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

Introduction of VBO. Now only tracks are rendered in a very simple way.

This commit is contained in:
Maciej Suminski 2013-04-30 15:59:32 +02:00
parent 0cd108b55d
commit 191cb40e79
8 changed files with 483 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/CMakeLists.txt
View File

@ -20,6 +20,7 @@ set(GAL_SRCS
gal/color4d.cpp
gal/opengl/opengl_gal.cpp
gal/opengl/shader.cpp
gal/opengl/vbo_item.cpp
gal/cairo/cairo_gal.cpp
view/wx_view_controls.cpp
)

6
common/drawpanel_gal.cpp
View File

@ -65,9 +65,8 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
m_gal->ComputeWorldScreenMatrix();
m_painter = new KiGfx::PCB_PAINTER( m_gal );
m_painter->SetGAL( m_gal );
m_view = new KiGfx::VIEW( true );
m_view = new KiGfx::VIEW( true, true );
m_view->SetPainter( m_painter );
m_view->SetGAL( m_gal );
@ -157,9 +156,6 @@ void EDA_DRAW_PANEL_GAL::SwitchBackend( GalType aGalType, bool aUseShaders )
if( m_view )
m_view->SetGAL( m_gal );
if( m_painter )
m_painter->SetGAL( m_gal );
wxSize size = GetClientSize();
m_gal->ResizeScreen( size.GetX(), size.GetY() );
}

208
common/gal/opengl/opengl_gal.cpp
View File

@ -26,10 +26,14 @@
#include <gal/opengl/opengl_gal.h>
#include <gal/opengl/shader.h>
#include <gal/opengl/vbo_item.h>
#include <gal/definitions.h>
#include <wx/log.h>
#include <macros.h>
#ifdef __WXDEBUG__
#include <profile.h>
#endif /* __WXDEBUG__ */
#ifndef CALLBACK
#define CALLBACK
@ -68,6 +72,10 @@ OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,
shaderPath = "../../common/gal/opengl/shader/";
wxSize parentSize = aParent->GetSize();
isVboInitialized = false;
curVboItem = NULL;
vboSize = 0;
SetSize( parentSize );
screenSize.x = parentSize.x;
@ -116,6 +124,11 @@ OPENGL_GAL::~OPENGL_GAL()
deleteFrameBuffer( &frameBufferBackup, &depthBufferBackup, &textureBackup );
}
if( isVboInitialized )
{
deleteVertexBufferObjects();
}
delete glContext;
}
@ -214,6 +227,28 @@ void OPENGL_GAL::initFrameBuffers()
}
void OPENGL_GAL::initVertexBufferObjects()
{
// Generate buffers for vertices and indices
glGenBuffers( 1, &curVboVertId );
glGenBuffers( 1, &curVboIndId );
isVboInitialized = true;
}
void OPENGL_GAL::deleteVertexBufferObjects()
{
glBindBuffer( GL_ARRAY_BUFFER, 0 );
glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, 0 );
glDeleteBuffers( 1, &curVboVertId );
glDeleteBuffers( 1, &curVboIndId );
isVboInitialized = false;
}
void OPENGL_GAL::SaveScreen()
{
glBindFramebuffer( GL_DRAW_FRAMEBUFFER, frameBufferBackup );
@ -269,6 +304,15 @@ void OPENGL_GAL::initGlew()
exit( 1 );
}
// Vertex buffer have to be supported
if ( !GLEW_ARB_vertex_buffer_object )
{
wxLogError( wxT( "Vertex buffer objects are not supported!" ) );
exit( 1 );
}
initVertexBufferObjects();
// Compute the unit circles, used for speed up of the circle drawing
computeUnitCircle();
computeUnitSemiCircle();
@ -284,7 +328,7 @@ void OPENGL_GAL::BeginDrawing()
clientDC = new wxClientDC( this );
// Initialize GLEW & FBOs
// Initialize GLEW, FBOs & VBOs
if( !isGlewInitialized )
{
initGlew();
@ -359,6 +403,7 @@ void OPENGL_GAL::BeginDrawing()
SetFillColor( fillColor );
SetStrokeColor( strokeColor );
isDeleteSavedPixels = true;
vboNeedsUpdate = false;
}
@ -410,6 +455,13 @@ void OPENGL_GAL::blitMainTexture( bool aIsClearFrameBuffer )
void OPENGL_GAL::EndDrawing()
{
// If any of VBO items is dirty - recache everything
if( vboNeedsUpdate )
{
rebuildVbo();
vboNeedsUpdate = false;
}
// Draw the remaining contents, blit the main texture to the screen, swap the buffers
glFlush();
blitMainTexture( true );
@ -419,6 +471,65 @@ void OPENGL_GAL::EndDrawing()
}
void OPENGL_GAL::rebuildVbo()
{
/* FIXME should be done less naively, maybe sth like:
float *ptr = (float*)glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_WRITE_ARB);
if(ptr)
{
updateVertices(....);
glUnmapBufferARB(GL_ARRAY_BUFFER_ARB); // release pointer to mapping buffer
}*/
#ifdef __WXDEBUG__
prof_counter totalTime;
prof_start( &totalTime, false );
#endif /* __WXDEBUG__ */
// Buffers for storing cached items data
GLfloat* verticesBuffer = new GLfloat[VBO_ITEM::VertStride * vboSize];
GLuint* indicesBuffer = new GLuint[vboSize];
// Pointers for easier usage with memcpy
GLfloat* verticesBufferPtr = verticesBuffer;
GLuint* indicesBufferPtr = indicesBuffer;
// Fill out buffers with data
for( std::deque<VBO_ITEM*>::iterator vboItem = vboItems.begin();
vboItem != vboItems.end(); vboItem++ )
{
int size = (*vboItem)->GetSize();
memcpy( verticesBufferPtr, (*vboItem)->GetVertices(), size * VBO_ITEM::VertSize );
verticesBufferPtr += size * VBO_ITEM::VertStride;
memcpy( indicesBufferPtr, (*vboItem)->GetIndices(), size * VBO_ITEM::IndSize );
indicesBufferPtr += size * VBO_ITEM::IndStride;
}
deleteVertexBufferObjects();
initVertexBufferObjects();
glBindBuffer( GL_ARRAY_BUFFER, curVboVertId );
glBufferData( GL_ARRAY_BUFFER, vboSize * VBO_ITEM::VertSize, verticesBuffer, GL_DYNAMIC_DRAW );
glBindBuffer( GL_ARRAY_BUFFER, 0 );
glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, curVboIndId );
glBufferData( GL_ELEMENT_ARRAY_BUFFER, vboSize * VBO_ITEM::IndSize, indicesBuffer, GL_DYNAMIC_DRAW );
glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, 0 );
delete verticesBuffer;
delete indicesBuffer;
#ifdef __WXDEBUG__
prof_end( &totalTime );
wxLogDebug( wxT( "Rebuilding VBO::items %d / %.1f ms" ),
vboSize, (double) totalTime.value / 1000.0 );
#endif /* __WXDEBUG__ */
}
inline void OPENGL_GAL::selectShader( int aIndex )
{
if( currentShader != aIndex )
@ -528,6 +639,44 @@ void OPENGL_GAL::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndP
VECTOR2D startEndVector = aEndPoint - aStartPoint;
double lineAngle = atan2( startEndVector.y, startEndVector.x );
if ( isGroupStarted )
{
// Angle of a line perpendicular to the segment being drawn
double beta = ( M_PI / 2.0 ) - lineAngle;
VECTOR2D v0( aStartPoint.x - ( aWidth * cos( beta ) / 2.0 ),
aStartPoint.y + ( aWidth * sin( beta ) / 2.0 ) );
VECTOR2D v1( aStartPoint.x + ( aWidth * cos( beta ) / 2.0 ),
aStartPoint.y - ( aWidth * sin( beta ) / 2.0 ) );
VECTOR2D v2( aEndPoint.x + ( aWidth * cos( beta ) / 2.0 ),
aEndPoint.y - ( aWidth * sin( beta ) / 2.0 ) );
VECTOR2D v3( aEndPoint.x - ( aWidth * cos( beta ) / 2.0 ),
aEndPoint.y + ( aWidth * sin( beta ) / 2.0 ) );
// First triangle
GLfloat newVertex1[] = { v0.x, v0.y, layerDepth,
strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a };
GLfloat newVertex2[] = { v1.x, v1.y, layerDepth,
strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a };
GLfloat newVertex3[] = { v2.x, v2.y, layerDepth,
strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a };
// Second triangle
GLfloat newVertex4[] = { v0.x, v0.y, layerDepth,
strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a };
GLfloat newVertex5[] = { v2.x, v2.y, layerDepth,
strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a };
GLfloat newVertex6[] = { v3.x, v3.y, layerDepth,
strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a };
curVboItem->PushVertex( newVertex1 );
curVboItem->PushVertex( newVertex2 );
curVboItem->PushVertex( newVertex3 );
curVboItem->PushVertex( newVertex4 );
curVboItem->PushVertex( newVertex5 );
curVboItem->PushVertex( newVertex6 );
}
if( isFillEnabled )
{
glColor4d( fillColor.r, fillColor.g, fillColor.b, fillColor.a );
@ -713,6 +862,7 @@ void OPENGL_GAL::DrawPolyline( std::deque<VECTOR2D>& aPointList )
glEnd();
break;
}
case LINE_JOIN_BEVEL:
{
// We compute the edge points of the line segments at the joint
@ -741,6 +891,7 @@ void OPENGL_GAL::DrawPolyline( std::deque<VECTOR2D>& aPointList )
break;
}
case LINE_JOIN_MITER:
{
// Compute points of the outer edges
@ -1313,40 +1464,73 @@ void OPENGL_GAL::Restore()
}
// TODO Error handling
int OPENGL_GAL::BeginGroup()
{
isGroupStarted = true;
GLint displayList = glGenLists( 1 );
glNewList( displayList, GL_COMPILE );
displayListsGroup.push_back( displayList );
return (int) displayList;
// There is a new group that is not in VBO yet
vboNeedsUpdate = true;
// Save the pointer for usage with the current item
curVboItem = new VBO_ITEM;
curVboItem->SetOffset( vboSize );
vboItems.push_back( curVboItem );
return vboItems.size() - 1;
}
void OPENGL_GAL::EndGroup()
{
vboSize += curVboItem->GetSize();
// TODO this has to be removed in final version
rebuildVbo();
isGroupStarted = false;
glEndList();
glCallList( displayListsGroup.back() );
}
void OPENGL_GAL::DeleteGroup( int aGroupNumber )
{
std::deque<GLuint>::iterator it = displayListsGroup.begin();
std::deque<VBO_ITEM*>::iterator it = vboItems.begin();
std::advance( it, aGroupNumber );
displayListsGroup.erase( it );
delete *it;
vboItems.erase( it );
glDeleteLists( (GLint) aGroupNumber, 1 );
vboNeedsUpdate = true;
}
void OPENGL_GAL::DrawGroup( int aGroupNumber )
{
glCallList( (GLint) aGroupNumber );
std::deque<VBO_ITEM*>::iterator it = vboItems.begin();
std::advance( it, aGroupNumber );
// TODO Checking if we are using right VBOs, in other case do the binding.
// Right now there is only one VBO, so there is no problem.
glEnableClientState( GL_VERTEX_ARRAY );
glEnableClientState( GL_COLOR_ARRAY );
// Bind vertices data buffer and point to the data
glBindBuffer( GL_ARRAY_BUFFER, curVboVertId );
glVertexPointer( 3, GL_FLOAT, VBO_ITEM::VertSize, 0 );
glColorPointer( 4, GL_FLOAT, VBO_ITEM::VertSize, (GLvoid*) VBO_ITEM::ColorOffset );
glBindBuffer( GL_ARRAY_BUFFER, 0 );
// Bind indices data buffer
int size = (*it)->GetSize();
int offset = (*it)->GetOffset();
glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, curVboIndId );
glDrawRangeElements( GL_TRIANGLES, 0, vboSize - 1, size,
GL_UNSIGNED_INT, (GLvoid*) ( offset * VBO_ITEM::IndSize ) );
glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, 0 );
// Deactivate vertex array
glDisableClientState( GL_COLOR_ARRAY );
glDisableClientState( GL_VERTEX_ARRAY );
}

134
common/gal/opengl/vbo_item.cpp Normal file
View File

@ -0,0 +1,134 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file vbo_item.cpp
* @brief Class to handle an item held in a Vertex Buffer Object.
*/
#include <gal/opengl/vbo_item.h>
#include <cstring>
using namespace KiGfx;
VBO_ITEM::VBO_ITEM() :
m_vertices( NULL ),
m_indices( NULL ),
m_offset( 0 ),
m_size( 0 ),
m_isDirty( true )
{
}
VBO_ITEM::~VBO_ITEM()
{
if( m_vertices )
delete m_vertices;
}
void VBO_ITEM::PushVertex( const GLfloat* aVertex )
{
GLfloat* newVertices = new GLfloat[( m_size + 1 ) * VertStride];
GLuint* newIndices = new GLuint[( m_size + 1 ) * IndStride];
// Handle a new vertex
if( m_vertices )
{
// Copy all previous vertices data
memcpy( newVertices, m_vertices, ( m_size ) * VertSize );
delete m_vertices;
}
m_vertices = newVertices;
// Add the new vertex
memcpy( &newVertices[m_size * VertStride], aVertex, VertSize );
// Handle a new index
if( m_indices )
{
// Copy all previous vertices data
memcpy( newIndices, m_indices, ( m_size ) * IndSize );
delete m_indices;
}
m_indices = newIndices;
// Add the new vertex
newIndices[m_size] = m_offset + m_size;
m_size++;
m_isDirty = true;
}
void VBO_ITEM::PushVertices( const GLfloat* aVertex, GLuint aSize )
{
// FIXME to be done
m_isDirty = true;
}
GLfloat* VBO_ITEM::GetVertices() const
{
return m_vertices;
}
GLuint* VBO_ITEM::GetIndices() const
{
return m_indices;
}
int VBO_ITEM::GetSize() const
{
return m_size;
}
void VBO_ITEM::SetOffset( int aOffset )
{
m_offset = aOffset;
// TODO change offset for all the vertices?
}
int VBO_ITEM::GetOffset() const
{
return m_offset;
}
/*
// TODO
void SetVbo( int aVboId )
{
}
int GetVbo()
{
}
*/

3
common/view/view.cpp
View File

@ -205,6 +205,9 @@ void VIEW::SetGAL( GAL* aGal )
{
m_gal = aGal;
if( m_painter )
m_painter->SetGAL( m_gal );
// items need to be recached after changing GAL
if( m_useGroups )
recacheAllItems();

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

@ -55,6 +55,7 @@
namespace KiGfx
{
class SHADER;
class VBO_ITEM;
/**
* @brief Class OpenGL_GAL is the OpenGL implementation of the Graphics Abstraction Layer.
@ -88,7 +89,7 @@ public:
*/
OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener = NULL,
wxEvtHandler* aPaintListener = NULL, bool isUseShaders = false,
const wxString& aName = wxT("GLCanvas") );
const wxString& aName = wxT( "GLCanvas" ) );
virtual ~OPENGL_GAL();
@ -132,7 +133,7 @@ public:
// Screen methods
// --------------
/// @brief Resizes the canvas.
/// @brief Resizes the canvas.
virtual void ResizeScreen ( int aWidth, int aHeight );
/// @brief Shows/hides the GAL canvas
@ -335,19 +336,28 @@ private:
wxEvtHandler* paintListener;
// Display lists
GLuint displayListsArcs; ///< Arc display list
GLuint displayListCircle; ///< Circle display list
GLuint displayListSemiCircle; ///< Semi circle display list
std::deque<GLuint> displayListsGroup; ///< List of display lists used for groups
GLuint displayListsArcs; ///< Arc display list
GLuint displayListCircle; ///< Circle display list
GLuint displayListSemiCircle; ///< Semi circle display list
std::deque<GLuint> displayListsGroup; ///< List of display lists used for groups
double curvePoints[12]; ///< Coefficients for curves
std::deque<VECTOR2D> unitCirclePoints; ///< List of the points on a unit circle
// Vertex buffer objects related fields
std::deque<VBO_ITEM*> vboItems; ///< Stores informations about VBO objects
VBO_ITEM* curVboItem;
GLuint curVboVertId;
GLuint curVboIndId;
int vboSize;
bool vboNeedsUpdate;
double curvePoints[12]; ///< Coefficients for curves
std::deque<VECTOR2D> unitCirclePoints; ///< List of the points on a unit circle
// Polygon tesselation
GLUtesselator* tesselator; ///< Pointer to the tesselator
GLUtesselator* tesselator; ///< Pointer to the tesselator
// Shader
std::deque<SHADER> shaderList; ///< List of the shaders
std::deque<SHADER> shaderList; ///< List of the shaders
// Cursor
int cursorSize; ///< Size of the cursor in pixels
@ -368,6 +378,7 @@ private:
bool isCreated;
bool isGlewInitialized; ///< Is GLEW initialized?
bool isFrameBufferInitialized; ///< Are the frame buffers initialized?
bool isVboInitialized;
bool isShaderInitialized; ///< Was the shader initialized?
bool isShaderEnabled; ///< Are the shaders enabled?
bool isUseShader; ///< Should the shaders be used?
@ -457,6 +468,15 @@ private:
*/
void deleteFrameBuffer( GLuint* aFrameBuffer, GLuint* aDepthBuffer, GLuint* aTexture );
// TODO comment
void initVertexBufferObjects();
// TODO comment
void deleteVertexBufferObjects();
// TODO comment
void rebuildVbo();
/**
* @brief Draw a quad for the line.
*

114
include/gal/opengl/vbo_item.h Normal file
View File

@ -0,0 +1,114 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file vbo_item.h
* @brief Class to handle an item held in a Vertex Buffer Object.
*/
// TODO comments
#ifndef VBO_ITEM_H_
#define VBO_ITEM_H_
#include <GL/gl.h>
namespace KiGfx
{
class VBO_ITEM
{
public:
VBO_ITEM();
~VBO_ITEM();
// TODO comments
void PushVertex( const GLfloat* aVertex );
void PushVertices( const GLfloat* aVertex, GLuint aSize );
/**
* Function GetVertices()
* Returns a pointer to the array containing all vertices.
* @return Pointer to vertices packed in format {X, Y, Z, R, G, B, A}.
*/
GLfloat* GetVertices() const;
GLuint* GetIndices() const;
/**
* Function GetSize()
* Returns information about number of vertices stored.
* @param Amount of vertices.
*/
int GetSize() const;
/**
* Function SetOffset()
* Sets data offset in the VBO.
* @param aOffset is the offset expressed as a number of vertices.
*/
void SetOffset( int aOffset );
/**
* Function GetOffset()
* Returns data offset in the VBO.
* @return Data offset expressed as a number of vertices.
*/
int GetOffset() const;
///< Functions for getting VBO ids.
//void SetVbo( int aVboId );
//int GetVbo();
///< Data organization information for vertices.
static const int VertStride = 7;
static const int VertSize = VertStride * sizeof(GLfloat);
static const int IndStride = 1;
static const int IndSize = IndStride * sizeof(GLuint);
static const int ColorOffset = 3 * sizeof(GLfloat);
private:
///< VBO ids in which the item is stored.
//int m_vboId; // not used yet
///< Contains vertices coordinates and colors.
///< Packed by 7 floats for each vertex: {X, Y, Z, R, G, B, A}
GLfloat* m_vertices;
GLuint* m_indices;
///< Offset and size of data in VBO.
int m_offset;
int m_size;
///< Shader data used for rendering.
int m_shader;
int m_shaderAttrib;
///< Flag telling if the item should be recached in VBO or not.
bool m_isDirty;
};
} // namespace KiGfx
#endif /* VBO_ITEM_H_ */

8
pcbnew/basepcbframe.cpp
View File

@ -166,7 +166,7 @@ void PCB_BASE_FRAME::SetBoard( BOARD* aBoard )
// in order to be displayed
// Load zones
for( int i = 0; i < m_Pcb->GetAreaCount(); ++i )
/*for( int i = 0; i < m_Pcb->GetAreaCount(); ++i )
{
view->Add( (KiGfx::VIEW_ITEM*) ( m_Pcb->GetArea( i ) ) );
}
@ -175,7 +175,7 @@ void PCB_BASE_FRAME::SetBoard( BOARD* aBoard )
for( BOARD_ITEM* drawing = m_Pcb->m_Drawings; drawing; drawing = drawing->Next() )
{
view->Add( drawing );
}
}*/
// Load tracks
for( TRACK* track = m_Pcb->m_Track; track; track = track->Next() )
@ -184,7 +184,7 @@ void PCB_BASE_FRAME::SetBoard( BOARD* aBoard )
}
// Load modules and its additional elements
for( MODULE* module = m_Pcb->m_Modules; module; module = module->Next() )
/*for( MODULE* module = m_Pcb->m_Modules; module; module = module->Next() )
{
// Load module's pads
for( D_PAD* pad = module->Pads().GetFirst(); pad; pad = pad->Next() )
@ -208,7 +208,7 @@ void PCB_BASE_FRAME::SetBoard( BOARD* aBoard )
for( SEGZONE* zone = m_Pcb->m_Zone; zone; zone = zone->Next() )
{
view->Add( zone );
}
}*/
// Apply layer coloring scheme & display options
if( view->GetPainter() )