Changeset 539 for trunk/src/engine/ragdoll_manager.cc

Timestamp:

01/24/17 17:55:00 (8 years ago)

Author:

epyon

Message:

• temporary_proxy implemented
• table_guard now uses temporary_proxy as main read functionality

File:

• trunk/src/engine/ragdoll_manager.cc (modified) (3 diffs)

trunk/src/engine/ragdoll_manager.cc

@@ -26 +26 @@
         NV_ASSERT_ALWAYS( m_world, "Physics world not setup in ragdoll_manager!" );
         bool result = false;
-        nv::string64 model_id = table.get_string64( "model" );
+        nv::string64 model_id = table["model"].get_string64();
         nv::resource< model > mr = m_model->get( model_id );
         if ( !mr ) return false;
@@ -66 +66 @@
         if ( auto bind_data = rbind.lock() )
         {
-                data->id = table.get_string32( "id" );
+                data->id = table["id"].get_string32();
                 int index = data->parts.size();
                 data->parts.emplace_back();
                 auto& part = data->parts.back();
-                part.name = table.get_string_hash_64( "name" );
-                part.bone_id = nv::uint32( bind_data->get_bone_list().resolve( table.get_string_hash_64( "bone" ) ) );
+                part.name = table["name"].get_shash64();
+                part.bone_id = nv::uint32( bind_data->get_bone_list().resolve( table["bone"].get_shash64() ) );
                 NV_ASSERT( part.bone_id < 256, "Bone ID not found!" );
-                float radius = table.get_float( "radius" );
+                float radius = table["radius"].get_f32();
                 float length = 0.0f;
                 if ( table.has_field( "target" ) )
                 {
                         const auto& of = bind_data->get_bone_transforms().m_offsets;
-                        int target = bind_data->get_bone_list().resolve( table.get_string_hash_64( "target" ) );
+                        int target = bind_data->get_bone_list().resolve( table["target"].get_shash64() );
                         if ( target < 0 ) return false;
                         length = math::distance( of[part.bone_id].get_position(), of[target].get_position() );
@@ -84 +84 @@
                 else
                 {
-                        length = table.get_float( "length" );
+                        length = table["length"].get_f32();
                 }
                 NV_ASSERT( radius > 0.0f && length > 0.0f, "Bad parameters!" );
                 part.shape      = m_world->create_capsule( radius, length );
                 part.parent_idx = pindex;
-                part.mass       = table.get_float( "mass", 1.0f );
+                part.mass       = table["mass"].get_f32( 1.0f );
                 part.cone_twist = false;
                 // Joints
                 if ( pindex != -1 )
                 {
-                        part.cone_twist = table.get_string_hash_64("joint") == shash64( "cone_twist"_ls );
-                        part.limits     = table.get< vec3 >( "limits" );
+                        part.cone_twist = table["joint"].get_shash64() == shash64( "cone_twist"_ls );
+                        part.limits     = table["limits"].as< vec3 >();
                 }
                 uint32 child_count = table.get_size();