Changeset 509 for trunk/src/engine/default_resource_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/default_resource_manager.cc (modified) (3 diffs)

trunk/src/engine/default_resource_manager.cc

@@ -9 +9 @@
 using namespace nv;
 
-default_resource_manager::default_resource_manager( context* context )
+default_resource_manager::default_resource_manager( context* context, bool clear_material_paths )
 {
         m_images        = register_resource_handler< image_data >( new image_manager );
@@ -15 +15 @@
         m_binds         = register_resource_handler< animator_bind_data >( new animator_bind_manager );
         m_animators     = register_resource_handler< animator_data >( new animator_manager );
-        m_materials     = register_resource_handler< material >( new material_manager );
+        m_materials     = register_resource_handler< material >( new material_manager( clear_material_paths ) );
         m_programs      = register_resource_handler< program >( new program_manager( context ) );
         m_gpu_meshes    = register_resource_handler< gpu_mesh >( new gpu_mesh_manager( context, m_meshes ) );
@@ -27 +27 @@
         m_lua = lua;
 
+        m_lua->register_enum( "RND_LINEAR",     static_cast<int>( random_dist::LINEAR ) );
+        m_lua->register_enum( "RND_GAUSSIAN",   static_cast<int>( random_dist::GAUSSIAN ) );
+        m_lua->register_enum( "RND_RGAUSSIAN",  static_cast<int>( random_dist::RGAUSSIAN ) );
+        m_lua->register_enum( "RND_STEP_1",     static_cast<int>( random_dist::STEP_1 ) );
+        m_lua->register_enum( "RND_STEP_2",     static_cast<int>( random_dist::STEP_2 ) );
+        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_MGAUSSIAN",  static_cast<int>( random_dist::MGAUSSIAN ) );
+        m_lua->register_enum( "RND_MRGAUSSIAN", static_cast<int>( random_dist::MRGAUSSIAN ) );
+        m_lua->register_enum( "RND_MSTEP_1",    static_cast<int>( random_dist::MSTEP_1 ) );
+        m_lua->register_enum( "RND_MSTEP_2",    static_cast<int>( random_dist::MSTEP_2 ) );
+        m_lua->register_enum( "RND_MSTEP_3",    static_cast<int>( random_dist::MSTEP_3 ) );
+        m_lua->register_enum( "RND_MSTEP_4",    static_cast<int>( random_dist::MSTEP_4 ) );
+        
         m_lua->register_enum( "INT_NONE",       static_cast<int>( interpolation::NONE ) );
         m_lua->register_enum( "INT_LINEAR",     static_cast<int>( interpolation::LINEAR ) );