From 11ea4958011231e0783b01230743525342f305b0 Mon Sep 17 00:00:00 2001 From: Kyle Fleming Date: Thu, 12 Nov 2015 15:25:49 -0800 Subject: [PATCH] remove trailing spaces --- engine/src/blueprint/node.h | 2 +- engine/src/blueprint/node_handle.h | 1 - engine/src/blueprint/node_registrar.h | 2 +- engine/src/blueprint/node_signal.h | 2 +- engine/src/core/rasterization_thread.cpp | 2 +- engine/src/core/renderer.h | 2 +- engine/src/nodes/incrementer.h | 4 ++-- engine/src/nodes/oscillators/saw_wave.h | 2 +- engine/src/nodes/oscillators/sin_wave.h | 2 +- engine/src/nodes/oscillators/square_wave.h | 2 +- engine/src/nodes/translate_node.hpp | 2 +- engine/src/utils/reactive/observable_map.h | 2 +- engine/src/utils/reactive/observable_shared_ptr.h | 2 +- engine/src/utils/reactive/observable_vector.h | 2 +- engine/src/utils/reactive/scoped_observer.h | 2 +- engine/src/utils/reactive/serializers/var_serializer.h | 2 +- engine/src/utils/serialization/forward_serialization.h | 2 +- .../serialization/serializers/boost_uuid_serializer.h | 2 +- engine/src/utils/type_erasure/weak_any_ptr.h | 2 +- engine/src/utils/type_erasure/weak_any_ptr.hpp | 2 +- engine/test/test_data/blueprint/project_test_data.h | 2 +- engine/test/tests/test_blueprints.cpp | 10 +++++----- engine/test/tests/test_components.cpp | 2 +- engine/test/tests/utils/reactive/test_rxcpp.cpp | 2 +- engine/test/tests/utils/reactive/test_var.cpp | 4 ++-- 25 files changed, 30 insertions(+), 31 deletions(-) diff --git a/engine/src/blueprint/node.h b/engine/src/blueprint/node.h index bb9b78d..5551fd5 100644 --- a/engine/src/blueprint/node.h +++ b/engine/src/blueprint/node.h @@ -8,7 +8,7 @@ #include "enable_type_erasure.h" /** - * Nodes are the building blocks of the Symmetry Engine. They receive inputs, and provide + * Nodes are the building blocks of the Symmetry Engine. They receive inputs, and provide * outputs. * A node can contain other nodes. */ diff --git a/engine/src/blueprint/node_handle.h b/engine/src/blueprint/node_handle.h index fe830d9..a7079f5 100644 --- a/engine/src/blueprint/node_handle.h +++ b/engine/src/blueprint/node_handle.h @@ -66,7 +66,6 @@ class NodeHandle : public DataTransmitter { virtual void setBridge(DataBridge& bridge); private: - Var name; ObservableVector> inputs; diff --git a/engine/src/blueprint/node_registrar.h b/engine/src/blueprint/node_registrar.h index 659a3c4..2a6e6b8 100644 --- a/engine/src/blueprint/node_registrar.h +++ b/engine/src/blueprint/node_registrar.h @@ -45,7 +45,7 @@ class NodeRegistrar : public Singleton { } // Helper class to enable static registration of node types -// +// // Notes: The registerEntry method only executes once per // template instantiation of NodeRegistrationEntry, // regardless of how many times its called. diff --git a/engine/src/blueprint/node_signal.h b/engine/src/blueprint/node_signal.h index 4ed3089..aea1e9e 100644 --- a/engine/src/blueprint/node_signal.h +++ b/engine/src/blueprint/node_signal.h @@ -22,7 +22,7 @@ class NodeSignal : public DataTransmitter { virtual void unwireOutput(NodeSocket& destinationNodeSocket); bool belongsTo(const NodeHandle& nodeHandle) const; - + Var name; protected: diff --git a/engine/src/core/rasterization_thread.cpp b/engine/src/core/rasterization_thread.cpp index 530a5ff..a417f1c 100644 --- a/engine/src/core/rasterization_thread.cpp +++ b/engine/src/core/rasterization_thread.cpp @@ -187,7 +187,7 @@ void RasterizationThread::performRasterization() if (model->pixels.size() != doubleBuffer.size()) { doubleBuffer.setSize(model->pixels.size()); } - + FrameContext frameContext(currentFrameTime - startTime); renderable->renderRenderable(frameContext, doubleBuffer.getBackBuffer()); diff --git a/engine/src/core/renderer.h b/engine/src/core/renderer.h index d902cab..8d8709c 100644 --- a/engine/src/core/renderer.h +++ b/engine/src/core/renderer.h @@ -9,7 +9,7 @@ class Renderer { public: explicit Renderer(DoubleBuffer& doubleBuffer); - + unsigned int copyColorBuffer(unsigned int id, vector& colorBuffer) const; private: diff --git a/engine/src/nodes/incrementer.h b/engine/src/nodes/incrementer.h index 4b328b1..18f5e95 100644 --- a/engine/src/nodes/incrementer.h +++ b/engine/src/nodes/incrementer.h @@ -9,7 +9,7 @@ class Incrementer : public BasicNode, Color> { public: static void configure(Incrementer& node, NodeHandle& handle); - + virtual void init() override; virtual void update(const FrameContext& frame) override; @@ -17,7 +17,7 @@ class Incrementer : public BasicNode, Color> { private: Def colorInput; - + int increment = 0; NODE_IMPL(); diff --git a/engine/src/nodes/oscillators/saw_wave.h b/engine/src/nodes/oscillators/saw_wave.h index 24d6469..941f51f 100644 --- a/engine/src/nodes/oscillators/saw_wave.h +++ b/engine/src/nodes/oscillators/saw_wave.h @@ -8,7 +8,7 @@ class SawWave : public Waveform { public: static void configure(SawWave& node, NodeHandle& handle); - + float calculate(const FrameContext& frame) const override; private: diff --git a/engine/src/nodes/oscillators/sin_wave.h b/engine/src/nodes/oscillators/sin_wave.h index d573d3b..a43ec81 100644 --- a/engine/src/nodes/oscillators/sin_wave.h +++ b/engine/src/nodes/oscillators/sin_wave.h @@ -8,7 +8,7 @@ class SinWave : public Waveform { public: static void configure(SinWave& node, NodeHandle& handle); - + float calculate(const FrameContext& frame) const override; private: diff --git a/engine/src/nodes/oscillators/square_wave.h b/engine/src/nodes/oscillators/square_wave.h index 4904d8e..e4ac38f 100644 --- a/engine/src/nodes/oscillators/square_wave.h +++ b/engine/src/nodes/oscillators/square_wave.h @@ -8,7 +8,7 @@ class SquareWave : public Waveform { public: static void configure(SquareWave& node, NodeHandle& handle); - + float calculate(const FrameContext& frame) const override; private: diff --git a/engine/src/nodes/translate_node.hpp b/engine/src/nodes/translate_node.hpp index 064e5c1..dad6af8 100644 --- a/engine/src/nodes/translate_node.hpp +++ b/engine/src/nodes/translate_node.hpp @@ -15,7 +15,7 @@ FrameContext TranslateNode::modifyContext(const FrameContext& original) c pixel.x += translateX(original); pixel.y += translateY(original); pixel.z += translateZ(original); - + FragmentContext frag(pixel); FrameContext childFrame(original, &frag); return childFrame; diff --git a/engine/src/utils/reactive/observable_map.h b/engine/src/utils/reactive/observable_map.h index 74eb167..e6239fa 100644 --- a/engine/src/utils/reactive/observable_map.h +++ b/engine/src/utils/reactive/observable_map.h @@ -87,7 +87,7 @@ class ObservableMap : public Observes, public ObjectOwner { }; template -std::ostream& operator<<(std::ostream& os, const ObservableMap& om) { +std::ostream& operator<<(std::ostream& os, const ObservableMap& om) { return os << om.m; } diff --git a/engine/src/utils/reactive/observable_shared_ptr.h b/engine/src/utils/reactive/observable_shared_ptr.h index ba1945b..63d3f22 100644 --- a/engine/src/utils/reactive/observable_shared_ptr.h +++ b/engine/src/utils/reactive/observable_shared_ptr.h @@ -68,7 +68,7 @@ class ObservableSharedPtr : public Var> { }; template -std::ostream& operator<<(std::ostream& os, const ObservableSharedPtr& osp) { +std::ostream& operator<<(std::ostream& os, const ObservableSharedPtr& osp) { return os << osp.getValue(); } diff --git a/engine/src/utils/reactive/observable_vector.h b/engine/src/utils/reactive/observable_vector.h index 12c6124..f51f23b 100644 --- a/engine/src/utils/reactive/observable_vector.h +++ b/engine/src/utils/reactive/observable_vector.h @@ -113,7 +113,7 @@ class ObservableVector : public Observes, public ObjectOwner { }; template -std::ostream& operator<<(std::ostream& os, const ObservableVector& ov) { +std::ostream& operator<<(std::ostream& os, const ObservableVector& ov) { return os << ov.v; } diff --git a/engine/src/utils/reactive/scoped_observer.h b/engine/src/utils/reactive/scoped_observer.h index 696e82d..dac0ace 100644 --- a/engine/src/utils/reactive/scoped_observer.h +++ b/engine/src/utils/reactive/scoped_observer.h @@ -27,7 +27,7 @@ class ScopedObserver { Observer observer; void unsubscribe(); }; - + std::shared_ptr container; }; diff --git a/engine/src/utils/reactive/serializers/var_serializer.h b/engine/src/utils/reactive/serializers/var_serializer.h index ee29247..5e605ad 100644 --- a/engine/src/utils/reactive/serializers/var_serializer.h +++ b/engine/src/utils/reactive/serializers/var_serializer.h @@ -9,7 +9,7 @@ FORWARD_SERIALIZATION_TEMPLATE(Var); template void save(Archive& archive, const Var& v) -{ +{ archive(v.getValue()); } diff --git a/engine/src/utils/serialization/forward_serialization.h b/engine/src/utils/serialization/forward_serialization.h index 0fa80d5..f901c56 100644 --- a/engine/src/utils/serialization/forward_serialization.h +++ b/engine/src/utils/serialization/forward_serialization.h @@ -22,7 +22,7 @@ namespace cereal \ void prologue(JSONInputArchive& ar, const TYPE& t) {} \ template inline \ void epilogue(JSONInputArchive& ar, const TYPE& t) {} \ -} +} #define FORWARD_SERIALIZATION_TEMPLATE_2(TYPE) \ namespace cereal \ diff --git a/engine/src/utils/serialization/serializers/boost_uuid_serializer.h b/engine/src/utils/serialization/serializers/boost_uuid_serializer.h index 95322b3..33c94ae 100644 --- a/engine/src/utils/serialization/serializers/boost_uuid_serializer.h +++ b/engine/src/utils/serialization/serializers/boost_uuid_serializer.h @@ -8,7 +8,7 @@ namespace cereal { - + template inline std::string save_minimal(const Archive& ar, const boost::uuids::uuid& uuid) { diff --git a/engine/src/utils/type_erasure/weak_any_ptr.h b/engine/src/utils/type_erasure/weak_any_ptr.h index 0e8b1a5..c76be3d 100644 --- a/engine/src/utils/type_erasure/weak_any_ptr.h +++ b/engine/src/utils/type_erasure/weak_any_ptr.h @@ -20,7 +20,7 @@ class WeakAnyPtr { WeakAnyPtr(const std::shared_ptr& value); bool expired() const; - + template std::shared_ptr get() const; diff --git a/engine/src/utils/type_erasure/weak_any_ptr.hpp b/engine/src/utils/type_erasure/weak_any_ptr.hpp index 8ef0ea1..cfa0cae 100644 --- a/engine/src/utils/type_erasure/weak_any_ptr.hpp +++ b/engine/src/utils/type_erasure/weak_any_ptr.hpp @@ -4,7 +4,7 @@ WeakAnyPtr::WeakAnyPtr(const std::shared_ptr& value_) , anyPtr(*value_) { } - + template std::shared_ptr WeakAnyPtr::get() const { diff --git a/engine/test/test_data/blueprint/project_test_data.h b/engine/test/test_data/blueprint/project_test_data.h index d72d417..9028c5f 100644 --- a/engine/test/test_data/blueprint/project_test_data.h +++ b/engine/test/test_data/blueprint/project_test_data.h @@ -10,7 +10,7 @@ template struct TestIncrementer : public BasicNode, Color> { static void configure(TestIncrementer& node, NodeHandle& handle) { BasicNode, Color>::configure(node, handle); } - + void init() override { increment = 0; } void update(const FrameContext& frame) override { increment = (increment + 1) % 0x100; } Color calculate(const FrameContext& frame) const override { return Color(increment); } diff --git a/engine/test/tests/test_blueprints.cpp b/engine/test/tests/test_blueprints.cpp index d68191b..1f941ba 100644 --- a/engine/test/tests/test_blueprints.cpp +++ b/engine/test/tests/test_blueprints.cpp @@ -24,7 +24,7 @@ // output.colorBuffer.push_back(Color(0xFFFFFFFF)); // } // blueprint->initRenderable(model); - + // GIVEN("A CompoundNode with A registered color output ") { // auto compound = blueprint->makeSubnode(); @@ -33,12 +33,12 @@ // GIVEN("Two subnodes (constant color, incrementer)") { // auto constantColor = compound->makeSubnode(); // auto incrementer = compound->makeSubnode(); - + // GIVEN("The nodes are wired up to the blueprint") { // compound->wireSubnodes(*constantColor, "output", *incrementer, "color"); // compound->wireOutput("color", *incrementer, "output"); // blueprint->wireOutput("color", *compound, "color"); - + // WHEN("The blueprint is updated") { // blueprint->update(frame); // THEN("no crash") { @@ -53,8 +53,8 @@ // } // } // } -// } -// } +// } +// } // } // } // } \ No newline at end of file diff --git a/engine/test/tests/test_components.cpp b/engine/test/tests/test_components.cpp index 7d754c2..5c45dbe 100644 --- a/engine/test/tests/test_components.cpp +++ b/engine/test/tests/test_components.cpp @@ -11,7 +11,7 @@ // ConstantColorNode c; // WHEN("We inspect its name") { - + // THEN("We get a value") { // REQUIRE(c.nodeName() != ""); // } diff --git a/engine/test/tests/utils/reactive/test_rxcpp.cpp b/engine/test/tests/utils/reactive/test_rxcpp.cpp index 9cb90e2..655fbf0 100644 --- a/engine/test/tests/utils/reactive/test_rxcpp.cpp +++ b/engine/test/tests/utils/reactive/test_rxcpp.cpp @@ -130,7 +130,7 @@ SCENARIO("pairing values with replaysubject") { rs.get_subscriber().on_next(10); THEN("the callback is called with the new value") { REQUIRE(calls == 1); - } + } } } GIVEN("it starts with 1 value") { diff --git a/engine/test/tests/utils/reactive/test_var.cpp b/engine/test/tests/utils/reactive/test_var.cpp index 5cc13fe..02e2735 100644 --- a/engine/test/tests/utils/reactive/test_var.cpp +++ b/engine/test/tests/utils/reactive/test_var.cpp @@ -287,7 +287,7 @@ SCENARIO("using Var") { REQUIRE(calls10a == 1); REQUIRE(calls10b == 1); REQUIRE(calls11 == 1); - + } } } @@ -702,7 +702,7 @@ SCENARIO("Using Var.pairWithPrevious()") { GIVEN("an empty var") { Var v; WHEN("pairWithPrevious is observed") { - + } } }