#5565: Move material editor sources to ui/materials/editor/

codereader · Mar 25, 2021 · 40eaabd · 40eaabd
1 parent a2d2d72
commit 40eaabd
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 50 deletions.
diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
@@ -103,9 +103,9 @@ add_executable(darkradiant
                ui/mainframe/TopLevelFrame.cpp
                ui/mapselector/MapSelector.cpp
                ui/materials/MaterialDefinitionView.cpp
-               ui/materials/MaterialEditor.cpp
-               ui/materials/MaterialEditorModule.cpp
-               ui/materials/MaterialPreview.cpp
+               ui/materials/editor/MaterialEditor.cpp
+               ui/materials/editor/MaterialEditorModule.cpp
+               ui/materials/editor/MaterialPreview.cpp
                ui/materials/MaterialPopulator.cpp
                ui/materials/MaterialTreeView.cpp
                ui/animationpreview/AnimationPreview.cpp

diff --git a/radiant/ui/materials/Binding.h → radiant/ui/materials/editor/Binding.h b/radiant/ui/materials/Binding.h → radiant/ui/materials/editor/Binding.h
diff --git a/radiant/ui/materials/CheckBoxBinding.h → ...ant/ui/materials/editor/CheckBoxBinding.h b/radiant/ui/materials/CheckBoxBinding.h → ...ant/ui/materials/editor/CheckBoxBinding.h
diff --git a/radiant/ui/materials/ExpressionBinding.h → ...t/ui/materials/editor/ExpressionBinding.h b/radiant/ui/materials/ExpressionBinding.h → ...t/ui/materials/editor/ExpressionBinding.h
diff --git a/radiant/ui/materials/MapExpressionEntry.h → .../ui/materials/editor/MapExpressionEntry.h b/radiant/ui/materials/MapExpressionEntry.h → .../ui/materials/editor/MapExpressionEntry.h
diff --git a/radiant/ui/materials/MaterialEditor.cpp → ...nt/ui/materials/editor/MaterialEditor.cpp b/radiant/ui/materials/MaterialEditor.cpp → ...nt/ui/materials/editor/MaterialEditor.cpp
diff --git a/radiant/ui/materials/MaterialEditor.h → radiant/ui/materials/editor/MaterialEditor.h b/radiant/ui/materials/MaterialEditor.h → radiant/ui/materials/editor/MaterialEditor.h
@@ -10,7 +10,7 @@
 #include "MaterialPreview.h"
 #include "wxutil/SourceView.h"
 
-#include "MaterialTreeView.h"
+#include "../MaterialTreeView.h"
 #include "Binding.h"
 
 namespace ui

diff --git a/...ant/ui/materials/MaterialEditorModule.cpp → ...materials/editor/MaterialEditorModule.cpp b/...ant/ui/materials/MaterialEditorModule.cpp → ...materials/editor/MaterialEditorModule.cpp
diff --git a/radiant/ui/materials/MaterialPreview.cpp → ...t/ui/materials/editor/MaterialPreview.cpp b/radiant/ui/materials/MaterialPreview.cpp → ...t/ui/materials/editor/MaterialPreview.cpp
diff --git a/radiant/ui/materials/MaterialPreview.h → ...ant/ui/materials/editor/MaterialPreview.h b/radiant/ui/materials/MaterialPreview.h → ...ant/ui/materials/editor/MaterialPreview.h
diff --git a/radiant/ui/materials/RadioButtonBinding.h → .../ui/materials/editor/RadioButtonBinding.h b/radiant/ui/materials/RadioButtonBinding.h → .../ui/materials/editor/RadioButtonBinding.h
diff --git a/radiant/ui/materials/SpinCtrlBinding.h → ...ant/ui/materials/editor/SpinCtrlBinding.h b/radiant/ui/materials/SpinCtrlBinding.h → ...ant/ui/materials/editor/SpinCtrlBinding.h
diff --git a/radiant/ui/materials/TestModelSkin.h → radiant/ui/materials/editor/TestModelSkin.h b/radiant/ui/materials/TestModelSkin.h → radiant/ui/materials/editor/TestModelSkin.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -264,11 +264,11 @@
     <ClCompile Include="..\..\radiant\ui\MapFileProgressHandler.cpp" />
     <ClCompile Include="..\..\radiant\ui\mapinfo\LayerInfoTab.cpp" />
     <ClCompile Include="..\..\radiant\ui\mapselector\MapSelector.cpp" />
+    <ClCompile Include="..\..\radiant\ui\materials\editor\MaterialEditor.cpp" />
+    <ClCompile Include="..\..\radiant\ui\materials\editor\MaterialEditorModule.cpp" />
+    <ClCompile Include="..\..\radiant\ui\materials\editor\MaterialPreview.cpp" />
     <ClCompile Include="..\..\radiant\ui\materials\MaterialDefinitionView.cpp" />
-    <ClCompile Include="..\..\radiant\ui\materials\MaterialEditor.cpp" />
-    <ClCompile Include="..\..\radiant\ui\materials\MaterialEditorModule.cpp" />
     <ClCompile Include="..\..\radiant\ui\materials\MaterialPopulator.cpp" />
-    <ClCompile Include="..\..\radiant\ui\materials\MaterialPreview.cpp" />
     <ClCompile Include="..\..\radiant\ui\materials\MaterialTreeView.cpp" />
     <ClCompile Include="..\..\radiant\ui\mediabrowser\MediaBrowserTreeView.cpp" />
     <ClCompile Include="..\..\radiant\ui\menu\MenuBar.cpp" />
@@ -460,18 +460,18 @@
     <ClInclude Include="..\..\radiant\ui\MapFileProgressHandler.h" />
     <ClInclude Include="..\..\radiant\ui\mapinfo\LayerInfoTab.h" />
     <ClInclude Include="..\..\radiant\ui\mapselector\MapSelector.h" />
-    <ClInclude Include="..\..\radiant\ui\materials\Binding.h" />
-    <ClInclude Include="..\..\radiant\ui\materials\CheckBoxBinding.h" />
-    <ClInclude Include="..\..\radiant\ui\materials\ExpressionBinding.h" />
-    <ClInclude Include="..\..\radiant\ui\materials\MapExpressionEntry.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\editor\Binding.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\editor\CheckBoxBinding.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\editor\ExpressionBinding.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\editor\MapExpressionEntry.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\editor\MaterialEditor.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\editor\MaterialPreview.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\editor\RadioButtonBinding.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\editor\SpinCtrlBinding.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\editor\TestModelSkin.h" />
     <ClInclude Include="..\..\radiant\ui\materials\MaterialDefinitionView.h" />
-    <ClInclude Include="..\..\radiant\ui\materials\MaterialEditor.h" />
     <ClInclude Include="..\..\radiant\ui\materials\MaterialPopulator.h" />
-    <ClInclude Include="..\..\radiant\ui\materials\MaterialPreview.h" />
     <ClInclude Include="..\..\radiant\ui\materials\MaterialTreeView.h" />
-    <ClInclude Include="..\..\radiant\ui\materials\RadioButtonBinding.h" />
-    <ClInclude Include="..\..\radiant\ui\materials\SpinCtrlBinding.h" />
-    <ClInclude Include="..\..\radiant\ui\materials\TestModelSkin.h" />
     <ClInclude Include="..\..\radiant\ui\mediabrowser\MediaBrowserTreeView.h" />
     <ClInclude Include="..\..\radiant\ui\menu\MenuBar.h" />
     <ClInclude Include="..\..\radiant\ui\menu\MenuElement.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -182,6 +182,9 @@
     <Filter Include="src\ui\materials">
       <UniqueIdentifier>{d855833c-6204-4825-ba61-c4e143ba50ce}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\ui\materials\editor">
+      <UniqueIdentifier>{d374722a-7ea0-4a6e-9954-69e32a7cbec8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiant\main.cpp">
@@ -688,15 +691,6 @@
     <ClCompile Include="..\..\radiant\ui\mainframe\AuiLayout.cpp">
       <Filter>src\ui\mainframe</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\materials\MaterialEditorModule.cpp">
-      <Filter>src\ui\materials</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\materials\MaterialEditor.cpp">
-      <Filter>src\ui\materials</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\materials\MaterialPreview.cpp">
-      <Filter>src\ui\materials</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\common\ImageFileSelector.cpp">
       <Filter>src\ui\common</Filter>
     </ClCompile>
@@ -712,6 +706,15 @@
     <ClCompile Include="..\..\radiant\ui\materials\MaterialTreeView.cpp">
       <Filter>src\ui\materials</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\materials\editor\MaterialEditor.cpp">
+      <Filter>src\ui\materials\editor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\materials\editor\MaterialEditorModule.cpp">
+      <Filter>src\ui\materials\editor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\materials\editor\MaterialPreview.cpp">
+      <Filter>src\ui\materials\editor</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\camera\CameraSettings.h">
@@ -1338,47 +1341,47 @@
     <ClInclude Include="..\..\radiant\ui\mainframe\AuiLayout.h">
       <Filter>src\ui\mainframe</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\MaterialEditor.h">
-      <Filter>src\ui\materials</Filter>
+    <ClInclude Include="..\..\radiant\ui\common\ImageFileSelector.h">
+      <Filter>src\ui\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\Binding.h">
-      <Filter>src\ui\materials</Filter>
+    <ClInclude Include="..\..\radiant\ui\common\ImageFilePopulator.h">
+      <Filter>src\ui\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\ExpressionBinding.h">
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialDefinitionView.h">
       <Filter>src\ui\materials</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\MaterialPreview.h">
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialPopulator.h">
       <Filter>src\ui\materials</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\TestModelSkin.h">
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialTreeView.h">
       <Filter>src\ui\materials</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\RadioButtonBinding.h">
-      <Filter>src\ui\materials</Filter>
+    <ClInclude Include="..\..\radiant\ui\materials\editor\Binding.h">
+      <Filter>src\ui\materials\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\SpinCtrlBinding.h">
-      <Filter>src\ui\materials</Filter>
+    <ClInclude Include="..\..\radiant\ui\materials\editor\CheckBoxBinding.h">
+      <Filter>src\ui\materials\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\CheckBoxBinding.h">
-      <Filter>src\ui\materials</Filter>
+    <ClInclude Include="..\..\radiant\ui\materials\editor\ExpressionBinding.h">
+      <Filter>src\ui\materials\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\common\ImageFileSelector.h">
-      <Filter>src\ui\common</Filter>
+    <ClInclude Include="..\..\radiant\ui\materials\editor\MapExpressionEntry.h">
+      <Filter>src\ui\materials\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\MapExpressionEntry.h">
-      <Filter>src\ui\materials</Filter>
+    <ClInclude Include="..\..\radiant\ui\materials\editor\MaterialEditor.h">
+      <Filter>src\ui\materials\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\common\ImageFilePopulator.h">
-      <Filter>src\ui\common</Filter>
+    <ClInclude Include="..\..\radiant\ui\materials\editor\MaterialPreview.h">
+      <Filter>src\ui\materials\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\MaterialDefinitionView.h">
-      <Filter>src\ui\materials</Filter>
+    <ClInclude Include="..\..\radiant\ui\materials\editor\RadioButtonBinding.h">
+      <Filter>src\ui\materials\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\MaterialPopulator.h">
-      <Filter>src\ui\materials</Filter>
+    <ClInclude Include="..\..\radiant\ui\materials\editor\SpinCtrlBinding.h">
+      <Filter>src\ui\materials\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\materials\MaterialTreeView.h">
-      <Filter>src\ui\materials</Filter>
+    <ClInclude Include="..\..\radiant\ui\materials\editor\TestModelSkin.h">
+      <Filter>src\ui\materials\editor</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>