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

Timestamp:

07/26/16 20:24:02 (9 years ago)

Author:

epyon

Message:

• random distributions
• resource - rename/remove support
• debug gizmo support
• minor resource_manager upgrades
• several minor changes

File:

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

trunk/src/engine/model_manager.cc

@@ -13 +13 @@
 bool nv::model_manager::load_resource( lua::table_guard& table, shash64 id )
 {
+        auto vec4_to_quat = [] ( const vec4& v ) { return quat( v.w, v.x, v.y, v.z ); };
+
         model* gm = new model;
         gm->attach = table.get_string_hash_64( "attach" );
-        gm->root = transform( table.get<vec3>( "position", vec3() ) );
-
+        gm->root.set_position( table.get<vec3>( "root_position", vec3() ) );
+        gm->root.set_orientation( vec4_to_quat( table.get<vec4>( "root_orientation", vec4(0.0f,0.0f,0.0f,1.0f) ) ) );
+        
         resource< mesh_data > def_data;
         if ( table.is_string( "path" ) )
@@ -45 +48 @@
 void nv::model_manager::read_model_node( lua::table_guard& table, model_node* node, resource< mesh_data > def_data )
 {
+        auto vec4_to_quat = [] ( const vec4& v ) { return quat( v.w, v.x, v.y, v.z ); };
+
         resource< data_channel_set > cmesh;
         resource< material >         cmaterial;
@@ -59 +64 @@
                 attach_id = info.parent_id;
         }
+
+        if ( table.has_field( "local_position" ) )
+                node->local.set_position( table.get<vec3>( "local_position", vec3() ) );
+        if ( table.has_field( "local_orientation" ) )
+                node->local.set_orientation( vec4_to_quat( table.get<vec4>( "local_orientation", vec4( 0.0f, 0.0f, 0.0f, 1.0f ) ) ) );
+
+        if ( table.has_field( "position" ) )
+        {
+                node->position.min = table.get<vec3>( "position", vec3() );
+                node->position.max = node->position.min;
+        }
+        if ( table.has_field( "rotation" ) )
+        {
+                node->rotation.min = table.get<vec3>( "rotation", vec3() );
+                node->rotation.max = node->rotation.min;
+        }
+        if ( table.has_field( "position_min" ) )  node->position.min  = table.get<vec3>( "position_min", vec3() );
+        if ( table.has_field( "position_max" ) )  node->position.max  = table.get<vec3>( "position_max", vec3() );
+        if ( table.has_field( "position_dist" ) ) node->position.dist = random_dist( table.get_unsigned( "position_dist", 0 ) );
+        if ( table.has_field( "rotation_min" ) )  node->rotation.min  = table.get<vec3>( "rotation_min", vec3() );
+        if ( table.has_field( "rotation_max" ) )  node->rotation.max  = table.get<vec3>( "rotation_max", vec3() );
+        if ( table.has_field( "rotation_dist" ) ) node->rotation.dist = random_dist( table.get_unsigned( "rotation_dist", 0 ) );
 
         if ( table.has_field( "attach" ) )
@@ -76 +103 @@
         }
 
-        node->force = table.get_boolean( "force", false );
-        node->chance = table.get_float( "chance", 1.0f );
-        node->random_rotate_y = table.get_boolean( "random_rotate", false );
-
-        node->mesh = cmesh;
+        node->force     = table.get_boolean( "force", false );
+        node->choice    = table.get_boolean( "choice", false );
+        node->chance    = table.get_float( "chance", 1.0f );
+        node->weight    = table.get_unsigned( "weight", 1 );
+        node->mesh      = cmesh;
         node->attach_id = attach_id;
-        node->material = cmaterial;
+        node->material  = cmaterial;
 
         for ( uint32 i = 1; i <= table.get_size(); ++i )