diff --git a/SFMLEngine/makingAGameTick/scenenode.cpp b/SFMLEngine/makingAGameTick/SceneNode.cpp similarity index 98% rename from SFMLEngine/makingAGameTick/scenenode.cpp rename to SFMLEngine/makingAGameTick/SceneNode.cpp index 41efe5e..9c6b10f 100644 --- a/SFMLEngine/makingAGameTick/scenenode.cpp +++ b/SFMLEngine/makingAGameTick/SceneNode.cpp @@ -1,7 +1,6 @@ #ifndef SCENE_NODE_CPP #define SCENE_NODE_CPP -#include "scenenode.hpp" void SceneNode::attachChild(ScenePointer child) // takes ownership of the scene node { @@ -32,7 +31,7 @@ SceneNode::ScenePointer SceneNode::detachChild(const SceneNode& node) // finds n void SceneNode::drawCurrent(sf::RenderTarget& target, sf::RenderStates states) const { - + } void SceneNode::draw(sf::RenderTarget& target, sf::RenderStates states) const diff --git a/SFMLEngine/makingAGameTick/scenenode.hpp b/SFMLEngine/makingAGameTick/SceneNode.hpp similarity index 98% rename from SFMLEngine/makingAGameTick/scenenode.hpp rename to SFMLEngine/makingAGameTick/SceneNode.hpp index f3da137..14f2922 100644 --- a/SFMLEngine/makingAGameTick/scenenode.hpp +++ b/SFMLEngine/makingAGameTick/SceneNode.hpp @@ -29,6 +29,6 @@ class SceneNode : public sf::Transformable, public sf::Drawable, private sf::Non }; -#include "scenenode.cpp" +#include "SceneNode.cpp" #endif diff --git a/SFMLEngine/makingAGameTick/app b/SFMLEngine/makingAGameTick/app deleted file mode 100755 index 90483f1..0000000 Binary files a/SFMLEngine/makingAGameTick/app and /dev/null differ diff --git a/SFMLEngine/makingAGameTick/entity.hpp b/SFMLEngine/makingAGameTick/entity.hpp index 45799c5..81cfa89 100644 --- a/SFMLEngine/makingAGameTick/entity.hpp +++ b/SFMLEngine/makingAGameTick/entity.hpp @@ -1,15 +1,17 @@ #ifndef ENTITY_HPP #define ENTITY_HPP +#include "SceneNode.hpp" +#include "SceneNode.cpp" -class Entity +class Entity : public SceneNode { -public: - void SetVelocity(sf::Vector2f velocity); - void setVelocity(float velocityX, float velocityY); - sf::Vector2f getVelocity() const; + public: + void SetVelocity(sf::Vector2f velocity); + void setVelocity(float velocityX, float velocityY); + sf::Vector2f getVelocity() const; private: - sf::Vector2f mVelocity; // default ocnstructor initializes this vector to a zero vector + sf::Vector2f mVelocity; // default ocnstructor initializes this vector to a zero vector }; diff --git a/SFMLEngine/makingAGameTick/game.cpp b/SFMLEngine/makingAGameTick/game.cpp index 9b211b9..b86b4d2 100644 --- a/SFMLEngine/makingAGameTick/game.cpp +++ b/SFMLEngine/makingAGameTick/game.cpp @@ -5,9 +5,9 @@ #include #include "constants.hpp" #include "resources.hpp" +#include "SceneNode.hpp" #include "entity.hpp" #include "aircraft.hpp" -#include "scenenode.hpp" #include "basic.cpp" diff --git a/SFMLEngine/makingAGameTick/game.o b/SFMLEngine/makingAGameTick/game.o index caab821..d92c076 100644 Binary files a/SFMLEngine/makingAGameTick/game.o and b/SFMLEngine/makingAGameTick/game.o differ