Changed to using a desriptor for the displacementMapScale.

vsg-dev · Jan 9, 2025 · 565b539 · 565b539
1 parent 72e5c30
commit 565b539
Show file tree

Hide file tree

Showing 5 changed files with 45,765 additions and 45,731 deletions.
diff --git a/include/vsg/io/tile.h b/include/vsg/io/tile.h
@@ -14,6 +14,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 #include <vsg/io/ReaderWriter.h>
 #include <vsg/nodes/TileDatabase.h>
+#include <vsg/nodes/VertexIndexDraw.h>
 #include <vsg/state/GraphicsPipeline.h>
 #include <vsg/utils/GraphicsPipelineConfigurator.h>
 #include <vsg/utils/ShaderSet.h>
@@ -52,7 +53,7 @@ namespace vsg
         ref_ptr<Object> read_root(ref_ptr<const Options> options = {}) const;
         ref_ptr<Object> read_subtile(uint32_t x, uint32_t y, uint32_t lod, ref_ptr<const Options> options = {}) const;
 
-        ref_ptr<BindDescriptorSet> createBindDescriptorSet(ref_ptr<Data> imageData, ref_ptr<Data> detailData, ref_ptr<Data> elevationData, Origin& origin) const;
+        ref_ptr<BindDescriptorSet> createBindDescriptorSet(ref_ptr<Data> imageData, ref_ptr<Data> detailData, ref_ptr<Data> elevationData, Origin& origin, const vec3& displacementMapScale) const;
 
         ref_ptr<Node> createTile(const dbox& tile_extents, ref_ptr<Data> imageData, ref_ptr<Data> detailData, ref_ptr<Data> elevationData) const;
         ref_ptr<Node> createECEFTile(const dbox& tile_extents, ref_ptr<Data> imageData, ref_ptr<Data> detailData, ref_ptr<Data> elevationData) const;
@@ -69,6 +70,9 @@ namespace vsg
         ref_ptr<DescriptorImage> _imageFallback;
         ref_ptr<DescriptorImage> _detailFallback;
         ref_ptr<DescriptorImage> _elevationFallback;
+
+        mutable std::mutex _geometryMapMutex;
+        mutable std::map<dvec4, ref_ptr<VertexIndexDraw>> _geometryMap;
     };
     VSG_type_name(vsg::tile);