cyberarm_engine 0.24.3 → 0.24.5

data/lib/cyberarm_engine/model/{model_object.rb → mesh.rb}

@@ -1,131 +1,131 @@
-module CyberarmEngine
-  class Model
-    class ModelObject
-      attr_reader :id, :name, :vertices, :uvs, :normals, :materials, :bounding_box, :debug_color
-      attr_accessor :faces, :scale
-
-      def initialize(id, name)
-        @id = id
-        @name = name
-        @vertices = []
-        @uvs      = []
-        @normals  = []
-        @faces    = []
-        @materials = []
-        @bounding_box = BoundingBox.new
-        @debug_color = Color.new(1.0, 1.0, 1.0)
-
-        @scale = 1.0
-
-        # Faces array packs everything:
-        #   vertex   = index[0]
-        #   uv       = index[1]
-        #   normal   = index[2]
-        #   material = index[3]
-      end
-
-      def has_texture?
-        @materials.find { |mat| mat.texture_id } ? true : false
-      end
-
-      def reflatten
-        @vertices_list = nil
-        @uvs_list = nil
-        @normals_list = nil
-
-        flattened_vertices
-        flattened_uvs
-        flattened_normals
-      end
-
-      def flattened_vertices
-        unless @vertices_list
-          @debug_color = @faces.first.material.diffuse
-
-          list = []
-          @faces.each do |face|
-            face.vertices.each do |v|
-              next unless v
-
-              list << v.x * @scale
-              list << v.y * @scale
-              list << v.z * @scale
-              list << v.weight
-            end
-          end
-
-          @vertices_list_size = list.size
-          @vertices_list = list.pack("f*")
-        end
-
-        @vertices_list
-      end
-
-      def flattened_vertices_size
-        @vertices_list_size
-      end
-
-      def flattened_uvs
-        unless @uvs_list
-          list = []
-          @faces.each do |face|
-            face.uvs.each do |v|
-              next unless v
-
-              list << v.x
-              list << v.y
-              list << v.z
-            end
-          end
-
-          @uvs_list_size = list.size
-          @uvs_list = list.pack("f*")
-        end
-
-        @uvs_list
-      end
-
-      def flattened_normals
-        unless @normals_list
-          list = []
-          @faces.each do |face|
-            face.normals.each do |n|
-              next unless n
-
-              list << n.x
-              list << n.y
-              list << n.z
-            end
-          end
-
-          @normals_list_size = list.size
-          @normals_list = list.pack("f*")
-        end
-
-        @normals_list
-      end
-
-      def flattened_materials
-        unless @materials_list
-          list = []
-          @faces.each do |face|
-            material = face.material
-            next unless material
-
-            face.vertices.each do # Add material to each vertex
-              list << material.diffuse.red
-              list << material.diffuse.green
-              list << material.diffuse.blue
-              # list << material.alpha
-            end
-          end
-
-          @materials_list_size = list.size
-          @materials_list = list.pack("f*")
-        end
-
-        @materials_list
-      end
-    end
-  end
-end
+module CyberarmEngine
+  class Model
+    class Mesh
+      attr_reader :id, :name, :vertices, :uvs, :normals, :materials, :bounding_box, :debug_color
+      attr_accessor :faces, :scale
+
+      def initialize(id, name)
+        @id = id
+        @name = name
+        @vertices = []
+        @uvs      = []
+        @normals  = []
+        @faces    = []
+        @materials = []
+        @bounding_box = BoundingBox.new
+        @debug_color = Color.new(1.0, 1.0, 1.0)
+
+        @scale = 1.0
+
+        # Faces array packs everything:
+        #   vertex   = index[0]
+        #   uv       = index[1]
+        #   normal   = index[2]
+        #   material = index[3]
+      end
+
+      def has_texture?
+        @materials.find { |mat| mat.texture_id } ? true : false
+      end
+
+      def reflatten
+        @vertices_list = nil
+        @uvs_list = nil
+        @normals_list = nil
+
+        flattened_vertices
+        flattened_uvs
+        flattened_normals
+      end
+
+      def flattened_vertices
+        unless @vertices_list
+          @debug_color = @faces.first.material.diffuse
+
+          list = []
+          @faces.each do |face|
+            face.vertices.each do |v|
+              next unless v
+
+              list << v.x * @scale
+              list << v.y * @scale
+              list << v.z * @scale
+              list << v.weight
+            end
+          end
+
+          @vertices_list_size = list.size
+          @vertices_list = list.pack("f*")
+        end
+
+        @vertices_list
+      end
+
+      def flattened_vertices_size
+        @vertices_list_size
+      end
+
+      def flattened_uvs
+        unless @uvs_list
+          list = []
+          @faces.each do |face|
+            face.uvs.each do |v|
+              next unless v
+
+              list << v.x
+              list << v.y
+              list << v.z
+            end
+          end
+
+          @uvs_list_size = list.size
+          @uvs_list = list.pack("f*")
+        end
+
+        @uvs_list
+      end
+
+      def flattened_normals
+        unless @normals_list
+          list = []
+          @faces.each do |face|
+            face.normals.each do |n|
+              next unless n
+
+              list << n.x
+              list << n.y
+              list << n.z
+            end
+          end
+
+          @normals_list_size = list.size
+          @normals_list = list.pack("f*")
+        end
+
+        @normals_list
+      end
+
+      def flattened_materials
+        unless @materials_list
+          list = []
+          @faces.each do |face|
+            material = face.material
+            next unless material
+
+            face.vertices.each do # Add material to each vertex
+              list << material.diffuse.red
+              list << material.diffuse.green
+              list << material.diffuse.blue
+              # list << material.alpha
+            end
+          end
+
+          @materials_list_size = list.size
+          @materials_list = list.pack("f*")
+        end
+
+        @materials_list
+      end
+    end
+  end
+end

data/lib/cyberarm_engine/model/parser.rb

@@ -1,74 +1,74 @@
-module CyberarmEngine
-  TextureCoordinate = Struct.new(:u, :v, :weight)
-  Point = Struct.new(:x, :y)
-  Color = Struct.new(:red, :green, :blue, :alpha)
-  Face  = Struct.new(:vertices, :uvs, :normals, :colors, :material, :smoothing)
-
-  class Model
-    class Parser
-      @@parsers = []
-
-      def self.handles
-        raise NotImplementedError,
-              "Model::Parser#handles must return an array of file extensions that this parser supports"
-      end
-
-      def self.inherited(parser)
-        @@parsers << parser
-      end
-
-      def self.find(file_type)
-        @@parsers.find do |parser|
-          parser.handles.include?(file_type)
-        end
-      end
-
-      def self.supported_formats
-        @@parsers.map { |parser| parser.handles }.flatten.map { |s| ".#{s}" }.join(", ")
-      end
-
-      def initialize(model)
-        @model = model
-      end
-
-      def parse
-      end
-
-      def set_object(id: nil, name: nil)
-        _model = nil
-
-        if id
-          _model = @model.objects.find { |o| o.id == id }
-        elsif name
-          _model = @model.objects.find { |o| o.name == name }
-        else
-          raise "Must provide either an id: or name:"
-        end
-
-        if _model
-          @model.current_object = _model
-        else
-          raise "Couldn't find ModelObject!"
-        end
-      end
-
-      def change_object(id, name)
-        @model.objects << Model::ModelObject.new(id, name)
-        @model.current_object = @model.objects.last
-      end
-
-      def set_material(name)
-        @model.current_material = name
-        @model.current_object.materials << current_material
-      end
-
-      def add_material(name, material)
-        @model.materials[name] = material
-      end
-
-      def current_material
-        @model.materials[@model.current_material]
-      end
-    end
-  end
-end
+module CyberarmEngine
+  TextureCoordinate = Struct.new(:u, :v, :weight)
+  Point = Struct.new(:x, :y)
+  Color = Struct.new(:red, :green, :blue, :alpha)
+  Face  = Struct.new(:vertices, :uvs, :normals, :colors, :material, :smoothing)
+
+  class Model
+    class Parser
+      @@parsers = []
+
+      def self.handles
+        raise NotImplementedError,
+              "Model::Parser#handles must return an array of file extensions that this parser supports"
+      end
+
+      def self.inherited(parser)
+        @@parsers << parser
+      end
+
+      def self.find(file_type)
+        @@parsers.find do |parser|
+          parser.handles.include?(file_type)
+        end
+      end
+
+      def self.supported_formats
+        @@parsers.map { |parser| parser.handles }.flatten.map { |s| ".#{s}" }.join(", ")
+      end
+
+      def initialize(model)
+        @model = model
+      end
+
+      def parse
+      end
+
+      def set_object(id: nil, name: nil)
+        _model = nil
+
+        if id
+          _model = @model.objects.find { |o| o.id == id }
+        elsif name
+          _model = @model.objects.find { |o| o.name == name }
+        else
+          raise "Must provide either an id: or name:"
+        end
+
+        if _model
+          @model.current_object = _model
+        else
+          raise "Couldn't find Mesh!"
+        end
+      end
+
+      def change_object(id, name)
+        @model.objects << Model::Mesh.new(id, name)
+        @model.current_object = @model.objects.last
+      end
+
+      def set_material(name)
+        @model.current_material = name
+        @model.current_object.materials << current_material
+      end
+
+      def add_material(name, material)
+        @model.materials[name] = material
+      end
+
+      def current_material
+        @model.materials[@model.current_material]
+      end
+    end
+  end
+end