PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

rename

Browse Source
This commit is contained in:
MihailRis 2024-04-23 18:43:02 +03:00
parent 67f34ceb8c
commit 051f0b8c6a
35 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/AssetsLoader.cpp
View File

@ -10,8 +10,8 @@
#include "../constants.h" #include "../constants.h"
#include "../data/dynamic.h" #include "../data/dynamic.h"
#include "../debug/Logger.h" #include "../debug/Logger.hpp"
#include "../coders/imageio.h" #include "../coders/imageio.hpp"
#include "../files/files.h" #include "../files/files.h"
#include "../files/engine_paths.h" #include "../files/engine_paths.h"
#include "../content/Content.h" #include "../content/Content.h"

2
src/assets/AssetsLoader.h
View File

@ -2,7 +2,7 @@
#define ASSETS_ASSETS_LOADER_H #define ASSETS_ASSETS_LOADER_H
#include "Assets.h" #include "Assets.h"
#include "../interfaces/Task.h" #include "../interfaces/Task.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include "../delegates.h" #include "../delegates.h"

2
src/assets/assetload_funcs.cpp
View File

@ -8,7 +8,7 @@
#include "../audio/audio.h" #include "../audio/audio.h"
#include "../files/files.h" #include "../files/files.h"
#include "../files/engine_paths.h" #include "../files/engine_paths.h"
#include "../coders/imageio.h" #include "../coders/imageio.hpp"
#include "../coders/json.h" #include "../coders/json.h"
#include "../coders/GLSLExtension.h" #include "../coders/GLSLExtension.h"
#include "../graphics/core/Shader.hpp" #include "../graphics/core/Shader.hpp"

2
src/audio/AL/ALAudio.cpp
View File

@ -3,7 +3,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include "../../debug/Logger.h" #include "../../debug/Logger.hpp"
static debug::Logger logger("al-audio"); static debug::Logger logger("al-audio");

2
src/coders/imageio.cpp
View File

@ -1,4 +1,4 @@
#include "imageio.h" #include "imageio.hpp"
#include "png.h" #include "png.h"
#include "../graphics/core/ImageData.hpp" #include "../graphics/core/ImageData.hpp"

6
src/coders/imageio.h → src/coders/imageio.hpp
View File

@ -1,5 +1,5 @@
#ifndef CODERS_IMAGEIO_H_ #ifndef CODERS_IMAGEIO_HPP_
#define CODERS_IMAGEIO_H_ #define CODERS_IMAGEIO_HPP_
#include <string> #include <string>
#include <memory> #include <memory>
@ -16,4 +16,4 @@ namespace imageio {
void write(const std::string& filename, const ImageData* image); void write(const std::string& filename, const ImageData* image);
} }
#endif // CODERS_IMAGEIO_H_ #endif // CODERS_IMAGEIO_HPP_

2
src/content/ContentLoader.cpp
View File

@ -7,7 +7,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include "Content.h" #include "Content.h"
#include "../debug/Logger.h" #include "../debug/Logger.hpp"
#include "../items/ItemDef.h" #include "../items/ItemDef.h"
#include "../util/listutil.h" #include "../util/listutil.h"
#include "../voxels/Block.h" #include "../voxels/Block.h"

2
src/debug/Logger.cpp
View File

@ -1,4 +1,4 @@
#include "Logger.h" #include "Logger.hpp"
#include <ctime> #include <ctime>
#include <iomanip> #include <iomanip>

6
src/debug/Logger.h → src/debug/Logger.hpp
View File

@ -1,5 +1,5 @@
#ifndef DEBUG_LOGGER_H_ #ifndef DEBUG_LOGGER_HPP_
#define DEBUG_LOGGER_H_ #define DEBUG_LOGGER_HPP_
#include <sstream> #include <sstream>
#include <fstream> #include <fstream>
@ -63,4 +63,4 @@ namespace debug {
}; };
} }
#endif // DEBUG_LOGGER_H_ #endif // DEBUG_LOGGER_HPP_

7
src/engine.cpp
View File

@ -2,10 +2,11 @@
#define GLEW_STATIC #define GLEW_STATIC
#include "debug/Logger.hpp"
#include "assets/AssetsLoader.h" #include "assets/AssetsLoader.h"
#include "audio/audio.h" #include "audio/audio.h"
#include "coders/GLSLExtension.h" #include "coders/GLSLExtension.h"
#include "coders/imageio.h" #include "coders/imageio.hpp"
#include "coders/json.h" #include "coders/json.h"
#include "content/ContentLoader.h" #include "content/ContentLoader.h"
#include "core_defs.h" #include "core_defs.h"
@ -18,7 +19,7 @@
#include "graphics/core/GfxContext.hpp" #include "graphics/core/GfxContext.hpp"
#include "graphics/core/ImageData.hpp" #include "graphics/core/ImageData.hpp"
#include "graphics/core/Shader.hpp" #include "graphics/core/Shader.hpp"
#include "graphics/ui/GUI.h" #include "graphics/ui/GUI.hpp"
#include "logic/EngineController.hpp" #include "logic/EngineController.hpp"
#include "logic/scripting/scripting.h" #include "logic/scripting/scripting.h"
#include "util/listutil.h" #include "util/listutil.h"
@ -37,8 +38,6 @@
#include <unordered_set> #include <unordered_set>
#include <functional> #include <functional>
#include "debug/Logger.h"
static debug::Logger logger("engine"); static debug::Logger logger("engine");
namespace fs = std::filesystem; namespace fs = std::filesystem;

2
src/files/WorldConverter.cpp
View File

@ -10,7 +10,7 @@
#include "../voxels/Chunk.h" #include "../voxels/Chunk.h"
#include "../content/ContentLUT.h" #include "../content/ContentLUT.h"
#include "../objects/Player.h" #include "../objects/Player.h"
#include "../debug/Logger.h" #include "../debug/Logger.hpp"
#include "../util/ThreadPool.hpp" #include "../util/ThreadPool.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

2
src/files/WorldConverter.h
View File

@ -7,7 +7,7 @@
#include "../typedefs.h" #include "../typedefs.h"
#include "../delegates.h" #include "../delegates.h"
#include "../interfaces/Task.h" #include "../interfaces/Task.hpp"
namespace fs = std::filesystem; namespace fs = std::filesystem;

2
src/frontend/InventoryView.cpp
View File

@ -367,7 +367,7 @@ void InventoryView::setInventory(std::shared_ptr<Inventory> inventory) {
} }
#include "../coders/xml.h" #include "../coders/xml.h"
#include "../graphics/ui/gui_xml.h" #include "../graphics/ui/gui_xml.hpp"
static slotcallback readSlotFunc(InventoryView* view, gui::UiXmlReader& reader, xml::xmlelement& element, const std::string& attr) { static slotcallback readSlotFunc(InventoryView* view, gui::UiXmlReader& reader, xml::xmlelement& element, const std::string& attr) {
auto consumer = scripting::create_int_array_consumer( auto consumer = scripting::create_int_array_consumer(

2
src/frontend/UiDocument.cpp
View File

@ -2,7 +2,7 @@
#include "../files/files.h" #include "../files/files.h"
#include "../graphics/ui/elements/UINode.hpp" #include "../graphics/ui/elements/UINode.hpp"
#include "../graphics/ui/gui_xml.h" #include "../graphics/ui/gui_xml.hpp"
#include "../logic/scripting/scripting.h" #include "../logic/scripting/scripting.h"
#include "InventoryView.h" #include "InventoryView.h"

2
src/frontend/hud.cpp
View File

@ -19,7 +19,7 @@
#include "../graphics/ui/elements/Menu.hpp" #include "../graphics/ui/elements/Menu.hpp"
#include "../graphics/ui/elements/Panel.hpp" #include "../graphics/ui/elements/Panel.hpp"
#include "../graphics/ui/elements/Plotter.hpp" #include "../graphics/ui/elements/Plotter.hpp"
#include "../graphics/ui/GUI.h" #include "../graphics/ui/GUI.hpp"
#include "../items/Inventories.h" #include "../items/Inventories.h"
#include "../items/Inventory.h" #include "../items/Inventory.h"
#include "../items/ItemDef.h" #include "../items/ItemDef.h"

6
src/frontend/menu.cpp
View File

@ -6,11 +6,11 @@
#include "../delegates.h" #include "../delegates.h"
#include "../engine.h" #include "../engine.h"
#include "../data/dynamic.h" #include "../data/dynamic.h"
#include "../interfaces/Task.h" #include "../interfaces/Task.hpp"
#include "../files/engine_paths.h" #include "../files/engine_paths.h"
#include "../graphics/ui/elements/Menu.hpp" #include "../graphics/ui/elements/Menu.hpp"
#include "../graphics/ui/gui_util.h" #include "../graphics/ui/gui_util.hpp"
#include "../graphics/ui/GUI.h" #include "../graphics/ui/GUI.hpp"
#include "../logic/scripting/scripting.h" #include "../logic/scripting/scripting.h"
#include "../settings.h" #include "../settings.h"
#include "../util/stringutil.h" #include "../util/stringutil.h"

6
src/frontend/screens/LevelScreen.cpp
View File

@ -2,14 +2,14 @@
#include "../hud.h" #include "../hud.h"
#include "../LevelFrontend.h" #include "../LevelFrontend.h"
#include "../../debug/Logger.h" #include "../../debug/Logger.hpp"
#include "../../audio/audio.h" #include "../../audio/audio.h"
#include "../../coders/imageio.h" #include "../../coders/imageio.hpp"
#include "../../graphics/core/PostProcessing.h" #include "../../graphics/core/PostProcessing.h"
#include "../../graphics/core/GfxContext.hpp" #include "../../graphics/core/GfxContext.hpp"
#include "../../graphics/core/Viewport.hpp" #include "../../graphics/core/Viewport.hpp"
#include "../../graphics/core/ImageData.hpp" #include "../../graphics/core/ImageData.hpp"
#include "../../graphics/ui/GUI.h" #include "../../graphics/ui/GUI.hpp"
#include "../../graphics/ui/elements/Menu.hpp" #include "../../graphics/ui/elements/Menu.hpp"
#include "../../graphics/render/WorldRenderer.h" #include "../../graphics/render/WorldRenderer.h"
#include "../../logic/LevelController.h" #include "../../logic/LevelController.h"

2
src/frontend/screens/MenuScreen.cpp
View File

@ -1,6 +1,6 @@
#include "MenuScreen.hpp" #include "MenuScreen.hpp"
#include "../../graphics/ui/GUI.h" #include "../../graphics/ui/GUI.hpp"
#include "../../graphics/ui/elements/Menu.hpp" #include "../../graphics/ui/elements/Menu.hpp"
#include "../../graphics/core/Batch2D.hpp" #include "../../graphics/core/Batch2D.hpp"
#include "../../graphics/core/Shader.hpp" #include "../../graphics/core/Shader.hpp"

4
src/graphics/render/ChunksRenderer.cpp
View File

@ -1,10 +1,10 @@
#include "ChunksRenderer.h" #include "ChunksRenderer.h"
#include "../../debug/Logger.h" #include "../../debug/Logger.hpp"
#include "../../graphics/core/Mesh.hpp" #include "../../graphics/core/Mesh.hpp"
#include "BlocksRenderer.h"
#include "../../voxels/Chunk.h" #include "../../voxels/Chunk.h"
#include "../../world/Level.h" #include "../../world/Level.h"
#include "BlocksRenderer.h"
#include <iostream> #include <iostream>
#include <glm/glm.hpp> #include <glm/glm.hpp>

2
src/graphics/ui/GUI.cpp
View File

@ -1,4 +1,4 @@
#include "GUI.h" #include "GUI.hpp"
#include "elements/UINode.hpp" #include "elements/UINode.hpp"
#include "elements/Menu.hpp" #include "elements/Menu.hpp"

6
src/graphics/ui/GUI.h → src/graphics/ui/GUI.hpp
View File

@ -1,5 +1,5 @@
#ifndef FRONTEND_GUI_GUI_H_ #ifndef FRONTEND_GUI_GUI_HPP_
#define FRONTEND_GUI_GUI_H_ #define FRONTEND_GUI_GUI_HPP_
#include <queue> #include <queue>
#include <memory> #include <memory>
@ -128,4 +128,4 @@ namespace gui {
}; };
} }
#endif // FRONTEND_GUI_GUI_H_ #endif // FRONTEND_GUI_GUI_HPP_

4
src/graphics/ui/gui_util.cpp
View File

@ -1,8 +1,8 @@
#include "gui_util.h" #include "gui_util.hpp"
#include "elements/Label.hpp" #include "elements/Label.hpp"
#include "elements/Menu.hpp" #include "elements/Menu.hpp"
#include "elements/Button.hpp" #include "elements/Button.hpp"
#include "gui_xml.h" #include "gui_xml.hpp"
#include <glm/glm.hpp> #include <glm/glm.hpp>

8
src/graphics/ui/gui_util.h → src/graphics/ui/gui_util.hpp
View File

@ -1,9 +1,9 @@
#ifndef FRONTEND_GUI_GUI_UTIL_H_ #ifndef FRONTEND_GUI_GUI_UTIL_HPP_
#define FRONTEND_GUI_GUI_UTIL_H_ #define FRONTEND_GUI_GUI_UTIL_HPP_
#include <memory> #include <memory>
#include <string> #include <string>
#include "GUI.h" #include "GUI.hpp"
#include "../../typedefs.h" #include "../../typedefs.h"
#include "../../delegates.h" #include "../../delegates.h"
@ -40,4 +40,4 @@ namespace guiutil {
std::wstring notext=L""); std::wstring notext=L"");
} }
#endif // FRONTEND_GUI_GUI_UTIL_H_ #endif // FRONTEND_GUI_GUI_UTIL_HPP_

2
src/graphics/ui/gui_xml.cpp
View File

@ -1,4 +1,4 @@
#include "gui_xml.h" #include "gui_xml.hpp"
#include <charconv> #include <charconv>
#include <stdexcept> #include <stdexcept>

8
src/graphics/ui/gui_xml.h → src/graphics/ui/gui_xml.hpp
View File

@ -1,12 +1,12 @@
#ifndef FRONTEND_GUI_GUI_XML_H_ #ifndef FRONTEND_GUI_GUI_XML_HPP_
#define FRONTEND_GUI_GUI_XML_H_ #define FRONTEND_GUI_GUI_XML_HPP_
#include <memory> #include <memory>
#include <stack> #include <stack>
#include <unordered_set> #include <unordered_set>
#include <unordered_map> #include <unordered_map>
#include "GUI.h" #include "GUI.hpp"
#include "../../coders/xml.h" #include "../../coders/xml.h"
namespace gui { namespace gui {
@ -57,4 +57,4 @@ namespace gui {
}; };
} }
#endif // FRONTEND_GUI_GUI_XML_H_ #endif // FRONTEND_GUI_GUI_XML_HPP_

6
src/interfaces/Task.h → src/interfaces/Task.hpp
View File

@ -1,5 +1,5 @@
#ifndef INTERFACES_TASK_H_ #ifndef INTERFACES_TASK_HPP_
#define INTERFACES_TASK_H_ #define INTERFACES_TASK_HPP_
#include "../typedefs.h" #include "../typedefs.h"
@ -17,5 +17,5 @@ public:
virtual void terminate() = 0; virtual void terminate() = 0;
}; };
#endif // INTERFACES_TASK_H_ #endif // INTERFACES_TASK_HPP_

6
src/logic/EngineController.cpp
View File

@ -1,7 +1,7 @@
#include "EngineController.hpp" #include "EngineController.hpp"
#include "../content/ContentLUT.h" #include "../content/ContentLUT.h"
#include "../debug/Logger.h" #include "../debug/Logger.hpp"
#include "../engine.h" #include "../engine.h"
#include "../files/WorldFiles.h" #include "../files/WorldFiles.h"
#include "../files/WorldConverter.h" #include "../files/WorldConverter.h"
@ -10,8 +10,8 @@
#include "../frontend/screens/LevelScreen.hpp" #include "../frontend/screens/LevelScreen.hpp"
#include "../frontend/menu.hpp" #include "../frontend/menu.hpp"
#include "../graphics/ui/elements/Menu.hpp" #include "../graphics/ui/elements/Menu.hpp"
#include "../graphics/ui/gui_util.h" #include "../graphics/ui/gui_util.hpp"
#include "../interfaces/Task.h" #include "../interfaces/Task.hpp"
#include "../util/stringutil.h" #include "../util/stringutil.h"
#include "../world/World.h" #include "../world/World.h"
#include "../world/Level.h" #include "../world/Level.h"

2
src/logic/LevelController.cpp
View File

@ -1,6 +1,6 @@
#include "LevelController.h" #include "LevelController.h"
#include "../files/WorldFiles.h" #include "../files/WorldFiles.h"
#include "../debug/Logger.h" #include "../debug/Logger.hpp"
#include "../world/Level.h" #include "../world/Level.h"
#include "../world/World.h" #include "../world/World.h"
#include "../physics/Hitbox.h" #include "../physics/Hitbox.h"

2
src/logic/scripting/lua/LuaState.cpp
View File

@ -4,7 +4,7 @@
#include <iostream> #include <iostream>
#include "lua_util.h" #include "lua_util.h"
#include "api_lua.h" #include "api_lua.h"
#include "../../../debug/Logger.h" #include "../../../debug/Logger.hpp"
#include "../../../util/stringutil.h" #include "../../../util/stringutil.h"
static debug::Logger logger("lua-state"); static debug::Logger logger("lua-state");

2
src/logic/scripting/lua/libgui.cpp
View File

@ -8,7 +8,7 @@
#include "../../../engine.h" #include "../../../engine.h"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
#include "../../../graphics/ui/gui_util.h" #include "../../../graphics/ui/gui_util.hpp"
#include "../../../graphics/ui/elements/UINode.hpp" #include "../../../graphics/ui/elements/UINode.hpp"
#include "../../../graphics/ui/elements/Button.hpp" #include "../../../graphics/ui/elements/Button.hpp"
#include "../../../graphics/ui/elements/CheckBox.hpp" #include "../../../graphics/ui/elements/CheckBox.hpp"

2
src/logic/scripting/scripting.cpp
View File

@ -3,7 +3,7 @@
#include <iostream> #include <iostream>
#include <stdexcept> #include <stdexcept>
#include "../../debug/Logger.h" #include "../../debug/Logger.hpp"
#include "../../content/ContentPack.h" #include "../../content/ContentPack.h"
#include "../../files/engine_paths.h" #include "../../files/engine_paths.h"
#include "../../files/files.h" #include "../../files/files.h"

2
src/logic/scripting/scripting_hud.cpp
View File

@ -4,7 +4,7 @@
#include "lua/api_lua.h" #include "lua/api_lua.h"
#include "lua/LuaState.h" #include "lua/LuaState.h"
#include "../../debug/Logger.h" #include "../../debug/Logger.hpp"
#include "../../frontend/hud.h" #include "../../frontend/hud.h"
#include "../../objects/Player.h" #include "../../objects/Player.h"
#include "../../files/files.h" #include "../../files/files.h"

4
src/util/ThreadPool.hpp
View File

@ -10,8 +10,8 @@
#include <condition_variable> #include <condition_variable>
#include "../delegates.h" #include "../delegates.h"
#include "../debug/Logger.h" #include "../debug/Logger.hpp"
#include "../interfaces/Task.h" #include "../interfaces/Task.hpp"
namespace util { namespace util {

2
src/voxel_engine.cpp
View File

@ -13,7 +13,7 @@
#include "files/engine_paths.h" #include "files/engine_paths.h"
#include "util/platform.h" #include "util/platform.h"
#include "util/command_line.h" #include "util/command_line.h"
#include "debug/Logger.h" #include "debug/Logger.hpp"
#define SETTINGS_FILE "settings.toml" #define SETTINGS_FILE "settings.toml"
#define CONTROLS_FILE "controls.json" #define CONTROLS_FILE "controls.json"

2
src/window/Window.cpp
View File

@ -1,7 +1,7 @@
#include <iostream> #include <iostream>
#include "Window.h" #include "Window.h"
#include "Events.h" #include "Events.h"
#include "../debug/Logger.h" #include "../debug/Logger.hpp"
#include "../graphics/core/ImageData.hpp" #include "../graphics/core/ImageData.hpp"
#include "../graphics/core/Texture.hpp" #include "../graphics/core/Texture.hpp"