haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed OpenGL different drawing modes, as they were not used. 

Removed DRAW_MODE_NORMAL, DRAW_MODE_PREPARE_EDGES, DRAW_MODE_DRAW_EDGES modes.
This commit is contained in:
Maciej Suminski 2013-04-10 09:09:48 +02:00
parent 5fda7bf32f
commit ccd2ebefd3
1 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
include/gal/opengl/opengl_gal.h
View File

@ -67,13 +67,6 @@ class OPENGL_GAL : public GAL, public wxGLCanvas
{ {
public: public:
/// Current drawing mode
enum DrawMode {
DRAW_MODE_NORMAL, ///< Normal drawing mode
DRAW_MODE_PREPARE_EDGES, ///< Prepare the object edges
DRAW_MODE_DRAW_EDGES ///< Draw anti-aliased object edges
};
/** /**
* @brief Constructor OPENGL_GAL * @brief Constructor OPENGL_GAL
* *
@ -311,58 +304,11 @@ public:
paintListener = aPaintListener; paintListener = aPaintListener;
} }
// Special methods for OpenGL only
void SetDrawMode( DrawMode aDrawMode )
{
m_drawMode = aDrawMode;
switch( aDrawMode )
{
case DRAW_MODE_NORMAL:
glColorMask( true, true, true, true );
glEnable( GL_DEPTH_TEST );
glDepthFunc( GL_LESS );
break;
case DRAW_MODE_PREPARE_EDGES:
// We just manipulate the Z-buffer in this mode
glColorMask( false, false, false, false );
glEnable( GL_DEPTH_TEST );
glDepthFunc( GL_LESS );
// Shift the depth of the edge points a very small value deeper
// this way we prevent that overlapping edge points are not drawn twice
// and brighter, if we have used transparency.
glTranslated( 0, 0, (depthRange.y - depthRange.x) * DEPTH_ADJUST_FACTOR );
break;
case DRAW_MODE_DRAW_EDGES:
glColorMask( true, true, true, true );
glEnable( GL_DEPTH_TEST );
glDepthFunc( GL_LESS );
// Restore the shifted position
glTranslated( 0, 0, -(depthRange.y - depthRange.x) * DEPTH_ADJUST_FACTOR );
break;
default:
break;
}
}
void SetShaderPath( const std::string& aPath ) void SetShaderPath( const std::string& aPath )
{ {
shaderPath = aPath; shaderPath = aPath;
} }
/**
* @brief Get the current drawing mode.
*
* @return the current drawing mode.
*/
DrawMode GetDrawMode()
{
return m_drawMode;
}
protected: protected:
virtual void DrawGridLine( VECTOR2D aStartPoint, VECTOR2D aEndPoint ); virtual void DrawGridLine( VECTOR2D aStartPoint, VECTOR2D aEndPoint );
@ -370,8 +316,6 @@ private:
/// Super class definition /// Super class definition
typedef GAL super; typedef GAL super;
DrawMode m_drawMode; ///< Current drawing mode
static const int CIRCLE_POINTS = 64; ///< The number of points for circle approximation static const int CIRCLE_POINTS = 64; ///< The number of points for circle approximation
static const int CURVE_POINTS = 32; ///< The number of points for curve approximation static const int CURVE_POINTS = 32; ///< The number of points for curve approximation
static const int SHADER_NUMBER = 2; ///< Number of the used shaders static const int SHADER_NUMBER = 2; ///< Number of the used shaders