Test

.gitattributes

@@ -1 +0,0 @@
-*  text=false

.github/workflows/sync-develop.yml

@@ -1,25 +0,0 @@
-name: Sync Back to Develop
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  sync-branches:
-    runs-on: ubuntu-latest
-    name: Syncing branches
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12
-      - name: Opening pull request
-        id: pull
-        uses: tretuna/sync-branches@1.2.0
-        with:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-          FROM_BRANCH: 'master'
-          TO_BRANCH: 'develop'

.gitignore

@@ -36,13 +36,11 @@
 *.user
 *.pdb
 *.idb
+*.manifest
+*.htm
 *.res
 *.ilk
 *.dep
-*.bin
-
-# ResEditor files
-*.aps
 
 /Debug
 /Release
@@ -50,18 +48,10 @@ stdout.txt
 log.txt
 *.suo
 *.suo
+G3DTest.suo
+G3DTest.suo
 stderr.txt
 desktop.ini
+main.cpp
 *.db
-
+G3DTest.sln
-#Redist
-!Installer/Redist/*
-UpgradeLog.htm
-click_output.JPEG
-click_output.PNG
-
-#Level Files
-*.b3dl
-*.b3dm
-*.rbxl
-*.rbxm

Application.cpp

@@ -0,0 +1,953 @@
+#include <G3DAll.h>
+#include <initguid.h>
+#include <iomanip>
+#include "Instance.h"
+#include "resource.h"
+#include "PartInstance.h"
+#include "TextButtonInstance.h"
+#include "ImageButtonInstance.h"
+#include "DataModelInstance.h"
+#include "CameraController.h"
+#include "AudioPlayer.h"
+#include "Globals.h"
+#include "Application.h"
+#include "win32Defines.h"
+#include "WindowFunctions.h"
+#include <limits.h>
+#include <mshtml.h>
+#include <exdisp.h>
+#include <vector>
+#include <string>
+#include "ax.h"
+#include <cguid.h>
+#include "IEBrowser.h"
+#include "PropertyWindow.h"
+#include <commctrl.h>
+#include "StringFunctions.h"
+#include "GuiRoot.h"
+
+#include "GUDButtonListener.h"
+#include "ModeSelectionListener.h"
+#include "DeleteListener.h"
+#include "CameraButtonListener.h"
+#include "RotateButtonListener.h"
+
+Ray testRay;
+static int cursorid = 0;
+static int cursorOvrid = 0;
+static int currentcursorid = 0;
+static G3D::TextureRef cursor = NULL;
+static G3D::TextureRef cursorOvr = NULL;
+static bool mouseMovedBeginMotion = false;
+static POINT oldGlobalMouse;
+Vector2 oldMouse = Vector2(0,0);
+float moveRate = 0.5;
+
+void Application::clearInstances()
+{
+	delete _dataModel;
+}
+
+PartInstance* Application::makePart()
+{
+	PartInstance* part = new PartInstance();
+	return part;
+}
+
+void Application::setFocus(bool focus)
+{
+	if(_propWindow != NULL)
+		if(focus)
+		{
+			ShowWindow(_propWindow->_hwndProp, SW_SHOW);
+			SetWindowPos(_propWindow->_hwndProp, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+		}
+		else 
+		{
+			SetWindowPos(_propWindow->_hwndProp, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+		}
+}
+
+Application::Application(HWND parentWindow) : _propWindow(NULL) { //: GApp(settings,window) {
+	
+
+	std::string tempPath = ((std::string)getenv("temp")) + "/"+g_PlaceholderName;
+	CreateDirectory(tempPath.c_str(), NULL);
+	
+	_hWndMain = parentWindow;
+
+	HMODULE hThisInstance = GetModuleHandle(NULL);
+
+	_hwndToolbox = CreateWindowEx(
+		WS_EX_ACCEPTFILES,
+		"AX",
+		"{8856F961-340A-11D0-A96B-00C04FD705A2}",
+		WS_CHILD | WS_VISIBLE,
+		0,
+		560,
+		800,
+		60,
+		_hWndMain, // parent
+		NULL, // menu
+		hThisInstance,
+		NULL
+	);
+	
+	_hwndRenderer = CreateWindowEx(
+		WS_EX_ACCEPTFILES,
+		"G3DWindow",
+		"3D",
+		WS_CHILD,
+		CW_USEDEFAULT,
+		CW_USEDEFAULT,
+		1,
+		1,
+		_hWndMain, // parent
+		NULL, // menu
+		hThisInstance,
+		NULL
+	);
+	_settings.window.resizable = true;
+	_settings.writeLicenseFile = false;
+	_settings.logFilename = tempPath + "/g3dlog.txt";
+	_settings.window.center = true; 
+	Win32Window* window = Win32Window::create(_settings.window,_hwndRenderer);
+	ShowWindow(_hwndRenderer, SW_SHOW);
+	ShowWindow(_hWndMain, SW_SHOW);
+
+	quit=false;
+	rightButtonHolding=false;
+	mouseOnScreen=false;
+	// GApp replacement
+	renderDevice = new RenderDevice();
+	if (window != NULL) {
+	renderDevice->init(window, NULL);
+	}
+	else
+	{
+		MessageBox(NULL,"Window not found!","Error",MB_OK | MB_ICONSTOP);
+		return;
+	}
+
+    _window = renderDevice->window();
+    _window->makeCurrent();
+	
+	SetWindowLongPtr(_hWndMain,GWL_USERDATA,(LONG)this);
+	SetWindowLongPtr(_hwndRenderer,GWL_USERDATA,(LONG)this);
+	_propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance);
+	IEBrowser* webBrowser = new IEBrowser(_hwndToolbox);
+	webBrowser->navigateSyncURL(L"http://androdome.com/g3d/toolbox/");
+}
+
+
+void Application::deleteInstance()
+{
+	if(g_selectedInstances.size() > 0)
+	{
+		size_t undeletable = 0;
+		while(g_selectedInstances.size() > undeletable)
+		{
+			if(g_selectedInstances.at(0)->canDelete)
+			{
+				AudioPlayer::playSound(GetFileInPath("/content/sounds/pageturn.wav"));
+				Instance* selectedInstance = g_selectedInstances.at(0);
+				if(selectedInstance->getParent() != NULL)
+					selectedInstance->getParent()->removeChild(selectedInstance);
+				delete selectedInstance;
+				selectedInstance = NULL;
+				g_selectedInstances.erase(g_selectedInstances.begin());
+			}
+			else
+			{
+				undeletable++;
+			}
+		}
+	}
+	if(g_selectedInstances.size() == 0)
+		g_usableApp->_propWindow->ClearProperties();
+}
+
+void Application::onInit()  {
+	
+    // Called before Application::run() beings
+	cameraController.setFrame(Vector3(0,2,10));
+	_dataModel = new DataModelInstance();
+	_dataModel->setParent(NULL);
+	_dataModel->name = "undefined";
+	_dataModel->font = g_fntdominant;
+	g_dataModel = _dataModel;
+	
+	//initGUI();
+
+#ifdef LEGACY_LOAD_G3DFUN_LEVEL
+	PartInstance* test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3(0.2F,0.3F,1);
+	test->setSize(Vector3(24,1,24));
+	test->setPosition(Vector3(0,0,0));
+	test->setCFrame(test->getCFrame() * Matrix3::fromEulerAnglesXYZ(0,toRadians(0),toRadians(0)));
+	
+
+	
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3(.5F,1,.5F);
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(-10,1,0));
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3(.5F,1,.5F);
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(10,1,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(7,2,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(-7,2,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(4,3,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(-5,3,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(1,4,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(-3,4,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(-2,5,0));
+	
+
+	
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(0,6,0));
+
+	test = makePart();
+	test->setParent(_dataModel->getWorkspace());
+	test->color = Color3::gray();
+	test->setSize(Vector3(4,1,2));
+	test->setPosition(Vector3(2,7,0));
+#else
+	_dataModel->debugGetOpen();
+#endif
+	
+
+
+
+	//setDesiredFrameRate(60);
+	
+	
+	
+
+    //GApplet::onInit();
+	
+}
+
+
+
+
+
+
+void Application::onCleanup() {
+    clearInstances();
+	sky->~Sky();
+}
+
+
+
+
+void Application::onLogic() {
+    // Add non-simulation game logic and AI code here
+
+		
+
+
+}
+
+
+void Application::onNetwork() {
+	// Poll net messages here
+}
+
+
+//double getVectorDistance(Vector3 vector1, Vector3 vector2)
+//{
+//	return pow(pow((double)vector1.x - (double)vector2.x, 2) + pow((double)vector1.y - (double)vector2.y, 2) + pow((double)vector1.z - (double)vector2.z, 2), 0.5);
+//}
+
+std::vector<Instance*> Application::getSelection()
+{
+	return g_selectedInstances;
+}
+void Application::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
+
+	
+		
+	_dataModel->getGuiRoot()->update();
+
+	if(_dataModel->name != _title)
+	{
+		_title = _dataModel->name;
+		std::string text = "Game \"" + _title + "\"";
+		SetWindowText(_hWndMain, text.c_str());
+		
+	}
+
+	cameraController.update(this);
+
+}
+
+/*double getOSVersion() {
+    OSVERSIONINFO osvi;
+
+    ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
+    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+
+    GetVersionEx(&osvi);
+	std::string version = Convert(osvi.dwMajorVersion) + "." + Convert(osvi.dwMinorVersion);
+	return ::atof(version.c_str());
+}*/
+/* 
+bool IsHolding(int button)
+{
+	return (GetKeyState(button) >> 1)>0;
+}
+
+*/
+
+void Application::onUserInput(UserInput* ui) {
+	
+	/*
+	if(GetHoldKeyState(VK_LCONTROL))
+	{
+		if(GetHoldKeyState('D'))
+		{
+			_messageTime = System::time();
+			if(debugMode())
+				_message = "Debug Mode Disabled";
+			else
+				_message = "Debug Mode Enabled";
+			setDebugMode(!debugMode());
+		}
+	}
+	*/
+	if(GetHoldKeyState(VK_F8))
+	{
+		_dataModel->getGuiRoot()->setDebugMessage("FOV Set to 10", System::time());	
+	}
+	//}
+
+	//_dataModel->mousex = ui->getMouseX();
+	//_dataModel->mousey = ui->getMouseY();
+	_dataModel->mouseButton1Down = (GetKeyState(VK_LBUTTON) & 0x100) != 0;
+
+	if (GetHoldKeyState(VK_LBUTTON)) {
+		if (_dragging) {
+			PartInstance* part = NULL;
+			if(g_selectedInstances.size() > 0)
+				part = (PartInstance*) g_selectedInstances.at(0);
+		Ray dragRay = cameraController.getCamera()->worldRay(_dataModel->mousex, _dataModel->mousey, renderDevice->getViewport());
+		std::vector<Instance*> instances = _dataModel->getWorkspace()->getAllChildren();
+		for(size_t i = 0; i < instances.size(); i++)
+			{
+				if(PartInstance* moveTo = dynamic_cast<PartInstance*>(instances.at(i)))
+				{
+					float __time = testRay.intersectionTime(moveTo->getBox());
+					float __nearest=std::numeric_limits<float>::infinity();
+					if (__time != inf()) 
+					{
+						if (__nearest>__time)
+						{
+							// BROKEN
+							//Vector3 closest = (dragRay.closestPoint(moveTo->getPosition()) * 2);
+							//part->setPosition(closest);
+							//part->setPosition(Vector3(floor(closest.x),part->getPosition().y,floor(closest.z)));
+						}
+					}
+				}
+			}
+			Sleep(10);
+		}
+	}
+	// Camera KB Handling {
+		if (GetKPBool(VK_OEM_COMMA)) //Left
+			g_usableApp->cameraController.panLeft();
+		else if (GetKPBool(VK_OEM_PERIOD)) // Right
+			g_usableApp->cameraController.panRight();
+		else if (GetKPBool(0x49)) // Zoom In (I)
+			g_usableApp->cameraController.Zoom(1);
+		else if (GetKPBool(0x4F)) // Zoom Out (O)
+			g_usableApp->cameraController.Zoom(-1);
+	// }
+
+	//readMouseGUIInput();
+	// Add other key handling here
+}
+
+void Application::makeFlag(Vector3 &vec, RenderDevice* &rd)
+{
+
+	Vector3 up = Vector3(vec.x, vec.y+3, vec.z);
+	rd->setColor(Color3::blue());
+	rd->beforePrimitive();
+
+		glBegin(GL_LINES);
+		glVertex3f(vec.x, vec.y, vec.z);
+		glVertex3f(up.x, up.y, up.z);
+		glEnd();
+
+		glBegin( GL_TRIANGLES );
+		glVertex3f(up.x, up.y-1, up.z);
+		glVertex3f(up.x, up.y-0.5, up.z-1);
+		glVertex3f(up.x, up.y, up.z);
+		
+		glVertex3f(up.x, up.y, up.z);
+		glVertex3f(up.x, up.y-0.5, up.z-1);
+		glVertex3f(up.x, up.y-1, up.z);
+
+		glEnd();
+	rd->afterPrimitive();
+	rd->setColor(Color3::white());
+	//I know how i will approach this now
+}
+
+void Application::setMode(int mode)
+{
+	_mode = mode;
+}
+int Application::getMode()
+{
+	return _mode;
+}
+
+
+void Application::drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c)
+{
+
+	Color3 outline = Color3::cyan();//Color3(0.098F,0.6F,1.0F);
+	float offsetSize = 0.05F;
+	//X
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, from.y + offsetSize, from.z + offsetSize), Vector3(to.x + offsetSize, from.y - offsetSize, from.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, to.y + offsetSize, from.z + offsetSize), Vector3(to.x + offsetSize, to.y - offsetSize, from.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, to.y + offsetSize, to.z + offsetSize), Vector3(to.x + offsetSize, to.y - offsetSize, to.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x - offsetSize, from.y + offsetSize, to.z + offsetSize), Vector3(to.x + offsetSize, from.y - offsetSize, to.z - offsetSize))), rd, outline, Color4::clear()); 
+	//Y
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y - offsetSize + 0.1, from.z + offsetSize), Vector3(from.x - offsetSize, to.y + offsetSize - 0.1, from.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.1, from.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize - 0.1, from.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y - offsetSize + 0.1, to.z + offsetSize), Vector3(to.x - offsetSize, to.y + offsetSize-0.1, to.z - offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y - offsetSize + 0.1, to.z + offsetSize), Vector3(from.x - offsetSize, to.y + offsetSize - 0.1, to.z - offsetSize))), rd, outline, Color4::clear()); 
+
+	//Z
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, from.y + offsetSize, from.z - offsetSize), Vector3(from.x - offsetSize, from.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(from.x + offsetSize, to.y + offsetSize, from.z - offsetSize), Vector3(from.x - offsetSize, to.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, from.y + offsetSize, from.z - offsetSize), Vector3(to.x - offsetSize, from.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
+	Draw::box(c.toWorldSpace(Box(Vector3(to.x + offsetSize, to.y + offsetSize, from.z - offsetSize), Vector3(to.x - offsetSize, to.y - offsetSize, to.z + offsetSize))), rd, outline, Color4::clear()); 
+	
+	if(_mode == ARROWS)
+	{
+		rd->setLight(0, NULL);
+		rd->setAmbientLightColor(Color3(1,1,1));
+		
+		AABox box;
+		c.toWorldSpace(Box(from, to)).getBounds(box);
+		float max = box.high().y - pos.y;
+
+		Draw::arrow(pos, Vector3(0, 1.5+max, 0), rd);
+		Draw::arrow(pos, Vector3(0, (-1.5)-max, 0), rd);
+		
+		max = box.high().x - pos.x;
+
+		Draw::arrow(pos, Vector3(1.5+max, 0, 0), rd);
+		Draw::arrow(pos, Vector3((-1.5)-max, 0, 0), rd);
+
+		max = box.high().z - pos.z;
+
+		Draw::arrow(pos, Vector3(0, 0, 1.5+max), rd);
+		Draw::arrow(pos, Vector3(0, 0, (-1.5)-max), rd);
+
+
+
+		rd->setAmbientLightColor(lighting.ambient);
+		rd->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor));
+	}
+	else if(_mode == RESIZE)
+	{
+		Color3 sphereColor = outline;
+		rd->setLight(0, NULL);
+		rd->setAmbientLightColor(Color3(1,1,1));
+		Vector3 gamepoint = pos;
+		Vector3 camerapoint = rd->getCameraToWorldMatrix().translation;
+		float distance = pow(pow((double)gamepoint.x - (double)camerapoint.x, 2) + pow((double)gamepoint.y - (double)camerapoint.y, 2) + pow((double)gamepoint.z - (double)camerapoint.z, 2), 0.5);
+		if(distance < 200)
+		{
+			
+			float multiplier = distance * 0.025F/2;
+			if(multiplier < 0.25F)
+				multiplier = 0.25F;
+			Vector3 position = pos + (c.lookVector()*((size.z/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+			position = pos - (c.lookVector()*((size.z/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+
+			position = pos + (c.rightVector()*((size.x/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+			position = pos - (c.rightVector()*((size.x/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+
+			position = pos + (c.upVector()*((size.y/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+			position = pos - (c.upVector()*((size.y/2)+1));
+			Draw::sphere(Sphere(position, multiplier), rd, sphereColor, Color4::clear());
+		}
+		rd->setAmbientLightColor(lighting.ambient);
+		rd->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor));
+	}
+	
+}
+
+void Application::exitApplication()
+{
+	//endApplet = true;
+    //endProgram = true;
+}
+
+
+void Application::onGraphics(RenderDevice* rd) {
+	
+	G3D::uint8 num = 0;
+	POINT mousepos;
+	mouseOnScreen = true;
+	if (GetCursorPos(&mousepos))
+	{
+		POINT pointm = mousepos;
+	if (ScreenToClient(_hWndMain, &mousepos))
+	{
+		//mouseOnScreen = true;
+		//POINT pointm;
+		///GetCursorPos(&pointm);
+		if(_hwndRenderer != WindowFromPoint(pointm)) //OLD: mousepos.x < 1 || mousepos.y < 1 || mousepos.x >= rd->getViewport().width()-1 || mousepos.y >= rd->getViewport().height()-1
+		{
+			mouseOnScreen = false;
+			//ShowCursor(true);
+			_window->setMouseVisible(true);
+			//rd->window()->setInputCaptureCount(0);
+		}
+		else
+		{
+			mouseOnScreen = true;
+			//SetCursor(NULL);
+			_window->setMouseVisible(false);
+			//rd->window()->setInputCaptureCount(1);
+		}
+		
+	}
+	}
+	
+	if(Globals::useMousePoint)
+	{
+		mousepos = Globals::mousepoint;
+		ScreenToClient(_hWndMain, &mousepos);
+	}
+	
+    LightingParameters lighting(G3D::toSeconds(11, 00, 00, AM));
+    renderDevice->setProjectionAndCameraMatrix(*cameraController.getCamera());
+	
+    // Cyan background
+    //renderDevice->setColorClearValue(Color3(0.0f, 0.5f, 1.0f));
+
+    renderDevice->clear(sky.isNull(), true, true);
+    if (sky.notNull()) {
+        sky->render(renderDevice, lighting);
+    }
+	
+    // Setup lighting
+    renderDevice->enableLighting();
+
+	renderDevice->setShadeMode(RenderDevice::SHADE_SMOOTH);
+	renderDevice->setAmbientLightColor(Color3(1,1,1));
+
+	renderDevice->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor));
+	renderDevice->setAmbientLightColor(lighting.ambient);
+	
+	rd->beforePrimitive();
+	CoordinateFrame forDraw = rd->getObjectToWorldMatrix();
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_COLOR_ARRAY);
+	glEnableClientState(GL_NORMAL_ARRAY);
+	
+	
+	
+
+	for (unsigned int i = 0; i < _dataModel->getWorkspace()->__pvVector.size(); i++)
+	{
+		_dataModel->getWorkspace()->__pvVector[i]->render(rd);
+	}
+	//_dataModel->getWorkspace()->render(rd);
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_COLOR_ARRAY);
+	glDisableClientState(GL_NORMAL_ARRAY);
+	rd->setObjectToWorldMatrix(forDraw);
+	rd->afterPrimitive();
+
+	if(g_selectedInstances.size() > 0)
+	{
+		for(size_t i = 0; i < g_selectedInstances.size(); i++)
+		{
+			if(PartInstance* part = dynamic_cast<PartInstance*>(g_selectedInstances.at(i)))
+			{
+			Vector3 size = part->getSize();
+			Vector3 pos = part->getPosition();
+			drawOutline(Vector3(0+size.x/2, 0+size.y/2, 0+size.z/2) ,Vector3(0-size.x/2,0-size.y/2,0-size.z/2), rd, lighting, Vector3(size.x/2, size.y/2, size.z/2), Vector3(pos.x, pos.y, pos.z), part->getCFrameRenderBased());
+			}
+		}
+	}
+	
+
+	//Vector3 gamepoint = Vector3(0, 5, 0);
+	//Vector3 camerapoint = rd->getCameraToWorldMatrix().translation;
+	//float distance = pow(pow((double)gamepoint.x - (double)camerapoint.x, 2) + pow((double)gamepoint.y - (double)camerapoint.y, 2) + pow((double)gamepoint.z - (double)camerapoint.z, 2), 0.5);
+	//if(distance < 50 && distance > -50)
+	
+	//{
+	//	if(distance < 0)
+	//	distance = distance*-1;
+	//	fntdominant->draw3D(rd, "Testing", CoordinateFrame(rd->getCameraToWorldMatrix().rotation, gamepoint), 0.04*distance, Color3::yellow(), Color3::black(), G3D::GFont::XALIGN_CENTER, G3D::GFont::YALIGN_CENTER);
+	//}
+
+    renderDevice->disableLighting();
+
+    if (sky.notNull()) {
+        sky->renderLensFlare(renderDevice, lighting);
+    }
+	renderDevice->push2D();
+		_dataModel->getGuiRoot()->renderGUI(renderDevice, m_graphicsWatch.FPS());
+		rd->pushState();
+			rd->beforePrimitive();
+
+			if(Globals::showMouse && mouseOnScreen)
+			{
+			glEnable( GL_TEXTURE_2D );
+			glEnable(GL_BLEND);// you enable blending function
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+			
+			std::vector<Instance*> instances = _dataModel->getWorkspace()->getAllChildren();
+			currentcursorid = cursorid;
+			for(size_t i = 0; i < instances.size(); i++)
+			{
+				if(PartInstance* test = dynamic_cast<PartInstance*>(instances.at(i)))
+				{
+					float time = cameraController.getCamera()->worldRay(_dataModel->mousex, _dataModel->mousey, renderDevice->getViewport()).intersectionTime(test->getBox());
+					//float time = testRay.intersectionTime(test->getBox());
+					if (time != inf()) 
+					{
+						currentcursorid = cursorOvrid;
+						break;
+					}
+					
+				}
+			}
+			
+			glBindTexture( GL_TEXTURE_2D, currentcursorid);
+
+			
+			glBegin( GL_QUADS );
+			glTexCoord2d(0.0,0.0);
+			glVertex2f(mousepos.x-64, mousepos.y-64);
+			glTexCoord2d( 1.0,0.0 );
+			glVertex2f(mousepos.x+64, mousepos.y-64);
+			glTexCoord2d(1.0,1.0 );
+			glVertex2f(mousepos.x+64, mousepos.y+64 );
+			glTexCoord2d( 0.0,1.0 );
+			glVertex2f( mousepos.x-64, mousepos.y+64 );
+			glEnd();
+
+			glDisable( GL_TEXTURE_2D );
+			}
+
+			rd->afterPrimitive();
+		rd->popState();
+	renderDevice->pop2D();
+}
+
+void Application::onKeyPressed(int key)
+{
+	if(key==VK_DELETE)
+	{
+		deleteInstance();
+	}
+	if (GetHoldKeyState(VK_RCONTROL))
+	{
+		if (key=='O')
+		{
+			_dataModel->getOpen();
+		}
+	}
+}
+void Application::onKeyUp(int key)
+{
+
+}
+
+void Application::onMouseLeftPressed(HWND hwnd,int x,int y)
+{
+	//Removed set focus 
+
+
+	std::cout << "Click: " << x << "," << y << std::endl;
+
+	bool onGUI = _dataModel->getGuiRoot()->mouseInGUI(renderDevice, x, y);
+	
+	
+	if(!onGUI)
+	{
+		testRay = cameraController.getCamera()->worldRay(_dataModel->mousex, _dataModel->mousey, renderDevice->getViewport());
+		float nearest=std::numeric_limits<float>::infinity();
+		Vector3 camPos = cameraController.getCamera()->getCoordinateFrame().translation;
+		std::vector<Instance*> instances = _dataModel->getWorkspace()->getAllChildren();
+        bool objFound = false;
+		for(size_t i = 0; i < instances.size(); i++)
+		{
+			if(PartInstance* test = dynamic_cast<PartInstance*>(instances.at(i)))
+			{
+				float time = testRay.intersectionTime(test->getBox());
+				
+				if (time != inf()) 
+				{
+					objFound = true;
+					if (nearest>time)
+					{
+						nearest=time;
+						bool found = false;
+						for(size_t i = 0; i < g_selectedInstances.size(); i++)
+						{
+							if(g_selectedInstances.at(i) == test)
+							{
+								found = true;
+								//ShowWindow(_propWindow->_hwndProp, SW_SHOW);
+								//SetActiveWindow(_propWindow->_hwndProp);
+								//SetForegroundWindow(_propWindow->_hwndProp);
+								break;
+							}
+						}
+						if(!found)
+						{
+							g_selectedInstances.clear();
+							g_selectedInstances.push_back(test);
+						}
+						selectInstance(test, _propWindow);
+						//_message = "Dragging = true.";
+						//_messageTime = System::time();
+						//_dragging = true;
+					}
+				}
+			}		
+		}
+		if(!objFound)
+			selectInstance(_dataModel,_propWindow);
+	}
+}
+
+void Application::selectInstance(Instance* selectedInstance, PropertyWindow* propWindow)
+{
+	g_selectedInstances.clear();
+	g_selectedInstances.push_back(selectedInstance);
+	propWindow->UpdateSelected(selectedInstance);
+
+}
+G3D::RenderDevice* Application::getRenderDevice()
+{
+	return renderDevice;
+}
+
+void Application::onMouseLeftUp(G3D::RenderDevice* renderDevice, int x, int y)
+{
+	//std::cout << "Release: " << x << "," << y << std::endl;
+	_dataModel->getGuiRoot()->onMouseLeftUp(renderDevice, x, y);
+	_dragging = false;
+	//_message = "Dragging = false.";
+	//_messageTime = System::time();
+
+}
+
+void Application::onMouseRightPressed(int x,int y)
+{
+}
+void Application::onMouseRightUp(int x,int y)
+{
+}
+void Application::onMouseMoved(int x,int y)
+{
+	oldMouse = _dataModel->getMousePos();
+	_dataModel->mousex = x;
+	_dataModel->mousey = y;
+
+}
+void Application::onMouseWheel(int x,int y,short delta)
+{
+	if (mouseOnScreen==true)
+	if (cameraController.onMouseWheel(x, y, delta))
+	{
+		AudioPlayer::playSound(cameraSound);
+	}
+}
+
+void Application::run() {
+	g_usableApp = this;
+	//setDebugMode(false);
+	//debugController.setActive(false);
+	/*
+	if (!createWindowClass("ToolWindowClass",ToolProc,GetModuleHandle(0)))
+	{
+		return;
+	}
+
+    HWND propertyHWnd = CreateWindowEx(
+    WS_EX_TOOLWINDOW,"ToolWindowClass", "ToolWindow",
+    WS_SYSMENU | WS_VISIBLE | WS_CHILD,
+	0, 0, 800, 64,
+    hWndMain, NULL, GetModuleHandle(0), NULL);
+
+	ShowWindow(propertyHWnd,SW_SHOW);
+	*/
+	UpdateWindow(_hWndMain);
+
+    // Load objects here=
+	cursor = Texture::fromFile(GetFileInPath("/content/images/ArrowCursor.png"));
+	cursorOvr = Texture::fromFile(GetFileInPath("/content/images/DragCursor.png"));
+	Globals::surface = Texture::fromFile(GetFileInPath("/content/images/surfacebr.png"));
+	Globals::surfaceId = Globals::surface->getOpenGLID();
+	cameraSound = GetFileInPath("/content/sounds/SWITCH3.wav");
+	clickSound = GetFileInPath("/content/sounds/switch.wav");
+	dingSound = GetFileInPath("/content/sounds/electronicpingshort.wav");
+    sky = Sky::create(NULL, ExePath() + "/content/sky/");
+	cursorid = cursor->openGLID();
+	currentcursorid = cursorid;
+	cursorOvrid = cursorOvr->openGLID();
+	RealTime	now=0, lastTime=0;
+	double		simTimeRate = 1.0f;
+	float		fps=3000.0f;
+
+	RealTime	desiredFrameDuration=1.0/fps;
+	onInit();
+	RealTime    lastWaitTime=0;
+
+	MSG			messages;
+	//RECT cRect;
+	//GetClientRect(_hWndMain,&cRect);
+	//renderDevice->notifyResize(cRect.right,cRect.bottom);
+	//Rect2D viewportRect = Rect2D::xywh(0,0,cRect.right,cRect.bottom);
+	//renderDevice->setViewport(viewportRect);
+	//window()->setInputCaptureCount(1);
+	resizeWithParent(_hWndMain);
+
+	while (!quit)
+	{
+		
+		lastTime = now;
+		now = System::getTick();
+		RealTime timeStep = now - lastTime;
+		
+		m_userInputWatch.tick();
+			onUserInput(userInput);
+			//m_moduleManager->onUserInput(_userInput);
+		m_userInputWatch.tock();
+		
+		m_simulationWatch.tick();
+			//debugController.doSimulation(clamp(timeStep, 0.0, 0.1));
+			//g3dCamera.setCoordinateFrame
+				//(debugController.getCoordinateFrame());
+
+			double rate = simTimeRate;    
+			RealTime rdt = timeStep;
+			SimTime  sdt = timeStep * rate;
+			SimTime  idt = desiredFrameDuration * rate;
+
+			onSimulation(rdt,sdt,idt);
+		m_simulationWatch.tock();
+
+		m_waitWatch.tick();
+		{
+			RealTime now = System::time();
+			// Compute accumulated time
+			System::sleep(max(0.0, desiredFrameDuration - (now - lastWaitTime)));
+			lastWaitTime = System::time();
+		}
+		m_waitWatch.tock();
+
+		m_graphicsWatch.tick();
+			renderDevice->beginFrame();
+				renderDevice->pushState();
+					onGraphics(renderDevice);
+				renderDevice->popState();
+				//renderDebugInfo();
+			renderDevice->endFrame();
+			//debugText.clear();
+		m_graphicsWatch.tock();
+
+		while (PeekMessage (&messages, NULL, 0, 0,PM_REMOVE))
+		{
+			if (IsDialogMessage(_hWndMain, &messages) == 0)
+			{
+				TranslateMessage(&messages);
+				DispatchMessage(&messages);
+			}
+		}
+	}
+	onCleanup();
+}
+void Application::resizeWithParent(HWND parentWindow)
+{
+	RECT rect;
+	GetClientRect(parentWindow,&rect);
+	SetWindowPos(_hwndRenderer,NULL,0,0,rect.right,rect.bottom-60,SWP_NOMOVE);
+	SetWindowPos(_hwndToolbox,NULL,0,rect.bottom-60,rect.right,60,SWP_NOACTIVATE | SWP_SHOWWINDOW);
+	GetClientRect(_hwndRenderer,&rect);
+	int viewWidth=rect.right;
+	int viewHeight=rect.bottom;
+	renderDevice->notifyResize(viewWidth,viewHeight);
+	Rect2D viewportRect = Rect2D::xywh(0,0,viewWidth,viewHeight);
+	renderDevice->setViewport(viewportRect);
+
+}
+
+void Application::QuitApp()
+{
+	PostQuitMessage(0);
+	quit=true;
+}
+
+void Application::onCreate(HWND parentWindow)
+{
+	//SetWindowLongPtr(hwndRenderer,GWL_USERDATA,(LONG)this);
+	//SetWindowLongPtr(hwndToolbox,GWL_USERDATA,(LONG)this);
+	//SetWindowLongPtr(hwndMain,GWL_USERDATA,(LONG)&app);
+}

Application.h

@@ -1,21 +1,20 @@
 #pragma once
 #include <G3DAll.h>
 #include "PropertyWindow.h"
-#include "DataModelV3/Gui/TextButtonInstance.h"
+#include "TextButtonInstance.h"
-#include "DataModelV3/Gui/ImageButtonInstance.h"
+#include "ImageButtonInstance.h"
 #include "CameraController.h"
-#include "IEBrowser.h"
+//#include "GuiRoot.h"
-#include "Mouse.h"
-#include "Tool/Tool.h"
 
-class B3D::TextButtonInstance;
+class TextButtonInstance;
-class B3D::ImageButtonInstance;
+class ImageButtonInstance;
-class B3D::PartInstance;
+class PartInstance;
 class CameraController;
 
 class Application { // : public GApp {
 	public:
 		Application(HWND parentWindow);
+		void Boop();
 		virtual			~Application() {}
 		virtual void	exitApplication();
 		virtual void	onInit();
@@ -26,8 +25,11 @@ class Application { // : public GApp {
 		virtual void	onUserInput(UserInput* ui);
 		virtual void	onCleanup();
 		void			clearInstances();
-		void			navigateToolbox(std::string);
 		PartInstance*	makePart();
+		void			drawButtons(RenderDevice* rd);
+		void			drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c);
+		void			makeFlag(Vector3 &vec, RenderDevice* &rd);
+		std::vector<Instance*>	getSelection();
 		void		deleteInstance();
 		void		run();
 		void		QuitApp();
@@ -43,26 +45,18 @@ class Application { // : public GApp {
 		void		onMouseWheel(int x, int y, short delta);
 		void		setFocus(bool isFocused);
 		int			getMode();
-		void		unSetMode();
-
 		CameraController	cameraController;
 		UserInput*			userInput;
 		PropertyWindow*		_propWindow;
-		void				generateShadowMap(const CoordinateFrame& lightViewMatrix) const;
+		void generateShadowMap(const CoordinateFrame& lightViewMatrix) const;
 		RenderDevice*		getRenderDevice();
 		void				selectInstance(Instance* selectedInstance,PropertyWindow* propWindow);
 		void				setMode(int mode);
-		void				resize3DView(int w, int h);		
-
-		Tool * tool;
-		void changeTool(Tool *);
-		Mouse mouse;
-		bool		viewportHasFocus();
 	private:
-		bool				mouseMoveState;
 		RenderDevice*		renderDevice;
 		//void				initGUI();
 		HWND				_hWndMain;
+		SkyRef				sky;
 		bool				quit;
 		bool				mouseOnScreen;
 		bool				rightButtonHolding;
@@ -71,16 +65,13 @@ class Application { // : public GApp {
 		HWND				_hwndToolbox;
 		HWND				_buttonTest;
 		HWND				_hwndRenderer;
-		//TODO make list
 		DataModelInstance*	_dataModel;
+		G3D::TextureRef		shadowMap;
 		std::string			_title;
-		//TODO deprecated?
 		bool				_dragging;
-		//TODO deprecated
 		int					_mode;
-		//Can be moved?
 		GAppSettings		_settings;
-		IEBrowser*		webBrowser;
+		double lightProjX, lightProjY, lightProjNear, lightProjFar;
 	protected:
 		Stopwatch           m_graphicsWatch;
 		Stopwatch           m_logicWatch;

AudioPlayer.cpp

@@ -0,0 +1,112 @@
+#include "AudioPlayer.h"
+#include "SDL.h"
+#include "SDL_audio.h"
+#include <stdlib.h>
+#include <malloc.h>
+#include <string.h>
+#define NUM_SOUNDS 10
+static SDL_AudioSpec fmt;
+static bool initiated = false;
+
+AudioPlayer::AudioPlayer(void)
+{
+	
+}
+
+AudioPlayer::~AudioPlayer(void)
+{
+	SDL_CloseAudio();
+}
+
+void AudioPlayer::init()
+{
+	initiated = true;
+	extern void mixaudio(void *unused, Uint8 *stream, int len);
+	fmt.freq = 22050;
+    fmt.format = AUDIO_S16;
+    fmt.channels = 2;
+    fmt.samples = 1024;        /* A good value for games */
+    fmt.callback = mixaudio;
+    fmt.userdata = NULL;
+
+    /* Open the audio device and start playing sound! */
+    if ( SDL_OpenAudio(&fmt, NULL) < 0 ) {
+        fprintf(stderr, "Unable to open audio: %s\n", SDL_GetError());
+    }
+    SDL_PauseAudio(0);
+}
+
+static struct sample {
+    Uint8 *data;
+    Uint32 dpos;
+    Uint32 dlen;
+} sounds[NUM_SOUNDS];
+
+void mixaudio(void *unused, Uint8 *stream, int len)
+{
+    int i;
+    Uint32 amount;
+
+    for ( i=0; i<NUM_SOUNDS; ++i ) {
+        amount = (sounds[i].dlen-sounds[i].dpos);
+        if ( amount > (Uint32)len ) {
+            amount = len;
+        }
+        SDL_MixAudio(stream, &sounds[i].data[sounds[i].dpos], amount, SDL_MIX_MAXVOLUME);
+        sounds[i].dpos += amount;
+    }
+}
+
+void AudioPlayer::playSound(std::string fileString)
+{
+
+	if(initiated)
+	{
+		char *file = new char[fileString.length() + 1];
+		strcpy(file, fileString.c_str());
+		
+
+		int index;
+		SDL_AudioSpec wave;
+		Uint8 *data;
+		Uint32 dlen;
+		SDL_AudioCVT cvt;
+
+		/* Look for an empty (or finished) sound slot */
+		for ( index=0; index<NUM_SOUNDS; ++index ) {
+			if ( sounds[index].dpos == sounds[index].dlen ) {
+				break;
+			}
+		}
+		if ( index == NUM_SOUNDS )
+			return;
+
+		/* Load the sound file and convert it to 16-bit stereo at 22kHz */
+		if ( SDL_LoadWAV(file, &wave, &data, &dlen) == NULL ) {
+			fprintf(stderr, "Couldn't load %s: %s\n", file, SDL_GetError());
+			return;
+		}
+		SDL_BuildAudioCVT(&cvt, wave.format, wave.channels, wave.freq,
+								AUDIO_S16,   2,             fmt.freq);
+		cvt.buf = (Uint8*)malloc(dlen*cvt.len_mult);
+		memcpy(cvt.buf, data, dlen);
+		cvt.len = dlen;
+		SDL_ConvertAudio(&cvt);
+		SDL_FreeWAV(data);
+
+		/* Put the sound data in the slot (it starts playing immediately) */
+		if ( sounds[index].data ) {
+			free(sounds[index].data);
+		}
+		SDL_LockAudio();
+		sounds[index].data = cvt.buf;
+		sounds[index].dlen = cvt.len_cvt;
+		sounds[index].dpos = 0;
+		SDL_UnlockAudio();
+		delete [] file;
+	}
+	else
+	{
+		OutputDebugString("Audio player not initialized, sound will not play\r\n");
+	}
+}

AudioPlayer.h

@@ -1,12 +1,11 @@
+#include <G3DAll.h>
 #pragma once
-#include <iostream>
+
-#include <string.h>
 class AudioPlayer
 {
 public:
 	AudioPlayer(void);
 	~AudioPlayer(void);
-
-	static void init();
 	static void playSound(std::string);
+	static void init();
 };

BaseButtonInstance.cpp

@@ -0,0 +1,57 @@
+#include "BaseButtonInstance.h"
+#include "Globals.h"
+
+
+ButtonListener* listener = NULL;
+
+BaseButtonInstance::BaseButtonInstance(void)
+{
+	Instance::Instance();
+	listener = NULL;
+}
+
+void BaseButtonInstance::render(RenderDevice* rd)
+{
+	DataModelInstance* dataModel = g_dataModel;
+	Vector2 pos = Vector2(dataModel->mousex,dataModel->mousey);
+	drawObj(rd, pos, dataModel->mouseButton1Down);
+	Instance::render(rd);
+}
+
+BaseButtonInstance::~BaseButtonInstance(void)
+{
+	delete listener;
+}
+
+void BaseButtonInstance::setButtonListener(ButtonListener* buttonListener)
+{
+	listener = buttonListener;
+}
+
+void BaseButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown){}
+
+bool BaseButtonInstance::mouseInButton(float mousex, float mousey, RenderDevice* rd){return false;}
+
+void BaseButtonInstance::onMouseClick()
+{
+	if(listener != NULL)
+	{
+		listener->onButton1MouseClick(this);
+		
+	}
+}
+
+
+bool BaseButtonInstance::mouseInArea(float point1x, float point1y, float point2x, float point2y, float mousex, float mousey)
+{
+	
+
+	if(mousex >= point1x && mousey >= point1y)
+	{
+		if(mousex < point2x && mousey < point2y)
+		{
+			return true;
+		}
+	}
+	return false;
+}

BaseButtonInstance.h

@@ -0,0 +1,26 @@
+#pragma once
+#include "instance.h"
+#include "ButtonListener.h"
+
+class ButtonListener;
+class Instance;
+
+class BaseButtonInstance : public Instance
+{
+public:
+	BaseButtonInstance(void);
+	virtual ~BaseButtonInstance(void);
+	virtual void render(RenderDevice* rd);
+	virtual void drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown);
+	virtual bool mouseInButton(float, float, RenderDevice* rd);
+	virtual void onMouseClick();
+	void setButtonListener(ButtonListener*);
+	bool floatBottom;
+	bool floatRight;
+	bool floatCenter;
+	volatile bool disabled;
+	bool selected;
+protected:
+	bool mouseInArea(float, float, float, float, float, float);
+	class ButtonListener* listener;
+};

Blocks3D VS2003.sln

@@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Blocks3D", "Blocks3D VS2003.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug.ActiveCfg = Debug|Win32
-		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug.Build.0 = Debug|Win32
-		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release.ActiveCfg = Release|Win32
-		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug|Win32.Build.0 = Debug|Win32
-		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release|Win32.ActiveCfg = Release|Win32
-		{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Blocks3D VS2003.vcproj

@@ -1,825 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="Blocks3D"
-	ProjectGUID="{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
-	RootNamespace="Blocks3D">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			UseOfATL="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="TRUE"
-				WholeProgramOptimization="TRUE"
-				AdditionalIncludeDirectories="C:\libraries\ode\include;C:\libraries\sdl\include;&quot;C:\libraries\g3d-6_10\include&quot;;.\src\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;NO_SDL_MAIN;_ATL_STATIC_REGISTRY"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeTypeInfo="TRUE"
-				PrecompiledHeaderFile=".\Release/Blocks3D.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib ode.lib Ole32.lib"
-				OutputFile="./Blocks3D.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="C:\libraries\sdl\lib\x86;C:\libraries\ode\lib\releaselib;&quot;C:\libraries\g3d-6_10\win32-7-lib&quot;"
-				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
-				SubSystem="2"
-				StackReserveSize="16777216"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="2"
-				LinkTimeCodeGeneration="TRUE"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/Blocks3D.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="4105"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2"
-			ManagedExtensions="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="C:\libraries\ode\include;C:\libraries\sdl\include;&quot;C:\libraries\g3d-6_10\include&quot;;.\src\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_ATL_STATIC_REGISTRY;NO_SDL_MAIN"
-				MinimalRebuild="FALSE"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="FALSE"
-				EnableEnhancedInstructionSet="0"
-				RuntimeTypeInfo="TRUE"
-				PrecompiledHeaderFile=".\Debug/Blocks3D.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib Urlmon.lib ole32.lib oleaut32.lib uuid.lib ode.lib"
-				OutputFile="./Blocks3D-Debug.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="C:\libraries\sdl\lib\x86;C:\libraries\ode\lib\debuglib;&quot;C:\libraries\g3d-6_10\win32-7-lib&quot;"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/Blocks3D.pdb"
-				SubSystem="1"
-				StackReserveSize="16777216"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/Blocks3D.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="4105"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Relese (Dec ALPHA)|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			UseOfATL="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="TRUE"
-				WholeProgramOptimization="TRUE"
-				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;NO_SDL_MAIN;_ATL_STATIC_REGISTRY"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeTypeInfo="TRUE"
-				PrecompiledHeaderFile=".\Release/Blocks3D.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib ode.lib Ole32.lib"
-				OutputFile="./Blocks3D.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
-				SubSystem="2"
-				StackReserveSize="16777216"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="2"
-				LinkTimeCodeGeneration="TRUE"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/Blocks3D.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="4105"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-		<AssemblyReference
-			RelativePath="System.dll"/>
-		<AssemblyReference
-			RelativePath="System.Data.dll"/>
-		<AssemblyReference
-			RelativePath="System.Drawing.dll"/>
-		<AssemblyReference
-			RelativePath="System.Windows.Forms.dll"/>
-		<AssemblyReference
-			RelativePath="System.XML.dll"/>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath=".\src\include\AbstractedInput.h">
-			</File>
-			<File
-				RelativePath=".\src\include\Application.h">
-			</File>
-			<File
-				RelativePath=".\src\include\AudioPlayer.h">
-			</File>
-			<File
-				RelativePath=".\src\include\ax.h">
-			</File>
-			<File
-				RelativePath=".\src\include\BrowserCallHandler.h">
-			</File>
-			<File
-				RelativePath=".\src\include\CameraController.h">
-			</File>
-			<File
-				RelativePath=".\src\include\Enum.h">
-			</File>
-			<File
-				RelativePath=".\src\include\ErrorFunctions.h">
-			</File>
-			<File
-				RelativePath=".\src\include\Faces.h">
-			</File>
-			<File
-				RelativePath=".\src\include\Globals.h">
-			</File>
-			<File
-				RelativePath=".\src\include\IEBrowser.h">
-			</File>
-			<File
-				RelativePath=".\src\include\IEDispatcher.h">
-			</File>
-			<File
-				RelativePath=".\src\include\MenuActions.h">
-			</File>
-			<File
-				RelativePath=".\src\include\Mouse.h">
-			</File>
-			<File
-				RelativePath=".\src\include\propertyGrid.h">
-			</File>
-			<File
-				RelativePath=".\src\include\PropertyWindow.h">
-			</File>
-			<File
-				RelativePath=".\src\include\Renderer.h">
-			</File>
-			<File
-				RelativePath=".\src\include\resource.h">
-			</File>
-			<File
-				RelativePath=".\src\include\SignalTypes.h">
-			</File>
-			<File
-				RelativePath=".\src\include\StringFunctions.h">
-			</File>
-			<File
-				RelativePath=".\src\include\TextureHandler.h">
-			</File>
-			<File
-				RelativePath=".\src\include\ToolEnum.h">
-			</File>
-			<File
-				RelativePath=".\src\include\versioning.h">
-			</File>
-			<File
-				RelativePath=".\src\include\VS2005CompatShim.h">
-			</File>
-			<File
-				RelativePath=".\src\include\win32Defines.h">
-			</File>
-			<File
-				RelativePath=".\src\include\WindowFunctions.h">
-			</File>
-			<Filter
-				Name="RapidXML">
-				<File
-					RelativePath=".\src\include\rapidxml\rapidxml.hpp">
-				</File>
-				<File
-					RelativePath=".\src\include\rapidxml\rapidxml_iterators.hpp">
-				</File>
-				<File
-					RelativePath=".\src\include\rapidxml\rapidxml_print.hpp">
-				</File>
-				<File
-					RelativePath=".\src\include\rapidxml\rapidxml_utils.hpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="Tool">
-				<File
-					RelativePath=".\src\include\Tool\ArrowTool.h">
-				</File>
-				<File
-					RelativePath=".\src\include\Tool\DraggerTool.h">
-				</File>
-				<File
-					RelativePath=".\src\include\Tool\SurfaceTool.h">
-				</File>
-				<File
-					RelativePath=".\src\include\Tool\Tool.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="Helpers">
-				<File
-					RelativePath=".\src\include\base64.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="Reflection"
-				Filter="">
-				<File
-					RelativePath=".\src\include\Reflection\Reflection.h">
-				</File>
-				<File
-					RelativePath=".\src\include\Reflection\ReflectionDataTable.h">
-				</File>
-				<File
-					RelativePath=".\src\include\Reflection\ReflectionProperty.h">
-				</File>
-				<File
-					RelativePath=".\src\include\Reflection\ReflectionProperty_impl.h">
-				</File>
-				<File
-					RelativePath=".\src\include\Reflection\ReflectionProperty_op_overload.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="DataModelV3"
-				Filter="">
-				<File
-					RelativePath=".\src\include\DataModelV3\DataModelInstance.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\GroupInstance.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\InputService.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\Instance.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\LevelInstance.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\LightingInstance.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\PartInstance.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\PVInstance.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\SelectionService.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\SignalService.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\SoundInstance.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\SoundService.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\WorkspaceInstance.h">
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\XplicitNgine\XplicitNgine.h">
-				</File>
-				<Filter
-					Name="Gui"
-					Filter="">
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\BaseButtonInstance.h">
-					</File>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\BaseGuiInstance.h">
-					</File>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\GuiRootInstance.h">
-					</File>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\ImageButtonInstance.h">
-					</File>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\TextButtonInstance.h">
-					</File>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\ToggleImageButtonInstance.h">
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath=".\src\source\Application.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\AudioPlayer.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\ax.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\BrowserCallHandler.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\CameraController.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\ErrorFunctions.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\Globals.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\IEBrowser.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\IEDispatcher.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\main.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\MenuActions.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\Mouse.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\propertyGrid.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\PropertyWindow.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\Renderer.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\StringFunctions.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\TextureHandler.cpp">
-			</File>
-			<File
-				RelativePath=".\src\source\WindowFunctions.cpp">
-			</File>
-			<Filter
-				Name="Tool">
-				<File
-					RelativePath=".\src\source\Tool\ArrowTool.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\Tool\DraggerTool.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\Tool\SurfaceTool.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\Tool\Tool.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="Helpers">
-				<File
-					RelativePath=".\src\source\base64.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="Reflection"
-				Filter="">
-				<File
-					RelativePath=".\src\source\Reflection\ReflectionDataTable.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="DataModelV3"
-				Filter="">
-				<File
-					RelativePath=".\src\source\DataModelV3\DataModelInstance.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\GroupInstance.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\InputService.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\Instance.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\LevelInstance.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\LightingInstance.cpp">
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Relese (Dec ALPHA)|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\PartInstance.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\PVInstance.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\SelectionService.cpp">
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Relese (Dec ALPHA)|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\SignalService.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\SoundInstance.cpp">
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Relese (Dec ALPHA)|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\SoundService.cpp">
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Relese (Dec ALPHA)|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\WorkspaceInstance.cpp">
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\XplicitNgine\XplicitNgine.cpp">
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Relese (Dec ALPHA)|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
-				<Filter
-					Name="Gui"
-					Filter="">
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\BaseButtonInstance.cpp">
-						<FileConfiguration
-							Name="Release|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Relese (Dec ALPHA)|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\BaseGuiInstance.cpp">
-						<FileConfiguration
-							Name="Release|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Relese (Dec ALPHA)|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\GuiRootInstance.cpp">
-						<FileConfiguration
-							Name="Release|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Relese (Dec ALPHA)|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\ImageButtonInstance.cpp">
-						<FileConfiguration
-							Name="Release|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Relese (Dec ALPHA)|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\TextButtonInstance.cpp">
-						<FileConfiguration
-							Name="Release|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Relese (Dec ALPHA)|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\ToggleImageButtonInstance.cpp">
-						<FileConfiguration
-							Name="Release|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Relese (Dec ALPHA)|Win32">
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-			<File
-				RelativePath=".\Dialogs.rc">
-			</File>
-			<File
-				RelativePath=".\icon1.ico">
-			</File>
-			<File
-				RelativePath=".\Parts.bmp">
-			</File>
-			<File
-				RelativePath=".\roblox_RN1_icon.ico">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-		<Global
-			Name="RESOURCE_FILE"
-			Value="Dialogs.rc"/>
-	</Globals>
-</VisualStudioProject>

Blocks3D.dsp

@@ -1,827 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Blocks3D" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=Blocks3D - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Blocks3D.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Blocks3D.mak" CFG="Blocks3D - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Blocks3D - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "Blocks3D - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Blocks3D - Win32 Release"
-# Name "Blocks3D - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "DataModelV2"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\BaseButtonInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\BaseGuiInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\DataModelInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\GroupInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\GuiRootInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\ImageButtonInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\Instance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\LevelInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\LightingInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\PartInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\PVInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\SelectionService.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\SoundInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\SoundService.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\TextButtonInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\ToggleImageButtonInstance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\DataModelV2\WorkspaceInstance.cpp
-# End Source File
-# End Group
-# Begin Group "Listener"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\source\Listener\ButtonListener.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Listener\CameraButtonListener.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Listener\DeleteListener.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Listener\GUDButtonListener.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Listener\MenuButtonListener.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Listener\ModeSelectionListener.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Listener\RotateButtonListener.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Listener\ToolbarListener.cpp
-# End Source File
-# End Group
-# Begin Group "Tool"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\source\Tool\ArrowTool.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Tool\DraggerTool.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Tool\SurfaceTool.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Tool\Tool.cpp
-# End Source File
-# End Group
-# Begin Group "Reflection"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\source\Reflection\ReflectionDataTable.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Reflection\ReflectionProperty.cpp
-# End Source File
-# End Group
-# Begin Group "XplicitNgine"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\source\XplicitNgine\XplicitNgine.cpp
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\src\source\Application.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\AudioPlayer.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\ax.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\base64.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\BrowserCallHandler.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\CameraController.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\ErrorFunctions.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Globals.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\IEBrowser.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\IEDispatcher.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\main.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Mouse.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\propertyGrid.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\PropertyWindow.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\Renderer.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\StringFunctions.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\TextureHandler.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\source\WindowFunctions.cpp
-
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
-
-# ADD CPP /I ".\src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
-
-# ADD CPP /I "src\include" /D "NO_SDL_MAIN"
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "DataModelV2_h"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\BaseButtonInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\BaseGuiInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\DataModelInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\GroupInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\GuiRootInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\ImageButtonInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\Instance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\LevelInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\LightingInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\PartInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\PVInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\SelectionService.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\SoundInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\SoundService.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\TextButtonInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\ThumbnailGeneratorInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\ToggleImageButtonInstance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\DataModelV2\WorkspaceInstance.h
-# End Source File
-# End Group
-# Begin Group "Listener_h"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\include\Listener\ButtonListener.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Listener\CameraButtonListener.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Listener\DeleteListener.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Listener\GUDButtonListener.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Listener\MenuButtonListener.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Listener\ModeSelectionListener.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Listener\RotateButtonListener.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Listener\ToolbarListener.h
-# End Source File
-# End Group
-# Begin Group "Tool_h"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\include\Tool\ArrowTool.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Tool\DraggerTool.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Tool\SurfaceTool.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Tool\Tool.h
-# End Source File
-# End Group
-# Begin Group "Reflection_h"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\include\Reflection\Reflection.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Reflection\ReflectionDataTable.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Reflection\ReflectionProperty.h
-# End Source File
-# End Group
-# Begin Group "XplicitNgine_h"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\include\XplicitNgine\XplicitNgine.h
-# End Source File
-# End Group
-# Begin Group "rapidxml"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\include\rapidxml\rapidxml.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\rapidxml\rapidxml_iterators.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\rapidxml\rapidxml_print.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\rapidxml\rapidxml_utils.hpp
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\src\include\Application.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\AudioPlayer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\ax.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\base64.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\BrowserCallHandler.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\CameraController.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Enum.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\ErrorFunctions.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Faces.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Globals.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\IEBrowser.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\IEDispatcher.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Mouse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\propertyGrid.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\PropertyWindow.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\Renderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\StringFunctions.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\TextureHandler.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\ToolEnum.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\versioning.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\VS2005CompatShim.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\win32Defines.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\include\WindowFunctions.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

Blocks3D.exe.manifest

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<dependency>
-		<dependentAssembly>
-			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
-		</dependentAssembly>
-	</dependency>
-	<!--This should generally not be specified, but XP's VS2005 won't update automatically-->
-<!--	<dependency>
-		<dependentAssembly>
-			<assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.6195" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
-		</dependentAssembly>
-	</dependency> -->
-</assembly>

Blocks3D.plg

@@ -1,120 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: Blocks3D - Win32 Debug--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP109.tmp" with contents
-[
-/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"Debug/Blocks3D.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\BaseButtonInstance.cpp"
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\DataModelInstance.cpp"
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\GroupInstance.cpp"
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\GuiRootInstance.cpp"
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\ImageButtonInstance.cpp"
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\LevelInstance.cpp"
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\PartInstance.cpp"
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\PVInstance.cpp"
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\TextButtonInstance.cpp"
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\ToggleImageButtonInstance.cpp"
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\DataModelV2\WorkspaceInstance.cpp"
-]
-Creating command line "cl.exe @E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP109.tmp" 
-Creating temporary file "E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP10A.tmp" with contents
-[
-/nologo /MLd /W3 /Gm /GX /ZI /Od /I "src\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "NO_SDL_MAIN" /Fp"Debug/Blocks3D.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"E:\Documents and Settings\Andreja\git\Blocks3D\src\source\Application.cpp"
-]
-Creating command line "cl.exe @E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP10A.tmp" 
-Creating temporary file "E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP10B.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/Blocks3D.pdb" /debug /machine:I386 /out:"Debug/Blocks3D.exe" /pdbtype:sept 
-".\Debug\BaseButtonInstance.obj"
-".\Debug\BaseGuiInstance.obj"
-".\Debug\DataModelInstance.obj"
-".\Debug\GroupInstance.obj"
-".\Debug\GuiRootInstance.obj"
-".\Debug\ImageButtonInstance.obj"
-".\Debug\Instance.obj"
-".\Debug\LevelInstance.obj"
-".\Debug\LightingInstance.obj"
-".\Debug\PartInstance.obj"
-".\Debug\PVInstance.obj"
-".\Debug\SelectionService.obj"
-".\Debug\SoundInstance.obj"
-".\Debug\SoundService.obj"
-".\Debug\TextButtonInstance.obj"
-".\Debug\ToggleImageButtonInstance.obj"
-".\Debug\WorkspaceInstance.obj"
-".\Debug\ButtonListener.obj"
-".\Debug\CameraButtonListener.obj"
-".\Debug\DeleteListener.obj"
-".\Debug\GUDButtonListener.obj"
-".\Debug\MenuButtonListener.obj"
-".\Debug\ModeSelectionListener.obj"
-".\Debug\RotateButtonListener.obj"
-".\Debug\ToolbarListener.obj"
-".\Debug\ArrowTool.obj"
-".\Debug\DraggerTool.obj"
-".\Debug\SurfaceTool.obj"
-".\Debug\Tool.obj"
-".\Debug\ReflectionDataTable.obj"
-".\Debug\ReflectionProperty.obj"
-".\Debug\XplicitNgine.obj"
-".\Debug\Application.obj"
-".\Debug\AudioPlayer.obj"
-".\Debug\ax.obj"
-".\Debug\base64.obj"
-".\Debug\BrowserCallHandler.obj"
-".\Debug\CameraController.obj"
-".\Debug\ErrorFunctions.obj"
-".\Debug\Globals.obj"
-".\Debug\IEBrowser.obj"
-".\Debug\IEDispatcher.obj"
-".\Debug\main.obj"
-".\Debug\Mouse.obj"
-".\Debug\propertyGrid.obj"
-".\Debug\PropertyWindow.obj"
-".\Debug\Renderer.obj"
-".\Debug\StringFunctions.obj"
-".\Debug\TextureHandler.obj"
-".\Debug\WindowFunctions.obj"
-]
-Creating command line "link.exe @E:\DOCUME~1\Andreja\LOCALS~1\Temp\RSP10B.tmp"
-<h3>Output Window</h3>
-Compiling...
-BaseButtonInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\basebuttoninstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/BaseButtonInstance.h': No such file or directory
-DataModelInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\datamodelinstance.cpp(4) : fatal error C1083: Cannot open include file: 'DataModelV2/GuiRootInstance.h': No such file or directory
-GroupInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\groupinstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/GroupInstance.h': No such file or directory
-GuiRootInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\guirootinstance.cpp(4) : fatal error C1083: Cannot open include file: 'DataModelV2/BaseButtonInstance.h': No such file or directory
-ImageButtonInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\imagebuttoninstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/ImageButtonInstance.h': No such file or directory
-LevelInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\levelinstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/DataModelInstance.h': No such file or directory
-PartInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\partinstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/PartInstance.h': No such file or directory
-PVInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\pvinstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/PVInstance.h': No such file or directory
-TextButtonInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\textbuttoninstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/TextButtonInstance.h': No such file or directory
-ToggleImageButtonInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\toggleimagebuttoninstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/ToggleImageButtonInstance.h': No such file or directory
-WorkspaceInstance.cpp
-e:\documents and settings\andreja\git\blocks3d\src\source\datamodelv2\workspaceinstance.cpp(1) : fatal error C1083: Cannot open include file: 'DataModelV2/WorkspaceInstance.h': No such file or directory
-Error executing cl.exe.
-Build : warning : failed to (or don't know how to) build 'E:\Documents and Settings\Andreja\git\Blocks3D\src\source\Reflection\ReflectionProperty.cpp'
-
-
-
-
-<h3>Results</h3>
-Blocks3D.exe - 11 error(s), 1 warning(s)
-</pre>
-</body>
-</html>

Blocks3D.vcproj

@@ -1,828 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="Blocks3D"
-	ProjectGUID="{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
-	RootNamespace="Blocks3D"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			UseOfATL="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/Blocks3D.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_ATL_STATIC_REGISTRY;NO_SDL_MAIN"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/Blocks3D.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="4105"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib ode.lib Ole32.lib"
-				OutputFile="./Blocks3D.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
-				SubSystem="2"
-				StackReserveSize="16777216"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="2"
-				LinkTimeCodeGeneration="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/Blocks3D.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/Blocks3D.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\src\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_ATL_STATIC_REGISTRY;NO_SDL_MAIN"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				EnableFunctionLevelLinking="false"
-				PrecompiledHeaderFile=".\Debug/Blocks3D.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="4105"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib Urlmon.lib ole32.lib oleaut32.lib uuid.lib oded.lib"
-				OutputFile="./Blocks3D-Debug.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/Blocks3D.pdb"
-				SubSystem="1"
-				StackReserveSize="16777216"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/Blocks3D.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-		<AssemblyReference
-			RelativePath="System.dll"
-			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-		/>
-		<AssemblyReference
-			RelativePath="System.Data.dll"
-			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
-		/>
-		<AssemblyReference
-			RelativePath="System.Drawing.dll"
-			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
-		/>
-		<AssemblyReference
-			RelativePath="System.Windows.Forms.dll"
-			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-		/>
-		<AssemblyReference
-			RelativePath="System.XML.dll"
-			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-		/>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath=".\src\source\Application.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\AudioPlayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\ax.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\BrowserCallHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\CameraController.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\ErrorFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\Globals.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\IEBrowser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\IEDispatcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\Mouse.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\propertyGrid.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\PropertyWindow.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\Renderer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\StringFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\TextureHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\WindowFunctions.cpp"
-				>
-			</File>
-			<Filter
-				Name="Tool"
-				>
-				<File
-					RelativePath=".\src\source\Tool\ArrowTool.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Tool\DraggerTool.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Tool\SurfaceTool.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\Tool\Tool.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Helpers"
-				>
-				<File
-					RelativePath=".\src\source\base64.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Reflection"
-				>
-				<File
-					RelativePath=".\src\source\Reflection\ReflectionDataTable.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="DataModelV3"
-				>
-				<File
-					RelativePath=".\src\source\DataModelV3\DataModelInstance.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\GroupInstance.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\Instance.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\LevelInstance.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\LightingInstance.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\PartInstance.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\PVInstance.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\SelectionService.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\SoundInstance.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\SoundService.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\source\DataModelV3\WorkspaceInstance.cpp"
-					>
-				</File>
-				<Filter
-					Name="XplicitNgine"
-					>
-					<File
-						RelativePath=".\src\source\DataModelV3\XplicitNgine\XplicitNgine.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-				<Filter
-					Name="Gui"
-					>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\BaseButtonInstance.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\BaseGuiInstance.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\GuiRootInstance.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\ImageButtonInstance.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\TextButtonInstance.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\source\DataModelV3\Gui\ToggleImageButtonInstance.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath=".\src\include\Application.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\AudioPlayer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\ax.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\BrowserCallHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\CameraController.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\Enum.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\ErrorFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\Faces.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\Globals.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\IEBrowser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\IEDispatcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\Mouse.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\propertyGrid.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\PropertyWindow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\Renderer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\StringFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\TextureHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\ToolEnum.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\versioning.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\VS2005CompatShim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\win32Defines.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\WindowFunctions.h"
-				>
-			</File>
-			<Filter
-				Name="RapidXML"
-				>
-				<File
-					RelativePath=".\src\include\rapidxml\rapidxml.hpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\rapidxml\rapidxml_iterators.hpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\rapidxml\rapidxml_print.hpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\rapidxml\rapidxml_utils.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Tool"
-				>
-				<File
-					RelativePath=".\src\include\Tool\ArrowTool.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Tool\DraggerTool.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Tool\SurfaceTool.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Tool\Tool.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Helpers"
-				>
-				<File
-					RelativePath=".\src\include\base64.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Reflection"
-				>
-				<File
-					RelativePath=".\src\include\Reflection\Reflection.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Reflection\ReflectionDataTable.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Reflection\ReflectionProperty.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\Reflection\ReflectionProperty_impl.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="DataModelV3"
-				>
-				<File
-					RelativePath=".\src\include\DataModelV3\DataModelInstance.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\GroupInstance.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\Instance.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\LevelInstance.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\LightingInstance.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\PartInstance.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\PVInstance.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\SelectionService.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\SoundInstance.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\SoundService.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\include\DataModelV3\WorkspaceInstance.h"
-					>
-				</File>
-				<Filter
-					Name="Gui"
-					>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\BaseButtonInstance.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\BaseGuiInstance.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\GuiRootInstance.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\ImageButtonInstance.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\TextButtonInstance.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\include\DataModelV3\Gui\ToggleImageButtonInstance.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="XplicitNgin"
-					>
-					<File
-						RelativePath=".\src\include\DataModelV3\XplicitNgine\XplicitNgine.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath=".\Blocks3D.exe.manifest"
-				>
-			</File>
-			<File
-				RelativePath=".\Dialogs.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\icon1.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\Parts.bmp"
-				>
-			</File>
-			<File
-				RelativePath=".\roblox_RN1_icon.ico"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-		<Global
-			Name="RESOURCE_FILE"
-			Value="Dialogs.rc"
-		/>
-	</Globals>
-</VisualStudioProject>

ButtonListener.cpp

@@ -0,0 +1,16 @@
+#include "BaseButtonInstance.h"
+#include "ButtonListener.h"
+
+
+ButtonListener::ButtonListener()
+{
+}
+
+ButtonListener::~ButtonListener(void)
+{
+}
+
+void ButtonListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+}
+

ButtonListener.h

@@ -0,0 +1,21 @@
+#pragma once
+//#include "Application.h"
+//#include "BaseButtonInstance.h"
+
+class BaseButtonInstance;
+
+class ButtonListener
+{
+	public:
+		ButtonListener();
+		~ButtonListener(void);
+		virtual void onButton1MouseClick(BaseButtonInstance*);
+		//virtual void onMouseOver(); //TODO
+		//virtual void onMouseOut(); //TODO
+		//virtual void onButton1MouseDown(); //TODO
+		//virtual void onButton1MouseUp(); //TODO
+		//virtual void onButton2MouseClick(); //TODO
+		//virtual void onButton2MouseDown(); //TODO
+		//virtual void onButton2MouseUp(); //TODO
+		//What to do now...
+};

CameraButtonListener.cpp

@@ -0,0 +1,24 @@
+#include "CameraButtonListener.h"
+#include "Globals.h"
+#include "AudioPlayer.h"
+#include "Application.h"
+
+void CameraButtonListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+	AudioPlayer::playSound(cameraSound);
+	CoordinateFrame frame = g_usableApp->cameraController.getCamera()->getCoordinateFrame();
+	if(button->name == "CenterCam" && g_selectedInstances.size() > 0)
+		g_usableApp->cameraController.centerCamera(g_selectedInstances.at(0));
+	else if(button->name == "ZoomIn")
+		g_usableApp->cameraController.Zoom(1);
+	else if(button->name == "ZoomOut")
+		g_usableApp->cameraController.Zoom(-1);
+	else if(button->name == "PanRight")
+		g_usableApp->cameraController.panRight();
+	else if(button->name == "PanLeft")
+		g_usableApp->cameraController.panLeft();
+	else if(button->name == "TiltUp")
+		g_usableApp->cameraController.tiltUp();
+	else if(button->name == "TiltDown")
+		g_usableApp->cameraController.tiltDown();
+}

CameraButtonListener.h

@@ -0,0 +1,7 @@
+#pragma once
+#include "ButtonListener.h"
+
+class CameraButtonListener : public ButtonListener {
+public:
+	void onButton1MouseClick(BaseButtonInstance*);
+};

CameraController.cpp

@@ -1,11 +1,10 @@
 #include "CameraController.h"
 #include "win32Defines.h"
 #include <iostream>
-#include "DataModelV3/PartInstance.h"
+#include "PartInstance.h"
 #include "Application.h"
 #include "AudioPlayer.h"
 
-using namespace B3D;
 
 
 CameraController::CameraController() :
@@ -58,35 +57,6 @@ void CameraController::refreshZoom(const CoordinateFrame& frame)
 
 void CameraController::pan(CoordinateFrame* frame,float spdX, float spdY)
 {
-	
-		yaw+=spdX;
-		pitch+=spdY;
-
-		if (pitch>1.4f) pitch=1.4f;
-		if (pitch<-1.4f) pitch=-1.4f;
-		frame->translation = Vector3(sin(-yaw)*zoom*cos(pitch),sin(pitch)*zoom,cos(-yaw)*zoom*cos(pitch))+focusPosition;
-		frame->lookAt(focusPosition);
-}
-
-void CameraController::panLock(CoordinateFrame* frame,float spdX, float spdY)
-{
-		int sign = 0;	
-		
-		
-		yaw = toDegrees(yaw);
-		if((((yaw - fmod(yaw, 45)) / 45) * 45) < 0)
-		{
-			sign = 1;
-		}
-		yaw = fabs(yaw);
-		yaw = ((yaw - fmod(yaw, 45)) / 45) * 45;
-		yaw = toRadians(yaw);
-
-		if(sign==1)
-		{
-			yaw = yaw * -1;
-		}
-	
 		yaw+=spdX;
 		pitch+=spdY;
 
@@ -135,14 +105,14 @@ void CameraController::Zoom(short delta)
 void CameraController::panLeft()
 {
 	CoordinateFrame frame = g3dCamera.getCoordinateFrame();
-	panLock(&frame,toRadians(-45),0);
+	pan(&frame,toRadians(-45),0);
 	setFrame(frame);
 	
 }
 void CameraController::panRight()
 {
 	CoordinateFrame frame = g3dCamera.getCoordinateFrame();
-	panLock(&frame,toRadians(45),0);
+	pan(&frame,toRadians(45),0);
 	setFrame(frame);
 }
 
@@ -160,11 +130,6 @@ void CameraController::tiltDown()
 	setFrame(frame);
 }
 
-void CameraController::zoomExtents() 
-{
-	// do some weird jank math
-}
-
 void CameraController::centerCamera(Instance* selection)
 {
 	CoordinateFrame frame = CoordinateFrame(g3dCamera.getCoordinateFrame().translation);
@@ -194,8 +159,6 @@ void CameraController::update(Application* app)
 	Vector3 cameraPos = g3dCamera.getCoordinateFrame().translation;
 	CoordinateFrame frame = g3dCamera.getCoordinateFrame();
 	bool moving=false;
-	if(!app->viewportHasFocus())
-		return;
 	if(GetHoldKeyState('U')) {
 		forwards = true;
 		moving=true;

CameraController.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <G3DAll.h>
-#include "DataModelV3/Instance.h"
+#include "Instance.h"
 #include "Globals.h"
 #include <string>
 
@@ -19,14 +19,12 @@ class CameraController {
 		void lookAt(const Vector3& position);
 		void refreshZoom(const CoordinateFrame& frame);
 		void pan(CoordinateFrame* frame,float spdX,float spdY);
-		void panLock(CoordinateFrame* frame,float spdX,float spdY);
 		void update(Application* app);
 		void centerCamera(Instance* selection);
 		void panLeft();
 		void panRight();
 		void tiltUp();
 		void tiltDown();
-		void zoomExtents();
 		void Zoom(short delta);
 		bool onMouseWheel(int x, int y, short delta);
 		GCamera* getCamera();

DataModelInstance.cpp

@@ -1,103 +1,95 @@
-#include "DataModelV3/DataModelInstance.h"
+#include <string>
-//TODO should this be here?
+#include "GuiRoot.h"
-#include "DataModelV3/Gui/ToggleImageButtonInstance.h"
+#include "DataModelInstance.h"
-using namespace B3D;
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <commdlg.h>
+#include "ErrorFunctions.h"
 
-DataModelInstance::DataModelInstance(void) : Instance("DataModel")
+using namespace std;
+using namespace rapidxml;
+
+
+DataModelInstance::DataModelInstance(void)
 {
-	// Instances
+	Instance::Instance();
-	printf("I am DataModel and I will be created!\n");
-	name = "Level";
-
-	parentDataModel = this;
 	workspace = new WorkspaceInstance();
-	guiRoot = new GuiRootInstance();
+	guiRoot = new GuiRoot();
 	level = new LevelInstance();
-	//thumbnailGenerator = new ThumbnailGeneratorInstance();
+	//children.push_back(workspace);
-	soundService = new SoundService();
+	//children.push_back(level);
-	lightingInstance = new LightingInstance();
+	className = "dataModel";
-
+	mousex = 0;
-	selectionService = new SelectionService();
+	mousey = 0;
-
+	mouseButton1Down = false;
-	signalService = new SignalService();
-
-	//TODO change how property window is either passed or accessed
-	//selectionService->setPropertyWindow(g_usableApp->_propWindow);
 	showMessage = false;
 	canDelete = false;
-
+	_modY=0;
-	// Parent stuff
 	workspace->setParent(this);
 	level->setParent(this);
-	soundService->setParent(this);
+	_loadedFileName="..//skooter.rbxm";
-	lightingInstance->setParent(this);
+	listicon = 5;
-	guiRoot->setParent(this);
-
-	running = false;
-	xplicitNgine = NULL;
-	resetEngine();
-}
-
-void DataModelInstance::resetEngine()
-{
-	if(xplicitNgine != NULL)
-		delete xplicitNgine;
-	xplicitNgine = new XplicitNgine();
-	for(size_t i = 0; i < getWorkspace()->partObjects.size(); i++)
-	{
-		PartInstance* partInstance = getWorkspace()->partObjects[i];
-		partInstance->physBody = NULL;
-	}
-}
-
-
-XplicitNgine * DataModelInstance::getEngine()
-{
-	return xplicitNgine;
-}
-
-SignalService * DataModelInstance::getSignalService()
-{
-	return signalService;
-}
-
-void DataModelInstance::toggleRun()
-{
-	running = !running;
 	
-	//TODO implement (in RunService!!!)
-	if(!running)
-		resetEngine();
-}
-
-bool DataModelInstance::isRunning()
-{
-	return running;
 }
 
 DataModelInstance::~DataModelInstance(void)
 {
-	//TODO implement in run service
-	delete xplicitNgine;
 }
 
+#ifdef _DEBUG
+void DataModelInstance::modXMLLevel(float modY)
+{
+	_modY += modY;
+	clearLevel();
+	debugGetOpen();
+
+}
+#endif
+
 void DataModelInstance::clearLevel()
 {
-	running = false;
-	Instance * goButton = this->getGuiRoot()->findFirstChild("go");
-	if(goButton != NULL){
-		if(ToggleImageButtonInstance* goButtonReal = dynamic_cast<ToggleImageButtonInstance*>(goButton))
-		{
-			goButtonReal->checked = false;
-		}
-	}
-	selectionService->clearSelection();
-	selectionService->addSelected(this);
 	workspace->clearChildren();
 }
+PartInstance* DataModelInstance::makePart()
+{
+	PartInstance* part = new PartInstance();
+	return part;
+}
 
-//TODO move elsewhere
+rapidxml::xml_node<>* DataModelInstance::getNode(xml_node<> * node,const char* name)
-Color3 DataModelInstance::bcToRGB(short bc)
+{
+	xml_node<> * tempNode = node->first_node(name);
+	if (!tempNode)
+	{
+		_errMsg = "Expected <";
+		_errMsg += name;
+		_errMsg+="> tag.";
+		_successfulLoad=false;
+		return 0;
+	}
+	return tempNode;
+}
+float DataModelInstance::getFloatValue(xml_node<> * node,const char* name)
+{
+	xml_node<> * tempNode = node->first_node(name);
+	if (!tempNode)
+	{
+		_errMsg = "Expected <";
+		_errMsg += name;
+		_errMsg+="> tag.";
+		_successfulLoad=false;
+		return 0;
+	}
+	float newFloat;
+	stringstream converter;
+	converter << tempNode->value();
+	converter >> newFloat;
+	return newFloat;
+}
+
+
+Color3 bcToRGB(short bc)
 {
 	switch(bc)
 	{
@@ -248,6 +240,254 @@ Color3 DataModelInstance::bcToRGB(short bc)
 	}
 }
 
+
+
+bool DataModelInstance::scanXMLObject(xml_node<> * scanNode)
+{
+	xml_node<> * watchFirstNode = scanNode->first_node();
+	
+	for (xml_node<> *node = scanNode->first_node();node; node = node->next_sibling())
+	{
+
+		if (strncmp(node->name(),"Item",4)==0)
+		{
+			xml_attribute<> *classAttr = node->first_attribute("class");
+			std::string className = classAttr->value();
+			if (className=="Part") {
+				xml_node<> *propNode = node->first_node();
+				xml_node<> *cFrameNode=0;
+				xml_node<> *sizeNode=0;
+				xml_node<> *colorNode=0;
+				xml_node<> *brickColorNode=0;
+				xml_node<> *nameNode=0;
+
+				for (xml_node<> *partPropNode = propNode->first_node();partPropNode; partPropNode = partPropNode->next_sibling())
+				{
+					for (xml_attribute<> *attr = partPropNode->first_attribute();attr; attr = attr->next_attribute())
+					{
+						std::string xmlName = attr->name();
+						std::string xmlValue = attr->value();
+						
+						if (xmlValue=="CFrame" | xmlValue=="CoordinateFrame")
+						{
+							 cFrameNode = partPropNode;
+						}
+						if (xmlValue=="Name")
+						{
+							 nameNode = partPropNode;
+						}
+						if (xmlValue=="Color")
+						{
+							colorNode=partPropNode;
+						}
+						if (xmlValue=="BrickColor")
+						{
+							brickColorNode=partPropNode;
+						}
+						if (xmlValue=="size")
+						{
+							sizeNode = partPropNode;
+							_legacyLoad=false;
+						}
+						if (xmlValue=="Part")
+						{
+							for (xml_node<> *featureNode = partPropNode->first_node();featureNode; featureNode = featureNode->next_sibling())
+							{
+								for (xml_attribute<> *attr = featureNode->first_attribute();attr; attr = attr->next_attribute())
+								{
+									std::string xmlName = attr->name();
+									std::string xmlValue = attr->value();
+									if (xmlValue=="size")
+									{
+										sizeNode=featureNode;
+										_legacyLoad=true;
+									}
+								}
+							}
+						}
+					}
+				}
+
+				if (!cFrameNode) {
+					_errMsg="CFrame is missing in Part";
+					return false;
+				}
+				if (!sizeNode) {
+					_errMsg="Size is missing in Part";
+					return false;
+				}
+
+				float R=1;
+				float G=1;
+				float B=1;
+
+				if (colorNode)
+				{
+					R = getFloatValue(colorNode,"R");
+					G = getFloatValue(colorNode,"G");
+					B = getFloatValue(colorNode,"B");
+				}
+				
+
+				std::string newName = nameNode->value();
+				float X = getFloatValue(cFrameNode,"X");
+				float Y = getFloatValue(cFrameNode,"Y");
+				float Z = getFloatValue(cFrameNode,"Z");
+				float R00 = getFloatValue(cFrameNode,"R00");
+				float R01 = getFloatValue(cFrameNode,"R01");
+				float R02 = getFloatValue(cFrameNode,"R02");
+				float R10 = getFloatValue(cFrameNode,"R10");
+				float R11 = getFloatValue(cFrameNode,"R11");
+				float R12 = getFloatValue(cFrameNode,"R12");
+				float R20 = getFloatValue(cFrameNode,"R20");
+				float R21 = getFloatValue(cFrameNode,"R21");
+				float R22 = getFloatValue(cFrameNode,"R22");
+
+				float sizeX = getFloatValue(sizeNode,"X");
+				float sizeY = getFloatValue(sizeNode,"Y");
+				float sizeZ = getFloatValue(sizeNode,"Z");
+				//sizeX=1;
+				//sizeY=1;
+				//sizeZ=1;
+				if (_successfulLoad) {
+					PartInstance* test = makePart();
+					test->setParent(getWorkspace());
+					test->color = Color3(R,G,B);
+					if(brickColorNode)
+					{
+						test->color = bcToRGB(atoi(brickColorNode->value()));
+					}
+					test->setSize(Vector3(sizeX,sizeY+_modY,sizeZ));
+					test->setName(newName);
+					CoordinateFrame cf;
+					
+					if (_legacyLoad)
+					{
+						
+						cf = CoordinateFrame(Vector3(-X,Y,Z))*CoordinateFrame(Vector3(-sizeX/2,(sizeY+_modY)/2,sizeZ/2)*Matrix3(R00,R01,R02,R10,R11,R12,R20,R21,R22));
+						cf.rotation = Matrix3(R00,R01,R02,R10,R11,R12,R20,R21,R22);
+					}
+					else
+					{
+						cf.translation = Vector3(X,Y,Z);
+						cf.rotation = Matrix3(R00,R01,R02,R10,R11,R12,R20,R21,R22);
+					}
+					
+					test->setCFrame(cf);
+				}
+				else
+				{
+					return false;
+				}
+
+			}
+		}
+		/*
+		for (xml_attribute<> *attr = node->first_attribute();attr; attr = attr->next_attribute())
+		{
+			std::string xmlName = attr->name();
+			std::string xmlValue = attr->value();
+		}
+		*/
+		scanXMLObject(node);
+	}
+
+	return true;
+}
+
+bool DataModelInstance::load(const char* filename, bool clearObjects)
+{
+	ifstream levelFile(filename,ios::binary);
+	if (levelFile)
+	{
+		if (clearObjects)
+			clearLevel();
+		readXMLFileStream(&levelFile);
+		std::string sfilename = std::string(filename);
+		std::size_t begin = sfilename.rfind('\\') + 1;
+		std::size_t end = sfilename.find(".rbx");
+		std::string hname = sfilename.substr(begin);
+		std::string tname = hname.substr(0, hname.length() - 5);
+		name = tname;
+		return true;
+	}
+	else
+	{
+		std::stringstream msg;
+		msg << "Failed to load file:" << std::endl << filename << std::endl << strerror(errno);
+		MessageBoxStr(msg.str());
+	}
+}
+
+bool DataModelInstance::readXMLFileStream(std::ifstream* file)
+{
+	file->seekg(0,file->end);
+	int length = file->tellg();
+	if (length<0)
+	{
+		MessageBoxStr("File is empty");
+		file->close();
+		return false;
+	}
+	file->seekg(0,file->beg);
+	char * buffer = new char[length+1];
+	buffer[length]=0;
+
+	file->read(buffer,length);
+	file->close();
+
+	if (!file)
+	{
+		stringstream msg;
+		msg << "Something went wrong." << endl << strerror(errno);
+		MessageBoxStr(msg.str());
+		return false;
+	}
+	_successfulLoad = true;
+	xml_document<> doc;
+	doc.parse<0>(buffer);
+	xml_node<> *mainNode = doc.first_node();
+	_legacyLoad=false;
+	//std::string xmlName = mainNode->name();
+	//node = node->first_node();
+	//xmlName = node->name();
+	scanXMLObject(mainNode);
+	delete[] buffer;
+	return true;
+}
+
+bool DataModelInstance::debugGetOpen()
+{
+	ifstream levelFile(_loadedFileName.c_str(),ios::binary);
+	if (levelFile)
+		readXMLFileStream(&levelFile);
+	else
+		getOpen();
+	return true;
+}
+
+bool DataModelInstance::getOpen()
+{
+	_modY=0;
+	OPENFILENAME of;
+	ZeroMemory( &of , sizeof( of));
+	of.lStructSize = sizeof(OPENFILENAME);
+	of.lpstrFilter = "Roblox Files\0*.rbxm;*.rbxl\0\0";
+	char szFile[512];
+	of.lpstrFile = szFile ;
+	of.lpstrFile[0]='\0';
+	of.nMaxFile=500;
+	of.lpstrTitle="Hello";
+	of.Flags = OFN_FILEMUSTEXIST;
+	ShowCursor(TRUE);
+	BOOL file = GetOpenFileName(&of);
+	if (file)
+	{
+		_loadedFileName = of.lpstrFile;
+		load(of.lpstrFile,true);
+	}
+	return true;
+}
 void DataModelInstance::setMessage(std::string msg)
 {
 	message = msg;
@@ -287,9 +527,9 @@ void DataModelInstance::drawMessage(RenderDevice* rd)
 			}
 		}
 		char brkc[12];
-		_snprintf(brkc, 12, "%d", brickCount);
+		sprintf_s(brkc, "%d", brickCount);
 		char instc[12];
-		_snprintf(instc, 12, "%d", instCount);
+		sprintf_s(instc, "%d", instCount);
 		message = "Bricks: ";
 		message += brkc;
 		message += "	Snaps: ";
@@ -310,35 +550,27 @@ WorkspaceInstance* DataModelInstance::getWorkspace()
 {
 	return workspace;
 }
-
+Vector2 DataModelInstance::getMousePos()
-GuiRootInstance* DataModelInstance::getGuiRoot()
+{
+	return Vector2(mousex,mousey);
+}
+void DataModelInstance::setMousePos(int x,int y)
+{
+	mousex=x;
+	mousey=y;
+}
+void DataModelInstance::setMousePos(Vector2 pos)
+{
+	mousex=pos.x;
+	mousey=pos.y;
+}
+GuiRoot* DataModelInstance::getGuiRoot()
 {
 	return guiRoot;
 }
 
-SelectionService* DataModelInstance::getSelectionService()
-{
-	return selectionService;
-}
 
 LevelInstance* DataModelInstance::getLevel()
 {
 	return level;
-}
-
-//TODO implement
-/*ThumbnailGeneratorInstance* DataModelInstance::getThumbnailGenerator()
-{
-	return thumbnailGenerator;
-}*/
-
-
-SoundService* DataModelInstance::getSoundService()
-{
-	return soundService;
-}
-
-LightingInstance* DataModelInstance::getLighting()
-{
-	return lightingInstance;
 }

DataModelInstance.h

@@ -0,0 +1,54 @@
+#pragma once
+#include "WorkspaceInstance.h"
+#include "LevelInstance.h"
+#include "PartInstance.h"
+#include "rapidxml/rapidxml.hpp"
+#include "GuiRoot.h"
+
+class GuiRoot;
+
+class DataModelInstance :
+	public Instance
+{
+public:
+	DataModelInstance(void);
+	~DataModelInstance(void);
+	void					setMessage(std::string);
+	void					setMessageBrickCount();
+	void					clearMessage();
+	bool					debugGetOpen();
+	bool					getOpen();
+	bool					load(const char* filename,bool clearObjects);	
+	bool					readXMLFileStream(std::ifstream* file);
+	void					drawMessage(RenderDevice*);
+	WorkspaceInstance*		getWorkspace();
+	WorkspaceInstance*		workspace;
+	LevelInstance *			level;
+	LevelInstance *			getLevel();
+	GuiRoot*				guiRoot;
+	std::string				message;
+	std::string				_loadedFileName;
+	bool					showMessage;
+	G3D::GFontRef			font;
+	GuiRoot*				getGuiRoot();
+	float					mousex;
+	float					mousey;
+	Vector2					getMousePos();
+	void					setMousePos(int x,int y);
+	void					setMousePos(Vector2 pos);
+	bool					mouseButton1Down;
+	PartInstance*			makePart();
+	void					clearLevel();
+#if _DEBUG
+	void					modXMLLevel(float modY);
+#endif
+private:
+	bool isBrickCount;
+	bool					scanXMLObject(rapidxml::xml_node<>* node);
+	rapidxml::xml_node<>*	getNode(rapidxml::xml_node<> * node,const char* name );
+	float					getFloatValue(rapidxml::xml_node<> * node,const char* name);
+	bool					_successfulLoad;
+	std::string				_errMsg;
+	bool					_legacyLoad;
+	float					_modY;
+};

DeleteListener.cpp

@@ -0,0 +1,8 @@
+#include "DeleteListener.h"
+#include "Globals.h"
+#include "Application.h"
+
+void DeleteListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+	g_usableApp->deleteInstance();
+}

DeleteListener.h

@@ -0,0 +1,6 @@
+#include "ButtonListener.h"
+
+class DeleteListener : public ButtonListener {
+public:
+	void onButton1MouseClick(BaseButtonInstance*);
+};

Dialogs.rc

@@ -1,86 +1,43 @@
-// Generated by ResEdit 1.6.6
+// Generated by ResEdit 1.6.6
-// Copyright (C) 2006-2015
+// Copyright (C) 2006-2015
-// http://www.resedit.net
+// http://www.resedit.net
-
+
-#include <windows.h>
+#include <windows.h>
-#include <commctrl.h>
+#include <commctrl.h>
-#include <richedit.h>
+#include <richedit.h>
-#include "src/include/resource.h"
+#include "resource.h"
-#include "src/include/versioning.h"
+
-
+
-
+
-
+
-
+//
-//
+// Bitmap resources
-// Bitmap resources
+//
-//
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
+IDB_BITMAP1        BITMAP         "Parts.bmp"
-IDB_BITMAP1        BITMAP         "Parts.bmp"
+
-
+
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
-1 VERSIONINFO
+//
-    FILEVERSION     APP_GENER,APP_MAJOR,APP_MINOR,APP_PATCH
+// Dialog resources
-    PRODUCTVERSION  APP_GENER,APP_MAJOR,APP_MINOR,APP_PATCH
+//
-    FILEOS          VOS__WINDOWS32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-    FILETYPE        VFT_APP
+IDD_DIALOG1 DIALOG 0, 0, 295, 43
-    FILESUBTYPE     VFT2_UNKNOWN
+STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFOREGROUND | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU
-    FILEFLAGSMASK   0
+EXSTYLE WS_EX_WINDOWEDGE
-    FILEFLAGS       0
+CAPTION "Insert Object"
-{
+FONT 8, "Ms Shell Dlg"
-    BLOCK "StringFileInfo"
+{
-    {
+    EDITTEXT        IDE_EDIT, 35, 6, 195, 14, ES_AUTOHSCROLL, WS_EX_LEFT
-        BLOCK "100901B5"
+    LTEXT           "Class:", 0, 10, 9, 20, 9, SS_LEFT, WS_EX_LEFT
-        {
+    PUSHBUTTON      "Cancel", IDCANCEL, 237, 24, 50, 14, 0, WS_EX_LEFT
-            VALUE "Comments", ""
+    DEFPUSHBUTTON   "OK", IDOK, 237, 6, 50, 14, 0, WS_EX_LEFT
-            VALUE "CompanyName", "Blocks3D Team"
+}
-            VALUE "FileDescription", "Blocks 3D"
+
-            VALUE "FileVersion", VER_STR(APP_VER_STRING)
+
-            VALUE "InternalName", "Blocks3D"
+
-            VALUE "LegalCopyright", "Blocks3D Team 2018-2023"
+//
-            VALUE "LegalTrademarks", ""
+// Icon resources
-            VALUE "OriginalFilename", "Blocks3D.exe"
+//
-            VALUE "PrivateBuild", ""
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
-            VALUE "ProductName", "Blocks3D"
+IDI_ICON1          ICON           "icon1.ico"
-            VALUE "ProductVersion", VER_STR(APP_VER_STRING)
-            VALUE "SpecialBuild", ""
-        }
-    }
-    BLOCK "VarFileInfo"
-    {
-        VALUE "Translation", 0x1009, 0x01B5
-    }
-}
-
-//
-// Dialog resources
-//
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-IDD_DIALOG1 DIALOG 0, 0, 295, 43
-STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFOREGROUND | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU
-EXSTYLE WS_EX_WINDOWEDGE
-CAPTION "Insert Object"
-FONT 8, "Ms Shell Dlg"
-{
-    EDITTEXT        IDC_EDIT1, 35, 6, 195, 14, ES_AUTOHSCROLL, WS_EX_LEFT
-    LTEXT           "Class:", 0, 10, 9, 20, 9, SS_LEFT, WS_EX_LEFT
-    PUSHBUTTON      "Cancel", IDCANCEL, 237, 24, 50, 14, 0, WS_EX_LEFT
-    DEFPUSHBUTTON   "OK", IDOK, 237, 6, 50, 14, 0, WS_EX_LEFT
-}
-
-
-
-//
-// Icon resources
-//
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
-IDI_ICON1          ICON           "FatB3dIcon.ico"
-
-
-
-//
-// Manifest resources
-//
-#ifndef _DEBUG
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-1				MANIFEST    ".\\Blocks3D.exe.manifest"
-#endif

Documentation/index.html

@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <title> RBX05R Documentation </title>
+    <meta charset="utf-8">
+  </head>
+  <body>
+    <div class="content" style="text-align:center;">
+      <h1> ROBLOX 2005 Recreation documentation </h1>
+      <br>
+      <h4> Current for: r360 </h4> 
+    </div>
+  </body>
+  </html>

Enum.h

@@ -0,0 +1,17 @@
+#pragma once
+
+namespace Enum
+{
+	namespace SurfaceType
+	{
+		enum Value {
+			Smooth, Snaps, Inlets, Glue, Weld, Spawn, Hinge, Motor, Bumps
+		};
+	}
+	namespace Shape
+	{
+		enum Value {
+			Ball = 0, Block = 1, Cylinder = 2
+		};
+	}
+}

Enums.h

@@ -0,0 +1,16 @@
+#ifdef UENUMS
+#ifndef ENUM_H
+#define ENUM_H
+static enum BinType {GameTool, Grab, Clone, Hammer};
+static enum ControllerType {None, KeyboardRight, KeyboardLeft, Joypad1, Joypad2, Chase, Flee};
+//static enum JointType {UNK0, WeldJoint, SnapJoint, UNK3, Rotate, RotateP, RotateV, GlueJoint, UNK8, UNK9, None};
+static enum ActionType {Nothing, Pause, Lose, Draw, Win};
+static enum AffectType {NoChange, Increase, Decrease};
+static enum InputType {NoInput, LeftTread, RightTread, Steer, Throtle, UpDown, Action1, Action2, Action3, Action4, Action5, Constant, Sin};
+//static enum SurfaceConstraint {None, Hinge, SteppingMotor, Motor};
+static enum SurfaceType{Smooth, Snaps, Inlets, Glue, Weld, Spawn, Hinge, Motor, Bumps};
+static enum SoundType {NoSound, Boing, Bomb, Break, Click, Clock, Slingshot, Page, Ping, Snap, Splat, Step, StepOn, Swoosh, Victory};
+static enum PartType {Ball, Block, Cylinder};
+static enum KeywordFilterType {Include, Exclude};
+#endif
+#endif

ErrorFunctions.cpp

@@ -3,11 +3,13 @@
 #include "Globals.h"
 
 
-
 void OnError(int err, std::string msg)
 {
-	std::string emsg = "An unexpected error has occured and "+g_appName+" has to quit. We're sorry!" + msg;
+	//g_usableApp->window()->setInputCaptureCount(0);
-	std::string title = g_appName+" Crash";
+	//g_usableApp->window()->setMouseVisible(true);
+	std::string emsg = "An unexpected error has occured and "+g_PlaceholderName+" has to quit. We're sorry!" + msg;
+	std::string title = g_PlaceholderName+"Crash";
+	//clearInstances();
 	MessageBox(NULL, emsg.c_str(), title.c_str(), MB_OK);
 	exit(err);
 }
@@ -15,13 +17,13 @@ void OnError(int err, std::string msg)
 
 void MessageBoxStr(std::string msg)
 {
-	std::string title = g_appName;
+	std::string title = g_PlaceholderName;
 	MessageBox(NULL, msg.c_str(), title.c_str(), MB_OK);
 }
 
 void MessageBoxStream(std::stringstream msg)
 {
 	std::string strMsg = msg.str();
-	std::string title = g_appName;
+	std::string title = g_PlaceholderName;
 	MessageBox(NULL, strMsg.c_str(), title.c_str(), MB_OK);
 }

G3DTest.dsp

@@ -0,0 +1,105 @@
+# Microsoft Developer Studio Project File - Name="G3DTest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=G3DTest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "G3DTest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "G3DTest.mak" CFG="G3DTest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "G3DTest - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "G3DTest - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "G3DTest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x1009 /d "NDEBUG"
+# ADD RSC /l 0x1009 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF  "$(CFG)" == "G3DTest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x1009 /d "_DEBUG"
+# ADD RSC /l 0x1009 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "G3DTest - Win32 Release"
+# Name "G3DTest - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\main.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

G3DTest.dsw

@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
+Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
+
-###############################################################################
+###############################################################################
-
+
-Project: "Blocks3D"=".\Blocks3D.dsp" - Package Owner=<4>
+Project: "G3DTest"=.\G3DTest.dsp - Package Owner=<4>
-
+
-Package=<5>
+Package=<5>
-{{{
+{{{
-}}}
+}}}
-
+
-Package=<4>
+Package=<4>
-{{{
+{{{
-}}}
+}}}
-
+
-###############################################################################
+###############################################################################
-
+
-Global:
+Global:
-
+
-Package=<5>
+Package=<5>
-{{{
+{{{
-}}}
+}}}
-
+
-Package=<3>
+Package=<3>
-{{{
+{{{
-}}}
+}}}
-
+
-###############################################################################
+###############################################################################
-
+

G3DTest.plg

@@ -0,0 +1,32 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: G3DTest - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\Users\Andreja\AppData\Local\Temp\RSPFD70.tmp" with contents
+[
+/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"Debug/G3DTest.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\USERS\ANDREJA\G3D\G3DTest\main.cpp"
+]
+Creating command line "cl.exe @C:\Users\Andreja\AppData\Local\Temp\RSPFD70.tmp" 
+Creating temporary file "C:\Users\Andreja\AppData\Local\Temp\RSPFD71.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/G3DTest.pdb" /debug /machine:I386 /out:"Debug/G3DTest.exe" /pdbtype:sept 
+.\Debug\main.obj
+]
+Creating command line "link.exe @C:\Users\Andreja\AppData\Local\Temp\RSPFD71.tmp"
+<h3>Output Window</h3>
+Compiling...
+main.cpp
+Linking...
+
+
+
+<h3>Results</h3>
+G3DTest.exe - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>

G3DTest.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Blocks3D", "Blocks3D.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "G3DTest", "G3DTest.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

G3DTest.vcproj

@@ -0,0 +1,579 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="G3DTest"
+	ProjectGUID="{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
+	RootNamespace="G3DTest"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			UseOfATL="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/G3DTest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/G3DTest.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="4105"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib"
+				OutputFile="./G3DTest.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release/G3DTest.pdb"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/G3DTest.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			ManagedExtensions="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/G3DTest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="false"
+				PrecompiledHeaderFile=".\Debug/G3DTest.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="4105"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib"
+				OutputFile="./G3DTest-Debug.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/G3DTest.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/G3DTest.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<AssemblyReference
+			RelativePath="System.dll"
+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"
+			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
+		/>
+		<AssemblyReference
+			RelativePath="System.Drawing.dll"
+			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.Windows.Forms.dll"
+			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.XML.dll"
+			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath=".\Application.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\AudioPlayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ax.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\BrowserCallHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ButtonListener.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\CameraController.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ErrorFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Globals.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\GroupInstance.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\GuiRoot.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\IEBrowser.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\IEDispatcher.cpp"
+				>
+			</File>
+			<File
+				RelativePath="main.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\propertyGrid.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\PropertyWindow.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\StringFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\WindowFunctions.cpp"
+				>
+			</File>
+			<Filter
+				Name="Instance"
+				>
+				<File
+					RelativePath=".\BaseButtonInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\DataModelInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ImageButtonInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Instance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\LevelInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\PartInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\PVInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\TextButtonInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\WorkspaceInstance.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Listeners"
+				>
+				<File
+					RelativePath=".\CameraButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\DeleteListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\GUDButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ModeSelectionListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\RotateButtonListener.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath=".\Application.h"
+				>
+			</File>
+			<File
+				RelativePath=".\AudioPlayer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ax.h"
+				>
+			</File>
+			<File
+				RelativePath=".\BrowserCallHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\CameraController.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Demo.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Enum.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Enums.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ErrorFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Globals.h"
+				>
+			</File>
+			<File
+				RelativePath=".\GuiRoot.h"
+				>
+			</File>
+			<File
+				RelativePath=".\IEBrowser.h"
+				>
+			</File>
+			<File
+				RelativePath=".\IEDispatcher.h"
+				>
+			</File>
+			<File
+				RelativePath=".\LevelInstance.h"
+				>
+			</File>
+			<File
+				RelativePath=".\propertyGrid.h"
+				>
+			</File>
+			<File
+				RelativePath=".\PropertyWindow.h"
+				>
+			</File>
+			<File
+				RelativePath=".\rapidxml\rapidxml.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\rapidxml\rapidxml_iterators.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\rapidxml\rapidxml_print.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\rapidxml\rapidxml_utils.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\RotateButtonListener.h"
+				>
+			</File>
+			<File
+				RelativePath=".\StringFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath=".\win32Defines.h"
+				>
+			</File>
+			<File
+				RelativePath=".\WindowFunctions.h"
+				>
+			</File>
+			<Filter
+				Name="Instance"
+				>
+				<File
+					RelativePath=".\BaseButtonInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\DataModelInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\GroupInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\ImageButtonInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Instance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\PartInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\PVInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\TextButtonInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\WorkspaceInstance.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Listeners"
+				>
+				<File
+					RelativePath=".\ButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\CameraButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\DeleteListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\GUDButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\ModeSelectionListener.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+			<File
+				RelativePath=".\Dialogs.rc"
+				>
+			</File>
+			<File
+				RelativePath=".\icon1.ico"
+				>
+			</File>
+			<File
+				RelativePath=".\Parts.bmp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="Dialogs.rc"
+		/>
+	</Globals>
+</VisualStudioProject>

GUDButtonListener.cpp

@@ -0,0 +1,40 @@
+#include <G3DAll.h>
+#include "Application.h"
+#include "Globals.h"
+#include "AudioPlayer.h"
+#include "GUDButtonListener.h"
+
+void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+	bool cont = false;
+	for(size_t i = 0; i < g_selectedInstances.size(); i++)
+		if(g_selectedInstances.at(i)->canDelete)
+		{
+			cont = true;	
+			break;
+		}
+	if(cont)
+	{
+		AudioPlayer::playSound(dingSound);
+		if(button->name == "Duplicate")
+		{
+			std::vector<Instance*> newinst;
+			for(size_t i = 0; i < g_selectedInstances.size(); i++)
+			{
+				if(g_selectedInstances.at(i)->canDelete)
+				{
+				Instance* tempinst = g_selectedInstances.at(i);
+				
+				Instance* clonedInstance = g_selectedInstances.at(i)->clone();
+
+				newinst.push_back(tempinst);
+				}
+				/*tempinst->setPosition(Vector3(tempPos.x, tempPos.y + tempSize.y, tempPos.z));
+				g_usableApp->cameraController.centerCamera(g_selectedInstances.at(0));*/
+			}
+			g_selectedInstances = newinst;
+			if(g_selectedInstances.size() > 0)
+				g_usableApp->_propWindow->UpdateSelected(newinst.at(0));
+		}
+	}
+}

GUDButtonListener.h

@@ -0,0 +1,7 @@
+#pragma once
+#include "ButtonListener.h"
+
+class GUDButtonListener : public ButtonListener {
+public:
+	void onButton1MouseClick(BaseButtonInstance*);
+};

Globals.cpp

@@ -1,17 +1,24 @@
 #include "Globals.h"
 #include "Application.h"
 
+int const Globals::gen = 0;
+int const Globals::major = 0;
+int const Globals::minor = 4;
+int const Globals::patch = 2;
+int Globals::surfaceId = 2;
+bool Globals::showMouse = true;
 bool Globals::useMousePoint = false;
 std::vector<Instance*> postRenderStack = std::vector<Instance*>();
 
+std::vector<Instance*> g_selectedInstances = std::vector<Instance*>();
 DataModelInstance* g_dataModel = NULL;
 
 bool running = false;
+G3D::TextureRef Globals::surface;
 POINT Globals::mousepoint;
 
 GFontRef g_fntdominant = NULL;
 GFontRef g_fntlighttrek = NULL;
-HWND Globals::mainHwnd = NULL;
 
 Globals::Globals(void){}
 
@@ -21,6 +28,4 @@ std::string cameraSound="";
 std::string clickSound="";
 std::string dingSound="";
 
-Application *g_usableApp = NULL;
+Application *g_usableApp = NULL;
-
-COLORREF g_acrCustClr[16] = {RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255),RGB(255,255,255)};

Globals.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "DataModelV3/DataModelInstance.h"
+#include "DataModelInstance.h"
-#include "DataModelV3/XplicitNgine/XplicitNgine.h"
+#include <G3DAll.h>
 
 class Application;
 
@@ -10,31 +10,28 @@ public:
     Globals(void);
     ~Globals(void);
     static DataModelInstance* dataModel;
-	//static bool showMouse;
+	static bool showMouse;
 	static POINT mousepoint;
 	static bool useMousePoint;
 	static const int gen;
 	static const int major;
 	static const int minor;
 	static const int patch;
-	static const std::string g_appName;
+	static G3D::TextureRef surface;
-	static COLORREF g_acrCustClr[16]; //Will be dynamic later
+	static int surfaceId;
-	static HWND mainHwnd;
+	static const std::string g_PlaceholderName;
 };
 
 extern std::vector<Instance*> postRenderStack;
+extern std::vector<Instance*> g_selectedInstances;
 extern bool running;
 extern DataModelInstance* g_dataModel;
 extern Application* g_usableApp;
-extern SkyRef g_sky;
-extern RenderDevice g_renderDevice;
 
 extern GFontRef g_fntdominant;
 extern GFontRef g_fntlighttrek;
 
-extern COLORREF g_acrCustClr[16]; //Will be dynamic later
 extern std::string cameraSound;
 extern std::string clickSound;
 extern std::string dingSound;
-extern HWND mainHwnd;
+const std::string g_PlaceholderName = "HyperCube";
-const std::string g_appName = "Blocks3D";

GroupInstance.cpp

@@ -0,0 +1,30 @@
+#include "GroupInstance.h"
+
+GroupInstance::GroupInstance(void)
+{
+	PVInstance::PVInstance();
+	className = "GroupInstance";
+	listicon = 12;
+}
+
+GroupInstance::GroupInstance(const GroupInstance &oinst)
+{
+	PVInstance::PVInstance(oinst);
+	listicon = 12;
+}
+
+GroupInstance::~GroupInstance(void)
+{
+}
+
+
+
+std::vector<PROPGRIDITEM> GroupInstance::getProperties()
+{
+	std::vector<PROPGRIDITEM> properties = PVInstance::getProperties();
+	return properties;
+}
+void GroupInstance::PropUpdate(LPPROPGRIDITEM &pItem)
+{
+	PVInstance::PropUpdate(pItem);
+}

GroupInstance.h

@@ -0,0 +1,14 @@
+#pragma once
+#include "PVInstance.h"
+
+class GroupInstance :
+	public PVInstance
+{
+public:
+	GroupInstance(void);
+	~GroupInstance(void);
+	GroupInstance(const GroupInstance &oinst);
+	virtual std::vector<PROPGRIDITEM> getProperties();
+	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+	
+};

GuiRoot.cpp

@@ -0,0 +1,491 @@
+#include <iomanip>
+#include <sstream>
+#include "G3DAll.h"
+#include "BaseButtonInstance.h"
+#include "TextButtonInstance.h"
+#include "ImageButtonInstance.h"
+#include "GuiRoot.h"
+#include "Globals.h"
+#include "StringFunctions.h"
+
+#include "GUDButtonListener.h"
+#include "ModeSelectionListener.h"
+#include "RotateButtonListener.h"
+#include "CameraButtonListener.h"
+#include "DeleteListener.h"
+
+#include "ImageButtonInstance.h"
+
+ImageButtonInstance* GuiRoot::makeImageButton(G3D::TextureRef newImage = NULL, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
+{
+	ImageButtonInstance* part = new ImageButtonInstance(newImage,overImage, downImage, disableImage);
+//	instances.push_back(part);
+//	instances_2D.push_back(part);
+	return part;
+}
+
+TextButtonInstance* GuiRoot::makeTextButton()
+{
+	TextButtonInstance* part = new TextButtonInstance();
+	return part;
+}
+
+GuiRoot::GuiRoot() : _message(""), _messageTime(0)
+{
+	g_fntdominant = GFont::fromFile(GetFileInPath("/content/font/dominant.fnt"));
+	g_fntlighttrek = GFont::fromFile(GetFileInPath("/content/font/lighttrek.fnt"));
+
+	TextButtonInstance* button = makeTextButton();
+	button->boxBegin = Vector2(0, -24);
+	button->boxEnd = Vector2(80, 0);
+	button->floatBottom = true;
+	button->setParent(this);
+	button->font = g_fntlighttrek;
+	button->textColor = Color3(0,255,255);
+	button->textOutlineColor = Color4::clear();
+	button->title = "Hopper";
+	button->fontLocationRelativeTo = Vector2(10, 3);
+	button->setAllColorsSame();
+	
+	button = makeTextButton();
+	button->boxBegin = Vector2(0, -48);
+	button->boxEnd = Vector2(80, -24);
+	button->floatBottom = true;
+	button->setParent(this);
+	button->font = g_fntlighttrek;
+	button->textColor = Color3(0,255,255);
+	button->textOutlineColor = Color4::clear();
+	button->title = "Controller";
+	button->fontLocationRelativeTo = Vector2(10, 3);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0, -72);
+	button->boxEnd = Vector2(80, -48);
+	button->floatBottom = true;
+	button->setParent(this);
+	button->font = g_fntlighttrek;
+	button->textColor = Color3(0,255,255);
+	button->textOutlineColor = Color4::clear();
+	button->title = "Color";
+	button->fontLocationRelativeTo = Vector2(10, 3);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0, -96);
+	button->boxEnd = Vector2(80, -72);
+	button->floatBottom = true;
+	button->setParent(this);
+	button->font = g_fntlighttrek;
+	button->textColor = Color3(0,255,255);
+	button->textOutlineColor = Color4::clear();
+	button->title = "Surface";
+	button->fontLocationRelativeTo = Vector2(10, 3);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0, -120);
+	button->boxEnd = Vector2(80, -96);
+	button->floatBottom = true;
+	button->setParent(this);
+	button->font = g_fntlighttrek;
+	button->textColor = Color3(0,255,255);
+	button->boxOutlineColor = Color3(0,255,255);
+	button->title = "Model";
+	button->fontLocationRelativeTo = Vector2(10, 3);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0, 0);
+	button->boxEnd = Vector2(125, 25);
+	button->setParent(this);
+	button->font = g_fntlighttrek;
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->title = "File";
+	button->textSize = 16;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(125, 0);
+	button->boxEnd = Vector2(250, 25);
+	button->setParent(this);
+	button->font = g_fntlighttrek;
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->title = "Edit";
+	button->textSize = 16;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(250, 0);
+	button->boxEnd = Vector2(375, 25);
+	button->setParent(this);
+	button->font = g_fntlighttrek;
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->title = "View";
+	button->textSize = 16;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(375, 0);
+	button->boxEnd = Vector2(500, 25);
+	button->setParent(this);
+	button->font = g_fntlighttrek;
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->title = "Insert";
+	button->textSize = 16;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setAllColorsSame();
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(500, 0);
+	button->boxEnd = Vector2(625, 25);
+	button->setParent(this);
+	button->font = g_fntlighttrek;
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->title = "Format";
+	button->textSize = 16;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setAllColorsSame();
+
+
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0,215);
+	button->boxEnd = Vector2(80,235);
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textSize = 12;
+	button->title = "Group";
+	button->name = "Group";
+	button->setAllColorsSame();	
+	button->textColorDis = Color3(0.8F,0.8F,0.8F);
+	button->font = g_fntlighttrek;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setParent(this);
+
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0,240);
+	button->boxEnd = Vector2(80,260);
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textSize = 12;
+	button->title = "UnGroup";
+	button->name = "UnGroup";
+	button->setAllColorsSame();
+	button->textColorDis = Color3(0.8F,0.8F,0.8F);
+	button->font = g_fntlighttrek;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setParent(this);
+
+	button = makeTextButton();
+	button->boxBegin = Vector2(0,265);
+	button->boxEnd = Vector2(80,285);
+	button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F);
+	button->textColor = Color3::white();
+	button->boxColor = Color4::clear();
+	button->textSize = 12;
+	button->title = "Duplicate";
+	button->setAllColorsSame();
+	button->textColorDis = Color3(0.8F,0.8F,0.8F);
+	button->font = g_fntlighttrek;
+	button->fontLocationRelativeTo = Vector2(10, 0);
+	button->setParent(this);
+	button->name = "Duplicate";
+	button->setButtonListener(new GUDButtonListener());
+
+	ImageButtonInstance* instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/Run.png")),
+		Texture::fromFile(GetFileInPath("/content/images/Run_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/Run_dn.png")));
+	instance->name = "go";
+	instance->size = Vector2(65,65);
+	instance->position = Vector2(6.5, 25);
+	instance->setParent(this);
+
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/ArrowTool.png")),
+		Texture::fromFile(GetFileInPath("/content/images/ArrowTool_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/ArrowTool_dn.png")),
+		Texture::fromFile(GetFileInPath("/content/images/ArrowTool_ds.png")));
+	instance->size = Vector2(50,50);
+	instance->position = Vector2(15, 90);
+	instance->setParent(this);
+	instance->name = "Cursor";
+	instance->setButtonListener(new ModeSelectionListener());
+
+	instance = makeImageButton(Texture::fromFile(GetFileInPath("/content/images/ScaleTool.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ovr.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_dn.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ds.png")));
+	instance->size = Vector2(40,40);
+	instance->position = Vector2(0, 140);
+	instance->setParent(this);
+	instance->name = "Resize";
+	instance->setButtonListener(new ModeSelectionListener());
+	
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/MoveTool.png")),
+		Texture::fromFile(GetFileInPath("/content/images/MoveTool_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/MoveTool_dn.png")),
+		Texture::fromFile(GetFileInPath("/content/images/MoveTool_ds.png")));
+	instance->size = Vector2(40,40);
+	instance->position = Vector2(40, 140);
+	instance->setParent(this);
+	instance->name = "Arrows";
+	instance->setButtonListener(new ModeSelectionListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/SelectionRotate.png")),
+		Texture::fromFile(GetFileInPath("/content/images/SelectionRotate_ovr.png")),
+		NULL,
+		Texture::fromFile(GetFileInPath("/content/images/SelectionRotate_ds.png")));
+	instance->size = Vector2(30,30);
+	instance->position = Vector2(10, 175);
+	instance->setParent(this);
+	instance->name = "Rotate";
+	instance->setButtonListener(new RotateButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/SelectionTilt.png")),
+		Texture::fromFile(GetFileInPath("/content/images/SelectionTilt_ovr.png")),
+		NULL,
+		Texture::fromFile(GetFileInPath("/content/images/SelectionTilt_ds.png")));
+	instance->size = Vector2(30,30);
+	instance->position = Vector2(40, 175);
+	instance->setParent(this);
+	instance->name = "Tilt";
+	instance->setButtonListener(new RotateButtonListener());
+
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/Delete.png")),
+		Texture::fromFile(GetFileInPath("/content/images/Delete_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/Delete_dn.png")),
+		Texture::fromFile(GetFileInPath("/content/images/Delete_ds.png")));
+	instance->size = Vector2(40,46);
+	instance->position = Vector2(20, 284);
+	instance->setParent(this);
+	instance->name = "Delete";
+	instance->setButtonListener(new DeleteListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn_dn.png")));
+	instance->size = Vector2(34,25);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-77, -90);
+	instance->setParent(this);
+	instance->name = "ZoomIn";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut_dn.png")));
+	instance->size = Vector2(34,26);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-77, -31);
+	instance->setParent(this);
+	instance->name = "ZoomOut";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft_dn.png")));
+	instance->size = Vector2(34,34);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-110, -50);
+	instance->setParent(this);
+	instance->name = "PanLeft";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanRight.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanRight_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraPanRight_dn.png")));
+	instance->size = Vector2(34,34);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-45, -50);
+	instance->setParent(this);
+	instance->name = "PanRight";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraCenter.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraCenter_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraCenter_dn.png")));
+	instance->size = Vector2(34,20);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-77, -60);
+	instance->setParent(this);
+	instance->name = "CenterCam";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp_dn.png")));
+	instance->size = Vector2(24,24);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-105, -75);
+	instance->setParent(this);
+	instance->name = "TiltUp";
+	instance->setButtonListener(new CameraButtonListener());
+
+	instance = makeImageButton(
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown_ovr.png")),
+		Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown_dn.png")));
+	instance->size = Vector2(24,24);
+	instance->floatBottom = true;
+	instance->floatRight = true;
+	instance->position = Vector2(-40, -75);
+	instance->setParent(this);
+	instance->name = "TiltDown";
+	instance->setButtonListener(new CameraButtonListener());
+}
+
+
+void GuiRoot::drawButtons(RenderDevice* rd)
+{
+	rd->pushState();
+	rd->beforePrimitive();
+			this->render(rd);
+	rd->afterPrimitive();
+	rd->popState();
+}
+
+void GuiRoot::setDebugMessage(std::string msg, G3D::RealTime msgTime)
+{
+	_messageTime = msgTime;
+	_message = msg;
+}
+
+//void GuiRoot::render(G3D::RenderDevice* renderDevice) {}
+
+void GuiRoot::renderGUI(G3D::RenderDevice* rd, double fps)
+{
+	//TODO--Move these to their own instance
+
+	std::stringstream stream;
+	stream << std::fixed << std::setprecision(1) << g_dataModel->getLevel()->timer;
+	g_fntdominant->draw2D(rd, "Timer: " + stream.str(), Vector2(rd->getWidth() - 120, 25), 20, Color3::fromARGB(0x81C518), Color3::black());
+	g_fntdominant->draw2D(rd, "Score: " + Convert(g_dataModel->getLevel()->score), Vector2(rd->getWidth() - 120, 50), 20, Color3::fromARGB(0x81C518), Color3::black());
+	//FPS
+#ifdef _DEBUG
+	stream.str("");
+    stream.clear();
+    stream << std::fixed << std::setprecision(3) << fps;
+    g_fntdominant->draw2D(rd, "FPS: " + stream.str(), Vector2(120, 25), 10, Color3::fromARGB(0xFFFF00), Color3::black());
+#endif
+	//GUI Boxes	
+	Draw::box(G3D::Box(Vector3(0,25,0),Vector3(80,355,0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0));
+	Draw::box(G3D::Box(Vector3(rd->getWidth() - 120,rd->getHeight() - 120,0),Vector3(rd->getWidth(),rd->getHeight(),0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0));
+	
+	//Camera menu title
+	g_fntlighttrek->draw2D(rd, "CameraMenu", Vector2(rd->getWidth()-(g_fntlighttrek->get2DStringBounds("CameraMenu", 14).x+1),rd->getHeight() - 120), 14, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F));
+
+	//Tools menu
+	Draw::box(G3D::Box(Vector3(5, 210,0),Vector3(75, 210,0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0.6F,0.6F,0.6F,0.4F));
+	g_fntlighttrek->draw2D(rd,"MENU", Vector2(10,332), 14, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F));
+
+	
+	drawButtons(rd);
+	if(System::time() - 3 < _messageTime)
+	{
+		g_fntdominant->draw2D(rd, _message, Vector2((rd->getWidth()/2)-(g_fntdominant->get2DStringBounds(_message, 20).x/2),(rd->getHeight()/2)-(g_fntdominant->get2DStringBounds(_message, 20).y/2)), 20, Color3::yellow(), Color3::black());
+	}
+
+	g_dataModel->drawMessage(rd);
+	render(rd);
+}
+
+bool GuiRoot::mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y)
+{
+	std::vector<Instance*> instances_2D = g_dataModel->getGuiRoot()->getAllChildren();
+	for(size_t i = 0; i < instances_2D.size(); i++)
+	{
+		if(BaseButtonInstance* button = dynamic_cast<BaseButtonInstance*>(instances_2D.at(i)))
+		{
+			if(button->mouseInButton(x,y, renderDevice))
+			{
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+void GuiRoot::update()
+{		
+	Instance * obj6 = this->findFirstChild("Delete");
+	Instance * obj = this->findFirstChild("Duplicate");
+	Instance * obj2 = this->findFirstChild("Group");
+	Instance * obj3 = this->findFirstChild("UnGroup");
+	Instance * obj4 = this->findFirstChild("Rotate");
+	Instance * obj5 = this->findFirstChild("Tilt");
+	if(obj != NULL && obj2 != NULL && obj3 != NULL && obj4 !=NULL && obj5 != NULL && obj6 != NULL)
+	{
+		BaseButtonInstance* button = (BaseButtonInstance*)obj;
+		BaseButtonInstance* button2 = (BaseButtonInstance*)obj2;
+		BaseButtonInstance* button3 = (BaseButtonInstance*)obj3;
+		BaseButtonInstance* button4 = (BaseButtonInstance*)obj4;
+		BaseButtonInstance* button5 = (BaseButtonInstance*)obj5;
+		BaseButtonInstance* button6 = (BaseButtonInstance*)obj6;
+		button->disabled = true;
+		button2->disabled = true;
+		button3->disabled = true;
+		button4->disabled = true;
+		button5->disabled = true;
+		button6->disabled = true;
+		for(size_t i = 0; i < g_selectedInstances.size(); i++)
+			if(g_selectedInstances.at(i)->canDelete)
+			{
+				button->disabled = false;
+				button2->disabled = false;
+				button3->disabled = false;
+				button4->disabled = false;
+				button5->disabled = false;
+				button6->disabled = false;
+				break;
+			}
+	}
+}
+
+void GuiRoot::onMouseLeftUp(G3D::RenderDevice* renderDevice, int x,int y)
+{
+	std::vector<Instance*> instances_2D = this->getAllChildren();
+	for(size_t i = 0; i < instances_2D.size(); i++)
+	{
+		if(BaseButtonInstance* button = dynamic_cast<BaseButtonInstance*>(instances_2D[i]))
+		{
+			if(button->mouseInButton(x, y, renderDevice))
+			{
+				button->onMouseClick();
+			}
+		}
+	}
+}

GuiRoot.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "Instance.h"
+
+class ImageButtonInstance;
+
+class TextButtonInstance;
+
+class GuiRoot : public Instance
+{
+public:
+	GuiRoot();
+	TextButtonInstance*		makeTextButton();
+	void					drawButtons(RenderDevice* rd);
+	ImageButtonInstance*	makeImageButton(G3D::TextureRef newImage, G3D::TextureRef overImage, G3D::TextureRef downImage, G3D::TextureRef disableImage);
+	void					renderGUI(G3D::RenderDevice* rd, double fps);
+	void					setDebugMessage(std::string msg, G3D::RealTime msgTime);
+	void					update();
+	bool					mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y);
+	void					onMouseLeftUp(G3D::RenderDevice* renderDevice, int x,int y);
+private:
+	std::string			_message;
+	G3D::RealTime		_messageTime;
+};

IEBrowser.cpp

@@ -0,0 +1,105 @@
+#ifndef WIN32_LEAN_AND_MEAN
+	#define WIN32_LEAN_AND_MEAN
+#endif
+
+
+#include <windows.h>
+
+#include "IEBrowser.h"
+#include "Globals.h"
+#include "ax.h"
+//#include "IEDispatcher.h"
+
+void IEBrowser::Boop(char* test)
+{
+}
+
+IEBrowser::IEBrowser(HWND attachHWnd) {
+	MSG messages;
+	while (PeekMessage (&messages, NULL, 0, 0,PM_REMOVE))
+	{
+		if (IsDialogMessage(hwnd, &messages) == 0)
+		{
+			TranslateMessage(&messages);
+			DispatchMessage(&messages);
+		}
+	}
+	hwnd = attachHWnd;
+	spDocument = 0;
+	webBrowser = 0;
+	SendMessage(hwnd,AX_INPLACE,1,0);
+	SendMessage(hwnd,AX_QUERYINTERFACE,(WPARAM)&IID_IWebBrowser2,(LPARAM)&webBrowser);
+}
+
+IEBrowser::~IEBrowser(void) {
+	if (webBrowser)
+	{
+		webBrowser->Release();
+	}
+}
+
+// Something goes here
+int IEBrowser::setExternal(IDispatch** ext)
+{
+	return 1;
+}
+
+bool IEBrowser::navigateSyncURL(wchar_t* url)
+{
+	MSG messages;
+	if (webBrowser)
+	{
+		webBrowser->Navigate(url,0,0,0,0);
+		for (int i=1;i<1000;i++)
+		{
+			while (PeekMessage (&messages, NULL, 0, 0,PM_REMOVE))
+			{
+				if (IsDialogMessage(hwnd, &messages) == 0)
+				{
+					TranslateMessage(&messages);
+					DispatchMessage(&messages);
+				}
+			}
+
+			Sleep(30);
+
+			HRESULT hresult = webBrowser->get_Document(&spDocument);
+			if (SUCCEEDED(hresult) && (spDocument != 0))
+			{
+				
+				IOleObject* spOleObject;
+				if (SUCCEEDED(spDocument->QueryInterface(IID_IOleObject,(void**)&spOleObject)))
+				{
+					IOleClientSite* spClientSite;
+					hresult = spOleObject->GetClientSite(&spClientSite);
+					if (SUCCEEDED(hresult) && spClientSite)
+					{
+						m_spDefaultDocHostUIHandler = spClientSite;
+						ICustomDoc* spCustomDoc;
+
+						//IEDispatcher* spIEDispatcher;
+						if (SUCCEEDED(m_spDefaultDocHostUIHandler->QueryInterface(IID_IDocHostUIHandler,(void**)&m_spHandler)))
+						{
+							if (SUCCEEDED(spDocument->QueryInterface(IID_ICustomDoc,(void**)&spCustomDoc)))
+							{
+								spCustomDoc->SetUIHandler(m_spHandler);
+				
+								m_spHandler->GetExternal(&m_spExternal);
+								
+							}
+						}
+					}
+				}
+				
+
+
+				return true;
+			}
+		}
+	}
+	else
+	{
+		MessageBox(NULL,"Cannot read IWebBrowser2...",(g_PlaceholderName+" Crash").c_str(),MB_OK);
+	}
+	return false;
+}

IEBrowser.h

@@ -0,0 +1,23 @@
+//#include "WindowFunctions.h"
+#pragma once
+#include <mshtml.h>
+#include <exdisp.h>
+#include <Mshtmhst.h>
+
+class IEBrowser {
+	public:
+		IEBrowser(HWND attachHWnd);
+		~IEBrowser(void);
+		bool navigateSyncURL(wchar_t* url);
+		void Boop(char* test);
+	private:
+		IWebBrowser2* webBrowser;
+		HWND hwnd;
+		IDispatch* spDocument;
+		IHTMLDocument* spDocument2;
+		IDocHostUIHandler* m_spHandler;
+		IDispatch* m_spExternal;
+		IDispatch* m_newExternal;
+		IOleClientSite* m_spDefaultDocHostUIHandler;
+		int setExternal(IDispatch** ext);
+};

IEDispatcher.h

@@ -2,9 +2,11 @@
 #include "oaidl.h"
 //DEFINE_GUID(CLSID_G3d, 0xB323F8E0L, 0x2E68, 0x11D0, 0x90, 0xEA, 0x00, 0xAA, 0x00, 0x60, 0xF8, 0x6F);
 
+/*
 class IEDispatcher : public IDispatch
 {
-/*
+*/
+
 EXTERN_C const IID IID_IDispatch;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
@@ -12,7 +14,6 @@ EXTERN_C const IID IID_IDispatch;
     MIDL_INTERFACE("B323F8E0-2E68-11D0-90EA-00AA0060F86F")
     IEDispatcher : public IDispatch
 	{
-*/
 public:
 	IEDispatcher(void);
 	~IEDispatcher(void);
@@ -26,4 +27,4 @@ public:
 	
 };
 
-//#endif
+#endif

ImageButtonInstance.cpp

@@ -0,0 +1,133 @@
+#include "ImageButtonInstance.h"
+
+ImageButtonInstance::ImageButtonInstance(G3D::TextureRef newImage, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
+{
+	BaseButtonInstance::BaseButtonInstance();
+	image = newImage;
+	openGLID = image->getOpenGLID();
+	image_ovr = overImage;
+	if(!image_ovr.isNull())
+	openGLID_ovr = image_ovr->getOpenGLID();
+	image_dn = downImage;
+	if(!image_dn.isNull())
+		openGLID_dn = image_dn->getOpenGLID();
+	image_ds = disableImage;
+	if(!image_ds.isNull())
+		openGLID_ds = image_ds->getOpenGLID();
+	Vector2 size = Vector2(0,0);
+	Vector2 position = Vector2(0,0);
+	floatCenter = false;
+	floatBottom = false;
+	floatRight = false;
+	disabled = false;
+	className = "ImageButton";
+}
+
+ImageButtonInstance::~ImageButtonInstance(void)
+{
+	//Delete everything on destruction
+	image.~ReferenceCountedPointer();
+	delete image.getPointer();
+	image_ovr.~ReferenceCountedPointer();
+	delete image_ovr.getPointer();
+	image_ds.~ReferenceCountedPointer();
+	delete image_ds.getPointer();
+	image_dn.~ReferenceCountedPointer();
+	delete image_dn.getPointer();
+	image = NULL;
+	image_ovr = NULL;
+	image_ds = NULL;
+	image_dn = NULL;
+	delete listener;
+	listener = NULL;
+	selected = false;
+}
+
+bool ImageButtonInstance::mouseInButton(float mousex, float mousey, RenderDevice* rd)
+{
+	Vector2 positionRelative = position;
+	if(floatRight && floatBottom)
+	{
+	    positionRelative = Vector2(rd->getWidth() + position.x, rd->getHeight() + position.y);
+	}
+	else if(floatBottom)
+	{
+	    positionRelative = Vector2(position.x, rd->getHeight() + position.y);
+	}
+	else if(floatRight)
+	{
+		positionRelative = Vector2(rd->getWidth() + position.x, position.y);
+	}
+	if(mousex >= positionRelative.x && mousey >= positionRelative.y)
+	{
+		if(mousex < positionRelative.x + size.x && mousey < positionRelative.y + size.y)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+void ImageButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown)
+{
+	bool drawDisabledBox = false;
+	Vector2 positionRelative = position;
+	if(floatRight && floatBottom)
+	{
+	    positionRelative = Vector2(rd->getWidth() + position.x, rd->getHeight() + position.y);
+	}
+	else if(floatBottom)
+	{
+	    positionRelative = Vector2(position.x, rd->getHeight() + position.y);
+	}
+	else if(floatRight)
+	{
+		positionRelative = Vector2(rd->getWidth() + position.x, position.y);
+	}
+	int renderimage = openGLID;
+	if(selected == true && !image_dn.isNull() && !disabled)
+	{
+		renderimage = openGLID_dn;
+	}
+	else if(disabled)
+	{
+		if(!image_ds.isNull())
+			renderimage = openGLID_ds;
+		else
+			drawDisabledBox = true;
+	}
+	else if(mouseInArea(positionRelative.x, positionRelative.y, positionRelative.x + size.x, positionRelative.y + size.y, mousePos.x, mousePos.y))
+	{
+		if(mouseDown && !image_dn.isNull())
+		{
+			renderimage = openGLID_dn;
+		}
+		else if(!image_ovr.isNull())
+		{
+			renderimage = openGLID_ovr;
+		}
+	}
+
+
+	
+		glEnable( GL_TEXTURE_2D );
+		glEnable(GL_BLEND);// you enable blending function
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+		glBindTexture( GL_TEXTURE_2D, renderimage);
+		glBegin( GL_QUADS );
+		glTexCoord2d(0.0,0.0);
+		glVertex2f( positionRelative.x, positionRelative.y );
+		glTexCoord2d( 1.0,0.0 );
+		glVertex2f( positionRelative.x + size.x, positionRelative.y );
+		glTexCoord2d( 1.0,1.0 );
+		glVertex2f( positionRelative.x + size.x, positionRelative.y + size.y );
+		glTexCoord2d( 0.0,1.0 );
+		glVertex2f( positionRelative.x, positionRelative.y + size.y );
+		glEnd();
+		glDisable( GL_TEXTURE_2D );
+	
+	if(drawDisabledBox)
+	{
+		Draw::box(Box(Vector3(positionRelative.x, positionRelative.y, 0), Vector3(positionRelative.x+size.x, positionRelative.y+size.y, 0)), rd, Color4(0.7F,0.7F,0.7F,0.3F), Color4::clear());
+	}
+}

ImageButtonInstance.h

@@ -0,0 +1,27 @@
+#pragma once
+#include "BaseButtonInstance.h"
+
+class BaseButtonInstance;
+
+class ImageButtonInstance : public BaseButtonInstance
+{
+public:
+	//ImageButtonInstance(G3D::TextureRef);
+	//ImageButtonInstance(G3D::TextureRef,G3D::TextureRef);
+	//ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef);
+	ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef,G3D::TextureRef);
+	~ImageButtonInstance(void);
+	void drawObj(RenderDevice*, Vector2, bool);
+	Vector2 size;
+	Vector2 position;
+	
+	G3D::TextureRef image;
+	int openGLID;
+	G3D::TextureRef image_ovr;
+	int openGLID_ovr;
+	G3D::TextureRef image_dn;
+	int openGLID_dn;
+	G3D::TextureRef image_ds;
+	int openGLID_ds;
+	bool mouseInButton(float, float, RenderDevice*);
+};

Installer/install_script.iss

@@ -1,49 +0,0 @@
-;InnoSetupVersion=5.4.3
-;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2005!!!
-#define AppVer GetFileVersion('..\Blocks3D.exe')
-
-[Setup]
-AppName=Blocks3D
-AppVersion=v{#AppVer}
-AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
-AppPublisherURL=http://blocks3d.com/
-AppSupportURL=http://blocks3d.com/
-AppUpdatesURL=http://blocks3d.com/
-DefaultDirName={%localappdata}\Blocks3D
-OutputBaseFilename=Blocks3D_Setup_v{#AppVer}
-Compression=lzma2
-PrivilegesRequired=lowest
-WizardImageFile=setup.bmp
-DefaultGroupName=Blocks3D
-
-
-[UninstallDelete]
-Type: filesandordirs; Name: "{app}"
-
-[Files]
-Source: "Redist\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion 
-;Source: "Redist\vcredist_x64.exe"; DestDir: "{tmp}"; Check: "IsWin64"; Flags: ignoreversion 
-Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
-;Source: "..\SDL.DLL"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
-Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
-
-[Registry]
-
-
-[Run]
-Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/q"; Tasks: instvc; 
-;Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/q"; Tasks: instvc; Check: "IsWin64";
-Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
-
-[Icons]
-Name: "{group}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
-Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscut;
-
-Name: "{userdesktop}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
-Name: "{userdesktop}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: desktopicon
-
-[Tasks]
-Name: "instvc"; Description: "Install Visual C++ Redistributable 2005 SP1 (Requires elevated permissions)";
-Name: "desktopicon"; Description: "Create Desktop Icons";
-Name: "startscut"; Description: "Create Start Menu Icons";
-

Installer/install_script_floppy.iss

@@ -1,52 +0,0 @@
-;InnoSetupVersion=5.4.3
-;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2005!!!
-#define AppVer GetFileVersion('..\Blocks3D.exe')
-
-[Setup]
-AppName=Blocks3D
-AppVersion=v{#AppVer}
-AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
-AppPublisherURL=http://blocks3d.com/
-AppSupportURL=http://blocks3d.com/
-AppUpdatesURL=http://blocks3d.com/
-DefaultDirName={%localappdata}\Blocks3D
-OutputBaseFilename=B3DSTP
-Compression=lzma2
-PrivilegesRequired=lowest
-WizardImageFile=setup.bmp
-DefaultGroupName=Blocks3D
-DiskSpanning=yes
-SlicesPerDisk=1
-DiskSliceSize=1457664
-
-
-[UninstallDelete]
-Type: filesandordirs; Name: "{app}"
-
-[Files]
-Source: "Redist\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion 
-;Source: "Redist\vcredist_x64.exe"; DestDir: "{tmp}"; Check: "IsWin64"; Flags: ignoreversion 
-Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
-;Source: "..\SDL.DLL"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
-Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
-
-[Registry]
-
-
-[Run]
-Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/q"; Tasks: instvc; 
-;Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/q"; Tasks: instvc; Check: "IsWin64";
-Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
-
-[Icons]
-Name: "{group}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
-Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscut;
-
-Name: "{userdesktop}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
-Name: "{userdesktop}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: desktopicon
-
-[Tasks]
-Name: "instvc"; Description: "Install Visual C++ Redistributable 2005 SP1 (Requires elevated permissions)";
-Name: "desktopicon"; Description: "Create Desktop Icons";
-Name: "startscut"; Description: "Create Start Menu Icons";
-

Installer/install_script_floppy_vs2003.iss

@@ -1,48 +0,0 @@
-;InnoSetupVersion=5.4.3
-;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2003!!!
-#define AppVer GetFileVersion('..\Blocks3D.exe')
-
-[Setup]
-AppName=Blocks3D
-AppVersion=v{#AppVer}
-AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
-AppPublisherURL=http://blocks3d.com/
-AppSupportURL=http://blocks3d.com/
-AppUpdatesURL=http://blocks3d.com/
-DefaultDirName={%localappdata}\Blocks3D
-OutputBaseFilename=B3DSTP
-Compression=lzma2
-PrivilegesRequired=lowest
-WizardImageFile=setup.bmp
-DefaultGroupName=Blocks3D
-DiskSpanning=yes
-SlicesPerDisk=1
-DiskSliceSize=1457664
-
-
-[UninstallDelete]
-Type: filesandordirs; Name: "{app}"
-
-[Files]
-Source: "Redist\msvcr71.dll"; DestDir: "{app}"; Flags: ignoreversion 
-Source: "Redist\msvcp71.dll"; DestDir: "{app}"; Flags: ignoreversion 
-Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
-Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
-
-[Registry]
-
-
-[Run]
-Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
-
-[Icons]
-Name: "{group}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
-Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscut;
-
-Name: "{userdesktop}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
-Name: "{userdesktop}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: desktopicon
-
-[Tasks]
-Name: "desktopicon"; Description: "Create Desktop Icons";
-Name: "startscut"; Description: "Create Start Menu Icons";
-

Installer/install_script_vs2003.iss

@@ -1,45 +0,0 @@
-;InnoSetupVersion=5.4.3
-;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2003!!!
-#define AppVer GetFileVersion('..\Blocks3D.exe')
-
-[Setup]
-AppName=Blocks3D
-AppVersion=v{#AppVer}
-AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
-AppPublisherURL=http://blocks3d.com/
-AppSupportURL=http://blocks3d.com/
-AppUpdatesURL=http://blocks3d.com/
-DefaultDirName={%localappdata}\Blocks3D
-OutputBaseFilename=Blocks3D_Setup_v{#AppVer}
-Compression=lzma2
-PrivilegesRequired=lowest
-WizardImageFile=setup.bmp
-DefaultGroupName=Blocks3D
-
-
-[UninstallDelete]
-Type: filesandordirs; Name: "{app}"
-
-[Files]
-Source: "Redist\msvcp71.dll"; DestDir: "{app}"; Flags: ignoreversion 
-Source: "Redist\msvcr71.dll"; DestDir: "{app}"; Flags: ignoreversion 
-Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
-Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
-
-[Registry]
-
-
-[Run]
-Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
-
-[Icons]
-Name: "{group}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
-Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscut;
-
-Name: "{userdesktop}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
-Name: "{userdesktop}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: desktopicon
-
-[Tasks]
-Name: "desktopicon"; Description: "Create Desktop Icons";
-Name: "startscut"; Description: "Create Start Menu Icons";
-

Instance.cpp

@@ -0,0 +1,183 @@
+#define WINVER	0x0400
+#include <G3DAll.h>
+#include "Instance.h"
+
+
+Instance::Instance(void)
+{
+	parent = NULL;
+	name = "Default Game Instance";
+	className = "BaseInstance";
+	listicon = 1;
+	canDelete = true;
+}
+
+Instance::Instance(const Instance &oinst)
+{
+	
+	name = oinst.name;
+	className = oinst.className;
+	canDelete = oinst.canDelete;
+	listicon = oinst.listicon;
+	//setParent(oinst.parent);
+}
+
+
+
+void Instance::render(RenderDevice* rd)
+{
+	for(size_t i = 0; i < children.size(); i++)
+	{
+		children[i]->render(rd);
+	}
+}
+
+void Instance::update()
+{
+}
+
+PROPGRIDITEM Instance::createPGI(LPSTR catalog, LPSTR propName, LPSTR propDesc, LPARAM curVal, INT type, TCHAR choices[])
+{
+	PROPGRIDITEM pItem;
+	PropGrid_ItemInit(pItem);
+	pItem.lpszCatalog=catalog;
+	pItem.lpszPropName=propName;
+	pItem.lpszPropDesc=propDesc;
+	pItem.lpCurValue=curVal;
+	pItem.iItemType=type;
+	if(choices != NULL)
+		pItem.lpszzCmbItems = choices;
+	return pItem;
+}
+
+void Instance::PropUpdate(LPPROPGRIDITEM &item)
+{
+	if(strcmp(item->lpszPropName, "Name") == 0)
+	{
+		name = (LPSTR)item->lpCurValue;
+	}
+}
+
+std::vector<PROPGRIDITEM> Instance::getProperties()
+{
+	std::vector<PROPGRIDITEM> properties;
+	
+	
+	properties.push_back(createPGI(
+		"Properties",
+		"Name",
+		"The name of this instance",
+		(LPARAM)name.c_str(),
+		PIT_EDIT
+		));
+	return properties;
+}
+
+
+
+Instance::~Instance(void)
+{
+	for(size_t i = 0; i < children.size(); i++)
+	{
+		delete children.at(i);
+	}
+}
+
+void Instance::setName(std::string newName)
+{
+	name = newName;
+}
+
+std::string Instance::getClassName()
+{
+	return className;
+}
+
+std::vector<Instance* > Instance::getChildren()
+{
+	return children;
+}
+
+std::vector<Instance* > Instance::getAllChildren()
+{
+	if(!children.empty())
+	{
+		std::vector<Instance* > totalchildren = children;
+		for(size_t i = 0; i < children.size(); i++)
+		{
+			std::vector<Instance* > subchildren = children.at(i)->getAllChildren();
+			if(!subchildren.empty())
+				totalchildren.insert(totalchildren.end(), subchildren.begin(), subchildren.end());
+		}
+		return totalchildren;
+	}
+	return children;
+}
+
+std::vector<Instance* > Instance::compileAndGetPVVector()
+{
+	std::vector<Instance* > totalchildren;
+	if(!children.empty())
+	{
+		for(size_t i = 0; i < children.size(); i++)
+		{
+			std::vector<Instance* > subchildren = children.at(i)->compileAndGetPVVector();
+			if(!subchildren.empty())
+				totalchildren.insert(totalchildren.end(), subchildren.begin(), subchildren.end());
+		}
+	}
+	return totalchildren;
+}
+
+void Instance::setParent(Instance* newParent)
+{
+	if(parent != NULL)
+	{
+		parent->removeChild(this);
+	}
+	parent = newParent;
+	if(newParent != NULL)
+	{
+		newParent->addChild(this);
+	}
+}
+
+Instance* Instance::getParent()
+{
+	return parent;
+}
+
+void Instance::addChild(Instance* newChild)
+{
+	children.push_back(newChild);
+}
+
+void Instance::clearChildren()
+{
+	children.clear();
+}
+void Instance::removeChild(Instance* oldChild)
+{
+	for(size_t i = 0; i < children.size(); i++)
+	{
+		if(children.at(i) == oldChild)
+		{
+			children.erase(children.begin() + i);
+		}
+	}
+}
+
+Instance* Instance::findFirstChild(std::string name)
+{
+	for(size_t i = 0; i < children.size(); i++)
+	{
+		if(children.at(i)->name.compare(name) == 0)
+		{
+			return children.at(i);
+		}
+	}
+	return NULL;
+}
+
+
+

Instance.h

@@ -0,0 +1,36 @@
+#pragma once
+#include <G3DAll.h>
+#include "propertyGrid.h"
+
+class Instance
+{
+public:
+	bool canDelete;
+	Instance(void);
+	Instance(const Instance&);
+	virtual ~Instance(void);
+	std::string name;
+	virtual void render(RenderDevice*);
+	virtual void update();
+	std::string getClassName();
+	Instance* findFirstChild(std::string);
+	std::vector<Instance* > getChildren();
+	std::vector<Instance* > getAllChildren();
+	std::vector<Instance* > compileAndGetPVVector();
+	virtual void setParent(Instance*);
+	void setName(std::string newName);
+	void addChild(Instance*);
+	void removeChild(Instance*);
+	void clearChildren();
+	Instance* getParent();
+	virtual Instance* clone() const { return new Instance(*this); }
+	virtual std::vector<PROPGRIDITEM> getProperties();
+	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+	int listicon;
+protected:
+	std::vector<Instance*> children; // All children.
+	std::string className;
+	Instance* parent;  // Another pointer.
+	PROPGRIDITEM createPGI(LPSTR catalog, LPSTR propName, LPSTR propDesc, LPARAM curVal, INT type, TCHAR choices[] = NULL);
+	
+};

Jenkinsfile

@@ -1,27 +0,0 @@
-pipeline {
-	agent {label 'windows'}
-	stages {
-		stage('Build') {
-			steps {
-				bat """
-					call "c:\\Program Files (x86)\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\vsvars32.bat"
-					devenv "Blocks3D VS2003.sln" /build release
-				"""
-			}
-		}
-		stage('Package') {
-			steps {
-				bat """
-					"C:\\Program Files (x86)\\Inno Setup 5\\ISCC" Installer\\install_script_vs2003.iss
-					"C:\\Program Files (x86)\\Inno Setup 5\\ISCC" Installer\\install_script_floppy_vs2003.iss 
-				"""
-			}
-		}
-		stage('Archive') {
-			steps {
-				archiveArtifacts artifacts: 'Installer\\Output\\Blocks3D_Setup_*,Installer\\Output\\B3DSTP*', fingerprint: true
-			}
-		}
-	}
-}
- 

LevelInstance.cpp

@@ -0,0 +1,73 @@
+#include "LevelInstance.h"
+
+LevelInstance::LevelInstance(void)
+{
+	Instance::Instance();
+	name = "Level";
+	winMessage = "You Won!";
+	loseMessage = "You Lost. Try Again";
+	timer = 60.0F;
+	score = 0;
+	canDelete = false;
+}
+
+LevelInstance::~LevelInstance(void)
+{
+}
+
+
+char timerTxt[12];
+char scoreTxt[12];
+std::vector<PROPGRIDITEM> LevelInstance::getProperties()
+{
+	std::vector<PROPGRIDITEM> properties = Instance::getProperties();
+
+
+
+	properties.push_back(createPGI("Messages",
+		"WinMessage",
+		"The message that shows when the player wins.",
+		(LPARAM)winMessage.c_str(),
+		PIT_EDIT));
+	properties.push_back(createPGI("Messages",
+		"LoseMessage",
+		"The message that shows when the player loses.",
+		(LPARAM)loseMessage.c_str(),
+		PIT_EDIT));
+
+
+	sprintf_s(timerTxt, "%g", timer);
+	sprintf_s(scoreTxt, "%d", score);
+	properties.push_back(createPGI("Gameplay",
+		"InitialTimerValue",
+		"The ammount of time in seconds the player has to complete this level.\r\n\r\nPut 0 if time is limitless.",
+		(LPARAM)timerTxt,
+		PIT_EDIT));
+	properties.push_back(createPGI("Gameplay",
+		"InitialScoreValue",
+		"The ammount of points the player starts with.",
+		(LPARAM)scoreTxt,
+		PIT_EDIT));
+	return properties;
+}
+void LevelInstance::PropUpdate(LPPROPGRIDITEM &pItem)
+{
+	if(strcmp(pItem->lpszPropName, "InitialTimerValue") == 0)
+	{
+		timer = atoi((LPSTR)pItem->lpCurValue);
+	}
+	if(strcmp(pItem->lpszPropName, "InitialScoreValue") == 0)
+	{
+		score = atof((LPSTR)pItem->lpCurValue);
+	}
+	if(strcmp(pItem->lpszPropName, "LoseMessage") == 0)
+	{
+		loseMessage = (LPSTR)pItem->lpCurValue;
+	}
+	if(strcmp(pItem->lpszPropName, "WinMessage") == 0)
+	{
+		winMessage = (LPSTR)pItem->lpCurValue;
+	}
+	else
+		Instance::PropUpdate(pItem);
+}

LevelInstance.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "instance.h"
+
+class LevelInstance :
+	public Instance
+{
+public:
+	LevelInstance(void);
+	~LevelInstance(void);
+	float timer;
+	int score;
+	virtual std::vector<PROPGRIDITEM> getProperties();
+	std::string winMessage;
+	std::string loseMessage;
+	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+};

ModeSelectionListener.cpp

@@ -0,0 +1,28 @@
+#include "Globals.h"
+#include "Instance.h"
+#include "ModeSelectionListener.h"
+#include "Application.h"
+
+void ModeSelectionListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+	//CoordinateFrame frame = g_usableApp->g3dCamera.getCoordinateFrame();
+	int mode = g_usableApp->getMode();
+
+	std::vector<Instance*> instances_2D = g_dataModel->getGuiRoot()->getAllChildren();
+	for(size_t i = 0; i < instances_2D.size(); i++)
+		{
+			if(instances_2D.at(i)->name == "Cursor" || instances_2D.at(i)->name == "Resize" || instances_2D.at(i)->name == "Arrows")
+			{
+				BaseButtonInstance* button = (BaseButtonInstance*)instances_2D.at(i);
+				button->selected = false;
+			}
+		}
+
+	button->selected = true;
+	if(button->name == "Cursor")
+		g_usableApp->setMode(CURSOR);
+	else if(button->name == "Resize")
+		g_usableApp->setMode(RESIZE);
+	else if(button->name == "Arrows")
+		g_usableApp->setMode(ARROWS);
+}

ModeSelectionListener.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "ButtonListener.h"
+
+#define CURSOR 0
+#define ARROWS 1
+#define RESIZE 2
+
+class ModeSelectionListener : public ButtonListener {
+public:
+	void onButton1MouseClick(BaseButtonInstance*);
+};

ODE Copyright.txt

@@ -1,6 +0,0 @@
-Open Dynamics Engine
-
-Copyright (c) 2001-2004,
-Russell L. Smith.
-
-All rights reserved.

PVInstance.cpp

@@ -0,0 +1,80 @@
+#include "PVInstance.h"
+#include "WorkspaceInstance.h"
+
+PVInstance::PVInstance(void)
+{
+	Instance::Instance();
+	nameShown = false;
+	className = "PVInstance";
+	listicon = 0;
+}
+
+PVInstance::PVInstance(const PVInstance &oinst)
+{
+	Instance::Instance(oinst);
+}
+
+PVInstance::~PVInstance(void)
+{
+}
+
+void PVInstance::postRender(RenderDevice* rd)
+{
+}
+
+void PVInstance::render(RenderDevice* rd)
+{
+}
+
+void PVInstance::setParent(Instance* newParent)
+{
+	if(parent != NULL)
+	{
+		Instance* workspace = parent;
+		while(workspace != NULL)
+		{
+			if(WorkspaceInstance* wsp = dynamic_cast<WorkspaceInstance*>(workspace))
+			{
+				wsp->removeFromPVector(this);
+				break;
+			}
+			workspace = workspace->getParent();
+		}
+		parent->removeChild(this);
+	}
+	parent = newParent;
+	if(newParent != NULL)
+	{
+		Instance* workspace = parent;
+		while(workspace != NULL)
+		{
+			if(WorkspaceInstance* wsp = dynamic_cast<WorkspaceInstance*>(workspace))
+			{
+				wsp->addToPVector(this);
+				break;
+			}
+			workspace = workspace->getParent();
+		}
+		newParent->addChild(this);
+	}
+}
+
+std::vector<PROPGRIDITEM> PVInstance::getProperties()
+{
+	std::vector<PROPGRIDITEM> properties = Instance::getProperties();
+	properties.push_back(createPGI(
+		"Item",
+		"NameShown",
+		"This chooses whether the item name is shown",
+		nameShown,
+		PIT_CHECK));
+	return properties;
+}
+void PVInstance::PropUpdate(LPPROPGRIDITEM &pItem)
+{
+	if(strcmp(pItem->lpszPropName, "NameShown") == 0)
+	{
+		nameShown = (bool)pItem->lpCurValue;
+	}
+	else Instance::PropUpdate(pItem);
+}

PVInstance.h

@@ -0,0 +1,17 @@
+#pragma once
+#include "instance.h"
+
+class PVInstance :
+	public Instance
+{
+public:
+	PVInstance(void);
+	~PVInstance(void);
+	PVInstance(const PVInstance &oinst);
+	virtual void postRender(RenderDevice* rd);
+	virtual void setParent(Instance* newParent);
+	virtual std::vector<PROPGRIDITEM> getProperties();
+	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+	virtual void render(RenderDevice* rd);
+	bool nameShown;
+};

PartInstance.h

@@ -0,0 +1,72 @@
+#pragma once
+#include "PVInstance.h"
+#include "Enum.h"
+
+#define NEW_BOX_RENDER
+
+class PartInstance : public PVInstance
+{
+public:
+	PartInstance(void);
+	PartInstance(const PartInstance &oinst);
+	Instance* clone() const { return new PartInstance(*this); }
+	virtual void PartInstance::postRender(RenderDevice* rd);
+	~PartInstance(void);
+	virtual void render(RenderDevice*);
+	Vector3 velocity;
+	Enum::SurfaceType::Value top;
+	Enum::SurfaceType::Value front;
+	Enum::SurfaceType::Value right;
+	Enum::SurfaceType::Value back;
+	Enum::SurfaceType::Value left;
+	Enum::SurfaceType::Value bottom;
+	Enum::Shape::Value shape;
+	CoordinateFrame cFrame;
+	Color3 color;
+	Vector3 getPosition();
+	void setPosition(Vector3);
+	CoordinateFrame getCFrame();
+	void setCFrame(CoordinateFrame);
+	Box getBox();
+	Box getScaledBox();
+	CoordinateFrame getCFrameRenderBased();
+	Vector3 getSize();
+	void setSize(Vector3);
+	void setShape(Enum::Shape::Value shape);
+	bool canCollide;
+	bool anchored;
+	Vector3 rotVelocity;
+	bool collides(Box);
+	virtual std::vector<PROPGRIDITEM> getProperties();
+	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+	#ifdef NEW_BOX_RENDER
+	void addVertex(Vector3 vertexPos,Color3 color);
+	void addNormals(Vector3 normal);
+	void addSingularNormal(Vector3 normal);
+	void addTriangle(Vector3 vertexPos,Vector3 vertexPos2, Vector3 vertexPos3);
+	void addSmoothTriangle(Vector3 vertexPos,Vector3 vertexPos2, Vector3 vertexPos3);
+	void makeSmoothFace(int vertex1, int vertex2, int vertex3);
+	void addPlus(Vector3 v1);
+	void addPlus2(Vector3 v1);
+	void debugPrintVertexIDs(RenderDevice* rd, GFontRef font, Matrix3 camRot);
+	void makeFace(int vertex1, int vertex2, int vertex3);
+	bool isUniqueVertex(Vector3 pos);
+	#endif
+private:
+	Vector3 position;
+	Vector3 size;
+	float	_bevelSize;
+	int		_parseVert;
+	int		_debugTimer;
+	std::vector<Vector3> _debugUniqueVertices;
+ 	#ifdef NEW_BOX_RENDER
+		std::vector<GLfloat> _vertices;
+		std::vector<GLfloat> _normals;
+	#else
+		GLfloat _vertices[96];
+	#endif
+	std::vector<GLushort> _indices;
+	bool changed;
+	Box itemBox;
+	GLuint glList;
+};

PropertyWindow.cpp

@@ -3,18 +3,22 @@
 #include "WindowFunctions.h"
 #include "resource.h"
 #include "PropertyWindow.h"
+#include "Globals.h"
 #include "strsafe.h"
 #include "Application.h"
-#include "propertyGrid.h"
 
-//std::vector<PROPGRIDITEM> prop;
+/*typedef struct typPRGP {
-//std::vector<B3D::Instance*> children;
+    Instance* instance;   // Declare member types
-//Instance * selectedInstance;
+    Property &prop;
-//Instance * parent = NULL;
+} PRGP;*/
+
+std::vector<PROPGRIDITEM> prop;
+std::vector<Instance*> children;
+Instance * selectedInstance;
+Instance * parent = NULL;
 const int CX_BITMAP = 16;
 const int CY_BITMAP = 16;
 
-//TODO Re-Implement for DataModelV3
 
 HBITMAP CreateBitmapMask(HBITMAP hbmColour, COLORREF crTransparent)
 {
@@ -75,7 +79,7 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		break;
 		case WM_DRAWITEM:
 			{
-				/*
+				std::cout << "Drawing?" << "\r\n";
 				COLORREF clrBackground;
 				COLORREF clrForeground;
 				TEXTMETRIC tm;
@@ -150,7 +154,7 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				// If the item has the focus, draw the focus rectangle.
 				if (lpdis->itemState & ODS_FOCUS)
 					DrawFocusRect(lpdis->hDC, &lpdis->rcItem);
-				*/
+
 		    
 			}
 		break;
@@ -170,11 +174,11 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			{
 				if(HIWORD(wParam) == CBN_SELCHANGE)
 				{ 
-					/*int ItemIndex = SendMessage((HWND) lParam, (UINT) CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
+					int ItemIndex = SendMessage((HWND) lParam, (UINT) CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
 					CHAR  ListItem[256];
 					SendMessage((HWND) lParam, (UINT) CB_GETLBTEXT, (WPARAM) ItemIndex, (LPARAM) ListItem); 
-					g_dataModel->getSelectionService()->clearSelection();
+					propWind->ClearProperties();
-					g_dataModel->getSelectionService()->addSelected(children.at(ItemIndex));*/
+					g_usableApp->selectInstance(children.at(ItemIndex),propWind);
 				}
 			}
 		break;
@@ -186,10 +190,10 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                 case PGN_PROPERTYCHANGE:
 				{
 					if (IDC_PROPERTYGRID==wParam) {
-                        /*LPNMHDR pnm = (LPNMHDR)lParam;
+                        LPNMHDR pnm = (LPNMHDR)lParam;
                         LPNMPROPGRID lpnmp = (LPNMPROPGRID)pnm;
                         LPPROPGRIDITEM item = PropGrid_GetItemData(pnm->hwndFrom,lpnmp->iIndex);
-						selectedInstance->PropUpdate(item);*/
+						selectedInstance->PropUpdate(item);
 						//propWind->UpdateSelected(selectedInstance);
                     }
 				}
@@ -204,18 +208,13 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	return 0; 
 }
 
-void PropertyWindow::clearExplorer()
+void PropertyWindow::refreshExplorer(Instance* selectedInstance)
 {
-	SendMessage(_explorerComboBox,CB_RESETCONTENT,0,0); 
-	SendMessage(_explorerComboBox,CB_SETCURSEL,0,(LPARAM)0);
-}
-
-void PropertyWindow::refreshExplorer(std::vector<Instance*> selectedInstances)
-{
-	/*Instance * instance = selectedInstances[0];
 	SendMessage(_explorerComboBox,CB_RESETCONTENT,0,0); 
 	parent = NULL;
 	children.clear();
+	//g_selectedInstances.clear();
+	//for (unsigned int i=0;i<g_selectedInstances.size();i++) {
 	children.push_back(selectedInstance);
 	SendMessage(_explorerComboBox, CB_ADDSTRING, 0, (LPARAM)selectedInstance->name.c_str()); 
 	if(selectedInstance->getParent() != NULL)
@@ -227,6 +226,7 @@ void PropertyWindow::refreshExplorer(std::vector<Instance*> selectedInstances)
 		parent = selectedInstance->getParent();
 		children.push_back(selectedInstance->getParent());
 	}
+	//children = g_selectedInstances[i]->getChildren();
 
 	std::vector<Instance*> selectedChildren = selectedInstance->getChildren();
 	for(size_t z = 0; z < selectedChildren.size(); z++)
@@ -235,7 +235,7 @@ void PropertyWindow::refreshExplorer(std::vector<Instance*> selectedInstances)
 		SendMessage(_explorerComboBox,CB_ADDSTRING, 0,(LPARAM)selectedChildren.at(z)->name.c_str()); 
 	}
 	//g_usableApp->selectInstance(selectedInstance, this);
-	SendMessage(_explorerComboBox,CB_SETCURSEL,0,(LPARAM)0);*/
+	SendMessage(_explorerComboBox,CB_SETCURSEL,0,(LPARAM)0);
 	//}
 }
 
@@ -247,7 +247,7 @@ bool PropertyWindow::onCreate(int x, int y, int sx, int sy, HMODULE hThisInstanc
 			WS_EX_TOOLWINDOW,
 			"propHWND",
 			"PropertyGrid",
-			WS_POPUPWINDOW | WS_THICKFRAME | WS_CAPTION,
+			WS_VISIBLE | WS_POPUPWINDOW | WS_THICKFRAME | WS_CAPTION,
 			CW_USEDEFAULT,
 			CW_USEDEFAULT,
 			300,
@@ -276,9 +276,42 @@ bool PropertyWindow::onCreate(int x, int y, int sx, int sy, HMODULE hThisInstanc
 
 		_propGrid = New_PropertyGrid(_hwndProp,IDC_PROPERTYGRID);
 
+		/*PROPGRIDITEM pItem;
+		PropGrid_ItemInit(pItem);
+
+		pItem.lpszCatalog="Test";
+		pItem.lpszPropName="Offset";
+		pItem.lpszzCmbItems="What";
+		pItem.lpszPropDesc="Description";
+		pItem.lpCurValue=(LPARAM)"0, 0, 0";
+
+		pItem.iItemType=PIT_EDIT;
+
+		PROPGRIDITEM pItem2;
+		PropGrid_ItemInit(pItem2);
+
+		pItem2.lpszCatalog="Test";
+		pItem2.lpszPropName="s";
+		pItem2.lpszzCmbItems="itemlist\0itemlist2\0itemlist3";
+		pItem2.lpszPropDesc="";
+		pItem2.lpCurValue=0;
+
+		pItem2.iItemType=PIT_COMBO;
+
+		/*PROPGRIDITEM FauxExplorerItem;
+		PropGrid_ItemInit(FauxExplorerItem);
+		FauxExplorerItem.lpszCatalog="Test";
+		FauxExplorerItem.lpszPropName = "Editable Combo Field";
+		FauxExplorerItem.lpszzCmbItems = "Test1\0Test2\0Test3";
+		FauxExplorerItem.lpszPropDesc = "Press F4 to view drop down.";
+		FauxExplorerItem.iItemType = PIT_EDITCOMBO;
+		FauxExplorerItem.lpCurValue = 1;
+		PropGrid_AddItem(_propGrid, &FauxExplorerItem);*/
 
 		PropGrid_Enable(_propGrid,true);
 		ShowWindow(_propGrid,SW_SHOW);
+//		PropGrid_AddItem(_propGrid,&pItem);
+//		PropGrid_AddItem(_propGrid,&pItem2);
 		PropGrid_SetItemHeight(_propGrid,20);
 		PropGrid_ShowToolTips(_propGrid,TRUE);
 		PropGrid_ShowPropertyDescriptions(_propGrid,TRUE);
@@ -287,6 +320,7 @@ bool PropertyWindow::onCreate(int x, int y, int sx, int sy, HMODULE hThisInstanc
 		
 		SetWindowLongPtr(_hwndProp,GWL_USERDATA,(LONG)this);
 
+		//refreshExplorer();
 		_resize();
 
 		return true;
@@ -309,17 +343,11 @@ void PropertyWindow::_resize()
 	SetWindowPos(_explorerComboBox, NULL, 0, 0, rect.right, 400, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
 }
 
-void PropertyWindow::UpdateSelected(std::vector<Instance *> instances)
+void PropertyWindow::UpdateSelected(Instance * instance)
 {
-	/*if(instances.size() <= 0)
-	{
-		ClearProperties();
-		return;
-	}
-	Instance * instance = instances[0];
 	PropGrid_ResetContent(_propGrid);
 	prop = instance->getProperties();
-	//if (selectedInstance != instance)
+	if (selectedInstance != instance)
 	{
 		selectedInstance = instance;
 		for(size_t i = 0; i < prop.size(); i++)
@@ -333,13 +361,12 @@ void PropertyWindow::UpdateSelected(std::vector<Instance *> instances)
 		PropGrid_ExpandAllCatalogs(_propGrid);
 		//SetWindowLongPtr(_propGrid,GWL_USERDATA,(LONG)this);
 
-		refreshExplorer(instances);
+		refreshExplorer(instance);
 		_resize();
-	}*/
+	}
 }
 
 void PropertyWindow::ClearProperties()
 {
-	clearExplorer();
 	PropGrid_ResetContent(_propGrid);
 }

PropertyWindow.h

@@ -1,18 +1,17 @@
 #pragma once
-#include "DataModelV3/Instance.h"
+#include "Instance.h"
 
 class PropertyWindow {
 public:
 	PropertyWindow(int x, int y, int sx, int sy, HMODULE hThisInstance);
 	bool	onCreate(int x, int y, int sx, int sy, HMODULE hThisInstance);
-	void	UpdateSelected(std::vector<B3D::Instance *> selection);
+	void	UpdateSelected(Instance *);
 	void	ClearProperties();
 	void	onResize();
-	void	refreshExplorer(std::vector<B3D::Instance *> selection);
+	void	refreshExplorer(Instance* selectedInstance);
 	HWND	_hwndProp;
 private:
 	HWND	_propGrid;
 	HWND	_explorerComboBox;
 	void	_resize();
-	void	clearExplorer();
 };

README.md

@@ -1,6 +1,3 @@
-# IMPORTANT -- READ BEFORE CONTRIBUTING
-Work on DataModel V3 will be starting November 3rd at 3PM PDT! This will mean **many PRs involving DataModel V2 may be immediately rejected until completion!** Progress on DataModelV3 can be tracked/contributed to on the feature/datamodel_v3 branch during this time.
-
 # ROBLOX 2005 Recreation Project
 ## Why are we doing this?
 ROBLOX in 2005 was a different game, based around minigames with win and lose conditions rather than a 3D building game. Since this build of the client is presumed lost despite having around 100 users, we have to recreate it. We are using era-appropriate tools for this as well (Visual Studio 2005 and 2005-era compilers), as well as G3D 6.10, the era-appropriate version of the Graphics3D graphics library used by ROBLOX to this day.

RotateButtonListener.cpp

@@ -0,0 +1,21 @@
+#include "BaseButtonInstance.h"
+#include "RotateButtonListener.h"
+#include "Globals.h"
+#include "AudioPlayer.h"
+
+void RotateButtonListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+	if(g_selectedInstances.size() > 0)
+	{
+		Instance* selectedInstance = g_selectedInstances.at(0);
+		AudioPlayer::playSound(clickSound);
+		if(PartInstance* part = dynamic_cast<PartInstance*>(selectedInstance))
+		{
+			if(button->name == "Tilt")
+				part->setCFrame(part->getCFrame()*Matrix3::fromEulerAnglesXYZ(0,0,toRadians(90)));
+			else if(button->name == "Rotate")
+				part->setCFrame(part->getCFrame()*Matrix3::fromEulerAnglesXYZ(0,toRadians(90),0));
+		}
+	}
+		
+}

RotateButtonListener.h

@@ -0,0 +1,7 @@
+#pragma once
+#include "ButtonListener.h"
+
+class RotateButtonListener : public ButtonListener {
+public:
+	void onButton1MouseClick(BaseButtonInstance*);
+};

ShapeRenderer.cpp

@@ -0,0 +1,9 @@
+#include "ShapeRenderer.h"
+
+ShapeRenderer::ShapeRenderer(void)
+{
+}
+
+ShapeRenderer::~ShapeRenderer(void)
+{
+}

StringFunctions.cpp

@@ -2,6 +2,7 @@
 #include <sstream>
 #include "ErrorFunctions.h"
 #include "StringFunctions.h"
+#include <windows.h>
 
 std::string Convert (float number)
 {

TextButtonInstance.cpp

@@ -1,8 +1,9 @@
-#include "DataModelV3/Gui/TextButtonInstance.h"
+#include "TextButtonInstance.h"
-#include "DataModelV3/Gui/BaseGuiInstance.h"
+
-using namespace B3D;
+
-TextButtonInstance::TextButtonInstance(void) : BaseButtonInstance()
+TextButtonInstance::TextButtonInstance(void)
 {
+	BaseButtonInstance::BaseButtonInstance();
 	boxBegin = Vector2(0,0);
 	boxEnd = Vector2(0,0);
 	fontLocationRelativeTo = Vector2(0,0);
@@ -10,7 +11,7 @@ TextButtonInstance::TextButtonInstance(void) : BaseButtonInstance()
 	title = "TextBox";
 	textColor = Color4(1, 1, 1, 1);
 	textOutlineColor = Color4(0, 0, 0, 0);
-	boxColor = BaseGuiInstance::translucentBackdrop();
+	boxColor = Color4(0.6F,0.6F,0.6F,0.4F);
 	boxOutlineColor = Color4(0, 0, 0, 0);
 	setAllColorsSame();
 	textSize = 12;
@@ -18,6 +19,7 @@ TextButtonInstance::TextButtonInstance(void) : BaseButtonInstance()
 	floatRight = false;
 	floatCenter = false;
 	visible = true;
+	className = "TextButton";
 	disabled = false;
 	selected = false;
 }
@@ -96,7 +98,12 @@ void TextButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseD
 		Draw::box(Box(point1, point2), rd, boxColorDn, boxOutlineColorDn);
 		font->draw2D(rd, title, RelativeTo, textSize, textColorDn, textOutlineColorDn);
 	}
-	else if(selected || mouseInArea(point1.x, point1.y, point2.x, point2.y, mousePos.x, mousePos.y))
+	else if(mouseInArea(point1.x, point1.y, point2.x, point2.y, mousePos.x, mousePos.y))
+	{
+		Draw::box(Box(point1, point2), rd, boxColorOvr, boxOutlineColorOvr);
+		font->draw2D(rd, title, RelativeTo, textSize, textColorOvr, textOutlineColorOvr);
+	}
+	else if(selected)
 	{
 		Draw::box(Box(point1, point2), rd, boxColorOvr, boxOutlineColorOvr);
 		font->draw2D(rd, title, RelativeTo, textSize, textColorOvr, textOutlineColorOvr);
@@ -108,4 +115,8 @@ void TextButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseD
 	}
 	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 	glEnableClientState(GL_COLOR_ARRAY);
+}
+
+void doNullCheck()
+{
 }

TextButtonInstance.h

@@ -0,0 +1,35 @@
+#pragma once
+#include "BaseButtonInstance.h"
+class TextButtonInstance : public BaseButtonInstance
+{
+public:
+	TextButtonInstance(void);
+	~TextButtonInstance(void);
+	void setAllColorsSame();
+	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;
+	Color4 textColorDis;
+	Color4 textOutlineColorDis;
+	Color4 boxColorDis;
+	Color4 boxOutlineColorDis;
+	bool centeredWithinBox;
+	std::string title;
+	G3D::GFontRef font;
+	bool visible;
+	int textSize;
+	void drawObj(RenderDevice*, Vector2, bool);
+	bool mouseInButton(float, float, RenderDevice*);
+};

WindowFunctions.cpp

@@ -1,6 +1,7 @@
 
 #include "WindowFunctions.h"
 #include <sstream>
+#include <string>
 
 using namespace std;
 
@@ -23,7 +24,7 @@ bool createWindowClass(const char* name,WNDPROC proc,HMODULE hInstance)
 	{
 		stringstream errMsg;
 		errMsg<<"Failed to register " << name;
-		MessageBox(NULL, errMsg.str().c_str(),"Blocks3D Crash", MB_OK);
+		MessageBox(NULL, errMsg.str().c_str(),"Dynamica Crash", MB_OK);
 		return false;
 	}
 	return true;

WindowFunctions.h

@@ -1,5 +1,4 @@
 #pragma once
 #include <windows.h>
 
-
 bool createWindowClass(const char* name,WNDPROC proc,HMODULE hInstance);

WorkspaceInstance.cpp

@@ -0,0 +1,23 @@
+#include "WorkspaceInstance.h"
+
+
+WorkspaceInstance::WorkspaceInstance(void)
+{
+	GroupInstance::GroupInstance();
+	name = "Workspace";
+	className = "Workspace";
+	canDelete = false;
+}
+
+WorkspaceInstance::~WorkspaceInstance(void)
+{
+}
+
+void WorkspaceInstance::removeFromPVector(PVInstance * instance)
+{
+	__pvVector.erase(std::remove(__pvVector.begin(), __pvVector.end(), instance), __pvVector.end());
+}
+void WorkspaceInstance::addToPVector(PVInstance * instance)
+{
+	__pvVector.push_back(instance);
+}

WorkspaceInstance.h

@@ -0,0 +1,15 @@
+#pragma once
+#include "GroupInstance.h"
+#include <set>
+
+class WorkspaceInstance :
+	public GroupInstance
+{
+public:
+	WorkspaceInstance(void);
+	~WorkspaceInstance(void);
+	void removeFromPVector(PVInstance *);
+	void addToPVector(PVInstance *);
+	std::vector<PVInstance*> __pvVector;
+	std::vector<PVInstance*>* getPVVector();
+};

ax.cpp

@@ -1,13 +1,17 @@
 // AX.CPP
+#include <windows.h>
+#include <comdef.h>
+#include <exdisp.h>
+#include <oledlg.h>
 #include "ax.h"
-#include "AudioPlayer.h"
+
-#include "Enum.h"
 
 #pragma warning (disable: 4311)
 #pragma warning (disable: 4312)
 #pragma warning (disable: 4244)
 #pragma warning (disable: 4800)
 
+
 // AXClientSite class
 // ------- Implement member functions
 AXClientSite :: AXClientSite()
@@ -22,89 +26,10 @@ AXClientSite :: ~AXClientSite()
    }
 
 
-STDMETHODIMP AXClientSite :: ShowContextMenu(DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: GetHostInfo(DOCHOSTUIINFO *pInfo)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: ShowUI( DWORD dwID, IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget, IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: HideUI( void)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: UpdateUI( void)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: OnDocWindowActivate(BOOL fActivate)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: OnFrameWindowActivate(BOOL fActivate)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: ResizeBorder( LPCRECT prcBorder, IOleInPlaceUIWindow *pUIWindow, BOOL fRameWindow)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: TranslateAccelerator( LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: GetOptionKeyPath( LPOLESTR *pchKey, DWORD dw)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: GetDropTarget( IDropTarget *pDropTarget, IDropTarget **ppDropTarget)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: GetExternal(IDispatch **ppDispatch)
-{
-	//IDispatch* disp = ax->GetExternalDispatch();
-	*ppDispatch = this;
-	/* if (disp!=NULL)
-	{
-		*ppDispatch = this;
-		return S_OK;
-	} */
-	return S_OK;
-}
-
-STDMETHODIMP AXClientSite ::TranslateUrl( DWORD dwTranslate, OLECHAR *pchURLIn, OLECHAR **ppchURLOut)
-{
-	return E_NOTIMPL;
-}
-
-STDMETHODIMP AXClientSite :: FilterDataObject( IDataObject *pDO, IDataObject **ppDORet)
-{
-	return E_NOTIMPL;
-}
-
 // IUnknown methods
 STDMETHODIMP AXClientSite :: QueryInterface(REFIID iid,void**ppvObject)
       {
       *ppvObject = 0;
-	 // if (iid == IID_IOleInPlaceSite)
-       //  *ppvObject = (IOleInPlaceSite*)this;
       if (iid == IID_IOleClientSite)
          *ppvObject = (IOleClientSite*)this;
       if (iid == IID_IUnknown)
@@ -113,7 +38,7 @@ STDMETHODIMP AXClientSite :: QueryInterface(REFIID iid,void**ppvObject)
          *ppvObject = (IAdviseSink*)this;
       if (iid == IID_IDispatch)
          *ppvObject = (IDispatch*)this;
-      //if (ExternalPlace == false)
+      if (ExternalPlace == false)
       	{
 	      if (iid == IID_IOleInPlaceSite)
 	         *ppvObject = (IOleInPlaceSite*)this;
@@ -121,8 +46,6 @@ STDMETHODIMP AXClientSite :: QueryInterface(REFIID iid,void**ppvObject)
 	         *ppvObject = (IOleInPlaceFrame*)this;
 	      if (iid == IID_IOleInPlaceUIWindow)
 	         *ppvObject = (IOleInPlaceUIWindow*)this;
-		  if (iid == IID_IDocHostUIHandler)
-	         *ppvObject = (IDocHostUIHandler*)this;
          }
 
       //* Log Call
@@ -306,9 +229,9 @@ STDMETHODIMP AXClientSite :: SetActiveObject(IOleInPlaceActiveObject*pV,LPCOLEST
 
 
 STDMETHODIMP AXClientSite :: SetStatusText(LPCOLESTR t)
-{
+      {
       return E_NOTIMPL;
-}
+      }
 
 STDMETHODIMP AXClientSite :: EnableModeless(BOOL f)
       {
@@ -328,21 +251,14 @@ HRESULT _stdcall AXClientSite :: GetTypeInfoCount(
 HRESULT _stdcall AXClientSite :: GetTypeInfo(
   unsigned int iTInfo,
   LCID lcid,
-  ITypeInfo FAR* FAR* ppTInfo)
+  ITypeInfo FAR* FAR* ppTInfo) {return E_NOTIMPL;}
-{
-	  return E_NOTIMPL;
-}
 
 HRESULT _stdcall AXClientSite :: GetIDsOfNames(
   REFIID riid,
-  OLECHAR FAR* FAR* ext_function_name,
+  OLECHAR FAR* FAR*,
   unsigned int cNames,
   LCID lcid,
-  DISPID FAR* )
+  DISPID FAR* ) {return E_NOTIMPL;}
-{
-	m_lastExternalName = *ext_function_name;
-	return S_OK;
-}
 
 
 // Other Methods
@@ -368,6 +284,8 @@ AX :: AX(char* cls)
 	Init(cls);
    }
 
+
+
 void AX :: Clean()
       {
       if (Site.InPlace == true)
@@ -504,12 +422,9 @@ HRESULT _stdcall AXClientSite :: Invoke(
   VARIANT FAR* pVarResult,
   EXCEPINFO FAR* pExcepInfo,
   unsigned int FAR* puArgErr)
-{
+  	{
-	IEBrowser * browser = (IEBrowser *)GetProp(Window,"Browser");
+	return E_NOTIMPL;
-	return browser->doExternal(m_lastExternalName,dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+   }
-	
-	//return S_OK;
-}
 
 
 void _stdcall AXClientSite :: OnDataChange(FORMATETC *pFormatEtc,STGMEDIUM *pStgmed)
@@ -616,6 +531,7 @@ LRESULT CALLBACK AXWndProc(HWND hh,UINT mm,WPARAM ww,LPARAM ll)
 
       return true;
       }
+
    if (mm == AX_GETAXINTERFACE)
       {
       AX* ax = (AX*)GetWindowLong(hh,GWL_USERDATA);

ax.h

@@ -1,10 +1,4 @@
 // AX.H
-#pragma once
-#include "Globals.h"
-#include <mshtmhst.h>
-#include <string>
-#pragma once
-#include "IEBrowser.h"
 
 // messages
 #define AX_QUERYINTERFACE (WM_USER + 1)
@@ -15,6 +9,7 @@
 #define AX_SETDATAADVISE (WM_USER + 6)
 #define AX_DOVERB (WM_USER + 7)
 
+
 // Registration function
 ATOM AXRegister();
 
@@ -25,8 +20,7 @@ class AXClientSite :
    public IDispatch,
    public IAdviseSink,
    public IOleInPlaceSite,
-   public IOleInPlaceFrame,
+   public IOleInPlaceFrame
-   public IDocHostUIHandler
    {
    protected:
 
@@ -34,6 +28,7 @@ class AXClientSite :
 
    public:
 
+
 		HWND Window;
 		HWND Parent;
 		HMENU Menu;
@@ -42,6 +37,7 @@ class AXClientSite :
 		bool CalledCanInPlace;
 
 		class AX* ax;
+
 	   // MyClientSite Methods
 		AXClientSite();
 		virtual ~AXClientSite();
@@ -59,64 +55,7 @@ class AXClientSite :
 		STDMETHODIMP ShowObject();
 		STDMETHODIMP OnShowWindow(BOOL f);
 		STDMETHODIMP RequestNewObjectLayout();
-
+	
-		// IDDocHandler methods
-		STDMETHODIMP ShowContextMenu( 
-            /* [in] */ DWORD dwID,
-            /* [in] */ POINT *ppt,
-            /* [in] */ IUnknown *pcmdtReserved,
-            /* [in] */ IDispatch *pdispReserved);
-        
-        STDMETHODIMP GetHostInfo( 
-            /* [out][in] */ DOCHOSTUIINFO *pInfo);
-        
-        STDMETHODIMP ShowUI( 
-            /* [in] */ DWORD dwID,
-            /* [in] */ IOleInPlaceActiveObject *pActiveObject,
-            /* [in] */ IOleCommandTarget *pCommandTarget,
-            /* [in] */ IOleInPlaceFrame *pFrame,
-            /* [in] */ IOleInPlaceUIWindow *pDoc);
-        
-        STDMETHODIMP HideUI( void);
-        
-        STDMETHODIMP UpdateUI( void);
-        
-        STDMETHODIMP OnDocWindowActivate( 
-            /* [in] */ BOOL fActivate);
-        
-        STDMETHODIMP OnFrameWindowActivate( 
-            /* [in] */ BOOL fActivate);
-        
-        STDMETHODIMP ResizeBorder( 
-            /* [in] */ LPCRECT prcBorder,
-            /* [in] */ IOleInPlaceUIWindow *pUIWindow,
-            /* [in] */ BOOL fRameWindow);
-        
-        STDMETHODIMP TranslateAccelerator( 
-            /* [in] */ LPMSG lpMsg,
-            /* [in] */ const GUID *pguidCmdGroup,
-            /* [in] */ DWORD nCmdID);
-        
-        STDMETHODIMP GetOptionKeyPath( 
-            /* [out] */ LPOLESTR *pchKey,
-            /* [in] */ DWORD dw);
-        
-        STDMETHODIMP GetDropTarget( 
-            /* [in] */ IDropTarget *pDropTarget,
-            /* [out] */ IDropTarget **ppDropTarget);
-        
-        STDMETHODIMP GetExternal( 
-            /* [out] */ IDispatch **ppDispatch);
-        
-        STDMETHODIMP TranslateUrl( 
-            /* [in] */ DWORD dwTranslate,
-            /* [in] */ OLECHAR *pchURLIn,
-            /* [out] */ OLECHAR **ppchURLOut);
-        
-        STDMETHODIMP FilterDataObject( 
-            /* [in] */ IDataObject *pDO,
-            /* [out] */ IDataObject **ppDORet);
-
 		// IAdviseSink methods
 		STDMETHODIMP_(void) OnDataChange(FORMATETC *pFormatEtc,STGMEDIUM *pStgmed);
 	
@@ -151,13 +90,14 @@ class AXClientSite :
 	   STDMETHODIMP EnableModeless(BOOL f);
 	   STDMETHODIMP TranslateAccelerator(LPMSG,WORD);
 	
-	   std::wstring m_lastExternalName;
+	
-
 	   // IDispatch Methods
 	   HRESULT _stdcall GetTypeInfoCount(unsigned int * pctinfo);
 	   HRESULT _stdcall GetTypeInfo(unsigned int iTInfo,LCID lcid,ITypeInfo FAR* FAR* ppTInfo);
 		HRESULT _stdcall GetIDsOfNames(REFIID riid,OLECHAR FAR* FAR*,unsigned int cNames,LCID lcid,DISPID FAR* );
 		HRESULT _stdcall Invoke(DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS FAR* pDispParams,VARIANT FAR* pVarResult,EXCEPINFO FAR* pExcepInfo,unsigned int FAR* puArgErr);
+
+		// IOleControlSite Methods
    };
 
 
@@ -187,9 +127,13 @@ class AX
 	   //AX_CONNECTSTRUCT* tcs;
 	   bool AddMenu;
 	   DWORD AdviseToken;
-		DWORD DAdviseToken[100];	
+		DWORD DAdviseToken[100];
+
+
+
 
 	private:
+
 		CLSID clsid;