From 2b508cd01744c4003b948216235cce3a9df69a19 Mon Sep 17 00:00:00 2001
From: andreja6 <andrejaandjic@hotmail.com>
Date: Wed, 11 Apr 2018 06:42:11 -0700
Subject: [PATCH] Changed the way of getting an instance type

---
 G3DTest.suo          | Bin 12288 -> 13312 bytes
 Instance.cpp         |   9 ++-------
 Instance.h           |   1 +
 PhysicalInstance.cpp |   8 ++++----
 main.cpp             |   2 +-
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/G3DTest.suo b/G3DTest.suo
index 2ee9c137b479be7e7898b161d9eb9f8a548df7f0..7fdd41e53e811522b77a9f439035f13ed69ddc9e 100644
GIT binary patch
delta 1812
zcmai!T})g>6vt=o-g~(V3tg7aUA|e??!p$^fVDMgppj^*BHM<Vexw!@+eJ}ZU8*95
z#Ta~$2ifC;ug16fVAIw3;DgkfR$Gm2ebB_0`qtFMkAy_g1pNQ+-o-{yPx9M2^WT{{
zb7#(+>_|3!_JHB9Q%co?)%>VYW>oZl(D(bywXd}gl4{ORnGa~E5$+mH-iXE}8#LuN
zYr;GUQPTF$vl%!Cz(H^b90sFc6*C@1dlZa-=fGp&aWDp+0LQ>_kOt%6N$?by08fKw
zz_Z{4;Ckfw+x$~X+3E!fi+iKzoB_iLqJu$&y=F?kGIWXj5x-M1Wy9K$wRo3gBlv)_
zl=i#5OkhYZl<&%w4_KU5K{1~xAM=IA4W-{qmtj4nv@g43a8zyun~Z>#RLw(@NFI{Z
zmXJ=%#mak3wO!qn3%zK3Xv<V+Mo-I1=(4S=Ff+sj10C>Q;X*LEnykZjSE&i}pf2TZ
z{~5_&7>Zw8SxW0dmwVw#U%uNL`f2sYwW3}Qt#Sk1$)B#i=(82?va;~C^(m_cJ;UuS
z*Sp^?+3>x7-3)pC;FiM+mIGl-b|;QVMcl!u)t+k@(3TA~P*|%mC7+sGtxhPp{7U0x
zEf>sfvfMmm>oBy2!l)L+Ft=GlP~Ok4v|RE@uB|`Uu_V{qLUJ=wFNc#mN|d|Dl*~2M
zNq_9&*{hTDcVL3@KAf&=oA67GC(D~=9DX@96Lf)Aumu#y^}wg~0%|yNwHeUv1Jrol
z_X7j$Q)<=~c~HZE_6Xp>cEDt(9RbB4OmrHPl^Qp~q@^KAU9A=^bCos?IIbF;2DCXq
ztrqduvt`~B`_R4yXs-hfjDZC}I}fOF)1Ls^XMh?v^Ese>1E`VjK?vOR`rT;11&pt5
zf#Sd@oB;YUv_)+X9PWP9(|Dvm09xA9ctzu!0GsqQ-s>q(oAR_WXfJ!(3|hu<1I@u{
zh5ssAYAs;a^B3g3&BynTboXqSDa>BZU}-D9CcYDD%$f?%FJ=$_<5|$c$lMyq#`pOb
zgFRQMX!*sdTHI=ua~hL`##-@?Kl9P~Gwf+O8LX<~^2KmeU2A2@=*o2tSP}G_3h$zG
zSZ|_d?T7Z3ywn)gcgr<1Dodrk)+DsEve$V~2D*01jp|mn-b^Rj@fK~lRJl{WNVe%J
zc{|V|BTiI~COcS-BoOPB6LmrO^O1kAE^Zxb{Hu;lCpx?}8`}Q2Fv(J)K}srDxPzwu
zEMg2J-z8!)SewB9uk`WU|6aRnXe>Rq>wH+p0Mo0e!$ox%l=klJ79WyNevR+c>-A~(
ejq4w8m<PNJUP>JB<<qz>wFKaMp+#^P;XeTiHB5>C

delta 1363
zcmZ{jOHWfl6vt=U+uA~bQXVNUdCQf8w1{X-h$NyhXlSb#@quEZfdxSq#UKh?FuH&Z
z^n3s{E?lrs=@*coVh}?VqZ=3OR5U8lg+xRBpWCSmjVJlvbI$L~oSC_IuF+$3-S4o-
zjR)boGOG2ai+dlZf-jb(RS41SjSXt8(pG>thvK@A47Wx<Y`xk>JRYYW``4`;bfA13
zIsu)8n6XYHJ_B_zn+lK2I9e<Y?u%NSCd+k-q%6^#7NAIKyL6fhd{1rH{*;Y;jRsr?
z?b3lsDT%r(B<=K5uZu;}&RIQu79m~!bd-gVR%2J^2Cce_Xt{1Z>KU+1TWHWTEE{Ou
zvtSp67~|n4t_nnBJOxIJ{+jT=ZJfd`&|4-3rNNaz&!-zaUp79+nYSW83-N)H9AUy@
zL)lNPPRS=>OB~i4vT<Tb9K;*^yPg-MIagCO->`1NzD7#V)5{9)OhJpZAr~%lTBI;!
zb0f>-%vOy^kF6IjNV~aKexmheG~%~f9JI?k49PGD2NB(htryQ*DO#)3QoxP2y!#Nv
z%V%j!57A()pPDP%Mm{;dy+uK&<8x>lzi4JzPzJ=!c{j{7i1$+h)j-K{^@!QFL(Ed3
zEfCv2h?x`G4_TnF5F;kcL2?9QI|}i@GUyn@b_z-^(rFSQ`V{lQUr?-Hv0V5|id|7G
z8~&<dhGMx`UyLevUBNx@HxwIJtP*}gv4@KBre_tKSBy9FRI%5J@y1sm5A+V=d>ixz
z;`PM`h#{*C4;Op|e3BhNz`O5KtP1fe#MZ4Cf0`bi0E;NbufAWg%ZjCf4JtMSU&%4c
zz@r5I8a(I4(6EXp=w4N~7Fp~2Mej=scX&~<Lu~wsc{pDW?#;$mhHpQ|N#@4A%ppTR
z>?{l1e#{j~YmTfbzm~=~jc)@R|M_?Hoz5;ZOE%$~%f^c(+M20_as!Rg>K5}?D>DCw
zNOil+GJgTSMi*(+x0n2ygC6;sXwuh!IKzzFa&_ttJfm^nZd%bibThMz(sc*Ds_mt*
Rf<v@e-)N5KIsX&-{swax9M=E<

diff --git a/Instance.cpp b/Instance.cpp
index 5b62ba2..dffef1a 100644
--- a/Instance.cpp
+++ b/Instance.cpp
@@ -3,9 +3,7 @@
 
 std::string name;
 Instance* parent;
-static const int BASE_INSTANCE = 0;
-static const int PHYSICAL_INSTANCE = 1;
-static const int type = BASE_INSTANCE;
+static const std::string className = "Instance";
 
 Instance::Instance(void)
 {
@@ -16,10 +14,7 @@ Instance::~Instance(void)
 {
 	name = "Default Game Instance";
 }
-int getType()
-{
-	return type;
-}
+
 
 
 
diff --git a/Instance.h b/Instance.h
index ca35656..2426db2 100644
--- a/Instance.h
+++ b/Instance.h
@@ -10,4 +10,5 @@ public:
 	Instance* parent;  // Another pointer.
 	static const int BASE_INSTANCE;
 	static const int PHYSICAL_INSTANCE;
+	static int type;
 };
diff --git a/PhysicalInstance.cpp b/PhysicalInstance.cpp
index 4e21366..68001da 100644
--- a/PhysicalInstance.cpp
+++ b/PhysicalInstance.cpp
@@ -1,22 +1,22 @@
 #include <G3DAll.h>
 #include "PhysicalInstance.h"
 
-
-bool collides = true;
+static const std::string className = "Part";
+bool canCollide = true;
 bool anchored = false;
 Vector3 size;
 Vector3 position;
 Color3 color;
-//static const int type = PHYSICAL_INSTANCE;
 
 PhysicalInstance::PhysicalInstance(void)
 {
 	name = "Default PhysicalInstance";
-	collides = true;
+	canCollide = true;
 	anchored = true;
 	size = Vector3(2,1,4);
 	position = Vector3(0,0,0);
 	color = Color3::gray();
+	
 }
 
 PhysicalInstance::~PhysicalInstance(void)
diff --git a/main.cpp b/main.cpp
index edf9e7b..b547d73 100644
--- a/main.cpp
+++ b/main.cpp
@@ -99,7 +99,7 @@ void Demo::onInit()  {
 	//dataModel->name = "undefined";
 	dataModel->parent = NULL;
 	
-	PhysicalInstance* test = new PhysicalInstance();
+	Instance* test = new PhysicalInstance();
 	setDesiredFrameRate(FPSVal[index]);
     app->debugCamera.setPosition(Vector3(0, 2, 10));
     app->debugCamera.lookAt(Vector3(0, 2, 0));