Changeset 512 for trunk/src/engine

Timestamp:

08/03/16 20:55:13 (9 years ago)

Author:

epyon

Message:

• lua_math fixes
• flags part of model definition

Location:

trunk/src/engine

Files:

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

trunk/src/engine/default_resource_manager.cc

@@ -27 +27 @@
         m_lua = lua;
 
+        int below_already_registered;
         m_lua->register_enum( "RND_LINEAR",     static_cast<int>( random_dist::LINEAR ) );
         m_lua->register_enum( "RND_GAUSSIAN",   static_cast<int>( random_dist::GAUSSIAN ) );

trunk/src/engine/model_manager.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_math.hh"
+#include "nv/lua/lua_flags.hh"
 
 using namespace nv;
@@ -16 +17 @@
 
         model* gm = new model;
+        gm->flags  = table.get< flags<32> >( "flags" );
         gm->attach = table.get_string_hash_64( "attach" );
         gm->root.set_position( table.get<vec3>( "root_position", vec3() ) );