Changeset 224 for trunk/src/formats/obj_loader.cc

Timestamp:

01/02/14 20:52:34 (11 years ago)

Author:

epyon

Message:

• universal mesh format
• removed keyframed_mesh_data

File:

• trunk/src/formats/obj_loader.cc (modified) (7 diffs)

trunk/src/formats/obj_loader.cc

@@ -119 +119 @@
 struct mesh_obj_reader : public obj_reader
 {
-        mesh_obj_reader( mesh* m ) : m_position( nullptr ), m_normal( nullptr ), m_tex_coord( nullptr ), m_tangent( nullptr ), m_mesh( m ) {}
+        mesh_obj_reader( mesh_data_creator* m ) : m_mesh( m ) {}
         virtual std::size_t add_face( uint32* v, uint32* t, uint32* n, size_t count );
         virtual void calculate_tangents();
 
-        vertex_attribute< vec3 >* m_position;
-        vertex_attribute< vec3 >* m_normal;
-        vertex_attribute< vec2 >* m_tex_coord;
-        vertex_attribute< vec4 >* m_tangent;
-        mesh* m_mesh;
+        mesh_data_creator* m_mesh;
 };
 
@@ -138 +134 @@
         }
 
-        if ( m_position == nullptr )
-        {
-                m_position  = m_mesh->add_attribute< vec3 >( "nv_position" );
-        }
-        if ( m_tex_coord == nullptr )
-        {
-                m_tex_coord = m_mesh->add_attribute< vec2 >( "nv_texcoord" );
-        }
-        if ( m_normal == nullptr && ni != nullptr )
-        {
-                m_normal = m_mesh->add_attribute< vec3 >( "nv_normal" );
-        }
-
         // TODO : support if normals not present;
 
-        std::vector< vec3 >& vp = m_position->get();
-        std::vector< vec2 >& vt = m_tex_coord->get();
-        std::vector< vec3 >& vn = m_normal->get();
+        std::vector< vec3 >& vp = m_mesh->get_positions();
+        std::vector< vec3 >& vn = m_mesh->get_normals();
+        std::vector< vec2 >& vt = m_mesh->get_texcoords();
 
         std::size_t result = 0;
@@ -174 +157 @@
 void mesh_obj_reader::calculate_tangents()
 {
-        m_tangent = m_mesh->add_attribute< vec4 >( "nv_tangent" );
-
-        std::vector< vec3 >& vp = m_position->get();
-        std::vector< vec2 >& vt = m_tex_coord->get();
-        std::vector< vec3 >& vn = m_normal->get();
-        std::vector< vec4 >& tg = m_tangent->get();
+        const std::vector< vec3 >& vp = m_mesh->get_positions();
+        const std::vector< vec2 >& vt = m_mesh->get_texcoords();
+        const std::vector< vec3 >& vn = m_mesh->get_normals();
+        std::vector< vec3 >& tg = m_mesh->get_tangents();
 
         size_t count  = vp.size();
@@ -225 +206 @@
                 tan1[i3] += sdir;
 
+                // tan2 not needed anymore??
                 tan2[i1] += tdir;
                 tan2[i2] += tdir;
@@ -235 +217 @@
                 const vec3& t = tan1[a];
 
-                tg[a] = vec4( glm::normalize(t - n * glm::dot( n, t )), 
-                    (glm::dot(glm::cross(n, t), tan2[a]) < 0.0f) ? -1.0f : 1.0f );
+                tg[a] = vec3( glm::normalize(t - n * glm::dot( n, t )) ); 
+                //tg[a][3] =    (glm::dot(glm::cross(n, t), tan2[a]) < 0.0f) ? -1.0f : 1.0f;
         }
 
@@ -258 +240 @@
                 delete m_mesh;
         }
-        m_mesh = new mesh();
-        mesh_obj_reader reader( m_mesh );
+        mesh_data_creator creator;
+        mesh_obj_reader reader( &creator );
         std_stream sstream( &source );
         reader.read_stream( sstream );
@@ -267 +249 @@
                 reader.calculate_tangents();
         }
+        m_mesh = creator.release();
         return true;
 }