Sync

lib/wavefront/model.rb

@@ -16,6 +16,7 @@ class IMICFPS
 
       attr_reader :normals_buffer, :uvs_buffer, :vertices_buffer
       attr_reader :vertices_buffer_data, :uvs_buffer_data, :normals_buffer_data
+      attr_reader :vertex_array_id
 
       def initialize(file_path:, game_object: nil)
         @game_object = game_object
@@ -34,20 +35,6 @@ class IMICFPS
         @faces    = []
         @smoothing= 0
 
-        # Allocate buffers for future use
-        @normals_buffer, @colors_buffer, @vertices_buffer = nil
-        buffer = " " * 4
-        glGenBuffers(1, buffer)
-        @normals_buffer = buffer.unpack('L2').first
-
-        buffer = " " * 4
-        glGenBuffers(1, buffer)
-        @uvs_buffer = buffer.unpack('L2').first
-
-        buffer = " " * 4
-        glGenBuffers(1, buffer)
-        @vertices_buffer = buffer.unpack('L2').first
-
         @bounding_box = BoundingBox.new(0,0,0, 0,0,0)
         start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
 
@@ -55,7 +42,9 @@ class IMICFPS
 
         puts "#{@file_path.split('/').last} took #{((Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)-start_time)/1000.0).round(2)} seconds to parse" if $debug
 
-        # populate_buffers
+        allocate_gl_objects
+        populate_buffers
+        populate_arrays
 
         @objects.each {|o| @vertex_count+=o.vertices.size}
         @objects.each_with_index do |o, i|
@@ -71,13 +60,35 @@ class IMICFPS
         end
       end
 
+      def allocate_gl_objects
+        # Allocate arrays for future use
+        @vertex_array_id = nil
+        buffer = " " * 4
+        glGenVertexArrays(1, buffer)
+        @vertex_array_id = buffer.unpack('L2').first
+
+        # Allocate buffers for future use
+        @normals_buffer, @colors_buffer, @vertices_buffer = nil
+        buffer = " " * 4
+        glGenBuffers(1, buffer)
+        @normals_buffer = buffer.unpack('L2').first
+
+        buffer = " " * 4
+        glGenBuffers(1, buffer)
+        @uvs_buffer = buffer.unpack('L2').first
+
+        buffer = " " * 4
+        glGenBuffers(1, buffer)
+        @vertices_buffer = buffer.unpack('L2').first
+      end
+
       def populate_buffers
         @vertices_buffer_data = @vertices.map {|vert| [vert.x, vert.y, vert.z]}.flatten.pack("f*")
         @uvs_buffer_data      = @uvs.map {|uv| [uv.x, uv.y, uv.z]}.flatten.pack("f*")
         @normals_buffer_data  = @normals.map {|norm| [norm.x, norm.y, norm.z, norm.weight]}.flatten.pack("f*")
 
         glBindBuffer(GL_ARRAY_BUFFER, @vertices_buffer)
-        glBufferData(GL_ARRAY_BUFFER, @vertices.size, @vertices_buffer_data, GL_STATIC_DRAW)
+        glBufferData(GL_ARRAY_BUFFER, Fiddle::SIZEOF_FLOAT * @vertices.size, @vertices_buffer_data, GL_STATIC_DRAW)
         glBindBuffer(GL_ARRAY_BUFFER, 0)
 
         glBindBuffer(GL_ARRAY_BUFFER, @uvs_buffer)
@@ -89,6 +100,13 @@ class IMICFPS
         glBindBuffer(GL_ARRAY_BUFFER, 0)
       end
 
+      def populate_arrays
+        glBindVertexArray(@vertex_array_id)
+        glBindBuffer(GL_ARRAY_BUFFER, @vertices_buffer)
+        glBindVertexArray(0)
+        glBindBuffer(GL_ARRAY_BUFFER, 0)
+      end
+
       def update
         @x, @y, @z = @game_object.x, @game_object.y, @game_object.z
         @scale = @game_object.scale