Changeset 540 for trunk/src/engine/model_manager.cc

Timestamp:

01/25/17 20:20:45 (8 years ago)

Author:

epyon

Message:

• lua::stack_proxy RTTI read support
• missing RTTI declarations
• new lua::table_guard syntax

File:

• trunk/src/engine/model_manager.cc (modified) (5 diffs)

trunk/src/engine/model_manager.cc

@@ -30 +30 @@
                 gm->ragdoll_id = table["ragdoll"].get_string32();
         
-        if ( table.has_field( "animator" ) )
+        if ( table["animator"] )
         {
                 gm->animator = m_rm->get< animator_data >( table["animator"].get_string() );
@@ -40 +40 @@
         }
 
-        if ( table.has_field( "phx_mesh" ) )
+        if ( table[ "phx_mesh" ] )
         {
                 nv::string128 cpath( table["phx_mesh"].get_string128() );
@@ -77 +77 @@
                 node->tag = table["tag"].get_string32();
 
-        if ( table.has_field( "path" ) )
+        if ( table[ "path" ] )
         {
                 nv::string128 cpath( table["path"].get_string128() );
@@ -85 +85 @@
         }
 
-        if ( table.has_field( "phx_hextents" ) )
+        if ( table[ "phx_hextents"] )
                 node->phx_hextents = table["phx_hextents"].as<vec3>();
-        if ( table.has_field( "phx_offset" ) )
+        if ( table[ "phx_offset"] )
                 node->phx_offset = table["phx_offset"].as<vec3>();
-        if ( table.has_field( "phx_mass" ) )
+        if ( table[ "phx_mass"] )
                 node->phx_mass = table["phx_mass"].as<float>( 0.0f );
-        if ( table.has_field( "phx_mass" ) )
+        if ( table["phx_mass"] )
                 node->phx_shape = nv::phx_shape( table["phx_shape"].as<int>( 0 ) );
 
-        if ( table.has_field( "local_position" ) )
+        if ( table["local_position"] )
                 node->local.set_position( table["local_position"].as<vec3>() );
-        if ( table.has_field( "local_orientation" ) )
+        if ( table["local_orientation"] )
                 node->local.set_orientation( vec4_to_quat( table["local_orientation"].as<vec4>( vec4( 0.0f, 0.0f, 0.0f, 1.0f ) ) ) );
 
-        if ( table.has_field( "position" ) )
+        if ( table["position"] )
         {
                 node->position.min = table["position"].as<vec3>();
                 node->position.max = node->position.min;
         }
-        if ( table.has_field( "rotation" ) )
+        if ( table["rotation"] )
         {
                 node->rotation.min = table["rotation"].as<vec3>();
                 node->rotation.max = node->rotation.min;
         }
-        if ( table.has_field( "position_min" ) )  node->position.min  = table["position_min"].as<vec3>();
-        if ( table.has_field( "position_max" ) )  node->position.max  = table["position_max"].as<vec3>();
-        if ( table.has_field( "position_dist" ) ) node->position.dist = random_dist( table["position_dist"].get_uint32() );
-        if ( table.has_field( "rotation_min" ) )  node->rotation.min  = table["rotation_min"].as<vec3>();
-        if ( table.has_field( "rotation_max" ) )  node->rotation.max  = table["rotation_max"].as<vec3>();
-        if ( table.has_field( "rotation_dist" ) ) node->rotation.dist = random_dist( table["rotation_dist"].get_uint32() );
+        if ( table["position_min"] )  node->position.min  = table["position_min"].as<vec3>();
+        if ( table["position_max"] )  node->position.max  = table["position_max"].as<vec3>();
+        if ( table["position_dist"] ) node->position.dist = random_dist( table["position_dist"].get_uint32() );
+        if ( table["rotation_min"] )  node->rotation.min  = table["rotation_min"].as<vec3>();
+        if ( table["rotation_max"] )  node->rotation.max  = table["rotation_max"].as<vec3>();
+        if ( table["rotation_dist"] ) node->rotation.dist = random_dist( table["rotation_dist"].get_uint32() );
 
-        if ( table.has_field( "attach" ) )
+        if ( table["attach"] )
         {
                 if ( table["attach"].is_number() )
@@ -140 +140 @@
         node->material  = cmaterial;
 
-        for ( uint32 i = 1; i <= table.get_size(); ++i )
+        for ( uint32 i = 1; i <= table.size(); ++i )
         {
                 lua::table_guard child_table( table, i );