Changeset 21

Timestamp:

05/16/13 00:56:40 (12 years ago)

Author:

epyon

Message:

• bugfixes
• missing files added

Location:

trunk

Files:

• nv/gl/image.hh (modified) (1 diff)
• nv/gl/texture_font.hh (added)
• nv/lib/gl.hh (modified) (3 diffs)
• src/gl/image.cc (modified) (2 diffs)
• src/gl/texture_font.cc (added)
• src/lib/gl.cc (modified) (2 diffs)

trunk/nv/gl/image.hh

@@ -26 +26 @@
         public:
                 image( glm::ivec2 size, size_t depth );
+                image( glm::ivec2 size, size_t depth, const uint8 * data, bool reversed = false );
                 void clear();
                 void fill( uint8 value );

trunk/nv/lib/gl.hh

@@ -162 +162 @@
 #define GL_MAX_VIEWPORT_DIMS 0x0D3A
 #define GL_SUBPIXEL_BITS 0x0D50
+#define GL_TEXTURE_2D 0x0DE1
 #define GL_POLYGON_OFFSET_UNITS 0x2A00
 #define GL_POLYGON_OFFSET_POINT 0x2A01
@@ -501 +502 @@
 NV_GL_FUN( void , glScissor , ( GLint , GLint , GLsizei , GLsizei ) );
 NV_GL_FUN( void , glTexParameterf , ( GLenum , GLenum , GLfloat ) );
-NV_GL_FUN( void , glTexParameterfv , ( GLenum , GLenum , const GLint *) );
-NV_GL_FUN( void , glTexParameteri , ( GLenum , GLenum , GLfloat ) );
+NV_GL_FUN( void , glTexParameterfv , ( GLenum , GLenum , const GLfloat *) );
+NV_GL_FUN( void , glTexParameteri , ( GLenum , GLenum , GLint ) );
 NV_GL_FUN( void , glTexParameteriv , ( GLenum , GLenum , const GLint *) );
 NV_GL_FUN( void , glTexImage1D , ( GLenum , GLint , GLint , GLsizei , GLint , GLenum , GLenum , const GLvoid *) );
@@ -551 +552 @@
 NV_GL_FUN( void , glTexSubImage1D , ( GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *) );
 NV_GL_FUN( void , glTexSubImage2D , ( GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *) );
-NV_GL_FUN( void , glBindTexture , ( GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *) );
+NV_GL_FUN( void , glBindTexture , ( GLenum , GLuint ) );
 NV_GL_FUN( void , glDeleteTextures , ( GLsizei , const GLuint *) );
 NV_GL_FUN( void , glGenTextures , ( GLsizei , GLuint *) );

trunk/src/gl/image.cc

@@ -13 +13 @@
 {
         m_data = new uint8[ m_size.x * m_size.y * m_depth ];
+}
+
+image::image( glm::ivec2 size, size_t depth, const uint8 * data, bool reversed )
+        : m_size( size ), m_depth( depth ), m_data( nullptr )
+{
+        m_data = new uint8[ m_size.x * m_size.y * m_depth ];
+
+        if ( reversed )
+        {
+                for( size_t i = 0; i < size.y; ++i )
+                {
+                        memcpy( m_data + size.x * ( size.y - i - 1) * m_depth, data + i * size.x * m_depth, m_size.x * m_depth );
+                }
+
+        }
+        else 
+        {
+                memcpy( m_data, data, m_size.x * m_size.y * m_depth );
+        }
 }
 
@@ -36 +55 @@
 }
 
+

trunk/src/lib/gl.cc

@@ -25 +25 @@
 void (NV_GL_APIENTRY *glScissor) ( GLint , GLint , GLsizei , GLsizei ) = nullptr;
 void (NV_GL_APIENTRY *glTexParameterf) ( GLenum , GLenum , GLfloat ) = nullptr;
-void (NV_GL_APIENTRY *glTexParameterfv) ( GLenum , GLenum , const GLint *) = nullptr;
-void (NV_GL_APIENTRY *glTexParameteri) ( GLenum , GLenum , GLfloat ) = nullptr;
+void (NV_GL_APIENTRY *glTexParameterfv) ( GLenum , GLenum , const GLfloat *) = nullptr;
+void (NV_GL_APIENTRY *glTexParameteri) ( GLenum , GLenum , GLint ) = nullptr;
 void (NV_GL_APIENTRY *glTexParameteriv) ( GLenum , GLenum , const GLint *) = nullptr;
 void (NV_GL_APIENTRY *glTexImage1D) ( GLenum , GLint , GLint , GLsizei , GLint , GLenum , GLenum , const GLvoid *) = nullptr;
@@ -75 +75 @@
 void (NV_GL_APIENTRY *glTexSubImage1D) ( GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *) = nullptr;
 void (NV_GL_APIENTRY *glTexSubImage2D) ( GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *) = nullptr;
-void (NV_GL_APIENTRY *glBindTexture) ( GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *) = nullptr;
+void (NV_GL_APIENTRY *glBindTexture) ( GLenum , GLuint ) = nullptr;
 void (NV_GL_APIENTRY *glDeleteTextures) ( GLsizei , const GLuint *) = nullptr;
 void (NV_GL_APIENTRY *glGenTextures) ( GLsizei , GLuint *) = nullptr;