From 5d39d476336cdacd3282f91cf21d2cc01889c892 Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 2 Jan 2019 20:23:08 +0000 Subject: [PATCH] made header guards follow the google c++ standards and switched to the #ifndef style instead of using pragmas --- .vscode/settings.json | 3 ++- bin/crumpet-engine | Bin 113280 -> 113392 bytes include/colour.h | 5 ++++- include/logger.h | 5 ++++- src/crumpet-engine/crumpet-engine.h | 5 ++++- src/crumpet-engine/entitymanager/entity.h | 5 ++++- src/crumpet-engine/entitymanager/entitybase.h | 7 +++++-- .../entitymanager/entitymanager.h | 5 ++++- src/crumpet-engine/game.h | 5 ++++- src/crumpet-engine/input/input.h | 5 ++++- src/crumpet-engine/input/keyboard.h | 8 +++++--- src/crumpet-engine/input/mouse.h | 5 ++++- src/crumpet-engine/math.h | 5 ++++- src/crumpet-engine/rect.h | 5 ++++- src/crumpet-engine/renderengine/renderer.h | 5 ++++- .../resourcemanager/resourcemanager.h | 5 ++++- .../resourcemanager/texturemanager.cpp | 6 +++++- .../resourcemanager/texturemanager.h | 8 ++++++-- src/main.cpp | 2 +- 19 files changed, 72 insertions(+), 22 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index a39e00b..f304ef8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -53,6 +53,7 @@ "variant": "cpp", "condition_variable": "cpp", "mutex": "cpp", - "valarray": "cpp" + "valarray": "cpp", + "map": "cpp" } } \ No newline at end of file diff --git a/bin/crumpet-engine b/bin/crumpet-engine index d7bef7dca0cbdbd9f92f7d07a3822edc7e977e99..87ac3d0ac02a3bdd372fbcaadbafdfe1607c4c89 100755 GIT binary patch delta 17044 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 #include @@ -61,3 +62,5 @@ public: std::cout << "\033[" << colour << "m"; } }; + +#endif diff --git a/include/logger.h b/include/logger.h index ca9b1f4..ff2dba7 100644 --- a/include/logger.h +++ b/include/logger.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _INCLUDE_LOGGER_H_ +#define _INCLUDE_LOGGER_H_ #include #include @@ -70,3 +71,5 @@ private: return stream.str(); } }; + +#endif diff --git a/src/crumpet-engine/crumpet-engine.h b/src/crumpet-engine/crumpet-engine.h index ddeeba3..cfe2897 100644 --- a/src/crumpet-engine/crumpet-engine.h +++ b/src/crumpet-engine/crumpet-engine.h @@ -1,7 +1,10 @@ -#pragma once +#ifndef _CRUMPET_ENGINE_H_ +#define _CRUMPET_ENGINE_H_ #include "game.h" #include #include #undef main + +#endif diff --git a/src/crumpet-engine/entitymanager/entity.h b/src/crumpet-engine/entitymanager/entity.h index 0864625..58356f1 100644 --- a/src/crumpet-engine/entitymanager/entity.h +++ b/src/crumpet-engine/entitymanager/entity.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _ENTITYMANAGER_ENTITY_H_ +#define _ENTITYMANAGER_ENTITY_H_ #include "entitybase.h" @@ -8,3 +9,5 @@ public: virtual ~Entity(); }; + +#endif diff --git a/src/crumpet-engine/entitymanager/entitybase.h b/src/crumpet-engine/entitymanager/entitybase.h index d7a3df0..a16f5a1 100644 --- a/src/crumpet-engine/entitymanager/entitybase.h +++ b/src/crumpet-engine/entitymanager/entitybase.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _ENTITYMANAGER_BASE_H_ +#define _ENTITYMANAGER_BASE_H_ #include #include "../math.h" @@ -9,7 +10,7 @@ class EntityBase { public: EntityBase(); - SDL_Texture* texture; + Texture* texture; virtual ~EntityBase(); private: @@ -17,3 +18,5 @@ private: std::string textureSource; Vec2 textureDimensions; }; + +#endif diff --git a/src/crumpet-engine/entitymanager/entitymanager.h b/src/crumpet-engine/entitymanager/entitymanager.h index 5187dca..499587e 100644 --- a/src/crumpet-engine/entitymanager/entitymanager.h +++ b/src/crumpet-engine/entitymanager/entitymanager.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _ENTITYMANAGER_ENTITYMANAGER_H_ +#define _ENTITYMANAGER_ENTITYMANAGER_H_ #include #include @@ -16,3 +17,5 @@ private: std::map m_activeEntities; ResourceManger* resourceManger; }; + +#endif diff --git a/src/crumpet-engine/game.h b/src/crumpet-engine/game.h index 7c8be7c..61bc243 100644 --- a/src/crumpet-engine/game.h +++ b/src/crumpet-engine/game.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _GAME_H_ +#define _GAME_H_ #include #include @@ -25,3 +26,5 @@ public: virtual ~Game(); }; + +#endif diff --git a/src/crumpet-engine/input/input.h b/src/crumpet-engine/input/input.h index e323ea2..6b53692 100644 --- a/src/crumpet-engine/input/input.h +++ b/src/crumpet-engine/input/input.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _INPUT_INPUT_H_ +#define _INPUT_INPUT_H_ #include #include @@ -20,3 +21,5 @@ private: SDL_Event m_event; Renderer* m_renderer; }; + +#endif diff --git a/src/crumpet-engine/input/keyboard.h b/src/crumpet-engine/input/keyboard.h index 09d7ffe..0d8f980 100644 --- a/src/crumpet-engine/input/keyboard.h +++ b/src/crumpet-engine/input/keyboard.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _INPUT_KEYBOARD_H_ +#define _INPUT_KEYBOARD_H_ typedef enum { KEY_A, @@ -48,6 +49,7 @@ typedef enum { class Keyboard { public: Key lastOutput = KEY_SPACE; - - + // do this with states }; + +#endif diff --git a/src/crumpet-engine/input/mouse.h b/src/crumpet-engine/input/mouse.h index 6f70f09..0a7b702 100644 --- a/src/crumpet-engine/input/mouse.h +++ b/src/crumpet-engine/input/mouse.h @@ -1 +1,4 @@ -#pragma once +#ifndef _INPUT_MOUSE_H +#define _INPUT_MOUSE_H + +#endif diff --git a/src/crumpet-engine/math.h b/src/crumpet-engine/math.h index 6c587c6..6a582d4 100644 --- a/src/crumpet-engine/math.h +++ b/src/crumpet-engine/math.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _MATH_H_ +#define _MATH_H_ const float DEG2RAD = 0.01745329251994329576923690768f; const float RAD2DEG = 57.2957795130823208767981548141f; @@ -218,3 +219,5 @@ struct Vec2 { return *this; } }; + +#endif diff --git a/src/crumpet-engine/rect.h b/src/crumpet-engine/rect.h index bcf123f..109cff0 100644 --- a/src/crumpet-engine/rect.h +++ b/src/crumpet-engine/rect.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _RECT_H_ +#define _RECT_H_ #include #include @@ -68,3 +69,5 @@ public: private: SDL_Rect* rect; }; + +#endif diff --git a/src/crumpet-engine/renderengine/renderer.h b/src/crumpet-engine/renderengine/renderer.h index e505009..dc4016a 100644 --- a/src/crumpet-engine/renderengine/renderer.h +++ b/src/crumpet-engine/renderengine/renderer.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _RENDERENGINE_RENDERER_H_ +#define _RENDERENGINE_RENDERER_H_ #include #include @@ -26,3 +27,5 @@ private: SDL_Window* m_window; bool m_isWindowClosed; }; + +#endif diff --git a/src/crumpet-engine/resourcemanager/resourcemanager.h b/src/crumpet-engine/resourcemanager/resourcemanager.h index e3deb19..6cd61bf 100644 --- a/src/crumpet-engine/resourcemanager/resourcemanager.h +++ b/src/crumpet-engine/resourcemanager/resourcemanager.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _RESOURCEMANAGER_RESOURCEMANAGER_H_ +#define _RESOURCEMANAGER_RESOURCEMANAGER_H_ #include "texturemanager.h" @@ -10,3 +11,5 @@ public: virtual ~ResourceManger() {}; }; + +#endif diff --git a/src/crumpet-engine/resourcemanager/texturemanager.cpp b/src/crumpet-engine/resourcemanager/texturemanager.cpp index ce366fb..04761aa 100644 --- a/src/crumpet-engine/resourcemanager/texturemanager.cpp +++ b/src/crumpet-engine/resourcemanager/texturemanager.cpp @@ -33,7 +33,11 @@ void TextureManager::unregisterTexture(std::string textureName) { delete &m_registerdTextures[textureName]; } -SDL_Texture* TextureManager::getTexture(std::string textureName) { +Texture* TextureManager::getTexture(std::string textureName) { + return m_registerdTextures[textureName]; +} + +SDL_Texture* TextureManager::getSDLTexture(std::string textureName) { return m_registerdTextures[textureName]->texture; } diff --git a/src/crumpet-engine/resourcemanager/texturemanager.h b/src/crumpet-engine/resourcemanager/texturemanager.h index 7fbb250..9ec9872 100644 --- a/src/crumpet-engine/resourcemanager/texturemanager.h +++ b/src/crumpet-engine/resourcemanager/texturemanager.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _RESOURCEMANAGER_TEXTUREMANAGER_H_ +#define _RESOURCEMANAGER_TEXTUREMANAGER_H_ #include #include @@ -24,7 +25,8 @@ public: bool registerTexture(std::string textureSource, std::string textureName); void unregisterTexture(std::string textureName); - SDL_Texture* getTexture(std::string textureName); + Texture* getTexture(std::string textureName); + SDL_Texture* getSDLTexture(std::string textureName); std::string getTextureSource(std::string textureName); virtual ~TextureManager(); @@ -32,3 +34,5 @@ private: std::map m_registerdTextures; Renderer* m_renderer; }; + +#endif diff --git a/src/main.cpp b/src/main.cpp index 2c47099..fe599dd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,7 +14,7 @@ int main(int argc, char** argv) { game.input.poll(); Rect rectfrom(0, 0, 1000, 1000); Rect rectTo(-300, 0, 1000, 1000); - SDL_RenderCopy(game.renderer.SDLRenderer, game.textureManager.getTexture("mario"), rectfrom.ToSDLRect(), rectTo.ToSDLRect()); + SDL_RenderCopy(game.renderer.SDLRenderer, game.textureManager.getSDLTexture("mario"), rectfrom.ToSDLRect(), rectTo.ToSDLRect()); game.renderer.update(); } }