Moved vsglights and vsgshadow into examples/lighting. Fixed error and

warning.
vsg-dev · Apr 29, 2024 · 59d1fdf · 59d1fdf
1 parent cb57ef7
commit 59d1fdf
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,23 +68,24 @@ endif()
 # install data
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION share/vsgExamples)
 
-# pure VSG examples
+# VSG examples
+add_subdirectory(examples/animation)
+add_subdirectory(examples/app)
+add_subdirectory(examples/commands)
 add_subdirectory(examples/core)
-add_subdirectory(examples/maths)
 add_subdirectory(examples/io)
-add_subdirectory(examples/ui)
-add_subdirectory(examples/state)
-add_subdirectory(examples/commands)
-add_subdirectory(examples/nodes)
-add_subdirectory(examples/threading)
-add_subdirectory(examples/app)
-add_subdirectory(examples/vk)
-add_subdirectory(examples/text)
+add_subdirectory(examples/lighting)
+add_subdirectory(examples/maths)
 add_subdirectory(examples/meshshaders)
-add_subdirectory(examples/raytracing)
+add_subdirectory(examples/nodes)
 add_subdirectory(examples/platform)
+add_subdirectory(examples/raytracing)
+add_subdirectory(examples/state)
+add_subdirectory(examples/text)
+add_subdirectory(examples/threading)
+add_subdirectory(examples/ui)
 add_subdirectory(examples/utils)
+add_subdirectory(examples/vk)
 add_subdirectory(examples/volume)
-add_subdirectory(examples/animation)
 
 vsg_add_feature_summary()
diff --git a/examples/lighting/CMakeLists.txt b/examples/lighting/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(vsglights)
+add_subdirectory(vsgshadow)
diff --git a/examples/nodes/vsglights/CMakeLists.txt → examples/lighting/vsglights/CMakeLists.txt b/examples/nodes/vsglights/CMakeLists.txt → examples/lighting/vsglights/CMakeLists.txt
diff --git a/examples/nodes/vsglights/vsglights.cpp → examples/lighting/vsglights/vsglights.cpp b/examples/nodes/vsglights/vsglights.cpp → examples/lighting/vsglights/vsglights.cpp
diff --git a/examples/nodes/vsgshadow/CMakeLists.txt → examples/lighting/vsgshadow/CMakeLists.txt b/examples/nodes/vsgshadow/CMakeLists.txt → examples/lighting/vsgshadow/CMakeLists.txt
diff --git a/examples/nodes/vsgshadow/vsgshadow.cpp → examples/lighting/vsgshadow/vsgshadow.cpp b/examples/nodes/vsgshadow/vsgshadow.cpp → examples/lighting/vsgshadow/vsgshadow.cpp
diff --git a/examples/nodes/CMakeLists.txt b/examples/nodes/CMakeLists.txt
@@ -1,8 +1,6 @@
 add_subdirectory(vsgannotation)
 add_subdirectory(vsggroups)
-add_subdirectory(vsglights)
 add_subdirectory(vsgtransform)
-add_subdirectory(vsgshadow)
 add_subdirectory(vsgtextureprojection)
 add_subdirectory(vsglayers)
 

diff --git a/examples/nodes/vsgtextureprojection/vsgtextureprojection.cpp b/examples/nodes/vsgtextureprojection/vsgtextureprojection.cpp
@@ -68,7 +68,7 @@ vsg::ref_ptr<vsg::Node> createLargeTestScene(vsg::ref_ptr<vsg::Options> options,
     if (requiresBase)
     {
         float diameter = static_cast<float>(vsg::length(bounds.max - bounds.min));
-        geomInfo.position.set(static_cast<float>((bounds.min.x + bounds.max.x)*0.5, static_cast<float>((bounds.min.y + bounds.max.y)*0.5), static_cast<float>(bounds.min.z);
+        geomInfo.position.set(static_cast<float>((bounds.min.x + bounds.max.x)*0.5), static_cast<float>((bounds.min.y + bounds.max.y)*0.5), static_cast<float>(bounds.min.z));
         geomInfo.dx.set(diameter, 0.0f, 0.0f);
         geomInfo.dy.set(0.0f, diameter, 0.0f);
         geomInfo.dz.set(0.0f, 0.0f, 1.0f);

diff --git a/examples/volume/vsgvolume/vsgvolume.cpp b/examples/volume/vsgvolume/vsgvolume.cpp
@@ -134,7 +134,7 @@ void updateBaseTexture3D(vsg::floatArray3D& image, float value)
                 float angle = atan2(delta.x, delta.y);
                 float distance_from_center = sqrt(d_ratio * d_ratio + r_ratio * r_ratio);
 
-                float intensity = (sin(1.0 * angle + 30.0f * distance_from_center + 10.0 * value) + 1.0f) * 0.5f;
+                float intensity = (sin(1.0f * angle + 30.0f * distance_from_center + 10.0f * value) + 1.0f) * 0.5f;
                 image.set(c, r, d, 1.0f - intensity);
             }
         }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		add_subdirectory(vsglights)
		add_subdirectory(vsgshadow)