Changeset 510 for trunk/src

Timestamp:

07/27/16 19:06:49 (9 years ago)

Author:

epyon

Message:

• choice a enum instead of boolean - pattern support

Location:

trunk/src/engine

Files:

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

trunk/src/engine/default_resource_manager.cc

@@ -61 +61 @@
         m_lua->register_enum( "EASING_SINE",    static_cast<int>( easing_type::SINE ) );
 
+        m_lua->register_enum( "CHOICE_ALL", static_cast<int>( model_node_choice::ALL ) );
+        m_lua->register_enum( "CHOICE_WEIGHTED", static_cast<int>( model_node_choice::WEIGHTED ) );
+        m_lua->register_enum( "CHOICE_PATTERN_CHECKER", static_cast<int>( model_node_choice::PATTERN_CHECKER ) );
+
         m_materials->initialize( lua );
         m_programs->initialize( lua );

trunk/src/engine/model_manager.cc

@@ -104 +104 @@
 
         node->force     = table.get_boolean( "force", false );
-        node->choice    = table.get_boolean( "choice", false );
+        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 );