This commit is contained in:
InfiniteCoder
2024-08-06 00:07:33 +03:00
parent f66d0ce7fd
commit 85239004e3
27 changed files with 53 additions and 53 deletions
+3 -3
View File
@@ -5,9 +5,9 @@
#include <content/ContentBuilder.hpp>
#include <files/files.hpp>
#include <files/engine_paths.hpp>
#include "window/Window.hpp"
#include "window/Events.hpp"
#include "window/input.hpp"
#include <window/Window.hpp>
#include <window/Events.hpp>
#include <window/input.hpp>
#include <voxels/Block.hpp>
// All in-game definitions (blocks, items, etc..)
+4 -4
View File
@@ -32,10 +32,10 @@
#include <util/platform.hpp>
#include <voxels/DefaultWorldGenerator.hpp>
#include <voxels/FlatWorldGenerator.hpp>
#include "window/Camera.hpp"
#include "window/Events.hpp"
#include "window/input.hpp"
#include "window/Window.hpp"
#include <window/Camera.hpp>
#include <window/Events.hpp>
#include <window/input.hpp>
#include <window/Window.hpp>
#include <world/WorldGenerators.hpp>
#include <settings.hpp>
+1 -1
View File
@@ -28,7 +28,7 @@
#include <voxels/Block.hpp>
#include <voxels/Chunk.hpp>
#include <voxels/voxel.hpp>
#include "../window/Camera.hpp"
#include <window/Camera.hpp>
#include <world/World.hpp>
#define WORLD_FORMAT_MAGIC ".VOXWLD"
+2 -2
View File
@@ -7,8 +7,8 @@
#include <coders/toml.hpp>
#include <debug/Logger.hpp>
#include <settings.hpp>
#include "../window/Events.hpp"
#include "../window/input.hpp"
#include <window/Events.hpp>
#include <window/input.hpp>
static debug::Logger logger("settings_io");
+4 -4
View File
@@ -37,10 +37,10 @@
#include <voxels/Block.hpp>
#include <voxels/Chunk.hpp>
#include <voxels/Chunks.hpp>
#include "../window/Camera.hpp"
#include "../window/Events.hpp"
#include "../window/input.hpp"
#include "../window/Window.hpp"
#include <window/Camera.hpp>
#include <window/Events.hpp>
#include <window/input.hpp>
#include <window/Window.hpp>
#include <world/Level.hpp>
#include <world/World.hpp>
+1 -1
View File
@@ -16,7 +16,7 @@
#include <settings.hpp>
#include <coders/commons.hpp>
#include <util/stringutil.hpp>
#include "../window/Window.hpp"
#include <window/Window.hpp>
#include <filesystem>
#include <glm/glm.hpp>
+3 -3
View File
@@ -21,9 +21,9 @@
#include <util/stringutil.hpp>
#include <physics/Hitbox.hpp>
#include <voxels/Chunks.hpp>
#include "../../window/Camera.hpp"
#include "../../window/Events.hpp"
#include "../../window/Window.hpp"
#include <window/Camera.hpp>
#include <window/Events.hpp>
#include <window/Window.hpp>
#include <world/Level.hpp>
#include <world/World.hpp>
+2 -2
View File
@@ -6,8 +6,8 @@
#include <graphics/core/Shader.hpp>
#include <graphics/core/Texture.hpp>
#include <maths/UVRegion.hpp>
#include "../../window/Window.hpp"
#include "../../window/Camera.hpp"
#include <window/Window.hpp>
#include <window/Camera.hpp>
#include <engine.hpp>
MenuScreen::MenuScreen(Engine* engine) : Screen(engine) {
+1 -1
View File
@@ -6,7 +6,7 @@
#include "Batch2D.hpp"
#include "Framebuffer.hpp"
#include "../../window/Window.hpp"
#include <window/Window.hpp>
static void set_blend_mode(BlendMode mode) {
switch (mode) {
+2 -2
View File
@@ -5,8 +5,8 @@
#include <content/Content.hpp>
#include <frontend/ContentGfxCache.hpp>
#include <voxels/Block.hpp>
#include "../../window/Camera.hpp"
#include "../../window/Window.hpp"
#include <window/Camera.hpp>
#include <window/Window.hpp>
#include <graphics/core/Atlas.hpp>
#include <graphics/core/Batch3D.hpp>
#include <graphics/core/Framebuffer.hpp>
+1 -1
View File
@@ -5,7 +5,7 @@
#include <graphics/core/Atlas.hpp>
#include <graphics/core/Texture.hpp>
#include <assets/Assets.hpp>
#include "../../window/Window.hpp"
#include <window/Window.hpp>
#include <voxels/Chunks.hpp>
#include <lighting/Lightmap.hpp>
+2 -2
View File
@@ -7,8 +7,8 @@
#include <graphics/core/Cubemap.hpp>
#include <graphics/core/Framebuffer.hpp>
#include <graphics/core/DrawContext.hpp>
#include "../../window/Window.hpp"
#include "../../window/Camera.hpp"
#include <window/Window.hpp>
#include <window/Camera.hpp>
#include <maths/UVRegion.hpp>
#include <cmath>
+2 -2
View File
@@ -25,8 +25,8 @@
#include <voxels/Block.hpp>
#include <voxels/Chunk.hpp>
#include <voxels/Chunks.hpp>
#include "../../window/Camera.hpp"
#include "../../window/Window.hpp"
#include <window/Camera.hpp>
#include <window/Window.hpp>
#include <world/Level.hpp>
#include <world/LevelEvents.hpp>
#include <world/World.hpp>
+4 -4
View File
@@ -12,10 +12,10 @@
#include <graphics/core/Batch2D.hpp>
#include <graphics/core/Shader.hpp>
#include <graphics/core/DrawContext.hpp>
#include "../../window/Events.hpp"
#include "../../window/Window.hpp"
#include "../../window/input.hpp"
#include "../../window/Camera.hpp"
#include <window/Events.hpp>
#include <window/Window.hpp>
#include <window/input.hpp>
#include <window/Camera.hpp>
#include <iostream>
#include <algorithm>
+2 -2
View File
@@ -13,8 +13,8 @@
#include <objects/Player.hpp>
#include <util/stringutil.hpp>
#include <voxels/Block.hpp>
#include "../../../window/Events.hpp"
#include "../../../window/input.hpp"
#include <window/Events.hpp>
#include <window/input.hpp>
#include <world/Level.hpp>
#include <graphics/core/Atlas.hpp>
#include <graphics/core/Batch2D.hpp>
+2 -2
View File
@@ -9,8 +9,8 @@
#include <graphics/core/Font.hpp>
#include <assets/Assets.hpp>
#include <util/stringutil.hpp>
#include "../../../window/Events.hpp"
#include "../../../window/Window.hpp"
#include <window/Events.hpp>
#include <window/Window.hpp>
using namespace gui;
+1 -1
View File
@@ -2,7 +2,7 @@
#define GRAPHICS_UI_ELEMENTS_UINODE_HPP_
#include <delegates.hpp>
#include "../../../window/input.hpp"
#include <window/input.hpp>
#include <glm/glm.hpp>
#include <vector>
+1 -1
View File
@@ -16,7 +16,7 @@
#include <logic/scripting/scripting.hpp>
#include <maths/voxmaths.hpp>
#include <util/stringutil.hpp>
#include "../../window/Events.hpp"
#include <window/Events.hpp>
#include <stdexcept>
#include <utility>
+4 -4
View File
@@ -18,10 +18,10 @@
#include <voxels/Block.hpp>
#include <voxels/Chunks.hpp>
#include <voxels/voxel.hpp>
#include "../window/Camera.hpp"
#include "../window/Events.hpp"
#include "../window/Window.hpp"
#include "../window/input.hpp"
#include <window/Camera.hpp>
#include <window/Events.hpp>
#include <window/Window.hpp>
#include <window/input.hpp>
#include <world/Level.hpp>
#include "BlocksController.hpp"
#include "scripting/scripting.hpp"
+1 -1
View File
@@ -1,7 +1,7 @@
#include <glm/ext.hpp>
#include <content/Content.hpp>
#include "../../../window/Camera.hpp"
#include <window/Camera.hpp>
#include <world/Level.hpp>
#include "api_lua.hpp"
+2 -2
View File
@@ -9,8 +9,8 @@
#include <frontend/screens/MenuScreen.hpp>
#include <logic/EngineController.hpp>
#include <logic/LevelController.hpp>
#include "../../../window/Events.hpp"
#include "../../../window/Window.hpp"
#include <window/Events.hpp>
#include <window/Window.hpp>
#include <world/Level.hpp>
#include <world/WorldGenerators.hpp>
#include "api_lua.hpp"
+1 -1
View File
@@ -8,7 +8,7 @@
#include <objects/rigging.hpp>
#include <physics/Hitbox.hpp>
#include <voxels/Chunks.hpp>
#include "../../../window/Camera.hpp"
#include <window/Camera.hpp>
using namespace scripting;
+2 -2
View File
@@ -3,8 +3,8 @@
#include <frontend/screens/Screen.hpp>
#include <graphics/ui/GUI.hpp>
#include <util/stringutil.hpp>
#include "../../../window/Events.hpp"
#include "../../../window/input.hpp"
#include <window/Events.hpp>
#include <window/input.hpp>
#include "api_lua.hpp"
namespace scripting {
+1 -1
View File
@@ -5,7 +5,7 @@
#include <objects/Entities.hpp>
#include <objects/Player.hpp>
#include <physics/Hitbox.hpp>
#include "../../../window/Camera.hpp"
#include <window/Camera.hpp>
#include <world/Level.hpp>
#include "libentity.hpp"
+1 -1
View File
@@ -1,5 +1,5 @@
#include <engine.hpp>
#include "../../../window/Window.hpp"
#include <window/Window.hpp>
#include "api_lua.hpp"
static int l_time_uptime(lua::State* L) {
+2 -2
View File
@@ -11,8 +11,8 @@
#include <physics/Hitbox.hpp>
#include <physics/PhysicsSolver.hpp>
#include <voxels/Chunks.hpp>
#include "../window/Camera.hpp"
#include "../window/Events.hpp"
#include <window/Camera.hpp>
#include <window/Events.hpp>
#include <world/Level.hpp>
const float CROUCH_SPEED_MUL = 0.35f;
+1 -1
View File
@@ -13,7 +13,7 @@
#include <voxels/Chunk.hpp>
#include <voxels/Chunks.hpp>
#include <voxels/ChunksStorage.hpp>
#include "../window/Camera.hpp"
#include <window/Camera.hpp>
#include "LevelEvents.hpp"
#include "World.hpp"