#5584: Rename RenderableStaticSurface to RenderableModelSurface

codereader · Jan 16, 2022 · 7118ec6 · 7118ec6
1 parent 6df202a
commit 7118ec6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/radiantcore/model/RenderableStaticSurface.h → radiantcore/model/RenderableModelSurface.h b/radiantcore/model/RenderableStaticSurface.h → radiantcore/model/RenderableModelSurface.h
@@ -6,27 +6,27 @@
 namespace model
 {
 
-// Wraps a StaticModelSurface to implement the IRenderableSurface interface
-// required to draw an oriented mesh in the scene.
-class RenderableStaticSurface final :
+// Wraps an IIndexedModelSurface to implement the IRenderableSurface interface
+// required to draw a composite mesh in the scene.
+class RenderableModelSurface final :
     public render::RenderableSurface
 {
 private:
     const IIndexedModelSurface& _surface;
     const Matrix4& _localToWorld;
 
 public:
-    using Ptr = std::shared_ptr<RenderableStaticSurface>;
+    using Ptr = std::shared_ptr<RenderableModelSurface>;
 
     // Construct this renderable around the existing surface.
     // The reference to the orientation matrix is stored and needs to remain valid
-    RenderableStaticSurface(const IIndexedModelSurface& surface, const Matrix4& localToWorld) :
+    RenderableModelSurface(const IIndexedModelSurface& surface, const Matrix4& localToWorld) :
         _surface(surface),
         _localToWorld(localToWorld)
     {}
 
-    RenderableStaticSurface(const RenderableStaticSurface& other) = delete;
-    RenderableStaticSurface& operator=(const RenderableStaticSurface& other) = delete;
+    RenderableModelSurface(const RenderableModelSurface& other) = delete;
+    RenderableModelSurface& operator=(const RenderableModelSurface& other) = delete;
 
     const IIndexedModelSurface& getSurface() const
     {

diff --git a/radiantcore/model/StaticModelNode.cpp b/radiantcore/model/StaticModelNode.cpp
@@ -30,7 +30,7 @@ void StaticModelNode::onInsertIntoScene(scene::IMapRootNode& root)
     // Renderables will acquire their shaders in onPreRender
     _model->foreachSurface([&](const StaticModelSurface& surface)
     {
-        _renderableSurfaces.emplace_back(std::make_shared<RenderableStaticSurface>(surface, localToWorld()));
+        _renderableSurfaces.emplace_back(std::make_shared<RenderableModelSurface>(surface, localToWorld()));
     });
 
     Node::onInsertIntoScene(root);

diff --git a/radiantcore/model/StaticModelNode.h b/radiantcore/model/StaticModelNode.h
@@ -10,7 +10,7 @@
 #include "render/VectorLightList.h"
 #include "StaticModel.h"
 #include "scene/Node.h"
-#include "RenderableStaticSurface.h"
+#include "RenderableModelSurface.h"
 
 namespace model
 {
@@ -42,7 +42,7 @@ class StaticModelNode final :
 	std::string _skin;
 
     // The renderable surfaces attached to the shaders
-    std::vector<RenderableStaticSurface::Ptr> _renderableSurfaces;
+    std::vector<RenderableModelSurface::Ptr> _renderableSurfaces;
 
     // We need to keep a reference for skin swapping
     RenderSystemWeakPtr _renderSystem;

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -931,7 +931,7 @@
     <ClInclude Include="..\..\radiantcore\model\picomodel\lib\pm_fm.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\PicoModelLoader.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\PicoModelModule.h" />
-    <ClInclude Include="..\..\radiantcore\model\RenderableStaticSurface.h" />
+    <ClInclude Include="..\..\radiantcore\model\RenderableModelSurface.h" />
     <ClInclude Include="..\..\radiantcore\model\StaticModel.h" />
     <ClInclude Include="..\..\radiantcore\model\StaticModelNode.h" />
     <ClInclude Include="..\..\radiantcore\model\StaticModelSurface.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -2274,7 +2274,7 @@
     <ClInclude Include="..\..\radiantcore\brush\RenderableBrushVertices.h">
       <Filter>src\brush</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\model\RenderableStaticSurface.h">
+    <ClInclude Include="..\..\radiantcore\model\RenderableModelSurface.h">
       <Filter>src\model</Filter>
     </ClInclude>
   </ItemGroup>