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

more rendering fixes

Browse Source
This commit is contained in:
Erwin Coumans
2017-05-23 23:34:55 -07:00
parent df1b5b6ca5
commit 9f7d7fecd5
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/multibody.bullet
View File

Binary file not shown.

4
examples/CommonInterfaces/CommonGraphicsAppInterface.h
View File

@@ -129,13 +129,13 @@ struct CommonGraphicsApp
virtual void drawText( const char* txt, int posX, int posY) virtual void drawText( const char* txt, int posX, int posY)
{ {
float size=1; float size=1;
float colorRGBA[4]={1,1,1,1}; float colorRGBA[4]={0,0,0,1};
drawText(txt,posX,posY, size, colorRGBA); drawText(txt,posX,posY, size, colorRGBA);
} }
virtual void drawText( const char* txt, int posX, int posY, float size) virtual void drawText( const char* txt, int posX, int posY, float size)
{ {
float colorRGBA[4]={1,1,1,1}; float colorRGBA[4]={0,0,0,1};
drawText(txt,posX,posY,size,colorRGBA); drawText(txt,posX,posY,size,colorRGBA);
} }
virtual void drawText( const char* txt, int posX, int posY, float size, float colorRGBA[4]) = 0; virtual void drawText( const char* txt, int posX, int posY, float size, float colorRGBA[4]) = 0;

2
examples/OpenGLWindow/GLPrimitiveRenderer.cpp
View File

@@ -43,8 +43,6 @@ static const char* fragmentShader3D= \
" texcolor = vec4(1,1,1,texcolor.x);\n" " texcolor = vec4(1,1,1,texcolor.x);\n"
" }\n" " }\n"
" fragColour = colourV*texcolor;\n" " fragColour = colourV*texcolor;\n"
" if (fragColour.w == 0.f)\n"
" discard;\n"
"}\n"; "}\n";

8
examples/OpenGLWindow/fontstash.cpp
View File

@@ -564,10 +564,10 @@ static Vertex* setv(Vertex* v, float x, float y, float s, float t, float width,
v->uv.p[0] = s; v->uv.p[0] = s;
v->uv.p[1] = t; v->uv.p[1] = t;
v->colour.p[0] = colorRGBA[0]; v->colour.p[0] = 0.1;//colorRGBA[0];
v->colour.p[1] = colorRGBA[1]; v->colour.p[1] = 0.1;//colorRGBA[1];
v->colour.p[2] = colorRGBA[2]; v->colour.p[2] = 0.1;//colorRGBA[2];
v->colour.p[3] = colorRGBA[3]; v->colour.p[3] = 1.0;//colorRGBA[3];
return v+1; return v+1;
} }

5
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -6011,6 +6011,11 @@ void PhysicsServerCommandProcessor::renderScene(int renderFlags)
{ {
if (m_data->m_guiHelper) if (m_data->m_guiHelper)
{ {
if (0==(renderFlags&COV_DISABLE_SYNC_RENDERING))
{
m_data->m_guiHelper->syncPhysicsToGraphics(m_data->m_dynamicsWorld);
}
m_data->m_guiHelper->render(m_data->m_dynamicsWorld); m_data->m_guiHelper->render(m_data->m_dynamicsWorld);
} }
#ifdef USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD #ifdef USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD