Skip to content

Commit e35ff59

Browse files
[Thunderscope] Remove Extra Robots and Add Missing Robots during Simulator + Fixes (UBC-Thunderbots#3454)
* init * tests * working * changes * changes * finished * [pre-commit.ci lite] apply automatic fixes * cleanup * changes * removed tests * cleanup * cleanup * changes to namespace * changed namespace indenting --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent 1ee0ead commit e35ff59

41 files changed

Lines changed: 1678 additions & 1453 deletions

Some content is hidden

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

.clang-format

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ IncludeBlocks: Regroup
1919
IndentCaseLabels: 'true'
2020
IndentWidth: '4'
2121
MaxEmptyLinesToKeep: '3'
22-
NamespaceIndentation: All
22+
NamespaceIndentation: None
2323
ReflowComments: 'true'
2424
SortIncludes: 'true'
2525
Standard: Cpp11
@@ -50,7 +50,7 @@ IncludeBlocks: Regroup
5050
IndentCaseLabels: 'true'
5151
IndentWidth: '4'
5252
MaxEmptyLinesToKeep: '3'
53-
NamespaceIndentation: All
53+
NamespaceIndentation: None
5454
ReflowComments: 'true'
5555
SortIncludes: 'true'
5656
Standard: Cpp11

src/extlibs/er_force_sim/src/amun/simulator/robotmesh.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
namespace camun
2828
{
29-
namespace simulator
30-
{
31-
std::vector<std::vector<std::tuple<float, float, float>>> createRobotMesh(
32-
float radius, float height, float angle, float holeDepth, float holeHeight);
33-
} // namespace simulator
29+
namespace simulator
30+
{
31+
std::vector<std::vector<std::tuple<float, float, float>>> createRobotMesh(
32+
float radius, float height, float angle, float holeDepth, float holeHeight);
33+
} // namespace simulator
3434
} // namespace camun
3535

3636
#endif // ROBOTMESH_H

src/extlibs/er_force_sim/src/amun/simulator/simball.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232
namespace camun
3333
{
34-
namespace simulator
35-
{
36-
class SimBall;
37-
} // namespace simulator
34+
namespace simulator
35+
{
36+
class SimBall;
37+
} // namespace simulator
3838
} // namespace camun
3939

4040
class camun::simulator::SimBall

src/extlibs/er_force_sim/src/amun/simulator/simfield.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
namespace camun
2929
{
30-
namespace simulator
31-
{
32-
class SimField;
33-
} // namespace simulator
30+
namespace simulator
31+
{
32+
class SimField;
33+
} // namespace simulator
3434
} // namespace camun
3535

3636
class camun::simulator::SimField

src/extlibs/er_force_sim/src/amun/simulator/simrobot.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333

3434
namespace camun
3535
{
36-
namespace simulator
37-
{
38-
class SimRobot;
39-
} // namespace simulator
36+
namespace simulator
37+
{
38+
class SimRobot;
39+
} // namespace simulator
4040
} // namespace camun
4141

4242
class camun::simulator::SimRobot

src/extlibs/er_force_sim/src/amun/simulator/simulator.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ const float FOCAL_LENGTH = 390.f;
4040

4141
namespace camun
4242
{
43-
namespace simulator
44-
{
45-
class Simulator;
46-
struct SimulatorData;
47-
} // namespace simulator
43+
namespace simulator
44+
{
45+
class Simulator;
46+
struct SimulatorData;
47+
} // namespace simulator
4848
} // namespace camun
4949

5050
class camun::simulator::Simulator

0 commit comments

Comments
 (0)