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

refactor

Browse Source
This commit is contained in:
MihailRis 2024-03-19 00:49:45 +03:00
parent 258666c377
commit 48bedc5d8e
9 changed files with 105 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/InventoryView.cpp
View File

@ -10,6 +10,7 @@
#include "../graphics/core/Font.h"
#include "../graphics/core/GfxContext.h"
#include "../graphics/core/Shader.h"
#include "../graphics/render/BlocksPreview.h"
#include "../graphics/ui/elements/containers.h"
#include "../graphics/ui/elements/controls.h"
#include "../items/Inventories.h"
@ -23,7 +24,6 @@
#include "../window/Events.h"
#include "../window/input.h"
#include "../world/Level.h"
#include "BlocksPreview.h"
#include "LevelFrontend.h"
SlotLayout::SlotLayout(

14
src/frontend/LevelFrontend.cpp
View File

@ -1,17 +1,15 @@
#include "LevelFrontend.h"
#include "BlocksPreview.h"
#include "ContentGfxCache.h"
#include "../audio/audio.h"
#include "../world/Level.h"
#include "../voxels/Block.h"
#include "../assets/Assets.h"
#include "../graphics/core/Atlas.h"
#include "../audio/audio.h"
#include "../content/Content.h"
#include "../graphics/core/Atlas.h"
#include "../graphics/render/BlocksPreview.h"
#include "../logic/LevelController.h"
#include "../logic/PlayerController.h"
#include "../voxels/Block.h"
#include "../world/Level.h"
#include "ContentGfxCache.h"
LevelFrontend::LevelFrontend(LevelController* controller, Assets* assets)
: level(controller->getLevel()),

3
src/frontend/debug_panel.cpp
View File

@ -7,6 +7,7 @@
#include "../engine.h"
#include "../graphics/core/Mesh.h"
#include "../graphics/ui/elements/controls.h"
#include "../graphics/render/WorldRenderer.h"
#include "../objects/Player.h"
#include "../physics/Hitbox.h"
#include "../util/stringutil.h"
@ -15,8 +16,6 @@
#include "../world/Level.h"
#include "../world/World.h"
#include "WorldRenderer.h"
using namespace gui;
static std::shared_ptr<Label> create_label(wstringsupplier supplier) {

78
src/frontend/hud.cpp
View File

@ -1,56 +1,56 @@
#include "hud.h"
#include <iostream>
#include <sstream>
#include <memory>
#include <string>
#include <assert.h>
#include <stdexcept>
#include "../typedefs.h"
#include "../content/Content.h"
#include "../util/stringutil.h"
#include "../util/timeutil.h"
#include "../assets/Assets.h"
#include "../graphics/core/Shader.h"
#include "../content/Content.h"
#include "../core_defs.h"
#include "../delegates.h"
#include "../engine.h"
#include "../graphics/core/Atlas.h"
#include "../graphics/core/Batch2D.h"
#include "../graphics/core/Batch3D.h"
#include "../graphics/core/Font.h"
#include "../graphics/core/Atlas.h"
#include "../graphics/core/Mesh.h"
#include "../graphics/core/Texture.h"
#include "../graphics/core/GfxContext.h"
#include "../window/Camera.h"
#include "../window/Window.h"
#include "../window/Events.h"
#include "../window/input.h"
#include "../voxels/Chunks.h"
#include "../voxels/Block.h"
#include "../voxels/Chunk.h"
#include "../world/World.h"
#include "../world/Level.h"
#include "../objects/Player.h"
#include "../physics/Hitbox.h"
#include "../maths/voxmaths.h"
#include "../graphics/ui/elements/controls.h"
#include "../graphics/core/Mesh.h"
#include "../graphics/core/Shader.h"
#include "../graphics/core/Texture.h"
#include "../graphics/render/BlocksPreview.h"
#include "../graphics/render/WorldRenderer.h"
#include "../graphics/ui/elements/containers.h"
#include "../graphics/ui/elements/controls.h"
#include "../graphics/ui/elements/UINode.h"
#include "../graphics/ui/GUI.h"
#include "../items/Inventories.h"
#include "../items/Inventory.h"
#include "../items/ItemDef.h"
#include "../logic/scripting/scripting.h"
#include "../maths/voxmaths.h"
#include "../objects/Player.h"
#include "../physics/Hitbox.h"
#include "../typedefs.h"
#include "../util/stringutil.h"
#include "../util/timeutil.h"
#include "../voxels/Block.h"
#include "../voxels/Chunk.h"
#include "../voxels/Chunks.h"
#include "../window/Camera.h"
#include "../window/Events.h"
#include "../window/input.h"
#include "../window/Window.h"
#include "../world/Level.h"
#include "../world/World.h"
#include "ContentGfxCache.h"
#include "menu/menu.h"
#include "screens.h"
#include "WorldRenderer.h"
#include "BlocksPreview.h"
#include "InventoryView.h"
#include "LevelFrontend.h"
#include "menu/menu.h"
#include "screens.h"
#include "UiDocument.h"
#include "../engine.h"
#include "../delegates.h"
#include "../core_defs.h"
#include "../items/ItemDef.h"
#include "../items/Inventory.h"
#include "../items/Inventories.h"
#include "../logic/scripting/scripting.h"
#include <assert.h>
#include <iostream>
#include <memory>
#include <sstream>
#include <stdexcept>
#include <string>
// implemented in debug_panel.cpp

2
src/frontend/screens.cpp
View File

@ -9,6 +9,7 @@
#include "../graphics/core/GfxContext.h"
#include "../graphics/core/Shader.h"
#include "../graphics/core/TextureAnimation.h"
#include "../graphics/render/WorldRenderer.h"
#include "../graphics/ui/elements/containers.h"
#include "../graphics/ui/GUI.h"
#include "../logic/ChunksController.h"
@ -31,7 +32,6 @@
#include "hud.h"
#include "LevelFrontend.h"
#include "menu/menu.h"
#include "WorldRenderer.h"
#include <filesystem>
#include <glm/glm.hpp>

28
src/frontend/BlocksPreview.cpp → src/graphics/render/BlocksPreview.cpp
View File

@ -2,20 +2,20 @@
#include <glm/ext.hpp>
#include "../assets/Assets.h"
#include "../graphics/core/Viewport.h"
#include "../graphics/core/Texture.h"
#include "../graphics/core/Atlas.h"
#include "../graphics/core/Batch3D.h"
#include "../graphics/core/Framebuffer.h"
#include "../graphics/core/GfxContext.h"
#include "../graphics/core/Shader.h"
#include "../window/Window.h"
#include "../window/Camera.h"
#include "../voxels/Block.h"
#include "../content/Content.h"
#include "../constants.h"
#include "ContentGfxCache.h"
#include "../../assets/Assets.h"
#include "../../constants.h"
#include "../../content/Content.h"
#include "../../frontend/ContentGfxCache.h"
#include "../../voxels/Block.h"
#include "../../window/Camera.h"
#include "../../window/Window.h"
#include "../core/Atlas.h"
#include "../core/Batch3D.h"
#include "../core/Framebuffer.h"
#include "../core/GfxContext.h"
#include "../core/Shader.h"
#include "../core/Texture.h"
#include "../core/Viewport.h"
ImageData* BlocksPreview::draw(
const ContentGfxCache* cache,

9
src/frontend/BlocksPreview.h → src/graphics/render/BlocksPreview.h
View File

@ -1,7 +1,8 @@
#ifndef FRONTEND_BLOCKS_PREVIEW_H_
#define FRONTEND_BLOCKS_PREVIEW_H_
#ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_H_
#define GRAPHICS_RENDER_BLOCKS_PREVIEW_H_
#include "../../typedefs.h"
#include "../typedefs.h"
#include <glm/glm.hpp>
#include <memory>
@ -32,4 +33,4 @@ public:
);
};
#endif // FRONTEND_BLOCKS_PREVIEW_H_
#endif // GRAPHICS_RENDER_BLOCKS_PREVIEW_H_

69
src/frontend/WorldRenderer.cpp → src/graphics/render/WorldRenderer.cpp
View File

@ -1,40 +1,41 @@
#include "WorldRenderer.h"
#include <iostream>
#include <GL/glew.h>
#include <memory>
#include <assert.h>
#include "../assets/Assets.h"
#include "../content/Content.h"
#include "../engine.h"
#include "../graphics/core/Atlas.h"
#include "../graphics/core/Batch3D.h"
#include "../graphics/core/GfxContext.h"
#include "../graphics/core/LineBatch.h"
#include "../graphics/core/Mesh.h"
#include "../graphics/core/PostProcessing.h"
#include "../graphics/core/Shader.h"
#include "../graphics/core/Texture.h"
#include "../graphics/render/ChunksRenderer.h"
#include "../graphics/render/Skybox.h"
#include "../items/Inventory.h"
#include "../items/ItemDef.h"
#include "../items/ItemStack.h"
#include "../logic/PlayerController.h"
#include "../maths/FrustumCulling.h"
#include "../maths/voxmaths.h"
#include "../objects/Player.h"
#include "../settings.h"
#include "../voxels/Block.h"
#include "../voxels/Chunk.h"
#include "../voxels/Chunks.h"
#include "../window/Camera.h"
#include "../window/Window.h"
#include "../world/Level.h"
#include "../world/LevelEvents.h"
#include "../world/World.h"
#include "LevelFrontend.h"
#include "../../assets/Assets.h"
#include "../../content/Content.h"
#include "../../engine.h"
#include "../../frontend/LevelFrontend.h"
#include "../../items/Inventory.h"
#include "../../items/ItemDef.h"
#include "../../items/ItemStack.h"
#include "../../logic/PlayerController.h"
#include "../../maths/FrustumCulling.h"
#include "../../maths/voxmaths.h"
#include "../../objects/Player.h"
#include "../../settings.h"
#include "../../voxels/Block.h"
#include "../../voxels/Chunk.h"
#include "../../voxels/Chunks.h"
#include "../../window/Camera.h"
#include "../../window/Window.h"
#include "../../world/Level.h"
#include "../../world/LevelEvents.h"
#include "../../world/World.h"
#include "../core/Atlas.h"
#include "../core/Batch3D.h"
#include "../core/GfxContext.h"
#include "../core/LineBatch.h"
#include "../core/Mesh.h"
#include "../core/PostProcessing.h"
#include "../core/Shader.h"
#include "../core/Texture.h"
#include "ChunksRenderer.h"
#include "Skybox.h"
#include <assert.h>
#include <GL/glew.h>
#include <iostream>
#include <memory>
WorldRenderer::WorldRenderer(Engine* engine, LevelFrontend* frontend, Player* player)
: engine(engine),

6
src/frontend/WorldRenderer.h → src/graphics/render/WorldRenderer.h
View File

@ -1,5 +1,5 @@
#ifndef WORLD_RENDERER_CPP
#define WORLD_RENDERER_CPP
#ifndef GRAPHICS_RENDER_WORLD_RENDERER_H_
#define GRAPHICS_RENDER_WORLD_RENDERER_H_
#include <vector>
#include <memory>
@ -77,4 +77,4 @@ public:
};
#endif // WORLD_RENDERER_CPP
#endif // GRAPHICS_RENDER_WORLD_RENDERER_H_