nothing actually done

This commit is contained in:
MihailRis 2024-04-24 07:35:46 +03:00
parent 051f0b8c6a
commit 1ecc608ead
19 changed files with 44 additions and 48 deletions

View File

@ -1,4 +1,4 @@
#include "rle.h"
#include "rle.hpp"
size_t rle::decode(const ubyte* src, size_t srclen, ubyte* dst) {
size_t offset = 0;

View File

@ -1,5 +1,5 @@
#ifndef CODERS_RLE_H_
#define CODERS_RLE_H_
#ifndef CODERS_RLE_HPP_
#define CODERS_RLE_HPP_
#include "../typedefs.h"
@ -14,4 +14,4 @@ namespace extrle {
size_t decode(const ubyte* src, size_t length, ubyte* dst);
}
#endif // CODERS_RLE_H_
#endif // CODERS_RLE_HPP_

View File

@ -8,6 +8,8 @@
#include <sstream>
#include <assert.h>
// FIXME: refactor this monster
using namespace toml;
Section::Section(std::string name) : name(name) {

View File

@ -1,6 +1,6 @@
#include "WorldRegions.hpp"
#include "../coders/rle.h"
#include "../coders/rle.hpp"
#include "../util/data_io.h"
#include "../coders/byte_utils.h"
#include "../maths/voxmaths.h"

View File

@ -10,7 +10,7 @@
#include "../graphics/core/Font.hpp"
#include "../graphics/core/GfxContext.hpp"
#include "../graphics/core/Shader.hpp"
#include "../graphics/render/BlocksPreview.h"
#include "../graphics/render/BlocksPreview.hpp"
#include "../items/Inventories.h"
#include "../items/Inventory.h"
#include "../items/ItemDef.h"

View File

@ -4,7 +4,7 @@
#include "../audio/audio.h"
#include "../content/Content.h"
#include "../graphics/core/Atlas.hpp"
#include "../graphics/render/BlocksPreview.h"
#include "../graphics/render/BlocksPreview.hpp"
#include "../logic/LevelController.h"
#include "../logic/PlayerController.h"
#include "../voxels/Block.h"

View File

@ -10,7 +10,7 @@
#include "../graphics/ui/elements/TextBox.hpp"
#include "../graphics/ui/elements/TrackBar.hpp"
#include "../graphics/ui/elements/InputBindBox.hpp"
#include "../graphics/render/WorldRenderer.h"
#include "../graphics/render/WorldRenderer.hpp"
#include "../objects/Player.h"
#include "../physics/Hitbox.h"
#include "../util/stringutil.h"

View File

@ -13,8 +13,8 @@
#include "../graphics/core/Mesh.hpp"
#include "../graphics/core/Shader.hpp"
#include "../graphics/core/Texture.hpp"
#include "../graphics/render/BlocksPreview.h"
#include "../graphics/render/WorldRenderer.h"
#include "../graphics/render/BlocksPreview.hpp"
#include "../graphics/render/WorldRenderer.hpp"
#include "../graphics/ui/elements/UINode.hpp"
#include "../graphics/ui/elements/Menu.hpp"
#include "../graphics/ui/elements/Panel.hpp"

View File

@ -11,7 +11,7 @@
#include "../../graphics/core/ImageData.hpp"
#include "../../graphics/ui/GUI.hpp"
#include "../../graphics/ui/elements/Menu.hpp"
#include "../../graphics/render/WorldRenderer.h"
#include "../../graphics/render/WorldRenderer.hpp"
#include "../../logic/LevelController.h"
#include "../../logic/scripting/scripting_hud.h"
#include "../../physics/Hitbox.h"

View File

@ -1,7 +1,4 @@
#include "BlocksPreview.h"
#include <glm/ext.hpp>
#include "BlocksPreview.hpp"
#include "../../assets/Assets.h"
#include "../../constants.h"
#include "../../content/Content.h"
@ -17,6 +14,8 @@
#include "../core/Texture.hpp"
#include "../core/Viewport.hpp"
#include <glm/ext.hpp>
std::unique_ptr<ImageData> BlocksPreview::draw(
const ContentGfxCache* cache,
Shader* shader,

View File

@ -1,5 +1,5 @@
#ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_H_
#define GRAPHICS_RENDER_BLOCKS_PREVIEW_H_
#ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
#define GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
#include "../../typedefs.h"
@ -33,4 +33,4 @@ public:
);
};
#endif // GRAPHICS_RENDER_BLOCKS_PREVIEW_H_
#endif // GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_

View File

@ -1,7 +1,4 @@
#include "BlocksRenderer.h"
#include <glm/glm.hpp>
#include "BlocksRenderer.hpp"
#include "../core/Mesh.hpp"
#include "../../maths/UVRegion.h"
#include "../../constants.h"
@ -13,6 +10,8 @@
#include "../../lighting/Lightmap.h"
#include "../../frontend/ContentGfxCache.h"
#include <glm/glm.hpp>
using glm::ivec3;
using glm::vec3;
using glm::vec4;

View File

@ -1,5 +1,5 @@
#ifndef GRAPHICS_RENDER_BLOCKS_RENDERER_H
#define GRAPHICS_RENDER_BLOCKS_RENDERER_H
#ifndef GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_
#define GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_
#include <stdlib.h>
#include <vector>
@ -99,4 +99,4 @@ public:
VoxelsVolume* getVoxelsBuffer() const;
};
#endif // GRAPHICS_RENDER_BLOCKS_RENDERER_H
#endif // GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_

View File

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

View File

@ -1,5 +1,5 @@
#ifndef GRAPHICS_RENDER_CHUNKSRENDERER_H_
#define GRAPHICS_RENDER_CHUNKSRENDERER_H_
#ifndef GRAPHICS_RENDER_CHUNKSRENDERER_HPP_
#define GRAPHICS_RENDER_CHUNKSRENDERER_HPP_
#include <queue>
#include <memory>
@ -47,4 +47,4 @@ public:
void update();
};
#endif // GRAPHICS_RENDER_CHUNKSRENDERER_H_
#endif // GRAPHICS_RENDER_CHUNKSRENDERER_HPP_

View File

@ -1,9 +1,4 @@
#include "Skybox.h"
#include <iostream>
#include <GL/glew.h>
#include <glm/glm.hpp>
#include "Skybox.hpp"
#include "../../assets/Assets.h"
#include "../../graphics/core/Shader.hpp"
#include "../../graphics/core/Mesh.hpp"
@ -15,6 +10,10 @@
#include "../../window/Window.h"
#include "../../window/Camera.h"
#include <iostream>
#include <GL/glew.h>
#include <glm/glm.hpp>
#ifndef M_PI
#define M_PI 3.141592
#endif // M_PI

View File

@ -1,5 +1,5 @@
#ifndef GRAPHICS_RENDER_SKYBOX_H_
#define GRAPHICS_RENDER_SKYBOX_H_
#ifndef GRAPHICS_RENDER_SKYBOX_HPP_
#define GRAPHICS_RENDER_SKYBOX_HPP_
#include <memory>
#include <string>
@ -55,4 +55,4 @@ public:
}
};
#endif // GRAPHICS_RENDER_SKYBOX_H_
#endif // GRAPHICS_RENDER_SKYBOX_HPP_

View File

@ -1,6 +1,6 @@
#include "WorldRenderer.h"
#include "WorldRenderer.hpp"
#include "ChunksRenderer.hpp"
#include "Skybox.hpp"
#include "../../assets/Assets.h"
#include "../../content/Content.h"
#include "../../engine.h"
@ -29,8 +29,6 @@
#include "../core/PostProcessing.h"
#include "../core/Shader.hpp"
#include "../core/Texture.hpp"
#include "ChunksRenderer.h"
#include "Skybox.h"
#include <assert.h>
#include <GL/glew.h>

View File

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