Changeset 316 for trunk

Timestamp:

08/20/14 12:50:51 (11 years ago)

Author:

epyon

Message:

• engine category
• resource system beginnings
• early effects system
• plenty minor changes

Location:

trunk

Files:

• nv/engine (added)
• nv/engine/program_manager.hh (added)
• nv/engine/resource_system.hh (added)
• nv/gl/gl_device.hh (modified) (2 diffs)
• nv/gl/gl_enum.hh (modified) (1 diff)
• nv/interface/device.hh (modified) (1 diff)
• nv/interface/uniform.hh (modified) (2 diffs)
• nv/lua/lua_nova.hh (modified) (1 diff)
• src/engine (added)
• src/engine/program_manager.cc (added)
• src/engine/resource_system.cc (added)
• src/gl/gl_device.cc (modified) (1 diff)
• src/gl/gl_enum.cc (modified) (1 diff)
• src/lua/lua_nova.cc (modified) (2 diffs)

trunk/nv/gl/gl_device.hh

@@ -58 +58 @@
                 virtual int get_attribute_location( program p, const string& name, bool fatal = true ) const;
                 virtual void prepare_program( program p );
+                virtual const string& get_shader_header() const { return m_shader_header; }
                 virtual ~gl_device();
         protected:
@@ -69 +70 @@
                 void load_uniforms( gl_program_info* p );
                 bool compile( uint32 sh_type, const std::string& shader_code, unsigned& glid );
-
+                std::string m_shader_header;
                 const void* m_info;
                 entity_store< gl_texture_info, texture >         m_textures;

trunk/nv/gl/gl_enum.hh

@@ -41 +41 @@
         unsigned int datatype_to_gl_enum( datatype type );
         datatype gl_enum_to_datatype( unsigned int gl_enum );
+        std::string datatype_to_glsl_type( datatype type );
 
 } // namespace nv

trunk/nv/interface/device.hh

@@ -144 +144 @@
                 virtual uint32 get_ticks() = 0;
                 virtual void delay( uint32 ms ) = 0;
+                virtual const string& get_shader_header() const = 0;
 
                 virtual texture create_texture( image_data* data, sampler asampler ) 

trunk/nv/interface/uniform.hh

@@ -114 +114 @@
         public:
                 virtual engine_uniform_base* create( uniform_base* ) = 0;
+                virtual datatype get_datatype() const = 0;
                 virtual ~engine_uniform_factory_base() {}
         };
@@ -125 +126 @@
                         return new T( u );
                 }
+                virtual datatype get_datatype() const { return type_to_enum<typename T::value_type>::type; }
         };
 

trunk/nv/lua/lua_nova.hh

@@ -13 +13 @@
         namespace lua
         {
+                void register_storage( state* a_state, const string& name, const string& constructor_name );
                 void register_nova( state* a_state );
         }

trunk/src/gl/gl_device.cc

@@ -47 +47 @@
 #endif
 
+        m_shader_header  = "#version 120\n";
+        for ( auto& i : get_uniform_factory() ) 
+                m_shader_header += "uniform "+datatype_to_glsl_type( i.second->get_datatype() )+" "+i.first+";\n";
+        for ( auto& i : get_link_uniform_factory() ) 
+                m_shader_header += "uniform sampler2D "+i.first+";\n";
 }
 

trunk/src/gl/gl_enum.cc

@@ -277 +277 @@
         }
 }
+
+std::string nv::datatype_to_glsl_type( datatype type )
+{
+        switch( type )
+        {
+        case INT            : return "int";
+        case FLOAT          : return "float";
+        case FLOAT_VECTOR_2 : return "vec2";
+        case FLOAT_VECTOR_3 : return "vec3";
+        case FLOAT_VECTOR_4 : return "vec4";
+        case FLOAT_MATRIX_2 : return "mat2";
+        case FLOAT_MATRIX_3 : return "mat3";
+        case FLOAT_MATRIX_4 : return "mat4";
+        case INT_VECTOR_2   : return "ivec2";
+        case INT_VECTOR_3   : return "ivec3";
+        case INT_VECTOR_4   : return "ivec4";
+        default : return "error";
+        }
+}

trunk/src/lua/lua_nova.cc

@@ -680 +680 @@
         lua_rawget( L, -2 );
 
-        if ( !lua_isnil( L, -1 ) ) luaL_error( L, "lua.nova - storage \"%s\" already registered!", lua_tolstring( L, lua_upvalueindex(1), 0 ) );
+        if ( !lua_isnil( L, -1 ) ) luaL_error( L, "lua.nova - storage \"%s\" already registered!", lua_tolstring( L, 1, 0 ) );
 
         lua_newtable( L ); // g t
@@ -805 +805 @@
         lua_settop( L, stack );
 }
+
+void nv::lua::register_storage( state* a_state, const string& name, const string& constructor_name )
+{
+        // TODO: error checking
+        lua_State* L = a_state->get_raw();
+        int stack = lua_gettop( L );
+        // TODO: check if nova is loaded
+        lua_pushcfunction( L, nova_register_storage );
+        lua_pushstring( L, name.c_str() );
+        lua_call( L, 1, 1 );
+        lua_setglobal( L, constructor_name.c_str() );
+        lua_settop( L, stack );
+}