Changeset 399 for trunk/src/formats

Timestamp:

06/13/15 11:47:09 (10 years ago)

Author:

epyon

Message:

• naming cleanup
• string_ref -> string_view (compatible with C++17 standard!)
• *_ref and const_*_ref, renamed to _ref and _view for consistency

Location:

trunk/src/formats

Files:

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

trunk/src/formats/assimp_loader.cc

@@ -237 +237 @@
                         aiMesh* mesh = scene->mMeshes[mc];
 
-                        NV_LOG_NOTICE( "Mesh #", mc, "   - ", string_ref( (char*)mesh->mName.data ) );
+                        NV_LOG_NOTICE( "Mesh #", mc, "   - ", string_view( (char*)mesh->mName.data ) );
                         NV_LOG_NOTICE( "  bones   - ", mesh->mNumBones );
                         NV_LOG_NOTICE( "  uvs     - ", mesh->mNumUVComponents[0] );

trunk/src/formats/md3_loader.cc

@@ -284 +284 @@
 }
 
-nv::key_raw_channel* nv::md3_loader::load_tags( const string_ref& tag )
+nv::key_raw_channel* nv::md3_loader::load_tags( const string_view& tag )
 {
         md3_t* md3 = (md3_t*)m_md3;
@@ -294 +294 @@
                 {
                         const md3_tag_t& rtag = md3->tags[i + md3->header.num_tags * f];
-                        string_ref rname((char*)(rtag.name));
+                        string_view rname((char*)(rtag.name));
                         if (rname == tag)
                         {
@@ -425 +425 @@
         {
                 const md3_tag_t& rtag = md3->tags[i];
-                string_ref name( (char*)(rtag.name) );
+                string_view name( (char*)(rtag.name) );
 
                 nodes[i].transform = mat4();

trunk/src/formats/md5_loader.cc

@@ -457 +457 @@
 }
 
-void md5_loader::build_frame_skeleton( mesh_node_data* nodes, uint32 index, const const_array_ref<md5_joint_info>& joint_infos, const const_array_ref<transform>& base_frames, const const_array_ref<float>& frame_data )
+void md5_loader::build_frame_skeleton( mesh_node_data* nodes, uint32 index, const array_view<md5_joint_info>& joint_infos, const array_view<transform>& base_frames, const array_view<float>& frame_data )
 {
         assert( m_type == ANIMATION );

trunk/src/formats/nmd_loader.cc

@@ -162 +162 @@
 static void nmd_dump_mesh( const mesh_data* mesh, stream& stream_out )
 {
-        const_array_ref< mesh_raw_channel* > data  = mesh->get_raw_channels();
+        array_view< mesh_raw_channel* > data  = mesh->get_raw_channels();
 
         uint32 size = sizeof( nmd_element_header );