Changeset 45

Timestamp:

05/28/13 17:55:52 (12 years ago)

Author:

epyon

Message:

• temporary draw for context (and implementation)
• cleaned up warnings
• general cleanups

Location:

trunk

Files:

• nv/gl/gl_context.hh (modified) (1 diff)
• nv/gl/gl_device.hh (modified) (1 diff)
• nv/gl/gl_enum.hh (modified) (2 diffs)
• nv/interface/context.hh (modified) (2 diffs)
• nv/interface/device.hh (modified) (2 diffs)
• src/gl/gl_context.cc (modified) (1 diff)
• src/gl/gl_device.cc (modified) (2 diffs)
• src/gl/gl_enum.cc (modified) (1 diff)
• src/gl/texture_font.cc (modified) (1 diff)
• src/resource_manager.cc (modified) (1 diff)

trunk/nv/gl/gl_context.hh

@@ -22 +22 @@
                 gl_context();
                 virtual void clear( const clear_state& cs );
+                // temporary
+                virtual void draw( primitive prim, const render_state& rs, program* p, vertex_array* va, int count );
                 virtual const ivec4& get_viewport();
                 virtual void set_viewport( const ivec4& viewport );

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 ~gl_device();
         private:

trunk/nv/gl/gl_enum.hh

@@ -17 +17 @@
 #include <nv/interface/vertex_buffer.hh>
 #include <nv/interface/texture2d.hh>
+#include <nv/interface/context.hh>
 #include <nv/types.hh>
 
@@ -35 +36 @@
         unsigned int texture_filter_to_enum( texture2d_sampler::filter filter );
         unsigned int texture_wrap_to_enum( texture2d_sampler::wrap wrap );
+        unsigned int primitive_to_enum( primitive p );
 
         unsigned int type_to_gl_enum( type type );

trunk/nv/interface/context.hh

@@ -14 +14 @@
 
 #include <nv/common.hh>
+#include <nv/interface/program.hh>
+#include <nv/interface/vertex_buffer.hh>
 #include <nv/interface/clear_state.hh>
 #include <nv/interface/render_state.hh>
@@ -19 +21 @@
 namespace nv
 {
+        enum primitive
+        {
+                POINTS,
+                LINES,
+                LINE_LOOP,
+                LINE_STRIP,
+                TRIANGLES,
+                TRIANGLE_STRIP,
+                TRIANGLE_FAN
+        };
+
         class context
         {
         public:
                 virtual void clear( const clear_state& cs ) = 0;
+                // temporary
+                virtual void draw( primitive prim, const render_state& rs, program* p, vertex_array* va, int count ) = 0;
                 virtual void apply_render_state( const render_state& state ) = 0;
                 virtual const ivec4& get_viewport() = 0;

trunk/nv/interface/device.hh

@@ -16 +16 @@
 #include <nv/string.hh>
 #include <nv/interface/vertex_buffer.hh>
+#include <nv/interface/texture2d.hh>
 
 namespace nv
@@ -30 +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;
         };
 

trunk/src/gl/gl_context.cc

@@ -353 +353 @@
         force_apply_render_state( m_render_state );
 }
+
+void gl_context::draw( primitive prim, const render_state& rs, program* p, vertex_array* va, int count )
+{
+        apply_render_state( rs );
+        p->bind();
+        va->bind();
+        glDrawArrays( primitive_to_enum(prim), 0, count);
+        va->unbind();
+        p->unbind();
+}

trunk/src/gl/gl_device.cc

@@ -8 +8 @@
 #include "nv/gl/gl_program.hh"
 #include "nv/gl/gl_vertex_buffer.hh"
+#include "nv/gl/gl_texture2d.hh"
 #include "nv/logging.hh"
 #include "nv/lib/sdl12.hh"
@@ -66 +67 @@
 }
 
+texture2d* gl_device::create_texture2d( ivec2 size, texture2d::format aformat, texture2d::datatype adatatype, texture2d_sampler sampler, void* data /*= nullptr */ )
+{
+        return new gl_texture2d( size, aformat, adatatype, sampler, data );
+}
+
 gl_device::~gl_device()
 {
         SDL_Quit();
 }
-

trunk/src/gl/gl_enum.cc

@@ -181 +181 @@
 }
 
+unsigned int nv::primitive_to_enum( primitive p )
+{
+        switch( p )
+        {
+        case POINTS         : return GL_POINTS;
+        case LINES          : return GL_LINES;
+        case LINE_LOOP      : return GL_LINE_LOOP;
+        case LINE_STRIP     : return GL_LINE_STRIP;
+        case TRIANGLES      : return GL_TRIANGLES;
+        case TRIANGLE_STRIP : return GL_TRIANGLE_STRIP;
+        case TRIANGLE_FAN   : return GL_TRIANGLE_FAN;
+        default : return 0; // TODO: throw!
+        }
+}
 
 unsigned int nv::type_to_gl_enum( type type )

trunk/src/gl/texture_font.cc

@@ -55 +55 @@
 
     FT_Size_Metrics metrics = ((FT_Face)(m_rface))->size->metrics; 
-    m_ascender = (metrics.ascender >> 6) / 100.0;
-    m_descender = (metrics.descender >> 6) / 100.0;
-    m_height = (metrics.height >> 6) / 100.0;
-    m_linegap = m_height - m_ascender + m_descender; 
+    m_ascender  = (float)(metrics.ascender >> 6) / 100.0f;
+    m_descender = (float)(metrics.descender >> 6) / 100.0f;
+    m_height    = (float)(metrics.height >> 6) / 100.0f;
+    m_linegap   = m_height - m_ascender + m_descender; 
 }
 

trunk/src/resource_manager.cc

@@ -24 +24 @@
         if ( i != m_id_map.end() )
         {
-                return m_data[ i->second ];
+                return m_data[ (unsigned int)i->second ];
         }
         return resource::ptr();