From 9f7d7fecd5ecc336f4a9b9c48b74df2be9a48a3a Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwincoumans@google.com>
Date: Tue, 23 May 2017 23:34:55 -0700
Subject: [PATCH] more rendering fixes

---
 data/multibody.bullet                         | Bin 16660 -> 14844 bytes
 .../CommonGraphicsAppInterface.h              |   4 ++--
 examples/OpenGLWindow/GLPrimitiveRenderer.cpp |   2 --
 examples/OpenGLWindow/fontstash.cpp           |   8 ++++----
 .../PhysicsServerCommandProcessor.cpp         |   5 +++++
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/data/multibody.bullet b/data/multibody.bullet
index f71d00473ae14b544e4cabd209769298abea4307..4b0debb4b5f8f3449adb320a1b9bd31b724242d5 100644
GIT binary patch
delta 2286
zcmcJQNlX)A6vyAdu#}>fRqBGRqGA+r0~<lQhytcU1vd^V2SXYmvBZQJjcL_O^+Yos
zfOx>*!HWmt#e*o`j6vf`Jn9W&VvKq;(f@yzc3RVznD{2YdEfrcTfT4Z-c){Gz7RSY
z4j(=-+%&$&x4-jrxHBpu1tvS76)-*J_KPI^(^FF&x0A_sG(l#9Y<s;J?jUR_TiP`L
zdU5d}%hOYXnDa99>RZoPYGz~H^Mb9%LY;##=wg!rXzpN15elRdROyWgtdcAF+pzmH
zkwCzj(Us~xcqf@`dlw(*&_9cxO!I>M!NFaH#%A2`IAD9W7#lr^&12DwWY@DlCibbY
z>t5U#OT)M(wvo7s7dN8iC7={IKpAj?a<Brd1gn4xQ~*n?O>5Dx8q@(dSOeCAbznWH
z2OEF~c)>=n3HwU}3Y)<euoX0dZ6NI;(?do$68>KhbnCJg?|q;Jw1WM>2Pg+X8(>z@
z#d;<{*Gk3{Fqz+rSZibI_Bb6vxCMnh88IA+oXT>#z0NuGC4I=UU8>Q>?4d91?ew`>
zkL#LFW1+^>bSfQ6=g~*(Yc@55!8(J*pfOmi)1TB7`i2_LP74EIlL@0dA`_P?Z?#)w
z1{jtzQ+h!Vgg_V^2IoN+7zF*G5AggPGRqO@9<$D|N7xR3H@9#_QY>DT;qAvMWM<NT
zqzM>dM*%`#m89ls;@P>a_u>2)+Wxje#>3|c;JSGJx3TuwJd>;&hu1b=8&|zM*=Hd#
z;yicOK3BhP0_$iiB;nUa9Szz;$Eh{e6l3Yk5*TvdG1OGHG~0&js@($VW$pu~b_XNO
zZru&gRjEhr=Ir&lKVJ2d&&PdwzB`v@^;^-J>d@w#t5Z+Qv^UOrH#&Jh((5vd2-oF+
zirfKCEm&T~FzeBwwtqisym4_O;O1SNx9Ze~`a(zR5K1N};UTw2mdWc#%~g$lQ(OE$
z)D|;NA}IUWhW;Ee9GH8t8XuH1G*50I2V3)pQQz{9Fh*83@N!BUWL+7#2I;;;s$R6>
zZ2zSEZ8T?T))mN%&ObIYh9%_BznR0kB5jU!B6H1gYByXpsRi{P%(+(m#TLE)ZVvxb
z(%Bo_J+qUS?c?FfN^g-%c8N>7zSkWek_r66e0Zv*TU0!yz$YGwpgx4RM*{leLOmj1
zl{#fo&d3vq;-|S#SgQ94dbm<TqRO&NDoN#olq&C)sFEm{C|FS6%M~Rmlh`SWA7Ufk
ZL*S)E%axccD^fVAyp`Bv@4oNlzX6g-erx~$

delta 3600
zcmeGfT}V@5^xW&V=G=qMRSPPnm|2mm8nj5go2_5wGBa$jFk*xcJ`_n0R!n0LJ_tE(
zK~}_~Abc@FAM{DFr@~$;kirKg2rM5K(Nl_@bHDrT-mP#G%_2INbI*6a^YfkWp7Wh=
zo4<1VrVy<?69^n`j5J@}>)G#b3iyWsKt$YyC?M`r;DdxigrvmyH&T%Tadn<a0o-0T
zN=o;730|Zq*Ffr>X@4?`G|}5TQj&7O9Di2%ke3ugH9L;PBc*aew3e5R;fw-xwf@i;
zj!cLRh!iG+q$HOZ%0)(^$&_!D;$rVcnU>khsP>+ndjG7#)+gDNO<k5AeQ&<s{_?5b
z9+jCtBaU9FKp%>Rz6M`t8U-Y)N2Ga>?}%G$S`7V1XWH%klcRE6beMI_1_~GFqTJ~p
zqS@D{P3eJeg3qli@a*fa%s*N$ndT_p2IhGYfmo_6t-7?l=NbujnTx)gl$K*a`f{hy
zW6nb>g^7z>bp@xMK&9ZKoZ$;_N_J}iYmnR}ckwr`ztH#Pb=`#?DU<RPG0GZ=K{vVN
zhBJh%8T@Z$sVLnPDXr3g&3XVU)Qo&3B0o;+bUR_gwC256Yn&+6HE)Agy^+*r&fTP0
zmu9!dAcHA2uFfgIr|!f7x_ziKJK5nGVb?*|b1z?$QKfy`<x56~fi{ee&&fT;<Eb5R
zr<`(Y&TCXP4azRV`s!<T>aT4Qqp_bT3u=}HrQS`n{^?`BdbfPTw2?*gz~tC8cgj;k
zt6C->SEW>t&zCz*#Y}C^<Sat*LA}_LCXQx`3(!L`BF`vgn9Kn>Fer{VHxa<qI~F+-
zPkM(=)}EL~V=LNi*ZIlEF^90T{o=#KN2$6gwv7g(T)-&`6a}tG_y003eu`t&VJ({t
z`wm(O5g*_`Rfyq*Ok)kE)v^J|p|&0JgxT(*&%{$kH;z7K7R|FdN;{6fNQhG0cF~(@
zxa!FuhyQ*;sN3ojLT57_vL$5vTSfTR_(G~Kxb^>p<a$CZ^r`$o-=0L}V6ebe6174Z
zUVDY$RL}+I!3!N=2N(WFD1=6cVe50_W5;;|K4wHGY=$cE;292p14r}}qTCPDf?2o=
zXJHsxASn#wnH5_=33+ORurLMP!gb*-%)^8b7TR`-F>%N+0j)w9y3t7l7b?Sd7#)nE
TdJ7B*NwG^9gUDe1?yuG#pz^9y

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