Skip to content

Commit

Permalink
remove trailing spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
kylefleming committed Nov 12, 2015
1 parent 055ae6a commit 11ea495
Show file tree
Hide file tree
Showing 25 changed files with 30 additions and 31 deletions.
2 changes: 1 addition & 1 deletion engine/src/blueprint/node.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
1 change: 0 additions & 1 deletion engine/src/blueprint/node_handle.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class NodeHandle : public DataTransmitter {
virtual void setBridge(DataBridge& bridge);

private:

Var<string> name;

ObservableVector<shared_ptr<NodeSocket>> inputs;
Expand Down
2 changes: 1 addition & 1 deletion engine/src/blueprint/node_registrar.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class NodeRegistrar : public Singleton<NodeRegistrar> {
}

// 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.
Expand Down
2 changes: 1 addition & 1 deletion engine/src/blueprint/node_signal.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class NodeSignal : public DataTransmitter {
virtual void unwireOutput(NodeSocket& destinationNodeSocket);

bool belongsTo(const NodeHandle& nodeHandle) const;

Var<string> name;

protected:
Expand Down
2 changes: 1 addition & 1 deletion engine/src/core/rasterization_thread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
2 changes: 1 addition & 1 deletion engine/src/core/renderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Renderer {

public:
explicit Renderer(DoubleBuffer<Color>& doubleBuffer);

unsigned int copyColorBuffer(unsigned int id, vector<Color>& colorBuffer) const;

private:
Expand Down
4 changes: 2 additions & 2 deletions engine/src/nodes/incrementer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ class Incrementer : public BasicNode<Skip<Input, 1>, Color> {

public:
static void configure(Incrementer<Input>& node, NodeHandle& handle);

virtual void init() override;
virtual void update(const FrameContext& frame) override;

Color calculate(const FrameContext& frame) const override;

private:
Def<Input, 0, Color> colorInput;

int increment = 0;

NODE_IMPL();
Expand Down
2 changes: 1 addition & 1 deletion engine/src/nodes/oscillators/saw_wave.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class SawWave : public Waveform<Input> {

public:
static void configure(SawWave<Input>& node, NodeHandle& handle);

float calculate(const FrameContext& frame) const override;

private:
Expand Down
2 changes: 1 addition & 1 deletion engine/src/nodes/oscillators/sin_wave.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class SinWave : public Waveform<Input> {

public:
static void configure(SinWave<Input>& node, NodeHandle& handle);

float calculate(const FrameContext& frame) const override;

private:
Expand Down
2 changes: 1 addition & 1 deletion engine/src/nodes/oscillators/square_wave.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class SquareWave : public Waveform<Input> {

public:
static void configure(SquareWave<Input>& node, NodeHandle& handle);

float calculate(const FrameContext& frame) const override;

private:
Expand Down
2 changes: 1 addition & 1 deletion engine/src/nodes/translate_node.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ FrameContext TranslateNode<Input>::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;
Expand Down
2 changes: 1 addition & 1 deletion engine/src/utils/reactive/observable_map.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class ObservableMap : public Observes, public ObjectOwner {
};

template<typename KeyT, typename ValueT>
std::ostream& operator<<(std::ostream& os, const ObservableMap<KeyT, ValueT>& om) {
std::ostream& operator<<(std::ostream& os, const ObservableMap<KeyT, ValueT>& om) {
return os << om.m;
}

Expand Down
2 changes: 1 addition & 1 deletion engine/src/utils/reactive/observable_shared_ptr.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class ObservableSharedPtr : public Var<std::shared_ptr<T>> {
};

template<typename T>
std::ostream& operator<<(std::ostream& os, const ObservableSharedPtr<T>& osp) {
std::ostream& operator<<(std::ostream& os, const ObservableSharedPtr<T>& osp) {
return os << osp.getValue();
}

Expand Down
2 changes: 1 addition & 1 deletion engine/src/utils/reactive/observable_vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class ObservableVector : public Observes, public ObjectOwner {
};

template<typename T>
std::ostream& operator<<(std::ostream& os, const ObservableVector<T>& ov) {
std::ostream& operator<<(std::ostream& os, const ObservableVector<T>& ov) {
return os << ov.v;
}

Expand Down
2 changes: 1 addition & 1 deletion engine/src/utils/reactive/scoped_observer.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ScopedObserver {
Observer observer;
void unsubscribe();
};

std::shared_ptr<ScopedObserverContainer> container;

};
2 changes: 1 addition & 1 deletion engine/src/utils/reactive/serializers/var_serializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FORWARD_SERIALIZATION_TEMPLATE(Var);

template <typename Archive, typename T>
void save(Archive& archive, const Var<T>& v)
{
{
archive(v.getValue());
}

Expand Down
2 changes: 1 addition & 1 deletion engine/src/utils/serialization/forward_serialization.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace cereal \
void prologue(JSONInputArchive& ar, const TYPE<T>& t) {} \
template <typename T> inline \
void epilogue(JSONInputArchive& ar, const TYPE<T>& t) {} \
}
}

#define FORWARD_SERIALIZATION_TEMPLATE_2(TYPE) \
namespace cereal \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace cereal
{

template<class Archive> inline
std::string save_minimal(const Archive& ar, const boost::uuids::uuid& uuid)
{
Expand Down
2 changes: 1 addition & 1 deletion engine/src/utils/type_erasure/weak_any_ptr.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class WeakAnyPtr {
WeakAnyPtr(const std::shared_ptr<ValueType>& value);

bool expired() const;

template <typename T>
std::shared_ptr<T> get() const;

Expand Down
2 changes: 1 addition & 1 deletion engine/src/utils/type_erasure/weak_any_ptr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WeakAnyPtr::WeakAnyPtr(const std::shared_ptr<ValueType>& value_)
, anyPtr(*value_)
{
}

template <typename T>
std::shared_ptr<T> WeakAnyPtr::get() const
{
Expand Down
2 changes: 1 addition & 1 deletion engine/test/test_data/blueprint/project_test_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ template<typename Input>
struct TestIncrementer : public BasicNode<Skip<Input, 1>, Color> {
static void configure(TestIncrementer<Input>& node, NodeHandle& handle)
{ BasicNode<Skip<Input, 1>, 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); }
Expand Down
10 changes: 5 additions & 5 deletions engine/test/tests/test_blueprints.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<CompoundNode>();
Expand All @@ -33,12 +33,12 @@
// GIVEN("Two subnodes (constant color, incrementer)") {
// auto constantColor = compound->makeSubnode<ConstantColorNode>();
// auto incrementer = compound->makeSubnode<Incrementer>();

// 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") {
Expand All @@ -53,8 +53,8 @@
// }
// }
// }
// }
// }
// }
// }
// }
// }
// }
2 changes: 1 addition & 1 deletion engine/test/tests/test_components.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// ConstantColorNode c;

// WHEN("We inspect its name") {

// THEN("We get a value") {
// REQUIRE(c.nodeName() != "");
// }
Expand Down
2 changes: 1 addition & 1 deletion engine/test/tests/utils/reactive/test_rxcpp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
4 changes: 2 additions & 2 deletions engine/test/tests/utils/reactive/test_var.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ SCENARIO("using Var<int>") {
REQUIRE(calls10a == 1);
REQUIRE(calls10b == 1);
REQUIRE(calls11 == 1);

}
}
}
Expand Down Expand Up @@ -702,7 +702,7 @@ SCENARIO("Using Var.pairWithPrevious()") {
GIVEN("an empty var") {
Var<int> v;
WHEN("pairWithPrevious is observed") {

}
}
}

0 comments on commit 11ea495

Please sign in to comment.