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

Timestamp:

07/23/14 15:24:03 (11 years ago)

Author:

epyon

Message:

• mesh_data_pack's in every format
• md5_mesh_data removed, uses standard mesh_data
• BONE_ARRAY in NMD is now a simple set of animation nodes
• bone and animation node concepts merged
• several minor changes

File:

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

trunk/src/formats/obj_loader.cc

@@ -50 +50 @@
         std::string line;
         std::string cmd;
+        std::string name;
+        std::string next_name;
 
         std::size_t size;
@@ -77 +79 @@
 bool obj_reader::read_stream( std::istream& stream )
 {
+        name = next_name;
         bool added_faces = false;
         f32 x, y, z;
@@ -146 +149 @@
                 if ( cmd == "g" )
                 {
-                        if (added_faces) return true;
+                        ss >> next_name;
+                        if (added_faces) 
+                                return true;
+                        name = next_name;
                         continue;
                 }
@@ -335 +341 @@
                 channel->count = reader->size * 3;
 
-                mesh_data* mesh = new mesh_data();
+                mesh_data* mesh = new mesh_data(reader->name);
                 mesh->add_channel( channel );
                 m_meshes.push_back( mesh );
@@ -357 +363 @@
         for ( auto mesh : m_meshes ) if ( mesh ) delete mesh;
 }
+
+mesh_data_pack* nv::obj_loader::release_mesh_data_pack()
+{
+        uint32 size = m_meshes.size();
+        mesh_data* meshes = new mesh_data[ size ];
+        for ( uint32 i = 0; i < size; ++i )
+        {
+                m_meshes[i]->move_to( meshes[i] );
+                delete m_meshes[i];
+        }
+        m_meshes.clear();
+        return new mesh_data_pack( size, meshes );
+}