From 250068d5ebab7488593712cb2b2564b2f48d1d21 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwin.coumans@gmail.com>
Date: Tue, 4 Aug 2015 22:03:53 -0700
Subject: [PATCH] re-enable enter key in example browser

---
 data/slope.bullet                             | Bin 79960 -> 79960 bytes
 .../GwenGUISupport/gwenUserInterface.cpp      |   5 +++++
 .../ExampleBrowser/OpenGLExampleBrowser.cpp   |  13 +------------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/data/slope.bullet b/data/slope.bullet
index df44889da9831359e218409bc267a7fcc684efa3..01617a5c3d6df518a2d3cb8e32a7206b2f520b83 100644
GIT binary patch
delta 2046
zcmYk-4TuzF90qXTy*=gB(~&znKaQBh(k{s%A|&kI(F_rl+lYvWXp)EsiAh8jIdm!_
zETX-8i-?GpvJXUL*s;5a=mshx`fwsbMdjwmEF*FVA_D1pp8x-d7M9)LzU;HlJv+;t
zsp@B{dMh=(&X~Tj&-&}Lv-9VTo!@0{ayOcFW`Q%cb*?aVH)=MRHPqtzJiYbdAv<q&
z8Rypq-L|el=hauZW|wDb?nu{0a|a{c*IoTRv$*j+-R^SNkSSb$eQi%ST*H07+fug+
zd8)VU`TEQCTA4e)XBZDz)bp(&gGIu4kuvNRCcVnWQekVUGFm2VFFR#S?&3ac@+|EW
zB+H3>xu7*b6a#|xN}^mTNLLfpYUG95CCoe5s#qn=GtXDD3h1v<vI-ciRk8{g-T)?3
z@>eBOS!2DDQD8KrWE2>0P%;WkZdNi1Yz3s%D4Vr!QA(7}(p!}hWwZP?r9|1R*rb#w
zo0YeN7&qN4dsUm2`7qhBsv?v_Z;P_rD)jGER@;QZU7T%vJ68+0%Y@zzqOn8Z?<As~
zf?zih?-qn3L^6UnEX^jEt97@MO~Cd&N>%~WdzGvL=JzRC1uX6dF*TzwSNVXFQDF6;
zl2OT2CsHv9hu$6~lR*Cw(rS{;f=88-WV7%wr6k#`@wif=Y!>ZRN|epwCqOJ6#+=I~
zakF;xuv@ZZXnb+M3)if23v0dZp(n5Ku(3}jZSB*yMEiy9{mS@&Fg>75n!>y(W3~=*
z%;KP+JxY|Lg7gqk9TMaT(0NLp7f<uRdj@gXpZ&0*|E!W#z~DJ0tAODVC98mq7nH05
zMlXWcpHUbweo4tFFd0)a3T!zgqrmnnN=AX{tEAN^T+FX2B?=ew>q?2j#r%d+qHI>Z
zsgx+&c?-g}#oIEMcT`!vBlO=@R__Ue_l4ufMBy<#^o|P~$7MGE1ZRs*2!fP|Q$g4v
zl8&Hpl4zY2L=!}N0(qF4RWMijp^{a={39i+fW^l`R)NY-^pI7+DhIJNlW;A6s$vkf
z^FCKH2=u=YG6)L3)I$b=;a8;9AY97dC?yG(@+qYx;ZpuiC`mR;zSl!ZvRUf~5IaYw
zWvupTWqekco>eC2g!wsT>w>VjplnYI%V`-co#ANJj3ECJ=v<WN#ZNr&E(yw?3I7*C
zb(si$MI3f!6^s@Breqbc@w<{$z^GEP3K;*PWEDh|(@p$ioSk*Pw;uQZ{bK*Tg8k$p
z@KDV(%~p3^V<7YY8kTQ{AC^pwU*zi#U$e@MthoNaU;E*|<-IJxuj|rY;|8zpVH``~
wrTi*NfGhzP|BzNc%zjWBrF?{)tZH+XJUh`nN6E62-hw$xn4R={%%+Y10;#`WY5)KL

delta 2029
zcmYM#eTWrh7zOa1y*FyJ#nE+L)Tlv3H<KJfLc(@u`and*k%)*0rY#~uViJ)>#HK>R
zqMF^eh={hKZ)A~|dv%M*7>J1I!#5&SRCbokG9-o|f{^N*=h<lgx%W5k?78QjS=due
z`&82|Z13?WCpxR!Jv}{c;_No>Hgkiwru`3o%(S=4jC-MXz1ivAcolBw;pOgGZ=0t#
ztZQxX`ptu_HJ)b<wbq-owZwegTGGc`<;PrXtu+s|2F-BWm#e+JY~uFl)m2MxsaoCV
z+Ap_zi`WExBY5eiecyUyxImaKP)7a2ykD6t6c!7W=^|md=!ECRCL0*_;;tPK<by;t
zC@6*qHzX*R5%n^GT|qP}kY}}vjXT$=SjEO&KTxs?7_3yX3K*_ZvI-cj1}jaf;%+jm
zWE7aLRWb_9)+reU<~J!B1r{ObG|I)@@@6HYK)XT7D6qOk$tcimR5A*zZv`=~-6VT8
zo0QcE*%?*2NDlp2S>G-U?oc*&3d6fN+vH}h7HyUZ{VhbYMG$Ny(yfAUJCSV{L_3Il
z2jZ|an^=6uok}(V%e$4V0@{0&tO8c|Dp>_|_koz2QJAZ~U&$!2c|ggiD(<8zCgIQ@
zQ!)t*9tN>AlN=uDBT6QL(W6QxfyrY^MuF)rC8NOXaS%&KnXY$mmuD_LF~&>DZn;$K
z);rQY!g7x?+bgttmHD`^8kg;gecaCN6O{XjdcVLPAesY$DhE1G$$R%S5Bz5khq+nD
z;)@<svI-bJt7H{0I;3P3FnM0dDq#8oh`AYs&9ax2i~{osC8NN?C>aHouP7M>+E+pB
z%_xWG`kInapnF}(D6oD*$tbXSQ^_b7ciw`qt$SPM^50R`?+SzWl+F9X@B`uGVNrBg
z5B+IjGA*+OM>t!0L=ajcvx2BY<Q+kBlqil0(ix(hK^~@N6^rlqk&;!w>SHCVfbJ6^
zt3dUqddMnZQ-N5TN%+(KOvNB<=YOtb5Ey(RWDpd7sfP>#qpv{h%pivc`i+uFV0uEy
zBry9<$RsHLUJscB7C(U4IXx+3l_!<iX`wx>%+Cm`Gs@ze(4AA3v%-2-MzeDqt(g;4
zKLVZe^4|T#1OI}c{+S4V5i}Qx@K?lPXI8QJj+d0I0w%vHSp`fRC98nh?@CrdL_It1
zEjIDup|1bOh)m8<EZ@xicM$xk2aK=c$@Am-KQLQ9Y_jD;CR#aQUR*k5uK8<>zsFC-
zi+^GMwq)u5w@n?NGS^;~+t>z=r@D+bxSef4_cw^A#SSh$R(nc*vWq`#dgsm0aPiC)
T^JEr|{VV6qFgWP*Hm?5{3CJh?

diff --git a/examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp b/examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp
index 15431c940..bc73c6f08 100644
--- a/examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp
+++ b/examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp
@@ -528,6 +528,11 @@ bool	GwenUserInterface::keyboardCallback(int bulletKey, int state)
 		//convert 'Bullet' keys into 'Gwen' keys
 		switch (bulletKey)
 		{
+		case B3G_RETURN:
+		{
+			gwenKey = Gwen::Key::Return;
+			break;
+		}
 		case B3G_LEFT_ARROW:
 		{
 			gwenKey = Gwen::Key::Left;
diff --git a/examples/ExampleBrowser/OpenGLExampleBrowser.cpp b/examples/ExampleBrowser/OpenGLExampleBrowser.cpp
index dd76aafec..b0e11cd42 100644
--- a/examples/ExampleBrowser/OpenGLExampleBrowser.cpp
+++ b/examples/ExampleBrowser/OpenGLExampleBrowser.cpp
@@ -360,16 +360,10 @@ static void saveCurrentSettings(int currentEntry,const char* startFileName)
 		if (enable_experimental_opencl)
 		{
 			fprintf(f,"--enable_experimental_opencl\n");
-		} else
-		{
-			fprintf(f,"//enable_experimental_opencl\n");
 		}
 		if (sUseOpenGL2 )
 		{
 			fprintf(f,"--opengl2\n");
-		} else
-		{
-			fprintf(f,"//opengl2\n");
 		}
 
 		fclose(f);
@@ -926,13 +920,8 @@ bool OpenGLExampleBrowser::requestedExit()
 
 void OpenGLExampleBrowser::update(float deltaTime)
 {
-/*	if (sCurrentDemo)
-	{
-		sCurrentDemo->stepSimulation(deltaTime);
-	}
-	*/
 
-			assert(glGetError()==GL_NO_ERROR);
+		assert(glGetError()==GL_NO_ERROR);
 		s_instancingRenderer->init();
         DrawGridData dg;
         dg.upAxis = s_app->getUpAxis();