diff --git a/data/multibody.bullet b/data/multibody.bullet index f71d00473..4b0debb4b 100644 Binary files a/data/multibody.bullet and b/data/multibody.bullet differ diff --git a/examples/CommonInterfaces/CommonGraphicsAppInterface.h b/examples/CommonInterfaces/CommonGraphicsAppInterface.h index 12f555a7a..e1c4182c6 100644 --- a/examples/CommonInterfaces/CommonGraphicsAppInterface.h +++ b/examples/CommonInterfaces/CommonGraphicsAppInterface.h @@ -129,13 +129,13 @@ struct CommonGraphicsApp virtual void drawText( const char* txt, int posX, int posY) { float size=1; - float colorRGBA[4]={1,1,1,1}; + float colorRGBA[4]={0,0,0,1}; drawText(txt,posX,posY, size, colorRGBA); } 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); } virtual void drawText( const char* txt, int posX, int posY, float size, float colorRGBA[4]) = 0; diff --git a/examples/OpenGLWindow/GLPrimitiveRenderer.cpp b/examples/OpenGLWindow/GLPrimitiveRenderer.cpp index b134a7ff9..151d8ed67 100644 --- a/examples/OpenGLWindow/GLPrimitiveRenderer.cpp +++ b/examples/OpenGLWindow/GLPrimitiveRenderer.cpp @@ -43,8 +43,6 @@ static const char* fragmentShader3D= \ " texcolor = vec4(1,1,1,texcolor.x);\n" " }\n" " fragColour = colourV*texcolor;\n" -" if (fragColour.w == 0.f)\n" -" discard;\n" "}\n"; diff --git a/examples/OpenGLWindow/fontstash.cpp b/examples/OpenGLWindow/fontstash.cpp index 2289aec38..3cd6df848 100644 --- a/examples/OpenGLWindow/fontstash.cpp +++ b/examples/OpenGLWindow/fontstash.cpp @@ -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[1] = t; - v->colour.p[0] = colorRGBA[0]; - v->colour.p[1] = colorRGBA[1]; - v->colour.p[2] = colorRGBA[2]; - v->colour.p[3] = colorRGBA[3]; + v->colour.p[0] = 0.1;//colorRGBA[0]; + v->colour.p[1] = 0.1;//colorRGBA[1]; + v->colour.p[2] = 0.1;//colorRGBA[2]; + v->colour.p[3] = 1.0;//colorRGBA[3]; return v+1; } diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index e7e0c93f5..54e1063df 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -6011,6 +6011,11 @@ void PhysicsServerCommandProcessor::renderScene(int renderFlags) { 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); } #ifdef USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD