Added insert items dialog function

.gitattributes

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

.github/workflows/sync-develop.yml

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

.gitignore

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

Blocks3D-2003.sln

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

Blocks3D.dsp

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

Blocks3D.dsw

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

Blocks3D.exe.manifest

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

Blocks3D.plg

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

Dialogs.rc

@@ -4,9 +4,7 @@
 
 #include <windows.h>
 #include <commctrl.h>
-#include <richedit.h>
-#include "src/include/resource.h"
-#include "src/include/versioning.h"
+#include "resource.h"
 
 
 
@@ -17,39 +15,7 @@
 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 2018-2023"
-            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
@@ -68,19 +34,8 @@ FONT 8, "Ms Shell Dlg"
 }
 
 
-
 //
 // Icon resources
 //
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
 IDI_ICON1          ICON           "FatB3dIcon.ico"
-
-
-
-//
-// Manifest resources
-//
-#ifndef _DEBUG
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-1				MANIFEST    ".\\Blocks3D.exe.manifest"
-#endif

Documentation/index.html

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

Installer/install_script.iss

@@ -1,16 +1,14 @@
 ;InnoSetupVersion=5.4.3
-;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2005!!!
-#define AppVer GetFileVersion('..\Blocks3D.exe')
 
 [Setup]
-AppName=Blocks3D
-AppVersion=v{#AppVer}
+AppName=Blocks3D
 AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
+AppVersion=v0_0_104_5
 AppPublisherURL=http://blocks3d.com/
 AppSupportURL=http://blocks3d.com/
 AppUpdatesURL=http://blocks3d.com/
 DefaultDirName={%localappdata}\Blocks3D
-OutputBaseFilename=Blocks3D_Setup_v{#AppVer}
+OutputBaseFilename=Blocks3D_Setup_{#SetupSetting("AppVersion")}
 Compression=lzma2
 PrivilegesRequired=lowest
 WizardImageFile=setup.bmp
@@ -22,9 +20,9 @@ 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: "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: "..\SDL.DLL"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 
 [Registry]
@@ -32,7 +30,7 @@ Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 
 [Run]
 Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/q"; Tasks: instvc; 
-;Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/q"; Tasks: instvc; Check: "IsWin64";
+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]

Installer/install_script_floppy.iss

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

Installer/install_script_floppy_vs2003.iss

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

Installer/install_script_vs2003.iss

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

Jenkinsfile

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

ODE Copyright.txt

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

README.md

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

content/page/hopper.html

@@ -22,7 +22,7 @@
 	}
 </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="window.external.ToggleHopperBin(0)">
+	<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)">

resource.h

@@ -0,0 +1,9 @@
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+
+#define IDI_ICON1                               101
+#define IDB_BITMAP1                             102
+#define IDD_DIALOG1                             103
+#define IDD_DIALOG2                             104
+#define IDC_EDIT1                               1001

src/include/AbstractedInput.h

@@ -1,8 +0,0 @@
-#pragma once
-namespace B3D{
-	namespace AbstractedInput{
-		static const unsigned char MOUSE_LEFT = 0x01;
-		static const unsigned char MOUSE_RIGHT = 0x02;
-		static const unsigned char MOUSE_MIDDLE = 0x03;
-	}
-}

src/include/Application.h

@@ -1,21 +1,23 @@
 #pragma once
 #include <G3DAll.h>
 #include "PropertyWindow.h"
-#include "DataModelV3/Gui/TextButtonInstance.h"
-#include "DataModelV3/Gui/ImageButtonInstance.h"
+#include "DataModelV2/TextButtonInstance.h"
+#include "DataModelV2/ImageButtonInstance.h"
 #include "CameraController.h"
 #include "IEBrowser.h"
 #include "Mouse.h"
 #include "Tool/Tool.h"
+//#include "GuiRoot.h"
 
-class B3D::TextButtonInstance;
-class B3D::ImageButtonInstance;
-class B3D::PartInstance;
+class TextButtonInstance;
+class ImageButtonInstance;
+class PartInstance;
 class CameraController;
 
 class Application { // : public GApp {
 	public:
 		Application(HWND parentWindow);
+		void Boop();
 		virtual			~Application() {}
 		virtual void	exitApplication();
 		virtual void	onInit();
@@ -28,6 +30,9 @@ class Application { // : public GApp {
 		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);
+		std::vector<Instance*>	getSelection();
 		void		deleteInstance();
 		void		run();
 		void		QuitApp();
@@ -44,25 +49,23 @@ class Application { // : public GApp {
 		void		setFocus(bool isFocused);
 		int			getMode();
 		void		unSetMode();
-
 		CameraController	cameraController;
 		UserInput*			userInput;
 		PropertyWindow*		_propWindow;
-		void				generateShadowMap(const CoordinateFrame& lightViewMatrix) const;
+		void generateShadowMap(const CoordinateFrame& lightViewMatrix) const;
 		RenderDevice*		getRenderDevice();
 		void				selectInstance(Instance* selectedInstance,PropertyWindow* propWindow);
 		void				setMode(int mode);
-		void				resize3DView(int w, int h);		
-
+		
 		Tool * tool;
 		void changeTool(Tool *);
 		Mouse mouse;
-		bool		viewportHasFocus();
 	private:
 		bool				mouseMoveState;
 		RenderDevice*		renderDevice;
 		//void				initGUI();
 		HWND				_hWndMain;
+		SkyRef				sky;
 		bool				quit;
 		bool				mouseOnScreen;
 		bool				rightButtonHolding;
@@ -71,15 +74,13 @@ class Application { // : public GApp {
 		HWND				_hwndToolbox;
 		HWND				_buttonTest;
 		HWND				_hwndRenderer;
-		//TODO make list
 		DataModelInstance*	_dataModel;
+		G3D::TextureRef		shadowMap;
 		std::string			_title;
-		//TODO deprecated?
 		bool				_dragging;
-		//TODO deprecated
 		int					_mode;
-		//Can be moved?
 		GAppSettings		_settings;
+		double lightProjX, lightProjY, lightProjNear, lightProjFar;
 		IEBrowser*		webBrowser;
 	protected:
 		Stopwatch           m_graphicsWatch;

src/include/AudioPlayer.h

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

src/include/CameraController.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <G3DAll.h>
-#include "DataModelV3/Instance.h"
+#include "DataModelV2/Instance.h"
 #include "Globals.h"
 #include <string>
 
@@ -26,7 +26,6 @@ class CameraController {
 		void panRight();
 		void tiltUp();
 		void tiltDown();
-		void zoomExtents();
 		void Zoom(short delta);
 		bool onMouseWheel(int x, int y, short delta);
 		GCamera* getCamera();

src/include/DataModelV2/BaseButtonInstance.h

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

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

@@ -0,0 +1,57 @@
+#pragma once
+#include "WorkspaceInstance.h"
+#include "LevelInstance.h"
+#include "PartInstance.h"
+#include "rapidxml/rapidxml.hpp"
+#include "GuiRootInstance.h"
+
+class GuiRootInstance;
+
+class DataModelInstance :
+	public Instance
+{
+public:
+	DataModelInstance(void);
+	~DataModelInstance(void);
+	void					setMessage(std::string);
+	void					setMessageBrickCount();
+	void					clearMessage();
+	bool					debugGetOpen();
+	bool					getOpen();
+	bool					load(const char* filename,bool clearObjects);	
+	bool					readXMLFileStream(std::ifstream* file);
+	void					drawMessage(RenderDevice*);
+	WorkspaceInstance*		getWorkspace();
+	LevelInstance *			getLevel();
+	std::string				message;
+	std::string				_loadedFileName;
+	bool					showMessage;
+	G3D::GFontRef			font;
+	GuiRootInstance*		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();
+#if _DEBUG
+	void					modXMLLevel(float modY);
+#endif
+private:
+	bool isBrickCount;
+	bool					scanXMLObject(rapidxml::xml_node<>* node);
+	rapidxml::xml_node<>*	getNode(rapidxml::xml_node<> * node,const char* name );
+	float					getFloatValue(rapidxml::xml_node<> * node,const char* name);
+	bool					_successfulLoad;
+	std::string				_errMsg;
+	bool					_legacyLoad;
+	float					_modY;
+	WorkspaceInstance*		workspace;
+	LevelInstance *			level;
+	GuiRootInstance*		guiRoot;
+	bool					running;
+};

src/include/DataModelV2/GroupInstance.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "PartInstance.h"
+
+class GroupInstance :
+	public PVInstance
+{
+public:
+	GroupInstance(void);
+	~GroupInstance(void);
+	GroupInstance(const GroupInstance &oinst);
+	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

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

src/include/DataModelV2/ImageButtonInstance.h

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

src/include/DataModelV2/Instance.h

@@ -0,0 +1,42 @@
+#pragma once
+#include <G3DAll.h>
+#include "propertyGrid.h"
+#include "map"
+
+#ifdef NO_SPRINTF
+#define sprintf_s sprintf
+#endif
+//#include "Properties/BoolProperty.h"
+
+class Instance
+{
+public:
+	bool canDelete;
+	Instance(void);
+	Instance(const Instance&);
+	virtual ~Instance(void);
+	std::string name;
+	virtual void render(RenderDevice*);
+	virtual void update();
+	std::vector<Instance*> children; // All children.
+	std::string getClassName();
+	Instance* findFirstChild(std::string);
+	std::vector<Instance* > getChildren();
+	std::vector<Instance* > getAllChildren();
+	virtual void setParent(Instance*);
+	void setName(std::string newName);
+	void addChild(Instance*);
+	void removeChild(Instance*);
+	void clearChildren();
+	Instance* getParent();
+	virtual Instance* clone() const { return new Instance(*this); }
+	virtual std::vector<PROPGRIDITEM> getProperties();
+	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+	int listicon;
+protected:
+	std::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/LevelInstance.h

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

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

@@ -0,0 +1,70 @@
+#pragma once
+#include "PVInstance.h"
+#include "Enum.h"
+#define _USE_MATH_DEFINES
+#include <cmath>
+
+class PartInstance : public PVInstance
+{
+public:
+	
+	PartInstance(void);
+	PartInstance(const PartInstance &oinst);
+	~PartInstance(void);
+	Instance* clone() const { return new PartInstance(*this); }
+	
+	//Rendering
+	virtual void PartInstance::postRender(RenderDevice* rd);
+	virtual void render(RenderDevice*);
+	
+	//Surfaces
+	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;
+
+	//Variables
+	Color3 color;
+	bool canCollide;
+	bool anchored;
+
+	//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);
+private:
+	Vector3 position;
+	Vector3 size;
+	Vector3 velocity;
+	Vector3 rotVelocity;
+	bool changed;
+	Box itemBox;
+	GLuint glList;
+};

src/include/DataModelV2/TextButtonInstance.h

@@ -0,0 +1,35 @@
+#pragma once
+#include "BaseButtonInstance.h"
+class TextButtonInstance : public BaseButtonInstance
+{
+public:
+	TextButtonInstance(void);
+	~TextButtonInstance(void);
+	void setAllColorsSame();
+	Vector2 boxBegin;
+	Vector2 boxEnd;
+	Vector2 fontLocationRelativeTo;
+	Color4 textColor;
+	Color4 textOutlineColor;
+	Color4 boxColor;
+	Color4 boxOutlineColor;
+	Color4 textColorOvr;
+	Color4 textOutlineColorOvr;
+	Color4 boxColorOvr;
+	Color4 boxOutlineColorOvr;
+	Color4 textColorDn;
+	Color4 textOutlineColorDn;
+	Color4 boxColorDn;
+	Color4 boxOutlineColorDn;
+	Color4 textColorDis;
+	Color4 textOutlineColorDis;
+	Color4 boxColorDis;
+	Color4 boxOutlineColorDis;
+	bool centeredWithinBox;
+	std::string title;
+	G3D::GFontRef font;
+	bool visible;
+	int textSize;
+	void drawObj(RenderDevice*, Vector2, bool);
+	bool mouseInButton(float, float, RenderDevice*);
+};

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