Added insert items dialog function

Merge pull request #54 from Vulpovile/DataModelV2
Data model v2
2022-10-01 11:25:07 -07:00 · 2022-09-30 15:24:44 -07:00 · 2022-09-30 15:22:10 -07:00 · 2021-08-17 13:28:59 -07:00 · 2021-03-21 01:08:18 -07:00 · 2021-03-20 21:58:41 -07:00
24 changed files with 847 additions and 2220 deletions
--- a/B3dIcon.ico
+++ b/B3dIcon.ico
--- a/Blocks3D-2003.sln
+++ b/Blocks3D-2003.sln
@@ -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
--- a/Blocks3D-2003.vcproj
+++ b/Blocks3D-2003.vcproj
@@ -0,0 +1,649 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="Blocks3D"
+	ProjectGUID="{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
+	RootNamespace="Blocks3D">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			UseOfATL="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				PrecompiledHeaderFile=".\Release/Blocks3D.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib"
+				OutputFile="./Blocks3D.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
+				SubSystem="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/Blocks3D.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="4105"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2"
+			ManagedExtensions="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;NO_SPRINTF;IGNORE_CATCH"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="FALSE"
+				PrecompiledHeaderFile=".\Debug/Blocks3D.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib Urlmon.lib ole32.lib oleaut32.lib uuid.lib"
+				OutputFile="./Blocks3D-Debug.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/Blocks3D.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/Blocks3D.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="4105"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<AssemblyReference
+			RelativePath="System.dll"/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"/>
+		<AssemblyReference
+			RelativePath="System.Drawing.dll"/>
+		<AssemblyReference
+			RelativePath="System.Windows.Forms.dll"/>
+		<AssemblyReference
+			RelativePath="System.XML.dll"/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath=".\src\source\Application.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\AudioPlayer.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\ax.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\BrowserCallHandler.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\CameraController.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\ErrorFunctions.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\Globals.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\IEBrowser.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\IEDispatcher.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\main.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\Mouse.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\propertyGrid.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\PropertyWindow.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\Renderer.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\StringFunctions.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\TextureHandler.cpp">
+			</File>
+			<File
+				RelativePath=".\src\source\WindowFunctions.cpp">
+			</File>
+			<Filter
+				Name="Tool">
+				<File
+					RelativePath=".\src\source\Tool\ArrowTool.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Tool\SurfaceTool.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Tool\Tool.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Listener">
+				<File
+					RelativePath=".\src\source\Listener\ButtonListener.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\CameraButtonListener.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\DeleteListener.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\GUDButtonListener.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\MenuButtonListener.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\ModeSelectionListener.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\RotateButtonListener.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\ToolbarListener.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="DataModelV2">
+				<File
+					RelativePath=".\src\source\DataModelV2\DataModelInstance.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\GroupInstance.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\Instance.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\LevelInstance.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\PartInstance.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\PVInstance.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModelV2\WorkspaceInstance.cpp">
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<Filter
+					Name="Gui">
+					<File
+						RelativePath=".\src\source\DataModelV2\BaseButtonInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV2\BaseGuiInstance.cpp">
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV2\GuiRootInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV2\ImageButtonInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV2\TextButtonInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\src\source\DataModelV2\ToggleImageButtonInstance.cpp">
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Properties">
+				<File
+					RelativePath=".\src\source\Properties\BoolProperty.cpp">
+				</File>
+				<File
+					RelativePath=".\src\source\Properties\Property.cpp">
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath=".\src\include\Application.h">
+			</File>
+			<File
+				RelativePath=".\src\include\AudioPlayer.h">
+			</File>
+			<File
+				RelativePath=".\src\include\ax.h">
+			</File>
+			<File
+				RelativePath=".\src\include\BrowserCallHandler.h">
+			</File>
+			<File
+				RelativePath=".\src\include\CameraController.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Enum.h">
+			</File>
+			<File
+				RelativePath=".\src\include\ErrorFunctions.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Faces.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Globals.h">
+			</File>
+			<File
+				RelativePath=".\src\include\IEBrowser.h">
+			</File>
+			<File
+				RelativePath=".\src\include\IEDispatcher.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Mouse.h">
+			</File>
+			<File
+				RelativePath=".\src\include\propertyGrid.h">
+			</File>
+			<File
+				RelativePath=".\src\include\PropertyWindow.h">
+			</File>
+			<File
+				RelativePath=".\src\include\Renderer.h">
+			</File>
+			<File
+				RelativePath=".\resource.h">
+			</File>
+			<File
+				RelativePath=".\src\include\StringFunctions.h">
+			</File>
+			<File
+				RelativePath=".\src\include\TextureHandler.h">
+			</File>
+			<File
+				RelativePath=".\src\include\win32Defines.h">
+			</File>
+			<File
+				RelativePath=".\src\include\WindowFunctions.h">
+			</File>
+			<File
+				RelativePath=".\src\include\winver.h">
+			</File>
+			<Filter
+				Name="RapidXML">
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml.hpp">
+				</File>
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml_iterators.hpp">
+				</File>
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml_print.hpp">
+				</File>
+				<File
+					RelativePath=".\src\include\rapidxml\rapidxml_utils.hpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Listener">
+				<File
+					RelativePath=".\src\include\Listener\ButtonListener.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\CameraButtonListener.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\DeleteListener.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\GUDButtonListener.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\MenuButtonListener.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\ModeSelectionListener.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\RotateButtonListener.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\ToolbarListener.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\WorkspaceInstance.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="Tool">
+				<File
+					RelativePath=".\src\include\Tool\ArrowTool.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Tool\SurfaceTool.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Tool\Tool.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="DataModelV2">
+				<File
+					RelativePath=".\src\include\DataModelV2\DataModelInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\GroupInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\Instance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\LevelInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\PartInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\PVInstance.h">
+				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\WorkspaceInstance.h">
+				</File>
+				<Filter
+					Name="Gui">
+					<File
+						RelativePath=".\src\include\DataModelV2\BaseButtonInstance.h">
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV2\BaseGuiInstance.h">
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV2\GuiRootInstance.h">
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV2\ImageButtonInstance.h">
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV2\TextButtonInstance.h">
+					</File>
+					<File
+						RelativePath=".\src\include\DataModelV2\ToggleImageButtonInstance.h">
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Properties">
+				<File
+					RelativePath=".\src\include\Properties\BoolProperty.h">
+				</File>
+				<File
+					RelativePath=".\src\include\Properties\Property.h">
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			<File
+				RelativePath=".\Dialogs.rc">
+			</File>
+			<File
+				RelativePath=".\icon1.ico">
+			</File>
+			<File
+				RelativePath=".\Parts.bmp">
+			</File>
+			<File
+				RelativePath=".\roblox_RN1_icon.ico">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="Dialogs.rc"/>
+	</Globals>
+</VisualStudioProject>
--- a/Blocks3D.vcproj
+++ b/Blocks3D.vcproj
@@ -79,6 +79,7 @@
 				OutputFile="./Blocks3D.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				AdditionalManifestDependencies=""
 				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
 				SubSystem="2"
 				TargetMachine="1"
@@ -729,6 +730,10 @@
 				RelativePath=".\src\include\WindowFunctions.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\include\winver.h"
+				>
+			</File>
 			<Filter
 				Name="RapidXML"
 				>
@@ -882,12 +887,16 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
+			<File
+				RelativePath=".\B3dIcon.ico"
+				>
+			</File>
 			<File
 				RelativePath=".\Dialogs.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\icon1.ico"
+				RelativePath=".\FatB3dIcon.ico"
 				>
 			</File>
 			<File
--- a/Dialogs.aps
+++ b/Dialogs.aps
--- a/Dialogs.rc
+++ b/Dialogs.rc
@@ -1,121 +1,41 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON                    "roblox_RN1_icon.ico"
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (Canada) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENC)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BITMAP1             BITMAP                  "Parts.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DIALOG1 DIALOGEX 0, 0, 304, 46
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,247,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,247,24,50,14
-    EDITTEXT        IDC_EDIT1,68,7,162,14,ES_AUTOHSCROLL
-    LTEXT           "Class:",-1,43,7,20,8
-END
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_DIALOG1, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 297
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 39
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (Canada) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+// Generated by ResEdit 1.6.6
+// Copyright (C) 2006-2015
+// http://www.resedit.net
+
+#include <windows.h>
+#include <commctrl.h>
+#include "resource.h"
+
+
+
+
+//
+// Bitmap resources
+//
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
+IDB_BITMAP1        BITMAP         "Parts.bmp"
+
+
+
+//
+// Dialog resources
+//
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_DIALOG1 DIALOG 0, 0, 295, 43
+STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFOREGROUND | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU
+EXSTYLE WS_EX_WINDOWEDGE
+CAPTION "Insert Object"
+FONT 8, "Ms Shell Dlg"
+{
+    EDITTEXT        IDC_EDIT1, 35, 6, 195, 14, ES_AUTOHSCROLL, WS_EX_LEFT
+    LTEXT           "Class:", 0, 10, 9, 20, 9, SS_LEFT, WS_EX_LEFT
+    PUSHBUTTON      "Cancel", IDCANCEL, 237, 24, 50, 14, 0, WS_EX_LEFT
+    DEFPUSHBUTTON   "OK", IDOK, 237, 6, 50, 14, 0, WS_EX_LEFT
+}
+
+
+//
+// Icon resources
+//
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
+IDI_ICON1          ICON           "FatB3dIcon.ico"
--- a/FatB3dIcon.ico
+++ b/FatB3dIcon.ico
--- a/Installer/install_script.iss
+++ b/Installer/install_script.iss
@@ -1,9 +1,9 @@
-;InnoSetupVersion=5.5.7
+;InnoSetupVersion=5.4.3

 [Setup]
 AppName=Blocks3D
 AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
-AppVersion=v0_0_104_4
+AppVersion=v0_0_104_5
 AppPublisherURL=http://blocks3d.com/
 AppSupportURL=http://blocks3d.com/
 AppUpdatesURL=http://blocks3d.com/
@@ -40,8 +40,6 @@ Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscu
 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";
--- a/Manifest.xml
+++ b/Manifest.xml
--- a/icon1.ico
+++ b/icon1.ico
--- a/resource.h
+++ b/resource.h
--- a/src/include/DataModelV2/Instance.h
+++ b/src/include/DataModelV2/Instance.h
@@ -2,6 +2,10 @@
 #include <G3DAll.h>
 #include "propertyGrid.h"
 #include "map"
+
+#ifdef NO_SPRINTF
+#define sprintf_s sprintf
+#endif
 //#include "Properties/BoolProperty.h"

 class Instance
--- a/src/include/resource.h
+++ b/src/include/resource.h
@@ -1,7 +0,0 @@
-#define IDC_PROPERTYGRID                2000
-#define IDC_STATIC						2
-
-#define IDE_EDIT								105
-#define IDI_ICON1                               102
-#define IDB_BITMAP1                             103
-#define IDD_DIALOG1                             104
--- a/src/include/winver.h
+++ b/src/include/winver.h
@@ -0,0 +1,5 @@
+#ifndef WINVER
+#define _WIN32_WINNT 0x0400
+#define _WIN32_WINDOWS 0x0400
+#define WINVER 0x0400
+#endif
--- a/src/source/Application.cpp
+++ b/src/source/Application.cpp
@@ -1,7 +1,7 @@
 #include <G3DAll.h>
 #include <initguid.h>
 #include <iomanip>
-#include "resource.h"
+#include "../../resource.h"
 #include "DataModelV2/Instance.h"
 #include "DataModelV2/PartInstance.h"
 #include "DataModelV2/TextButtonInstance.h"
@@ -673,17 +673,18 @@ void Application::onGraphics(RenderDevice* rd) {



-	renderDevice->setShininess(70);
-	renderDevice->setSpecularCoefficient(Color3(0.1F, 0.1F, 0.1F));
+	//renderDevice->setShininess(70);
+	//renderDevice->setSpecularCoefficient(Color3(0.1F, 0.1F, 0.1F));
 	
-	//float   lightAmbient[]  = { 0.5F, 0.6F, 0.9F, 1.0F };
-    //float   lightDiffuse[]  = { 0.6F, 0.4F, 0.9F, 1.0F };
+	float   lightAmbient[]  = { 0.5F, 0.6F, 0.9F, 1.0F };
+    float   lightDiffuse[]  = { 0.6F, 0.4F, 0.9F, 1.0F };
+    float   lightSpecular[] = { 0.8F, 0.8F, 0.8F, 1.0F };
    //float   lightSpecular[] = { 0.8F, 0.6F, 1.0F, 1.0F };

-	//glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, lightAmbient);
-    //glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, lightDiffuse);
-    //glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, lightSpecular);
-	//glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 70);
+	glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, lightAmbient);
+    glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, lightDiffuse);
+    glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, lightSpecular);
+	glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 70);
 	

 	rd->beforePrimitive();
@@ -793,6 +794,11 @@ void Application::onKeyPressed(int key)
 	{
 			_dataModel->getOpen();
 	}
+	if ((GetHoldKeyState(VK_LCONTROL) || GetHoldKeyState(VK_RCONTROL)) && key=='A')
+	{
+		std::vector<Instance *> vec = _dataModel->getWorkspace()->getAllChildren();
+		g_selectedInstances.insert(g_selectedInstances.end(), vec.begin(), vec.end());
+	}
 	tool->onKeyDown(key);
 }
 void Application::onKeyUp(int key)
--- a/src/source/DataModelV2/DataModelInstance.cpp
+++ b/src/source/DataModelV2/DataModelInstance.cpp
@@ -13,6 +13,7 @@ using namespace std;
 using namespace rapidxml;


+
 DataModelInstance::DataModelInstance(void)
 {
 	Instance::Instance();
@@ -518,7 +519,6 @@ bool DataModelInstance::getOpen()
 	of.lpstrFile[0]='\0';
 	of.nMaxFile=500;
 	of.lpstrTitle="Hello";
-	of.Flags = OFN_FILEMUSTEXIST;
 	ShowCursor(TRUE);
 	BOOL file = GetOpenFileName(&of);
 	if (file)
@@ -526,6 +526,7 @@ bool DataModelInstance::getOpen()
 		_loadedFileName = of.lpstrFile;
 		load(of.lpstrFile,true);
 	}
+	//else MessageBox(NULL, "Failed to open dialog", "Failure", MB_ICONHAND | MB_OK);
 	return true;
 }
 void DataModelInstance::setMessage(std::string msg)
--- a/src/source/DataModelV2/GuiRootInstance.cpp
+++ b/src/source/DataModelV2/GuiRootInstance.cpp
@@ -184,6 +184,8 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->fontLocationRelativeTo = Vector2(10, 0);
 	button->setAllColorsSame();
 	button->boxColorOvr = Color4(0.6F,0.6F,0.6F,0.4F);
+	button->setName("insert");
+	button->setButtonListener(menuListener);

 	button = makeTextButton();
 	button->boxBegin = Vector2(500, 0);
--- a/src/source/DataModelV2/Instance.cpp
+++ b/src/source/DataModelV2/Instance.cpp
@@ -1,4 +1,3 @@
-#define WINVER	0x0400
 #include <G3DAll.h>
 #include "DataModelV2/Instance.h"

--- a/src/source/DataModelV2/PartInstance.cpp
+++ b/src/source/DataModelV2/PartInstance.cpp
@@ -279,6 +279,7 @@ void PartInstance::render(RenderDevice* rd) {
 		changed=false;
 		Vector3 renderSize = size/2;
 		glNewList(glList, GL_COMPILE);
+		//glScalef(0.5f,0.5f,0.5f);
 		renderShape(this->shape, renderSize, color);
 		renderSurface(TOP, this->top, renderSize, this->controller, color);
 		renderSurface(FRONT, this->front, renderSize, this->controller, color);
--- a/src/source/Listener/MenuButtonListener.cpp
+++ b/src/source/Listener/MenuButtonListener.cpp
@@ -2,6 +2,33 @@
 #include "DataModelV2/ToggleImageButtonInstance.h"
 #include "Application.h"
 #include "Globals.h"
+#include "../../resource.h"
+
+INT_PTR CALLBACK InsertDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
+{
+	switch(Message)
+	{
+		case WM_INITDIALOG:
+		return TRUE;
+		break;
+		case WM_COMMAND:
+			switch(LOWORD(wParam))
+			{
+				case IDOK:
+					//g_dataModel->setMessage("lol u thought");
+					EndDialog(hwnd, IDOK);
+				break;
+				case IDCANCEL:
+					EndDialog(hwnd, IDCANCEL);
+				break;
+			}
+		break;
+		default:
+			return FALSE;
+	}
+	return TRUE;
+}
+
 void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
 	if(button->name == "go")
@@ -20,4 +47,11 @@ void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 		GetCursorPos(&p);
 		TrackPopupMenu(mainmenu, TPM_LEFTBUTTON, p.x, p.y, 0, Globals::mainHwnd, 0);
 	}
-}
+	else if(button->name == "insert")
+	{
+		//HWND aDiag = CreateDialog((HINSTANCE) GetWindowLong(Globals::mainHwnd, GWL_HINSTANCE), MAKEINTRESOURCE(IDD_DIALOG1), Globals::mainHwnd, (DLGPROC)InsertDlgProc);
+		HWND aDiag2 = CreateDialog((HINSTANCE) GetWindowLong(Globals::mainHwnd, GWL_HINSTANCE), MAKEINTRESOURCE(IDD_DIALOG2), Globals::mainHwnd, (DLGPROC)InsertDlgProc);
+	}
+}
+
+
--- a/src/source/PropertyWindow.cpp
+++ b/src/source/PropertyWindow.cpp
@@ -1,7 +1,7 @@
 #define _WINSOCKAPI_
 #include <windows.h>
 #include "WindowFunctions.h"
-#include "resource.h"
+#include "../../resource.h"
 #include "PropertyWindow.h"
 #include "Globals.h"
 #include "strsafe.h"
--- a/src/source/Tool/ArrowTool.cpp
+++ b/src/source/Tool/ArrowTool.cpp
@@ -69,6 +69,30 @@ void ArrowTool::onKeyDown(int key)
 	{
 		lctrlDown = true;
 	}
+	else if(key == 'R')
+	{
+		if(g_selectedInstances.size() > 0)
+		{
+			Instance* selectedInstance = g_selectedInstances.at(0);
+			AudioPlayer::playSound(clickSound);
+			if(PartInstance* part = dynamic_cast<PartInstance*>(selectedInstance))
+			{
+				part->setCFrame(part->getCFrame()*Matrix3::fromEulerAnglesXYZ(0,toRadians(90),0));
+			}
+		}
+	}
+	else if(key == 'T')
+	{
+		if(g_selectedInstances.size() > 0)
+		{
+			Instance* selectedInstance = g_selectedInstances.at(0);
+			AudioPlayer::playSound(clickSound);
+			if(PartInstance* part = dynamic_cast<PartInstance*>(selectedInstance))
+			{
+				part->setCFrame(part->getCFrame()*Matrix3::fromEulerAnglesXYZ(0,0,toRadians(90)));
+			}
+		}
+	}
 }

 void ArrowTool::onKeyUp(int key)
--- a/src/source/main.cpp
+++ b/src/source/main.cpp
@@ -1,10 +1,6 @@
 // TODO: Move toolbar buttons with resized window.
-#define _WIN32_WINNT 0x0400
-#define _WIN32_WINDOWS 0x0400
-#define WINVER 0x0400
-#define _CRTBLD
-
-#include "resource.h"
+#include "winver.h"
+#include "../../resource.h"
 #include "Application.h"
 #include "WindowFunctions.h"
 #include "ax.h"
@@ -148,7 +144,12 @@ LRESULT CALLBACK G3DProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)


 int main(int argc, char** argv) {
+
+	long double a = 1;
+
+#ifndef IGNORE_CATCH
 	try{
+#endif
 		hresult = OleInitialize(NULL);

 /*		IInternetSecurityManager *pSecurityMgr;
@@ -173,7 +174,7 @@ int main(int argc, char** argv) {

 		icc.dwSize = sizeof(icc);
 		icc.dwICC = ICC_WIN95_CLASSES/*|ICC_COOL_CLASSES|ICC_DATE_CLASSES|
-					   ICC_PAGESCROLLER_CLASS|ICC_USEREX_CLASSES*/;
+		//			   ICC_PAGESCROLLER_CLASS|ICC_USEREX_CLASSES*/;
 		InitCommonControlsEx(&icc);

 		AudioPlayer::init();
@@ -214,10 +215,12 @@ int main(int argc, char** argv) {
 		Globals::mainHwnd = hwndMain;
 		Application app = Application(hwndMain);
 		app.run();	
+	#ifndef IGNORE_CATCH
 	}
 	catch(...)
 	{
 		OnError(-1);
 	}
+	#endif
    return 0;
 }
--- a/src/source/propertyGrid.cpp
+++ b/src/source/propertyGrid.cpp
@@ -31,13 +31,12 @@

 //DWM 1.9: Suppress POCC Warning "Argument x to 'sscanf' does not match the format string;
 //          expected 'unsigned char *' but found 'unsigned long'"
+#include "winver.h"
+
 #ifdef __POCC__
 #pragma warn(disable:2234)
 #endif

-#ifndef _WIN32_WINNT // Necessary for WM_MOUSEWHEEL support
-#define _WIN32_WINNT 0x0400
-#endif

 // MSVC++ Support
 #ifndef _CRT_SECURE_NO_WARNINGS
Author	SHA1	Message	Date
FlareMicrosystems	e50d2674ff	Added insert items dialog function	2022-10-01 11:25:07 -07:00
Vulpovile	550962f1e6	Merge pull request #54 from Vulpovile/DataModelV2 Data model v2	2022-09-30 15:24:44 -07:00
FlareMicrosystems	c86fb57710	Removed Pro Requirement	2022-09-30 15:22:10 -07:00
Vulpovile	daacf6ae02	Icons	2021-08-17 13:28:59 -07:00
Vulpovile	066e955933	Added select all	2021-03-21 01:08:18 -07:00
Vulpovile	bba534be3c	Fixes	2021-03-20 21:58:41 -07:00
Vulpovile	e473d0eb7e	Removed old icon, made Dialogs.rc correct	2021-03-20 21:50:14 -07:00
Vulpovile	aab26d2e35	Finally got VS2005 to shut the hell up	2021-03-20 21:38:44 -07:00
Vulpovile	b9305d1fb9	Replaced resource.h because the old one was a disaster	2021-03-20 21:25:54 -07:00
Vulpovile	f9c4700e7d	Removed redefinition from resources.h. We should take a look at that file because it is insane	2021-03-20 21:14:11 -07:00
Vulpovile	239f7b8fa8	Tried to add VS2003 support...	2021-03-18 23:22:37 -07:00