Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove a few warnings, fix GLInstancingRenderer::drawLines

Browse Source
This commit is contained in:
=
2014-07-29 11:08:09 -07:00
parent c487170196
commit cac50c1a8e
5 changed files with 87 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
btgui/OpenGLWindow/SimpleOpenGL3App.h
View File

@@ -5,6 +5,25 @@
#include "OpenGLWindow/GLPrimitiveRenderer.h"
#include "OpenGLWindow/b3gWindowInterface.h"
struct DrawGridData
{
int gridSize;
float upOffset;
int upAxis;
float gridColor[4];
DrawGridData()
:gridSize(10),
upOffset(0.001f),
upAxis(1)
{
gridColor[0] = 0.6f;
gridColor[1] = 0.6f;
gridColor[2] = 0.6f;
gridColor[3] = 1.f;
}
};
struct SimpleOpenGL3App
{
struct SimpleInternalData* m_data;
@@ -15,11 +34,11 @@ struct SimpleOpenGL3App
SimpleOpenGL3App(const char* title, int width,int height);
virtual ~SimpleOpenGL3App();
int registerCubeShape(float halfExtentsX=1.f,float halfExtentsY=1.f, float halfExtentsZ = 1.f);
int registerGraphicsSphereShape(float radius, bool usePointSprites=true, int largeSphereThreshold=100, int mediumSphereThreshold=10);
void drawGrid(int gridSize=10, float upOffset=0.001, int upAxis=1);
void drawGrid(DrawGridData data=DrawGridData());
void swapBuffer();
void drawText( const char* txt, int posX, int posY);
struct sth_stash* getFontStash();