Test

.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,14 +36,11 @@
 *.user
 *.pdb
 *.idb
+*.manifest
+*.htm
 *.res
 *.ilk
 *.dep
-*.bin
-*.7z
-
-# ResEditor files
-*.aps
 
 /Debug
 /Release
@@ -55,10 +52,6 @@ G3DTest.suo
 G3DTest.suo
 stderr.txt
 desktop.ini
+main.cpp
 *.db
-
-#Redist
-!Installer/Redist/*
-UpgradeLog.htm
-click_output.JPEG
-click_output.PNG
+G3DTest.sln

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,12 +1,10 @@
 #pragma once
 #include <G3DAll.h>
 #include "PropertyWindow.h"
-#include "DataModelV2/TextButtonInstance.h"
-#include "DataModelV2/ImageButtonInstance.h"
+#include "TextButtonInstance.h"
+#include "ImageButtonInstance.h"
 #include "CameraController.h"
-#include "IEBrowser.h"
-#include "Mouse.h"
-#include "Tool/Tool.h"
+//#include "GuiRoot.h"
 
 class TextButtonInstance;
 class ImageButtonInstance;
@@ -27,10 +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();
@@ -46,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;
@@ -81,7 +72,6 @@ class Application { // : public GApp {
 		int					_mode;
 		GAppSettings		_settings;
 		double lightProjX, lightProjY, lightProjNear, lightProjFar;
-		IEBrowser*		webBrowser;
 	protected:
 		Stopwatch           m_graphicsWatch;
 		Stopwatch           m_logicWatch;

AudioPlayer.cpp

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <malloc.h>
 #include <string.h>
-#define NUM_SOUNDS 32
+#define NUM_SOUNDS 10
 static SDL_AudioSpec fmt;
 static bool initiated = false;
 
@@ -23,7 +23,7 @@ void AudioPlayer::init()
 	initiated = true;
 	extern void mixaudio(void *unused, Uint8 *stream, int len);
 	fmt.freq = 22050;
-    fmt.format = AUDIO_S16LSB;
+    fmt.format = AUDIO_S16;
     fmt.channels = 2;
     fmt.samples = 1024;        /* A good value for games */
     fmt.callback = mixaudio;

AudioPlayer.h

@@ -6,7 +6,6 @@ class AudioPlayer
 public:
 	AudioPlayer(void);
 	~AudioPlayer(void);
-
-	static void init();
 	static void playSound(std::string);
+	static void init();
 };

BaseButtonInstance.cpp

@@ -1,6 +1,5 @@
-#include "DataModelV2/BaseButtonInstance.h"
+#include "BaseButtonInstance.h"
 #include "Globals.h"
-#include "Application.h"
 
 
 ButtonListener* listener = NULL;
@@ -14,18 +13,19 @@ BaseButtonInstance::BaseButtonInstance(void)
 void BaseButtonInstance::render(RenderDevice* rd)
 {
 	DataModelInstance* dataModel = g_dataModel;
-	Vector2 pos = Vector2(g_usableApp->mouse.x,g_usableApp->mouse.y);
-	drawObj(rd, pos, g_usableApp->mouse.isMouseDown());
+	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)
+void BaseButtonInstance::setButtonListener(ButtonListener* buttonListener)
 {
-	listener = &buttonListener;
+	listener = buttonListener;
 }
 
 void BaseButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown){}
@@ -37,6 +37,7 @@ void BaseButtonInstance::onMouseClick()
 	if(listener != NULL)
 	{
 		listener->onButton1MouseClick(this);
+		
 	}
 }
 

BaseButtonInstance.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "Instance.h"
-#include "Listener/ButtonListener.h"
+#include "instance.h"
+#include "ButtonListener.h"
 
 class ButtonListener;
 class Instance;
@@ -14,7 +14,7 @@ public:
 	virtual void drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown);
 	virtual bool mouseInButton(float, float, RenderDevice* rd);
 	virtual void onMouseClick();
-	void setButtonListener(ButtonListener&);
+	void setButtonListener(ButtonListener*);
 	bool floatBottom;
 	bool floatRight;
 	bool floatCenter;

Blocks3D.exe.manifest

@@ -1,8 +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>
-</assembly>

ButtonListener.cpp

@@ -1,10 +1,9 @@
-#include "DataModelV2/BaseButtonInstance.h"
-#include "Listener/ButtonListener.h"
+#include "BaseButtonInstance.h"
+#include "ButtonListener.h"
 
 
 ButtonListener::ButtonListener()
 {
-	doDelete = true;
 }
 
 ButtonListener::~ButtonListener(void)

ButtonListener.h

@@ -1,6 +1,6 @@
 #pragma once
 //#include "Application.h"
-#include "DataModelV2/BaseButtonInstance.h"
+//#include "BaseButtonInstance.h"
 
 class BaseButtonInstance;
 
@@ -10,7 +10,6 @@ class ButtonListener
 		ButtonListener();
 		~ButtonListener(void);
 		virtual void onButton1MouseClick(BaseButtonInstance*);
-		bool doDelete;
 		//virtual void onMouseOver(); //TODO
 		//virtual void onMouseOut(); //TODO
 		//virtual void onButton1MouseDown(); //TODO

CameraButtonListener.cpp

@@ -1,4 +1,4 @@
-#include "Listener/CameraButtonListener.h"
+#include "CameraButtonListener.h"
 #include "Globals.h"
 #include "AudioPlayer.h"
 #include "Application.h"
@@ -7,8 +7,8 @@ void CameraButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
 	AudioPlayer::playSound(cameraSound);
 	CoordinateFrame frame = g_usableApp->cameraController.getCamera()->getCoordinateFrame();
-	if(button->name == "CenterCam" && g_dataModel->getSelectionService()->getSelection().size() > 0)
-		g_usableApp->cameraController.centerCamera(g_dataModel->getSelectionService()->getSelection()[0]);
+	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")

CameraController.cpp

@@ -1,7 +1,7 @@
 #include "CameraController.h"
 #include "win32Defines.h"
 #include <iostream>
-#include "DataModelV2/PartInstance.h"
+#include "PartInstance.h"
 #include "Application.h"
 #include "AudioPlayer.h"
 
@@ -57,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;
 
@@ -134,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);
 }
 
@@ -159,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);
@@ -193,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 "DataModelV2/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,87 +1,40 @@
 #include <string>
-
-// Instances
-#include "DataModelV2/GuiRootInstance.h"
-#include "DataModelV2/ToggleImageButtonInstance.h"
-#include "DataModelV2/DataModelInstance.h"
-#include "DataModelV2/ThumbnailGeneratorInstance.h"
-#include "DataModelV2/LightingInstance.h"
-
+#include "GuiRoot.h"
+#include "DataModelInstance.h"
 #include <fstream>
 #include <iostream>
 #include <sstream>
 #include <commdlg.h>
 #include "ErrorFunctions.h"
-#include "Globals.h"
-#include "Application.h"
 
 using namespace std;
 using namespace rapidxml;
 
+
 DataModelInstance::DataModelInstance(void)
 {
-	// Instances
 	Instance::Instance();
 	workspace = new WorkspaceInstance();
-	guiRoot = new GuiRootInstance();
+	guiRoot = new GuiRoot();
 	level = new LevelInstance();
-	thumbnailGenerator = new ThumbnailGeneratorInstance();
-	soundService = new SoundService();
-	lightingInstance = new LightingInstance();
-
-	selectionService = new SelectionService();
-	selectionService->setPropertyWindow(g_usableApp->_propWindow);
+	//children.push_back(workspace);
+	//children.push_back(level);
 	className = "dataModel";
+	mousex = 0;
+	mousey = 0;
+	mouseButton1Down = false;
 	showMessage = false;
 	canDelete = false;
 	_modY=0;
-
-	// Parent stuff
 	workspace->setParent(this);
 	level->setParent(this);
-	soundService->setParent(this);
-	lightingInstance->setParent(this);
-
 	_loadedFileName="..//skooter.rbxm";
 	listicon = 5;
-	running = false;
-	xplicitNgine = NULL;
-	resetEngine();
-}
-
-void DataModelInstance::resetEngine()
-{
-	if(xplicitNgine != NULL)
-		delete xplicitNgine;
-	xplicitNgine = new XplicitNgine();
-	g_xplicitNgine = xplicitNgine;
-	for(size_t i = 0; i < getWorkspace()->partObjects.size(); i++)
-	{
-		PartInstance* partInstance = getWorkspace()->partObjects[i];
-		partInstance->physBody = NULL;
-	}
-}
-
-XplicitNgine * DataModelInstance::getEngine()
-{
-	return xplicitNgine;
-}
-
-void DataModelInstance::toggleRun()
-{
-	running = !running;
-	//if(!running)
-		//resetEngine();
-}
-
-bool DataModelInstance::isRunning()
-{
-	return running;
+	
 }
 
 DataModelInstance::~DataModelInstance(void)
 {
-	delete xplicitNgine;
 }
 
 #ifdef _DEBUG
@@ -96,16 +49,6 @@ void DataModelInstance::modXMLLevel(float modY)
 
 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()
@@ -302,7 +245,7 @@ Color3 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())
 	{
 
@@ -314,8 +257,6 @@ bool DataModelInstance::scanXMLObject(xml_node<> * scanNode)
 				xml_node<> *propNode = node->first_node();
 				xml_node<> *cFrameNode=0;
 				xml_node<> *sizeNode=0;
-				xml_node<> *anchoredNode=0;
-				xml_node<> *shapeNode=0;
 				xml_node<> *colorNode=0;
 				xml_node<> *brickColorNode=0;
 				xml_node<> *nameNode=0;
@@ -326,24 +267,15 @@ bool DataModelInstance::scanXMLObject(xml_node<> * scanNode)
 					{
 						std::string xmlName = attr->name();
 						std::string xmlValue = attr->value();
-
+						
 						if (xmlValue=="CFrame" | xmlValue=="CoordinateFrame")
 						{
 							 cFrameNode = partPropNode;
-						}	
-						if (xmlValue=="Anchored")
-						{
-							 anchoredNode = partPropNode;
 						}
 						if (xmlValue=="Name")
 						{
 							 nameNode = partPropNode;
 						}
-						if (xmlValue=="shape")
-						{
-							 shapeNode = partPropNode;
-							 _legacyLoad=false;
-						}
 						if (xmlValue=="Color")
 						{
 							colorNode=partPropNode;
@@ -365,11 +297,6 @@ bool DataModelInstance::scanXMLObject(xml_node<> * scanNode)
 								{
 									std::string xmlName = attr->name();
 									std::string xmlValue = attr->value();
-									if (xmlValue=="shape")
-									{
-										 shapeNode = featureNode;
-										 _legacyLoad=true;
-									}
 									if (xmlValue=="size")
 									{
 										sizeNode=featureNode;
@@ -400,21 +327,7 @@ bool DataModelInstance::scanXMLObject(xml_node<> * scanNode)
 					G = getFloatValue(colorNode,"G");
 					B = getFloatValue(colorNode,"B");
 				}
-
-				Enum::Shape::Value partshape = Enum::Shape::Block;
-				std::string pshape = shapeNode->value();
-				if (shapeNode)
-				{
-					if(pshape == "0" || pshape == "Ball"){
-						partshape = Enum::Shape::Ball;
-					}
-					if(pshape == "1" || pshape == "Block"){
-						partshape = Enum::Shape::Block;
-					}
-					if(pshape == "2" || pshape == "Cylinder"){
-						partshape = Enum::Shape::Cylinder;
-					}
-				}
+				
 
 				std::string newName = nameNode->value();
 				float X = getFloatValue(cFrameNode,"X");
@@ -440,22 +353,17 @@ bool DataModelInstance::scanXMLObject(xml_node<> * scanNode)
 					PartInstance* test = makePart();
 					test->setParent(getWorkspace());
 					test->color = Color3(R,G,B);
-					test->shape = partshape;
 					if(brickColorNode)
 					{
 						test->color = bcToRGB(atoi(brickColorNode->value()));
 					}
-					if(anchoredNode)
-					{
-						test->setAnchored(stricmp(anchoredNode->value(), "true") == 0);
-					}
 					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);
 					}
@@ -464,7 +372,7 @@ bool DataModelInstance::scanXMLObject(xml_node<> * scanNode)
 						cf.translation = Vector3(X,Y,Z);
 						cf.rotation = Matrix3(R00,R01,R02,R10,R11,R12,R20,R21,R22);
 					}
-
+					
 					test->setCFrame(cf);
 				}
 				else
@@ -501,9 +409,6 @@ bool DataModelInstance::load(const char* filename, bool clearObjects)
 		std::string hname = sfilename.substr(begin);
 		std::string tname = hname.substr(0, hname.length() - 5);
 		name = tname;
-		resetEngine();
-		selectionService->clearSelection();
-		selectionService->addSelected(this);
 		return true;
 	}
 	else
@@ -511,7 +416,6 @@ bool DataModelInstance::load(const char* filename, bool clearObjects)
 		std::stringstream msg;
 		msg << "Failed to load file:" << std::endl << filename << std::endl << strerror(errno);
 		MessageBoxStr(msg.str());
-		return false;
 	}
 }
 
@@ -646,33 +550,27 @@ WorkspaceInstance* DataModelInstance::getWorkspace()
 {
 	return workspace;
 }
-
-GuiRootInstance* DataModelInstance::getGuiRoot()
+Vector2 DataModelInstance::getMousePos()
+{
+	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;
-}
-
-ThumbnailGeneratorInstance* DataModelInstance::getThumbnailGenerator()
-{
-	return thumbnailGenerator;
-}
-
-SoundService* DataModelInstance::getSoundService()
-{
-	return soundService;
-}
-
-LightingInstance* DataModelInstance::getLighting()
-{
-	return lightingInstance;
 }

DataModelInstance.h

@@ -1,20 +1,11 @@
 #pragma once
-
-// Instances
 #include "WorkspaceInstance.h"
 #include "LevelInstance.h"
 #include "PartInstance.h"
-#include "SelectionService.h"
-#include "GuiRootInstance.h"
-#include "ThumbnailGeneratorInstance.h"
-#include "XplicitNgine/XplicitNgine.h"
-#include "SoundService.h"
-#include "LightingInstance.h"
-
-// Libraries 
 #include "rapidxml/rapidxml.hpp"
+#include "GuiRoot.h"
 
-class GuiRootInstance;
+class GuiRoot;
 
 class DataModelInstance :
 	public Instance
@@ -30,26 +21,24 @@ public:
 	bool					load(const char* filename,bool clearObjects);	
 	bool					readXMLFileStream(std::ifstream* file);
 	void					drawMessage(RenderDevice*);
-	
-	// Instance getters
-	WorkspaceInstance*				getWorkspace();
-	LevelInstance*					getLevel();
-	XplicitNgine*					getEngine();
-	ThumbnailGeneratorInstance*		getThumbnailGenerator();
-	SoundService*					getSoundService();
-	LightingInstance*				getLighting();
-
+	WorkspaceInstance*		getWorkspace();
+	WorkspaceInstance*		workspace;
+	LevelInstance *			level;
+	LevelInstance *			getLevel();
+	GuiRoot*				guiRoot;
 	std::string				message;
 	std::string				_loadedFileName;
 	bool					showMessage;
 	G3D::GFontRef			font;
-	GuiRootInstance*		getGuiRoot();
-	SelectionService*		getSelectionService();
+	GuiRoot*				getGuiRoot();
+	float					mousex;
+	float					mousey;
+	Vector2					getMousePos();
+	void					setMousePos(int x,int y);
+	void					setMousePos(Vector2 pos);
+	bool					mouseButton1Down;
 	PartInstance*			makePart();
 	void					clearLevel();
-	void					toggleRun();
-	bool					isRunning();
-	void					resetEngine();
 #if _DEBUG
 	void					modXMLLevel(float modY);
 #endif
@@ -62,16 +51,4 @@ private:
 	std::string				_errMsg;
 	bool					_legacyLoad;
 	float					_modY;
-	
-	// Instances
-	WorkspaceInstance*		workspace;
-	LevelInstance*			level;
-	GuiRootInstance*		guiRoot;
-	SelectionService*		selectionService;
-	ThumbnailGeneratorInstance* thumbnailGenerator;
-	XplicitNgine*			xplicitNgine;
-	SoundService*			soundService;
-	LightingInstance*		lightingInstance;
-	bool					running;
-	
 };

DeleteListener.cpp

@@ -1,4 +1,4 @@
-#include "Listener/DeleteListener.h"
+#include "DeleteListener.h"
 #include "Globals.h"
 #include "Application.h"
 

Dialogs.rc

@@ -1,86 +1,43 @@
-// Generated by ResEdit 1.6.6
-// Copyright (C) 2006-2015
-// http://www.resedit.net
-
-#include <windows.h>
-#include <commctrl.h>
-#include <richedit.h>
-#include "src/include/resource.h"
-#include "src/include/versioning.h"
-
-
-
-
-//
-// Bitmap resources
-//
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
-IDB_BITMAP1        BITMAP         "Parts.bmp"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-1 VERSIONINFO
-    FILEVERSION     APP_GENER,APP_MAJOR,APP_MINOR,APP_PATCH
-    PRODUCTVERSION  APP_GENER,APP_MAJOR,APP_MINOR,APP_PATCH
-    FILEOS          VOS__WINDOWS32
-    FILETYPE        VFT_APP
-    FILESUBTYPE     VFT2_UNKNOWN
-    FILEFLAGSMASK   0
-    FILEFLAGS       0
-{
-    BLOCK "StringFileInfo"
-    {
-        BLOCK "100901B5"
-        {
-            VALUE "Comments", ""
-            VALUE "CompanyName", "Blocks3D Team"
-            VALUE "FileDescription", "Blocks 3D"
-            VALUE "FileVersion", VER_STR(APP_VER_STRING)
-            VALUE "InternalName", "Blocks3D"
-            VALUE "LegalCopyright", "Blocks3D Team - 2022"
-            VALUE "LegalTrademarks", ""
-            VALUE "OriginalFilename", "Blocks3D.exe"
-            VALUE "PrivateBuild", ""
-            VALUE "ProductName", "Blocks3D"
-            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
+// Generated by ResEdit 1.6.6
+// Copyright (C) 2006-2015
+// http://www.resedit.net
+
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include "resource.h"
+
+
+
+
+//
+// Bitmap resources
+//
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
+IDB_BITMAP1        BITMAP         "Parts.bmp"
+
+
+
+//
+// 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        IDE_EDIT, 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           "icon1.ico"

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;
-	std::string title = g_appName+" Crash";
+	//g_usableApp->window()->setInputCaptureCount(0);
+	//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

@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="Blocks3D" - Package Owner=<4>
+# 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=Blocks3D - Win32 Debug
+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 "Blocks3D.mak".
+!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 "Blocks3D.mak" CFG="Blocks3D - Win32 Debug"
+!MESSAGE NMAKE /f "G3DTest.mak" CFG="G3DTest - 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 "G3DTest - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "G3DTest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Blocks3D - Win32 Release"
+!IF  "$(CFG)" == "G3DTest - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -54,7 +54,7 @@ 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"
+!ELSEIF  "$(CFG)" == "G3DTest - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -83,8 +83,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "Blocks3D - Win32 Release"
-# Name "Blocks3D - Win32 Debug"
+# 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"

G3DTest.dsw

@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "Blocks3D"=.\Blocks3D.dsp - Package Owner=<4>
+Project: "G3DTest"=.\G3DTest.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

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));
+		}
+	}
+}

Globals.cpp

@@ -1,18 +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;
-XplicitNgine* g_xplicitNgine = 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){}
 
@@ -22,6 +28,4 @@ std::string cameraSound="";
 std::string clickSound="";
 std::string dingSound="";
 
-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)};
+Application *g_usableApp = NULL;

Globals.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "DataModelV2/DataModelInstance.h"
-#include "XplicitNgine/XplicitNgine.h"
+#include "DataModelInstance.h"
+#include <G3DAll.h>
 
 class Application;
 
@@ -10,32 +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 COLORREF g_acrCustClr[16]; //Will be dynamic later
-	static HWND mainHwnd;
+	static G3D::TextureRef surface;
+	static int surfaceId;
+	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 XplicitNgine* g_xplicitNgine;
 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_appName = "Blocks3D";
+const std::string g_PlaceholderName = "HyperCube";

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

@@ -1,5 +1,5 @@
 #pragma once
-#include "PartInstance.h"
+#include "PVInstance.h"
 
 class GroupInstance :
 	public PVInstance
@@ -10,7 +10,5 @@ public:
 	GroupInstance(const GroupInstance &oinst);
 	virtual std::vector<PROPGRIDITEM> getProperties();
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
-	std::vector<Instance *> unGroup();
-	PartInstance * primaryPart;
-	void render(RenderDevice * r);
+	
 };

GuiRoot.cpp

@@ -1,32 +1,22 @@
 #include <iomanip>
 #include <sstream>
 #include "G3DAll.h"
-#include "DataModelV2/BaseButtonInstance.h"
-#include "DataModelV2/TextButtonInstance.h"
-#include "DataModelV2/ImageButtonInstance.h"
-#include "DataModelV2/ToggleImageButtonInstance.h"
-#include "DataModelV2/GuiRootInstance.h"
-#include "DataModelV2/ImageButtonInstance.h"
+#include "BaseButtonInstance.h"
+#include "TextButtonInstance.h"
+#include "ImageButtonInstance.h"
+#include "GuiRoot.h"
 #include "Globals.h"
 #include "StringFunctions.h"
 
-#include "Listener/GUDButtonListener.h"
-#include "Listener/ModeSelectionListener.h"
-#include "Listener/MenuButtonListener.h"
-#include "Listener/RotateButtonListener.h"
-#include "Listener/CameraButtonListener.h"
-#include "Listener/DeleteListener.h"
-#include "Listener/ToolbarListener.h"
+#include "GUDButtonListener.h"
+#include "ModeSelectionListener.h"
+#include "RotateButtonListener.h"
+#include "CameraButtonListener.h"
+#include "DeleteListener.h"
 
-MenuButtonListener menuListener = MenuButtonListener();
-ToolbarListener toolbar = ToolbarListener();
-GUDButtonListener gud = GUDButtonListener();
-ModeSelectionListener msl = ModeSelectionListener();
-RotateButtonListener rbl = RotateButtonListener();
-DeleteListener delet = DeleteListener();
-CameraButtonListener cam = CameraButtonListener();
+#include "ImageButtonInstance.h"
 
-ImageButtonInstance* GuiRootInstance::makeImageButton(G3D::TextureRef newImage = NULL, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
+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);
@@ -34,18 +24,17 @@ ImageButtonInstance* GuiRootInstance::makeImageButton(G3D::TextureRef newImage =
 	return part;
 }
 
-TextButtonInstance* GuiRootInstance::makeTextButton()
+TextButtonInstance* GuiRoot::makeTextButton()
 {
 	TextButtonInstance* part = new TextButtonInstance();
 	return part;
 }
-GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
+
+GuiRoot::GuiRoot() : _message(""), _messageTime(0)
 {
 	g_fntdominant = GFont::fromFile(GetFileInPath("/content/font/dominant.fnt"));
 	g_fntlighttrek = GFont::fromFile(GetFileInPath("/content/font/lighttrek.fnt"));
-	_hideGui = false;
 
-	//Bottom Left
 	TextButtonInstance* button = makeTextButton();
 	button->boxBegin = Vector2(0, -24);
 	button->boxEnd = Vector2(80, 0);
@@ -57,11 +46,6 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->title = "Hopper";
 	button->fontLocationRelativeTo = Vector2(10, 3);
 	button->setAllColorsSame();
-	button->boxOutlineColorOvr = Color3(0,255,255);
-	button->boxColorDn = Color4(button->boxColor.r,button->boxColor.g,button->boxColor.b, 0.2F);
-	button->setButtonListener(toolbar);
-	toolbar.addButtonRef(button);
-
 	
 	button = makeTextButton();
 	button->boxBegin = Vector2(0, -48);
@@ -74,10 +58,6 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->title = "Controller";
 	button->fontLocationRelativeTo = Vector2(10, 3);
 	button->setAllColorsSame();
-	button->boxOutlineColorOvr = Color3(0,255,255);
-	button->boxColorDn = Color4(button->boxColor.r,button->boxColor.g,button->boxColor.b, 0.2F);
-	button->setButtonListener(toolbar);
-	toolbar.addButtonRef(button);
 
 	button = makeTextButton();
 	button->boxBegin = Vector2(0, -72);
@@ -90,10 +70,6 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->title = "Color";
 	button->fontLocationRelativeTo = Vector2(10, 3);
 	button->setAllColorsSame();
-	button->boxOutlineColorOvr = Color3(0,255,255);
-	button->boxColorDn = Color4(button->boxColor.r,button->boxColor.g,button->boxColor.b, 0.2F);
-	button->setButtonListener(toolbar);
-	toolbar.addButtonRef(button);
 
 	button = makeTextButton();
 	button->boxBegin = Vector2(0, -96);
@@ -106,10 +82,6 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->title = "Surface";
 	button->fontLocationRelativeTo = Vector2(10, 3);
 	button->setAllColorsSame();
-	button->boxOutlineColorOvr = Color3(0,255,255);
-	button->boxColorDn = Color4(button->boxColor.r,button->boxColor.g,button->boxColor.b, 0.2F);
-	button->setButtonListener(toolbar);
-	toolbar.addButtonRef(button);
 
 	button = makeTextButton();
 	button->boxBegin = Vector2(0, -120);
@@ -118,16 +90,11 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->setParent(this);
 	button->font = g_fntlighttrek;
 	button->textColor = Color3(0,255,255);
+	button->boxOutlineColor = Color3(0,255,255);
 	button->title = "Model";
-	button->selected = true;
 	button->fontLocationRelativeTo = Vector2(10, 3);
 	button->setAllColorsSame();
-	button->boxOutlineColorOvr = Color3(0,255,255);
-	button->boxColorDn = Color4(button->boxColor.r,button->boxColor.g,button->boxColor.b, 0.2F);
-	button->setButtonListener(toolbar);
-	toolbar.addButtonRef(button);
 
-	//Top bar
 	button = makeTextButton();
 	button->boxBegin = Vector2(0, 0);
 	button->boxEnd = Vector2(125, 25);
@@ -140,9 +107,6 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->textSize = 16;
 	button->fontLocationRelativeTo = Vector2(10, 0);
 	button->setAllColorsSame();
-	button->boxColorOvr = Color4(0.6F,0.6F,0.6F,0.4F);
-	button->name = "file";
-	button->setButtonListener(menuListener);
 
 	button = makeTextButton();
 	button->boxBegin = Vector2(125, 0);
@@ -156,9 +120,6 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->textSize = 16;
 	button->fontLocationRelativeTo = Vector2(10, 0);
 	button->setAllColorsSame();
-	button->boxColorOvr = Color4(0.6F,0.6F,0.6F,0.4F);
-	button->name = "edit";
-	button->setButtonListener(menuListener);
 
 	button = makeTextButton();
 	button->boxBegin = Vector2(250, 0);
@@ -172,9 +133,6 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->textSize = 16;
 	button->fontLocationRelativeTo = Vector2(10, 0);
 	button->setAllColorsSame();
-	button->boxColorOvr = Color4(0.6F,0.6F,0.6F,0.4F);
-	button->name = "view";
-	button->setButtonListener(menuListener);
 
 	button = makeTextButton();
 	button->boxBegin = Vector2(375, 0);
@@ -188,9 +146,6 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->textSize = 16;
 	button->fontLocationRelativeTo = Vector2(10, 0);
 	button->setAllColorsSame();
-	button->boxColorOvr = Color4(0.6F,0.6F,0.6F,0.4F);
-	button->name = "insert";
-	button->setButtonListener(menuListener);
 
 	button = makeTextButton();
 	button->boxBegin = Vector2(500, 0);
@@ -204,11 +159,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->textSize = 16;
 	button->fontLocationRelativeTo = Vector2(10, 0);
 	button->setAllColorsSame();
-	button->boxColorOvr = Color4(0.6F,0.6F,0.6F,0.4F);
-	button->name = "format";
-	button->setButtonListener(menuListener);
 
-	//Menu
+
+
 	button = makeTextButton();
 	button->boxBegin = Vector2(0,215);
 	button->boxEnd = Vector2(80,235);
@@ -223,7 +176,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->font = g_fntlighttrek;
 	button->fontLocationRelativeTo = Vector2(10, 0);
 	button->setParent(this);
-	button->setButtonListener(gud);
+
 
 	button = makeTextButton();
 	button->boxBegin = Vector2(0,240);
@@ -239,7 +192,6 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->font = g_fntlighttrek;
 	button->fontLocationRelativeTo = Vector2(10, 0);
 	button->setParent(this);
-	button->setButtonListener(gud);
 
 	button = makeTextButton();
 	button->boxBegin = Vector2(0,265);
@@ -255,18 +207,12 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->fontLocationRelativeTo = Vector2(10, 0);
 	button->setParent(this);
 	button->name = "Duplicate";
-	button->setButtonListener(gud);
+	button->setButtonListener(new GUDButtonListener());
 
-	ImageButtonInstance* instance = new ToggleImageButtonInstance(
+	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")),
-		NULL,		
-		Texture::fromFile(GetFileInPath("/content/images/Stop.png")),
-		Texture::fromFile(GetFileInPath("/content/images/Stop_ovr.png")),
-		Texture::fromFile(GetFileInPath("/content/images/Stop_dn.png"))
-		);
-	instance->setButtonListener(menuListener);
+		Texture::fromFile(GetFileInPath("/content/images/Run_dn.png")));
 	instance->name = "go";
 	instance->size = Vector2(65,65);
 	instance->position = Vector2(6.5, 25);
@@ -282,14 +228,14 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(15, 90);
 	instance->setParent(this);
 	instance->name = "Cursor";
-	instance->setButtonListener(msl);
+	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(msl);
+	instance->setButtonListener(new ModeSelectionListener());
 	
 
 	instance = makeImageButton(
@@ -301,7 +247,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(40, 140);
 	instance->setParent(this);
 	instance->name = "Arrows";
-	instance->setButtonListener(msl);
+	instance->setButtonListener(new ModeSelectionListener());
 
 	instance = makeImageButton(
 		Texture::fromFile(GetFileInPath("/content/images/SelectionRotate.png")),
@@ -312,7 +258,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(10, 175);
 	instance->setParent(this);
 	instance->name = "Rotate";
-	instance->setButtonListener(rbl);
+	instance->setButtonListener(new RotateButtonListener());
 
 	instance = makeImageButton(
 		Texture::fromFile(GetFileInPath("/content/images/SelectionTilt.png")),
@@ -323,7 +269,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(40, 175);
 	instance->setParent(this);
 	instance->name = "Tilt";
-	instance->setButtonListener(rbl);
+	instance->setButtonListener(new RotateButtonListener());
 
 
 	instance = makeImageButton(
@@ -335,7 +281,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(20, 284);
 	instance->setParent(this);
 	instance->name = "Delete";
-	instance->setButtonListener(delet);
+	instance->setButtonListener(new DeleteListener());
 
 	instance = makeImageButton(
 		Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn.png")),
@@ -347,7 +293,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(-77, -90);
 	instance->setParent(this);
 	instance->name = "ZoomIn";
-	instance->setButtonListener(cam);
+	instance->setButtonListener(new CameraButtonListener());
 
 	instance = makeImageButton(
 		Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut.png")),
@@ -359,7 +305,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(-77, -31);
 	instance->setParent(this);
 	instance->name = "ZoomOut";
-	instance->setButtonListener(cam);
+	instance->setButtonListener(new CameraButtonListener());
 
 	instance = makeImageButton(
 		Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft.png")),
@@ -371,7 +317,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(-110, -50);
 	instance->setParent(this);
 	instance->name = "PanLeft";
-	instance->setButtonListener(cam);
+	instance->setButtonListener(new CameraButtonListener());
 
 	instance = makeImageButton(
 		Texture::fromFile(GetFileInPath("/content/images/CameraPanRight.png")),
@@ -383,7 +329,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(-45, -50);
 	instance->setParent(this);
 	instance->name = "PanRight";
-	instance->setButtonListener(cam);
+	instance->setButtonListener(new CameraButtonListener());
 
 	instance = makeImageButton(
 		Texture::fromFile(GetFileInPath("/content/images/CameraCenter.png")),
@@ -395,7 +341,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(-77, -60);
 	instance->setParent(this);
 	instance->name = "CenterCam";
-	instance->setButtonListener(cam);
+	instance->setButtonListener(new CameraButtonListener());
 
 	instance = makeImageButton(
 		Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp.png")),
@@ -407,7 +353,7 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(-105, -75);
 	instance->setParent(this);
 	instance->name = "TiltUp";
-	instance->setButtonListener(cam);
+	instance->setButtonListener(new CameraButtonListener());
 
 	instance = makeImageButton(
 		Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown.png")),
@@ -419,30 +365,29 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->position = Vector2(-40, -75);
 	instance->setParent(this);
 	instance->name = "TiltDown";
-	instance->setButtonListener(cam);
+	instance->setButtonListener(new CameraButtonListener());
 }
 
 
-void GuiRootInstance::drawButtons(RenderDevice* rd)
+void GuiRoot::drawButtons(RenderDevice* rd)
 {
 	rd->pushState();
 	rd->beforePrimitive();
-			//this->render(rd);
+			this->render(rd);
 	rd->afterPrimitive();
 	rd->popState();
 }
 
-void GuiRootInstance::setDebugMessage(std::string msg, G3D::RealTime msgTime)
+void GuiRoot::setDebugMessage(std::string msg, G3D::RealTime msgTime)
 {
 	_messageTime = msgTime;
 	_message = msg;
 }
 
-//void GuiRootInstance::render(G3D::RenderDevice* renderDevice) {}
+//void GuiRoot::render(G3D::RenderDevice* renderDevice) {}
 
-void GuiRootInstance::renderGUI(G3D::RenderDevice* rd, double fps)
+void GuiRoot::renderGUI(G3D::RenderDevice* rd, double fps)
 {
-	if(_hideGui) return;
 	//TODO--Move these to their own instance
 
 	std::stringstream stream;
@@ -458,7 +403,7 @@ void GuiRootInstance::renderGUI(G3D::RenderDevice* rd, double fps)
 #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() - 117,0),Vector3(rd->getWidth(),rd->getHeight(),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));
@@ -468,7 +413,7 @@ void GuiRootInstance::renderGUI(G3D::RenderDevice* rd, double fps)
 	g_fntlighttrek->draw2D(rd,"MENU", Vector2(10,332), 14, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F));
 
 	
-	//drawButtons(rd);
+	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());
@@ -478,7 +423,7 @@ void GuiRootInstance::renderGUI(G3D::RenderDevice* rd, double fps)
 	render(rd);
 }
 
-bool GuiRootInstance::mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y)
+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++)
@@ -493,8 +438,8 @@ bool GuiRootInstance::mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y)
 	}
 	return false;
 }
-//Oh eww...
-void GuiRootInstance::update()
+
+void GuiRoot::update()
 {		
 	Instance * obj6 = this->findFirstChild("Delete");
 	Instance * obj = this->findFirstChild("Duplicate");
@@ -516,8 +461,8 @@ void GuiRootInstance::update()
 		button4->disabled = true;
 		button5->disabled = true;
 		button6->disabled = true;
-		for(size_t i = 0; i < g_dataModel->getSelectionService()->getSelection().size(); i++)
-			if(g_dataModel->getSelectionService()->getSelection()[i]->canDelete)
+		for(size_t i = 0; i < g_selectedInstances.size(); i++)
+			if(g_selectedInstances.at(i)->canDelete)
 			{
 				button->disabled = false;
 				button2->disabled = false;
@@ -530,11 +475,7 @@ void GuiRootInstance::update()
 	}
 }
 
-GuiRootInstance::~GuiRootInstance()
-{
-}
-
-void GuiRootInstance::onMouseLeftUp(G3D::RenderDevice* renderDevice, int x,int y)
+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++)
@@ -548,7 +489,3 @@ void GuiRootInstance::onMouseLeftUp(G3D::RenderDevice* renderDevice, int x,int y
 		}
 	}
 }
-
-void GuiRootInstance::hideGui(bool doHide) {
-	_hideGui = doHide;
-}

GuiRoot.h

@@ -5,11 +5,10 @@ class ImageButtonInstance;
 
 class TextButtonInstance;
 
-class GuiRootInstance : public Instance
+class GuiRoot : public Instance
 {
 public:
-	GuiRootInstance();
-	GuiRootInstance::~GuiRootInstance();
+	GuiRoot();
 	TextButtonInstance*		makeTextButton();
 	void					drawButtons(RenderDevice* rd);
 	ImageButtonInstance*	makeImageButton(G3D::TextureRef newImage, G3D::TextureRef overImage, G3D::TextureRef downImage, G3D::TextureRef disableImage);
@@ -18,9 +17,7 @@ public:
 	void					update();
 	bool					mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y);
 	void					onMouseLeftUp(G3D::RenderDevice* renderDevice, int x,int y);
-	void					hideGui(bool doHide);
 private:
 	std::string			_message;
 	G3D::RealTime		_messageTime;
-	bool				_hideGui;
 };

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

@@ -1,4 +1,4 @@
-#include "DataModelV2/ImageButtonInstance.h"
+#include "ImageButtonInstance.h"
 
 ImageButtonInstance::ImageButtonInstance(G3D::TextureRef newImage, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
 {
@@ -38,6 +38,7 @@ ImageButtonInstance::~ImageButtonInstance(void)
 	image_ovr = NULL;
 	image_ds = NULL;
 	image_dn = NULL;
+	delete listener;
 	listener = NULL;
 	selected = false;
 }

Installer/install_script.iss

@@ -1,48 +0,0 @@
-;InnoSetupVersion=5.4.3
-#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,51 +0,0 @@
-;InnoSetupVersion=5.4.3
-#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";
-

Instance.cpp

@@ -1,7 +1,6 @@
 #define WINVER	0x0400
 #include <G3DAll.h>
-#include "DataModelV2/Instance.h"
-
+#include "Instance.h"
 
 
 Instance::Instance(void)
@@ -20,8 +19,11 @@ Instance::Instance(const Instance &oinst)
 	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++)
@@ -30,14 +32,6 @@ void Instance::render(RenderDevice* rd)
 	}
 }
 
-void Instance::renderName(RenderDevice* rd)
-{
-	for(size_t i = 0; i < children.size(); i++)
-	{
-		children[i]->renderName(rd);
-	}
-}
-
 void Instance::update()
 {
 }
@@ -80,13 +74,6 @@ std::vector<PROPGRIDITEM> Instance::getProperties()
 }
 
 
-std::vector<Property *> Instance::collectProperties()
-{
-	std::vector<Property *> properties;
-	properties.push_back(new StringProperty("Name", "The name of this instance", "Properties", name, this, &Instance::setName));
-	return properties;
-}
-
 
 Instance::~Instance(void)
 {
@@ -127,6 +114,21 @@ std::vector<Instance* > Instance::getAllChildren()
 	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)
@@ -152,10 +154,6 @@ void Instance::addChild(Instance* newChild)
 
 void Instance::clearChildren()
 {
-	for (size_t i = 0; i < children.size(); i++)
-	{
-		delete children.at(i);
-	} 
 	children.clear();
 }
 void Instance::removeChild(Instance* oldChild)

Instance.h

@@ -1,9 +1,6 @@
 #pragma once
 #include <G3DAll.h>
 #include "propertyGrid.h"
-#include "PropertiesV2/StringProperty.h"
-#include "PropertiesV2/BoolProperty.h"
-#include "map"
 
 class Instance
 {
@@ -14,13 +11,12 @@ public:
 	virtual ~Instance(void);
 	std::string name;
 	virtual void render(RenderDevice*);
-	virtual void renderName(RenderDevice*);
 	virtual void update();
-	std::vector<Instance*> children; // All children.
 	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*);
@@ -28,19 +24,13 @@ public:
 	void clearChildren();
 	Instance* getParent();
 	virtual Instance* clone() const { return new Instance(*this); }
-	//Deprecated
 	virtual std::vector<PROPGRIDITEM> getProperties();
-	//Deprecated
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
-
-	virtual std::vector<Property *> collectProperties();
-
 	int listicon;
 protected:
+	std::vector<Instance*> children; // All children.
 	std::string className;
 	Instance* parent;  // Another pointer.
-	//Deprecated
 	PROPGRIDITEM createPGI(LPSTR catalog, LPSTR propName, LPSTR propDesc, LPARAM curVal, INT type, TCHAR choices[] = NULL);
-private:
-	static const std::map<std::string, Instance> g_logLevelsDescriptions;
+	
 };

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

@@ -7,19 +7,10 @@ class LevelInstance :
 public:
 	LevelInstance(void);
 	~LevelInstance(void);
-	bool HighScoreIsGood;
-	Enum::ActionType::Value TimerUpAction;
-	Enum::AffectType::Value TimerAffectsScore;
-	bool RunOnOpen;
 	float timer;
 	int score;
 	virtual std::vector<PROPGRIDITEM> getProperties();
 	std::string winMessage;
 	std::string loseMessage;
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
-	void winCondition();
-	void loseCondition();
-	void pauseCondition();
-	void drawCondition();
-	void Step(SimTime sdt);
 };

ModeSelectionListener.cpp

@@ -1,9 +1,7 @@
 #include "Globals.h"
-#include "DataModelV2/Instance.h"
-#include "Listener/ModeSelectionListener.h"
+#include "Instance.h"
+#include "ModeSelectionListener.h"
 #include "Application.h"
-#include "Tool/ArrowTool.h"
-#include "Tool/DraggerTool.h"
 
 void ModeSelectionListener::onButton1MouseClick(BaseButtonInstance* button)
 {
@@ -22,14 +20,9 @@ void ModeSelectionListener::onButton1MouseClick(BaseButtonInstance* button)
 
 	button->selected = true;
 	if(button->name == "Cursor")
-		g_usableApp->changeTool(new ArrowTool());
+		g_usableApp->setMode(CURSOR);
 	else if(button->name == "Resize")
-	{
 		g_usableApp->setMode(RESIZE);
-	}
 	else if(button->name == "Arrows")
-	{	
-		g_usableApp->changeTool(new DraggerTool());
-		g_usableApp->setMode(NULL);
-	}
+		g_usableApp->setMode(ARROWS);
 }

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;
+};

Physics Test/Cylinder.rbxl

@@ -1,588 +0,0 @@
-<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
-	<External>null</External>
-	<External>nil</External>
-	<Item class="Workspace" referent="RBX0">
-		<Properties>
-			<token name="Controller">0</token>
-			<bool name="ControllerFlagShown">true</bool>
-			<Ref name="CurrentCamera">RBX1</Ref>
-			<double name="DistributedGameTime">0</double>
-			<CoordinateFrame name="ModelInPrimary">
-				<X>0</X>
-				<Y>0</Y>
-				<Z>0</Z>
-				<R00>1</R00>
-				<R01>0</R01>
-				<R02>0</R02>
-				<R10>0</R10>
-				<R11>1</R11>
-				<R12>0</R12>
-				<R20>0</R20>
-				<R21>0</R21>
-				<R22>1</R22>
-			</CoordinateFrame>
-			<string name="Name">Workspace</string>
-			<Ref name="PrimaryPart">null</Ref>
-			<bool name="archivable">true</bool>
-		</Properties>
-		<Item class="Camera" referent="RBX1">
-			<Properties>
-				<Ref name="CameraSubject">null</Ref>
-				<token name="CameraType">0</token>
-				<CoordinateFrame name="CoordinateFrame">
-					<X>-2.9603548</X>
-					<Y>115.389259</Y>
-					<Z>44.9416084</Z>
-					<R00>0.112786211</R00>
-					<R01>0.522245169</R01>
-					<R02>-0.845304191</R02>
-					<R10>-2.22539209e-009</R10>
-					<R11>0.850732446</R11>
-					<R12>0.525598884</R12>
-					<R20>0.993619263</R20>
-					<R21>-0.0592803061</R21>
-					<R22>0.0959508941</R22>
-				</CoordinateFrame>
-				<CoordinateFrame name="Focus">
-					<X>13.9457293</X>
-					<Y>104.877281</Y>
-					<Z>43.0225906</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<string name="Name">Camera</string>
-				<bool name="archivable">true</bool>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX2">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">21</int>
-				<CoordinateFrame name="CFrame">
-					<X>87.0174942</X>
-					<Y>48.0466728</Y>
-					<Z>25.0001202</Z>
-					<R00>-0.969314575</R00>
-					<R01>0.245822206</R01>
-					<R02>4.6762093e-006</R02>
-					<R10>0.245822206</R10>
-					<R11>0.969314933</R11>
-					<R12>6.9744442e-007</R12>
-					<R20>-4.35209677e-006</R20>
-					<R21>1.87532066e-006</R21>
-					<R22>-0.999999642</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">2</token>
-				<Vector3 name="size">
-					<X>6</X>
-					<Y>6</Y>
-					<Z>6</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX3">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>108.911415</X>
-					<Y>38.7803154</Y>
-					<Z>27.5002155</Z>
-					<R00>-0.969314575</R00>
-					<R01>0.245822206</R01>
-					<R02>4.6762093e-006</R02>
-					<R10>0.245822206</R10>
-					<R11>0.969314933</R11>
-					<R12>6.9744442e-007</R12>
-					<R20>-4.35209677e-006</R20>
-					<R21>1.87532066e-006</R21>
-					<R22>-0.999999642</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>53</X>
-					<Y>1.20000005</Y>
-					<Z>1</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX4">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>141.499893</X>
-					<Y>38.1177788</Y>
-					<Z>27.0499611</Z>
-					<R00>1</R00>
-					<R01>-1.07914104e-006</R01>
-					<R02>-4.49890285e-006</R02>
-					<R10>-5.98966139e-008</R10>
-					<R11>0.969315231</R11>
-					<R12>-0.245820925</R12>
-					<R20>4.6261307e-006</R20>
-					<R21>0.245820925</R21>
-					<R22>0.969315231</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>1</X>
-					<Y>16.8000011</Y>
-					<Z>12</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX5">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>108.911438</X>
-					<Y>38.7803192</Y>
-					<Z>22.5002174</Z>
-					<R00>-0.969314575</R00>
-					<R01>0.245822206</R01>
-					<R02>4.6762093e-006</R02>
-					<R10>0.245822206</R10>
-					<R11>0.969314933</R11>
-					<R12>6.9744442e-007</R12>
-					<R20>-4.35209677e-006</R20>
-					<R21>1.87532066e-006</R21>
-					<R22>-0.999999642</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>53</X>
-					<Y>1.20000005</Y>
-					<Z>1</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX6">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>140.499786</X>
-					<Y>24.7802944</Y>
-					<Z>47.911438</Z>
-					<R00>4.35209677e-006</R00>
-					<R01>-1.87532066e-006</R01>
-					<R02>0.999999642</R02>
-					<R10>0.245822206</R10>
-					<R11>0.969314933</R11>
-					<R12>6.9744442e-007</R12>
-					<R20>-0.969314575</R20>
-					<R21>0.245822206</R21>
-					<R22>4.6762093e-006</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>53</X>
-					<Y>1.20000005</Y>
-					<Z>1</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX7">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>135.499786</X>
-					<Y>24.7802944</Y>
-					<Z>47.9114227</Z>
-					<R00>4.35515585e-006</R00>
-					<R01>-1.85873387e-006</R01>
-					<R02>0.999999881</R02>
-					<R10>0.245822236</R10>
-					<R11>0.969314933</R11>
-					<R12>7.14274279e-007</R12>
-					<R20>-0.969314814</R20>
-					<R21>0.245822236</R21>
-					<R22>4.67732343e-006</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>53</X>
-					<Y>1.20000005</Y>
-					<Z>1</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-	</Item>
-	<Item class="RunService" referent="RBX8">
-		<Properties>
-			<string name="Name">Run Service</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX9</External>
-	<External>RBX10</External>
-	<Item class="Players" referent="RBX11">
-		<Properties>
-			<int name="MaxPlayers">12</int>
-			<string name="Name">Players</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="StarterPack" referent="RBX12">
-		<Properties>
-			<string name="Name">StarterPack</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="SoundService" referent="RBX13">
-		<Properties>
-			<token name="AmbientReverb">0</token>
-			<float name="DistanceFactor">10</float>
-			<float name="DopplerScale">1</float>
-			<string name="Name">Soundscape</string>
-			<float name="RolloffScale">1</float>
-			<bool name="archivable">true</bool>
-		</Properties>
-		<External>RBX14</External>
-		<External>RBX15</External>
-		<External>RBX16</External>
-		<External>RBX17</External>
-		<External>RBX18</External>
-		<External>RBX19</External>
-		<External>RBX20</External>
-		<External>RBX21</External>
-		<External>RBX22</External>
-		<External>RBX23</External>
-		<External>RBX24</External>
-		<External>RBX25</External>
-		<External>RBX26</External>
-		<External>RBX27</External>
-	</Item>
-	<Item class="ContentProvider" referent="RBX28">
-		<Properties>
-			<string name="Name">Instance</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="PhysicsService" referent="RBX29">
-		<Properties>
-			<string name="Name">PhysicsService</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX30</External>
-	<Item class="Selection" referent="RBX31">
-		<Properties>
-			<string name="Name">Selection</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX32</External>
-	<Item class="Lighting" referent="RBX33">
-		<Properties>
-			<Color3 name="Ambient">4286940549</Color3>
-			<float name="Brightness">1</float>
-			<Color3 name="ColorShift_Bottom">4278190080</Color3>
-			<Color3 name="ColorShift_Top">4278190080</Color3>
-			<float name="GeographicLatitude">41.7332993</float>
-			<string name="Name">Lighting</string>
-			<Color3 name="ShadowColor">4290295997</Color3>
-			<string name="TimeOfDay">14:00:00</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="ControllerService" referent="RBX34">
-		<Properties>
-			<string name="Name">Instance</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="ChangeHistoryService" referent="RBX35">
-		<Properties>
-			<string name="Name">ChangeHistoryService</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX36</External>
-</roblox>

Physics Test/phys_test_004.rbxl

@@ -1,578 +0,0 @@
-<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
-	<External>null</External>
-	<External>nil</External>
-	<Item class="RunService">
-		<Properties>
-			<string name="Name">Run Service</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="Selection">
-		<Properties>
-			<string name="Name">Selection</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="Workspace">
-		<Properties>
-			<token name="Controller">0</token>
-			<bool name="ControllerFlagShown">true</bool>
-			<Ref name="CurrentCamera">RBX0</Ref>
-			<CoordinateFrame name="ModelInPrimary">
-				<X>0</X>
-				<Y>0</Y>
-				<Z>0</Z>
-				<R00>1</R00>
-				<R01>0</R01>
-				<R02>0</R02>
-				<R10>0</R10>
-				<R11>1</R11>
-				<R12>0</R12>
-				<R20>0</R20>
-				<R21>0</R21>
-				<R22>1</R22>
-			</CoordinateFrame>
-			<string name="Name">Workspace</string>
-			<Ref name="PrimaryPart">RBX1</Ref>
-			<bool name="archivable">true</bool>
-		</Properties>
-		<Item class="Camera" referent="RBX0">
-			<Properties>
-				<Ref name="CameraSubject">null</Ref>
-				<token name="CameraType">0</token>
-				<CoordinateFrame name="CoordinateFrame">
-					<X>202.42688</X>
-					<Y>55.4607582</Y>
-					<Z>3.2956109</Z>
-					<R00>0.0106770508</R00>
-					<R01>0.00328579429</R01>
-					<R02>0.999937654</R02>
-					<R10>4.65661287e-010</R10>
-					<R11>0.999994576</R11>
-					<R12>-0.00328598148</R12>
-					<R20>-0.999943018</R20>
-					<R21>3.50852497e-005</R21>
-					<R22>0.010676994</R22>
-				</CoordinateFrame>
-				<CoordinateFrame name="Focus">
-					<X>182.428116</X>
-					<Y>55.5264778</Y>
-					<Z>3.08207107</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<string name="Name">Camera</string>
-				<bool name="archivable">true</bool>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX1">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">37</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>2.79999995</Y>
-					<Z>-4</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">true</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>64</X>
-					<Y>1</Y>
-					<Z>248</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>78.3000031</Y>
-					<Z>-96</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>2</X>
-					<Y>2</Y>
-					<Z>2</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>79.3000031</Y>
-					<Z>-62</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>4</X>
-					<Y>4</Y>
-					<Z>4</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>81.3000031</Y>
-					<Z>-25</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>8</X>
-					<Y>8</Y>
-					<Z>8</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>85.3000031</Y>
-					<Z>18</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>16</X>
-					<Y>16</Y>
-					<Z>16</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">0</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">23</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>93.3000031</Y>
-					<Z>73</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<bool name="CastsShadows">false</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="Cullable">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Part</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">0</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>32</X>
-					<Y>32</Y>
-					<Z>32</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-	</Item>
-	<External>RBX2</External>
-	<External>RBX3</External>
-	<Item class="Players">
-		<Properties>
-			<string name="Name">Players</string>
-			<bool name="archivable">true</bool>
-			<int name="maxPlayers">10</int>
-		</Properties>
-	</Item>
-	<Item class="StarterPack">
-		<Properties>
-			<string name="Name">StarterPack</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="SoundService">
-		<Properties>
-			<string name="Name">SoundService</string>
-			<bool name="archivable">true</bool>
-			<float name="distancefactor">10</float>
-			<float name="dopplerscale">1</float>
-			<float name="rolloffscale">1</float>
-		</Properties>
-		<External>RBX4</External>
-		<External>RBX5</External>
-		<External>RBX6</External>
-		<External>RBX7</External>
-		<External>RBX8</External>
-		<External>RBX9</External>
-		<External>RBX10</External>
-		<External>RBX11</External>
-		<External>RBX12</External>
-		<External>RBX13</External>
-		<External>RBX14</External>
-		<External>RBX15</External>
-		<External>RBX16</External>
-		<External>RBX17</External>
-	</Item>
-	<Item class="Lighting">
-		<Properties>
-			<Color3 name="BottomAmbientV9">4286220152</Color3>
-			<Color3 name="ClearColor">4278190080</Color3>
-			<string name="Name">Lighting</string>
-			<Color3 name="SpotLightV9">4290822336</Color3>
-			<string name="TimeOfDay">14:00:00</string>
-			<Color3 name="TopAmbientV9">4292006362</Color3>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="ControllerService">
-		<Properties>
-			<string name="Name">Instance</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX18</External>
-	<External>RBX19</External>
-	<External>RBX20</External>
-</roblox>

Physics Test/phys_test_stable.rbxl

@@ -1,660 +0,0 @@
-<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
-	<External>null</External>
-	<External>nil</External>
-	<Item class="Workspace" referent="RBX0">
-		<Properties>
-			<token name="Controller">0</token>
-			<bool name="ControllerFlagShown">true</bool>
-			<Ref name="CurrentCamera">RBX1</Ref>
-			<double name="DistributedGameTime">0</double>
-			<CoordinateFrame name="ModelInPrimary">
-				<X>0</X>
-				<Y>0</Y>
-				<Z>0</Z>
-				<R00>1</R00>
-				<R01>0</R01>
-				<R02>0</R02>
-				<R10>0</R10>
-				<R11>1</R11>
-				<R12>0</R12>
-				<R20>0</R20>
-				<R21>0</R21>
-				<R22>1</R22>
-			</CoordinateFrame>
-			<string name="Name">Workspace</string>
-			<Ref name="PrimaryPart">null</Ref>
-			<bool name="archivable">true</bool>
-		</Properties>
-		<Item class="Camera" referent="RBX1">
-			<Properties>
-				<Ref name="CameraSubject">null</Ref>
-				<token name="CameraType">0</token>
-				<CoordinateFrame name="CoordinateFrame">
-					<X>-62.3436203</X>
-					<Y>290.964996</Y>
-					<Z>130.047195</Z>
-					<R00>0.900759101</R00>
-					<R01>0.385544956</R01>
-					<R02>-0.199970409</R02>
-					<R10>3.07713033e-009</R10>
-					<R11>0.460422784</R11>
-					<R12>0.887699783</R12>
-					<R20>0.434319079</R20>
-					<R21>-0.799603641</R21>
-					<R22>0.414730012</R22>
-				</CoordinateFrame>
-				<CoordinateFrame name="Focus">
-					<X>-58.3442116</X>
-					<Y>273.210999</Y>
-					<Z>121.752594</Z>
-					<R00>1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>1</R22>
-				</CoordinateFrame>
-				<string name="Name">Camera</string>
-				<bool name="archivable">true</bool>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX2">
-			<Properties>
-				<bool name="Anchored">true</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">37</int>
-				<CoordinateFrame name="CFrame">
-					<X>0</X>
-					<Y>0.600000024</Y>
-					<Z>0</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>-0</R02>
-					<R10>-0</R10>
-					<R11>1</R11>
-					<R12>-0</R12>
-					<R20>-0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">1</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">true</bool>
-				<string name="Name">Baseplate</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>512</X>
-					<Y>1.20000005</Y>
-					<Z>512</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX3">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>-2</X>
-					<Y>5.69999981</Y>
-					<Z>1</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>2</X>
-					<Y>9</Y>
-					<Z>2</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX4">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>6</X>
-					<Y>5.69999981</Y>
-					<Z>1</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>2</X>
-					<Y>9</Y>
-					<Z>2</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX5">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>6</X>
-					<Y>5.69999981</Y>
-					<Z>-7</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>2</X>
-					<Y>9</Y>
-					<Z>2</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX6">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>-2</X>
-					<Y>5.69999981</Y>
-					<Z>-7</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>2</X>
-					<Y>9</Y>
-					<Z>2</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX7">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>2</X>
-					<Y>11.1999998</Y>
-					<Z>-3</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>10</X>
-					<Y>2</Y>
-					<Z>10</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-		<Item class="Part" referent="RBX8">
-			<Properties>
-				<bool name="Anchored">false</bool>
-				<float name="BackParamA">-0.5</float>
-				<float name="BackParamB">0.5</float>
-				<token name="BackSurface">0</token>
-				<token name="BackSurfaceInput">0</token>
-				<float name="BottomParamA">-0.5</float>
-				<float name="BottomParamB">0.5</float>
-				<token name="BottomSurface">4</token>
-				<token name="BottomSurfaceInput">0</token>
-				<int name="BrickColor">28</int>
-				<CoordinateFrame name="CFrame">
-					<X>2</X>
-					<Y>13.1999998</Y>
-					<Z>-3</Z>
-					<R00>-1</R00>
-					<R01>0</R01>
-					<R02>0</R02>
-					<R10>0</R10>
-					<R11>1</R11>
-					<R12>0</R12>
-					<R20>0</R20>
-					<R21>0</R21>
-					<R22>-1</R22>
-				</CoordinateFrame>
-				<bool name="CanCollide">true</bool>
-				<token name="Controller">0</token>
-				<bool name="ControllerFlagShown">true</bool>
-				<bool name="DraggingV1">false</bool>
-				<float name="Elasticity">0.5</float>
-				<token name="FormFactor">0</token>
-				<float name="Friction">0.300000012</float>
-				<float name="FrontParamA">-0.5</float>
-				<float name="FrontParamB">0.5</float>
-				<token name="FrontSurface">0</token>
-				<token name="FrontSurfaceInput">0</token>
-				<float name="LeftParamA">-0.5</float>
-				<float name="LeftParamB">0.5</float>
-				<token name="LeftSurface">0</token>
-				<token name="LeftSurfaceInput">0</token>
-				<bool name="Locked">false</bool>
-				<string name="Name">Smooth Block Model</string>
-				<float name="Reflectance">0</float>
-				<float name="RightParamA">-0.5</float>
-				<float name="RightParamB">0.5</float>
-				<token name="RightSurface">0</token>
-				<token name="RightSurfaceInput">0</token>
-				<Vector3 name="RotVelocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<float name="TopParamA">-0.5</float>
-				<float name="TopParamB">0.5</float>
-				<token name="TopSurface">3</token>
-				<token name="TopSurfaceInput">0</token>
-				<float name="Transparency">0</float>
-				<Vector3 name="Velocity">
-					<X>0</X>
-					<Y>0</Y>
-					<Z>0</Z>
-				</Vector3>
-				<bool name="archivable">true</bool>
-				<token name="shape">1</token>
-				<Vector3 name="size">
-					<X>6</X>
-					<Y>2</Y>
-					<Z>6</Z>
-				</Vector3>
-			</Properties>
-		</Item>
-	</Item>
-	<Item class="RunService" referent="RBX9">
-		<Properties>
-			<string name="Name">Run Service</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX10</External>
-	<External>RBX11</External>
-	<Item class="Players" referent="RBX12">
-		<Properties>
-			<int name="MaxPlayers">12</int>
-			<string name="Name">Players</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="StarterPack" referent="RBX13">
-		<Properties>
-			<string name="Name">StarterPack</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="SoundService" referent="RBX14">
-		<Properties>
-			<token name="AmbientReverb">0</token>
-			<float name="DistanceFactor">10</float>
-			<float name="DopplerScale">1</float>
-			<string name="Name">Soundscape</string>
-			<float name="RolloffScale">1</float>
-			<bool name="archivable">true</bool>
-		</Properties>
-		<External>RBX15</External>
-		<External>RBX16</External>
-		<External>RBX17</External>
-		<External>RBX18</External>
-		<External>RBX19</External>
-		<External>RBX20</External>
-		<External>RBX21</External>
-		<External>RBX22</External>
-		<External>RBX23</External>
-		<External>RBX24</External>
-		<External>RBX25</External>
-		<External>RBX26</External>
-		<External>RBX27</External>
-		<External>RBX28</External>
-	</Item>
-	<Item class="ContentProvider" referent="RBX29">
-		<Properties>
-			<string name="Name">Instance</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="PhysicsService" referent="RBX30">
-		<Properties>
-			<string name="Name">PhysicsService</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX31</External>
-	<Item class="Selection" referent="RBX32">
-		<Properties>
-			<string name="Name">Selection</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX33</External>
-	<Item class="Lighting" referent="RBX34">
-		<Properties>
-			<Color3 name="Ambient">4286611584</Color3>
-			<float name="Brightness">1</float>
-			<Color3 name="ColorShift_Bottom">4278190080</Color3>
-			<Color3 name="ColorShift_Top">4278190080</Color3>
-			<float name="GeographicLatitude">41.7332993</float>
-			<string name="Name">Lighting</string>
-			<Color3 name="ShadowColor">4289967032</Color3>
-			<string name="TimeOfDay">14:00:00</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="ControllerService" referent="RBX35">
-		<Properties>
-			<string name="Name">Instance</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<Item class="ChangeHistoryService" referent="RBX36">
-		<Properties>
-			<string name="Name">ChangeHistoryService</string>
-			<bool name="archivable">true</bool>
-		</Properties>
-	</Item>
-	<External>RBX37</External>
-</roblox>

PropertyWindow.cpp

@@ -3,10 +3,16 @@
 #include "WindowFunctions.h"
 #include "resource.h"
 #include "PropertyWindow.h"
+#include "Globals.h"
 #include "strsafe.h"
 #include "Application.h"
 
-std::vector<Property*> prop;
+/*typedef struct typPRGP {
+    Instance* instance;   // Declare member types
+    Property &prop;
+} PRGP;*/
+
+std::vector<PROPGRIDITEM> prop;
 std::vector<Instance*> children;
 Instance * selectedInstance;
 Instance * parent = NULL;
@@ -73,6 +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;
@@ -170,8 +177,8 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					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();
-					g_dataModel->getSelectionService()->addSelected(children.at(ItemIndex));
+					propWind->ClearProperties();
+					g_usableApp->selectInstance(children.at(ItemIndex),propWind);
 				}
 			}
 		break;
@@ -186,15 +193,8 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                         LPNMHDR pnm = (LPNMHDR)lParam;
                         LPNMPROPGRID lpnmp = (LPNMPROPGRID)pnm;
                         LPPROPGRIDITEM item = PropGrid_GetItemData(pnm->hwndFrom,lpnmp->iIndex);
-						for(size_t i = 0; i < prop.size(); i++)
-						{
-							if(strcmp(item->lpszPropName, prop[i]->getName()) == 0)
-							{
-								prop[i]->setProperty(item);
-							}
-						}
-						//selectedInstance->PropUpdate(item);
-						propWind->UpdateSelected(g_dataModel->getSelectionService()->getSelection());
+						selectedInstance->PropUpdate(item);
+						//propWind->UpdateSelected(selectedInstance);
                     }
 				}
                 break;
@@ -208,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)
@@ -231,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++)
@@ -347,23 +343,16 @@ 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)
 {
-	deleteProperties();
-	if(instances.size() <= 0)
-	{
-		ClearProperties();
-		return;
-	}
-	Instance * instance = instances[0];
 	PropGrid_ResetContent(_propGrid);
-	prop = instance->collectProperties();
-	//if (selectedInstance != instance)
+	prop = instance->getProperties();
+	if (selectedInstance != instance)
 	{
 		selectedInstance = instance;
 		for(size_t i = 0; i < prop.size(); i++)
 		{
-			::PROPGRIDITEM item = prop.at(i)->getPropGridItem();
+			::PROPGRIDITEM item = prop.at(i);
 			PropGrid_AddItem(_propGrid, &item);
 			//PRGP propgp;
 			//propgp.instance = instance;
@@ -372,23 +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()
 {
-	deleteProperties();
-	clearExplorer();
 	PropGrid_ResetContent(_propGrid);
-}
-
-void PropertyWindow::deleteProperties()
-{
-	while(prop.size() > 0) {
-		Property * toDelete = prop.back();
-		prop.pop_back();
-		delete toDelete;
-	}
 }

PropertyWindow.h

@@ -1,19 +1,17 @@
 #pragma once
-#include "DataModelV2/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<Instance *> selection);
+	void	UpdateSelected(Instance *);
 	void	ClearProperties();
 	void	onResize();
-	void	refreshExplorer(std::vector<Instance *> selection);
+	void	refreshExplorer(Instance* selectedInstance);
 	HWND	_hwndProp;
 private:
 	HWND	_propGrid;
 	HWND	_explorerComboBox;
 	void	_resize();
-	void	clearExplorer();
-	void	deleteProperties();
 };

RotateButtonListener.cpp

@@ -1,13 +1,13 @@
-#include "DataModelV2/BaseButtonInstance.h"
-#include "Listener/RotateButtonListener.h"
+#include "BaseButtonInstance.h"
+#include "RotateButtonListener.h"
 #include "Globals.h"
 #include "AudioPlayer.h"
 
 void RotateButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
-	if(g_dataModel->getSelectionService()->getSelection().size() > 0)
+	if(g_selectedInstances.size() > 0)
 	{
-		Instance* selectedInstance = g_dataModel->getSelectionService()->getSelection()[0];
+		Instance* selectedInstance = g_selectedInstances.at(0);
 		AudioPlayer::playSound(clickSound);
 		if(PartInstance* part = dynamic_cast<PartInstance*>(selectedInstance))
 		{

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,4 +1,4 @@
-#include "DataModelV2/TextButtonInstance.h"
+#include "TextButtonInstance.h"
 
 
 TextButtonInstance::TextButtonInstance(void)
@@ -98,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);

ThumbnailGeneratorInstance.cpp

@@ -1,56 +0,0 @@
-#include "DataModelV2/ThumbnailGeneratorInstance.h"
-#include "Application.h"
-#include "Globals.h"
-#include "base64.h"
-#include <fstream>
-
-ThumbnailGeneratorInstance::ThumbnailGeneratorInstance(void)
-{
-	Instance::Instance();
-	name = "ThumbnailGenerator";
-	className = "ThumbnailGenerator";
-	canDelete = false;
-}
-
-ThumbnailGeneratorInstance::~ThumbnailGeneratorInstance(void) {}
-
-/*
- * TODO:
- * Move functions like toggleSky into their own "Lighting" instance
- * Make this headless, and allow for resolutions greater than the screen resolution
-*/
-std::string ThumbnailGeneratorInstance::click(std::string fileType, int cx, int cy, bool hideSky)
-{
-	if(!G3D::GImage::supportedFormat(fileType)) {
-		printf("%s is not a valid fileType.", fileType);
-		return "";
-	}
-
-	RenderDevice* rd = g_usableApp->getRenderDevice();
-	GuiRootInstance* guiRoot = g_dataModel->getGuiRoot();
-	const G3D::GImage::Format format = G3D::GImage::stringToFormat(fileType);
-
-	int prevWidth = rd->width();
-	int prevHeight = rd->height();
-	G3D::GImage imgBuffer(cx, cy, 4);
-	G3D::BinaryOutput binOut;
-
-	guiRoot->hideGui(true);
-	g_usableApp->resize3DView(cx, cy);
-
-	if(hideSky) 
-		g_dataModel->getLighting()->suppressSky(true);
-	
-	g_usableApp->onGraphics(rd);
-	rd->screenshotPic(imgBuffer, true, hideSky);
-	imgBuffer.encode(format, binOut);
-
-	// Convert to Base64 string
-	std::string base64ImgStr = base64_encode(reinterpret_cast<const unsigned char*>(binOut.getCArray()), binOut.length(), false);
-	
-	guiRoot->hideGui(false);
-	g_usableApp->resize3DView(prevWidth, prevHeight);
-
-	return base64ImgStr;
-}
-

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)
-{
-	  return E_NOTIMPL;
-}
+  ITypeInfo FAR* FAR* ppTInfo) {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* )
-{
-	m_lastExternalName = *ext_function_name;
-	return S_OK;
-}
+  DISPID FAR* ) {return E_NOTIMPL;}
 
 
 // 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 browser->doExternal(m_lastExternalName,dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
-	
-	//return S_OK;
-}
+  	{
+	return E_NOTIMPL;
+   }
 
 
 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 IDocHostUIHandler
+   public IOleInPlaceFrame
    {
    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;