Changeset 511 for trunk

Timestamp:

07/28/16 20:31:39 (9 years ago)

Author:

epyon

Message:

• RTTI upgrades

Location:

trunk

Files:

• nv/core/random.hh (modified) (1 diff)
• nv/core/types.hh (modified) (3 diffs)
• nv/engine/default_resource_manager.hh (modified) (1 diff)
• nv/engine/model_manager.hh (modified) (1 diff)
• nv/lua/lua_state.hh (modified) (1 diff)
• src/lua/lua_state.cc (modified) (1 diff)

trunk/nv/core/random.hh

@@ -480 +480 @@
 }
 
+NV_RTTI_DECLARE( nv::random_dist )
+
 #endif // NV_CORE_RANDOM_HH

trunk/nv/core/types.hh

@@ -85 +85 @@
         {
                 shash64 name;
+                shash64 desc;
                 sint32  value;
         };
@@ -124 +125 @@
                 type_creator union_field( const string_view& aname, TFIELD TOBJECT::*field, const string_view& control_name, ENUM_VALUE control_value, typename enable_if< !is_container<TFIELD>::value, void* >::type = nullptr );
 
-                type_creator value( const string_view& aname, sint32 value );
+                type_creator value( const string_view& aname, sint32 value, const string_view& desc = string_view() );
         private:
                 type_database* m_database;
@@ -287 +288 @@
         }
 
-        inline type_creator type_creator::value( const string_view& aname, sint32 value )
+        inline type_creator type_creator::value( const string_view& aname, sint32 value, const string_view& desc )
         {
                 NV_ASSERT( m_entry->field_list.empty(), "Type cannot have both enums and fields!" );
                 type_enum e;
                 e.name = m_database->m_names.insert( aname );
+                if ( !desc.empty() )
+                        e.desc = m_database->m_names.insert( desc );
                 e.value = value;
                 m_entry->enum_list.push_back( e );

trunk/nv/engine/default_resource_manager.hh

@@ -55 +55 @@
                         return m_mesh_datas->resolve( h );
                 }
+                lua::state* get_lua() { return m_lua; }
+                const type_database* get_type_db() { return m_lua->get_type_data()->get_type_database(); }
 
                 void reload_data();

trunk/nv/engine/model_manager.hh

@@ -95 +95 @@
         };
 
+        NV_RTTI_DECLARE_NAME( model_node_choice, "random_dist" )
         NV_RTTI_DECLARE_NAME( model, "model" )
 

trunk/nv/lua/lua_state.hh

@@ -262 +262 @@
                         void unregister_object( ref object_index );
 
+                        template <typename E>
+                        void register_enum()
+                        {
+                                register_enum( m_lua_types->get_type_database()->get_type<E>() );
+                        }
+                        void register_enum( const type_entry* type );
                         void register_enum( string_view name, int value );
                         void register_singleton( string_view name, void* o );

trunk/src/lua/lua_state.cc

@@ -750 +750 @@
 }
 
+void nv::lua::state::register_enum( const type_entry* type )
+{
+        NV_ASSERT_ALWAYS( type, "type not found!" );
+        NV_ASSERT_ALWAYS( !type->enum_list.empty(), "type not enum!" );
+        type_database* db = type->type_db;
+        for ( auto e : type->enum_list )
+        {
+                lua_pushinteger( m_state, e.value );
+                lua_setglobal( m_state, db->resolve_name( e.name ).data() );
+        }
+}
+
 void nv::lua::state::register_rtti_type( thash64 tid, lua_rtti_push_function p, lua_rtti_read_function r )
 {