From 78fd6f67f07f68e807077d20748295a74a8dc025 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 20 Mar 2024 13:11:45 +0000 Subject: [PATCH] Ran clang-format --- include/vsg/animation/CameraAnimation.h | 3 +-- include/vsg/animation/TransformSampler.h | 2 +- include/vsg/utils/Instrumentation.h | 1 + src/vsg/animation/CameraAnimation.cpp | 5 ++--- src/vsg/animation/TransformSampler.cpp | 2 +- src/vsg/app/ProjectionMatrix.cpp | 2 -- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/vsg/animation/CameraAnimation.h b/include/vsg/animation/CameraAnimation.h index 8a1f4d711..52f45e722 100644 --- a/include/vsg/animation/CameraAnimation.h +++ b/include/vsg/animation/CameraAnimation.h @@ -12,10 +12,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI */ +#include #include #include #include -#include namespace vsg { @@ -63,5 +63,4 @@ namespace vsg }; VSG_type_name(vsg::CameraAnimation); - } // namespace vsg diff --git a/include/vsg/animation/TransformSampler.h b/include/vsg/animation/TransformSampler.h index f91a6d2fa..ca4b2c4ff 100644 --- a/include/vsg/animation/TransformSampler.h +++ b/include/vsg/animation/TransformSampler.h @@ -13,8 +13,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI */ #include -#include #include +#include namespace vsg { diff --git a/include/vsg/utils/Instrumentation.h b/include/vsg/utils/Instrumentation.h index c1e216bdf..05cba909d 100644 --- a/include/vsg/utils/Instrumentation.h +++ b/include/vsg/utils/Instrumentation.h @@ -69,6 +69,7 @@ namespace vsg virtual void leave(const SourceLocation* /*sl*/, uint64_t& /*reference*/, CommandBuffer& /*commandBuffer*/, const Object* /*object*/ = nullptr) const {}; virtual void finish() const {}; + protected: virtual ~Instrumentation(); }; diff --git a/src/vsg/animation/CameraAnimation.cpp b/src/vsg/animation/CameraAnimation.cpp index c6cf05726..46326b373 100644 --- a/src/vsg/animation/CameraAnimation.cpp +++ b/src/vsg/animation/CameraAnimation.cpp @@ -22,7 +22,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI using namespace vsg; - CameraAnimation::CameraAnimation(ref_ptr in_object, const Path& in_filename, ref_ptr in_options) : object(in_object), filename(in_filename), @@ -34,7 +33,7 @@ CameraAnimation::CameraAnimation(ref_ptr in_object, const Path& in_filen { if (animation = read_object.cast()) { - for(auto sampler : animation->samplers) + for (auto sampler : animation->samplers) { if (auto ts = sampler.cast()) { @@ -73,7 +72,7 @@ CameraAnimation::CameraAnimation(ref_ptr in_object, ref_ptr i { if (animation) { - for(auto& sampler : animation->samplers) + for (auto& sampler : animation->samplers) { if (auto ts = sampler.cast()) { diff --git a/src/vsg/animation/TransformSampler.cpp b/src/vsg/animation/TransformSampler.cpp index 5c2a56674..764a59c54 100644 --- a/src/vsg/animation/TransformSampler.cpp +++ b/src/vsg/animation/TransformSampler.cpp @@ -13,12 +13,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI #include #include #include +#include #include #include #include #include #include -#include using namespace vsg; diff --git a/src/vsg/app/ProjectionMatrix.cpp b/src/vsg/app/ProjectionMatrix.cpp index 05fdac84f..521f6a43d 100644 --- a/src/vsg/app/ProjectionMatrix.cpp +++ b/src/vsg/app/ProjectionMatrix.cpp @@ -94,5 +94,3 @@ void EllipsoidPerspective::write(Output& output) const output.write("nearFarRatio", nearFarRatio); output.write("horizonMountainHeight", horizonMountainHeight); } - -