however

src/assets/Assets.cpp

@@ -1,4 +1,4 @@
-#include "Assets.h"
+#include "Assets.hpp"
 
 #include "../audio/audio.hpp"
 #include "../graphics/core/Texture.hpp"
@@ -12,76 +12,76 @@ Assets::~Assets() {
 }
 
 Texture* Assets::getTexture(std::string name) const {
-	auto found = textures.find(name);
-	if (found == textures.end())
-		return nullptr;
-	return found->second.get();
+    auto found = textures.find(name);
+    if (found == textures.end())
+        return nullptr;
+    return found->second.get();
 }
 
 void Assets::store(Texture* texture, std::string name){
-	textures.emplace(name, texture);
+    textures.emplace(name, texture);
 }
 
 
 Shader* Assets::getShader(std::string name) const{
-	auto found = shaders.find(name);
-	if (found == shaders.end())
-		return nullptr;
-	return found->second.get();
+    auto found = shaders.find(name);
+    if (found == shaders.end())
+        return nullptr;
+    return found->second.get();
 }
 
 void Assets::store(Shader* shader, std::string name){
-	shaders.emplace(name, shader);
+    shaders.emplace(name, shader);
 }
 
 Font* Assets::getFont(std::string name) const {
-	auto found = fonts.find(name);
-	if (found == fonts.end())
-		return nullptr;
-	return found->second.get();
+    auto found = fonts.find(name);
+    if (found == fonts.end())
+        return nullptr;
+    return found->second.get();
 }
 
 void Assets::store(Font* font, std::string name){
-	fonts.emplace(name, font);
+    fonts.emplace(name, font);
 }
 
 Atlas* Assets::getAtlas(std::string name) const {
-	auto found = atlases.find(name);
-	if (found == atlases.end())
-		return nullptr;
-	return found->second.get();
+    auto found = atlases.find(name);
+    if (found == atlases.end())
+        return nullptr;
+    return found->second.get();
 }
 
 void Assets::store(Atlas* atlas, std::string name){
-	atlases.emplace(name, atlas);
+    atlases.emplace(name, atlas);
 }
 
 audio::Sound* Assets::getSound(std::string name) const {
-	auto found = sounds.find(name);
-	if (found == sounds.end())
-		return nullptr;
-	return found->second.get();
+    auto found = sounds.find(name);
+    if (found == sounds.end())
+        return nullptr;
+    return found->second.get();
 }
 
 void Assets::store(audio::Sound* sound, std::string name) {
-	sounds.emplace(name, sound);
+    sounds.emplace(name, sound);
 }
 
 const std::vector<TextureAnimation>& Assets::getAnimations() {
-	return animations;
+    return animations;
 }
 
 void Assets::store(const TextureAnimation& animation) {
-	animations.emplace_back(animation);
+    animations.emplace_back(animation);
 }
 
 UiDocument* Assets::getLayout(std::string name) const {
-	auto found = layouts.find(name);
-	if (found == layouts.end())
-		return nullptr;
-	return found->second.get();
+    auto found = layouts.find(name);
+    if (found == layouts.end())
+        return nullptr;
+    return found->second.get();
 }
 
 void Assets::store(UiDocument* layout, std::string name) {
-	layouts[name] = std::shared_ptr<UiDocument>(layout);
+    layouts[name] = std::shared_ptr<UiDocument>(layout);
 }

src/assets/Assets.h

@@ -1,63 +0,0 @@
-#ifndef ASSETS_ASSETS_H_
-#define ASSETS_ASSETS_H_
-
-#include "../graphics/core/TextureAnimation.hpp"
-
-#include <string>
-#include <memory>
-#include <functional>
-#include <unordered_map>
-#include <vector>
-
-class Texture;
-class Shader;
-class Font;
-class Atlas;
-class Assets;
-class UiDocument;
-
-namespace audio {
-	class Sound;
-}
-
-namespace assetload {
-    /// @brief final work to do in the main thread
-    using postfunc = std::function<void(Assets*)>;
-}
-
-class Assets {
-	std::unordered_map<std::string, std::shared_ptr<Texture>> textures;
-	std::unordered_map<std::string, std::shared_ptr<Shader>> shaders;
-	std::unordered_map<std::string, std::shared_ptr<Font>> fonts;
-	std::unordered_map<std::string, std::shared_ptr<Atlas>> atlases;
-	std::unordered_map<std::string, std::shared_ptr<UiDocument>> layouts;
-	std::unordered_map<std::string, std::shared_ptr<audio::Sound>> sounds;
-	std::vector<TextureAnimation> animations;
-public:
-    Assets() {}
-    Assets(const Assets&) = delete;
-	~Assets();
-    
-	Texture* getTexture(std::string name) const;
-	void store(Texture* texture, std::string name);
-
-	Shader* getShader(std::string name) const;
-	void store(Shader* shader, std::string name);
-
-	Font* getFont(std::string name) const;
-	void store(Font* font, std::string name);
-
-	Atlas* getAtlas(std::string name) const;
-	void store(Atlas* atlas, std::string name);
-
-	audio::Sound* getSound(std::string name) const;
-	void store(audio::Sound* sound, std::string name);
-
-	const std::vector<TextureAnimation>& getAnimations();
-	void store(const TextureAnimation& animation);
-
-	UiDocument* getLayout(std::string name) const;
-	void store(UiDocument* layout, std::string name);
-};
-
-#endif /* ASSETS_ASSETS_H_ */

src/assets/Assets.hpp

@@ -0,0 +1,63 @@
+#ifndef ASSETS_ASSETS_HPP_
+#define ASSETS_ASSETS_HPP_
+
+#include "../graphics/core/TextureAnimation.hpp"
+
+#include <string>
+#include <memory>
+#include <functional>
+#include <unordered_map>
+#include <vector>
+
+class Texture;
+class Shader;
+class Font;
+class Atlas;
+class Assets;
+class UiDocument;
+
+namespace audio {
+    class Sound;
+}
+
+namespace assetload {
+    /// @brief final work to do in the main thread
+    using postfunc = std::function<void(Assets*)>;
+}
+
+class Assets {
+    std::unordered_map<std::string, std::shared_ptr<Texture>> textures;
+    std::unordered_map<std::string, std::shared_ptr<Shader>> shaders;
+    std::unordered_map<std::string, std::shared_ptr<Font>> fonts;
+    std::unordered_map<std::string, std::shared_ptr<Atlas>> atlases;
+    std::unordered_map<std::string, std::shared_ptr<UiDocument>> layouts;
+    std::unordered_map<std::string, std::shared_ptr<audio::Sound>> sounds;
+    std::vector<TextureAnimation> animations;
+public:
+    Assets() {}
+    Assets(const Assets&) = delete;
+    ~Assets();
+    
+    Texture* getTexture(std::string name) const;
+    void store(Texture* texture, std::string name);
+
+    Shader* getShader(std::string name) const;
+    void store(Shader* shader, std::string name);
+
+    Font* getFont(std::string name) const;
+    void store(Font* font, std::string name);
+
+    Atlas* getAtlas(std::string name) const;
+    void store(Atlas* atlas, std::string name);
+
+    audio::Sound* getSound(std::string name) const;
+    void store(audio::Sound* sound, std::string name);
+
+    const std::vector<TextureAnimation>& getAnimations();
+    void store(const TextureAnimation& animation);
+
+    UiDocument* getLayout(std::string name) const;
+    void store(UiDocument* layout, std::string name);
+};
+
+#endif // ASSETS_ASSETS_HPP_

src/assets/AssetsLoader.cpp

@@ -1,6 +1,6 @@
 #include "AssetsLoader.hpp"
 
-#include "Assets.h"
+#include "Assets.hpp"
 #include "assetload_funcs.hpp"
 #include "../util/ThreadPool.hpp"
 #include "../constants.h"

src/assets/AssetsLoader.hpp

@@ -1,7 +1,7 @@
 #ifndef ASSETS_ASSETS_LOADER_HPP_
 #define ASSETS_ASSETS_LOADER_HPP_
 
-#include "Assets.h"
+#include "Assets.hpp"
 #include "../interfaces/Task.hpp"
 #include "../typedefs.h"
 #include "../delegates.h"

src/assets/assetload_funcs.cpp

@@ -1,6 +1,6 @@
 #include "assetload_funcs.hpp"
 
-#include "Assets.h"
+#include "Assets.hpp"
 #include "AssetsLoader.hpp"
 #include "../audio/audio.hpp"
 #include "../files/files.h"

src/assets/assetload_funcs.hpp

@@ -1,7 +1,7 @@
 #ifndef ASSETS_ASSET_LOADERS_HPP_
 #define ASSETS_ASSET_LOADERS_HPP_
 
-#include "Assets.h"
+#include "Assets.hpp"
 
 #include <string>
 #include <memory>