build error

overte-org · Oct 22, 2024 · ac3730c · ac3730c
1 parent 049a11a
commit ac3730c
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 19 deletions.
diff --git a/libraries/render-utils/src/AmbientOcclusionStage.cpp b/libraries/render-utils/src/AmbientOcclusionStage.cpp
@@ -10,4 +10,5 @@
 
 #include "AmbientOcclusionStage.h"
 
-std::string AmbientOcclusionStage::_name { "AMBIENT_OCCLUSION_STAGE" };
+template <>
+std::string render::PointerStage<graphics::AmbientOcclusion, graphics::AmbientOcclusionPointer>::_name { "AMBIENT_OCCLUSION_STAGE" };
diff --git a/libraries/render-utils/src/BackgroundStage.cpp b/libraries/render-utils/src/BackgroundStage.cpp
@@ -15,7 +15,8 @@
 
 #include <graphics/ShaderConstants.h>
 
-std::string BackgroundStage::_name { "BACKGROUND_STAGE" };
+template <>
+std::string render::PointerStage<graphics::SunSkyStage, graphics::SunSkyStagePointer>::_name { "BACKGROUND_STAGE" };
 
 void DrawBackgroundStage::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) {
     const auto& lightingModel = inputs.get0();

diff --git a/libraries/render-utils/src/BloomStage.cpp b/libraries/render-utils/src/BloomStage.cpp
@@ -11,4 +11,5 @@
 
 #include "BloomStage.h"
 
-std::string BloomStage::_name { "BLOOM_STAGE" };
+template <>
+std::string render::PointerStage<graphics::Bloom, graphics::BloomPointer>::_name { "BLOOM_STAGE" };
diff --git a/libraries/render-utils/src/HazeStage.cpp b/libraries/render-utils/src/HazeStage.cpp
@@ -11,4 +11,5 @@
 
 #include "HazeStage.h"
 
-std::string HazeStage::_name { "HAZE_STAGE" };
+template <>
+std::string render::PointerStage<graphics::Haze, graphics::HazePointer>::_name { "HAZE_STAGE" };
diff --git a/libraries/render-utils/src/LightStage.cpp b/libraries/render-utils/src/LightStage.cpp
@@ -16,7 +16,8 @@
 
 #include "ViewFrustum.h"
 
-std::string LightStage::_name { "LIGHT_STAGE" };
+template <>
+std::string render::PointerStage<graphics::Light, graphics::LightPointer, LightFrame>::_name { "LIGHT_STAGE" };
 
 // The bias matrix goes from homogeneous coordinates to UV coords (see http://www.opengl-tutorial.org/intermediate-tutorials/tutorial-16-shadow-mapping/#basic-shader)
 const glm::mat4 LightStage::Shadow::_biasMatrix {
@@ -340,8 +341,8 @@ LightStage::Index LightStage::addElement(const LightPointer& light, const bool s
                 _descs[lightId] = Desc();
             }
 
-            // INsert the light and its index in the reverese map
-            _elementMap.insert(ElementMap::value_type(light, lightId));
+            // Insert the light and its index in the reverese map
+            _elementMap[light] = lightId;
 
             updateLightArrayBuffer(lightId);
         }

diff --git a/libraries/render-utils/src/TonemappingStage.cpp b/libraries/render-utils/src/TonemappingStage.cpp
@@ -10,4 +10,5 @@
 
 #include "TonemappingStage.h"
 
-std::string TonemappingStage::_name { "TONEMAPPING_STAGE" };
+template <>
+std::string render::PointerStage<graphics::Tonemapping, graphics::TonemappingPointer>::_name { "TONEMAPPING_STAGE" };
diff --git a/libraries/render/src/render/HighlightStage.cpp b/libraries/render/src/render/HighlightStage.cpp
@@ -15,7 +15,8 @@
 
 using namespace render;
 
-std::string HighlightStage::_name { "HIGHLIGHT_STAGE" };
+template <>
+std::string TypedStage<Highlight>::_name { "HIGHLIGHT_STAGE" };
 
 HighlightStage::Index HighlightStage::addHighlight(const std::string& selectionName, const HighlightStyle& style) {
     Highlight outline { selectionName, style };

diff --git a/libraries/render/src/render/Stage.h b/libraries/render/src/render/Stage.h
@@ -73,9 +73,7 @@ namespace render {
     protected:
         static Name _name;
 
-        using Elements = indexed_container::IndexedVector<T>;
-
-        Elements _elements;
+        indexed_container::IndexedVector<T> _elements;
         IDList _activeElementIDs;
     };
 
@@ -123,7 +121,7 @@ namespace render {
                 // Avoid failing to allocate an element, just pass
                 if (id != INVALID_INDEX) {
                     // Insert the element and its index in the reverse map
-                    _elementMap.insert(ElementMap::value_type(element, id));
+                    _elementMap[element] = id;
                 }
                 return id;
             } else {
@@ -147,11 +145,8 @@ namespace render {
     protected:
         static Name _name;
 
-        using Elements = indexed_container::IndexedPointerVector<T>;
-        using ElementMap = std::unordered_map<P, Index>;
-
-        Elements _elements;
-        ElementMap _elementMap;
+        indexed_container::IndexedPointerVector<T> _elements;
+        std::unordered_map<P, Index> _elementMap;
     };
 }
 

diff --git a/libraries/render/src/render/TransitionStage.cpp b/libraries/render/src/render/TransitionStage.cpp
@@ -13,7 +13,8 @@
 
 using namespace render;
 
-std::string TransitionStage::_name { "TRANSITION_STAGE" };
+template <>
+std::string TypedStage<Transition>::_name { "TRANSITION_STAGE" };
 
 TransitionStage::Index TransitionStage::addTransition(ItemID itemId, Transition::Type type, ItemID boundId) {
     Transition transition;