Added support for detail and elevation layers to vsg::TileDatabase

CMakeLists.txt

@@ -164,20 +164,26 @@ set(PBR_DEFINES
     -v "VSG_DIFFUSE_MAP VSG_LIGHTMAP_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP VSG_WORKFLOW_SPECGLOSS"
     -v "VSG_DIFFUSE_MAP VSG_EMISSIVE_MAP VSG_LIGHTMAP_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP VSG_TWO_SIDED_LIGHTING"
     -v "VSG_DIFFUSE_MAP VSG_EMISSIVE_MAP VSG_LIGHTMAP_MAP VSG_NORMAL_MAP VSG_SPECULAR_MAP VSG_WORKFLOW_SPECGLOSS"
+    -v "VSG_DISPLACEMENT_MAP VSG_DIFFUSE_MAP"
+    -v "VSG_DISPLACEMENT_MAP VSG_DETAIL_MAP VSG_DIFFUSE_MAP"
 )
 
 set(PHONG_DEFINES
     -v \"\"
     -v "VSG_BILLBOARD"
     -v "VSG_DIFFUSE_MAP"
     -v "VSG_BILLBOARD VSG_DIFFUSE_MAP"
+    -v "VSG_DISPLACEMENT_MAP VSG_DIFFUSE_MAP"
+    -v "VSG_DISPLACEMENT_MAP VSG_DETAIL_MAP VSG_DIFFUSE_MAP"
 )
 
 set(FLAT_DEFINES
     -v \"\"
     -v "VSG_BILLBOARD"
     -v "VSG_DIFFUSE_MAP"
     -v "VSG_BILLBOARD VSG_DIFFUSE_MAP"
+    -v "VSG_DISPLACEMENT_MAP VSG_DIFFUSE_MAP"
+    -v "VSG_DISPLACEMENT_MAP VSG_DETAIL_MAP VSG_DIFFUSE_MAP"
 )
 
 set(TEXT_DEFINES

include/vsg/core/ConstVisitor.h

@@ -265,8 +265,11 @@ namespace vsg
         virtual void apply(const block128Array&);
 
         // Array2Ds
+        virtual void apply(const byteArray2D&);
         virtual void apply(const ubyteArray2D&);
+        virtual void apply(const shortArray2D&);
         virtual void apply(const ushortArray2D&);
+        virtual void apply(const intArray2D&);
         virtual void apply(const uintArray2D&);
         virtual void apply(const floatArray2D&);
         virtual void apply(const doubleArray2D&);
@@ -298,8 +301,11 @@ namespace vsg
         virtual void apply(const block128Array2D&);
 
         // Array3Ds
+        virtual void apply(const byteArray3D&);
         virtual void apply(const ubyteArray3D&);
+        virtual void apply(const shortArray3D&);
         virtual void apply(const ushortArray3D&);
+        virtual void apply(const intArray3D&);
         virtual void apply(const uintArray3D&);
         virtual void apply(const floatArray3D&);
         virtual void apply(const doubleArray3D&);

include/vsg/core/Visitor.h

@@ -265,8 +265,11 @@ namespace vsg
         virtual void apply(block128Array&);
 
         // Array2Ds
+        virtual void apply(byteArray2D&);
         virtual void apply(ubyteArray2D&);
+        virtual void apply(shortArray2D&);
         virtual void apply(ushortArray2D&);
+        virtual void apply(intArray2D&);
         virtual void apply(uintArray2D&);
         virtual void apply(floatArray2D&);
         virtual void apply(doubleArray2D&);
@@ -298,8 +301,11 @@ namespace vsg
         virtual void apply(block128Array2D&);
 
         // Array3Ds
+        virtual void apply(byteArray3D&);
         virtual void apply(ubyteArray3D&);
+        virtual void apply(shortArray3D&);
         virtual void apply(ushortArray3D&);
+        virtual void apply(intArray3D&);
         virtual void apply(uintArray3D&);
         virtual void apply(floatArray3D&);
         virtual void apply(doubleArray3D&);

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,9 +53,11 @@ 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<Node> createTile(const dbox& tile_extents, ref_ptr<Data> sourceData) const;
-        ref_ptr<Node> createECEFTile(const dbox& tile_extents, ref_ptr<Data> sourceData) const;
-        ref_ptr<Node> createTextureQuad(const dbox& tile_extents, ref_ptr<Data> sourceData) 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;
+        ref_ptr<Node> createTextureQuad(const dbox& tile_extents, ref_ptr<Data> imageData, ref_ptr<Data> detailData, ref_ptr<Data> elevationData) const;
 
         ref_ptr<StateGroup> createRoot() const;
 
@@ -63,6 +66,13 @@ namespace vsg
         uint32_t _materialSetIndex = 1;
         ref_ptr<Sampler> _sampler;
         ref_ptr<DescriptorBuffer> _material;
+
+        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);
 

include/vsg/nodes/TileDatabase.h

@@ -41,8 +41,21 @@ namespace vsg
         std::string projection;
         ref_ptr<EllipsoidModel> ellipsoidModel = EllipsoidModel::create();
 
+        // callback for post processing loading image, detail or terrain layers data after the source data is loaded.
+        using ProcessCallback = std::function<ref_ptr<Data>(ref_ptr<Data>)>;
+
         Path imageLayer;
-        Path terrainLayer;
+        ProcessCallback imageLayerCallback;
+
+        Path detailLayer;
+        ProcessCallback detailLayerCallback;
+
+        Path elevationLayer;
+        ProcessCallback elevationLayerCallback;
+        double elevationScale = 32868.0;
+        double skirtRatio = 0.02;
+        uint32_t maxTileDimension = 1024;
+
         uint32_t mipmapLevelsHint = 16;
 
         /// hint of whether to use flat shaded shaders or with lighting enabled.

src/vsg/core/ConstVisitor.cpp

@@ -327,14 +327,26 @@ void ConstVisitor::apply(const block128Array& value)
 //
 // Array2Ds
 //
+void ConstVisitor::apply(const byteArray2D& value)
+{
+    apply(static_cast<const Data&>(value));
+}
 void ConstVisitor::apply(const ubyteArray2D& value)
 {
     apply(static_cast<const Data&>(value));
 }
+void ConstVisitor::apply(const shortArray2D& value)
+{
+    apply(static_cast<const Data&>(value));
+}
 void ConstVisitor::apply(const ushortArray2D& value)
 {
     apply(static_cast<const Data&>(value));
 }
+void ConstVisitor::apply(const intArray2D& value)
+{
+    apply(static_cast<const Data&>(value));
+}
 void ConstVisitor::apply(const uintArray2D& value)
 {
     apply(static_cast<const Data&>(value));
@@ -456,14 +468,26 @@ void ConstVisitor::apply(const block128Array2D& value)
 //
 // Array3Ds
 //
+void ConstVisitor::apply(const byteArray3D& value)
+{
+    apply(static_cast<const Data&>(value));
+}
 void ConstVisitor::apply(const ubyteArray3D& value)
 {
     apply(static_cast<const Data&>(value));
 }
+void ConstVisitor::apply(const shortArray3D& value)
+{
+    apply(static_cast<const Data&>(value));
+}
 void ConstVisitor::apply(const ushortArray3D& value)
 {
     apply(static_cast<const Data&>(value));
 }
+void ConstVisitor::apply(const intArray3D& value)
+{
+    apply(static_cast<const Data&>(value));
+}
 void ConstVisitor::apply(const uintArray3D& value)
 {
     apply(static_cast<const Data&>(value));

src/vsg/core/Visitor.cpp

@@ -327,14 +327,26 @@ void Visitor::apply(block128Array& value)
 //
 // Array2Ds
 //
+void Visitor::apply(byteArray2D& value)
+{
+    apply(static_cast<Data&>(value));
+}
 void Visitor::apply(ubyteArray2D& value)
 {
     apply(static_cast<Data&>(value));
 }
+void Visitor::apply(shortArray2D& value)
+{
+    apply(static_cast<Data&>(value));
+}
 void Visitor::apply(ushortArray2D& value)
 {
     apply(static_cast<Data&>(value));
 }
+void Visitor::apply(intArray2D& value)
+{
+    apply(static_cast<Data&>(value));
+}
 void Visitor::apply(uintArray2D& value)
 {
     apply(static_cast<Data&>(value));
@@ -456,14 +468,26 @@ void Visitor::apply(block128Array2D& value)
 //
 // Array3Ds
 //
+void Visitor::apply(byteArray3D& value)
+{
+    apply(static_cast<Data&>(value));
+}
 void Visitor::apply(ubyteArray3D& value)
 {
     apply(static_cast<Data&>(value));
 }
+void Visitor::apply(shortArray3D& value)
+{
+    apply(static_cast<Data&>(value));
+}
 void Visitor::apply(ushortArray3D& value)
 {
     apply(static_cast<Data&>(value));
 }
+void Visitor::apply(intArray3D& value)
+{
+    apply(static_cast<Data&>(value));
+}
 void Visitor::apply(uintArray3D& value)
 {
     apply(static_cast<Data&>(value));