Class cleanup

DataModelInstance.cpp

@@ -1,14 +1,7 @@
 #include "DataModelInstance.h"
 
 
-WorkspaceInstance* workspace;
-Instance* guiRoot;
-float mousex;
-float mousey;
-bool mouseButton1Down;
-std::string message;
-bool showMessage;
-G3D::GFontRef font;
+
 
 
 DataModelInstance::DataModelInstance(void)

DataModelInstance.h

@@ -11,8 +11,12 @@ public:
 	void setMessage(std::string);
 	void clearMessage();
 	void drawMessage(RenderDevice*);
-	GFontRef font;
 	WorkspaceInstance* getWorkspace();
+	WorkspaceInstance* workspace;
+	Instance* guiRoot;
+	std::string message;
+	bool showMessage;
+	G3D::GFontRef font;
 	Instance* getGuiRoot();
 	float mousex;
 	float mousey;

ImageButtonInstance.cpp

@@ -1,14 +1,5 @@
 #include "ImageButtonInstance.h"
-G3D::TextureRef image = NULL;
-int openGLID = 0;
-G3D::TextureRef image_ovr = NULL;
-int openGLID_ovr = 0;
-G3D::TextureRef image_dn = NULL;
-int openGLID_dn = 0;
-G3D::TextureRef image_ds = NULL;
-int openGLID_ds = 0;
-Vector2 size;
-Vector2 position;
+
 ImageButtonInstance::ImageButtonInstance(G3D::TextureRef newImage, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
 {
 	

Instance.cpp

@@ -2,10 +2,6 @@
 #include <G3DAll.h>
 #include "Instance.h"
 
-std::string name;
-Instance* parent = NULL;
-std::vector<Instance* > children;
-static std::string className = "BaseInstance";
 
 Instance::Instance(void)
 {

PhysicalInstance.cpp

@@ -1,8 +1,6 @@
 #include "PhysicalInstance.h"
 #include "Globals.h"
-GLfloat vertecies[96];
-bool changed = true;
-Box itemBox = Box();
+
 
 PhysicalInstance::PhysicalInstance(void)
 {

PhysicalInstance.h

@@ -36,4 +36,7 @@ public:
 private:
 	Vector3 position;
 	Vector3 size;
+	GLfloat vertecies[96];
+	bool changed;
+	Box itemBox;
 };

TextButtonInstance.cpp

@@ -1,25 +1,5 @@
 #include "TextButtonInstance.h"
-Vector2 boxBegin;
-Vector2 boxEnd;
-Vector2 fontLocationRelativeTo;
-Color4 textColor;
-Color4 textOutlineColor;
-Color4 boxColor;
-Color4 boxOutlineColor;
-Color4 textColorOvr;
-Color4 textOutlineColorOvr;
-Color4 boxColorOvr;
-Color4 boxOutlineColorOvr;
-Color4 textColorDn;
-Color4 textOutlineColorDn;
-Color4 boxColorDn;
-Color4 boxOutlineColorDn;
-bool centeredWithinBox;
-std::string title;
-G3D::GFontRef* font;
-int textSize;
 
-bool visible;
 
 TextButtonInstance::TextButtonInstance(void)
 {

WorkspaceInstance.cpp

@@ -1,6 +1,5 @@
 #include "WorkspaceInstance.h"
-float timer = 60.0F;
-int score = 0;
+
 
 WorkspaceInstance::WorkspaceInstance(void)
 {