Improve file handling, add scaling

src/3d/mesh.cr

@@ -2,10 +2,38 @@ module PF
   # Mesh represents a collection of points and triangles
   # TODO: Keep points in a collection, removing duplicates, and keep triangle verticies pointing to the points in that collection
   class Mesh
+    struct Material
+      # @texture : Sprite
+
+      def self.load_mtl(path : String)
+        materials = [] of Material
+        line_no = 0
+        File.open(path) do |file|
+          file.each_line do |line|
+            # Ns          = Phong specular component. Ranges from 0 to 1000. (I've seen various statements about this range (see below))
+            # Kd          = Diffuse color weighted by the diffuse coefficient.
+            # Ka          = Ambient color weighted by the ambient coefficient.
+            # Ks          = Specular color weighted by the specular coefficient.
+            # d           = Dissolve factor (pseudo-transparency). Values are from 0-1. 0 is completely transparent, 1 is opaque.
+            # Ni          = Refraction index. Values range from 1 upwards. A value of 1 will cause no refraction. A higher value implies refraction.
+            # illum       = (0, 1, or 2) 0 to disable lighting, 1 for ambient & diffuse only (specular color set to black), 2 for full lighting (see below)
+            # sharpness   = ? (see below)
+            # map_Kd      = Diffuse color texture map.
+            # map_Ks      = Specular color texture map.
+            # map_Ka      = Ambient color texture map.
+            # map_Bump    = Bump texture map.
+            # map_d       = Opacity texture map.
+            # refl        = reflection type and filename (?)
+          end
+        end
+      end # /load_mtl
+    end
+
     setter tris = [] of Tri
     property origin : Vector3(Float64) = Vector[0.0, 0.0, 0.0]
     property rotation : Vector3(Float64) = Vector[0.0, 0.0, 0.0]
     property position : Vector3(Float64) = Vector[0.0, 0.0, 0.0]
+    property scale : Vector3(Float64) = Vector[1.0, 1.0, 1.0]
 
     # Load an obj file
     # TODO: Load meshes specified by the obj file
@@ -20,26 +48,34 @@ module PF
         file.each_line do |line|
           line_no += 1
           next if line =~ /^\s*$/
-          parts = line.split(/\s+/)
+          parts = line.strip.split(/\s+/)
 
           case parts[0]
           when "o"
-            puts "Object: #{parts[1]}"
+            # puts "Object: #{parts[1]}"
             # TODO: This is when a new mesh starts
           when "mtllib"
             # TODO This is where we need to load texture and material information
           when "v"
-            w = parts[4]?.try { |n| n.to_f64 }
-            verticies << Vector3.new(x: parts[1].to_f64, y: parts[2].to_f64, z: parts[3].to_f64)
+            # Vertex coord
+            # EX: v 0.0 1.0 1.0
+            w = parts[4]?.try { |n| n.to_f64 } || 1.0
+            verticies << Vector[parts[1].to_f64, parts[2].to_f64, parts[3].to_f64]
           when "vt"
+            # Vertex Texture coord
+            # EX: vt 0.0 1.0
             v = parts[2]?.try { |n| n.to_f64 } || 0.0
-            w = parts[3]?.try { |n| n.to_f64 } || 1.0
-            texture_verticies << Vector3.new(parts[1].to_f64, v, w)
+            # w = parts[3]?.try { |n| n.to_f64 } || 1.0
+            texture_verticies << Vector[parts[1].to_f64, v, 1.0]
           when "vn"
+            # Vertex Normal
             if use_normals
               normal_verticies << Vector3.new(parts[1].to_f64, parts[2].to_f64, parts[3].to_f64)
             end
           when "f"
+            # Face
+            # EX: f 1/1 2/2 3/3 4/4
+
             face_verts = [] of Vector3(Float64)
             face_tex = [] of Vector3(Float64)
 
@@ -71,17 +107,23 @@ module PF
 
             tris << tri
 
-            # Split a square into triangles
+            # If a fourth component is provided, it's a square...
+            # So, we need to create the second triangle
             if face_verts.size > 3
               tri = Tri.new(face_verts[0], face_verts[2], face_verts[3], normal: normal)
+
               unless face_tex.empty?
                 tri.t1 = face_tex[0]
                 tri.t2 = face_tex[2]
                 tri.t3 = face_tex[3]
               end
+
               tris << tri
             end
           end
+        rescue e : Exception
+          puts "Error! => '#{line}'\n"
+          raise e
         end
       end
 
@@ -94,6 +136,7 @@ module PF
     def tris
       # Translate and rotate
       @tris.map do |tri|
+        tri *= Transform3d.scale(scale)
         tri *= Transform3d.translation(origin)
         tri *= Transform3d.rotation(rotation)
         tri *= Transform3d.translation(position)

src/transform3d.cr

@@ -65,6 +65,15 @@ module PF
       self.translation(pos.x, pos.y, pos.z)
     end
 
+    def self.scale(scale : Vector3(Float64))
+      Matrix[
+        scale.x, 0.0, 0.0, 0.0,
+        0.0, scale.y, 0.0, 0.0,
+        0.0, 0.0, scale.z, 0.0,
+        0.0, 0.0, 0.0, 1.0,
+      ]
+    end
+
     # Does not work for scaling, only for rotation / translation
     def self.quick_inverse(other : Matrix)
       matrix = Matrix(Float64, 16).new(4, 4)