Skip to content

Commit 89d2c19

Browse files
robertosfieldrobertosfield
committed
Ran clang-format.
1 parent 1b4f2ae commit 89d2c19

19 files changed

+92
-74
lines changed

‎include/vsg/core/Array.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ namespace vsg
118118
template<typename... Args>
119119
static ref_ptr<Array> create_if(bool flag, Args&&... args)
120120
{
121-
if (flag) return ref_ptr<Array>(new Array(std::forward<Args>(args)...));
122-
else return {};
121+
if (flag)
122+
return ref_ptr<Array>(new Array(std::forward<Args>(args)...));
123+
else
124+
return {};
123125
}
124126

125127
static ref_ptr<Array> create(std::initializer_list<value_type> l)

‎include/vsg/core/Array2D.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,13 @@ namespace vsg
103103
return ref_ptr<Array2D>(new Array2D(std::forward<Args>(args)...));
104104
}
105105

106-
107106
template<typename... Args>
108107
static ref_ptr<Array2D> create_if(bool flag, Args&&... args)
109108
{
110-
if (flag) return ref_ptr<Array2D>(new Array2D(std::forward<Args>(args)...));
111-
else return {};
109+
if (flag)
110+
return ref_ptr<Array2D>(new Array2D(std::forward<Args>(args)...));
111+
else
112+
return {};
112113
}
113114

114115
ref_ptr<Object> clone(const CopyOp& copyop = {}) const override

‎include/vsg/core/Array3D.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,10 @@ namespace vsg
111111
template<typename... Args>
112112
static ref_ptr<Array3D> create_if(bool flag, Args&&... args)
113113
{
114-
if (flag) return ref_ptr<Array3D>(new Array3D(std::forward<Args>(args)...));
115-
else return {};
114+
if (flag)
115+
return ref_ptr<Array3D>(new Array3D(std::forward<Args>(args)...));
116+
else
117+
return {};
116118
}
117119

118120
ref_ptr<Object> clone(const CopyOp& copyop = {}) const override

‎include/vsg/core/IntrusiveAllocator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
1515
#include <vsg/core/Allocator.h>
1616

1717
#include <list>
18-
#include <vector>
1918
#include <string>
19+
#include <vector>
2020

2121
namespace vsg
2222
{

‎include/vsg/core/Value.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ namespace vsg
6161
template<typename... Args>
6262
static ref_ptr<Value> create_if(bool flag, Args&&... args)
6363
{
64-
if (flag) return ref_ptr<Value>(new Value(std::forward<Args>(args)...));
65-
else return {};
64+
if (flag)
65+
return ref_ptr<Value>(new Value(std::forward<Args>(args)...));
66+
else
67+
return {};
6668
}
6769

6870
ref_ptr<Object> clone(const CopyOp& copyop = {}) const override

‎include/vsg/threading/DeleteQueue.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ namespace vsg
6969
std::scoped_lock lock(_mutex);
7070

7171
// register the SharedObjects to call prune on
72-
if (std::find(_sharedObjectsToPrune.begin(), _sharedObjectsToPrune.end(), sharedObjects)==_sharedObjectsToPrune.end())
72+
if (std::find(_sharedObjectsToPrune.begin(), _sharedObjectsToPrune.end(), sharedObjects) == _sharedObjectsToPrune.end())
7373
{
7474
_sharedObjectsToPrune.push_back(sharedObjects);
7575
}
@@ -85,8 +85,8 @@ namespace vsg
8585
// register the Objects to delete
8686
for (auto& sharedObjects : sharedObjectsList)
8787
{
88-
if (std::find(_sharedObjectsToPrune.begin(), _sharedObjectsToPrune.end(), sharedObjects)==_sharedObjectsToPrune.end())
89-
_sharedObjectsToPrune.push_back(sharedObjects);
88+
if (std::find(_sharedObjectsToPrune.begin(), _sharedObjectsToPrune.end(), sharedObjects) == _sharedObjectsToPrune.end())
89+
_sharedObjectsToPrune.push_back(sharedObjects);
9090
}
9191

9292
_cv.notify_one();
@@ -106,13 +106,12 @@ namespace vsg
106106
// register the SharedObjects to call prune on
107107
for (auto& sharedObjects : sharedObjectsList)
108108
{
109-
if (std::find(_sharedObjectsToPrune.begin(), _sharedObjectsToPrune.end(), sharedObjects)==_sharedObjectsToPrune.end())
110-
_sharedObjectsToPrune.push_back(sharedObjects);
109+
if (std::find(_sharedObjectsToPrune.begin(), _sharedObjectsToPrune.end(), sharedObjects) == _sharedObjectsToPrune.end())
110+
_sharedObjectsToPrune.push_back(sharedObjects);
111111
}
112112
_cv.notify_one();
113113
}
114114

115-
116115
void wait_then_clear();
117116

118117
void clear();

‎include/vsg/threading/OperationQueue.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ namespace vsg
4646
void add(value_type operation, InsertionPosition insertionPosition = INSERT_BACK)
4747
{
4848
std::scoped_lock lock(_mutex);
49-
if (insertionPosition==INSERT_BACK) _queue.emplace_back(operation);
50-
else _queue.emplace_front(operation);
49+
if (insertionPosition == INSERT_BACK)
50+
_queue.emplace_back(operation);
51+
else
52+
_queue.emplace_front(operation);
5153
_cv.notify_one();
5254
}
5355

@@ -59,8 +61,10 @@ namespace vsg
5961
std::scoped_lock lock(_mutex);
6062
for (auto itr = begin; itr != end; ++itr)
6163
{
62-
if (insertionPosition==INSERT_BACK) _queue.emplace_back(*itr);
63-
else _queue.emplace_front(*itr);
64+
if (insertionPosition == INSERT_BACK)
65+
_queue.emplace_back(*itr);
66+
else
67+
_queue.emplace_front(*itr);
6468
++numAdditions;
6569
}
6670

‎include/vsg/utils/CommandLine.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,12 @@ namespace vsg
273273

274274
inline std::ostream& operator<<(std::ostream& output, const CommandLine& arguments)
275275
{
276-
for(int i=0; i < arguments.argc(); ++i)
276+
for (int i = 0; i < arguments.argc(); ++i)
277277
{
278-
if (i>0) output << ' ';
278+
if (i > 0) output << ' ';
279279
output << arguments[i];
280280
}
281281
return output;
282282
}
283283

284-
285284
} // namespace vsg

‎src/vsg/app/RecordTraversal.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
3232
#include <vsg/nodes/DepthSorted.h>
3333
#include <vsg/nodes/Geometry.h>
3434
#include <vsg/nodes/Group.h>
35+
#include <vsg/nodes/InstanceDraw.h>
36+
#include <vsg/nodes/InstanceNode.h>
3537
#include <vsg/nodes/LOD.h>
3638
#include <vsg/nodes/Layer.h>
3739
#include <vsg/nodes/MatrixTransform.h>
@@ -43,8 +45,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
4345
#include <vsg/nodes/TileDatabase.h>
4446
#include <vsg/nodes/VertexDraw.h>
4547
#include <vsg/nodes/VertexIndexDraw.h>
46-
#include <vsg/nodes/InstanceNode.h>
47-
#include <vsg/nodes/InstanceDraw.h>
4848
#include <vsg/state/ViewDependentState.h>
4949
#include <vsg/threading/atomics.h>
5050
#include <vsg/ui/ApplicationEvent.h>

‎src/vsg/io/DatabasePager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ void DatabasePager::updateSceneGraph(ref_ptr<FrameStamp> frameStamp, CompileResu
344344

345345
if (plod->options->sharedObjects)
346346
{
347-
if (std::find(sharedObjectsToPrune.begin(), sharedObjectsToPrune.end(), plod->options->sharedObjects)==sharedObjectsToPrune.end())
347+
if (std::find(sharedObjectsToPrune.begin(), sharedObjectsToPrune.end(), plod->options->sharedObjects) == sharedObjectsToPrune.end())
348348
{
349349
sharedObjectsToPrune.push_back(plod->options->sharedObjects);
350350
}

0 commit comments

Comments
 (0)