Changeset 529 for trunk/src/engine

Timestamp:

01/05/17 13:50:41 (8 years ago)

Author:

epyon

Message:

• mass update

Location:

trunk/src/engine

Files:

• default_resource_manager.cc (modified) (1 diff)
• model_manager.cc (modified) (1 diff)
• particle_engine.cc (modified) (1 diff)
• resource_system.cc (modified) (1 diff)

trunk/src/engine/default_resource_manager.cc

@@ -37 +37 @@
         m_lua->register_enum( "RND_STEP_3",     static_cast<int>( random_dist::STEP_3 ) );
         m_lua->register_enum( "RND_STEP_4",     static_cast<int>( random_dist::STEP_4 ) );
-        m_lua->register_enum( "RND_LINEAR",     static_cast<int>( random_dist::LINEAR ) );
+        m_lua->register_enum( "RND_MLINEAR",    static_cast<int>( random_dist::MLINEAR ) );
         m_lua->register_enum( "RND_MGAUSSIAN",  static_cast<int>( random_dist::MGAUSSIAN ) );
         m_lua->register_enum( "RND_MRGAUSSIAN", static_cast<int>( random_dist::MRGAUSSIAN ) );

trunk/src/engine/model_manager.cc

@@ -135 +135 @@
         node->choice    = model_node_choice( table.get_unsigned( "choice", false ) );
         node->chance    = table.get_float( "chance", 1.0f );
-        node->weight    = table.get_unsigned( "weight", 1 );
+        node->weight    = static_cast< uint16 >( table.get_unsigned( "weight", 1 ) );
         node->mesh      = cmesh;
         node->attach_id = attach_id;

trunk/src/engine/particle_engine.cc

@@ -454 +454 @@
         uint32 ecount = info->data->emitter_count;
         if ( ecount == 0 ) return;
-
-        bool local = model.is_identity();
-//      if ( !local ) 
-//      {
-//              source = vec3( m_model_matrix[3] );
-//              orient = mat3( m_model_matrix );
-//      }
 
         for ( uint32 i = 0; i < ecount; ++i )

trunk/src/engine/resource_system.cc

@@ -44 +44 @@
                 lua::table_guard sub_table( table, i + 1 );
                 string64 id = sub_table.get_string64( "id" );
-                NV_ASSERT( m_id_hash.find( id ) == m_id_hash.end(), "HASH COLLISION - ", id, " - ", m_id_hash[id] );
+                NV_ASSERT( m_id_hash.find( id ) == m_id_hash.end(), "HASH COLLISION" );
                 m_id_hash[id] = id;
         }