Changeset 228 for trunk

Timestamp:

02/04/14 03:50:28 (11 years ago)

Author:

epyon

Message:

• various untracked changes

Location:

trunk

Files:

• nv/formats/md2_loader.hh (modified) (1 diff)
• nv/formats/md3_loader.hh (modified) (1 diff)
• nv/formats/md5_loader.hh (modified) (1 diff)
• nv/gfx/image.hh (modified) (2 diffs)
• nv/gl/gl_device.hh (modified) (1 diff)
• nv/gl/gl_window.hh (modified) (1 diff)
• nv/interface/device.hh (modified) (1 diff)
• nv/lua/lua_state.hh (modified) (2 diffs)
• nv/lua/lua_values.hh (modified) (2 diffs)
• nv/random.hh (modified) (1 diff)
• src/gfx/image.cc (modified) (2 diffs)
• src/gl/gl_device.cc (modified) (1 diff)
• src/gl/gl_window.cc (modified) (1 diff)
• src/lua/lua_map_tile.cc (modified) (1 diff)
• src/lua/lua_state.cc (modified) (1 diff)

trunk/nv/formats/md2_loader.hh

@@ -14 +14 @@
 #define NV_MD2_LOADER_HH
 
+#include <nv/common.hh>
 #include <unordered_map>
 #include <vector>
-#include <nv/common.hh>
 #include <nv/interface/mesh_loader.hh>
 

trunk/nv/formats/md3_loader.hh

@@ -14 +14 @@
 #define NV_MD3_LOADER_HH
 
+#include <nv/common.hh>
 #include <unordered_map>
 #include <vector>
-#include <nv/common.hh>
 #include <nv/gfx/mesh_data.hh>
 #include <nv/interface/mesh_loader.hh>

trunk/nv/formats/md5_loader.hh

@@ -14 +14 @@
 #define NV_MD5_LOADER_HH
 
+#include <nv/common.hh>
 #include <unordered_map>
 #include <vector>
-#include <nv/common.hh>
 #include <nv/interface/mesh_loader.hh>
 

trunk/nv/gfx/image.hh

@@ -69 +69 @@
                 void fill( uint8 value );
                 /**
+                 * Fills the region with a given value.
+                 *
+                 * @arg[in] r : Region to be filled.
+                 * @arg[in] value : Value to fill.
+                 */
+                void fill( region r, uint8 value, int stride = 0 );
+                /**
                  * Just like fill, but a region can be specified.
                  *
@@ -76 +83 @@
                  */
                 void set_region( region r, const uint8 * data, int stride = 0 );
+
+                /**
+                 * Just like fill, but a region can be specified. Checks for data depth,
+                 * and converts if needed.
+                 *
+                 * @arg[in] r : Region to be filled.
+                 * @arg[in] data : Data to fill the region
+                 */
+                void set_region( region r, const image_data* idata );
+
                 /**
                  * Default destructor. Deallocates data.

trunk/nv/gl/gl_device.hh

@@ -21 +21 @@
         public:
                 gl_device();
-                virtual window* create_window( uint16 width, uint16 height );
+                virtual window* create_window( uint16 width, uint16 height, bool fullscreen );
                 virtual program* create_program( const string& vs_source, const string& fs_source );
                 virtual vertex_buffer* create_vertex_buffer( buffer_hint hint, size_t size, const void* source = nullptr );

trunk/nv/gl/gl_window.hh

@@ -22 +22 @@
         {
         public:
-                gl_window( device* dev, uint16 width, uint16 height );
+                gl_window( device* dev, uint16 width, uint16 height, bool fullscreen = false );
                 uint16 get_width() const;
                 uint16 get_height() const;

trunk/nv/interface/device.hh

@@ -28 +28 @@
         {
         public:
-                virtual window* create_window( uint16 width, uint16 height ) = 0;
+                virtual window* create_window( uint16 width, uint16 height, bool fullscreen ) = 0;
                 virtual program* create_program( const string& vs_source, const string& fs_source ) = 0;
                 virtual vertex_buffer* create_vertex_buffer( buffer_hint hint, size_t size, const void* source = nullptr ) = 0;

trunk/nv/lua/lua_state.hh

@@ -12 +12 @@
 #define NV_LUA_HH
 
+#include <nv/common.hh>
 #include <istream>
 #include <map>
-#include <nv/common.hh>
 #include <nv/flags.hh>
 #include <nv/types.hh>
@@ -141 +141 @@
                                 register_native_function( detail::function_wrapper< F, f >, name );
                         }
+
+                        template < typename C, typename F, F* f > 
+                        void register_function( const char* name )
+                        {
+                                register_native_function( detail::object_method_wrapper< C, F, f >, name );
+                        }
+
                 protected:
                         bool is_defined( const path& p, bool global );

trunk/nv/lua/lua_values.hh

@@ -221 +221 @@
                         {
                                 typedef typename type_degrade<T>::type degraded;
-                                p = pass_traits<degraded>::to( L, -1 );
+                                p = (T)pass_traits<degraded>::to( L, -1 );
                                 detail::pop_and_discard(L, 1);
                         }
@@ -229 +229 @@
                                 typedef typename type_degrade<T>::type degraded;
                                 T ret;
-                                ret = pass_traits<degraded>::to( L, -1 );
+                                ret = (T)pass_traits<degraded>::to( L, -1 );
                                 detail::pop_and_discard(L, 1);
                                 return ret;

trunk/nv/random.hh

@@ -8 +8 @@
 #define NV_RANDOM_HH
 
+#include <nv/common.hh>
 #include <random>
-#include <nv/common.hh>
 #include <nv/math.hh>
 

trunk/src/gfx/image.cc

@@ -48 +48 @@
 }
 
+void image::fill( region r, uint8 value, int stride )
+{
+        if ( stride == 0 ) stride = r.size.x * static_cast<sint32>( m_depth );
+
+        sint32 bpos  = (r.pos.y*m_size.x + r.pos.x ) * static_cast<sint32>( m_depth );
+        sint32 bline = m_size.x*static_cast<sint32>( m_depth );
+
+        for( int i = 0; i < r.size.y; ++i )
+        {
+                // TODO: test 
+                std::fill( m_data + bpos + bline * i, m_data + bpos + bline * i + stride, value );
+        }
+}
+
+
 void image::set_region( region r, const uint8 * data, int stride )
 {
@@ -64 +79 @@
 }
 
+void image::set_region( region r, const image_data* idata )
+{
+        if ( idata->get_depth() == m_depth )
+        {
+                set_region( r, idata->get_data() );
+                return;
+        }
+
+        fill( r, 255 );
+
+        sint32 bpos       = (r.pos.y*m_size.x + r.pos.x ) * static_cast<sint32>( m_depth );
+        sint32 bline      = m_size.x*static_cast<sint32>( m_depth );
+
+        const uint8* data = idata->get_data();
+        sint32 depth      = idata->get_depth();
+        sint32 dstride    = r.size.x * static_cast<sint32>( depth );
+
+        for( int y = 0; y < r.size.y; ++y )
+        {
+                sint32 pos = bpos + bline * y;
+                for( int x = 0; x < r.size.x; ++x )
+                {
+                        sint32 xy = pos + x * m_depth;
+                        for( int e = 0; e < depth; ++e )
+                        {
+                                m_data[ xy + e ] = data[ y*dstride + x * depth + e ];
+                        }
+                }
+        }
+}
+
+
 image::~image()
 {

trunk/src/gl/gl_device.cc

@@ -15 +15 @@
 using namespace nv;
 
-window* gl_device::create_window( uint16 width, uint16 height )
+window* gl_device::create_window( uint16 width, uint16 height, bool fullscreen )
 {
-        return new gl_window( this, width, height );
+        return new gl_window( this, width, height, fullscreen );
 }
 

trunk/src/gl/gl_window.cc

@@ -203 +203 @@
 
 
-gl_window::gl_window( device* dev, uint16 width, uint16 height )
+gl_window::gl_window( device* dev, uint16 width, uint16 height, bool fullscreen )
         : m_device( dev ), m_width( width ), m_height( height ), m_title("NV Engine"), m_handle( nullptr )
 {
 #if NV_SDL_VERSION == NV_SDL_12
         uint32 flags = SDL_OPENGL;
+        if (fullscreen) flags |= SDL_FULLSCREEN;
         m_handle = SDL_SetVideoMode( width, height, 32, flags );
 #elif NV_SDL_VERSION == NV_SDL_20
         uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN;
+        if (fullscreen) flags |= SDL_FULLSCREEN;
         m_handle = SDL_CreateWindow("Nova Engine", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
                 width, height, flags );

trunk/src/lua/lua_map_tile.cc

@@ -130 +130 @@
                 {
                         nv::uint8 c = tile->data[ y * tile->size_x + x ];
-                        if ( c != 0 ) area->set_cell( coord + nv::ivec2( x, y ), tile->data[ y * tile->size_x + x ] );
+                        if ( c != 0 ) area->set_cell( coord + nv::ivec2( x, y ), c );
                 }
 

trunk/src/lua/lua_state.cc

@@ -234 +234 @@
                 for(; lib->func != NULL; lib++)
                 {
-                        lib->func( m_state );
+                        lua_pushcfunction( m_state, lib->func );
+                        lua_call(m_state, 0, 1);
+                        lua_setglobal( m_state, lib->name );
                 }
                 register_nova( this );