Beginning to create a cros platform graphics API

MatthewScholefield · Jun 20, 2016 · 8424504 · 8424504
1 parent 715e2e1
commit 8424504
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,7 +67,7 @@ include_directories("source/")
 include_directories("source-SFML/")
 
 file(GLOB_RECURSE Foo_SOURCES "source/*.cpp" "source-SFML/*.cpp")
-file(GLOB_RECURSE Foo_HEADERS "source/*.hpp" "source-SFML/*.cpp")
+file(GLOB_RECURSE Foo_HEADERS "source/*.hpp" "source-SFML/*.hpp")
 
 set (Foo_INCLUDE_DIRS "")
 foreach (_headerFile ${Foo_HEADERS})

diff --git a/assets/gfx/texture.grit → assets/gfx/blocks.grit b/assets/gfx/texture.grit → assets/gfx/blocks.grit
diff --git a/assets/gfx/texture.png → assets/gfx/blocks.png b/assets/gfx/texture.png → assets/gfx/blocks.png
diff --git a/assets/gfx/mobs.grit b/assets/gfx/mobs.grit
@@ -0,0 +1,7 @@
+#An 8 bit sprite
+-gB8
+#A tiled image
+-gt
+-th 16
+#The Transperant colour of 0xFF00FF
+-gT FF00FF
diff --git a/assets/gfx/mobs.png b/assets/gfx/mobs.png
diff --git a/...ce/Backend/Graphics/AnimatedMobSprite.cpp → ...ML/Backend/Graphics/AnimatedMobSprite.cpp b/...ce/Backend/Graphics/AnimatedMobSprite.cpp → ...ML/Backend/Graphics/AnimatedMobSprite.cpp
diff --git a/...ce/Backend/Graphics/AnimatedMobSprite.hpp → ...ML/Backend/Graphics/AnimatedMobSprite.hpp b/...ce/Backend/Graphics/AnimatedMobSprite.hpp → ...ML/Backend/Graphics/AnimatedMobSprite.hpp
diff --git a/...Backend/Graphics/AnimatedSpritePlayer.cpp → ...Backend/Graphics/AnimatedSpritePlayer.cpp b/...Backend/Graphics/AnimatedSpritePlayer.cpp → ...Backend/Graphics/AnimatedSpritePlayer.cpp
diff --git a/...Backend/Graphics/AnimatedSpritePlayer.hpp → ...Backend/Graphics/AnimatedSpritePlayer.hpp b/...Backend/Graphics/AnimatedSpritePlayer.hpp → ...Backend/Graphics/AnimatedSpritePlayer.hpp
diff --git a/source/Backend/Graphics/Animation.cpp → source-SFML/Backend/Graphics/Animation.cpp b/source/Backend/Graphics/Animation.cpp → source-SFML/Backend/Graphics/Animation.cpp
diff --git a/source/Backend/Graphics/Animation.hpp → source-SFML/Backend/Graphics/Animation.hpp b/source/Backend/Graphics/Animation.hpp → source-SFML/Backend/Graphics/Animation.hpp
diff --git a/source/Backend/Graphics/RenderWindow.hpp → ...ce-SFML/Backend/Graphics/RenderWindow.hpp b/source/Backend/Graphics/RenderWindow.hpp → ...ce-SFML/Backend/Graphics/RenderWindow.hpp
diff --git a/source-SFML/TextureManager.cpp → source-SFML/SFMLGraphics.cpp b/source-SFML/TextureManager.cpp → source-SFML/SFMLGraphics.cpp
@@ -17,28 +17,28 @@
 
 #include <SFML/Graphics.hpp>
 #include <SFML/Window.hpp>
-#include "TextureManager.hpp"
+#include "SFMLGraphics.hpp"
 
-TextureManager::TextureManager(const sf::Vector2f &SIZE) : rectangle({})
+SFMLGraphics::SFMLGraphics(const sf::Vector2f &SIZE) : rectangle({})
 {
 	resize(SIZE);
 }
 
-TextureManager::TextureManager(const TextureManager& orig) { }
+SFMLGraphics::SFMLGraphics(const SFMLGraphics& orig) { }
 
-TextureManager::~TextureManager() { }
+SFMLGraphics::~SFMLGraphics() { }
 
-bool TextureManager::loadTexture()
+bool SFMLGraphics::loadTexture()
 {
-	if (!image.loadFromFile("gfx/texture.png"))
+	if (!image.loadFromFile("gfx/blocks.png"))
 		return false;
 	image.createMaskFromColor(sf::Color(255, 0, 255));
 	texture.loadFromImage(image);
 	texture.setSmooth(false);
 	return true;
 }
 
-void TextureManager::resize(const sf::Vector2f &SIZE)
+void SFMLGraphics::resize(const sf::Vector2f &SIZE)
 {
 	sf::Color skyColors[2] = {
 		{10, 30, 100},
@@ -55,12 +55,12 @@ void TextureManager::resize(const sf::Vector2f &SIZE)
 	rectangle = temp;
 }
 
-sf::Texture &TextureManager::getTexture()
+sf::Texture &SFMLGraphics::getTexture()
 {
 	return texture;
 }
 
-void TextureManager::drawSky(sf::RenderWindow &window)
+void SFMLGraphics::drawSky(sf::RenderWindow &window)
 {
 	std::array<sf::Vertex, 4> temp(rectangle);
 	const sf::Vector2i &pos = window.mapCoordsToPixel(sf::Vector2f(0, 0));

diff --git a/source-SFML/TextureManager.hpp → source-SFML/SFMLGraphics.hpp b/source-SFML/TextureManager.hpp → source-SFML/SFMLGraphics.hpp
@@ -27,12 +27,12 @@ class Vertex;
 class RenderWindow;
 }
 
-class TextureManager
+class SFMLGraphics
 {
 public:
-	TextureManager(const sf::Vector2f &SIZE);
-	TextureManager(const TextureManager& orig);
-	virtual ~TextureManager();
+	SFMLGraphics(const sf::Vector2f &SIZE);
+	SFMLGraphics(const SFMLGraphics& orig);
+	virtual ~SFMLGraphics();
 	bool loadTexture();
 	sf::Texture &getTexture();
 	void resize(const sf::Vector2f &SIZE);

diff --git a/source-SFML/main.cpp b/source-SFML/main.cpp
@@ -4,7 +4,7 @@
 #include "World/Entities/Entity.hpp"
 #include "World/WorldRenderer.hpp" // renderer
 #include "World/World.hpp"
-#include "TextureManager.hpp"
+#include "SFMLGraphics.hpp"
 #include "EntityHandler.hpp" // world
 #include <memory>
 #include <iostream> // world
@@ -22,7 +22,7 @@ int main()
 
 	sf::Clock deltaClock;
 
-	TextureManager textureManager(view.getSize());
+	SFMLGraphics textureManager(view.getSize());
 	if (!textureManager.loadTexture())
 		return 1;