Changeset 540 for trunk/src/engine

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

Location:

trunk/src/engine

Files:

• animation.cc (modified) (4 diffs)
• model_manager.cc (modified) (5 diffs)
• particle_manager.cc (modified) (1 diff)
• program_manager.cc (modified) (1 diff)
• ragdoll_manager.cc (modified) (2 diffs)

trunk/src/engine/animation.cc

@@ -27 +27 @@
 nv::resource< animator_data > nv::animator_manager::load_animator( nv::lua::table_guard& table, nv::shash64 id, nv::pose_data_set* poses /*= nullptr */ )
 {
-        uint32 count = table.get_size();
+        uint32 count = table.size();
         if ( count == 0 )
         {
@@ -73 +73 @@
                 {
                         nv::lua::table_guard states_table( layer_table, "states" );
-                        uint32 state_count = states_table.get_size();
+                        uint32 state_count = states_table.size();
                         if ( state_count > 0 )
                         {
@@ -119 +119 @@
                                         {
                                                 nv::lua::table_guard transitions_table( state_table, "transitions" );
-                                                uint32 transition_count = transitions_table.get_size();
+                                                uint32 transition_count = transitions_table.size();
                                                 if ( transition_count > 0 )
                                                 {
@@ -167 +167 @@
         result.in = table["ease_in"].get_enum( result.in );
         result.out = table["ease_out"].get_enum( nv::easing_type::NONE );
-        if ( table.has_field( "ease_in_out" ) )
+        if ( table[ "ease_in_out" ] )
         {
                 result.in = result.out = table["ease_in_out"].get_enum( nv::easing_type::NONE );

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 );

trunk/src/engine/particle_manager.cc

@@ -68 +68 @@
 
         vec2 def_size        = table.get<vec2>("size", vec2(0.1,0.1) );
-        uint32 elements = table.get_size();
+        uint32 elements = table.size();
         for ( uint32 i = 0; i < elements; ++i )
         {

trunk/src/engine/program_manager.cc

@@ -68 +68 @@
         {
                 lua::table_guard inctable( table, "files" );
-                uint32 count = inctable.get_size();
+                uint32 count = inctable.size();
                 for ( uint32 i = 1; i <= count; ++i )
                 {

trunk/src/engine/ragdoll_manager.cc

@@ -75 +75 @@
                 float radius = table["radius"].get_f32();
                 float length = 0.0f;
-                if ( table.has_field( "target" ) )
+                if ( table[ "target" ] )
                 {
                         const auto& of = bind_data->get_bone_transforms().m_offsets;
@@ -97 +97 @@
                         part.limits     = table["limits"].as< vec3 >();
                 }
-                uint32 child_count = table.get_size();
+                uint32 child_count = table.size();
                 bool   result = true;
                 if ( child_count > 0 )