the final rename

This commit is contained in:
MihailRis
2024-05-06 03:38:19 +03:00
parent f27a418dbe
commit 1627e21c1d
196 changed files with 836 additions and 815 deletions
+14 -14
View File
@@ -1,19 +1,19 @@
#include "BlocksController.h"
#include "BlocksController.hpp"
#include "../voxels/voxel.h"
#include "../voxels/Block.h"
#include "../voxels/Chunk.h"
#include "../voxels/Chunks.h"
#include "../world/Level.h"
#include "../world/World.h"
#include "../content/Content.h"
#include "../lighting/Lighting.h"
#include "../util/timeutil.h"
#include "../maths/fastmaths.h"
#include "../items/Inventory.h"
#include "../items/Inventories.h"
#include "../voxels/voxel.hpp"
#include "../voxels/Block.hpp"
#include "../voxels/Chunk.hpp"
#include "../voxels/Chunks.hpp"
#include "../world/Level.hpp"
#include "../world/World.hpp"
#include "../content/Content.hpp"
#include "../lighting/Lighting.hpp"
#include "../util/timeutil.hpp"
#include "../maths/fastmaths.hpp"
#include "../items/Inventory.hpp"
#include "../items/Inventories.hpp"
#include "scripting/scripting.h"
#include "scripting/scripting.hpp"
Clock::Clock(int tickRate, int tickParts)
: tickRate(tickRate),
@@ -1,8 +1,8 @@
#ifndef LOGIC_BLOCKS_CONTROLLER_H_
#define LOGIC_BLOCKS_CONTROLLER_H_
#ifndef LOGIC_BLOCKS_CONTROLLER_HPP_
#define LOGIC_BLOCKS_CONTROLLER_HPP_
#include "../typedefs.h"
#include "../maths/fastmaths.h"
#include "../typedefs.hpp"
#include "../maths/fastmaths.hpp"
class Player;
class Block;
@@ -54,4 +54,4 @@ public:
void unbindInventory(int x, int y, int z);
};
#endif // LOGIC_BLOCKS_CONTROLLER_H_
#endif // LOGIC_BLOCKS_CONTROLLER_HPP_
+16 -16
View File
@@ -1,24 +1,24 @@
#include "ChunksController.h"
#include "ChunksController.hpp"
#include "../content/Content.hpp"
#include "../voxels/Block.hpp"
#include "../voxels/Chunk.hpp"
#include "../voxels/Chunks.hpp"
#include "../voxels/ChunksStorage.hpp"
#include "../voxels/WorldGenerator.hpp"
#include "../world/WorldGenerators.hpp"
#include "../graphics/core/Mesh.hpp"
#include "../lighting/Lighting.hpp"
#include "../files/WorldFiles.hpp"
#include "../world/Level.hpp"
#include "../world/World.hpp"
#include "../maths/voxmaths.hpp"
#include "../util/timeutil.hpp"
#include <limits.h>
#include <memory>
#include <iostream>
#include "../content/Content.h"
#include "../voxels/Block.h"
#include "../voxels/Chunk.h"
#include "../voxels/Chunks.h"
#include "../voxels/ChunksStorage.h"
#include "../voxels/WorldGenerator.h"
#include "../world/WorldGenerators.h"
#include "../graphics/core/Mesh.hpp"
#include "../lighting/Lighting.h"
#include "../files/WorldFiles.h"
#include "../world/Level.h"
#include "../world/World.h"
#include "../maths/voxmaths.h"
#include "../util/timeutil.h"
const uint MAX_WORK_PER_FRAME = 64;
const uint MIN_SURROUNDING = 9;
@@ -1,8 +1,8 @@
#ifndef VOXELS_CHUNKSCONTROLLER_H_
#define VOXELS_CHUNKSCONTROLLER_H_
#ifndef VOXELS_CHUNKSCONTROLLER_HPP_
#define VOXELS_CHUNKSCONTROLLER_HPP_
#include "../typedefs.hpp"
#include <memory>
#include "../typedefs.h"
class Level;
class Chunk;
@@ -31,4 +31,4 @@ public:
void update(int64_t maxDuration);
};
#endif /* VOXELS_CHUNKSCONTROLLER_H_ */
#endif /* VOXELS_CHUNKSCONTROLLER_HPP_ */
+6 -6
View File
@@ -2,9 +2,9 @@
#include "../content/ContentLUT.hpp"
#include "../debug/Logger.hpp"
#include "../engine.h"
#include "../files/WorldFiles.h"
#include "../files/WorldConverter.h"
#include "../engine.hpp"
#include "../files/WorldFiles.hpp"
#include "../files/WorldConverter.hpp"
#include "../frontend/locale.hpp"
#include "../frontend/screens/MenuScreen.hpp"
#include "../frontend/screens/LevelScreen.hpp"
@@ -13,9 +13,9 @@
#include "../graphics/ui/gui_util.hpp"
#include "../interfaces/Task.hpp"
#include "../util/stringutil.hpp"
#include "../world/World.h"
#include "../world/Level.h"
#include "LevelController.h"
#include "../world/World.hpp"
#include "../world/Level.hpp"
#include "LevelController.hpp"
#include <memory>
#include <filesystem>
+7 -7
View File
@@ -1,12 +1,12 @@
#include "LevelController.h"
#include "../files/WorldFiles.h"
#include "LevelController.hpp"
#include "../files/WorldFiles.hpp"
#include "../debug/Logger.hpp"
#include "../world/Level.h"
#include "../world/World.h"
#include "../physics/Hitbox.h"
#include "../world/Level.hpp"
#include "../world/World.hpp"
#include "../physics/Hitbox.hpp"
#include "scripting/scripting.h"
#include "../interfaces/Object.h"
#include "scripting/scripting.hpp"
#include "../interfaces/Object.hpp"
static debug::Logger logger("level-control");
@@ -1,12 +1,12 @@
#ifndef LOGIC_LEVEL_CONTROLLER_H_
#define LOGIC_LEVEL_CONTROLLER_H_
#ifndef LOGIC_LEVEL_CONTROLLER_HPP_
#define LOGIC_LEVEL_CONTROLLER_HPP_
#include <memory>
#include "../settings.h"
#include "../settings.hpp"
#include "PlayerController.h"
#include "BlocksController.h"
#include "ChunksController.h"
#include "PlayerController.hpp"
#include "BlocksController.hpp"
#include "ChunksController.hpp"
class Level;
class Player;
@@ -42,4 +42,4 @@ public:
PlayerController* getPlayerController();
};
#endif // LOGIC_LEVEL_CONTROLLER_H_
#endif // LOGIC_LEVEL_CONTROLLER_HPP_
+15 -15
View File
@@ -1,26 +1,26 @@
#define _USE_MATH_DEFINES
#include <cmath>
#include "PlayerController.h"
#include "BlocksController.h"
#include "scripting/scripting.h"
#include "PlayerController.hpp"
#include "BlocksController.hpp"
#include "scripting/scripting.hpp"
#include "../objects/Player.h"
#include "../physics/PhysicsSolver.h"
#include "../physics/Hitbox.h"
#include "../lighting/Lighting.h"
#include "../world/Level.h"
#include "../content/Content.h"
#include "../voxels/Block.h"
#include "../voxels/voxel.h"
#include "../voxels/Chunks.h"
#include "../objects/Player.hpp"
#include "../physics/PhysicsSolver.hpp"
#include "../physics/Hitbox.hpp"
#include "../lighting/Lighting.hpp"
#include "../world/Level.hpp"
#include "../content/Content.hpp"
#include "../voxels/Block.hpp"
#include "../voxels/voxel.hpp"
#include "../voxels/Chunks.hpp"
#include "../window/Camera.hpp"
#include "../window/Window.hpp"
#include "../window/Events.hpp"
#include "../window/input.hpp"
#include "../items/ItemDef.h"
#include "../items/ItemStack.h"
#include "../items/Inventory.h"
#include "../items/ItemDef.hpp"
#include "../items/ItemStack.hpp"
#include "../items/Inventory.hpp"
#include "../core_defs.hpp"
const float CAM_SHAKE_OFFSET = 0.025f;
@@ -1,13 +1,13 @@
#ifndef PLAYER_CONTROL_H_
#define PLAYER_CONTROL_H_
#ifndef PLAYER_CONTROL_HPP_
#define PLAYER_CONTROL_HPP_
#include <memory>
#include <vector>
#include <functional>
#include <glm/glm.hpp>
#include "../settings.h"
#include "../objects/Player.h"
#include "../settings.hpp"
#include "../objects/Player.hpp"
class Camera;
class Level;
@@ -94,4 +94,4 @@ public:
void listenBlockInteraction(on_block_interaction callback);
};
#endif /* PLAYER_CONTROL_H_ */
#endif /* PLAYER_CONTROL_HPP_ */
+2 -2
View File
@@ -3,8 +3,8 @@
#include "lua_commons.hpp"
#include "../../../data/dynamic.h"
#include "../../../delegates.h"
#include "../../../data/dynamic.hpp"
#include "../../../delegates.hpp"
#ifndef LUAJIT_VERSION
#error LuaJIT required
+2 -2
View File
@@ -3,8 +3,8 @@
#include "lua_util.hpp"
#include "../../../audio/audio.hpp"
#include "../../../engine.h"
#include "../scripting.h"
#include "../../../engine.hpp"
#include "../scripting.hpp"
inline const char* DEFAULT_CHANNEL = "regular";
+9 -9
View File
@@ -1,15 +1,15 @@
#include "lua_commons.hpp"
#include "api_lua.hpp"
#include "lua_util.hpp"
#include "../scripting.h"
#include "../../../world/Level.h"
#include "../../../voxels/Chunks.h"
#include "../../../voxels/Chunk.h"
#include "../../../voxels/Block.h"
#include "../../../voxels/voxel.h"
#include "../../../lighting/Lighting.h"
#include "../../../content/Content.h"
#include "../../../logic/BlocksController.h"
#include "../scripting.hpp"
#include "../../../world/Level.hpp"
#include "../../../voxels/Chunks.hpp"
#include "../../../voxels/Chunk.hpp"
#include "../../../voxels/Block.hpp"
#include "../../../voxels/voxel.hpp"
#include "../../../lighting/Lighting.hpp"
#include "../../../content/Content.hpp"
#include "../../../logic/BlocksController.hpp"
int l_block_name(lua_State* L) {
auto indices = scripting::content->getIndices();
+6 -6
View File
@@ -2,18 +2,18 @@
#include "api_lua.hpp"
#include "LuaState.hpp"
#include "../../../engine.h"
#include "../../../engine.hpp"
#include "../../../files/settings_io.hpp"
#include "../../../files/engine_paths.h"
#include "../../../files/engine_paths.hpp"
#include "../../../frontend/menu.hpp"
#include "../../../frontend/screens/MenuScreen.hpp"
#include "../../../logic/LevelController.h"
#include "../../../logic/LevelController.hpp"
#include "../../../logic/EngineController.hpp"
#include "../../../world/Level.h"
#include "../../../world/Level.hpp"
#include "../../../window/Events.hpp"
#include "../../../window/Window.hpp"
#include "../../../world/WorldGenerators.h"
#include "../scripting.h"
#include "../../../world/WorldGenerators.hpp"
#include "../scripting.hpp"
#include <vector>
#include <memory>
+4 -4
View File
@@ -1,9 +1,9 @@
#include "lua_commons.hpp"
#include "api_lua.hpp"
#include "../scripting.h"
#include "../../../engine.h"
#include "../../../files/files.h"
#include "../../../files/engine_paths.h"
#include "../scripting.hpp"
#include "../../../engine.hpp"
#include "../../../files/files.hpp"
#include "../../../files/engine_paths.hpp"
#include <string>
#include <filesystem>
+4 -4
View File
@@ -3,10 +3,10 @@
#include "lua_util.hpp"
#include "LuaState.hpp"
#include "../scripting.h"
#include "../../../engine.h"
#include "../scripting.hpp"
#include "../../../engine.hpp"
#include "../../../assets/Assets.hpp"
#include "../../../items/Inventories.h"
#include "../../../items/Inventories.hpp"
#include "../../../graphics/ui/gui_util.hpp"
#include "../../../graphics/ui/elements/UINode.hpp"
#include "../../../graphics/ui/elements/Button.hpp"
@@ -19,7 +19,7 @@
#include "../../../frontend/UiDocument.hpp"
#include "../../../frontend/locale.hpp"
#include "../../../util/stringutil.hpp"
#include "../../../world/Level.h"
#include "../../../world/Level.hpp"
using namespace gui;
+9 -9
View File
@@ -3,18 +3,18 @@
#include "LuaState.hpp"
#include "../../../assets/Assets.hpp"
#include "../../../content/Content.h"
#include "../../../engine.h"
#include "../../../content/Content.hpp"
#include "../../../engine.hpp"
#include "../../../frontend/hud.hpp"
#include "../../../frontend/UiDocument.hpp"
#include "../../../graphics/ui/elements/InventoryView.hpp"
#include "../../../items/Inventories.h"
#include "../../../logic/BlocksController.h"
#include "../../../voxels/Block.h"
#include "../../../voxels/Chunks.h"
#include "../../../voxels/voxel.h"
#include "../../../world/Level.h"
#include "../scripting.h"
#include "../../../items/Inventories.hpp"
#include "../../../logic/BlocksController.hpp"
#include "../../../voxels/Block.hpp"
#include "../../../voxels/Chunks.hpp"
#include "../../../voxels/voxel.hpp"
#include "../../../world/Level.hpp"
#include "../scripting.hpp"
#include <iostream>
#include <glm/glm.hpp>
+2 -2
View File
@@ -1,13 +1,13 @@
#include "api_lua.hpp"
#include "lua_commons.hpp"
#include "LuaState.hpp"
#include "../scripting.h"
#include "../scripting.hpp"
#include "../../../window/input.hpp"
#include "../../../window/Events.hpp"
#include "../../../frontend/screens/Screen.hpp"
#include "../../../frontend/hud.hpp"
#include "../../../engine.h"
#include "../../../engine.hpp"
namespace scripting {
extern lua::LuaState* state;
+6 -6
View File
@@ -1,12 +1,12 @@
#include "lua_commons.hpp"
#include "api_lua.hpp"
#include "lua_util.hpp"
#include "../scripting.h"
#include "../../../content/Content.h"
#include "../../../world/Level.h"
#include "../../../items/ItemStack.h"
#include "../../../items/Inventories.h"
#include "../../../logic/BlocksController.h"
#include "../scripting.hpp"
#include "../../../content/Content.hpp"
#include "../../../world/Level.hpp"
#include "../../../items/ItemStack.hpp"
#include "../../../items/Inventories.hpp"
#include "../../../logic/BlocksController.hpp"
static void validate_itemid(lua_State* L, itemid_t id) {
if (id >= scripting::indices->countItemDefs()) {
+3 -3
View File
@@ -1,8 +1,8 @@
#include "lua_commons.hpp"
#include "api_lua.hpp"
#include "../scripting.h"
#include "../../../content/Content.h"
#include "../../../items/ItemDef.h"
#include "../scripting.hpp"
#include "../../../content/Content.hpp"
#include "../../../items/ItemDef.hpp"
static int l_item_name(lua_State* L) {
auto indices = scripting::content->getIndices();
+2 -2
View File
@@ -2,8 +2,8 @@
#include "lua_commons.hpp"
#include "LuaState.hpp"
#include "../../../coders/json.h"
#include "../../../data/dynamic.h"
#include "../../../coders/json.hpp"
#include "../../../data/dynamic.hpp"
namespace scripting {
extern lua::LuaState* state;
+6 -6
View File
@@ -1,13 +1,13 @@
#include "api_lua.hpp"
#include "lua_commons.hpp"
#include "../scripting.h"
#include "../../../engine.h"
#include "../scripting.hpp"
#include "../../../engine.hpp"
#include "../../../assets/AssetsLoader.hpp"
#include "../../../files/engine_paths.h"
#include "../../../files/WorldFiles.h"
#include "../../../world/Level.h"
#include "../../../world/World.h"
#include "../../../files/engine_paths.hpp"
#include "../../../files/WorldFiles.hpp"
#include "../../../world/Level.hpp"
#include "../../../world/World.hpp"
#include <string>
#include <stdexcept>
+5 -5
View File
@@ -1,11 +1,11 @@
#include "lua_commons.hpp"
#include "api_lua.hpp"
#include "../scripting.h"
#include "../../../world/Level.h"
#include "../../../objects/Player.h"
#include "../../../physics/Hitbox.h"
#include "../scripting.hpp"
#include "../../../world/Level.hpp"
#include "../../../objects/Player.hpp"
#include "../../../physics/Hitbox.hpp"
#include "../../../window/Camera.hpp"
#include "../../../items/Inventory.h"
#include "../../../items/Inventory.hpp"
#include <glm/glm.hpp>
+2 -2
View File
@@ -1,7 +1,7 @@
#include "api_lua.hpp"
#include "lua_commons.hpp"
#include "../scripting.h"
#include "../../../engine.h"
#include "../scripting.hpp"
#include "../../../engine.hpp"
#include "../../../window/Window.hpp"
static int l_time_uptime(lua_State* L) {
+5 -5
View File
@@ -1,13 +1,13 @@
#include "lua_commons.hpp"
#include "api_lua.hpp"
#include "../scripting.h"
#include "../scripting.hpp"
#include "../../../assets/Assets.hpp"
#include "../../../assets/AssetsLoader.hpp"
#include "../../../files/engine_paths.h"
#include "../../../world/Level.h"
#include "../../../world/World.h"
#include "../../../engine.h"
#include "../../../files/engine_paths.hpp"
#include "../../../world/Level.hpp"
#include "../../../world/World.hpp"
#include "../../../engine.hpp"
#include <cmath>
#include <filesystem>
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef LOGIC_SCRIPTING_LUA_UTIL_H_
#define LOGIC_SCRIPTING_LUA_UTIL_H_
#ifndef LOGIC_SCRIPTING_LUA_UTIL_HPP_
#define LOGIC_SCRIPTING_LUA_UTIL_HPP_
#include "LuaState.hpp"
@@ -120,4 +120,4 @@ namespace lua {
}
}
#endif // LOGIC_SCRIPTING_LUA_UTIL_H_
#endif // LOGIC_SCRIPTING_LUA_UTIL_HPP_
+14 -14
View File
@@ -1,21 +1,21 @@
#include "scripting.h"
#include "scripting.hpp"
#include "../../content/ContentPack.h"
#include "../../content/ContentPack.hpp"
#include "../../debug/Logger.hpp"
#include "../../engine.h"
#include "../../files/engine_paths.h"
#include "../../files/files.h"
#include "../../engine.hpp"
#include "../../files/engine_paths.hpp"
#include "../../files/files.hpp"
#include "../../frontend/UiDocument.hpp"
#include "../../items/Inventory.h"
#include "../../items/ItemDef.h"
#include "../../logic/BlocksController.h"
#include "../../logic/LevelController.h"
#include "../../objects/Player.h"
#include "../../items/Inventory.hpp"
#include "../../items/ItemDef.hpp"
#include "../../logic/BlocksController.hpp"
#include "../../logic/LevelController.hpp"
#include "../../objects/Player.hpp"
#include "../../util/stringutil.hpp"
#include "../../util/timeutil.h"
#include "../../util/timeutil.h"
#include "../../voxels/Block.h"
#include "../../world/Level.h"
#include "../../util/timeutil.hpp"
#include "../../util/timeutil.hpp"
#include "../../voxels/Block.hpp"
#include "../../world/Level.hpp"
#include "lua/LuaState.hpp"
#include <iostream>
@@ -1,8 +1,11 @@
#include "../../data/dynamic.h"
#include "../../typedefs.h"
#include "../../delegates.h"
#ifndef LOGIC_SCRIPTING_SCRIPTING_HPP_
#define LOGIC_SCRIPTING_SCRIPTING_HPP_
#include "scripting_functional.h"
#include "../../data/dynamic.hpp"
#include "../../typedefs.hpp"
#include "../../delegates.hpp"
#include "scripting_functional.hpp"
#include <vector>
#include <string>
@@ -110,3 +113,5 @@ namespace scripting {
/// @brief Finalize lua state. Using scripting after will lead to Lua panic
void close();
}
#endif // LOGIC_SCRIPTING_SCRIPTING_HPP_
+1 -1
View File
@@ -1,4 +1,4 @@
#include "scripting_functional.h"
#include "scripting_functional.hpp"
#include "lua/LuaState.hpp"
#include "../../debug/Logger.hpp"
@@ -1,10 +1,10 @@
#ifndef LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_H_
#define LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_H_
#ifndef LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_HPP_
#define LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_HPP_
#include <glm/glm.hpp>
#include <string>
#include "../../typedefs.h"
#include "../../delegates.h"
#include "../../typedefs.hpp"
#include "../../delegates.hpp"
namespace scripting {
runnable create_runnable(
@@ -68,4 +68,4 @@ namespace scripting {
);
}
#endif // LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_H_
#endif // LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_HPP_
+4 -4
View File
@@ -1,14 +1,14 @@
#include "scripting_hud.hpp"
#include "scripting.h"
#include "scripting.hpp"
#include "lua/api_lua.hpp"
#include "lua/LuaState.hpp"
#include "../../debug/Logger.hpp"
#include "../../frontend/hud.hpp"
#include "../../objects/Player.h"
#include "../../files/files.h"
#include "../../engine.h"
#include "../../objects/Player.hpp"
#include "../../files/files.hpp"
#include "../../engine.hpp"
namespace scripting {
extern lua::LuaState* state;
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef LOGIC_SCRIPTING_SCRIPTING_HUD_HPP_
#define LOGIC_SCRIPTING_SCRIPTING_HUD_HPP_
#include "../../typedefs.h"
#include "../../typedefs.hpp"
#include <string>
#include <filesystem>