From b12c7531794e0f3f9137a3d30f5cca9f9ae3fd3f Mon Sep 17 00:00:00 2001
From: andreja6 <andrejaandjic@hotmail.com>
Date: Fri, 13 Apr 2018 20:09:20 -0700
Subject: [PATCH] Added visible and float booleans

---
 G3DTest.suo            | Bin 14336 -> 14336 bytes
 TextButtonInstance.cpp |   9 +++++++--
 TextButtonInstance.h   |   4 ++++
 main.cpp               |  10 ++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/G3DTest.suo b/G3DTest.suo
index 540815454e3c9457b2d6f5cac4160a8ef6fdebcd..f7e4e0cf04b508a0a0a5bc27b5ad5a73f2e33c95 100644
GIT binary patch
delta 2555
zcmcguTWnNS6g{`ScbMtSw4Lc=+Ufg6OQ)~t)M6_*wlhUat4wJtL@;*RRCyK3qY4<p
zVEo{VklC1+XiP}_(*Qd9A<?9Ss(&H^eyK6)hbC&GRsl7RYu&k%5Rk+#ce3u@XPte|
zJ&(QjxrzD2{Q0RI*Wc-MnkZLFy*YMTOX{Oqnbheu`CrYKmnW}Y)pF6Js^y42ED={w
zx^!J`>Z7t0=t??tIb@93louX_QV<GAq7c2t#AJ5ZQuO$MGJv1(0~J6ePz6*2^sR-i
zv+M@wMxY5;X>l#kt#Zb;wPe6z2B9NB6xb}D70oRRuwuX%z%j?6p9S^;j{ygPEr3j|
zDE7o*JPAwzbe@)Yj<0V!T04N97P}jI4%lP0=PkV-`haEg?Pu_I;4OP3$EI>X+s(Z=
zm>08i{pe52sfHF=#D3k(8_CghafUkOpfe^*dY3FaW5x>jIWjxw$ELbQ<dS=B(j7JU
za(-qw_ePt>W+R)aWw$F=vx(*jOQLu&>5bTw8-qC6X)B_o<cQZiGou(yU2b`w(@JEa
z=uw+i3&KNBXAP{g03;PId0mt4($b{wLGP&g<igKePSn3U^hW>nnU`)Hs*?W3Xy9%-
z^R7}oYETWSqpCw~QnPBenw7BcV$vU#uYG=b)mN{%<hVbaEQ@3oQIc6xS<I-%2tKy7
zdikwvqb!xLkwkff8z77Rj)Ds~=6<zJO=8Dq)qXkStdS{uqa-W5b5Sq{)Gi$DUNsM&
zQ59Fys!R2$ah&5EI7|dK`}f1zb`O4?**}M|2Jj9?`j_`pY5$OB*f3pJX7ZIA<&qw>
zHG@g$sXr<=Xa-}rIMZ8g_R4bggjPYu7((CYslzo7>)}~-=NBKr%y%HpvV4b{F(b^0
zm!_>9*bR?qtRpVzh5=b@ct}32^J+Qre&?i-2fyv2tqOY%VYP#50Z*=aj~bS>O=HKd
z1p7I2rSWl_cwm!b#4wGSq_oNDKqpWO1c9vIYS@(f0do9y0HACD$T@%!fa!qbJ7$t4
zXfOjQj{|h%@oxht(*QYEhZ%svbR@@$z_g_71IQ5{0IVn<T5V3A=}Gw*pic?DuP$4S
zYnJAWuLG1X06H>VzXT}X0OXiF-vX5HfUMv5CZp7k78i#8$>M&uIF`K|<nVp<C%~6k
z*Zu-110cw8X9j6N)>|AWIBap7Eso7N9z3e;7S{oL3p*e?Eso8zc(|a?LwA!PuHi8Y
z{TVdd4BlNdAir8%A?#%>^<HzS=6K@tFO%%kWM5%X5gqe^Tv8C18FObG=Uy9LVB7T4
zG)Xu6G>06mSe0yz8m#$MW(I76bwUoej!4vny4Q+=#-lFCBuv0e7$*<+6#ydcHlJJ$
z7D|0nwVZEjlye@h^tMgQ3;s2o6IjPxv5t5@fVhuC&!E3Uv7+07DH&+$lSKPddj6H?
zXXIp0WnT+uhAxE%&&90*cwbRCHP&0kVs<Fz(5PH#JFX8!#$z&%>bvM~Nd-Dz)N)a%
zWT36?*#BCTFtcpQu!>he-K&<Id|-Hq7Y!Fh!3OW~bQj#QiE`OrF+S%hX2O|!LY)=v
z4fm-HU~p5oXXM&}R)9h~^NF7OdQC>L{D=Pgp}jNO&2Y(tl!xQ<d)dINMaXozd1_gP
zK@{8y0u_heD*=tw2Vz*96SmFb92Q4k7wlT-0*kAGooCrTXmcg<a;Vw7j+J~A>Kj;x
zt6~UOO%I+Cl*e`zLMw>VXvZ^%|B?`XFk+}hdr`M|1;qiTUPk)mq8>74(9mVfJ|au2
z*Wg-<-ma6q>$M{0hHV0FZ{t4i9k!W^Gt7)x?zR318rU?RhSLvntEx%rE2_=^w8e6}
OmdifZF7&Y)QvLz%_4Ks>

delta 2295
zcmah~OHi9t6uvj)4+-HBLP%&yc}D`_(Ll&pr!8rr4+@r`XmNZ2TBMFMq7Ah`6>vK3
zbnL?BOsDI*a6x^Rr5y!fMjfYG>-bnXx^t?d8#+^66u<A!pNece%*VOsyXWS=_uO;N
zotv1O_+Z%P+M<-YyS~1D_rrlpI&JUMhE&@t3vXPt&3|?CTb+aHxk{O~_sEJnD%<UL
zxnu8h7K6s3b$PQkoOapeq|xirMH@(&^T5*>e8dN`6z~H9pbQuR_|0<YAg~Rn04jkh
zpc<$FY61G~fxZu@2g1M+x$Jnnv<oB7?zMC`^pF(i)`!U^VGUR_4_kT~`cWWd*)p8#
z>!9<~Acie+6#5z9S>Pxz2GD05`WWy$?F$3-A(9(q%5t26J_Wo=d+~PeVVg_aFs3i#
zC8@lm!6TMQQF}y|5WYKky=Hh*?xbPIjLV!^b0=lhzFkuJ{SNH}otL5WlZFFUp=qTG
z`eh}5*IR`-T8S?1lq<!h`jmX)-zE}mmiL?LCDOVh?d@{t0xWWKk)s5o6`M?Z&095?
z12Or_JEOPCWXWNN;=GrhkvfcC2TX~p4z)wI;jatWV~%*rXj^-%BQ9ThsuK=nQ(9a8
zmb!i==Kb^TAM5|e^N5ltUb^aA&{AXf%TnoX9BS6ToG$Bfs2og}X3kueG?+61S~?`R
z%le%)u>XzlmVW8lvP%+yZh6n`6_2Y?J7qc0Dc71COLO5miX%Lro=`8~PDj<tYGiSJ
z>ppF8DnIj$AmVC|IvT;GZHs>g4{3wH@5{_qn6t80F{p!NjD7Gsxj0pMz%GfpM7k~^
ze*bRyF1A;0R(o@B|I!)imvB>15~0JhHzv<8q1C2HDV7j9UVsPS&9K(UF)<=Q70?W1
z{n|06!~k-604s&EA0X!f4gk!<hm@K%NtWdxKw(+XkzpJHC{F^}k33~EO1)@t+{lE*
zov=8T_$wC20^nMfKU0J<50LZY`}dOSj74@rp9Lsy0CWri=K;zxK#rUK6rg+#kmF{)
z04P5I<cMDYFYv2nw?O|0@cZf(kaeuZARl%JI?MH7z}=5n97FmWKpD3<UePfwfJ|B(
z@AZVmO<SBB+>FJ&2HnmvF^_*$(5InkR|2!v_&hW-4irUZn;sK?_*%jD3#Z>DVa{Es
zE-5O6!HcC7s)M2%F1u16Eicg4@{*@SYxH!VtxAi>7fCmEJK1=-obAX!KB!@tYV1Yz
zf8Ew9YmLZl^!ii;MPx+XCoykbwfxi)l8>9bGTk&PiH1=bZyAzzn(AQZ$z1c;?8S4@
zLvT0GLY)=nB+nNH7z_$u19A-jUj+)Q+B_Fp@KM#G#$h{vJ|HX3>>#VF^o)w5o?}YN
zeBB$GUs0e41s`6Fv|iLQ)EbdXtqsT@7Q=tU$-wk&T6iktLFXJgc+ZoyxVe>aZ+y8n
z@+_M%fXS2PF_ii82h*;20jq?qjKYQ<mDRvb_9c0{J!qIglF!<A$Xt1wRD=ox$MIaX
zARH6sB^)|_eS|B`d#%faig%wGaYm`k3Wo0J{bwiSR&$UkWhOZL3-?8vn_was0OOwZ
z$=(HXksN=%8ep>50^}G%J`EIBU)GO(iGHmX2ZdJx*T*Kd-y)OHY)1Sr!^_2t3QL=t
z>H)}c4HJjb3uMmNi<rga=h%^S{Gj%*_c{hK8PhTy?{S!KjGwHm#mzi6p2O_#@=dH)
IR%1K=0X#Ul*#H0l

diff --git a/TextButtonInstance.cpp b/TextButtonInstance.cpp
index 69b405b..b388b17 100644
--- a/TextButtonInstance.cpp
+++ b/TextButtonInstance.cpp
@@ -16,9 +16,11 @@ Color4 boxColorDn;
 Color4 boxOutlineColorDn;
 bool centeredWithinBox;
 std::string title;
-G3D::GFontRef font;
+G3D::GFontRef* font;
 int textSize;
-
+bool floatBottom;
+bool floatRight;
+bool visible;
 
 TextButtonInstance::TextButtonInstance(void)
 {
@@ -32,6 +34,9 @@ TextButtonInstance::TextButtonInstance(void)
 	boxColor = Color4(0.6F,0.6F,0.6F,0.4F);
 	boxOutlineColor = Color4(0, 0, 0, 0);
 	textSize = 12;
+	floatBottom = false;
+	floatRight = false;
+	visible = true;
 	
 }
 
diff --git a/TextButtonInstance.h b/TextButtonInstance.h
index f606862..1ac5ed1 100644
--- a/TextButtonInstance.h
+++ b/TextButtonInstance.h
@@ -25,4 +25,8 @@ public:
 	bool centeredWithinBox;
 	std::string title;
 	G3D::GFontRef font;
+	bool floatBottom;
+	bool floatRight;
+	bool visible;
+
 };
diff --git a/main.cpp b/main.cpp
index 23aa7dc..6ec16b6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,6 +14,7 @@
 #include "resource.h"
 #include "Instance.h"
 #include "PhysicalInstance.h"
+#include "TextButtonInstance.h"
 
 #if G3D_VER < 61000
 	#error Requires G3D 6.10
@@ -22,6 +23,7 @@ static const float VNUM = 0.01F;
 static std::string title = "";
 static const std::string VERSION = "PRE-ALPHA ";
 static std::vector<Instance*> instances;
+static std::vector<Instance*> instances_2D;
 static Instance* dataModel;
 static GFontRef fntdominant = NULL;
 static GFontRef fntlighttrek = NULL;
@@ -102,6 +104,14 @@ PhysicalInstance* makePart()
 	return part;
 }
 
+TextButtonInstance* makeTextButton()
+{
+	TextButtonInstance* part = new TextButtonInstance();
+	instances.push_back(part);
+	instances_2D.push_back(part);
+	return part;
+}
+
 void Demo::onInit()  {
 	
     // Called before Demo::run() beings