Merge pull request #337 from vsg-dev/MultiLayerTileDatabase

Added tests for vsg::TileDatabase detail and elevation layers

Author: robertosfield

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.7)
 
 project(vsgExamples
-        VERSION 1.1.7
+        VERSION 1.1.8
         DESCRIPTION "Set of example programs that test and illustrate how to use the VulkanSceneGraph"
         LANGUAGES CXX C
 )

data/shaders/standard.vert

@@ -11,15 +11,18 @@ layout(push_constant) uniform PushConstants {
     mat4 modelView;
 } pc;
 
-#ifdef VSG_DISPLACEMENT_MAP
-layout(set = MATERIAL_DESCRIPTOR_SET, binding = 6) uniform sampler2D displacementMap;
-#endif
-
 layout(location = 0) in vec3 vsg_Vertex;
 layout(location = 1) in vec3 vsg_Normal;
 layout(location = 2) in vec2 vsg_TexCoord0;
 layout(location = 3) in vec4 vsg_Color;
 
+#ifdef VSG_DISPLACEMENT_MAP
+layout(set = MATERIAL_DESCRIPTOR_SET, binding = 7) uniform sampler2D displacementMap;
+layout(set = MATERIAL_DESCRIPTOR_SET, binding = 8) uniform DisplacementMapScale
+{
+    vec3 value;
+} displacementMapScale;
+#endif
 
 #ifdef VSG_BILLBOARD
 layout(location = 4) in vec4 vsg_position_scaleDistance;
@@ -71,8 +74,11 @@ void main()
     vec4 normal = vec4(vsg_Normal, 0.0);
 
 #ifdef VSG_DISPLACEMENT_MAP
-    // TODO need to pass as as uniform or per instance attributes
+#if 0
     vec3 scale = vec3(1.0, 1.0, 1.0);
+#else
+    vec3 scale = displacementMapScale.value;
+#endif
 
     vertex.xyz = vertex.xyz + vsg_Normal * (texture(displacementMap, vsg_TexCoord0.st).s * scale.z);
 

data/shaders/standard_flat_shaded.frag

@@ -1,6 +1,6 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
-#pragma import_defines (VSG_POINT_SPRITE, VSG_DIFFUSE_MAP, VSG_GREYSCALE_DIFFUSE_MAP, VSG_ALPHA_TEST)
+#pragma import_defines (VSG_POINT_SPRITE, VSG_DIFFUSE_MAP, VSG_GREYSCALE_DIFFUSE_MAP, VSG_DETAIL_MAP, VSG_ALPHA_TEST)
 
 #define VIEW_DESCRIPTOR_SET 0
 #define MATERIAL_DESCRIPTOR_SET 1
@@ -9,6 +9,10 @@
 layout(set = MATERIAL_DESCRIPTOR_SET, binding = 0) uniform sampler2D diffuseMap;
 #endif
 
+#ifdef VSG_DETAIL_MAP
+layout(set = MATERIAL_DESCRIPTOR_SET, binding = 1) uniform sampler2D detailMap;
+#endif
+
 layout(set = MATERIAL_DESCRIPTOR_SET, binding = 10) uniform MaterialData
 {
     vec4 ambientColor;
@@ -44,6 +48,12 @@ void main()
     #endif
 #endif
 
+#ifdef VSG_DETAIL_MAP
+    vec4 detailColor = texture(detailMap, texCoord0.st);
+    diffuseColor.rgb = mix(diffuseColor.rgb, detailColor.rgb, detailColor.a);
+#endif
+
+
 #ifdef VSG_ALPHA_TEST
     if (material.alphaMask == 1.0f && diffuseColor.a < material.alphaMaskCutoff) discard;
 #endif

data/shaders/standard_pbr.frag

@@ -1,6 +1,6 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
-#pragma import_defines (VSG_DIFFUSE_MAP, VSG_GREYSCALE_DIFFUSE_MAP, VSG_EMISSIVE_MAP, VSG_LIGHTMAP_MAP, VSG_NORMAL_MAP, VSG_METALLROUGHNESS_MAP, VSG_SPECULAR_MAP, VSG_TWO_SIDED_LIGHTING, VSG_WORKFLOW_SPECGLOSS, VSG_SHADOWS_PCSS, VSG_SHADOWS_SOFT, VSG_SHADOWS_HARD, SHADOWMAP_DEBUG, VSG_ALPHA_TEST)
+#pragma import_defines (VSG_DIFFUSE_MAP, VSG_GREYSCALE_DIFFUSE_MAP, VSG_DETAIL_MAP, VSG_EMISSIVE_MAP, VSG_LIGHTMAP_MAP, VSG_NORMAL_MAP, VSG_METALLROUGHNESS_MAP, VSG_SPECULAR_MAP, VSG_TWO_SIDED_LIGHTING, VSG_WORKFLOW_SPECGLOSS, VSG_SHADOWS_PCSS, VSG_SHADOWS_SOFT, VSG_SHADOWS_HARD, SHADOWMAP_DEBUG, VSG_ALPHA_TEST)
 
 // define by default for backwards compatibility
 #define VSG_SHADOWS_HARD
@@ -18,8 +18,8 @@ const float c_MinRoughness = 0.04;
 layout(set = MATERIAL_DESCRIPTOR_SET, binding = 0) uniform sampler2D diffuseMap;
 #endif
 
-#ifdef VSG_METALLROUGHNESS_MAP
-layout(set = MATERIAL_DESCRIPTOR_SET, binding = 1) uniform sampler2D mrMap;
+#ifdef VSG_DETAIL_MAP
+layout(set = MATERIAL_DESCRIPTOR_SET, binding = 1) uniform sampler2D detailMap;
 #endif
 
 #ifdef VSG_NORMAL_MAP
@@ -38,6 +38,10 @@ layout(set = MATERIAL_DESCRIPTOR_SET, binding = 4) uniform sampler2D emissiveMap
 layout(set = MATERIAL_DESCRIPTOR_SET, binding = 5) uniform sampler2D specularMap;
 #endif
 
+#ifdef VSG_METALLROUGHNESS_MAP
+layout(set = MATERIAL_DESCRIPTOR_SET, binding = 6) uniform sampler2D mrMap;
+#endif
+
 layout(set = MATERIAL_DESCRIPTOR_SET, binding = 10) uniform PbrData
 {
     vec4 baseColorFactor;
@@ -335,6 +339,13 @@ void main()
     baseColor = vertexColor * pbr.baseColorFactor;
 #endif
 
+
+#ifdef VSG_DETAIL_MAP
+    vec4 detailColor = texture(detailMap, texCoord0.st);
+    baseColor.rgb = mix(baseColor.rgb, detailColor.rgb, detailColor.a);
+#endif
+
+
 #ifdef VSG_ALPHA_TEST
     if (pbr.alphaMask == 1.0f && baseColor.a < pbr.alphaMaskCutoff) discard;
 #endif

data/shaders/standard_phong.frag

@@ -1,6 +1,6 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
-#pragma import_defines (VSG_POINT_SPRITE, VSG_DIFFUSE_MAP, VSG_GREYSCALE_DIFFUSE_MAP, VSG_EMISSIVE_MAP, VSG_LIGHTMAP_MAP, VSG_NORMAL_MAP, VSG_SPECULAR_MAP, VSG_TWO_SIDED_LIGHTING, VSG_SHADOWS_PCSS, VSG_SHADOWS_SOFT, VSG_SHADOWS_HARD, SHADOWMAP_DEBUG, VSG_ALPHA_TEST)
+#pragma import_defines (VSG_POINT_SPRITE, VSG_DIFFUSE_MAP, VSG_GREYSCALE_DIFFUSE_MAP, VSG_DETAIL_MAP, VSG_EMISSIVE_MAP, VSG_LIGHTMAP_MAP, VSG_NORMAL_MAP, VSG_SPECULAR_MAP, VSG_TWO_SIDED_LIGHTING, VSG_SHADOWS_PCSS, VSG_SHADOWS_SOFT, VSG_SHADOWS_HARD, SHADOWMAP_DEBUG, VSG_ALPHA_TEST)
 
 // define by default for backwards compatibility
 #define VSG_SHADOWS_HARD
@@ -14,6 +14,10 @@ const float PI = radians(180);
 layout(set = MATERIAL_DESCRIPTOR_SET, binding = 0) uniform sampler2D diffuseMap;
 #endif
 
+#ifdef VSG_DETAIL_MAP
+layout(set = MATERIAL_DESCRIPTOR_SET, binding = 1) uniform sampler2D detailMap;
+#endif
+
 #ifdef VSG_NORMAL_MAP
 layout(set = MATERIAL_DESCRIPTOR_SET, binding = 2) uniform sampler2D normalMap;
 #endif
@@ -131,6 +135,11 @@ void main()
     #endif
 #endif
 
+#ifdef VSG_DETAIL_MAP
+    vec4 detailColor = texture(detailMap, texCoord0.st);
+    diffuseColor.rgb = mix(diffuseColor.rgb, detailColor.rgb, detailColor.a);
+#endif
+
     vec4 ambientColor = diffuseColor * material.ambientColor * material.ambientColor.a;
     vec4 specularColor = material.specularColor;
     vec4 emissiveColor = material.emissiveColor;

examples/app/vsgaxes/vsgaxes.cpp

@@ -9,26 +9,28 @@
 
 // A rotation tracking view matrix. It returns the rotation component
 // of another viewMatrix.
-class RotationTrackingMatrix : public vsg::Inherit<vsg::ViewMatrix, RotationTrackingMatrix> {
-    public:
+class RotationTrackingMatrix : public vsg::Inherit<vsg::ViewMatrix, RotationTrackingMatrix>
+{
+public:
     RotationTrackingMatrix(vsg::ref_ptr<vsg::ViewMatrix> parentTransform) :
         parentTransform_(parentTransform) {}
-      
+
     // The transform() returns the rotation part of the tracked matrix
-    vsg::dmat4 transform(const vsg::dvec3&) const override {
+    vsg::dmat4 transform(const vsg::dvec3&) const override
+    {
 
         vsg::dvec3 translation, scale;
-        vsg::dquat rotation; 
+        vsg::dquat rotation;
         vsg::decompose(parentTransform_->transform(),
                        // output
                        translation,
                        rotation,
                        scale);
-  
+
         return vsg::rotate(rotation);
     }
-  
-    private:
+
+private:
     vsg::ref_ptr<vsg::ViewMatrix> parentTransform_;
 };
 
@@ -42,29 +44,29 @@ vsg::ref_ptr<vsg::Node> createArrow(vsg::vec3 pos, vsg::vec3 dir, vsg::vec4 colo
     vsg::GeometryInfo geomInfo;
     vsg::StateInfo stateInfo;
 
-    geomInfo.color = vsg::vec4{1,1,1,1};
+    geomInfo.color = vsg::vec4{1, 1, 1, 1};
     geomInfo.position = pos;
     geomInfo.transform = vsg::translate(0.0f, 0.0f, 0.5f);
 
     // If we don't point in the z-direction, then rotate the arrow
-    if (vsg::length(vsg::cross(vsg::vec3{0,0,1}, dir)) > 0.0001)
+    if (vsg::length(vsg::cross(vsg::vec3{0, 0, 1}, dir)) > 0.0001)
     {
-        vsg::vec3 axis = vsg::cross(vsg::vec3{0,0,1}, dir);
-        float angle = acos(vsg::dot(vsg::vec3{0,0,1}, dir));
+        vsg::vec3 axis = vsg::cross(vsg::vec3{0, 0, 1}, dir);
+        float angle = acos(vsg::dot(vsg::vec3{0, 0, 1}, dir));
         geomInfo.transform = vsg::rotate(angle, axis) * geomInfo.transform;
     }
 
     auto axisTransform = geomInfo.transform;
     geomInfo.transform = geomInfo.transform * vsg::scale(0.1f, 0.1f, 1.0f);
-    
+
     // Rotate geomInfo from pos in the direction of dir
     auto node = builder.createCylinder(geomInfo, stateInfo);
     arrow->addChild(node);
 
     // The cone
     geomInfo.color = color;
     // This would have been cleaner with a pre_translate transform
-    geomInfo.transform = vsg::scale(0.3f, 0.3f, 0.3f) * axisTransform * vsg::translate(0.0f, 0.0f, 1.0f/0.3f);
+    geomInfo.transform = vsg::scale(0.3f, 0.3f, 0.3f) * axisTransform * vsg::translate(0.0f, 0.0f, 1.0f / 0.3f);
     node = builder.createCone(geomInfo, stateInfo);
     arrow->addChild(node);
 
@@ -76,14 +78,14 @@ vsg::ref_ptr<vsg::Node> createGizmo()
 {
     vsg::ref_ptr<vsg::Group> gizmo = vsg::Group::create();
 
-    gizmo->addChild(createArrow(vsg::vec3{0,0,0}, vsg::vec3{1,0,0}, vsg::vec4{1,0,0,1}));
-    gizmo->addChild(createArrow(vsg::vec3{0,0,0}, vsg::vec3{0,1,0}, vsg::vec4{0,1,0,1}));
-    gizmo->addChild(createArrow(vsg::vec3{0,0,0}, vsg::vec3{0,0,1}, vsg::vec4{0,0,1,1}));
+    gizmo->addChild(createArrow(vsg::vec3{0, 0, 0}, vsg::vec3{1, 0, 0}, vsg::vec4{1, 0, 0, 1}));
+    gizmo->addChild(createArrow(vsg::vec3{0, 0, 0}, vsg::vec3{0, 1, 0}, vsg::vec4{0, 1, 0, 1}));
+    gizmo->addChild(createArrow(vsg::vec3{0, 0, 0}, vsg::vec3{0, 0, 1}, vsg::vec4{0, 0, 1, 1}));
 
     vsg::Builder builder;
     vsg::GeometryInfo geomInfo;
     vsg::StateInfo stateInfo;
-    geomInfo.color = vsg::vec4{1,1,1,1};
+    geomInfo.color = vsg::vec4{1, 1, 1, 1};
     geomInfo.transform = vsg::scale(0.1f, 0.1f, 0.1f);
 
     auto sphere = builder.createSphere(geomInfo, stateInfo);
@@ -95,7 +97,7 @@ vsg::ref_ptr<vsg::Node> createGizmo()
 // Create a tracking overlay with a axes view that shows the orientation
 // of the main camera view matrix
 vsg::ref_ptr<vsg::View> createAxesView(vsg::ref_ptr<vsg::Camera> camera,
-                                        double aspectRatio)
+                                       double aspectRatio)
 {
     auto viewMat = RotationTrackingMatrix::create(camera->viewMatrix);
 
@@ -104,14 +106,14 @@ vsg::ref_ptr<vsg::View> createAxesView(vsg::ref_ptr<vsg::Camera> camera,
     double camWidth = 10;
     double camXOffs = -8;
     double camYOffs = -8;
-    auto ortho = vsg::Orthographic::create(camXOffs,camXOffs+camWidth,  // left, right
-                                           camYOffs/aspectRatio,(camYOffs+camWidth)/aspectRatio, // bottom, top
-                                           -1000,1000); // near, far
+    auto ortho = vsg::Orthographic::create(camXOffs, camXOffs + camWidth,                               // left, right
+                                           camYOffs / aspectRatio, (camYOffs + camWidth) / aspectRatio, // bottom, top
+                                           -1000, 1000);                                                // near, far
 
     auto gizmoCamera = vsg::Camera::create(
-      ortho,
-      viewMat,
-      camera->viewportState);
+        ortho,
+        viewMat,
+        camera->viewportState);
 
     auto scene = vsg::Group::create();
     scene->addChild(createGizmo());
@@ -194,7 +196,7 @@ int main(int argc, char** argv)
 
     uint32_t width = window->extent2D().width;
     uint32_t height = window->extent2D().height;
-    double aspectRatio = (double)width/height;
+    double aspectRatio = (double)width / height;
 
     auto renderGraph = vsg::RenderGraph::create(window);
 

examples/app/vsgmultigpu/vsgmultigpu.cpp

@@ -323,11 +323,11 @@ int main(int argc, char** argv)
     else if (affinity)
     {
         std::cout << "vsg::setAffinity(";
-        for(auto cpu_num : affinity.cpus)
+        for (auto cpu_num : affinity.cpus)
         {
-            std::cout<<" "<<cpu_num;
+            std::cout << " " << cpu_num;
         }
-        std::cout<<" )"<< std::endl;
+        std::cout << " )" << std::endl;
 
         vsg::setAffinity(affinity);
     }

examples/app/vsgviewer/vsgviewer.cpp

@@ -180,7 +180,6 @@ int main(int argc, char** argv)
             affinity.cpus.insert(cpu);
         }
 
-
         // should animations be automatically played
         auto autoPlay = !arguments.read({"--no-auto-play", "--nop"});
 
@@ -327,11 +326,11 @@ int main(int argc, char** argv)
         else if (affinity)
         {
             std::cout << "vsg::setAffinity(";
-            for(auto cpu_num : affinity.cpus)
+            for (auto cpu_num : affinity.cpus)
             {
-                std::cout<<" "<<cpu_num;
+                std::cout << " " << cpu_num;
             }
-            std::cout<<" )"<< std::endl;
+            std::cout << " )" << std::endl;
 
             vsg::setAffinity(affinity);
         }

examples/core/vsgallocator/vsgallocator.cpp

@@ -28,14 +28,14 @@ class StdAllocator : public vsg::Allocator
 
     void* allocate(std::size_t size, vsg::AllocatorAffinity) override
     {
-        return operator new (size); //, std::align_val_t{default_alignment});
+        return operator new(size); //, std::align_val_t{default_alignment});
     }
 
     bool deallocate(void* ptr, std::size_t size) override
     {
         if (nestedAllocator && nestedAllocator->deallocate(ptr, size)) return true;
 
-        operator delete (ptr);//, std::align_val_t{default_alignment});
+        operator delete(ptr); //, std::align_val_t{default_alignment});
         return true;
     }
 
@@ -46,7 +46,6 @@ class StdAllocator : public vsg::Allocator
     void setBlockSize(vsg::AllocatorAffinity, size_t) {}
 };
 
-
 struct SceneStatistics : public vsg::Inherit<vsg::ConstVisitor, SceneStatistics>
 {
     std::map<const char*, size_t> objectCounts;