Removed yet another block of outdated render code, fixed unSetMode

Hope I've done this properly. Stud snapping is primitive and needs work done.

.gitignore

@@ -52,6 +52,7 @@ G3DTest.suo
 G3DTest.suo
 stderr.txt
 desktop.ini
-main.cpp
 *.db
-G3DTest.sln
+
+#Redist
+!Installer/Redist/*

Blocks3D.dsp

@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="G3DTest" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Blocks3D" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=G3DTest - Win32 Debug
+CFG=Blocks3D - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "G3DTest.mak".
+!MESSAGE NMAKE /f "Blocks3D.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "G3DTest.mak" CFG="G3DTest - Win32 Debug"
+!MESSAGE NMAKE /f "Blocks3D.mak" CFG="Blocks3D - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "G3DTest - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "Blocks3D - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "G3DTest - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "Blocks3D - 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)" == "G3DTest - Win32 Release"
+!IF  "$(CFG)" == "Blocks3D - 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)" == "G3DTest - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Blocks3D - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -83,8 +83,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "G3DTest - Win32 Release"
+# Name "Blocks3D - Win32 Release"
-# Name "G3DTest - Win32 Debug"
+# Name "Blocks3D - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

Blocks3D.dsw

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

Blocks3D.sln

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

Blocks3D.vcproj

@@ -0,0 +1,909 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Blocks3D"
+	ProjectGUID="{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
+	RootNamespace="Blocks3D"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			UseOfATL="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/Blocks3D.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/Blocks3D.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="4105"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib"
+				OutputFile="./Blocks3D.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/Blocks3D.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			ManagedExtensions="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/Blocks3D.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="false"
+				PrecompiledHeaderFile=".\Debug/Blocks3D.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="4105"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib Urlmon.lib ole32.lib oleaut32.lib uuid.lib"
+				OutputFile="./Blocks3D-Debug.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/Blocks3D.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/Blocks3D.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<AssemblyReference
+			RelativePath="System.dll"
+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"
+			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
+		/>
+		<AssemblyReference
+			RelativePath="System.Drawing.dll"
+			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.Windows.Forms.dll"
+			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.XML.dll"
+			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath=".\src\source\Application.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\AudioPlayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\ax.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\BrowserCallHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\CameraController.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\ErrorFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\Globals.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\IEBrowser.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\IEDispatcher.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\main.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\Mouse.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\propertyGrid.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\PropertyWindow.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\Renderer.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\StringFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\TextureHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\source\WindowFunctions.cpp"
+				>
+			</File>
+			<Filter
+				Name="Tool"
+				>
+				<File
+					RelativePath=".\src\source\Tool\ArrowTool.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Tool\SurfaceTool.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Tool\Tool.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Listener"
+				>
+				<File
+					RelativePath=".\src\source\Listener\ButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\CameraButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\DeleteListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\GUDButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\MenuButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\ModeSelectionListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\RotateButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\ToolbarListener.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="DataModelV2"
+				>
+				<File
+					RelativePath=".\src\source\DataModelV2\DataModelInstance.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\GroupInstance.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\Instance.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\LevelInstance.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\PartInstance.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\PVInstance.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\WorkspaceInstance.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<Filter
+					Name="Gui"
+					>
+					<File
+						RelativePath=".\src\source\DataModelV2\BaseButtonInstance.cpp"
+						>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV2\BaseGuiInstance.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV2\GuiRootInstance.cpp"
+						>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV2\ImageButtonInstance.cpp"
+						>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV2\TextButtonInstance.cpp"
+						>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV2\ToggleImageButtonInstance.cpp"
+						>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Properties"
+				>
+				<File
+					RelativePath=".\src\source\Properties\BoolProperty.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Properties\Property.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath=".\src\include\Application.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\AudioPlayer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\ax.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\BrowserCallHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\CameraController.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\Enum.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\ErrorFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\Faces.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\Globals.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\IEBrowser.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\IEDispatcher.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\Mouse.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\propertyGrid.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\PropertyWindow.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\Renderer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\StringFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\TextureHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\win32Defines.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\WindowFunctions.h"
+				>
+			</File>
+			<Filter
+				Name="RapidXML"
+				>
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml.hpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml_iterators.hpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml_print.hpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml_utils.hpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Listener"
+				>
+				<File
+					RelativePath=".\src\include\Listener\ButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\CameraButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\DeleteListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\GUDButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\MenuButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\ModeSelectionListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\RotateButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\ToolbarListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\WorkspaceInstance.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Tool"
+				>
+				<File
+					RelativePath=".\src\include\Tool\ArrowTool.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Tool\SurfaceTool.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Tool\Tool.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="DataModelV2"
+				>
+				<File
+					RelativePath=".\src\include\DataModelV2\DataModelInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\GroupInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\Instance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\LevelInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\PartInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\PVInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\WorkspaceInstance.h"
+					>
+				</File>
+				<Filter
+					Name="Gui"
+					>
+					<File
+						RelativePath=".\src\include\DataModelV2\BaseButtonInstance.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV2\BaseGuiInstance.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV2\GuiRootInstance.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV2\ImageButtonInstance.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV2\TextButtonInstance.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV2\ToggleImageButtonInstance.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Properties"
+				>
+				<File
+					RelativePath=".\src\include\Properties\BoolProperty.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Properties\Property.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>
+			<File
+				RelativePath=".\roblox_RN1_icon.ico"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="Dialogs.rc"
+		/>
+	</Globals>
+</VisualStudioProject>

Dialogs.rc

@@ -1,43 +1,121 @@
-// Generated by ResEdit 1.6.6
+// Microsoft Visual C++ generated resource script.
-// Copyright (C) 2006-2015
+//
-// http://www.resedit.net
-
-#include <windows.h>
-#include <commctrl.h>
-#include <richedit.h>
 #include "resource.h"
 
-
+#define APSTUDIO_READONLY_SYMBOLS
-
+/////////////////////////////////////////////////////////////////////////////
-
 //
-// Bitmap resources
+// Generated from the TEXTINCLUDE 2 resource.
 //
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "roblox_RN1_icon.ico"
+#endif    // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (Canada) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENC)
+#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
 IDB_BITMAP1             BITMAP                  "Parts.bmp"
 
-
+/////////////////////////////////////////////////////////////////////////////
-
 //
-// Dialog resources
+// Dialog
 //
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
-IDD_DIALOG1 DIALOG 0, 0, 295, 43
+IDD_DIALOG1 DIALOGEX 0, 0, 304, 46
-STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFOREGROUND | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_WINDOWEDGE
+CAPTION "Dialog"
-CAPTION "Insert Object"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
-FONT 8, "Ms Shell Dlg"
+BEGIN
-{
+    DEFPUSHBUTTON   "OK",IDOK,247,7,50,14
-    EDITTEXT        IDE_EDIT, 35, 6, 195, 14, ES_AUTOHSCROLL, WS_EX_LEFT
+    PUSHBUTTON      "Cancel",IDCANCEL,247,24,50,14
-    LTEXT           "Class:", 0, 10, 9, 20, 9, SS_LEFT, WS_EX_LEFT
+    EDITTEXT        IDC_EDIT1,68,7,162,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Cancel", IDCANCEL, 237, 24, 50, 14, 0, WS_EX_LEFT
+    LTEXT           "Class:",-1,43,7,20,8
-    DEFPUSHBUTTON   "OK", IDOK, 237, 6, 50, 14, 0, WS_EX_LEFT
+END
-}
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_DIALOG1, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 297
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 39
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (Canada) resources
+/////////////////////////////////////////////////////////////////////////////
 
 
 
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
 //
-// Icon resources
+// Generated from the TEXTINCLUDE 3 resource.
 //
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
+
-IDI_ICON1          ICON           "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

Enum.h

@@ -1,17 +0,0 @@
-#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

@@ -1,16 +0,0 @@
-#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

G3DTest.plg

@@ -1,32 +0,0 @@
-<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.vcproj

@@ -1,579 +0,0 @@
-<?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 Urlmon.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>

GroupInstance.cpp

@@ -1,42 +0,0 @@
-#include "GroupInstance.h"
-
-GroupInstance::GroupInstance(void)
-{
-	PVInstance::PVInstance();
-	name = "Model";
-	className = "GroupInstance";
-	listicon = 12;
-}
-
-GroupInstance::GroupInstance(const GroupInstance &oinst)
-{
-	PVInstance::PVInstance(oinst);
-	name = "Model";
-	className = "GroupInstance";
-	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);
-}
-
-std::vector<Instance *> GroupInstance::unGroup()
-{
-	std::vector<Instance *> child;
-	while(children.size() > 0)
-	{
-		child.push_back(children[0]);
-		children[0]->setParent(parent);
-	}
-	return child;
-}

IEBrowser.cpp

@@ -1,117 +0,0 @@
-#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)
-{
-	std::cout << &m_IEDispatcher;
-	IInternetHostSecurityManager* spSecMan;
-	spDocument2->QueryInterface(IID_IInternetHostSecurityManager,
-			(void **) &spSecMan);
-
-	// TODO: hr needs to say: 'S_OK'
-	//spSecMan->QueryCustomPolicy
-	HRESULT hr = spSecMan->ProcessUrlAction(URLACTION_ACTIVEX_OVERRIDE_OBJECT_SAFETY,
-		NULL, 0, NULL, 0, 0, PUAF_WARN_IF_DENIED);
-
-	(*ext) = &m_IEDispatcher;
-	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);
-								spDocument->QueryInterface(IID_IHTMLDocument2, (void **) &spDocument2);
-								setExternal(&m_spExternal);
-							}
-						}
-					}
-				}
-				
-
-
-				return true;
-			}
-		}
-	}
-	else
-	{
-		MessageBox(NULL,"Cannot read IWebBrowser2...",(g_PlaceholderName+" Crash").c_str(),MB_OK);
-	}
-	return false;
-}

IEBrowser.h

@@ -1,25 +0,0 @@
-//#include "WindowFunctions.h"
-#pragma once
-#include <mshtml.h>
-#include <exdisp.h>
-#include <Mshtmhst.h>
-#include "IEDispatcher.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;
-		IEDispatcher m_IEDispatcher;
-		IOleClientSite* m_spDefaultDocHostUIHandler;
-		int setExternal(IDispatch** ext);
-};

Installer/install_script.iss

@@ -0,0 +1,49 @@
+;InnoSetupVersion=5.5.7
+
+[Setup]
+AppName=Blocks3D
+AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
+AppVersion=v0_0_104_4
+AppPublisherURL=http://blocks3d.com/
+AppSupportURL=http://blocks3d.com/
+AppUpdatesURL=http://blocks3d.com/
+DefaultDirName={%localappdata}\Blocks3D
+OutputBaseFilename=Blocks3D_Setup_{#SetupSetting("AppVersion")}
+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";
+

PVInstance.cpp

@@ -1,42 +0,0 @@
-#include "PVInstance.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)
-{
-}
-
-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

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

ShapeRenderer.cpp

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

content/page/color.html

@@ -0,0 +1,122 @@
+<html>
+<script>
+
+</script>
+<style>
+	img{
+		height: 100%;
+	}
+	.container
+	{
+		height: 47px;
+		width: 50px;
+		margin-right: 10px;	
+	}
+	.color
+	{
+		border-style: inset;
+		border-width: 2px;
+		width:16px;
+		height:16px;
+		font-size: 0;
+		
+		display:inline-block;
+		*display:inline; 
+		*zoom:1;
+	}
+	#currentcolor
+	{
+		width; 80%;
+		height: 80%;
+		border-style: inset;
+		border-width: 2px;
+	}
+	.colorPicker
+	{
+		width: 32px;
+		height: 32px;
+	}
+</style>
+<script>
+	var currentcolor = "white"; //This will be queried from the application later
+	function setColor(btn)
+	{
+		var color = btn.style.backgroundColor;
+		var clInt = parseInt(color.replace("#","0x"));
+		document.getElementById("currentcolor").style.backgroundColor = color;
+		window.external.SetColor(clInt);
+	}
+	
+	
+	
+	 function decimalColorToHTMLcolor(number) {
+		//Found at https://bytes.com/topic/javascript/insights/636088-function-convert-decimal-color-number-into-html-hex-color-string
+		var intnumber = number - 0;
+		var red, green, blue;
+		var template = "#000000";
+		red = (intnumber&0x0000ff) << 16;
+		green = intnumber&0x00ff00;
+		blue = (intnumber&0xff0000) >>> 16;
+		intnumber = red|green|blue;
+		var HTMLcolor = intnumber.toString(16);
+		HTMLcolor = template.substring(0,7 - HTMLcolor.length) + HTMLcolor;
+		return HTMLcolor;
+	} 
+	
+	function hex2decInt(hex)
+	{
+		return parseInt(hex, 16);
+	}
+
+	function queryColor()
+	{
+		var color = window.external.ChooseColor();
+		if(color != null)
+		{
+			color = decimalColorToHTMLcolor(color);
+			document.getElementById("currentcolor").style.backgroundColor = color;
+		}
+	}
+</script>
+<body style="background-color: ButtonFace; margin: 0; padding: 5px; overflow: hidden; border: outset 2px;">
+<table height="100%">
+	<tr>
+		<th>
+			<div class="color" onclick="setColor(this)" style="background-color: #000000"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #808080"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #800000"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #808000"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #008000"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #008080"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #000080"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #800080"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #808040"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #004040"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #0080FF"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #004080"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #8000FF"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #804000"></div><br>
+			<div class="color" onclick="setColor(this)" style="background-color: #FFFFFF"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #C0C0C0"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #FF0000"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #FFFF00"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #00FF00"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #00FFFF"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #0000FF"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #FF00FF"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #FFFF80"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #00FF80"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #80FFFF"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #8080FF"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #FF0080"></div>
+			<div class="color" onclick="setColor(this)" style="background-color: #FF8040"></div>
+		</th>
+		<td>
+			<button onclick="queryColor();" class='colorPicker'>
+				<div id='currentcolor' style="background-color:white;">
+			</button>
+		</td>
+	</tr>
+</table>
+</body>
+</html>

content/page/controller.html

@@ -0,0 +1,21 @@
+<html>
+<script>
+	function toolOvr(image)
+	{
+		if(image.src.indexOf("_dn.png") == -1)
+			image.src = image.src.replace(".png", "_dn.png");
+	}
+	function toolOut(image)
+	{
+		if(image.src.indexOf("_dn.png") != -1)
+			image.src = image.src.replace("_dn.png",".png");
+	}
+</script>
+<body style="background-color: ButtonFace; margin: 0; padding: 5px; overflow: hidden; border: outset 2px;">
+	<img src="../images/Controller1Tool.png" onclick="window.external.SetController(1)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+	<img src="../images/Controller2Tool.png" onclick="window.external.SetController(2)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+	<img src="../images/ControllerAI1Tool.png" onclick="window.external.SetController(5)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+	<img src="../images/ControllerAI2Tool.png" onclick="window.external.SetController(6)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+	<img src="../images/ControllerNoneTool.png" onclick="window.external.SetController(0)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+</body>
+</html>

content/page/hopper.html

@@ -0,0 +1,47 @@
+<html>
+<script>
+	function toolOvr(image)
+	{
+		image.style.backgroundColor = "#cccccc";
+	}
+	function toolOut(image)
+	{
+		
+		image.style.backgroundColor = "transparent";
+	}
+</script>
+<style>
+	img{
+		height: 100%;
+	}
+	.container
+	{
+		height: 47px;
+		width: 50px;
+		margin-right: 10px;
+	}
+</style>
+<body style="background-color: ButtonFace; margin: 0; padding: 5px; overflow: hidden; border: outset 2px;">
+	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="alert(window.external.ToggleHopperBin(0))">
+		<img src="../images/GameTool.png" />
+	</span>
+	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(1)">
+		<img src="../images/Grab.png" />
+	</span>
+	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(2)">
+		<img src="../images/Clone.png" />
+	</span>
+	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(3)">
+		<img src="../images/Hammer.png" />
+	</span>
+	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(4)">
+		<img src="../images/Slingshot.png" />
+	</span>
+	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(5)">
+		<img src="../images/Rocket.png" />
+	</span>
+	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(6)">
+		<img src="../images/Laser.png" />
+	</span>
+</body>
+</html>

content/page/surface.html

@@ -0,0 +1,23 @@
+<html>
+<script>
+	function toolOvr(image)
+	{
+		if(image.src.indexOf("_dn.png") == -1)
+			image.src = image.src.replace(".png", "_dn.png");
+	}
+	function toolOut(image)
+	{
+		if(image.src.indexOf("_dn.png") != -1)
+			image.src = image.src.replace("_dn.png",".png");
+	}
+</script>
+<body style="background-color: ButtonFace; margin: 0; padding: 5px; overflow: hidden; border: outset 2px;">
+	<img src="../images/FlatTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(0, 0)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+	<img src="../images/BumpTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(1, 0)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+	<img src="../images/HingeTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(2, 0)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+	<img src="../images/LeftMotorTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(3, 1)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+	<img src="../images/LeftMotorFastTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(3, 2)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+	<img src="../images/RightMotorTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(3, 3)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+	<img src="../images/RightMotorFastTool.png" onmouseout="toolOut(this)" onclick="window.external.SetSurface(3, 4)" onmousedown="toolOvr(this)" onmouseup="toolOut(this)"/>
+</body>
+</html>

src/include/Application.h

@@ -1,9 +1,12 @@
 #pragma once
 #include <G3DAll.h>
 #include "PropertyWindow.h"
-#include "TextButtonInstance.h"
+#include "DataModelV2/TextButtonInstance.h"
-#include "ImageButtonInstance.h"
+#include "DataModelV2/ImageButtonInstance.h"
 #include "CameraController.h"
+#include "IEBrowser.h"
+#include "Mouse.h"
+#include "Tool/Tool.h"
 //#include "GuiRoot.h"
 
 class TextButtonInstance;
@@ -25,10 +28,10 @@ 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();
@@ -45,6 +48,7 @@ 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;
@@ -52,7 +56,12 @@ class Application { // : public GApp {
 		RenderDevice*		getRenderDevice();
 		void				selectInstance(Instance* selectedInstance,PropertyWindow* propWindow);
 		void				setMode(int mode);
+		
+		Tool * tool;
+		void changeTool(Tool *);
+		Mouse mouse;
 	private:
+		bool				mouseMoveState;
 		RenderDevice*		renderDevice;
 		//void				initGUI();
 		HWND				_hWndMain;
@@ -72,6 +81,7 @@ class Application { // : public GApp {
 		int					_mode;
 		GAppSettings		_settings;
 		double lightProjX, lightProjY, lightProjNear, lightProjFar;
+		IEBrowser*		webBrowser;
 	protected:
 		Stopwatch           m_graphicsWatch;
 		Stopwatch           m_logicWatch;

src/include/CameraController.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <G3DAll.h>
-#include "Instance.h"
+#include "DataModelV2/Instance.h"
 #include "Globals.h"
 #include <string>
 

src/include/DataModelV2/BaseButtonInstance.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "instance.h"
+#include "Instance.h"
-#include "ButtonListener.h"
+#include "Listener/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;

src/include/DataModelV2/BaseGuiInstance.h

@@ -0,0 +1,49 @@
+#pragma once
+#include "Instance.h"
+
+struct UDim
+{
+	float scale;
+	float offset;
+	UDim()
+	{
+		scale = offset = 0;
+	}
+	UDim(float scale_, float offset_)
+	{
+		scale = scale_;
+		offset = offset_;
+	}
+};
+
+struct UDim2
+{
+	UDim x;
+	UDim y;
+	UDim2(UDim x_, UDim y_)
+	{
+		x = x_;
+		y = y_;
+	}
+	UDim2(float scale_x, float offset_x, float scale_y, float offset_y)
+	{
+		x = UDim(scale_x, offset_x);
+		y = UDim(scale_y, offset_y);
+	}
+};
+
+class Instance;
+
+class BaseGuiInstance : public Instance
+{
+public:
+	BaseGuiInstance(void);
+	virtual ~BaseGuiInstance(void);
+	virtual void render(RenderDevice* rd);
+	virtual bool mouseHovered(float, float, RenderDevice* rd);
+	UDim2 position;
+	UDim2 size;	
+protected:
+	bool mouseInArea(float, float, float, float, float, float);
+	class ButtonListener* listener;
+};

src/include/DataModelV2/DataModelInstance.h

@@ -3,9 +3,9 @@
 #include "LevelInstance.h"
 #include "PartInstance.h"
 #include "rapidxml/rapidxml.hpp"
-#include "GuiRoot.h"
+#include "GuiRootInstance.h"
 
-class GuiRoot;
+class GuiRootInstance;
 
 class DataModelInstance :
 	public Instance
@@ -27,15 +27,17 @@ public:
 	std::string				_loadedFileName;
 	bool					showMessage;
 	G3D::GFontRef			font;
-	GuiRoot*				getGuiRoot();
+	GuiRootInstance*		getGuiRoot();
-	float					mousex;
+	//float					mousex;
-	float					mousey;
+	//float					mousey;
-	Vector2					getMousePos();
+	//Vector2					getMousePos();
-	void					setMousePos(int x,int y);
+	//void					setMousePos(int x,int y);
-	void					setMousePos(Vector2 pos);
+	//void					setMousePos(Vector2 pos);
-	bool					mouseButton1Down;
+	//bool					mouseButton1Down;
 	PartInstance*			makePart();
 	void					clearLevel();
+	void					toggleRun();
+	bool					isRunning();
 #if _DEBUG
 	void					modXMLLevel(float modY);
 #endif
@@ -50,5 +52,6 @@ private:
 	float					_modY;
 	WorkspaceInstance*		workspace;
 	LevelInstance *			level;
-	GuiRoot*				guiRoot;
+	GuiRootInstance*		guiRoot;
+	bool					running;
 };

src/include/DataModelV2/GroupInstance.h

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

src/include/DataModelV2/GuiRootInstance.h

@@ -5,10 +5,11 @@ class ImageButtonInstance;
 
 class TextButtonInstance;
 
-class GuiRoot : public Instance
+class GuiRootInstance : public Instance
 {
 public:
-	GuiRoot();
+	GuiRootInstance();
+	GuiRootInstance::~GuiRootInstance();
 	TextButtonInstance*		makeTextButton();
 	void					drawButtons(RenderDevice* rd);
 	ImageButtonInstance*	makeImageButton(G3D::TextureRef newImage, G3D::TextureRef overImage, G3D::TextureRef downImage, G3D::TextureRef disableImage);

src/include/DataModelV2/Instance.h

@@ -1,6 +1,8 @@
 #pragma once
 #include <G3DAll.h>
 #include "propertyGrid.h"
+#include "map"
+//#include "Properties/BoolProperty.h"
 
 class Instance
 {
@@ -17,7 +19,7 @@ public:
 	Instance* findFirstChild(std::string);
 	std::vector<Instance* > getChildren();
 	std::vector<Instance* > getAllChildren();
-	void setParent(Instance*);
+	virtual void setParent(Instance*);
 	void setName(std::string newName);
 	void addChild(Instance*);
 	void removeChild(Instance*);
@@ -31,5 +33,6 @@ protected:
 	std::string className;
 	Instance* parent;  // Another pointer.
 	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;
 };

src/include/DataModelV2/PVInstance.h

@@ -0,0 +1,35 @@
+#pragma once
+#include "instance.h"
+#include "enum.h"
+
+class PVInstance :
+	public Instance
+{
+public:
+	PVInstance(void);
+	~PVInstance(void);
+	PVInstance(const PVInstance &oinst);
+	virtual void postRender(RenderDevice* rd);
+	virtual std::vector<PROPGRIDITEM> getProperties();
+	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+	bool nameShown;
+	bool controllerFlagShown;
+	Enum::Controller::Value controller;
+protected:
+	CoordinateFrame cFrame;
+	static G3D::Color3 getControllerColor(int controller)
+	{
+		switch(controller)
+		{
+			case Enum::Controller::KeyboardLeft:
+				return Color3::red();
+			case Enum::Controller::KeyboardRight:
+				return Color3::blue();
+			case Enum::Controller::Chase:
+				return Color3::black();
+			case Enum::Controller::Flee:
+				return Color3::yellow();
+		}
+		return Color3::gray();
+	}
+};

src/include/DataModelV2/PartInstance.h

@@ -4,19 +4,20 @@
 #define _USE_MATH_DEFINES
 #include <cmath>
 
-#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);
+	Instance* clone() const { return new PartInstance(*this); }
+	
+	//Rendering
+	virtual void PartInstance::postRender(RenderDevice* rd);
 	virtual void render(RenderDevice*);
-	Vector3 velocity;
+	
+	//Surfaces
 	Enum::SurfaceType::Value top;
 	Enum::SurfaceType::Value front;
 	Enum::SurfaceType::Value right;
@@ -24,54 +25,45 @@ public:
 	Enum::SurfaceType::Value left;
 	Enum::SurfaceType::Value bottom;
 	Enum::Shape::Value shape;
-	CoordinateFrame cFrame;
+
+	//Variables
 	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;
+
+	//Getters
+	Vector3 getPosition();
+	Vector3 getVelocity();
+	Vector3 getRotVelocity();
+	Vector3 getSize();
+	Box getBox();
+	Sphere getSphere();
+	Box getScaledBox();
+	CoordinateFrame getCFrame();
+
+	//Setters
+	void setParent(Instance* parent);
+	void setPosition(Vector3);
+	void setVelocity(Vector3);
+	void setRotVelocity(Vector3);
+	void setCFrame(CoordinateFrame);
+	void setSize(Vector3);
+	void setShape(Enum::Shape::Value shape);
+	void setChanged();
+	void setSurface(int face, Enum::SurfaceType::Value surface);
+
+	//Collision
+	bool collides(PartInstance * part);
 	bool collides(Box);
+
+	//Properties
 	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 addQuad(Vector3 v1,Vector3 v2, Vector3 v3, Vector3 v4);
-	void genSmoothNormals(int);
-	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);
-	void fromArrays(float verts[], float norms[], float ind[], unsigned int countVN, unsigned int countInd);
-	bool isUniqueVertex(Vector3 pos);
-	#endif
 private:
 	Vector3 position;
 	Vector3 size;
-	float	_bevelSize;
+	Vector3 velocity;
-	int		_parseVert;
+	Vector3 rotVelocity;
-	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;

src/include/DataModelV2/ToggleImageButtonInstance.h

@@ -0,0 +1,29 @@
+#pragma once
+#include "imagebuttoninstance.h"
+
+
+class ToggleImageButtonInstance : public ImageButtonInstance
+{
+public:
+	//ImageButtonInstance(G3D::TextureRef);
+	//ImageButtonInstance(G3D::TextureRef,G3D::TextureRef);
+	//ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef);
+	ToggleImageButtonInstance(G3D::TextureRef newImage,G3D::TextureRef overImage = NULL,
+										 G3D::TextureRef downImage = NULL,
+										 G3D::TextureRef disableImage = NULL,
+										 G3D::TextureRef newImage2 = NULL,
+										 G3D::TextureRef overImage2 = NULL,
+										 G3D::TextureRef downImage2 = NULL,
+										 G3D::TextureRef disableImage2 = NULL);
+	~ToggleImageButtonInstance(void);
+	void drawObj(RenderDevice*, Vector2, bool);
+	bool checked;
+	G3D::TextureRef image2;
+	int openGLID2;
+	G3D::TextureRef image_ovr2;
+	int openGLID2_ovr;
+	G3D::TextureRef image_dn2;
+	int openGLID2_dn;
+	G3D::TextureRef image_ds2;
+	int openGLID2_ds;
+};

src/include/DataModelV2/WorkspaceInstance.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "GroupInstance.h"
+#include "PartInstance.h"
 
 class WorkspaceInstance :
 	public GroupInstance
@@ -7,4 +8,6 @@ class WorkspaceInstance :
 public:
 	WorkspaceInstance(void);
 	~WorkspaceInstance(void);
+	void clearChildren();
+	std::vector<PartInstance *> partObjects;
 };

src/include/Enum.h

@@ -0,0 +1,23 @@
+#pragma once
+
+namespace Enum
+{
+	namespace SurfaceType
+	{
+		enum Value {
+			Smooth = 0, Bumps = 1, Hinge = 2, Motor = 3, StepperMotor = 4, Spawn = 5
+		};
+	}
+	namespace Shape
+	{
+		enum Value {
+			Ball = 0, Block = 1, Cylinder = 2
+		};
+	}
+	namespace Controller
+	{
+		enum Value {
+			Player = 7, KeyboardRight = 1, KeyboardLeft = 2, Joypad1 = 3, Joypad2 = 4, Chase = 5, Flee = 6, None = 0
+		};
+	}
+}

src/include/Faces.h

@@ -0,0 +1,9 @@
+#ifndef FACES_H
+#define FACES_H
+#define TOP 3
+#define BOTTOM 5
+#define LEFT 1
+#define RIGHT 4
+#define FRONT 0
+#define BACK 2
+#endif

src/include/Globals.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "DataModelInstance.h"
+#include "DataModelV2/DataModelInstance.h"
-#include <G3DAll.h>
+
 
 class Application;
 
@@ -10,7 +10,7 @@ public:
     Globals(void);
     ~Globals(void);
     static DataModelInstance* dataModel;
-	static bool showMouse;
+	//static bool showMouse;
 	static POINT mousepoint;
 	static bool useMousePoint;
 	static const int gen;
@@ -19,7 +19,9 @@ public:
 	static const int patch;
 	static G3D::TextureRef surface;
 	static int surfaceId;
-	static const std::string g_PlaceholderName;
+	static const std::string g_appName;
+	static COLORREF g_acrCustClr[16]; //Will be dynamic later
+	static HWND mainHwnd;
 };
 
 extern std::vector<Instance*> postRenderStack;
@@ -31,7 +33,9 @@ extern Application* g_usableApp;
 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;
-const std::string g_PlaceholderName = "HyperCube";
+extern HWND mainHwnd;
+const std::string g_appName = "Blocks3D";

src/include/IEBrowser.h

@@ -0,0 +1,28 @@
+//#include "WindowFunctions.h"
+#pragma once
+#include "Globals.h"
+#pragma once
+#include <mshtml.h>
+#include <exdisp.h>
+#include <Mshtmhst.h>
+#include "IEDispatcher.h"
+#include "AudioPlayer.h"
+
+class IEBrowser {
+	public:
+		IEBrowser(HWND attachHWnd);
+		~IEBrowser(void);
+		bool navigateSyncURL(wchar_t* url);
+		HRESULT doExternal(std::wstring funcName,
+  DISPID dispIdMember,
+  REFIID riid,
+  LCID lcid,
+  WORD wFlags,
+  DISPPARAMS FAR* pDispParams,
+  VARIANT FAR* pVarResult,
+  EXCEPINFO FAR* pExcepInfo,
+  unsigned int FAR* puArgErr);
+	private:
+		IWebBrowser2* webBrowser;
+		HWND parentHwnd;
+};

src/include/Listener/ButtonListener.h

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

src/include/Listener/MenuButtonListener.h

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

src/include/Listener/ToolbarListener.h

@@ -0,0 +1,13 @@
+#pragma once
+#include "buttonlistener.h"
+#pragma once
+#include <G3DAll.h>
+
+class ToolbarListener : public ButtonListener
+{
+public:
+	void onButton1MouseClick(BaseButtonInstance* button);
+	void addButtonRef(BaseButtonInstance* button);
+private:
+	std::vector<BaseButtonInstance*> btns;
+};

src/include/Mouse.h

@@ -0,0 +1,34 @@
+#pragma once
+#include "DataModelV2/PartInstance.h"
+#pragma once
+#include "DataModelV2/WorkspaceInstance.h"
+
+struct MousePoint{
+	Vector3 position;
+	PartInstance * target;
+	MousePoint(Vector3 pos, PartInstance * targ)
+	{
+		position = pos;
+		target = targ;
+	}
+};
+
+#pragma once
+class Mouse
+{
+public:
+	Mouse();
+	~Mouse(void);
+	int x, y;
+	int oldx, oldy;
+	PartInstance * getTarget();
+	MousePoint getPositionAndPart(std::vector<Instance *> ignore = std::vector<Instance *>());
+	Vector3 getPosition(std::vector<Instance *> ignore = std::vector<Instance *>());
+	bool isMouseOnScreen();
+	bool isMouseDown();
+	void setMouseDown(bool mouseDown);
+	G3D::Ray * getRay();
+	G3D::Ray getLastRay();
+private:
+	bool mouseDown;
+};

src/include/Properties/BoolProperty.h

@@ -0,0 +1,12 @@
+#pragma once
+#include "Property.h"
+class BoolProperty : public Property<bool>
+{
+public:
+	BoolProperty(std::string name, bool& value, Instance& owner)
+	{
+		Property<bool>(name, value, owner);
+	}
+	~BoolProperty(void);
+	PROPGRIDITEM getPropGridItem();
+};

src/include/Properties/Property.h

@@ -0,0 +1,30 @@
+#pragma once
+#include "DataModelV2/Instance.h"
+#include <string>
+class Instance;
+
+template <typename T> 
+class Property
+{
+public:
+	Property(std::string name, T& value, Instance& owner)
+	{
+		_value = value;
+		_owner = owner;
+	}
+	~Property(void);
+	const T getValue()
+	{
+		return _value;
+	}
+	const void setValue(T val)
+	{
+		_value = val;
+	}
+	virtual PROPGRIDITEM getPropGridItem();
+	void setProperty(LPPROPGRIDITEM item);
+protected:
+	Instance* _owner;
+	std::string _name;
+	T* _value;
+};

src/include/PropertyWindow.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "Instance.h"
+#include "DataModelV2/Instance.h"
 
 class PropertyWindow {
 public:

src/include/Renderer.h

@@ -0,0 +1,7 @@
+#ifndef RENDERUTIL
+#define RENDERUTIL
+#include "Enum.h"
+#include "DataModelV2/Instance.h"
+void renderShape(const Enum::Shape::Value& shape, const Vector3& size, const Color3& ncolor);
+void renderSurface(const char face, const Enum::SurfaceType::Value& surface, const Vector3& size, const Enum::Controller::Value& controller, const Color3& color);
+#endif

src/include/TextureHandler.h

@@ -0,0 +1,87 @@
+#pragma once
+#include <G3DAll.h>
+#include <map>
+class TextureHandler
+{
+public:
+	TextureHandler(void);
+	~TextureHandler(void);
+	static int getTextureVolatile(std::string str)
+	{
+		if(!volTex[str].isNull())
+		{
+			volExp[str] = G3D::System::time();
+			return volTex[str]->openGLID();
+		}
+		else
+		{
+			G3D::TextureRef tex = G3D::Texture::fromFile(str);
+			volExp[str] = G3D::System::time();
+			volTex[str] = tex;
+			return tex->openGLID();
+		}
+	}
+	static int getTexturePermanent(std::string str)
+	{
+		if(!permTex[str].isNull())
+		{
+			return permTex[str]->openGLID();
+		}
+		else
+		{
+			G3D::TextureRef tex = G3D::Texture::fromFile(str);
+			permTex[str] = tex;
+			return tex->openGLID();
+		}
+	}
+	static void flushVolatile()
+	{
+		std::map<std::string, G3D::RealTime>::iterator it;
+		for (it=volExp.begin(); it!=volExp.end(); ++it)
+		{
+			if(it->second < G3D::System::time() - 3)
+			{
+				volTex[it->first]->~Texture();
+				volTex.erase(it->first);
+				volExp.erase(it->first);
+				//it->second->~ReferenceCountedPointer();
+			}
+		}
+	}
+	static void dispose()
+	{
+		std::map<std::string, G3D::TextureRef>::iterator it;
+		for (it=volTex.begin(); it!=volTex.end(); ++it)
+		{
+			it->second->~Texture();
+			//it->second->~ReferenceCountedPointer();
+		}
+		for (it=permTex.begin(); it!=permTex.end(); ++it)
+		{
+			it->second->~Texture();
+			//it->second->~ReferenceCountedPointer();
+		}
+		permTex.clear();
+		volTex.clear();
+	}
+
+	static void remove(std::string str)
+	{
+		if(!volTex[str].isNull())
+		{
+			volTex[str]->~Texture();
+			//volTex[str]->~ReferenceCountedPointer();
+			volTex.erase(str);
+		}
+		if(!permTex[str].isNull())
+		{
+			permTex[str]->~Texture();
+			//permTex[str]->~ReferenceCountedPointer();
+			permTex.erase(str);
+		}
+	}
+private:
+	static std::map<std::string, G3D::TextureRef> volTex;
+	static std::map<std::string, G3D::RealTime> volExp;
+	static std::map<std::string, G3D::TextureRef> permTex;
+};

src/include/Tool/ArrowTool.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "tool.h"
+
+class ArrowTool :
+	public Tool
+{
+public:
+	ArrowTool(void); //OnSelect?
+	~ArrowTool(void); //OnDeselect?
+	void onButton1MouseDown(Mouse);
+	void onButton1MouseUp(Mouse);
+	void onMouseMoved(Mouse mouse);
+	void onSelect(Mouse mouse); 
+	void onKeyDown(int key);
+	void onKeyUp(int key);
+private:
+	bool lctrlDown;
+	bool rctrlDown;
+	int mouseDownStartx;
+	int mouseDownStarty;
+	bool dragging;
+	bool mouseDown;
+};

src/include/Tool/SurfaceTool.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "tool.h"
+#include "Enum.h"
+
+class SurfaceTool :
+	public Tool
+{
+public:
+	SurfaceTool(int surface, int extraParam); //OnSelect?
+	~SurfaceTool(void); //OnDeselect?
+	void onButton1MouseDown(Mouse);
+	void onButton1MouseUp(Mouse);
+	void onMouseMoved(Mouse mouse);
+	void onSelect(Mouse mouse); 
+	void onKeyDown(int key);
+	void onKeyUp(int key);
+private:
+	int surface;
+	int param;
+};

src/include/Tool/Tool.h

@@ -0,0 +1,34 @@
+#pragma once
+#include "TextureHandler.h"
+#pragma once
+#include <G3DAll.h>
+#pragma once
+#include "Mouse.h"
+#pragma once
+#include "Globals.h"
+#pragma once
+#include "StringFunctions.h"
+#pragma once
+class Tool
+{
+public:
+	Tool(void);
+	~Tool(void);
+	virtual void onButton1MouseDown(Mouse); //yes
+	virtual void onButton2MouseDown(Mouse);	//yes
+	virtual void onButton3MouseDown(Mouse);	//no
+	virtual void onButton1MouseUp(Mouse);//yes
+	virtual void onButton2MouseUp(Mouse);//yes
+	virtual void onButton3MouseUp(Mouse); //no
+	virtual void onMouseMoved(Mouse);//yes
+	virtual void onSelect(Mouse);//yes
+	virtual void onDeselect(Mouse);//yes
+	virtual void onMouseScroll(Mouse);//Kinda
+	virtual void onKeyDown(int);//yes
+	virtual void onKeyUp(int);//yes
+	//virtual int getCursorId();//yes
+protected:
+	//virtual void setCursor(std::string);
+private:
+	//std::string cursorString;
+};

src/include/WindowFunctions.h

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

src/include/ax.h

@@ -1,4 +1,10 @@
 // AX.H
+#pragma once
+#include "Globals.h"
+#include <mshtmhst.h>
+#include <string>
+#pragma once
+#include "IEBrowser.h"
 
 // messages
 #define AX_QUERYINTERFACE (WM_USER + 1)
@@ -9,7 +15,6 @@
 #define AX_SETDATAADVISE (WM_USER + 6)
 #define AX_DOVERB (WM_USER + 7)
 
-
 // Registration function
 ATOM AXRegister();
 
@@ -20,7 +25,8 @@ class AXClientSite :
    public IDispatch,
    public IAdviseSink,
    public IOleInPlaceSite,
-   public IOleInPlaceFrame
+   public IOleInPlaceFrame,
+   public IDocHostUIHandler
    {
    protected:
 
@@ -28,7 +34,6 @@ class AXClientSite :
 
    public:
 
-
 		HWND Window;
 		HWND Parent;
 		HMENU Menu;
@@ -37,7 +42,6 @@ class AXClientSite :
 		bool CalledCanInPlace;
 
 		class AX* ax;
-
 	   // MyClientSite Methods
 		AXClientSite();
 		virtual ~AXClientSite();
@@ -56,6 +60,63 @@ class AXClientSite :
 		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);
 	
@@ -90,14 +151,13 @@ 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
    };
 
 
@@ -129,11 +189,7 @@ class AX
 	   DWORD AdviseToken;
 		DWORD DAdviseToken[100];	
 
-
-
-
 	private:
-
 		CLSID clsid;
 
 

src/include/resource.h

@@ -0,0 +1,7 @@
+#define IDC_PROPERTYGRID                2000
+#define IDC_STATIC						2
+
+#define IDE_EDIT								105
+#define IDI_ICON1                               102
+#define IDB_BITMAP1                             103
+#define IDD_DIALOG1                             104