diff --git a/.gitignore b/.gitignore index e137ba9..cfc20d1 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,10 @@ G3DTest.suo G3DTest.suo stderr.txt desktop.ini +UpgradeLog.XML +/_UpgradeReport_Files +/.vs +*.7.10.old *.db #Redist diff --git a/Backup/Blocks3D.sln b/Backup/Blocks3D.sln new file mode 100644 index 0000000..836a214 --- /dev/null +++ b/Backup/Blocks3D.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Blocks3D", "Blocks3D.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}" +EndProject +Global + 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 diff --git a/Blocks3D-2003.sln b/Blocks3D-2003.sln index f494330..d652459 100644 --- a/Blocks3D-2003.sln +++ b/Blocks3D-2003.sln @@ -1,24 +1,9 @@  -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 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 diff --git a/Blocks3D-2003.sln.old b/Blocks3D-2003.sln.old new file mode 100644 index 0000000..f494330 --- /dev/null +++ b/Blocks3D-2003.sln.old @@ -0,0 +1,35 @@ + +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 diff --git a/Blocks3D-2003.vcproj b/Blocks3D-2003.vcproj index 75f2202..172c8ce 100644 --- a/Blocks3D-2003.vcproj +++ b/Blocks3D-2003.vcproj @@ -1,649 +1,893 @@ + RootNamespace="Blocks3D" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + ManagedExtensions="0" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + RelativePath="System.dll" + AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" + /> + RelativePath="System.Data.dll" + AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86" + /> + RelativePath="System.Drawing.dll" + AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + /> + RelativePath="System.Windows.Forms.dll" + AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" + /> + RelativePath="System.XML.dll" + AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" + /> + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath=".\src\source\Application.cpp" + > + RelativePath=".\src\source\AudioPlayer.cpp" + > + RelativePath=".\src\source\ax.cpp" + > + RelativePath=".\src\source\BrowserCallHandler.cpp" + > + RelativePath=".\src\source\CameraController.cpp" + > + RelativePath=".\src\source\ErrorFunctions.cpp" + > + RelativePath=".\src\source\Globals.cpp" + > + RelativePath=".\src\source\IEBrowser.cpp" + > + RelativePath=".\src\source\IEDispatcher.cpp" + > + RelativePath=".\src\source\main.cpp" + > + RelativePath=".\src\source\Mouse.cpp" + > + RelativePath=".\src\source\propertyGrid.cpp" + > + RelativePath=".\src\source\PropertyWindow.cpp" + > + RelativePath=".\src\source\Renderer.cpp" + > + RelativePath=".\SplashHTML.cpp" + > + RelativePath=".\src\source\StringFunctions.cpp" + > + RelativePath=".\src\source\TextureHandler.cpp" + > + + + Name="Tool" + > + RelativePath=".\src\source\Tool\ArrowTool.cpp" + > + RelativePath=".\src\source\Tool\SurfaceTool.cpp" + > + RelativePath=".\src\source\Tool\Tool.cpp" + > + Name="Listener" + > + RelativePath=".\src\source\Listener\ButtonListener.cpp" + > + RelativePath=".\src\source\Listener\CameraButtonListener.cpp" + > + RelativePath=".\src\source\Listener\DeleteListener.cpp" + > + RelativePath=".\src\source\Listener\GUDButtonListener.cpp" + > + RelativePath=".\src\source\Listener\MenuButtonListener.cpp" + > + RelativePath=".\src\source\Listener\ModeSelectionListener.cpp" + > + RelativePath=".\src\source\Listener\RotateButtonListener.cpp" + > + RelativePath=".\src\source\Listener\ToolbarListener.cpp" + > + Name="DataModelV2" + > + RelativePath=".\src\source\DataModelV2\DataModelInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + RelativePath=".\src\source\DataModelV2\GroupInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + RelativePath=".\src\source\DataModelV2\Instance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + RelativePath=".\src\source\DataModelV2\LevelInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + RelativePath=".\src\source\DataModelV2\PartInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + RelativePath=".\src\source\DataModelV2\PVInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + RelativePath=".\src\source\DataModelV2\WorkspaceInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Gui" + > + RelativePath=".\src\source\DataModelV2\BaseButtonInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + RelativePath=".\src\source\DataModelV2\BaseGuiInstance.cpp" + > + RelativePath=".\src\source\DataModelV2\GuiRootInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + RelativePath=".\src\source\DataModelV2\ImageButtonInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + RelativePath=".\src\source\DataModelV2\TextButtonInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + RelativePath=".\src\source\DataModelV2\ToggleImageButtonInstance.cpp" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Debug|Win32" + > + ObjectFile="$(IntDir)\$(InputName)1.obj" + /> + Name="Properties" + > + RelativePath=".\src\source\Properties\BoolProperty.cpp" + > + RelativePath=".\src\source\Properties\Property.cpp" + > + Filter="h;hpp;hxx;hm;inl" + > + RelativePath=".\src\include\Application.h" + > + RelativePath=".\src\include\AudioPlayer.h" + > + RelativePath=".\src\include\ax.h" + > + RelativePath=".\src\include\BrowserCallHandler.h" + > + RelativePath=".\src\include\CameraController.h" + > + RelativePath=".\src\include\Enum.h" + > + RelativePath=".\src\include\ErrorFunctions.h" + > + RelativePath=".\src\include\Faces.h" + > + RelativePath=".\src\include\Globals.h" + > + RelativePath=".\src\include\IEBrowser.h" + > + RelativePath=".\src\include\IEDispatcher.h" + > + RelativePath=".\src\include\Mouse.h" + > + RelativePath=".\src\include\propertyGrid.h" + > + RelativePath=".\src\include\PropertyWindow.h" + > + RelativePath=".\src\include\Renderer.h" + > + RelativePath=".\resource.h" + > + RelativePath=".\SplashHTML.h" + > + RelativePath=".\src\include\StringFunctions.h" + > + RelativePath=".\src\include\TextureHandler.h" + > + RelativePath=".\src\include\win32Defines.h" + > + RelativePath=".\src\include\WindowFunctions.h" + > + + + Name="RapidXML" + > + RelativePath=".\src\include\rapidxml\rapidxml.hpp" + > + RelativePath=".\src\include\rapidxml\rapidxml_iterators.hpp" + > + RelativePath=".\src\include\rapidxml\rapidxml_print.hpp" + > + RelativePath=".\src\include\rapidxml\rapidxml_utils.hpp" + > + Name="Listener" + > + RelativePath=".\src\include\Listener\ButtonListener.h" + > + RelativePath=".\src\include\Listener\CameraButtonListener.h" + > + RelativePath=".\src\include\Listener\DeleteListener.h" + > + RelativePath=".\src\include\Listener\GUDButtonListener.h" + > + RelativePath=".\src\include\Listener\MenuButtonListener.h" + > + RelativePath=".\src\include\Listener\ModeSelectionListener.h" + > + RelativePath=".\src\include\Listener\RotateButtonListener.h" + > + RelativePath=".\src\include\Listener\ToolbarListener.h" + > + RelativePath=".\src\include\DataModel\WorkspaceInstance.h" + > + Name="Tool" + > + RelativePath=".\src\include\Tool\ArrowTool.h" + > + RelativePath=".\src\include\Tool\SurfaceTool.h" + > + RelativePath=".\src\include\Tool\Tool.h" + > + Name="DataModelV2" + > + RelativePath=".\src\include\DataModelV2\DataModelInstance.h" + > + RelativePath=".\src\include\DataModelV2\GroupInstance.h" + > + RelativePath=".\src\include\DataModelV2\Instance.h" + > + RelativePath=".\src\include\DataModelV2\LevelInstance.h" + > + RelativePath=".\src\include\DataModelV2\PartInstance.h" + > + RelativePath=".\src\include\DataModelV2\PVInstance.h" + > + RelativePath=".\src\include\DataModelV2\WorkspaceInstance.h" + > + Name="Gui" + > + RelativePath=".\src\include\DataModelV2\BaseButtonInstance.h" + > + RelativePath=".\src\include\DataModelV2\BaseGuiInstance.h" + > + RelativePath=".\src\include\DataModelV2\GuiRootInstance.h" + > + RelativePath=".\src\include\DataModelV2\ImageButtonInstance.h" + > + RelativePath=".\src\include\DataModelV2\TextButtonInstance.h" + > + RelativePath=".\src\include\DataModelV2\ToggleImageButtonInstance.h" + > + Name="Properties" + > + RelativePath=".\src\include\Properties\BoolProperty.h" + > + RelativePath=".\src\include\Properties\Property.h" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + RelativePath=".\Dialogs.rc" + > + RelativePath=".\icon1.ico" + > + RelativePath=".\Parts.bmp" + > + RelativePath=".\roblox_RN1_icon.ico" + > + Value="Dialogs.rc" + /> diff --git a/Blocks3D.sln b/Blocks3D.sln index 836a214..8102dd1 100644 --- a/Blocks3D.sln +++ b/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}") = "Blocks3D", "Blocks3D.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Blocks3D", "Blocks3D.vcproj", "{8D509AE8-DE30-4EDA-A20F-A47AA7A83379}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -9,10 +9,10 @@ Global 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 + {8D509AE8-DE30-4EDA-A20F-A47AA7A83379}.Debug|Win32.ActiveCfg = Debug|Win32 + {8D509AE8-DE30-4EDA-A20F-A47AA7A83379}.Debug|Win32.Build.0 = Debug|Win32 + {8D509AE8-DE30-4EDA-A20F-A47AA7A83379}.Release|Win32.ActiveCfg = Release|Win32 + {8D509AE8-DE30-4EDA-A20F-A47AA7A83379}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Blocks3D.vcproj b/Blocks3D.vcproj index 9aa5681..b3c98d5 100644 --- a/Blocks3D.vcproj +++ b/Blocks3D.vcproj @@ -3,8 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="Blocks3D" - ProjectGUID="{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}" - RootNamespace="Blocks3D" + ProjectGUID="{8D509AE8-DE30-4EDA-A20F-A47AA7A83379}" > @@ -50,10 +48,9 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="".\src\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\Release/Blocks3D.pch" AssemblerListingLocation=".\Release/" @@ -75,11 +72,10 @@ /> - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Blocks3D.vcxproj b/Blocks3D.vcxproj new file mode 100644 index 0000000..e5d4593 --- /dev/null +++ b/Blocks3D.vcxproj @@ -0,0 +1,340 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + 17.0 + {6C4D6EEF-B1D1-456A-B850-92CAB17124BE} + Blocks3D + + + + Application + v143 + false + MultiByte + false + + + Application + v143 + false + false + MultiByte + + + + + + + + + + + + + + + <_ProjectFileVersion>17.0.32505.173 + + + .\Release\ + .\Release\ + false + + + .\Debug\ + .\Debug\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/Blocks3D.tlb + + + + MaxSpeed + OnlyExplicitInline + .\src\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/Blocks3D.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x1009 + + + Advapi32.lib;Comctl32.lib;Comdlg32.lib;Shell32.lib;%(AdditionalDependencies) + ./Blocks3D.exe + true + .\Release/Blocks3D.pdb + Windows + MachineX86 + + + true + .\Release/Blocks3D.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/Blocks3D.tlb + + + + Disabled + .\src\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + Default + MultiThreadedDebugDLL + false + .\Debug/Blocks3D.pch + .\Debug/ + .\Debug/ + .\Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x1009 + + + Advapi32.lib;UxTheme.lib;Comctl32.lib;Comdlg32.lib;Shell32.lib;Urlmon.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) + ./Blocks3D-Debug.exe + true + true + .\Debug/Blocks3D.pdb + Console + MachineX86 + + + true + .\Debug/Blocks3D.bsc + + + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + + + + + + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Blocks3D.vcxproj.filters b/Blocks3D.vcxproj.filters new file mode 100644 index 0000000..c0be71d --- /dev/null +++ b/Blocks3D.vcxproj.filters @@ -0,0 +1,358 @@ + + + + + {9571c986-a719-4aa9-8f06-edd22511bbbf} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {10225c23-5e14-45ed-aa65-5e2952d83749} + + + {9a362f2a-3ea4-4130-80e1-c7dae14a8862} + + + {018ed0d2-9b98-424f-9af8-172600aa12e3} + + + {870b4a49-cf43-4f47-8321-f48d7b01816b} + + + {7d5f8016-5447-4c00-b9cd-d2c5bb2e59b8} + + + {f959d8b8-bb6a-4c70-ad2c-f1c66758c461} + h;hpp;hxx;hm;inl + + + {6db93330-5b80-4675-8d44-4db372d9d5b5} + + + {8bb34ca3-25fe-465c-a77e-8057005450b0} + + + {b00aefef-dafe-4dc3-8aec-d5a4d56dd2e0} + + + {c13ee511-5b6b-4b79-8402-31323e149b75} + + + {2414eb84-1360-4601-af93-51eb6639ba14} + + + {1ff12666-0b54-4e78-8a68-43853c4f7f12} + + + {f27a93e2-d403-4b4e-ac57-4081d78febbc} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Tool + + + Source Files\Tool + + + Source Files\Tool + + + Source Files\Listener + + + Source Files\Listener + + + Source Files\Listener + + + Source Files\Listener + + + Source Files\Listener + + + Source Files\Listener + + + Source Files\Listener + + + Source Files\Listener + + + Source Files\DataModelV2 + + + Source Files\DataModelV2 + + + Source Files\DataModelV2 + + + Source Files\DataModelV2 + + + Source Files\DataModelV2 + + + Source Files\DataModelV2 + + + Source Files\DataModelV2 + + + Source Files\DataModelV2\Gui + + + Source Files\DataModelV2\Gui + + + Source Files\DataModelV2\Gui + + + Source Files\DataModelV2\Gui + + + Source Files\DataModelV2\Gui + + + Source Files\DataModelV2\Gui + + + Source Files\Properties + + + Source Files\Properties + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\RapidXML + + + Header Files\RapidXML + + + Header Files\RapidXML + + + Header Files\RapidXML + + + Header Files\Listener + + + Header Files\Listener + + + Header Files\Listener + + + Header Files\Listener + + + Header Files\Listener + + + Header Files\Listener + + + Header Files\Listener + + + Header Files\Listener + + + Header Files\Listener + + + Header Files\Tool + + + Header Files\Tool + + + Header Files\Tool + + + Header Files\DataModelV2 + + + Header Files\DataModelV2 + + + Header Files\DataModelV2 + + + Header Files\DataModelV2 + + + Header Files\DataModelV2 + + + Header Files\DataModelV2 + + + Header Files\DataModelV2 + + + Header Files\DataModelV2\Gui + + + Header Files\DataModelV2\Gui + + + Header Files\DataModelV2\Gui + + + Header Files\DataModelV2\Gui + + + Header Files\DataModelV2\Gui + + + Header Files\DataModelV2\Gui + + + Header Files\Properties + + + Header Files\Properties + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/SplashHTML.cpp b/SplashHTML.cpp new file mode 100644 index 0000000..c022085 --- /dev/null +++ b/SplashHTML.cpp @@ -0,0 +1,43 @@ +#include "DataModelV2/LevelInstance.h" +#include "Globals.h" +#include "SplashHTML.h" +#include +#include +#include +#include +#include + +int SplashHTMLLoad(std::string strHTML) +{ + printf("%s \n", strHTML.c_str()); + CoInitialize(NULL); + + HRESULT InstanciateIEResult; + HRESULT NavigateResult; + HRESULT ShowBrowserResult; + + VARIANT empty; + VariantInit(&empty); + + IWebBrowser2* browser = NULL; + HRESULT hr = CoCreateInstance(CLSID_InternetExplorer, NULL, + CLSCTX_LOCAL_SERVER, IID_IWebBrowser2, (void**)&browser); + + std::wstring HtmlWide; + HtmlWide.assign( strHTML.begin(), strHTML.end() ); + + if (browser) + { + BSTR URL = SysAllocString(L"about:blank"); + browser->put_AddressBar(false); + browser->put_ToolBar(false); + browser->Navigate(URL, &empty, &empty, &empty, &empty); + SysFreeString(URL); + + ShowBrowserResult = browser->put_Visible(VARIANT_TRUE); + browser->Release(); + } + + CoUninitialize(); + return 0; +} \ No newline at end of file diff --git a/SplashHTML.h b/SplashHTML.h new file mode 100644 index 0000000..b893696 --- /dev/null +++ b/SplashHTML.h @@ -0,0 +1,2 @@ +#include +int SplashHTMLLoad(std::string); \ No newline at end of file diff --git a/src/include/DataModelV2/LevelInstance.h b/src/include/DataModelV2/LevelInstance.h index f29ca78..a28e57d 100644 --- a/src/include/DataModelV2/LevelInstance.h +++ b/src/include/DataModelV2/LevelInstance.h @@ -5,6 +5,7 @@ class LevelInstance : public Instance { public: + std::string SplashHTML; LevelInstance(void); ~LevelInstance(void); float timer; diff --git a/src/source/Application.cpp b/src/source/Application.cpp index 104de26..ce7b671 100644 --- a/src/source/Application.cpp +++ b/src/source/Application.cpp @@ -24,6 +24,7 @@ #include "PropertyWindow.h" #include #include "StringFunctions.h" +#include "../../SplashHTML.h" #include "Listener/GUDButtonListener.h" #include "Listener/ModeSelectionListener.h" @@ -281,7 +282,9 @@ void Application::onInit() { #else _dataModel->debugGetOpen(); #endif - + LevelInstance * level = g_dataModel->getLevel(); + std::string GetCurrentSplash = level->SplashHTML; + SplashHTMLLoad(GetCurrentSplash); diff --git a/src/source/DataModelV2/LevelInstance.cpp b/src/source/DataModelV2/LevelInstance.cpp index 21c7e66..0eb3af6 100644 --- a/src/source/DataModelV2/LevelInstance.cpp +++ b/src/source/DataModelV2/LevelInstance.cpp @@ -3,6 +3,7 @@ LevelInstance::LevelInstance(void) { Instance::Instance(); + SplashHTML = "Test"; name = "Level"; winMessage = "You Won!"; loseMessage = "You Lost. Try Again"; @@ -23,7 +24,12 @@ std::vector LevelInstance::getProperties() std::vector properties = Instance::getProperties(); - + properties.push_back(createPGI("Properties", + "SplashHTML", + "HTML that shows when the Level is loaded.", + (LPARAM)SplashHTML.c_str(), + PIT_EDIT)); + properties.push_back(createPGI("Messages", "WinMessage", "The message that shows when the player wins.", @@ -40,12 +46,12 @@ std::vector LevelInstance::getProperties() sprintf_s(scoreTxt, "%d", score); properties.push_back(createPGI("Gameplay", "InitialTimerValue", - "The ammount of time in seconds the player has to complete this level.\r\n\r\nPut 0 if time is limitless.", + "The amount of time in seconds the player has to complete this level.\r\n\r\nPut 0 if time is limitless.", (LPARAM)timerTxt, PIT_EDIT)); properties.push_back(createPGI("Gameplay", "InitialScoreValue", - "The ammount of points the player starts with.", + "The amount of points the player starts with.", (LPARAM)scoreTxt, PIT_EDIT)); return properties;