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

Timestamp:

06/02/15 20:56:15 (10 years ago)

Author:

epyon

Message:

• more work on stl
• fully working vectors!
• copy & copy_n
• removal of a lot of std code!

File:

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

trunk/src/formats/md3_loader.cc

@@ -198 +198 @@
         md3->tags     = new md3_tag_t    [ md3->header.num_tags * md3->header.num_frames ];
         md3->surfaces = new md3_surface_t[ md3->header.num_surfaces ];
-        std::memset( md3->surfaces, 0, static_cast< nv::size_t >( md3->header.num_surfaces ) * sizeof( md3_surface_t ) );
+        nv::raw_zero_n( md3->surfaces, static_cast< nv::size_t >( md3->header.num_surfaces ) );
 
         source.seek( md3->header.ofs_frames, origin::SET );
@@ -285 +285 @@
 }
 
-nv::key_raw_channel* nv::md3_loader::load_tags( const std::string& tag )
+nv::key_raw_channel* nv::md3_loader::load_tags( const string_ref& tag )
 {
         md3_t* md3 = (md3_t*)m_md3;
@@ -295 +295 @@
                 {
                         const md3_tag_t& rtag = md3->tags[i + md3->header.num_tags * f];
-                        std::string rname((char*)(rtag.name));
+                        string_ref rname((char*)(rtag.name));
                         if (rname == tag)
                         {
@@ -421 +421 @@
         md3_t* md3 = (md3_t*)m_md3;
         uint32 node_count = (uint32)md3->header.num_tags;
-        if ( node_count == 0 ) return nullptr;;
+        if ( node_count == 0 ) return nullptr;
         mesh_node_data* nodes = new mesh_node_data[ node_count ];
         for ( uint32 i = 0; i < node_count; ++i )
         {
                 const md3_tag_t& rtag = md3->tags[i];
-                std::string name( (char*)(rtag.name) );
+                string_ref name( (char*)(rtag.name) );
 
                 nodes[i].transform = mat4();
-                nodes[i].name      = name;
+                nodes[i].name      = name.to_string();
                 nodes[i].parent_id = -1;
                 nodes[i].target_id = -1;