Changeset 411 for trunk/src/formats

Timestamp:

07/09/15 12:19:30 (10 years ago)

Author:

epyon

Message:

• mesh_raw_channel and key_raw_channel merged into raw_data_channel

Location:

trunk/src/formats

Files:

• assimp_loader.cc (modified) (4 diffs)
• md2_loader.cc (modified) (3 diffs)
• md3_loader.cc (modified) (3 diffs)
• md5_loader.cc (modified) (3 diffs)
• nmd_loader.cc (modified) (4 diffs)
• obj_loader.cc (modified) (1 diff)

trunk/src/formats/assimp_loader.cc

@@ -118 +118 @@
 
         bool skinned = mesh->mNumBones > 0;
-        mesh_raw_channel* channel = nullptr;
+        raw_data_channel* channel = nullptr;
         if ( skinned )
-                channel = mesh_raw_channel::create< assimp_skinned_vtx >( mesh->mNumVertices );
+                channel = raw_data_channel::create< assimp_skinned_vtx >( mesh->mNumVertices );
         else
-                channel = mesh_raw_channel::create< assimp_plain_vtx >( mesh->mNumVertices );
+                channel = raw_data_channel::create< assimp_plain_vtx >( mesh->mNumVertices );
 
         data->add_channel( channel );
@@ -169 +169 @@
         }
 
-        mesh_raw_channel* ichannel = mesh_raw_channel::create_index( USHORT, mesh->mNumFaces * 3 );
+        raw_data_channel* ichannel = raw_data_channel::create_index( USHORT, mesh->mNumFaces * 3 );
         data->add_channel( ichannel );
         uint16* indices = reinterpret_cast<uint16*>( ichannel->data );
@@ -315 +315 @@
                         if ( m > 0 && bones.size() > 0 )
                         {
-                                mesh_raw_channel* channel = meshes[m].get_raw_channels()[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->count; ++v )
@@ -418 +418 @@
 
         data->data = new key_data;
-        key_raw_channel* raw_pchannel = key_raw_channel::create<assimp_key_p>( node->mNumPositionKeys );
-        key_raw_channel* raw_rchannel = key_raw_channel::create<assimp_key_r>( node->mNumRotationKeys );
-        //key_raw_channel* raw_schannel = key_raw_channel::create<assimp_key_s>( node->mNumScalingKeys );
+        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 );

trunk/src/formats/md2_loader.cc

@@ -324 +324 @@
         size_t frame_count   = ( frame == -1 ? num_frames : 1 );
 
-        mesh_raw_channel* mc_pn = mesh_raw_channel::create< vtx_md2_pn >( num_verts * frame_count );
+        raw_data_channel* mc_pn = raw_data_channel::create< vtx_md2_pn >( num_verts * frame_count );
         vtx_md2_pn* vtx_pn = reinterpret_cast< vtx_md2_pn* >( mc_pn->data );
 
@@ -347 +347 @@
         }
 
-        mesh_raw_channel* mc_t = mesh_raw_channel::create< vtx_md2_t >( num_verts );
+        raw_data_channel* mc_t = raw_data_channel::create< vtx_md2_t >( num_verts );
         vtx_md2_t* vtx_t = reinterpret_cast< vtx_md2_t* >( mc_t->data );
 
@@ -357 +357 @@
         }
 
-        mesh_raw_channel* ic = mesh_raw_channel::create_index< uint16 >( m_new_indexes.size() );
+        raw_data_channel* ic = raw_data_channel::create_index< uint16 >( m_new_indexes.size() );
         if ( m_new_indexes.size() > 0 )
         {

trunk/src/formats/md3_loader.cc

@@ -286 +286 @@
 }
 
-nv::key_raw_channel* nv::md3_loader::load_tags( const string_view& tag )
+nv::raw_data_channel* nv::md3_loader::load_tags( const string_view& tag )
 {
         md3_t* md3 = reinterpret_cast< md3_t* >( m_md3 );
-        key_raw_channel* result = key_raw_channel::create<md3_key>( uint32( md3->header.num_frames ) );
+        raw_data_channel* result = raw_data_channel::create<md3_key>( uint32( md3->header.num_frames ) );
         // TODO: is this brain damaged in efficiency (loop nest order) or what?
         for ( sint32 f = 0; f < md3->header.num_frames; ++f )
@@ -352 +352 @@
                 }
 
-        mesh_raw_channel* mc_pn = mesh_raw_channel::create< vtx_md3_pn >( uint32( num_verts * frame_count ) );
-        mesh_raw_channel* mc_t  = mesh_raw_channel::create< vtx_md3_t >( uint32( num_verts ) );
-        mesh_raw_channel* ic = mesh_raw_channel::create_index< uint16 >( uint32( index_count ) );
+        raw_data_channel* mc_pn = raw_data_channel::create< vtx_md3_pn >( uint32( num_verts * frame_count ) );
+        raw_data_channel* mc_t  = raw_data_channel::create< vtx_md3_t >( uint32( num_verts ) );
+        raw_data_channel* ic = raw_data_channel::create_index< uint16 >( uint32( index_count ) );
         vtx_md3_pn* vtx_pn = reinterpret_cast< vtx_md3_pn* >( mc_pn->data );
         vtx_md3_t*  vtx_t  = reinterpret_cast< vtx_md3_t* >( mc_t->data );
@@ -435 +435 @@
                 nodes[i].data      = new key_data;
         
-                key_raw_channel* keys = load_tags( name );
+                raw_data_channel* keys = load_tags( name );
                 nodes[i].data->add_channel( keys );
         }

trunk/src/formats/md5_loader.cc

@@ -159 +159 @@
                                         md5_vtx_t* tdata = nullptr;
                                         {
-                                                mesh_raw_channel* ch_pnt = mesh_raw_channel::create<md5_vtx_pnt>( num_verts );
-                                                mesh_raw_channel* ch_t   = mesh_raw_channel::create<md5_vtx_t>( num_verts );
-                                                mesh_raw_channel* ch_pntiw = mesh_raw_channel::create<md5_vtx_pntiw>( num_verts );
+                                                raw_data_channel* ch_pnt = raw_data_channel::create<md5_vtx_pnt>( num_verts );
+                                                raw_data_channel* ch_t   = raw_data_channel::create<md5_vtx_t>( num_verts );
+                                                raw_data_channel* ch_pntiw = raw_data_channel::create<md5_vtx_pntiw>( num_verts );
                                                 tdata = reinterpret_cast< md5_vtx_t* >( ch_t->data );
                                                 mesh->add_channel( ch_pnt );
@@ -190 +190 @@
                                         sstream >> num_tris;
 
-                                        mesh_raw_channel* ch_i = mesh_raw_channel::create_index<uint32>( num_tris * 3 );
+                                        raw_data_channel* ch_i = raw_data_channel::create_index<uint32>( num_tris * 3 );
                                         uint32* vtx_i                = reinterpret_cast< uint32* >( ch_i->data );
                                         uint32 idx = 0;
@@ -256 +256 @@
                                 nodes[i].target_id = -1;
                                 nodes[i].data      = new key_data;
-                                nodes[i].data->add_channel( key_raw_channel::create< md5_key_t >( num_frames ) );
+                                nodes[i].data->add_channel( raw_data_channel::create< md5_key_t >( num_frames ) );
                                 next_line( sstream ); 
                         }

trunk/src/formats/nmd_loader.cc

@@ -43 +43 @@
                 nmd_stream_header stream_header;
                 source.read( &stream_header, sizeof( stream_header ), 1 );
-                mesh_raw_channel* channel = mesh_raw_channel::create( stream_header.format, stream_header.count );
+                raw_data_channel* channel = raw_data_channel::create( stream_header.format, stream_header.count );
                 source.read( channel->data, stream_header.format.element_size(), stream_header.count );
                 mesh->add_channel( channel );
@@ -128 +128 @@
                                 nv::nmd_stream_header cheader;
                                 source.read( &cheader, sizeof( cheader ), 1 );
-                                key_raw_channel* channel = key_raw_channel::create( cheader.format, cheader.count );
+                                raw_data_channel* channel = raw_data_channel::create( cheader.format, cheader.count );
                                 source.read( channel->data, channel->desc.element_size(), channel->count );
                                 kdata->add_channel( channel );
@@ -162 +162 @@
 static void nmd_dump_mesh( const mesh_data* mesh, stream& stream_out )
 {
-        array_view< mesh_raw_channel* > data  = mesh->get_raw_channels();
+        array_view< raw_data_channel* > data  = mesh->get_raw_channels();
 
         uint32 size = sizeof( nmd_element_header );
@@ -248 +248 @@
                 for ( uint32 c = 0; c < chan_count; ++c )
                 {
-                        const key_raw_channel* channel = node->data->get_channel(c);
+                        const raw_data_channel* channel = node->data->get_channel(c);
 
                         eheader.type     = nmd_type::KEY_CHANNEL;

trunk/src/formats/obj_loader.cc

@@ -324 +324 @@
                 }
         
-                mesh_raw_channel* channel = new mesh_raw_channel();
+                raw_data_channel* channel = new raw_data_channel();
                 nv::uint8* data = nullptr;