From ac3730cebae2d863c86a8ef50d4455de0173d47c Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Mon, 21 Oct 2024 18:49:46 -0700 Subject: [PATCH] build error --- .../render-utils/src/AmbientOcclusionStage.cpp | 3 ++- libraries/render-utils/src/BackgroundStage.cpp | 3 ++- libraries/render-utils/src/BloomStage.cpp | 3 ++- libraries/render-utils/src/HazeStage.cpp | 3 ++- libraries/render-utils/src/LightStage.cpp | 7 ++++--- libraries/render-utils/src/TonemappingStage.cpp | 3 ++- libraries/render/src/render/HighlightStage.cpp | 3 ++- libraries/render/src/render/Stage.h | 13 ++++--------- libraries/render/src/render/TransitionStage.cpp | 3 ++- 9 files changed, 22 insertions(+), 19 deletions(-) diff --git a/libraries/render-utils/src/AmbientOcclusionStage.cpp b/libraries/render-utils/src/AmbientOcclusionStage.cpp index a65bcf8260..55fa290ab7 100644 --- 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::_name { "AMBIENT_OCCLUSION_STAGE" }; diff --git a/libraries/render-utils/src/BackgroundStage.cpp b/libraries/render-utils/src/BackgroundStage.cpp index 4f837e7a2f..f3f287bdac 100644 --- a/libraries/render-utils/src/BackgroundStage.cpp +++ b/libraries/render-utils/src/BackgroundStage.cpp @@ -15,7 +15,8 @@ #include -std::string BackgroundStage::_name { "BACKGROUND_STAGE" }; +template <> +std::string render::PointerStage::_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 index 9cca02b5ad..23ec4596bd 100644 --- 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::_name { "BLOOM_STAGE" }; diff --git a/libraries/render-utils/src/HazeStage.cpp b/libraries/render-utils/src/HazeStage.cpp index b204e905d0..49ed7a1ea4 100644 --- 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::_name { "HAZE_STAGE" }; diff --git a/libraries/render-utils/src/LightStage.cpp b/libraries/render-utils/src/LightStage.cpp index c16dd8d1d3..395ca15487 100644 --- 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::_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 index e44f8b3501..1bb382b77d 100644 --- 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::_name { "TONEMAPPING_STAGE" }; diff --git a/libraries/render/src/render/HighlightStage.cpp b/libraries/render/src/render/HighlightStage.cpp index 1c35233e74..07fb5b5635 100644 --- 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::_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 index f2a1e10b36..2bb81771e5 100644 --- 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; - - Elements _elements; + indexed_container::IndexedVector _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; - using ElementMap = std::unordered_map; - - Elements _elements; - ElementMap _elementMap; + indexed_container::IndexedPointerVector _elements; + std::unordered_map _elementMap; }; } diff --git a/libraries/render/src/render/TransitionStage.cpp b/libraries/render/src/render/TransitionStage.cpp index 6c0daf5953..72637cc3d9 100644 --- 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::_name { "TRANSITION_STAGE" }; TransitionStage::Index TransitionStage::addTransition(ItemID itemId, Transition::Type type, ItemID boundId) { Transition transition;