Changeset 233

Timestamp:

05/12/14 16:49:24 (11 years ago)

Author:

epyon

Message:

• polygon_mode added to context and gl context implementation

Location:

trunk

Files:

• nv/gl/gl_context.hh (modified) (1 diff)
• nv/gl/gl_enum.hh (modified) (1 diff)
• nv/interface/render_state.hh (modified) (2 diffs)
• src/gl/gl_context.cc (modified) (3 diffs)
• src/gl/gl_enum.cc (modified) (1 diff)

trunk/nv/gl/gl_context.hh

@@ -40 +40 @@
                 void apply_blending( const blending& blend );
                 void apply_culling( const culling& cull );
+                void apply_polygon_mode( const polygon_mode& mode );
                 void enable( unsigned int what, bool value );
 

trunk/nv/gl/gl_enum.hh

@@ -25 +25 @@
         unsigned int clear_state_buffers_to_mask( clear_state::buffers_type type );
         unsigned int depth_state_function_to_enum( depth_test::function_type type );
+        unsigned int polygon_mode_fill_to_enum( polygon_mode::fill_type type );
         unsigned int blending_factor_to_enum( blending::factor type );
         unsigned int blending_equation_to_enum( blending::equation type );

trunk/nv/interface/render_state.hh

@@ -39 +39 @@
 
                 depth_test() : enabled( true ), function( LESS ) {}
+        };
+
+        struct polygon_mode
+        {
+                enum fill_type
+                {
+                        POINT,
+                        LINE,
+                        FILL
+                };
+
+                fill_type fill;
+
+                polygon_mode() : fill( FILL ) {}
         };
 
@@ -183 +197 @@
                 nv::culling      culling;
                 nv::color_mask   color_mask;
+                nv::polygon_mode polygon_mode;
                 bool depth_mask;
         };

trunk/src/gl/gl_context.cc

@@ -171 +171 @@
 }
 
+void gl_context::apply_polygon_mode( const polygon_mode& mode )
+{
+        if ( m_render_state.polygon_mode.fill != mode.fill )
+        {
+                glPolygonMode( GL_FRONT_AND_BACK, polygon_mode_fill_to_enum( mode.fill ) );
+                m_render_state.polygon_mode.fill = mode.fill;
+        }
+}
+
+
 void gl_context::apply_depth_range( const depth_range& range )
 {
@@ -316 +326 @@
                 state.color_mask.blue, state.color_mask.alpha 
         );
+        glPolygonMode( GL_FRONT_AND_BACK, polygon_mode_fill_to_enum( state.polygon_mode.fill ) );
 }
 
@@ -347 +358 @@
         apply_color_mask( state.color_mask );
         apply_depth_mask( state.depth_mask );
+        apply_polygon_mode( state.polygon_mode );
 }
 

trunk/src/gl/gl_enum.cc

@@ -33 +33 @@
         }
 }
+
+unsigned int nv::polygon_mode_fill_to_enum( polygon_mode::fill_type type )
+{
+        switch( type )
+        {
+        case polygon_mode::FILL           : return GL_FILL;
+        case polygon_mode::LINE           : return GL_LINE;
+        case polygon_mode::POINT          : return GL_POINT;
+        NV_RETURN_COVERED_DEFAULT( 0 );
+        }
+}
+
+
 
 unsigned int nv::blending_factor_to_enum( blending::factor type )