Skip to content

Commit

Permalink
Ran clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
robertosfield committed Mar 20, 2024
1 parent 2158f09 commit 78fd6f6
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 9 deletions.
3 changes: 1 addition & 2 deletions include/vsg/animation/CameraAnimation.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
</editor-fold> */

#include <vsg/animation/TransformSampler.h>
#include <vsg/core/Inherit.h>
#include <vsg/maths/quat.h>
#include <vsg/ui/KeyEvent.h>
#include <vsg/animation/TransformSampler.h>

namespace vsg
{
Expand Down Expand Up @@ -63,5 +63,4 @@ namespace vsg
};
VSG_type_name(vsg::CameraAnimation);


} // namespace vsg
2 changes: 1 addition & 1 deletion include/vsg/animation/TransformSampler.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
</editor-fold> */

#include <vsg/animation/Animation.h>
#include <vsg/maths/transform.h>
#include <vsg/app/ViewMatrix.h>
#include <vsg/maths/transform.h>

namespace vsg
{
Expand Down
1 change: 1 addition & 0 deletions include/vsg/utils/Instrumentation.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};
Expand Down
5 changes: 2 additions & 3 deletions src/vsg/animation/CameraAnimation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Object> in_object, const Path& in_filename, ref_ptr<Options> in_options) :
object(in_object),
filename(in_filename),
Expand All @@ -34,7 +33,7 @@ CameraAnimation::CameraAnimation(ref_ptr<Object> in_object, const Path& in_filen
{
if (animation = read_object.cast<Animation>())
{
for(auto sampler : animation->samplers)
for (auto sampler : animation->samplers)
{
if (auto ts = sampler.cast<TransformSampler>())
{
Expand Down Expand Up @@ -73,7 +72,7 @@ CameraAnimation::CameraAnimation(ref_ptr<Object> in_object, ref_ptr<Animation> i
{
if (animation)
{
for(auto& sampler : animation->samplers)
for (auto& sampler : animation->samplers)
{
if (auto ts = sampler.cast<TransformSampler>())
{
Expand Down
2 changes: 1 addition & 1 deletion src/vsg/animation/TransformSampler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#include <vsg/animation/AnimationGroup.h>
#include <vsg/animation/Joint.h>
#include <vsg/animation/TransformSampler.h>
#include <vsg/app/Camera.h>
#include <vsg/core/compare.h>
#include <vsg/io/Input.h>
#include <vsg/io/Options.h>
#include <vsg/io/Output.h>
#include <vsg/nodes/MatrixTransform.h>
#include <vsg/app/Camera.h>

using namespace vsg;

Expand Down
2 changes: 0 additions & 2 deletions src/vsg/app/ProjectionMatrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,3 @@ void EllipsoidPerspective::write(Output& output) const
output.write("nearFarRatio", nearFarRatio);
output.write("horizonMountainHeight", horizonMountainHeight);
}


0 comments on commit 78fd6f6

Please sign in to comment.