Skip to content

Commit e24a0b4

Browse files
committed
Ran clang-format
1 parent 2e42b7a commit e24a0b4

File tree

12 files changed

+48
-50
lines changed

12 files changed

+48
-50
lines changed

include/vsg/app/ViewMatrix.h

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ namespace vsg
3636
/// scenes where standrd double precision is insufficient for avoiding visually significant numerical errors.
3737
dvec3 origin;
3838

39-
virtual dmat4 transform(const vsg::dvec3& offset={}) const = 0;
39+
virtual dmat4 transform(const vsg::dvec3& offset = {}) const = 0;
4040

41-
virtual dmat4 inverse(const vsg::dvec3& offset={}) const
41+
virtual dmat4 inverse(const vsg::dvec3& offset = {}) const
4242
{
4343
return vsg::inverse(transform(offset));
4444
}
@@ -88,7 +88,7 @@ namespace vsg
8888

8989
void set(const dmat4& matrix);
9090

91-
dmat4 transform(const dvec3& offset={}) const override;
91+
dmat4 transform(const dvec3& offset = {}) const override;
9292

9393
void read(Input& input) override;
9494
void write(Output& output) const override;
@@ -103,7 +103,6 @@ namespace vsg
103103
class VSG_DECLSPEC LookDirection : public vsg::Inherit<ViewMatrix, LookDirection>
104104
{
105105
public:
106-
107106
LookDirection() :
108107
position(0.0, 0.0, 0.0),
109108
rotation()
@@ -124,11 +123,10 @@ namespace vsg
124123

125124
void set(const dmat4& matrix);
126125

127-
dmat4 transform(const dvec3& offset={}) const override;
126+
dmat4 transform(const dvec3& offset = {}) const override;
128127
};
129128
VSG_type_name(vsg::LookDirection);
130129

131-
132130
/// RelativeViewMatrix is a ViewMatrix that decorates another ViewMatrix and pre-multiplies its transform matrix to give a relative view matrix.
133131
class VSG_DECLSPEC RelativeViewMatrix : public Inherit<ViewMatrix, RelativeViewMatrix>
134132
{
@@ -140,7 +138,7 @@ namespace vsg
140138
}
141139

142140
/// returns matrix * viewMatrix->transform()
143-
dmat4 transform(const vsg::dvec3& offset={}) const override;
141+
dmat4 transform(const vsg::dvec3& offset = {}) const override;
144142

145143
dmat4 matrix;
146144
ref_ptr<ViewMatrix> viewMatrix;
@@ -163,8 +161,8 @@ namespace vsg
163161
objectPath(path.begin(), path.end()) {}
164162

165163
/// returns matrix * computeTransfrom(objectPath)
166-
dmat4 transform(const vsg::dvec3& offset={}) const override;
167-
dmat4 inverse(const vsg::dvec3& offset={}) const override;
164+
dmat4 transform(const vsg::dvec3& offset = {}) const override;
165+
dmat4 inverse(const vsg::dvec3& offset = {}) const override;
168166

169167
dmat4 matrix;
170168
RefObjectPath objectPath;

include/vsg/core/Array3D.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,11 @@ namespace vsg
396396
VSG_array3D(svec2Array3D, svec2);
397397
VSG_array3D(svec3Array3D, svec3);
398398
VSG_array3D(svec4Array3D, svec4);
399-
399+
400400
VSG_array3D(usvec2Array3D, usvec2);
401401
VSG_array3D(usvec3Array3D, usvec3);
402402
VSG_array3D(usvec4Array3D, usvec4);
403-
403+
404404
VSG_array3D(ubvec2Array3D, ubvec2);
405405
VSG_array3D(ubvec3Array3D, ubvec3);
406406
VSG_array3D(ubvec4Array3D, ubvec4);

include/vsg/maths/box.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ namespace vsg
8888
}
8989
};
9090

91-
using box = t_box<float>; /// float box class
92-
using dbox = t_box<double>; /// double box class
91+
using box = t_box<float>; /// float box class
92+
using dbox = t_box<double>; /// double box class
9393
using ldbox = t_box<long double>; /// double box class
9494

9595
VSG_type_name(vsg::box);

include/vsg/maths/mat4.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ namespace vsg
119119
const T* data() const { return value[0].data(); }
120120
};
121121

122-
using mat4 = t_mat4<float>; /// float 4x4 matrix
123-
using dmat4 = t_mat4<double>; /// double 4x4 matrix
122+
using mat4 = t_mat4<float>; /// float 4x4 matrix
123+
using dmat4 = t_mat4<double>; /// double 4x4 matrix
124124
using ldmat4 = t_mat4<long double>; /// long double 4x4 matrix
125125

126126
VSG_type_name(vsg::mat4);

include/vsg/maths/quat.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ namespace vsg
145145
explicit operator bool() const noexcept { return value[0] != 0.0 || value[1] != 0.0 || value[2] != 0.0 || value[3] != 0.0; }
146146
};
147147

148-
using quat = t_quat<float>; /// float quaternion
149-
using dquat = t_quat<double>; /// double quaternion
148+
using quat = t_quat<float>; /// float quaternion
149+
using dquat = t_quat<double>; /// double quaternion
150150
using ldquat = t_quat<long double>; /// long double quaternion
151151

152152
VSG_type_name(vsg::quat);

include/vsg/maths/sphere.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ namespace vsg
120120
}
121121
};
122122

123-
using sphere = t_sphere<float>; /// float sphere class
124-
using dsphere = t_sphere<double>; /// double sphere class
123+
using sphere = t_sphere<float>; /// float sphere class
124+
using dsphere = t_sphere<double>; /// double sphere class
125125
using ldsphere = t_sphere<long double>; /// long double sphere class
126126

127127
VSG_type_name(vsg::sphere);

include/vsg/maths/vec2.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ namespace vsg
136136
explicit operator bool() const noexcept { return value[0] != 0.0 || value[1] != 0.0; }
137137
};
138138

139-
using vec2 = t_vec2<float>; // float 2D vector
140-
using dvec2 = t_vec2<double>; // double 2D vector
141-
using ldvec2 = t_vec2<long double>; // long double 2D vector
142-
using bvec2 = t_vec2<int8_t>; // signed 8 bit integer 2D vector
143-
using svec2 = t_vec2<int16_t>; // signed 16 bit integer 2D vector
144-
using ivec2 = t_vec2<int32_t>; // signed 32 bit integer 2D vector
145-
using ubvec2 = t_vec2<uint8_t>; // unsigned 8 bit integer 2D vector
146-
using usvec2 = t_vec2<uint16_t>; // unsigned 16 bit integer 2D vector
147-
using uivec2 = t_vec2<uint32_t>; // unsigned 32 bit integer 2D vector
139+
using vec2 = t_vec2<float>; // float 2D vector
140+
using dvec2 = t_vec2<double>; // double 2D vector
141+
using ldvec2 = t_vec2<long double>; // long double 2D vector
142+
using bvec2 = t_vec2<int8_t>; // signed 8 bit integer 2D vector
143+
using svec2 = t_vec2<int16_t>; // signed 16 bit integer 2D vector
144+
using ivec2 = t_vec2<int32_t>; // signed 32 bit integer 2D vector
145+
using ubvec2 = t_vec2<uint8_t>; // unsigned 8 bit integer 2D vector
146+
using usvec2 = t_vec2<uint16_t>; // unsigned 16 bit integer 2D vector
147+
using uivec2 = t_vec2<uint32_t>; // unsigned 32 bit integer 2D vector
148148

149149
VSG_type_name(vsg::vec2);
150150
VSG_type_name(vsg::dvec2);

include/vsg/maths/vec3.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ namespace vsg
144144
explicit operator bool() const noexcept { return value[0] != 0.0 || value[1] != 0.0 || value[2] != 0.0; }
145145
};
146146

147-
using vec3 = t_vec3<float>; // float 3D vector
148-
using dvec3 = t_vec3<double>; // double 3D vector
149-
using ldvec3 = t_vec3<long double>; // long double 3D vector
150-
using bvec3 = t_vec3<int8_t>; // signed 8 bit integer 3D vector
151-
using svec3 = t_vec3<int16_t>; // signed 16 bit integer 3D vector
152-
using ivec3 = t_vec3<int32_t>; // signed 32 bit integer 3D vector
153-
using ubvec3 = t_vec3<uint8_t>; // unsigned 8 bit integer 3D vector
154-
using usvec3 = t_vec3<uint16_t>; // unsigned 16 bit integer 3D vector
155-
using uivec3 = t_vec3<uint32_t>; // unsigned 32 bit integer 3D vector
147+
using vec3 = t_vec3<float>; // float 3D vector
148+
using dvec3 = t_vec3<double>; // double 3D vector
149+
using ldvec3 = t_vec3<long double>; // long double 3D vector
150+
using bvec3 = t_vec3<int8_t>; // signed 8 bit integer 3D vector
151+
using svec3 = t_vec3<int16_t>; // signed 16 bit integer 3D vector
152+
using ivec3 = t_vec3<int32_t>; // signed 32 bit integer 3D vector
153+
using ubvec3 = t_vec3<uint8_t>; // unsigned 8 bit integer 3D vector
154+
using usvec3 = t_vec3<uint16_t>; // unsigned 16 bit integer 3D vector
155+
using uivec3 = t_vec3<uint32_t>; // unsigned 32 bit integer 3D vector
156156

157157
VSG_type_name(vsg::vec3);
158158
VSG_type_name(vsg::dvec3);

include/vsg/maths/vec4.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@ namespace vsg
174174
explicit operator bool() const noexcept { return value[0] != 0.0 || value[1] != 0.0 || value[2] != 0.0 || value[3] != 0.0; }
175175
};
176176

177-
using vec4 = t_vec4<float>; // float 4D vector
178-
using dvec4 = t_vec4<double>; // double 4D vector
179-
using ldvec4 = t_vec4<long double>; // long double 4D vector
180-
using bvec4 = t_vec4<int8_t>; // signed 8 bit integer 4D vector
181-
using svec4 = t_vec4<int16_t>; // signed 16 bit integer 4D vector
182-
using ivec4 = t_vec4<int32_t>; // signed 32 bit integer 4D vector
183-
using ubvec4 = t_vec4<uint8_t>; // unsigned 8 bit integer 4D vector
184-
using usvec4 = t_vec4<uint16_t>; // unsigned 16 bit integer 4D vector
185-
using uivec4 = t_vec4<uint32_t>; // unsigned 32 bit integer 4D vector
177+
using vec4 = t_vec4<float>; // float 4D vector
178+
using dvec4 = t_vec4<double>; // double 4D vector
179+
using ldvec4 = t_vec4<long double>; // long double 4D vector
180+
using bvec4 = t_vec4<int8_t>; // signed 8 bit integer 4D vector
181+
using svec4 = t_vec4<int16_t>; // signed 16 bit integer 4D vector
182+
using ivec4 = t_vec4<int32_t>; // signed 32 bit integer 4D vector
183+
using ubvec4 = t_vec4<uint8_t>; // unsigned 8 bit integer 4D vector
184+
using usvec4 = t_vec4<uint16_t>; // unsigned 16 bit integer 4D vector
185+
using uivec4 = t_vec4<uint32_t>; // unsigned 32 bit integer 4D vector
186186

187187
VSG_type_name(vsg::vec4);
188188
VSG_type_name(vsg::dvec4);

src/vsg/app/RecordTraversal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
2727
#include <vsg/lighting/SpotLight.h>
2828
#include <vsg/maths/plane.h>
2929
#include <vsg/nodes/Bin.h>
30+
#include <vsg/nodes/CoordinateFrame.h>
3031
#include <vsg/nodes/CullGroup.h>
3132
#include <vsg/nodes/CullNode.h>
3233
#include <vsg/nodes/DepthSorted.h>
@@ -35,7 +36,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
3536
#include <vsg/nodes/LOD.h>
3637
#include <vsg/nodes/Layer.h>
3738
#include <vsg/nodes/MatrixTransform.h>
38-
#include <vsg/nodes/CoordinateFrame.h>
3939
#include <vsg/nodes/PagedLOD.h>
4040
#include <vsg/nodes/QuadGroup.h>
4141
#include <vsg/nodes/RegionOfInterest.h>

0 commit comments

Comments
 (0)