Skip to content

Commit ea81455

Browse files
robertosfieldrobertosfield
committed
Merge branch 'master' into ExperimentalChangesForQuieteningVulkanValidation
2 parents 45233a5 + 308d7c9 commit ea81455

File tree

190 files changed

+44353
-43042
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+44353
-43042
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [ubuntu-latest, macos-latest, windows-latest]
13-
vulkan-version: [1.3.224.1]
13+
vulkan-version: [1.3.250.1]
1414
build-shared: [OFF]
1515
include:
1616
- build-shared: ON
1717
os: windows-latest
18-
vulkan-version: 1.3.224.1
18+
vulkan-version: 1.3.250.1
1919
continue-on-error: ${{ matrix.vulkan-version == 'latest' }}
2020

2121
steps:
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
cmake-version: ${{ env.CMakeVersion }}
2727
- name: Install Vulkan SDK
28-
uses: humbletim/install-vulkan-sdk@v1.1.1
28+
uses: humbletim/install-vulkan-sdk@c2aa128094d42ba02959a660f03e0a4e012192f9
2929
with:
3030
version: ${{ matrix.vulkan-version }}
3131
cache: true

‎CMakeLists.txt‎

Lines changed: 77 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.7)
22

33
project(vsg
4-
VERSION 1.1.8
4+
VERSION 1.1.9
55
DESCRIPTION "VulkanSceneGraph library"
66
LANGUAGES CXX
77
)
@@ -43,8 +43,16 @@ set(VSG_MAX_INSTRUMENTATION_LEVEL 1 CACHE STRING "Set the instrumentation level
4343
# Enable/disable shader compilation support that pulls in glslang
4444
set(VSG_SUPPORTS_ShaderCompiler 1 CACHE STRING "Optional shader compiler support, 0 for off, 1 for enabled." )
4545
if (VSG_SUPPORTS_ShaderCompiler)
46-
set(GLSLANG_MIN_VERSION "14" CACHE STRING "glslang 14 is the earliest version that we think installs itself properly on all platforms. Other platforms may be able to use an earlier version")
47-
find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG)
46+
47+
# Try looking for glslang 15 first.
48+
set(GLSLANG_MIN_VERSION "15" CACHE STRING "glslang 14 is the earliest version that we think installs itself properly on all platforms. Other platforms may be able to use an earlier version")
49+
find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG QUIET)
50+
51+
if (NOT glslang_FOUND)
52+
# fallback to trying glslang 14.
53+
set(GLSLANG_MIN_VERSION "14")
54+
find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG)
55+
endif()
4856

4957
if (glslang_FOUND)
5058
set(FIND_DEPENDENCY_glslang "find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG REQUIRED)")
@@ -117,11 +125,73 @@ add_custom_target(build_all_h
117125
set_target_properties(build_all_h PROPERTIES FOLDER "VulkanSceneGraph")
118126

119127
# build_ShaderSets target automatically rebuilds the various built-in ShaderSets.
128+
set(PBR_DEFINES
129+
-v \"\"
130+
-v "VSG_DIFFUSE_MAP"
131+
-v "VSG_EMISSIVE_MAP"
132+
-v "VSG_LIGHTMAP_MAP"
133+
-v "VSG_METALLROUGHNESS_MAP"
134+
-v "VSG_NORMAL_MAP"
135+
-v "VSG_SKINNING"
136+
-v "VSG_TWO_SIDED_LIGHTING"
137+
-v "VSG_WORKFLOW_SPECGLOSS"
138+
-v "VSG_DIFFUSE_MAP VSG_EMISSIVE_MAP"
139+
-v "VSG_DIFFUSE_MAP VSG_LIGHTMAP_MAP"
140+
-v "VSG_DIFFUSE_MAP VSG_METALLROUGHNESS_MAP"
141+
-v "VSG_DIFFUSE_MAP VSG_NORMAL_MAP"
142+
-v "VSG_DIFFUSE_MAP VSG_SKINNING"
143+
-v "VSG_DIFFUSE_MAP VSG_TWO_SIDED_LIGHTING"
144+
-v "VSG_DIFFUSE_MAP VSG_WORKFLOW_SPECGLOSS"
145+
-v "VSG_LIGHTMAP_MAP VSG_METALLROUGHNESS_MAP"
146+
-v "VSG_LIGHTMAP_MAP VSG_NORMAL_MAP"
147+
-v "VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP"
148+
-v "VSG_METALLROUGHNESS_MAP VSG_TWO_SIDED_LIGHTING"
149+
-v "VSG_DIFFUSE_MAP VSG_EMISSIVE_MAP VSG_TWO_SIDED_LIGHTING"
150+
-v "VSG_DIFFUSE_MAP VSG_LIGHTMAP_MAP VSG_METALLROUGHNESS_MAP"
151+
-v "VSG_DIFFUSE_MAP VSG_LIGHTMAP_MAP VSG_NORMAL_MAP"
152+
-v "VSG_DIFFUSE_MAP VSG_LIGHTMAP_MAP VSG_TWO_SIDED_LIGHTING"
153+
-v "VSG_DIFFUSE_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP"
154+
-v "VSG_DIFFUSE_MAP VSG_METALLROUGHNESS_MAP VSG_TWO_SIDED_LIGHTING"
155+
-v "VSG_DIFFUSE_MAP VSG_NORMAL_MAP VSG_TWO_SIDED_LIGHTING"
156+
-v "VSG_LIGHTMAP_MAP VSG_NORMAL_MAP VSG_WORKFLOW_SPECGLOSS"
157+
-v "VSG_DIFFUSE_MAP VSG_EMISSIVE_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP"
158+
-v "VSG_DIFFUSE_MAP VSG_LIGHTMAP_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP"
159+
-v "VSG_DIFFUSE_MAP VSG_LIGHTMAP_MAP VSG_NORMAL_MAP VSG_TWO_SIDED_LIGHTING"
160+
-v "VSG_DIFFUSE_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP VSG_TWO_SIDED_LIGHTING"
161+
-v "VSG_DIFFUSE_MAP VSG_EMISSIVE_MAP VSG_LIGHTMAP_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP"
162+
-v "VSG_DIFFUSE_MAP VSG_EMISSIVE_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP VSG_TWO_SIDED_LIGHTING"
163+
-v "VSG_DIFFUSE_MAP VSG_LIGHTMAP_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP VSG_TWO_SIDED_LIGHTING"
164+
-v "VSG_DIFFUSE_MAP VSG_LIGHTMAP_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP VSG_WORKFLOW_SPECGLOSS"
165+
-v "VSG_DIFFUSE_MAP VSG_EMISSIVE_MAP VSG_LIGHTMAP_MAP VSG_METALLROUGHNESS_MAP VSG_NORMAL_MAP VSG_TWO_SIDED_LIGHTING"
166+
-v "VSG_DIFFUSE_MAP VSG_EMISSIVE_MAP VSG_LIGHTMAP_MAP VSG_NORMAL_MAP VSG_SPECULAR_MAP VSG_WORKFLOW_SPECGLOSS"
167+
)
168+
169+
set(PHONG_DEFINES
170+
-v \"\"
171+
-v "VSG_BILLBOARD"
172+
-v "VSG_DIFFUSE_MAP"
173+
-v "VSG_BILLBOARD VSG_DIFFUSE_MAP"
174+
)
175+
176+
set(FLAT_DEFINES
177+
-v \"\"
178+
-v "VSG_BILLBOARD"
179+
-v "VSG_DIFFUSE_MAP"
180+
-v "VSG_BILLBOARD VSG_DIFFUSE_MAP"
181+
)
182+
183+
set(TEXT_DEFINES
184+
-v "CPU_LAYOUT"
185+
-v "CPU_LAYOUT BILLBOARD"
186+
-v "GPU_LAYOUT"
187+
-v "GPU_LAYOUT BILLBOARD"
188+
)
189+
120190
add_custom_target(build_ShaderSets
121-
COMMAND find ~/Data/glTF-Sample-Models/2.0 -name "*.glb" -o -name "*.gltf" | xargs vsgshaderset --pbr -o src/vsg/utils/shaders/pbr_ShaderSet.cpp --binary
122-
COMMAND vsgshaderset --phong -v \"\" -v "VSG_BILLBOARD" -v "VSG_DIFFUSE_MAP" -v "VSG_BILLBOARD VSG_DIFFUSE_MAP" -o src/vsg/utils/shaders/phong_ShaderSet.cpp --binary
123-
COMMAND vsgshaderset --flat -v \"\" -v "VSG_BILLBOARD" -v "VSG_DIFFUSE_MAP" -v "VSG_BILLBOARD VSG_DIFFUSE_MAP" -o src/vsg/utils/shaders/flat_ShaderSet.cpp --binary
124-
COMMAND vsgshaderset --text -v "CPU_LAYOUT" -v "CPU_LAYOUT BILLBOARD" -v "GPU_LAYOUT" -v "GPU_LAYOUT BILLBOARD" -o src/vsg/text/shaders/text_ShaderSet.cpp --binary
191+
COMMAND vsgshaderset --pbr ${PBR_DEFINES} -o src/vsg/utils/shaders/pbr_ShaderSet.cpp --binary
192+
COMMAND vsgshaderset --phong ${PHONG_DEFINES} -o src/vsg/utils/shaders/phong_ShaderSet.cpp --binary
193+
COMMAND vsgshaderset --flat ${FLAT_DEFINES} -o src/vsg/utils/shaders/flat_ShaderSet.cpp --binary
194+
COMMAND vsgshaderset --text ${TEXT_DEFINES} -o src/vsg/text/shaders/text_ShaderSet.cpp --binary
125195
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
126196
COMMENT "update built-in ShaderSets"
127197
)

‎cmake/cppcheck-suppression-list.txt‎

Lines changed: 134 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// suppress Key related errors
2-
noExplicitConstructor:*include/vsg/core/ref_ptr.h
3-
noExplicitConstructor:*include/vsg/core/Inherit.h:31
4-
noExplicitConstructor:*include/vsg/core/Allocator.h:138
5-
noExplicitConstructor:*include/vsg/io/Path.h
2+
noExplicitConstructor:*/include/vsg/core/ref_ptr.h
3+
noExplicitConstructor:*/include/vsg/core/Inherit.h:31
4+
noExplicitConstructor:*/include/vsg/core/Allocator.h:138
5+
noExplicitConstructor:*/include/vsg/io/Path.h
66

77
// suppress correct casts flagged as issues
88
invalidPointerCast:*/include/vsg/core/Data.h
@@ -18,6 +18,7 @@ useStlAlgorithm:*/include/vsg/core/Value.h
1818
useStlAlgorithm:*/include/vsg/core/Array.h
1919
useStlAlgorithm:*/include/vsg/core/Array2D.h
2020
useStlAlgorithm:*/include/vsg/core/Array3D.h
21+
useStlAlgorithm:*/include/vsg/threading/DeleteQueue.h
2122
useStlAlgorithm:*/include/vsg/vk/vk_buffer.h
2223
useStlAlgorithm:*/include/vsg/utils/CommandLine.h
2324
useStlAlgorithm:*/src/vsg/nodes/VertexDraw.cpp
@@ -55,63 +56,84 @@ useStlAlgorithm:*/src/vsg/utils/ShaderSet.cpp
5556
useStlAlgorithm:*/src/vsg/utils/ShaderCompiler.cpp
5657
useStlAlgorithm:*/src/vsg/utils/GraphicsPipelineConfigurator.cpp
5758
useStlAlgorithm:*/src/vsg//utils/Builder.cpp
59+
useStlAlgorithm:*/src/vsg/io/Path.cpp
60+
useStlAlgorithm:*/src/vsg/utils/PolytopeIntersector.cpp
61+
useStlAlgorithm:*/src/vsg/vk/PhysicalDevice.cpp
62+
5863

5964
// suppress the warning about valid C++17 if (init; condition) usage
60-
syntaxError:*include/vsg/core/Inherit.h
61-
syntaxError:*src/vsg/io/AsciiOutput.cpp
62-
syntaxError:*src/vsg/io/AsciiInput.cpp
63-
syntaxError:*src/vsg/io/BinaryOutput.cpp
64-
syntaxError:*src/vsg/io/BinaryInput.cpp
65-
syntaxError:*src/vsg/io/ReaderWriter.cpp
66-
syntaxError:*src/vsg/io/FileSystem.cpp
67-
syntaxError:*include/vsg/io/Input.h
68-
syntaxError:*include/vsg/io/Output.h
65+
syntaxError:*/include/vsg/core/Inherit.h
66+
syntaxError:*/src/vsg/io/AsciiOutput.cpp
67+
syntaxError:*/src/vsg/io/AsciiInput.cpp
68+
syntaxError:*/src/vsg/io/BinaryOutput.cpp
69+
syntaxError:*/src/vsg/io/BinaryInput.cpp
70+
syntaxError:*/src/vsg/io/ReaderWriter.cpp
71+
syntaxError:*/src/vsg/io/FileSystem.cpp
72+
syntaxError:*/include/vsg/io/Input.h
73+
syntaxError:*/include/vsg/io/Output.h
6974

7075
// suppress the warning about valid C++17 if (init; condition) usage
71-
syntaxError:*include/vsg/utils/CommandLine.h
72-
syntaxError:*include/vsg/core/Data.h:51
76+
syntaxError:*/include/vsg/utils/CommandLine.h
77+
syntaxError:*/include/vsg/core/Data.h:51
7378

7479
// suppress warnings about never used variables that are used in .cpp's
75-
unusedStructMember:*include/vsg/core/Data.h
76-
unusedStructMember:*include/vsg/core/Exception.h
77-
unusedStructMember:*include/vsg/core/Version.h
78-
unusedStructMember:*include/vsg/core/IntrusiveAllocator.h
79-
unusedStructMember:*include/vsg/io/ObjectCache.h
80-
unusedStructMember:*include/vsg/nodes/Bin.h
81-
unusedStructMember:*include/vsg/nodes/LOD.h
82-
unusedStructMember:*include/vsg/nodes/PagedLOD.h
83-
unusedStructMember:*include/vsg/state/ArrayState.h
84-
unusedStructMember:*include/vsg/utils/LineSegmentIntersector.h
85-
unusedStructMember:*include/vsg/app/Trackball.h
86-
unusedStructMember:*include/vsg/vk/ResourceRequirements.h
87-
unusedStructMember:*include/vsg/vk/Device.h
88-
unusedStructMember:*include/vsg/vk/RenderPass.h
89-
unusedStructMember:*include/vsg/vk/Swapchain.h
90-
unusedStructMember:*include/vsg/vk/vulkan.h
91-
unusedStructMember:*include/vsg/nodes/Switch.h
92-
unusedStructMember:*include/vsg/text/TextLayout.h
93-
unusedStructMember:*include/vsg/introspection/c_interface.h
94-
unusedStructMember:*include/vsg/utils/Builder.h
95-
unusedStructMember:*src/vsg/core/External.cpp
80+
unusedStructMember:*/include/vsg/core/Data.h
81+
unusedStructMember:*/include/vsg/core/Exception.h
82+
unusedStructMember:*/include/vsg/core/Version.h
83+
unusedStructMember:*/include/vsg/core/IntrusiveAllocator.h
84+
unusedStructMember:*/include/vsg/io/ObjectCache.h
85+
unusedStructMember:*/include/vsg/nodes/Bin.h
86+
unusedStructMember:*/include/vsg/nodes/LOD.h
87+
unusedStructMember:*/include/vsg/nodes/PagedLOD.h
88+
unusedStructMember:*/include/vsg/state/ArrayState.h
89+
unusedStructMember:*/include/vsg/utils/LineSegmentIntersector.h
90+
unusedStructMember:*/include/vsg/app/Trackball.h
91+
unusedStructMember:*/include/vsg/vk/ResourceRequirements.h
92+
unusedStructMember:*/include/vsg/vk/Device.h
93+
unusedStructMember:*/include/vsg/vk/RenderPass.h
94+
unusedStructMember:*/include/vsg/vk/Swapchain.h
95+
unusedStructMember:*/include/vsg/vk/vulkan.h
96+
unusedStructMember:*/include/vsg/nodes/Switch.h
97+
unusedStructMember:*/include/vsg/text/TextLayout.h
98+
unusedStructMember:*/include/vsg/introspection/c_interface.h
99+
unusedStructMember:*/include/vsg/utils/Builder.h
100+
unusedStructMember:*/src/vsg/core/External.cpp#
101+
unusedStructMember:*/include/vsg/animation/MorphSampler.h
102+
unusedStructMember:*/include/vsg/app/CompileManager.h
103+
unusedStructMember:*/include/vsg/app/RecordTraversal.h
104+
unusedStructMember:*/include/vsg/app/TransferTask.h
105+
unusedStructMember:*/include/vsg/commands/CopyAndReleaseImage.h
106+
unusedStructMember:*/include/vsg/core/MemorySlots.h
107+
unusedStructMember:*/include/vsg/io/AsciiInput.h
108+
unusedStructMember:*/include/vsg/io/Input.h
109+
unusedStructMember:*/include/vsg/io/Output.h
110+
unusedStructMember:*/include/vsg/io/Path.h
111+
unusedStructMember:*/include/vsg/io/ReaderWriter.h
112+
unusedStructMember:*/include/vsg/raytracing/BuildAccelerationStructureTraversal.h
113+
unusedStructMember:*/include/vsg/state/BindDescriptorSet.h
114+
unusedStructMember:*/include/vsg/state/BufferInfo.h
115+
unusedStructMember:*/include/vsg/utils/Instrumentation.h
116+
unusedStructMember:*/include/vsg/utils/ShaderSet.h
117+
unusedStructMember:*/include/vsg/utils/LoadPagedLOD.h
96118

97119
// suppress warnings about unused variables
98-
unusedVariable:*src/vsg/io/FileSystem.cpp
99-
unusedVariable:*src/vsg/app/CompileManager.cpp
100-
unusedVariable:*src/vsg/app/Viewer.cpp
120+
unusedVariable:*/src/vsg/io/FileSystem.cpp
121+
unusedVariable:*/src/vsg/app/CompileManager.cpp
122+
unusedVariable:*/src/vsg/app/Viewer.cpp
101123

102124
// suppress inappropriate warnings about unassigned variables
103-
unassignedVariable:*src/vsg/commands/ExecuteCommands.cpp
104-
unassignedVariable:*src/vsg/state/ShaderStage.cpp
105-
unassignedVariable:*src/vsg/state/ViewDependentState.cpp
106-
unassignedVariable:*src/vsg/vk/DescriptorPool.cpp
107-
unassignedVariable:*src/vsg/vk/ResourceRequirements.cpp
108-
unassignedVariable:*src/vsg/core/External.cpp
109-
unassignedVariable:*src/vsg/core/MemorySlots.cpp
110-
unassignedVariable:*src/vsg/vk/Context.cpp
111-
unassignedVariable:*src/vsg/app/CompileManager.cpp
112-
unassignedVariable:*src/vsg/app/RecordAndSubmitTask.cpp
113-
unassignedVariable:*src/vsg/app/Viewer.cpp
114-
unassignedVariable:*src/vsg/vk/DescriptorPools.cpp
125+
unassignedVariable:*/src/vsg/commands/ExecuteCommands.cpp
126+
unassignedVariable:*/src/vsg/state/ShaderStage.cpp
127+
unassignedVariable:*/src/vsg/state/ViewDependentState.cpp
128+
unassignedVariable:*/src/vsg/vk/DescriptorPool.cpp
129+
unassignedVariable:*/src/vsg/vk/ResourceRequirements.cpp
130+
unassignedVariable:*/src/vsg/core/External.cpp
131+
unassignedVariable:*/src/vsg/core/MemorySlots.cpp
132+
unassignedVariable:*/src/vsg/vk/Context.cpp
133+
unassignedVariable:*/src/vsg/app/CompileManager.cpp
134+
unassignedVariable:*/src/vsg/app/RecordAndSubmitTask.cpp
135+
unassignedVariable:*/src/vsg/app/Viewer.cpp
136+
unassignedVariable:*/src/vsg/vk/DescriptorPools.cpp
115137

116138
// suppress inappropriate warnings about unreadVariable variables
117139
unreadVariable:*/src/vsg/state/DescriptorTexelBufferView.cpp
@@ -121,10 +143,11 @@ uninitvar:*/include/vsg/vk/DeviceFeatures.h
121143
uninitvar:*/src/vsg/vk/DeviceFeatures.cpp
122144

123145
// suppress inappropriate warning about out of bounds
124-
arrayIndexOutOfBounds:*include/vsg/vk/State.h
146+
arrayIndexOutOfBounds:*/include/vsg/vk/State.h
125147

126-
// suppress warnings about intentional code usage
148+
// suppress warnings about intentional code usage or where cppcheck just hasn't got a clue about how templates are used...
127149
knownConditionTrueFalse:*/src/vsg/utils/Builder.cpp
150+
knownConditionTrueFalse:*/include/vsg/utils/CommandLine.h
128151

129152
// suppress warning about initializtion.
130153
useInitializationList:*/include/vsg/core/ScratchMemory.h
@@ -155,3 +178,61 @@ variableScope:*/src/vsg/core/IntrusiveAllocator.cpp
155178
// suppress really stupid warning of pointerLessThanZero
156179
pointerLessThanZero:*/src/vsg/app/Viewer.cpp
157180

181+
// suppress inappropriate warning of duplInheritedMember
182+
duplInheritedMember:*/include/vsg/core/Inherit.h
183+
duplInheritedMember:*/include/vsg/core/Data.h
184+
duplInheritedMember:*/include/vsg/nodes/Node.h
185+
duplInheritedMember:*/include/vsg/nodes/Group.h
186+
duplInheritedMember:*/include/vsg/nodes/StateGroup.h
187+
duplInheritedMember:*/include/vsg/animation/AnimationGroup.h
188+
duplInheritedMember:*/src/vsg/core/Data.cpp
189+
duplInheritedMember:*/src/vsg/nodes/Node.cpp
190+
191+
// suppress unhelpful warning of shadowFunction
192+
shadowFunction:*/include/vsg/maths/transform.h
193+
shadowFunction:*/src/io/Path.cpp
194+
shadowFunction:*/src/vsg/animation/CameraAnimationHandler.cpp
195+
shadowFunction:*/src/vsg/animation/CameraSampler.cpp
196+
shadowFunction:*/src/vsg/animation/TransformSampler.cpp
197+
shadowFunction:*/src/vsg/io/tile.cpp
198+
shadowFunction:*/src/vsg/io/FileSystem.cpp
199+
shadowFunction:*/src/vsg/io/Path.cpp
200+
shadowFunction:*/src/vsg/app/Trackball.cpp
201+
shadowFunction:*/src/vsg/app/RecordTraversal.cpp
202+
shadowFunction:*/src/vsg/commands/PipelineBarrier.cpp
203+
shadowFunction:*/src/vsg/state/ArrayState.cpp
204+
shadowFunction:*/src/vsg/state/DescriptorBuffer.cpp
205+
shadowFunction:*/src/vsg/state/Image.cpp
206+
shadowFunction:*/src/vsg/state/ImageView.cpp
207+
shadowFunction:*/src/vsg/state/MultisampleState.cpp
208+
shadowFunction:*/src/vsg/state/DescriptorImage.cpp
209+
shadowFunction:*/src/vsg/utils/FindDynamicObjects.cpp
210+
shadowFunction:*/src/vsg/utils/LoadPagedLOD.cpp
211+
shadowFunction:*/src/vsg/utils/PropagateDynamicObjects.cpp
212+
shadowFunction:*/src/vsg/app/ViewMatrix.cpp
213+
214+
// suppress unhelpful warning of c casts
215+
cstyleCast:*/include/vsg/io/mem_stream.h
216+
cstyleCast:*/src/vsg/io/mem_stream.cpp
217+
218+
// suppress unhelpful warnings of override that make inform programmers what is being done
219+
uselessOverride:*/include/vsg/utils/TracyInstrumentation.h
220+
221+
// suppress inappropriate warning
222+
constParameterReference:*/include/vsg/vk/Device.h
223+
constParameterReference:*/src/vsg/vk/Device.cpp
224+
constParameterReference:*/include/vsg/vk/Instance.h
225+
constParameterReference:*/src/vsg/vk/Instance.cpp
226+
constParameterReference:*/include/vsg/app/RecordAndSubmitTask.h
227+
constParameterReference:*/src/vsg/app/RecordAndSubmitTask.cpp
228+
229+
// suppress inappropriate warning
230+
constVariableReference:*/src/vsg/app/RecordTraversal.cpp
231+
constVariableReference:*/src/vsg/utils/ShaderSet.cpp
232+
233+
// suppress inappropriate warning
234+
constVariablePointer:*/src/vsg/app/SecondaryCommandGraph.cpp
235+
236+
// suppress inappropriate warning
237+
passedByValue:*/src/vsg/vk/Device.cpp
238+
passedByValue:*/src/vsg/vk/Instance.cpp

‎cmake/vsgMacros.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ endmacro()
238238
macro(vsg_add_target_clang_format)
239239
set(options)
240240
set(oneValueArgs )
241-
set(multiValueArgs FILES EXCLUDE)
241+
set(multiValueArgs FILES EXCLUDES)
242242
cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
243243

244244
find_program(CLANGFORMAT clang-format)

‎include/vsg/all.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
6060
#include <vsg/nodes/AbsoluteTransform.h>
6161
#include <vsg/nodes/Bin.h>
6262
#include <vsg/nodes/Compilable.h>
63+
#include <vsg/nodes/CoordinateFrame.h>
6364
#include <vsg/nodes/CullGroup.h>
6465
#include <vsg/nodes/CullNode.h>
6566
#include <vsg/nodes/DepthSorted.h>
@@ -84,12 +85,14 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
8485
#include <vsg/animation/Animation.h>
8586
#include <vsg/animation/AnimationGroup.h>
8687
#include <vsg/animation/AnimationManager.h>
87-
#include <vsg/animation/CameraAnimation.h>
88+
#include <vsg/animation/CameraAnimationHandler.h>
89+
#include <vsg/animation/CameraSampler.h>
8890
#include <vsg/animation/FindAnimations.h>
8991
#include <vsg/animation/Joint.h>
9092
#include <vsg/animation/JointSampler.h>
9193
#include <vsg/animation/MorphSampler.h>
9294
#include <vsg/animation/TransformSampler.h>
95+
#include <vsg/animation/time_value.h>
9396

9497
// Lighting header files
9598
#include <vsg/lighting/AmbientLight.h>

0 commit comments

Comments
 (0)