Changeset 413 for trunk/src/formats/assimp_loader.cc

Timestamp:

07/09/15 18:53:08 (10 years ago)

Author:

epyon

Message:

• data_descriptor creators ( buggy )

File:

• trunk/src/formats/assimp_loader.cc (modified) (8 diffs)

trunk/src/formats/assimp_loader.cc

@@ -7 +7 @@
 #include "nv/formats/assimp_loader.hh"
 #include "nv/stl/unordered_map.hh"
-#include "nv/gfx/mesh_creator.hh"
 #include "nv/lib/assimp.hh"
 
@@ -123 +122 @@
         else
                 channel = raw_data_channel::create< assimp_plain_vtx >( mesh->mNumVertices );
+        uint8* cdata = const_cast< uint8*>( channel->raw_data() );
 
         data->add_channel( channel );
@@ -139 +139 @@
                 nv::vec4 vt ( t_i[0], t_i[1], t_i[2], det );
                 if ( skinned )
-                        reinterpret_cast< assimp_skinned_vtx* >(channel->data)[i] = assimp_skinned_vtx( v, s, n, vt );
+                        reinterpret_cast< assimp_skinned_vtx* >( cdata )[i] = assimp_skinned_vtx( v, s, n, vt );
                 else
-                        reinterpret_cast< assimp_plain_vtx* >(channel->data)[i] = assimp_plain_vtx( v, s, n, vt );
+                        reinterpret_cast< assimp_plain_vtx* >( cdata )[i] = assimp_plain_vtx( v, s, n, vt );
         }
 
         if ( skinned )
         {
-                assimp_skinned_vtx* vtx = reinterpret_cast< assimp_skinned_vtx* >( channel->data );
+                assimp_skinned_vtx* vtx = reinterpret_cast< assimp_skinned_vtx* >( cdata );
                 for (unsigned int m=0; m<mesh->mNumBones; m++)
                 {
@@ -169 +169 @@
         }
 
-        raw_data_channel* ichannel = raw_data_channel::create< index_u16 >( mesh->mNumFaces * 3 );
-        data->add_channel( ichannel );
-        uint16* indices = reinterpret_cast<uint16*>( ichannel->data );
+        data_channel_creator< index_u16 > ichannel( mesh->mNumFaces * 3 );
+        uint16* indices = reinterpret_cast<uint16*>( ichannel.raw_data() );
         for (unsigned int i=0; i<mesh->mNumFaces; i++)
         {
@@ -180 +179 @@
                 }
         }
+        data->add_channel( ichannel.release() );
 }
 
@@ -315 +315 @@
                         if ( m > 0 && bones.size() > 0 )
                         {
-                                raw_data_channel* channel = meshes[m].get_raw_channels()[0];
-                                assimp_skinned_vtx* va = reinterpret_cast< assimp_skinned_vtx* >( channel->data );
-                                for ( unsigned v = 0; v < channel->element_count(); ++v )
+                                data_channel_creator< assimp_skinned_vtx > channel( meshes[m].get_raw_channels()[0] );
+                                for ( unsigned v = 0; v < channel.size(); ++v )
                                 {
-                                        assimp_skinned_vtx& vertex = va[v];
+                                        assimp_skinned_vtx& vertex = channel.data()[v];
 
                                         for ( int i = 0 ; i < 4; ++i)
@@ -418 +417 @@
 
         data->data = new key_data;
-        raw_data_channel* raw_pchannel = raw_data_channel::create<assimp_key_p>( node->mNumPositionKeys );
-        raw_data_channel* raw_rchannel = raw_data_channel::create<assimp_key_r>( node->mNumRotationKeys );
-        //raw_data_channel* raw_schannel = raw_data_channel::create<assimp_key_s>( node->mNumScalingKeys );
-        data->data->add_channel( raw_pchannel );
-        data->data->add_channel( raw_rchannel );
-        //data->data->add_channel( raw_schannel );
-        assimp_key_p* pchannel = reinterpret_cast< assimp_key_p* >( raw_pchannel->data );
-        assimp_key_r* rchannel = reinterpret_cast< assimp_key_r* >( raw_rchannel->data );
+        data_channel_creator< assimp_key_p > pchannel_creator( node->mNumPositionKeys );
+        data_channel_creator< assimp_key_r > rchannel_creator( node->mNumRotationKeys );
+//      data_channel_creator< assimp_key_s > schannel_creator( node->mNumScalingKeys );
+
+        assimp_key_p* pchannel = pchannel_creator.data();
+        assimp_key_r* rchannel = rchannel_creator.data();
         //assimp_key_s* schannel = ((assimp_key_s*)(raw_schannel->data));
 
@@ -457 +454 @@
 //              }
 //      }
-
+        data->data->add_channel( pchannel_creator.release() );
+        data->data->add_channel( rchannel_creator.release() );
+//      data->data->add_channel( schannel_creator.release() );
 }