Project structure update

MihailRis · Nov 5, 2023 · 7730da0 · 7730da0
1 parent d67c707
commit 7730da0
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 62 deletions.
diff --git a/src/Assets.cpp → src/assets/Assets.cpp b/src/Assets.cpp → src/assets/Assets.cpp
@@ -1,8 +1,8 @@
 #include "Assets.h"
 
-#include "graphics/Texture.h"
-#include "graphics/Shader.h"
-#include "graphics/Font.h"
+#include "../graphics/Texture.h"
+#include "../graphics/Shader.h"
+#include "../graphics/Font.h"
 
 Assets::~Assets() {
 	for (auto& iter : shaders){

diff --git a/src/Assets.h → src/assets/Assets.h b/src/Assets.h → src/assets/Assets.h
@@ -1,5 +1,5 @@
-#ifndef SRC_ASSETS_H_
-#define SRC_ASSETS_H_
+#ifndef ASSETS_ASSETS_H_
+#define ASSETS_ASSETS_H_
 
 #include <string>
 #include <unordered_map>
@@ -24,4 +24,4 @@ class Assets {
 	void store(Font* font, std::string name);
 };
 
-#endif /* SRC_ASSETS_H_ */
+#endif /* ASSETS_ASSETS_H_ */
diff --git a/src/AssetsLoader.cpp → src/assets/AssetsLoader.cpp b/src/AssetsLoader.cpp → src/assets/AssetsLoader.cpp
@@ -33,9 +33,10 @@ bool AssetsLoader::loadNext() {
 	return status;
 }
 
-#include "graphics/Shader.h"
-#include "graphics/Texture.h"
-#include "graphics/Font.h"
+#include "../coders/png.h"
+#include "../graphics/Shader.h"
+#include "../graphics/Texture.h"
+#include "../graphics/Font.h"
 
 bool _load_shader(Assets* assets, const std::string& filename, const std::string& name) {
 	Shader* shader = load_shader(filename + ".glslv", filename + ".glslf");
@@ -48,7 +49,7 @@ bool _load_shader(Assets* assets, const std::string& filename, const std::string
 }
 
 bool _load_texture(Assets* assets, const std::string& filename, const std::string& name) {
-	Texture* texture = load_texture(filename);
+	Texture* texture = png::load_texture(filename);
 	if (texture == nullptr) {
 		std::cerr << "failed to load texture '" << name << "'" << std::endl;
 		return false;
@@ -60,7 +61,7 @@ bool _load_texture(Assets* assets, const std::string& filename, const std::strin
 bool _load_font(Assets* assets, const std::string& filename, const std::string& name) {
 	std::vector<Texture*> pages;
 	for (size_t i = 0; i <= 4; i++) {
-		Texture* texture = load_texture(filename + "_" + std::to_string(i) + ".png");
+		Texture* texture = png::load_texture(filename + "_" + std::to_string(i) + ".png");
 		if (texture == nullptr) {
 			std::cerr << "failed to load bitmap font '" << name << "' (missing page " << std::to_string(i) << ")" << std::endl;
 			return false;
@@ -77,3 +78,15 @@ void AssetsLoader::createDefaults(AssetsLoader& loader) {
 	loader.addLoader(ASSET_TEXTURE, _load_texture);
 	loader.addLoader(ASSET_FONT, _load_font);
 }
+
+void AssetsLoader::addDefaults(AssetsLoader& loader) {
+	loader.add(ASSET_SHADER, "res/main", "main");
+	loader.add(ASSET_SHADER, "res/crosshair", "crosshair");
+	loader.add(ASSET_SHADER, "res/lines", "lines");
+	loader.add(ASSET_SHADER, "res/ui", "ui");
+
+	loader.add(ASSET_TEXTURE, "res/block.png", "block");
+	loader.add(ASSET_TEXTURE, "res/slot.png", "slot");
+
+	loader.add(ASSET_FONT, "res/font", "normal");
+}
diff --git a/src/AssetsLoader.h → src/assets/AssetsLoader.h b/src/AssetsLoader.h → src/assets/AssetsLoader.h
@@ -1,5 +1,5 @@
-#ifndef SRC_ASSETS_LOADER_H
-#define SRC_ASSETS_LOADER_H
+#ifndef ASSETS_ASSETS_LOADER_H
+#define ASSETS_ASSETS_LOADER_H
 
 #include <string>
 #include <functional>
@@ -33,6 +33,7 @@ class AssetsLoader {
 	bool loadNext();
 
 	static void createDefaults(AssetsLoader& loader);
+	static void addDefaults(AssetsLoader& loader);
 };
 
-#endif // SRC_ASSETS_LOADER_H
+#endif // ASSETS_ASSETS_LOADER_H
diff --git a/src/loaders/png_loading.cpp → src/coders/png.cpp b/src/loaders/png_loading.cpp → src/coders/png.cpp
@@ -1,4 +1,4 @@
-#include "png_loading.h"
+#include "png.h"
 
 #include <iostream>
 #include <GL/glew.h>
@@ -263,7 +263,7 @@ int _png_load(const char* file, int* pwidth, int* pheight){
 
 #endif
 
-Texture* load_texture(std::string filename){
+Texture* png::load_texture(std::string filename){
 	int width, height;
 	GLuint texture = _png_load(filename.c_str(), &width, &height);
 	if (texture == 0){

diff --git a/src/coders/png.h b/src/coders/png.h
@@ -0,0 +1,12 @@
+#ifndef CODERS_PNG_H_
+#define CODERS_PNG_H_
+
+#include <string>
+
+class Texture;
+
+namespace png {
+    extern Texture* load_texture(std::string filename);
+}
+
+#endif /* CODERS_PNG_H_ */
diff --git a/src/declarations.cpp → src/definitions.cpp b/src/declarations.cpp → src/definitions.cpp
@@ -1,23 +1,8 @@
-#include "declarations.h"
+#include "definitions.h"
 
-#include "AssetsLoader.h"
 #include "window/Window.h"
-
 #include "voxels/Block.h"
 
-
-void initialize_assets(AssetsLoader* loader) {
-	loader->add(ASSET_SHADER, "res/main", "main");
-	loader->add(ASSET_SHADER, "res/crosshair", "crosshair");
-	loader->add(ASSET_SHADER, "res/lines", "lines");
-	loader->add(ASSET_SHADER, "res/ui", "ui");
-
-	loader->add(ASSET_TEXTURE, "res/block.png", "block");
-	loader->add(ASSET_TEXTURE, "res/slot.png", "slot");
-
-	loader->add(ASSET_FONT, "res/font", "normal");
-}
-
 // All in-game definitions (blocks, items, etc..)
 void setup_definitions() {
 	for (size_t i = 0; i < 256; i++) {

diff --git a/src/declarations.h → src/definitions.h b/src/declarations.h → src/definitions.h
@@ -21,9 +21,6 @@
 #define BLOCK_METAL 15
 #define BLOCK_RUST 16
 
-class AssetsLoader;
-
-void initialize_assets(AssetsLoader* loader);
 void setup_definitions();
 
 #endif // DECLARATIONS_H

diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp
@@ -8,7 +8,7 @@
 #include "../voxels/voxel.h"
 #include "../voxels/Chunk.h"
 #include "../typedefs.h"
-#include "../voxmaths.h"
+#include "../maths/voxmaths.h"
 
 #include <cassert>
 #include <iostream>

diff --git a/src/graphics/Texture.h b/src/graphics/Texture.h
@@ -16,6 +16,4 @@ class Texture {
 	void reload(unsigned char* data);
 };
 
-extern Texture* load_texture(std::string filename);
-
 #endif /* GRAPHICS_TEXTURE_H_ */
diff --git a/src/hud_render.cpp b/src/hud_render.cpp
@@ -5,7 +5,7 @@
 #include <GLFW/glfw3.h>
 
 #include "typedefs.h"
-#include "Assets.h"
+#include "assets/Assets.h"
 #include "graphics/Shader.h"
 #include "graphics/Batch2D.h"
 #include "graphics/Font.h"

diff --git a/src/loaders/png_loading.h b/src/loaders/png_loading.h
diff --git a/src/voxmaths.h → src/maths/voxmaths.h b/src/voxmaths.h → src/maths/voxmaths.h
@@ -1,7 +1,7 @@
 #ifndef SRC_VOXNATHS_H_
 #define SRC_VOXNATHS_H_
 
-#include "typedefs.h"
+#include "../typedefs.h"
 
 inline int floordiv(int a, int b) {
 	if (a < 0 && a % b) {
@@ -40,4 +40,4 @@ inline light_t light_pack(ubyte r, ubyte g, ubyte b, ubyte s) {
 	return r | (g << 4) | (b << 8) | (s << 12);
 }
 
-#endif // SRC_VOXNATHS_H_
+#endif // SRC_VOXNATHS_H_
diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp
@@ -29,9 +29,9 @@
 #include "objects/Player.h"
 #include "world/Level.h"
 #include "world/World.h"
-#include "declarations.h"
-#include "Assets.h"
-#include "AssetsLoader.h"
+#include "definitions.h"
+#include "assets/Assets.h"
+#include "assets/AssetsLoader.h"
 #include "world_render.h"
 #include "hud_render.h"
 
@@ -76,7 +76,7 @@ Engine::Engine(const EngineSettings& settings) {
 	std::cout << "-- loading assets" << std::endl;
 	AssetsLoader loader(assets);
 	AssetsLoader::createDefaults(loader);
-	initialize_assets(&loader);
+	AssetsLoader::addDefaults(loader);
 	while (loader.hasNext()) {
 		if (!loader.loadNext()) {
 			delete assets;

diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp
@@ -8,7 +8,7 @@
 #include "../world/LevelEvents.h"
 
 #include "../graphics/Mesh.h"
-#include "../voxmaths.h"
+#include "../maths/voxmaths.h"
 
 #include <math.h>
 #include <limits.h>

diff --git a/src/voxels/ChunksController.cpp b/src/voxels/ChunksController.cpp
@@ -56,7 +56,7 @@ bool ChunksController::loadVisible(WorldFiles* worldFiles){
 					lighting->buildSkyLight(chunk->x, chunk->z);
 					lighting->onChunkLoaded(chunk->x, chunk->z);
 					chunk->setLighted(true);
-					return false;
+					return true;
 				}
 				continue;
 			}
@@ -101,4 +101,4 @@ bool ChunksController::loadVisible(WorldFiles* worldFiles){
 	}
 	lighting->prebuildSkyLight(chunk->x, chunk->z);
 	return true;
-}
+}
diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp
@@ -4,7 +4,7 @@
 
 #include "VoxelsVolume.h"
 #include "Chunk.h"
-#include "../voxmaths.h"
+#include "../maths/voxmaths.h"
 #include "../lighting/Lightmap.h"
 
 
@@ -97,4 +97,4 @@ void ChunksStorage::getVoxels(VoxelsVolume* volume) const {
 			}
 		}
 	}
-}
+}
diff --git a/src/voxels/WorldGenerator.cpp b/src/voxels/WorldGenerator.cpp
@@ -10,7 +10,7 @@
 #include "../maths/FastNoiseLite.h"
 #include <time.h>
 
-#include "../declarations.h"
+#include "../definitions.h"
 
 class PseudoRandom {
 	unsigned short seed;

diff --git a/src/world_render.cpp b/src/world_render.cpp
@@ -19,7 +19,7 @@
 #include "world/Level.h"
 #include "world/LevelEvents.h"
 #include "objects/Player.h"
-#include "Assets.h"
+#include "assets/Assets.h"
 #include "player_control.h"
 
 using std::shared_ptr;