diff options
author | Tom Barrett <tombarrett@cornell.engr.siu.edu> | 2015-05-01 13:06:29 -0500 |
---|---|---|
committer | Tom Barrett <tombarrett@cornell.engr.siu.edu> | 2015-05-01 13:06:29 -0500 |
commit | 7cbc9334a09540627df8845bb9952196276ae6f9 (patch) | |
tree | a6173cfba42e457c5732f850a24d0b296da03a34 | |
parent | 87d20801300e90423c17ad425364f77152eb88c3 (diff) |
removed duplicates and redirected images
-rw-r--r-- | images/Cbasic.png | bin | 3081 -> 0 bytes | |||
-rw-r--r-- | images/Rbasic.png | bin | 1310 -> 0 bytes | |||
-rw-r--r-- | src/creature.h | 12 | ||||
-rw-r--r-- | src/entity.h | 20 | ||||
-rw-r--r-- | src/event.h | 21 | ||||
-rw-r--r-- | src/main.cpp | 4 | ||||
-rw-r--r-- | src/main.h | 10 | ||||
-rw-r--r-- | src/resource.h | 12 | ||||
-rw-r--r-- | src/window.h | 24 |
9 files changed, 2 insertions, 101 deletions
diff --git a/images/Cbasic.png b/images/Cbasic.png Binary files differdeleted file mode 100644 index 6d1f592..0000000 --- a/images/Cbasic.png +++ /dev/null diff --git a/images/Rbasic.png b/images/Rbasic.png Binary files differdeleted file mode 100644 index 9f668cf..0000000 --- a/images/Rbasic.png +++ /dev/null diff --git a/src/creature.h b/src/creature.h deleted file mode 100644 index 5f5bb8d..0000000 --- a/src/creature.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef creature_h -#define creature_h - -#include "entity.h" - -class Creature: public Entity -{ - public: - Creature(Window m, std::string s); -}; - -#endif diff --git a/src/entity.h b/src/entity.h deleted file mode 100644 index 1d16a2c..0000000 --- a/src/entity.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef entity_h -#define entity_h - -#include "window.h" - -class Entity -{ - public: - void Place(); - SDL_Texture* loadTexture(std::string path, Window main); - - protected: - int x, y; - int height, width; - int degrees = 0; - SDL_Texture* texture; - SDL_Renderer* renderer; -}; - -#endif diff --git a/src/event.h b/src/event.h deleted file mode 100644 index 9ba7eea..0000000 --- a/src/event.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef event_h -#define event_h - -#include "window.h" - -class Event -{ - public: - Event(); - int Poll(); - void off(); - bool gRun(); - SDL_Event& gEvent(); - int gEventType(); - - private: - bool run; - SDL_Event v; -}; - -#endif diff --git a/src/main.cpp b/src/main.cpp index 88a34dc..eaa449d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,8 +3,8 @@ int main()
{
Window main;
- Creature testcreature(main, "images/Cbasic.png");
- Resource testresource(main, "images/Rbasic.png");
+ Creature testcreature(main, "img/Cbasic.png");
+ Resource testresource(main, "img/Rbasic.png");
Event e;
while(e.gRun())
diff --git a/src/main.h b/src/main.h deleted file mode 100644 index d026886..0000000 --- a/src/main.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef main_h -#define main_h - -#include "window.h" -#include "entity.h" -#include "event.h" -#include "creature.h" -#include "resource.h" - -#endif diff --git a/src/resource.h b/src/resource.h deleted file mode 100644 index 463f355..0000000 --- a/src/resource.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef resource_h -#define resource_h - -#include "entity.h" - -class Resource: public Entity -{ - public: - Resource(Window m, std::string s); -}; - -#endif diff --git a/src/window.h b/src/window.h deleted file mode 100644 index fb1cf67..0000000 --- a/src/window.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef window_h -#define window_h - -#include <SDL2/SDL.h> -#include <SDL2/SDL_image.h> -#include <string> -#include <cmath> - -class Window -{ - public: - Window(); - void Destroy(); - - void Clear(); - void Render(); - SDL_Renderer* getRenderer(); - - private: - SDL_Window* main; - SDL_Renderer* renderer; -}; - -#endif |