Project updates and compilation fixes

codereader · Jul 23, 2024 · 9dd3233 · 9dd3233
1 parent a537863
commit 9dd3233
Show file tree

Hide file tree

Showing 11 changed files with 209 additions and 189 deletions.
diff --git a/DarkRadiant.sln b/DarkRadiant.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29613.14
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34728.123
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DarkRadiant", "tools\msvc\DarkRadiant.vcxproj", "{8E70385C-223A-4DD1-9B99-28FF2331A2B5}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -19,26 +19,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlutillib", "tools\msvc\xm
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxutillib", "tools\msvc\wxutillib.vcxproj", "{B6D4B38A-0C39-42CD-8193-75979E1F4D68}"
 	ProjectSection(ProjectDependencies) = postProject
-		{F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385}
 		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
+		{3C9FB5AA-7118-476E-B33D-D3AC1C8412BB} = {3C9FB5AA-7118-476E-B33D-D3AC1C8412BB}
+		{F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "tools\msvc\sound.vcxproj", "{1482AAB4-40B6-44C0-9FD8-AF80C18A5E7F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68}
 		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
+		{B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.stimresponse", "tools\msvc\dm.stimresponse.vcxproj", "{EE9A3B61-58E0-4AA4-8942-6CFCBFAACC3F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68}
 		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
+		{B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.objectives", "tools\msvc\dm.objectives.vcxproj", "{05E9A613-2108-4843-A567-16B432DAC272}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68}
 		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
+		{B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.difficulty", "tools\msvc\dm.difficulty.vcxproj", "{68B95079-09DF-48F7-BAD9-81C33118BEFD}"
@@ -59,8 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "include", "tools\msvc\inclu
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.conversation", "tools\msvc\dm.conversation.vcxproj", "{435F29EA-7236-49AD-BF1A-5DB8AD566B5D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2}
 		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
+		{A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "script", "tools\msvc\script.vcxproj", "{979A38FE-BE30-4121-845C-B705461BB1B0}"
@@ -91,11 +92,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main Binary and Headers", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DarkRadiantCore", "tools\msvc\DarkRadiantCore.vcxproj", "{83D79C71-4E8F-4F78-9D46-EF02D5D5CD89}"
 	ProjectSection(ProjectDependencies) = postProject
-		{76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215} = {76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215}
-		{F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385}
-		{A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2}
 		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
 		{3C9FB5AA-7118-476E-B33D-D3AC1C8412BB} = {3C9FB5AA-7118-476E-B33D-D3AC1C8412BB}
+		{76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215} = {76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215}
+		{A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2}
+		{F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modulelib", "tools\msvc\modulelib.vcxproj", "{76FF9B0F-B1FF-42BF-9E1D-8FBE2B3F6215}"
@@ -105,24 +106,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modulelib", "tools\msvc\mod
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "tools\msvc\Tests\Tests.vcxproj", "{20C43725-BD6F-4E90-8D8C-5AB2AFFBF957}"
 	ProjectSection(ProjectDependencies) = postProject
-		{83D79C71-4E8F-4F78-9D46-EF02D5D5CD89} = {83D79C71-4E8F-4F78-9D46-EF02D5D5CD89}
 		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
+		{83D79C71-4E8F-4F78-9D46-EF02D5D5CD89} = {83D79C71-4E8F-4F78-9D46-EF02D5D5CD89}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dm.gameconnection", "tools\msvc\dm.gameconnection.vcxproj", "{471AEAFE-68CE-4010-9B8F-3CB95810BEA5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385}
-		{B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68}
 		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
+		{B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68}
+		{F7408B46-E4A9-470C-9731-9A1564247385} = {F7408B46-E4A9-470C-9731-9A1564247385}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DependencyCheck", "tools\DependencyCheck\DependencyCheck.vcxproj", "{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcs", "tools\msvc\vcs.vcxproj", "{6591C1E2-6BCF-4874-B724-CC87B8AA0DA4}"
 	ProjectSection(ProjectDependencies) = postProject
+		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
 		{A15EFB56-927F-411D-A57B-0328321456A2} = {A15EFB56-927F-411D-A57B-0328321456A2}
 		{B6D4B38A-0C39-42CD-8193-75979E1F4D68} = {B6D4B38A-0C39-42CD-8193-75979E1F4D68}
-		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
 	EndProjectSection
 EndProject
 Global

diff --git a/include/ishaderlayer.h b/include/ishaderlayer.h
@@ -479,6 +479,8 @@ inline std::ostream& operator<< (std::ostream& os, IShaderLayer::VertexColourMod
         return os << "vertexColor";
     case IShaderLayer::VERTEX_COLOUR_INVERSE_MULTIPLY:
         return os << "inverseVertexColor";
+    default:
+        return os;
     }
 }
 
@@ -493,6 +495,8 @@ inline std::ostream& operator<< (std::ostream& os, IShaderLayer::Type type)
         return os << "specularmap";
     case IShaderLayer::BLEND:
         return os << "blend";
+    default:
+        return os;
     }
 }
 

diff --git a/test/Skin.cpp b/test/Skin.cpp
@@ -692,15 +692,15 @@ void expectModelDefHasMeshAndSkin(const std::string& modelDef, const std::string
     EXPECT_EQ(model->getSkin(), expectedSkin) << "Expected skin to be " << expectedSkin << " on modelDef " << modelDef;
 }
 
-IEntityNodePtr createStaticEntityWithModel(const std::string& model)
+EntityNodePtr createStaticEntityWithModel(const std::string& model)
 {
     auto funcStaticClass = GlobalEntityClassManager().findClass("func_static");
     auto entity = GlobalEntityModule().createEntity(funcStaticClass);
     entity->getEntity().setKeyValue("model", model);
     return entity;
 }
 
-SkinnedModel::Ptr getSkinnedModel(const IEntityNodePtr& entity)
+SkinnedModel::Ptr getSkinnedModel(const EntityNodePtr& entity)
 {
     SkinnedModel::Ptr foundModelNode;
 
@@ -719,7 +719,7 @@ SkinnedModel::Ptr getSkinnedModel(const IEntityNodePtr& entity)
     return foundModelNode;
 }
 
-void expectEntityHasSkinnedModel(const IEntityNodePtr& entity, const std::string& expectedSkin, const std::vector<std::string>& expectedMaterials)
+void expectEntityHasSkinnedModel(const EntityNodePtr& entity, const std::string& expectedSkin, const std::vector<std::string>& expectedMaterials)
 {
     // Check the skinned model node beneath it
     auto foundModelNode = getSkinnedModel(entity);
@@ -746,7 +746,7 @@ void expectEntityClassHasSkinnedModel(const std::string& eclassName, const std::
     expectEntityHasSkinnedModel(entity, expectedSkin, expectedMaterials);
 }
 
-void setSkinKeyAndCheckModel(const IEntityNodePtr& entity, const std::string& expectedSkin, const std::vector<std::string>& expectedMaterials)
+void setSkinKeyAndCheckModel(const EntityNodePtr& entity, const std::string& expectedSkin, const std::vector<std::string>& expectedMaterials)
 {
     // Save the data to do a before/after test
     auto model = getSkinnedModel(entity);

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -578,7 +578,6 @@
     <ClInclude Include="..\..\radiant\ui\script\ScriptWindow.h" />
     <ClInclude Include="..\..\radiant\ui\SelectionModeToggle.h" />
     <ClInclude Include="..\..\radiant\ui\selectionset\SelectionSetToolmenu.h" />
-    <ClInclude Include="..\..\radiant\ui\skin\MaterialSelectorColumn.h" />
     <ClInclude Include="..\..\radiant\ui\skin\SkinEditor.h" />
     <ClInclude Include="..\..\radiant\ui\skin\SkinEditorTreeView.h" />
     <ClInclude Include="..\..\radiant\ui\statusbar\CommandStatus.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -1443,9 +1443,6 @@
     <ClInclude Include="..\..\radiant\ui\skin\SkinEditorTreeView.h">
       <Filter>src\ui\skin</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\skin\MaterialSelectorColumn.h">
-      <Filter>src\ui\skin</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\xyview\OrthoView.h">
       <Filter>src\xyview</Filter>
     </ClInclude>

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -45,38 +45,22 @@
     <ClCompile Include="..\..\radiantcore\eclass\EClassManager.cpp" />
     <ClCompile Include="..\..\radiantcore\eclass\EntityClass.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\AngleKey.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\AttachmentData.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\curve\Curve.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\curve\CurveCatmullRom.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\curve\CurveEditInstance.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\curve\CurveNURBS.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\doom3group\StaticGeometryNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\eclassmodel\EclassModelNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\EntityModule.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\EntityNode.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\EntitySettings.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\generic\GenericEntityNode.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\KeyValue.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\KeyValueObserver.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\light\LightNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\light\Renderables.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\ModelKey.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\NameKeyObserver.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\NamespaceManager.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\RenderableArrow.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\RenderableEntityBox.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\RenderableEntityName.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\RotationKey.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\RotationMatrix.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\ShaderParms.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\SpawnArgs.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\speaker\SpeakerNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\speaker\SpeakerRenderables.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\target\TargetableNode.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\target\TargetKey.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\target\TargetKeyCollection.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\target\TargetLineNode.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\target\TargetManager.cpp" />
     <ClCompile Include="..\..\radiantcore\filetypes\FileTypeRegistry.cpp" />
     <ClCompile Include="..\..\radiantcore\filters\BasicFilterSystem.cpp" />
     <ClCompile Include="..\..\radiantcore\filters\XMLFilter.cpp" />
@@ -776,8 +760,6 @@
     <ClInclude Include="..\..\radiantcore\eclass\EntityClass.h" />
     <ClInclude Include="..\..\radiantcore\entity\algorithm\Speaker.h" />
     <ClInclude Include="..\..\radiantcore\entity\AngleKey.h" />
-    <ClInclude Include="..\..\radiantcore\entity\AttachmentData.h" />
-    <ClInclude Include="..\..\radiantcore\entity\ColourKey.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\Curve.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\CurveCatmullRom.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\CurveControlPointFunctors.h" />
@@ -789,40 +771,18 @@
     <ClInclude Include="..\..\radiantcore\entity\doom3group\StaticGeometryNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\eclassmodel\EclassModelNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\EntityModule.h" />
-    <ClInclude Include="..\..\radiantcore\entity\EntityNode.h" />
-    <ClInclude Include="..\..\radiantcore\entity\EntitySettings.h" />
     <ClInclude Include="..\..\radiantcore\entity\generic\GenericEntityNode.h" />
-    <ClInclude Include="..\..\radiantcore\entity\KeyObserverDelegate.h" />
-    <ClInclude Include="..\..\radiantcore\entity\KeyObserverMap.h" />
-    <ClInclude Include="..\..\radiantcore\entity\KeyValue.h" />
-    <ClInclude Include="..\..\radiantcore\entity\KeyValueObserver.h" />
     <ClInclude Include="..\..\radiantcore\entity\light\Doom3LightRadius.h" />
     <ClInclude Include="..\..\radiantcore\entity\light\LightNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\light\LightShader.h" />
     <ClInclude Include="..\..\radiantcore\entity\light\Renderables.h" />
     <ClInclude Include="..\..\radiantcore\entity\light\LightVertexInstanceSet.h" />
-    <ClInclude Include="..\..\radiantcore\entity\ModelKey.h" />
-    <ClInclude Include="..\..\radiantcore\entity\NameKey.h" />
-    <ClInclude Include="..\..\radiantcore\entity\NameKeyObserver.h" />
-    <ClInclude Include="..\..\radiantcore\entity\NamespaceManager.h" />
-    <ClInclude Include="..\..\radiantcore\entity\OriginKey.h" />
     <ClInclude Include="..\..\radiantcore\entity\RenderableArrow.h" />
     <ClInclude Include="..\..\radiantcore\entity\RenderableEntityBox.h" />
-    <ClInclude Include="..\..\radiantcore\entity\RenderableEntityName.h" />
-    <ClInclude Include="..\..\radiantcore\entity\RenderableObjectCollection.h" />
     <ClInclude Include="..\..\radiantcore\entity\RotationKey.h" />
     <ClInclude Include="..\..\radiantcore\entity\RotationMatrix.h" />
-    <ClInclude Include="..\..\radiantcore\entity\ShaderParms.h" />
-    <ClInclude Include="..\..\radiantcore\entity\SpawnArgs.h" />
     <ClInclude Include="..\..\radiantcore\entity\speaker\SpeakerNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\speaker\SpeakerRenderables.h" />
-    <ClInclude Include="..\..\radiantcore\entity\target\RenderableTargetLines.h" />
-    <ClInclude Include="..\..\radiantcore\entity\target\Target.h" />
-    <ClInclude Include="..\..\radiantcore\entity\target\TargetableNode.h" />
-    <ClInclude Include="..\..\radiantcore\entity\target\TargetKey.h" />
-    <ClInclude Include="..\..\radiantcore\entity\target\TargetKeyCollection.h" />
-    <ClInclude Include="..\..\radiantcore\entity\target\TargetLineNode.h" />
-    <ClInclude Include="..\..\radiantcore\entity\target\TargetManager.h" />
     <ClInclude Include="..\..\radiantcore\entity\VertexInstance.h" />
     <ClInclude Include="..\..\radiantcore\filetypes\FileTypeRegistry.h" />
     <ClInclude Include="..\..\radiantcore\filters\BasicFilterSystem.h" />