Changeset 49 for trunk

Timestamp:

05/28/13 22:19:58 (12 years ago)

Author:

epyon

Message:

• renamings for easier typing

Location:

trunk

Files:

• nv/gl/gl_device.hh (modified) (1 diff)
• nv/gl/gl_enum.hh (modified) (1 diff)
• nv/gl/gl_texture2d.hh (modified) (1 diff)
• nv/interface/device.hh (modified) (1 diff)
• nv/interface/texture2d.hh (modified) (3 diffs)
• src/gl/gl_device.cc (modified) (1 diff)
• src/gl/gl_enum.cc (modified) (1 diff)
• src/gl/gl_texture2d.cc (modified) (2 diffs)
• tests/render_test/rl.cc (modified) (1 diff)

trunk/nv/gl/gl_device.hh

@@ -26 +26 @@
                 virtual index_buffer* create_index_buffer( buffer_hint hint, int size, void* source = nullptr );
                 virtual vertex_array* create_vertex_array();
-                virtual texture2d* create_texture2d( ivec2 size, texture2d::format aformat, texture2d::datatype adatatype, texture2d_sampler sampler, void* data = nullptr );
+                virtual texture2d* create_texture2d( ivec2 size, image_format aformat, type adatatype, sampler asampler, void* data = nullptr );
                 virtual ~gl_device();
         private:

trunk/nv/gl/gl_enum.hh

@@ -32 +32 @@
         unsigned int stencil_operation_to_enum( stencil_test_face::operation type );
         unsigned int buffer_hint_to_enum( buffer_hint hint );
-        unsigned int texture_format_to_enum( texture2d::format format );
-        unsigned int texture_datatype_to_enum( texture2d::datatype datatype );
-        unsigned int texture_filter_to_enum( texture2d_sampler::filter filter );
-        unsigned int texture_wrap_to_enum( texture2d_sampler::wrap wrap );
+        unsigned int image_format_to_enum( image_format format );
+        unsigned int sampler_filter_to_enum( sampler::filter filter );
+        unsigned int sampler_wrap_to_enum( sampler::wrap wrap );
         unsigned int primitive_to_enum( primitive p );
 

trunk/nv/gl/gl_texture2d.hh

@@ -22 +22 @@
         {
         public:
-                gl_texture2d( ivec2 size, format aformat, datatype adatatype, texture2d_sampler sampler, void* data = nullptr );
+                gl_texture2d( ivec2 size, image_format aformat, type adatatype, sampler asampler, void* data = nullptr );
                 virtual void assign( void* data );
                 virtual void bind( int slot = 0 );

trunk/nv/interface/device.hh

@@ -31 +31 @@
                 virtual index_buffer* create_index_buffer( buffer_hint hint, int size, void* source = nullptr ) = 0;
                 virtual vertex_array* create_vertex_array() = 0;
-                virtual texture2d* create_texture2d( ivec2 size, texture2d::format aformat, texture2d::datatype adatatype, texture2d_sampler sampler, void* data = nullptr ) = 0;
+                virtual texture2d* create_texture2d( ivec2 size, image_format aformat, type adatatype, sampler asampler, void* data = nullptr ) = 0;
         };
 

trunk/nv/interface/texture2d.hh

@@ -19 +19 @@
 {
 
-        struct texture2d_sampler
+        struct sampler
         {
                 enum filter
@@ -43 +43 @@
                 wrap wrap_t;
 
-                texture2d_sampler( filter min, filter max, wrap s, wrap t )
+                sampler( filter min, filter max, wrap s, wrap t )
                         : filter_min( min ), filter_max( max ), wrap_s( s ), wrap_t( t ) {}
-                texture2d_sampler( filter f, wrap w )
+                sampler( filter f, wrap w )
                         : filter_min( f ), filter_max( f ), wrap_s( w ), wrap_t( w ) {}
 
         };
 
+        enum image_format
+        {
+                RGB,
+                RGBA
+        };
 
         class texture2d
         {
         public:
-                enum format
-                {
-                        RGB,
-                        RGBA
-                };
 
-                enum datatype
-                {
-                        UINT,
-                        UBYTE,
-                        FLOAT
-                };
-                texture2d( ivec2 size, format aformat, datatype adatatype, texture2d_sampler asampler ) : 
+                texture2d( ivec2 size, image_format aformat, type adatatype, sampler asampler ) : 
                         m_size( size ), m_format( aformat ), m_datatype( adatatype ), m_sampler( asampler ) {}
                 virtual void assign( void* data ) = 0;
@@ -75 +69 @@
                 int get_width() const { return m_size.x; }
                 int get_height() const { return m_size.y; }
-                format get_format() const { return m_format; }
-                datatype get_datatype() const { return m_datatype; }
-                const texture2d_sampler& get_sampler() const { return m_sampler; }
+                image_format get_format() const { return m_format; }
+                type get_datatype() const { return m_datatype; }
+                const sampler& get_sampler() const { return m_sampler; }
         protected:
-                ivec2             m_size;
-                format            m_format;
-                datatype          m_datatype;
-                texture2d_sampler m_sampler;
+                ivec2        m_size;
+                image_format m_format;
+                type         m_datatype;
+                sampler      m_sampler;
         };
 

trunk/src/gl/gl_device.cc

@@ -67 +67 @@
 }
 
-texture2d* gl_device::create_texture2d( ivec2 size, texture2d::format aformat, texture2d::datatype adatatype, texture2d_sampler sampler, void* data /*= nullptr */ )
+texture2d* gl_device::create_texture2d( ivec2 size, image_format aformat, type adatatype, sampler asampler, void* data /*= nullptr */ )
 {
-        return new gl_texture2d( size, aformat, adatatype, sampler, data );
+        return new gl_texture2d( size, aformat, adatatype, asampler, data );
 }
 

trunk/src/gl/gl_enum.cc

@@ -134 +134 @@
 }
 
-unsigned int nv::texture_format_to_enum( texture2d::format format )
+unsigned int nv::image_format_to_enum( image_format format )
 {
         switch( format )
         {
-        case texture2d::RGB  : return GL_RGB;
-        case texture2d::RGBA : return GL_RGBA;
-        default : return 0; // TODO: throw!
-        }
-}
-
-unsigned int nv::texture_datatype_to_enum( texture2d::datatype datatype )
-{
-        switch( datatype )
-        {
-        case texture2d::UINT   : return GL_UNSIGNED_INT;
-        case texture2d::UBYTE  : return GL_UNSIGNED_BYTE;
-        case texture2d::FLOAT  : return GL_FLOAT;
-        default : return 0; // TODO: throw!
-        }
-}
-
-unsigned int nv::texture_filter_to_enum( texture2d_sampler::filter filter )
+        case RGB  : return GL_RGB;
+        case RGBA : return GL_RGBA;
+        default : return 0; // TODO: throw!
+        }
+}
+
+unsigned int nv::sampler_filter_to_enum( sampler::filter filter )
 {
         switch( filter )
         {
-        case texture2d_sampler::LINEAR                 : return GL_LINEAR;
-        case texture2d_sampler::NEAREST                : return GL_NEAREST;
-        case texture2d_sampler::NEAREST_MIPMAP_NEAREST : return GL_NEAREST_MIPMAP_NEAREST;
-        case texture2d_sampler::LINEAR_MIPMAP_NEAREST  : return GL_LINEAR_MIPMAP_NEAREST;
-        case texture2d_sampler::NEAREST_MIPMAP_LINEAR  : return GL_NEAREST_MIPMAP_LINEAR;
-        case texture2d_sampler::LINEAR_MIPMAP_LINEAR   : return GL_LINEAR_MIPMAP_LINEAR;
-        default : return 0; // TODO: throw!
-        }
-}
-
-unsigned int nv::texture_wrap_to_enum( texture2d_sampler::wrap wrap )
+        case sampler::LINEAR                 : return GL_LINEAR;
+        case sampler::NEAREST                : return GL_NEAREST;
+        case sampler::NEAREST_MIPMAP_NEAREST : return GL_NEAREST_MIPMAP_NEAREST;
+        case sampler::LINEAR_MIPMAP_NEAREST  : return GL_LINEAR_MIPMAP_NEAREST;
+        case sampler::NEAREST_MIPMAP_LINEAR  : return GL_NEAREST_MIPMAP_LINEAR;
+        case sampler::LINEAR_MIPMAP_LINEAR   : return GL_LINEAR_MIPMAP_LINEAR;
+        default : return 0; // TODO: throw!
+        }
+}
+
+unsigned int nv::sampler_wrap_to_enum( sampler::wrap wrap )
 {
         switch( wrap )
         {
-        case texture2d_sampler::CLAMP_TO_EDGE   : return GL_CLAMP_TO_EDGE;
-        case texture2d_sampler::CLAMP_TO_BORDER : return GL_CLAMP_TO_BORDER;
-        case texture2d_sampler::MIRRORED_REPEAT : return GL_MIRRORED_REPEAT;
-        case texture2d_sampler::REPEAT          : return GL_REPEAT;
+        case sampler::CLAMP_TO_EDGE   : return GL_CLAMP_TO_EDGE;
+        case sampler::CLAMP_TO_BORDER : return GL_CLAMP_TO_BORDER;
+        case sampler::MIRRORED_REPEAT : return GL_MIRRORED_REPEAT;
+        case sampler::REPEAT          : return GL_REPEAT;
         default : return 0; // TODO: throw!
         }

trunk/src/gl/gl_texture2d.cc

@@ -10 +10 @@
 using namespace nv;
 
-nv::gl_texture2d::gl_texture2d( ivec2 size, format aformat, datatype adatatype, texture2d_sampler sampler, void* data /*= nullptr */ )
-        : texture2d( size, aformat, adatatype, sampler ), m_name()
+nv::gl_texture2d::gl_texture2d( ivec2 size, image_format aformat, type adatatype, sampler asampler, void* data /*= nullptr */ )
+        : texture2d( size, aformat, adatatype, asampler ), m_name()
 {
         glBindTexture( GL_TEXTURE_2D, m_name.get_value() );
 
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, nv::texture_filter_to_enum( m_sampler.filter_min ) );
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, nv::texture_filter_to_enum( m_sampler.filter_max ) );
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, nv::texture_wrap_to_enum( m_sampler.wrap_s) );
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, nv::texture_wrap_to_enum( m_sampler.wrap_t) );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, nv::sampler_filter_to_enum( m_sampler.filter_min ) );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, nv::sampler_filter_to_enum( m_sampler.filter_max ) );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, nv::sampler_wrap_to_enum( m_sampler.wrap_s) );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, nv::sampler_wrap_to_enum( m_sampler.wrap_t) );
 
         glBindTexture( GL_TEXTURE_2D, 0 );
@@ -31 +31 @@
 {
         glBindTexture( GL_TEXTURE_2D, m_name.get_value() );
-        glTexImage2D( GL_TEXTURE_2D, 0, nv::texture_format_to_enum(m_format), m_size.x, m_size.y, 0, nv::texture_format_to_enum(m_format), nv::texture_datatype_to_enum(m_datatype), data );
+        glTexImage2D( GL_TEXTURE_2D, 0, nv::image_format_to_enum(m_format), m_size.x, m_size.y, 0, nv::image_format_to_enum(m_format), nv::type_to_gl_enum(m_datatype), data );
         glBindTexture( GL_TEXTURE_2D, 0 );
 }

trunk/tests/render_test/rl.cc

@@ -95 +95 @@
         SDL_Surface* texture = IMG_Load( "spritesheet.png" );
         nv::image sprites( glm::ivec2( texture->w, texture->h ), 4, (nv::uint8*)texture->pixels );
-        nv::texture2d_sampler sampler( nv::texture2d_sampler::NEAREST, nv::texture2d_sampler::REPEAT );
-        m_texture = m_device->create_texture2d( sprites.get_size(), nv::texture2d::RGBA, nv::texture2d::UBYTE, sampler, (void*)sprites.get_data() );
+        nv::sampler sampler( nv::sampler::NEAREST, nv::sampler::REPEAT );
+        m_texture = m_device->create_texture2d( sprites.get_size(), nv::RGBA, nv::UBYTE, sampler, (void*)sprites.get_data() );
 
         m_clear_state.buffers = nv::clear_state::COLOR_AND_DEPTH_BUFFER;