Changeset 230 for trunk/src/formats/md3_loader.cc

Timestamp:

05/06/14 12:39:51 (11 years ago)

Author:

epyon

Message:

• animated_mesh, scene_node, camera and transform classes added
• order in mesh hierarchies
• simplified and generified animation class hierarchy

File:

• trunk/src/formats/md3_loader.cc (modified) (4 diffs)

trunk/src/formats/md3_loader.cc

@@ -328 +328 @@
 */
 
-void nv::md3_loader::load_tags( std::vector<mat4>& t, const std::string& tag )
+void nv::md3_loader::load_tags( std::vector<transform>& t, const std::string& tag )
 {
         md3_t* md3 = (md3_t*)m_md3;
@@ -340 +340 @@
                         if (rname == tag)
                         {
-                                vec4 axisx     = vec4( md3_vec3( rtag.axis[0] ), 0.0 );
-                                vec4 axisz     = vec4( md3_vec3( rtag.axis[1] ), 0.0 );
-                                vec4 axisy     = vec4( md3_vec3( rtag.axis[2] ), 0.0 );
-                                vec4 origin    = vec4( md3_vec3( rtag.origin ),  1.0 );
-                                t.emplace_back( axisx, axisy, axisz, origin );
+                                vec3 axisx  ( md3_vec3( rtag.axis[0] ) );
+                                vec3 axisz  ( md3_vec3( rtag.axis[1] ) );
+                                vec3 axisy  ( md3_vec3( rtag.axis[2] ) );
+                                vec3 origin ( md3_vec3( rtag.origin )  );
+                                t.emplace_back( origin, quat( mat3( axisx, axisy, axisz ) ) );
                         }
                 }
@@ -406 +406 @@
 }
 
-mat4 md3_loader::get_tag( sint32 frame, const std::string& name ) const
+transform md3_loader::get_tag( sint32 frame, const std::string& name ) const
 {
         md3_t* md3 = (md3_t*)m_md3;
@@ -415 +415 @@
                 if (rname == name)
                 {
-                        vec4 axisx     = vec4( md3_vec3( rtag.axis[0] ), 0.0 );
-                        vec4 axisz     = vec4( md3_vec3( rtag.axis[1] ), 0.0 );
-                        vec4 axisy     = vec4( md3_vec3( rtag.axis[2] ), 0.0 );
-                        vec4 origin    = vec4( md3_vec3( rtag.origin ),  1.0 );
-                        return glm::mat4( axisx, axisy, axisz, origin );
-                }
-        }
-        return glm::mat4();
+                        vec3 axisx ( md3_vec3( rtag.axis[0] ) );
+                        vec3 axisz ( md3_vec3( rtag.axis[1] ) );
+                        vec3 axisy ( md3_vec3( rtag.axis[2] ) );
+                        vec3 origin( md3_vec3( rtag.origin ) );
+                        return transform( origin, quat( mat3( axisx, axisy, axisz ) ) );
+                }
+        }
+        return transform();
 }