9 Commits

Author SHA1 Message Date
359af6326b test5 2022-10-04 12:58:15 -04:00
Vulpovile
cb6be1e183 Fixed structure 2022-10-04 07:12:25 -07:00
Vulpovile
6f9e9da771 Fix merge conflicts 2022-10-04 07:08:56 -07:00
Vulpovile
d96bcd2a2b Merge pull request #78 from Vulpovile/bugfix/fix-broken-delete
Fix broken delete
2022-10-03 22:27:00 -07:00
Vulpovile
6de83febb5 Fix prefix 2022-10-03 22:26:09 -07:00
Vulpovile
aaceb4eb21 Version bump 2022-10-03 22:16:30 -07:00
88176d317c Placeholder 2022-10-03 15:28:11 -04:00
9dc3577bc8 splashhtml 2022-10-02 00:20:31 -04:00
3bdef8e3ab Add a broken SplashHTML 2022-10-01 14:23:57 -04:00
17 changed files with 910 additions and 48 deletions

5
.gitignore vendored
View File

@@ -50,7 +50,12 @@ G3DTest.suo
G3DTest.suo
stderr.txt
desktop.ini
UpgradeLog.XML
/_UpgradeReport_Files
/.vs
*.7.10.old
*.db
#Redist
!Installer/Redist/*
UpgradeLog.htm

20
Backup/Blocks3D.sln Normal file
View File

@@ -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

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="0.0.106.1"
version="0.0.106.2"
processorArchitecture="*"
name="Blocks3D.Blocks3D.Blocks3D"
type="win32"

View File

@@ -292,6 +292,10 @@
RelativePath=".\src\source\Renderer.cpp"
>
</File>
<File
RelativePath=".\src\source\SplashHTML.cpp"
>
</File>
<File
RelativePath=".\src\source\StringFunctions.cpp"
>
@@ -725,6 +729,10 @@
RelativePath=".\src\include\resource.h"
>
</File>
<File
RelativePath=".\src\include\SplashHTML.h"
>
</File>
<File
RelativePath=".\src\include\StringFunctions.h"
>

340
Blocks3D.vcxproj Normal file
View File

@@ -0,0 +1,340 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>17.0</VCProjectVersion>
<ProjectGuid>{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}</ProjectGuid>
<RootNamespace>Blocks3D</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v143</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<CLRSupport>false</CLRSupport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v143</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>false</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Release\</OutDir>
<IntDir>.\Release\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\Debug\</OutDir>
<IntDir>.\Debug\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\Release/Blocks3D.tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>.\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeaderOutputFile>.\Release/Blocks3D.pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>.\Release/</AssemblerListingLocation>
<ObjectFileName>.\Release/</ObjectFileName>
<ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x1009</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>Advapi32.lib;Comctl32.lib;Comdlg32.lib;Shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>./Blocks3D.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\Release/Blocks3D.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Release/Blocks3D.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\Debug/Blocks3D.tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
<PrecompiledHeaderOutputFile>.\Debug/Blocks3D.pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
<ObjectFileName>.\Debug/</ObjectFileName>
<ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x1009</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>Advapi32.lib;UxTheme.lib;Comctl32.lib;Comdlg32.lib;Shell32.lib;Urlmon.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>./Blocks3D-Debug.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\Debug/Blocks3D.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Debug/Blocks3D.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\source\Application.cpp" />
<ClCompile Include="src\source\AudioPlayer.cpp" />
<ClCompile Include="src\source\ax.cpp" />
<ClCompile Include="src\source\BrowserCallHandler.cpp" />
<ClCompile Include="src\source\CameraController.cpp" />
<ClCompile Include="src\source\DataModelV2\BaseButtonInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\BaseGuiInstance.cpp" />
<ClCompile Include="src\source\DataModelV2\DataModelInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\GroupInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\GuiRootInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\ImageButtonInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\Instance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\LevelInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\PartInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\PVInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\TextButtonInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\ToggleImageButtonInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\WorkspaceInstance.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="src\source\ErrorFunctions.cpp" />
<ClCompile Include="src\source\Globals.cpp" />
<ClCompile Include="src\source\IEBrowser.cpp" />
<ClCompile Include="src\source\IEDispatcher.cpp" />
<ClCompile Include="src\source\Listener\ButtonListener.cpp" />
<ClCompile Include="src\source\Listener\CameraButtonListener.cpp" />
<ClCompile Include="src\source\Listener\DeleteListener.cpp" />
<ClCompile Include="src\source\Listener\GUDButtonListener.cpp" />
<ClCompile Include="src\source\Listener\MenuButtonListener.cpp" />
<ClCompile Include="src\source\Listener\ModeSelectionListener.cpp" />
<ClCompile Include="src\source\Listener\RotateButtonListener.cpp" />
<ClCompile Include="src\source\Listener\ToolbarListener.cpp" />
<ClCompile Include="src\source\main.cpp" />
<ClCompile Include="src\source\Mouse.cpp" />
<ClCompile Include="src\source\Properties\BoolProperty.cpp" />
<ClCompile Include="src\source\Properties\Property.cpp" />
<ClCompile Include="src\source\propertyGrid.cpp" />
<ClCompile Include="src\source\PropertyWindow.cpp" />
<ClCompile Include="src\source\Renderer.cpp" />
<ClCompile Include="src\source\StringFunctions.cpp" />
<ClCompile Include="src\source\TextureHandler.cpp" />
<ClCompile Include="src\source\Tool\ArrowTool.cpp" />
<ClCompile Include="src\source\Tool\SurfaceTool.cpp" />
<ClCompile Include="src\source\Tool\Tool.cpp" />
<ClCompile Include="src\source\WindowFunctions.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h" />
<ClInclude Include="src\include\Application.h" />
<ClInclude Include="src\include\AudioPlayer.h" />
<ClInclude Include="src\include\ax.h" />
<ClInclude Include="src\include\BrowserCallHandler.h" />
<ClInclude Include="src\include\CameraController.h" />
<ClInclude Include="src\include\DataModelV2\BaseButtonInstance.h" />
<ClInclude Include="src\include\DataModelV2\BaseGuiInstance.h" />
<ClInclude Include="src\include\DataModelV2\DataModelInstance.h" />
<ClInclude Include="src\include\DataModelV2\GroupInstance.h" />
<ClInclude Include="src\include\DataModelV2\GuiRootInstance.h" />
<ClInclude Include="src\include\DataModelV2\ImageButtonInstance.h" />
<ClInclude Include="src\include\DataModelV2\Instance.h" />
<ClInclude Include="src\include\DataModelV2\LevelInstance.h" />
<ClInclude Include="src\include\DataModelV2\PartInstance.h" />
<ClInclude Include="src\include\DataModelV2\PVInstance.h" />
<ClInclude Include="src\include\DataModelV2\TextButtonInstance.h" />
<ClInclude Include="src\include\DataModelV2\ToggleImageButtonInstance.h" />
<ClInclude Include="src\include\DataModelV2\WorkspaceInstance.h" />
<ClInclude Include="src\include\DataModel\WorkspaceInstance.h" />
<ClInclude Include="src\include\Enum.h" />
<ClInclude Include="src\include\ErrorFunctions.h" />
<ClInclude Include="src\include\Faces.h" />
<ClInclude Include="src\include\Globals.h" />
<ClInclude Include="src\include\IEBrowser.h" />
<ClInclude Include="src\include\IEDispatcher.h" />
<ClInclude Include="src\include\Listener\ButtonListener.h" />
<ClInclude Include="src\include\Listener\CameraButtonListener.h" />
<ClInclude Include="src\include\Listener\DeleteListener.h" />
<ClInclude Include="src\include\Listener\GUDButtonListener.h" />
<ClInclude Include="src\include\Listener\MenuButtonListener.h" />
<ClInclude Include="src\include\Listener\ModeSelectionListener.h" />
<ClInclude Include="src\include\Listener\RotateButtonListener.h" />
<ClInclude Include="src\include\Listener\ToolbarListener.h" />
<ClInclude Include="src\include\Mouse.h" />
<ClInclude Include="src\include\Properties\BoolProperty.h" />
<ClInclude Include="src\include\Properties\Property.h" />
<ClInclude Include="src\include\propertyGrid.h" />
<ClInclude Include="src\include\PropertyWindow.h" />
<ClInclude Include="src\include\rapidxml\rapidxml.hpp" />
<ClInclude Include="src\include\rapidxml\rapidxml_iterators.hpp" />
<ClInclude Include="src\include\rapidxml\rapidxml_print.hpp" />
<ClInclude Include="src\include\rapidxml\rapidxml_utils.hpp" />
<ClInclude Include="src\include\Renderer.h" />
<ClInclude Include="src\include\StringFunctions.h" />
<ClInclude Include="src\include\TextureHandler.h" />
<ClInclude Include="src\include\Tool\ArrowTool.h" />
<ClInclude Include="src\include\Tool\SurfaceTool.h" />
<ClInclude Include="src\include\Tool\Tool.h" />
<ClInclude Include="src\include\win32Defines.h" />
<ClInclude Include="src\include\WindowFunctions.h" />
<ClInclude Include="src\include\winver.h" />
</ItemGroup>
<ItemGroup>
<None Include="B3dIcon.ico" />
<None Include="FatB3dIcon.ico" />
<None Include="Parts.bmp" />
<None Include="roblox_RN1_icon.ico" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Dialogs.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties RESOURCE_FILE="Dialogs.rc" />
</VisualStudio>
</ProjectExtensions>
</Project>

358
Blocks3D.vcxproj.filters Normal file
View File

@@ -0,0 +1,358 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{9571c986-a719-4aa9-8f06-edd22511bbbf}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Source Files\Tool">
<UniqueIdentifier>{10225c23-5e14-45ed-aa65-5e2952d83749}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Listener">
<UniqueIdentifier>{9a362f2a-3ea4-4130-80e1-c7dae14a8862}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\DataModelV2">
<UniqueIdentifier>{018ed0d2-9b98-424f-9af8-172600aa12e3}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\DataModelV2\Gui">
<UniqueIdentifier>{870b4a49-cf43-4f47-8321-f48d7b01816b}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Properties">
<UniqueIdentifier>{7d5f8016-5447-4c00-b9cd-d2c5bb2e59b8}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{f959d8b8-bb6a-4c70-ad2c-f1c66758c461}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
<Filter Include="Header Files\RapidXML">
<UniqueIdentifier>{6db93330-5b80-4675-8d44-4db372d9d5b5}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Listener">
<UniqueIdentifier>{8bb34ca3-25fe-465c-a77e-8057005450b0}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Tool">
<UniqueIdentifier>{b00aefef-dafe-4dc3-8aec-d5a4d56dd2e0}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\DataModelV2">
<UniqueIdentifier>{c13ee511-5b6b-4b79-8402-31323e149b75}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\DataModelV2\Gui">
<UniqueIdentifier>{2414eb84-1360-4601-af93-51eb6639ba14}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Properties">
<UniqueIdentifier>{1ff12666-0b54-4e78-8a68-43853c4f7f12}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{f27a93e2-d403-4b4e-ac57-4081d78febbc}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\source\Application.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\AudioPlayer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\ax.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\BrowserCallHandler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\CameraController.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\ErrorFunctions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\Globals.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\IEBrowser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\IEDispatcher.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\Mouse.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\propertyGrid.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\PropertyWindow.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\Renderer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\StringFunctions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\TextureHandler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\WindowFunctions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\source\Tool\ArrowTool.cpp">
<Filter>Source Files\Tool</Filter>
</ClCompile>
<ClCompile Include="src\source\Tool\SurfaceTool.cpp">
<Filter>Source Files\Tool</Filter>
</ClCompile>
<ClCompile Include="src\source\Tool\Tool.cpp">
<Filter>Source Files\Tool</Filter>
</ClCompile>
<ClCompile Include="src\source\Listener\ButtonListener.cpp">
<Filter>Source Files\Listener</Filter>
</ClCompile>
<ClCompile Include="src\source\Listener\CameraButtonListener.cpp">
<Filter>Source Files\Listener</Filter>
</ClCompile>
<ClCompile Include="src\source\Listener\DeleteListener.cpp">
<Filter>Source Files\Listener</Filter>
</ClCompile>
<ClCompile Include="src\source\Listener\GUDButtonListener.cpp">
<Filter>Source Files\Listener</Filter>
</ClCompile>
<ClCompile Include="src\source\Listener\MenuButtonListener.cpp">
<Filter>Source Files\Listener</Filter>
</ClCompile>
<ClCompile Include="src\source\Listener\ModeSelectionListener.cpp">
<Filter>Source Files\Listener</Filter>
</ClCompile>
<ClCompile Include="src\source\Listener\RotateButtonListener.cpp">
<Filter>Source Files\Listener</Filter>
</ClCompile>
<ClCompile Include="src\source\Listener\ToolbarListener.cpp">
<Filter>Source Files\Listener</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\DataModelInstance.cpp">
<Filter>Source Files\DataModelV2</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\GroupInstance.cpp">
<Filter>Source Files\DataModelV2</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\Instance.cpp">
<Filter>Source Files\DataModelV2</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\LevelInstance.cpp">
<Filter>Source Files\DataModelV2</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\PartInstance.cpp">
<Filter>Source Files\DataModelV2</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\PVInstance.cpp">
<Filter>Source Files\DataModelV2</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\WorkspaceInstance.cpp">
<Filter>Source Files\DataModelV2</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\BaseButtonInstance.cpp">
<Filter>Source Files\DataModelV2\Gui</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\BaseGuiInstance.cpp">
<Filter>Source Files\DataModelV2\Gui</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\GuiRootInstance.cpp">
<Filter>Source Files\DataModelV2\Gui</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\ImageButtonInstance.cpp">
<Filter>Source Files\DataModelV2\Gui</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\TextButtonInstance.cpp">
<Filter>Source Files\DataModelV2\Gui</Filter>
</ClCompile>
<ClCompile Include="src\source\DataModelV2\ToggleImageButtonInstance.cpp">
<Filter>Source Files\DataModelV2\Gui</Filter>
</ClCompile>
<ClCompile Include="src\source\Properties\BoolProperty.cpp">
<Filter>Source Files\Properties</Filter>
</ClCompile>
<ClCompile Include="src\source\Properties\Property.cpp">
<Filter>Source Files\Properties</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\include\Application.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\AudioPlayer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ax.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\BrowserCallHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\CameraController.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\Enum.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ErrorFunctions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\Faces.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\Globals.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\IEBrowser.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\IEDispatcher.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\Mouse.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\propertyGrid.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\PropertyWindow.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\Renderer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\StringFunctions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\TextureHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\win32Defines.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\WindowFunctions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\winver.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\rapidxml\rapidxml.hpp">
<Filter>Header Files\RapidXML</Filter>
</ClInclude>
<ClInclude Include="src\include\rapidxml\rapidxml_iterators.hpp">
<Filter>Header Files\RapidXML</Filter>
</ClInclude>
<ClInclude Include="src\include\rapidxml\rapidxml_print.hpp">
<Filter>Header Files\RapidXML</Filter>
</ClInclude>
<ClInclude Include="src\include\rapidxml\rapidxml_utils.hpp">
<Filter>Header Files\RapidXML</Filter>
</ClInclude>
<ClInclude Include="src\include\Listener\ButtonListener.h">
<Filter>Header Files\Listener</Filter>
</ClInclude>
<ClInclude Include="src\include\Listener\CameraButtonListener.h">
<Filter>Header Files\Listener</Filter>
</ClInclude>
<ClInclude Include="src\include\Listener\DeleteListener.h">
<Filter>Header Files\Listener</Filter>
</ClInclude>
<ClInclude Include="src\include\Listener\GUDButtonListener.h">
<Filter>Header Files\Listener</Filter>
</ClInclude>
<ClInclude Include="src\include\Listener\MenuButtonListener.h">
<Filter>Header Files\Listener</Filter>
</ClInclude>
<ClInclude Include="src\include\Listener\ModeSelectionListener.h">
<Filter>Header Files\Listener</Filter>
</ClInclude>
<ClInclude Include="src\include\Listener\RotateButtonListener.h">
<Filter>Header Files\Listener</Filter>
</ClInclude>
<ClInclude Include="src\include\Listener\ToolbarListener.h">
<Filter>Header Files\Listener</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModel\WorkspaceInstance.h">
<Filter>Header Files\Listener</Filter>
</ClInclude>
<ClInclude Include="src\include\Tool\ArrowTool.h">
<Filter>Header Files\Tool</Filter>
</ClInclude>
<ClInclude Include="src\include\Tool\SurfaceTool.h">
<Filter>Header Files\Tool</Filter>
</ClInclude>
<ClInclude Include="src\include\Tool\Tool.h">
<Filter>Header Files\Tool</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\DataModelInstance.h">
<Filter>Header Files\DataModelV2</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\GroupInstance.h">
<Filter>Header Files\DataModelV2</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\Instance.h">
<Filter>Header Files\DataModelV2</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\LevelInstance.h">
<Filter>Header Files\DataModelV2</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\PartInstance.h">
<Filter>Header Files\DataModelV2</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\PVInstance.h">
<Filter>Header Files\DataModelV2</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\WorkspaceInstance.h">
<Filter>Header Files\DataModelV2</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\BaseButtonInstance.h">
<Filter>Header Files\DataModelV2\Gui</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\BaseGuiInstance.h">
<Filter>Header Files\DataModelV2\Gui</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\GuiRootInstance.h">
<Filter>Header Files\DataModelV2\Gui</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\ImageButtonInstance.h">
<Filter>Header Files\DataModelV2\Gui</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\TextButtonInstance.h">
<Filter>Header Files\DataModelV2\Gui</Filter>
</ClInclude>
<ClInclude Include="src\include\DataModelV2\ToggleImageButtonInstance.h">
<Filter>Header Files\DataModelV2\Gui</Filter>
</ClInclude>
<ClInclude Include="src\include\Properties\BoolProperty.h">
<Filter>Header Files\Properties</Filter>
</ClInclude>
<ClInclude Include="src\include\Properties\Property.h">
<Filter>Header Files\Properties</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="B3dIcon.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="FatB3dIcon.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="Parts.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="roblox_RN1_icon.ico">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Dialogs.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

View File

@@ -7,6 +7,17 @@
#include <richedit.h>
#include "src/include/resource.h"
#define APP_GENER 0
#define APP_MAJOR 0
#define APP_MINOR 106
#define APP_PATCH 2
#define APP_VER_STRING APP_GENER.APP_MAJOR.APP_MINOR.APP_PATCH
#define VER_PREFIX( N ) v##N
#define HSTR( N ) #N
#define STR( N ) HSTR( N )
#define VER_STR( N ) STR( VER_PREFIX( N ) )
@@ -18,8 +29,8 @@ IDB_BITMAP1 BITMAP "Parts.bmp"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
1 VERSIONINFO
FILEVERSION 0,0,106,1
PRODUCTVERSION 0,0,106,1
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
@@ -33,14 +44,14 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
VALUE "Comments", ""
VALUE "CompanyName", "Blocks3D Team"
VALUE "FileDescription", "Blocks 3D"
VALUE "FileVersion", "v0.0.106.1"
VALUE "FileVersion", VER_STR(APP_VER_STRING)
VALUE "InternalName", "Blocks3D"
VALUE "LegalCopyright", "Blocks3D Team - 2022"
VALUE "LegalTrademarks", ""
VALUE "OriginalFilename", "Blocks3D.exe"
VALUE "PrivateBuild", ""
VALUE "ProductName", "Blocks3D"
VALUE "ProductVersion", "v0.0.106.1"
VALUE "ProductVersion", VER_STR(APP_VER_STRING)
VALUE "SpecialBuild", ""
}
}

View File

@@ -5,6 +5,7 @@ class LevelInstance :
public Instance
{
public:
std::string SplashHTML;
LevelInstance(void);
~LevelInstance(void);
float timer;

View File

@@ -1,6 +1,5 @@
#pragma once
#include "DataModelV2/Instance.h"
#include <set>
class PropertyWindow {
public:
@@ -15,4 +14,5 @@ private:
HWND _propGrid;
HWND _explorerComboBox;
void _resize();
void clearExplorer();
};

3
src/include/SplashHTML.h Normal file
View File

@@ -0,0 +1,3 @@
#include <string>
//int SplashHTMLLoad(std::string strHTML);
int SplashHTMLLoad(std::string strHTML);

View File

@@ -25,6 +25,7 @@
#include "PropertyWindow.h"
#include <commctrl.h>
#include "StringFunctions.h"
#include "SplashHTML.h"
#include "Listener/GUDButtonListener.h"
#include "Listener/ModeSelectionListener.h"
@@ -161,22 +162,23 @@ void Application::deleteInstance()
{
if(_dataModel->getSelectionService()->getSelection().size() > 0)
{
size_t undeletable = 0;
while(_dataModel->getSelectionService()->getSelection().size() > undeletable)
std::vector<Instance *> selection = _dataModel->getSelectionService()->getSelection();
std::vector<Instance *> toDelete;
for(size_t i = 0; i < selection.size(); i++) {
if(selection[i]->canDelete) {
toDelete.push_back(selection[i]);
}
}
if(toDelete.size() > 0)
{
if(_dataModel->getSelectionService()->getSelection()[0]->canDelete)
{
AudioPlayer::playSound(GetFileInPath("/content/sounds/pageturn.wav"));
Instance* selectedInstance = g_dataModel->getSelectionService()->getSelection()[0];
_dataModel->getSelectionService()->removeChild(selectedInstance);
AudioPlayer::playSound(GetFileInPath("/content/sounds/pageturn.wav"));
for(size_t i = 0; i < toDelete.size(); i++) {
Instance* selectedInstance = toDelete[i];
_dataModel->getSelectionService()->removeSelected(selectedInstance);
selectedInstance->setParent(NULL);
delete selectedInstance;
selectedInstance = NULL;
}
else
{
undeletable++;
}
}
}
if(_dataModel->getSelectionService()->getSelection().size() == 0)
@@ -284,6 +286,9 @@ void Application::onInit() {
#else
_dataModel->debugGetOpen();
#endif
LevelInstance * level = g_dataModel->getLevel();
std::string GetCurrentSplash = level->SplashHTML;
SplashHTMLLoad(GetCurrentSplash);
_dataModel->getSelectionService()->clearSelection();
_dataModel->getSelectionService()->addSelected(_dataModel);

View File

@@ -21,6 +21,7 @@ void SelectionService::clearSelection(){
this->selection.clear();
if(propertyWindow != NULL)
propertyWindow->ClearProperties();
printf("selectionSize: %d\n", selection.size());
}
bool SelectionService::isSelected(Instance * instance){
return std::find(selection.begin(), selection.end(), instance) != selection.end();
@@ -30,11 +31,13 @@ void SelectionService::addSelected(Instance * instance){
this->selection.push_back(instance);
if(propertyWindow != NULL)
propertyWindow->UpdateSelected(selection);
printf("selectionSize: %d\n", selection.size());
}
void SelectionService::removeSelected(Instance * instance){
selection.erase(std::remove(selection.begin(), selection.end(), instance), selection.end());
if(propertyWindow != NULL)
propertyWindow->UpdateSelected(selection);
printf("selectionSize: %d\n", selection.size());
}
void SelectionService::addSelected(const std::vector<Instance *> &instances){
for(size_t i = 0; i < instances.size(); i++)
@@ -44,10 +47,12 @@ void SelectionService::addSelected(const std::vector<Instance *> &instances){
}
if(propertyWindow != NULL)
propertyWindow->UpdateSelected(selection);
printf("selectionSize: %d\n", selection.size());
}
void SelectionService::setPropertyWindow(PropertyWindow * propertyWindow)
{
this->propertyWindow = propertyWindow;
if(propertyWindow != NULL)
propertyWindow->ClearProperties();
printf("selectionSize: %d\n", selection.size());
}

View File

@@ -3,6 +3,7 @@
LevelInstance::LevelInstance(void)
{
Instance::Instance();
SplashHTML = "<html><body><b>Test</b><body></html>";
name = "Level";
winMessage = "You Won!";
loseMessage = "You Lost. Try Again";
@@ -23,6 +24,11 @@ std::vector<PROPGRIDITEM> LevelInstance::getProperties()
std::vector<PROPGRIDITEM> 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",

View File

@@ -3,7 +3,6 @@
#include "WindowFunctions.h"
#include "resource.h"
#include "PropertyWindow.h"
#include "Globals.h"
#include "strsafe.h"
#include "Application.h"
@@ -203,6 +202,12 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
return 0;
}
void PropertyWindow::clearExplorer()
{
SendMessage(_explorerComboBox,CB_RESETCONTENT,0,0);
SendMessage(_explorerComboBox,CB_SETCURSEL,0,(LPARAM)0);
}
void PropertyWindow::refreshExplorer(std::vector<Instance*> selectedInstances)
{
Instance * instance = selectedInstances[0];
@@ -367,12 +372,6 @@ void PropertyWindow::UpdateSelected(std::vector<Instance *> instances)
void PropertyWindow::ClearProperties()
{
if(g_dataModel != NULL)
{
g_dataModel->getSelectionService()->addSelected(g_dataModel);
}
else
{
PropGrid_ResetContent(_propGrid);
}
clearExplorer();
PropGrid_ResetContent(_propGrid);
}

94
src/source/SplashHTML.cpp Normal file
View File

@@ -0,0 +1,94 @@
#include "DataModelV2/LevelInstance.h"
#include "Globals.h"
#include "SplashHTML.h"
#include "Application.h"
#include <windows.h>
#include <MsHTML.h>
#include <Exdisp.h>
#include <ExDispid.h>
#include <shlwapi.h>
HWND SplashHTMLContainer()
{
HWND invisWindowHandle = CreateWindowEx(WS_EX_TOOLWINDOW,
"htmlWindow",
"Splash",
WS_OVERLAPPEDWINDOW & ~WS_MAXIMIZEBOX & ~WS_THICKFRAME,
200,
200,
500,
300,
NULL,
NULL,
NULL,
NULL);
printf("Creating Window HWND: %u\n", invisWindowHandle);
ShowWindow(invisWindowHandle, 1);
UpdateWindow(invisWindowHandle);
return invisWindowHandle;
}
void PH()
//int SplashHTMLLoad(std::string strHTML)
{
SplashHTMLContainer();
IHTMLDocument2 *document; // Declared earlier in the code
BSTR bstr = SysAllocString(OLESTR("Written by IHTMLDocument2::write()."));
// Creates a new one-dimensional array
SAFEARRAY *psaStrings = SafeArrayCreateVector(VT_VARIANT, 0, 1);
if (psaStrings == NULL) {
goto cleanup;
}
VARIANT *param;
HRESULT hr = SafeArrayAccessData(psaStrings, (LPVOID*)&param);
param->vt = VT_BSTR;
param->bstrVal = bstr;
hr = SafeArrayUnaccessData(psaStrings);
//hr = document->write(psaStrings);
cleanup:
// SafeArrayDestroy calls SysFreeString for each BSTR
if (psaStrings != NULL) {
SafeArrayDestroy(psaStrings);
}
}
int SplashHTMLLoad(std::string strHTML)
{
HWND splashContainer = SplashHTMLContainer();
SHANDLE_PTR browserHWND;
HWND parentResultSplash;
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"http://google.com");
browser->put_AddressBar(false);
browser->put_ToolBar(false);
browser->put_TheaterMode(false);
browser->put_Width(500);
browser->put_Height(300);
browser->Navigate(URL, &empty, &empty, &empty, &empty);
SysFreeString(URL);
ShowBrowserResult = browser->get_HWND(&browserHWND);
ShowBrowserResult = browser->put_Visible(VARIANT_TRUE);
browser->Release();
parentResultSplash = SetParent((HWND)&browserHWND, splashContainer);
}
printf("%s \n%u \n%u \n", strHTML.c_str(), (HWND)&browserHWND, parentResultSplash);
CoUninitialize();
return 0;
}

View File

@@ -24,6 +24,11 @@ DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
EXCEPINFO excepinfo;
UINT nArgErr;
LRESULT CALLBACK HtmlProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
return DefWindowProc(hwnd, msg, wParam, lParam);
}
LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
Application *app = (Application *)GetWindowLongPtr(hwnd, GWL_USERDATA);
@@ -185,6 +190,8 @@ int main(int argc, char** argv) {
settings.window.center = true; */
HMODULE hThisInstance = GetModuleHandle(NULL);
if (!createWindowClass("htmlWindow",HtmlProc,NULL))
return false;
if (!createWindowClass("mainHWND",WndProc,hThisInstance))
return false;
if (!createWindowClass("toolboxHWND",ToolboxProc,hThisInstance))