diff --git a/G3DTest.suo b/G3DTest.suo index 2ee9c13..7fdd41e 100644 Binary files a/G3DTest.suo and b/G3DTest.suo differ 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 #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));