#5532: Setup empty MaterialPreview class

codereader · Mar 5, 2021 · 244ad4e · 244ad4e
1 parent 1c35296
commit 244ad4e
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 3 deletions.
diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
@@ -105,6 +105,7 @@ add_executable(darkradiant
                ui/mapselector/MapSelector.cpp
                ui/materials/MaterialEditor.cpp
                ui/materials/MaterialEditorModule.cpp
+               ui/materials/MaterialPreview.cpp
                ui/animationpreview/AnimationPreview.cpp
                ui/animationpreview/MD5AnimationChooser.cpp
                ui/animationpreview/MD5AnimationViewer.cpp

diff --git a/radiant/ui/materials/MaterialEditor.cpp b/radiant/ui/materials/MaterialEditor.cpp
@@ -82,7 +82,7 @@ MaterialEditor::MaterialEditor() :
 
     // Set up the preview
     auto* previewPanel = getControl<wxPanel>("MaterialEditorPreviewPanel");
-    _preview.reset(new wxutil::ModelPreview(previewPanel));
+    _preview.reset(new MaterialPreview(previewPanel));
 
     _sourceView = new wxutil::D3MaterialSourceViewCtrl(previewPanel);
 
@@ -486,6 +486,8 @@ void MaterialEditor::_onStageListSelectionChanged(wxDataViewEvent& ev)
 
 void MaterialEditor::updateControlsFromMaterial()
 {
+    _preview->setMaterial(_material);
+
     updateMaterialPropertiesFromMaterial();
     updateStageListFromMaterial();
 }

diff --git a/radiant/ui/materials/MaterialEditor.h b/radiant/ui/materials/MaterialEditor.h
@@ -7,7 +7,7 @@
 #include "wxutil/WindowPosition.h"
 #include "wxutil/PanedPosition.h"
 #include "wxutil/XmlResourceBasedWidget.h"
-#include "wxutil/preview/ModelPreview.h"
+#include "MaterialPreview.h"
 #include "wxutil/SourceView.h"
 
 #include "ui/common/MaterialTreeView.h"
@@ -29,7 +29,7 @@ class MaterialEditor :
     wxutil::WindowPosition _windowPosition;
     wxutil::PanedPosition _panedPosition;
 
-    std::shared_ptr<wxutil::ModelPreview> _preview;
+    std::unique_ptr<MaterialPreview> _preview;
     wxutil::D3MaterialSourceViewCtrl* _sourceView;
 
     MaterialPtr _material;

diff --git a/radiant/ui/materials/MaterialPreview.cpp b/radiant/ui/materials/MaterialPreview.cpp
@@ -0,0 +1,20 @@
+#include "MaterialPreview.h"
+
+namespace ui
+{
+
+MaterialPreview::MaterialPreview(wxWindow* parent) :
+    RenderPreview(parent, true)
+{}
+
+const MaterialPtr& MaterialPreview::getMaterial()
+{
+    return _material;
+}
+
+void MaterialPreview::setMaterial(const MaterialPtr& material)
+{
+    _material = material;
+}
+
+}
diff --git a/radiant/ui/materials/MaterialPreview.h b/radiant/ui/materials/MaterialPreview.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "ishaders.h"
+#include "wxutil/preview/RenderPreview.h"
+
+namespace ui
+{
+
+class MaterialPreview :
+    public wxutil::RenderPreview
+{
+private:
+    MaterialPtr _material;
+
+public:
+    MaterialPreview(wxWindow* parent);
+
+    const MaterialPtr& getMaterial();
+    void setMaterial(const MaterialPtr& material);
+};
+
+}
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -267,6 +267,7 @@
     <ClCompile Include="..\..\radiant\ui\mapselector\MapSelector.cpp" />
     <ClCompile Include="..\..\radiant\ui\materials\MaterialEditor.cpp" />
     <ClCompile Include="..\..\radiant\ui\materials\MaterialEditorModule.cpp" />
+    <ClCompile Include="..\..\radiant\ui\materials\MaterialPreview.cpp" />
     <ClCompile Include="..\..\radiant\ui\mediabrowser\MediaBrowserTreeView.cpp" />
     <ClCompile Include="..\..\radiant\ui\menu\MenuBar.cpp" />
     <ClCompile Include="..\..\radiant\ui\menu\MenuElement.cpp" />
@@ -461,6 +462,7 @@
     <ClInclude Include="..\..\radiant\ui\materials\Binding.h" />
     <ClInclude Include="..\..\radiant\ui\materials\ExpressionBinding.h" />
     <ClInclude Include="..\..\radiant\ui\materials\MaterialEditor.h" />
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialPreview.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
@@ -703,6 +703,9 @@
     <ClCompile Include="..\..\radiant\ui\common\MaterialPopulator.cpp">
       <Filter>src\ui\common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\materials\MaterialPreview.cpp">
+      <Filter>src\ui\materials</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\camera\CameraSettings.h">
@@ -1347,6 +1350,9 @@
     <ClInclude Include="..\..\radiant\ui\materials\ExpressionBinding.h">
       <Filter>src\ui\materials</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\materials\MaterialPreview.h">
+      <Filter>src\ui\materials</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />