From 4ee96df1d3937bbc5d760c45fa62765e4d4cc859 Mon Sep 17 00:00:00 2001 From: Hopson97 Date: Sat, 8 Jul 2017 01:22:10 +0100 Subject: [PATCH] remove the jesyspa stuff --- .gitignore | 0 CMakeLists.txt | 0 CODESTYLE.md | 0 Data/Blocks/Air.block | 0 Data/Blocks/Dirt.block | 0 Data/Blocks/Grass.block | 0 Data/Blocks/Oak_Leaf.block | 0 Data/Blocks/Oak_Wood.block | 0 Data/Blocks/Rose.block | 0 Data/Blocks/Sand.block | 0 Data/Blocks/Stone.block | 0 Data/Blocks/Tall_Grass.block | 0 Data/Blocks/Water.block | 0 Data/Blocks/_Example.block | 0 Data/Fonts/rs.ttf | Bin Data/Music/Rue's Whistle.ogg | Bin Data/Music/Undertale - Once Upon A Time.ogg | Bin Data/Shaders/Block_Fragment.glsl | 0 Data/Shaders/Flora_Vertex.glsl | 0 Data/Shaders/Liquid_Vertex.glsl | 0 Data/Shaders/Simple_Fragment.glsl | 0 Data/Shaders/Simple_Vertex.glsl | 0 Data/Shaders/Solid_Vertex.glsl | 0 Data/Textures/Atlas/Low.png | Bin Data/Textures/Crosshair.png | Bin Data/Textures/GUI.png | Bin Data/Textures/Logo.png | Bin Data/Textures/Menu_BG/1.png | Bin Data/Textures/Vignette.png | Bin Data/WorldGen/Classic/Dense Forest.biome | 0 Data/WorldGen/Classic/Forest.biome | 0 Data/WorldGen/Classic/Grassland.biome | 0 Data/WorldGen/Classic/Info.biome | 0 Data/WorldGen/Classic/Mountains.biome | 0 Data/WorldGen/Classic/Ocean.biome | 0 Data/WorldGen/Islands/Deep Trench.biome | 0 Data/WorldGen/Islands/Highland.biome | 0 Data/WorldGen/Islands/Info.biome | 0 Data/WorldGen/Islands/Land.biome | 0 Data/WorldGen/Islands/Land2.biome | 0 Data/WorldGen/Islands/Ocean.biome | 0 Data/WorldGen/Islands/Trench.biome | 0 IMPLEMENTATION.md | 0 License.txt | 0 README.md | 0 Source/Application.cpp | 0 Source/Application.h | 0 Source/Camera.cpp | 0 Source/Camera.h | 0 Source/Display.cpp | 0 Source/Display.h | 0 Source/Entity/Cube.h | 0 Source/Entity/Entity.h | 0 Source/GUI/Background.cpp | 0 Source/GUI/Background.h | 0 Source/GUI/BasicButton.cpp | 0 Source/GUI/BasicButton.h | 0 Source/GUI/Button.cpp | 0 Source/GUI/Button.h | 0 Source/GUI/Component.cpp | 0 Source/GUI/Component.h | 0 Source/GUI/Image.cpp | 0 Source/GUI/Image.h | 0 Source/GUI/Imaged_Button.cpp | 0 Source/GUI/Imaged_Button.h | 0 Source/GUI/Menu.cpp | 0 Source/GUI/Menu.h | 0 Source/GUI/Panel.cpp | 0 Source/GUI/Panel.h | 0 Source/GUI/Text_Box.cpp | 0 Source/GUI/Text_Box.h | 0 Source/GUI/ToggleOptionButton.h | 0 Source/HUD/Crosshair.cpp | 0 Source/HUD/Crosshair.h | 0 Source/HUD/Debug.cpp | 0 Source/HUD/Debug.h | 0 Source/HUD/HUD.h | 0 Source/HUD/Vignette.cpp | 0 Source/HUD/Vignette.h | 0 Source/Input/FunctionToggleKey.cpp | 0 Source/Input/FunctionToggleKey.h | 0 Source/Input/KeyBinds.cpp | 0 Source/Input/KeyBinds.h | 0 Source/Main.cpp | 14 -- Source/Maths/Frustum.cpp | 0 Source/Maths/Frustum.h | 0 Source/Maths/GLM.h | 0 Source/Maths/General.cpp | 0 Source/Maths/General.h | 0 Source/Maths/Matrix.cpp | 0 Source/Maths/Matrix.h | 0 Source/Maths/Plane.h | 0 Source/Maths/PositionConversion.cpp | 0 Source/Maths/PositionConversion.h | 0 Source/Model.cpp | 0 Source/Model.h | 0 Source/ModelCoords.cpp | 0 Source/ModelCoords.h | 0 Source/MusicPlayer.cpp | 0 Source/MusicPlayer.h | 0 Source/Physics/AABB.cpp | 0 Source/Physics/AABB.h | 0 Source/Physics/Ray.cpp | 0 Source/Physics/Ray.h | 0 Source/Player/Player.cpp | 0 Source/Player/Player.h | 0 Source/Player/PlayerInput.cpp | 0 Source/Renderer/RFlora.cpp | 0 Source/Renderer/RFlora.h | 0 Source/Renderer/RInfo.h | 0 Source/Renderer/RLiquid.cpp | 0 Source/Renderer/RLiquid.h | 0 Source/Renderer/RMaster.cpp | 0 Source/Renderer/RMaster.h | 0 Source/Renderer/RSFML.cpp | 0 Source/Renderer/RSFML.h | 0 Source/Renderer/RSimple.cpp | 0 Source/Renderer/RSimple.h | 0 Source/Renderer/RSolid.cpp | 0 Source/Renderer/RSolid.h | 0 Source/ResourceManagers/ResourceHolder.cpp | 0 Source/ResourceManagers/ResourceHolder.h | 0 Source/ResourceManagers/ResourceManager.h | 0 Source/Shaders/ChunkShader.cpp | 0 Source/Shaders/ChunkShader.h | 0 Source/Shaders/ShaderLoader.cpp | 0 Source/Shaders/ShaderLoader.h | 0 Source/Shaders/ShaderProgram.cpp | 0 Source/Shaders/ShaderProgram.h | 0 Source/Shaders/SimpleShader.cpp | 0 Source/Shaders/SimpleShader.h | 0 Source/States/Base.cpp | 0 Source/States/Base.h | 0 Source/States/MainMenu.cpp | 0 Source/States/MainMenu.h | 0 Source/States/Playing.cpp | 0 Source/States/Playing.h | 0 Source/States/SettingsMenu.cpp | 0 Source/States/SettingsMenu.h | 0 Source/Texture/Cube_Map.cpp | 0 Source/Texture/Cube_Map.h | 0 Source/Texture/Texture.cpp | 0 Source/Texture/Texture.h | 0 Source/Texture/Texture_Atlas.cpp | 0 Source/Texture/Texture_Atlas.h | 0 Source/Util/Array2D.h | 0 Source/Util/Array3D.h | 0 Source/Util/Config.cpp | 104 -------------- Source/Util/Config.h | 36 ----- Source/Util/ConfigParser.cpp | 128 ------------------ Source/Util/ConfigParser.h | 70 ---------- Source/Util/FileUtil.cpp | 0 Source/Util/FileUtil.h | 0 Source/Util/Hasher.h | 0 Source/Util/Loader.cpp | 0 Source/Util/Loader.h | 0 Source/Util/Log.h | 0 Source/Util/Native.h | 0 Source/Util/Random.cpp | 0 Source/Util/Random.h | 0 Source/Util/STDUtil.cpp | 0 Source/Util/STD_Util.h | 0 Source/Util/Singleton.h | 49 ------- Source/Util/TimeCheck.cpp | 0 Source/Util/TimeCheck.h | 0 Source/World/Block/BlockData.cpp | 0 Source/World/Block/BlockData.h | 0 Source/World/Block/BlockDatabase.cpp | 0 Source/World/Block/BlockDatabase.h | 0 Source/World/Block/BlockID.h | 0 Source/World/Block/BlockPosition.h | 0 Source/World/Block/Types/BDefault.cpp | 0 Source/World/Block/Types/BDefault.h | 0 Source/World/Block/Types/BPlant.cpp | 0 Source/World/Block/Types/BPlant.h | 0 Source/World/Block/Types/BWater.cpp | 0 Source/World/Block/Types/BWater.h | 0 Source/World/Block/Types/BlockType.cpp | 0 Source/World/Block/Types/BlockType.h | 0 Source/World/Chunk/FullChunk.cpp | 0 Source/World/Chunk/FullChunk.h | 0 Source/World/Chunk/Mesh.cpp | 0 Source/World/Chunk/Mesh.h | 0 Source/World/Chunk/MeshBuilder.cpp | 0 Source/World/Chunk/MeshBuilder.h | 0 Source/World/Chunk/Nodes.cpp | 0 Source/World/Chunk/Nodes.h | 0 Source/World/Chunk/Section.cpp | 0 Source/World/Chunk/Section.h | 0 Source/World/Generators/Biome.cpp | 0 Source/World/Generators/Biome.h | 0 Source/World/Generators/Buildings.cpp | 0 Source/World/Generators/Buildings.h | 0 Source/World/Generators/GenerationType.cpp | 0 Source/World/Generators/GenerationType.h | 0 Source/World/Generators/Noise.cpp | 0 Source/World/Generators/Noise.h | 0 Source/World/Generators/Structures.cpp | 0 Source/World/Generators/Structures.h | 0 Source/World/Generators/StructuresBuilder.cpp | 0 Source/World/Generators/StructuresBuilder.h | 0 Source/World/Generators/Terrain.cpp | 0 Source/World/Generators/Terrain.h | 0 Source/World/Generators/Trees.cpp | 0 Source/World/Generators/Trees.h | 0 Source/World/IBlock_Accessible.h | 0 Source/World/World.cpp | 0 Source/World/World.h | 0 Source/World/WorldConstants.h | 0 Source/World/WorldSettings.h | 0 cmake_modules/FindSFML.cmake | 0 211 files changed, 401 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 CMakeLists.txt mode change 100644 => 100755 CODESTYLE.md mode change 100644 => 100755 Data/Blocks/Air.block mode change 100644 => 100755 Data/Blocks/Dirt.block mode change 100644 => 100755 Data/Blocks/Grass.block mode change 100644 => 100755 Data/Blocks/Oak_Leaf.block mode change 100644 => 100755 Data/Blocks/Oak_Wood.block mode change 100644 => 100755 Data/Blocks/Rose.block mode change 100644 => 100755 Data/Blocks/Sand.block mode change 100644 => 100755 Data/Blocks/Stone.block mode change 100644 => 100755 Data/Blocks/Tall_Grass.block mode change 100644 => 100755 Data/Blocks/Water.block mode change 100644 => 100755 Data/Blocks/_Example.block mode change 100644 => 100755 Data/Fonts/rs.ttf mode change 100644 => 100755 Data/Music/Rue's Whistle.ogg mode change 100644 => 100755 Data/Music/Undertale - Once Upon A Time.ogg mode change 100644 => 100755 Data/Shaders/Block_Fragment.glsl mode change 100644 => 100755 Data/Shaders/Flora_Vertex.glsl mode change 100644 => 100755 Data/Shaders/Liquid_Vertex.glsl mode change 100644 => 100755 Data/Shaders/Simple_Fragment.glsl mode change 100644 => 100755 Data/Shaders/Simple_Vertex.glsl mode change 100644 => 100755 Data/Shaders/Solid_Vertex.glsl mode change 100644 => 100755 Data/Textures/Atlas/Low.png mode change 100644 => 100755 Data/Textures/Crosshair.png mode change 100644 => 100755 Data/Textures/GUI.png mode change 100644 => 100755 Data/Textures/Logo.png mode change 100644 => 100755 Data/Textures/Menu_BG/1.png mode change 100644 => 100755 Data/Textures/Vignette.png mode change 100644 => 100755 Data/WorldGen/Classic/Dense Forest.biome mode change 100644 => 100755 Data/WorldGen/Classic/Forest.biome mode change 100644 => 100755 Data/WorldGen/Classic/Grassland.biome mode change 100644 => 100755 Data/WorldGen/Classic/Info.biome mode change 100644 => 100755 Data/WorldGen/Classic/Mountains.biome mode change 100644 => 100755 Data/WorldGen/Classic/Ocean.biome mode change 100644 => 100755 Data/WorldGen/Islands/Deep Trench.biome mode change 100644 => 100755 Data/WorldGen/Islands/Highland.biome mode change 100644 => 100755 Data/WorldGen/Islands/Info.biome mode change 100644 => 100755 Data/WorldGen/Islands/Land.biome mode change 100644 => 100755 Data/WorldGen/Islands/Land2.biome mode change 100644 => 100755 Data/WorldGen/Islands/Ocean.biome mode change 100644 => 100755 Data/WorldGen/Islands/Trench.biome mode change 100644 => 100755 IMPLEMENTATION.md mode change 100644 => 100755 License.txt mode change 100644 => 100755 README.md mode change 100644 => 100755 Source/Application.cpp mode change 100644 => 100755 Source/Application.h mode change 100644 => 100755 Source/Camera.cpp mode change 100644 => 100755 Source/Camera.h mode change 100644 => 100755 Source/Display.cpp mode change 100644 => 100755 Source/Display.h mode change 100644 => 100755 Source/Entity/Cube.h mode change 100644 => 100755 Source/Entity/Entity.h mode change 100644 => 100755 Source/GUI/Background.cpp mode change 100644 => 100755 Source/GUI/Background.h mode change 100644 => 100755 Source/GUI/BasicButton.cpp mode change 100644 => 100755 Source/GUI/BasicButton.h mode change 100644 => 100755 Source/GUI/Button.cpp mode change 100644 => 100755 Source/GUI/Button.h mode change 100644 => 100755 Source/GUI/Component.cpp mode change 100644 => 100755 Source/GUI/Component.h mode change 100644 => 100755 Source/GUI/Image.cpp mode change 100644 => 100755 Source/GUI/Image.h mode change 100644 => 100755 Source/GUI/Imaged_Button.cpp mode change 100644 => 100755 Source/GUI/Imaged_Button.h mode change 100644 => 100755 Source/GUI/Menu.cpp mode change 100644 => 100755 Source/GUI/Menu.h mode change 100644 => 100755 Source/GUI/Panel.cpp mode change 100644 => 100755 Source/GUI/Panel.h mode change 100644 => 100755 Source/GUI/Text_Box.cpp mode change 100644 => 100755 Source/GUI/Text_Box.h mode change 100644 => 100755 Source/GUI/ToggleOptionButton.h mode change 100644 => 100755 Source/HUD/Crosshair.cpp mode change 100644 => 100755 Source/HUD/Crosshair.h mode change 100644 => 100755 Source/HUD/Debug.cpp mode change 100644 => 100755 Source/HUD/Debug.h mode change 100644 => 100755 Source/HUD/HUD.h mode change 100644 => 100755 Source/HUD/Vignette.cpp mode change 100644 => 100755 Source/HUD/Vignette.h mode change 100644 => 100755 Source/Input/FunctionToggleKey.cpp mode change 100644 => 100755 Source/Input/FunctionToggleKey.h mode change 100644 => 100755 Source/Input/KeyBinds.cpp mode change 100644 => 100755 Source/Input/KeyBinds.h mode change 100644 => 100755 Source/Main.cpp mode change 100644 => 100755 Source/Maths/Frustum.cpp mode change 100644 => 100755 Source/Maths/Frustum.h mode change 100644 => 100755 Source/Maths/GLM.h mode change 100644 => 100755 Source/Maths/General.cpp mode change 100644 => 100755 Source/Maths/General.h mode change 100644 => 100755 Source/Maths/Matrix.cpp mode change 100644 => 100755 Source/Maths/Matrix.h mode change 100644 => 100755 Source/Maths/Plane.h mode change 100644 => 100755 Source/Maths/PositionConversion.cpp mode change 100644 => 100755 Source/Maths/PositionConversion.h mode change 100644 => 100755 Source/Model.cpp mode change 100644 => 100755 Source/Model.h mode change 100644 => 100755 Source/ModelCoords.cpp mode change 100644 => 100755 Source/ModelCoords.h mode change 100644 => 100755 Source/MusicPlayer.cpp mode change 100644 => 100755 Source/MusicPlayer.h mode change 100644 => 100755 Source/Physics/AABB.cpp mode change 100644 => 100755 Source/Physics/AABB.h mode change 100644 => 100755 Source/Physics/Ray.cpp mode change 100644 => 100755 Source/Physics/Ray.h mode change 100644 => 100755 Source/Player/Player.cpp mode change 100644 => 100755 Source/Player/Player.h mode change 100644 => 100755 Source/Player/PlayerInput.cpp mode change 100644 => 100755 Source/Renderer/RFlora.cpp mode change 100644 => 100755 Source/Renderer/RFlora.h mode change 100644 => 100755 Source/Renderer/RInfo.h mode change 100644 => 100755 Source/Renderer/RLiquid.cpp mode change 100644 => 100755 Source/Renderer/RLiquid.h mode change 100644 => 100755 Source/Renderer/RMaster.cpp mode change 100644 => 100755 Source/Renderer/RMaster.h mode change 100644 => 100755 Source/Renderer/RSFML.cpp mode change 100644 => 100755 Source/Renderer/RSFML.h mode change 100644 => 100755 Source/Renderer/RSimple.cpp mode change 100644 => 100755 Source/Renderer/RSimple.h mode change 100644 => 100755 Source/Renderer/RSolid.cpp mode change 100644 => 100755 Source/Renderer/RSolid.h mode change 100644 => 100755 Source/ResourceManagers/ResourceHolder.cpp mode change 100644 => 100755 Source/ResourceManagers/ResourceHolder.h mode change 100644 => 100755 Source/ResourceManagers/ResourceManager.h mode change 100644 => 100755 Source/Shaders/ChunkShader.cpp mode change 100644 => 100755 Source/Shaders/ChunkShader.h mode change 100644 => 100755 Source/Shaders/ShaderLoader.cpp mode change 100644 => 100755 Source/Shaders/ShaderLoader.h mode change 100644 => 100755 Source/Shaders/ShaderProgram.cpp mode change 100644 => 100755 Source/Shaders/ShaderProgram.h mode change 100644 => 100755 Source/Shaders/SimpleShader.cpp mode change 100644 => 100755 Source/Shaders/SimpleShader.h mode change 100644 => 100755 Source/States/Base.cpp mode change 100644 => 100755 Source/States/Base.h mode change 100644 => 100755 Source/States/MainMenu.cpp mode change 100644 => 100755 Source/States/MainMenu.h mode change 100644 => 100755 Source/States/Playing.cpp mode change 100644 => 100755 Source/States/Playing.h mode change 100644 => 100755 Source/States/SettingsMenu.cpp mode change 100644 => 100755 Source/States/SettingsMenu.h mode change 100644 => 100755 Source/Texture/Cube_Map.cpp mode change 100644 => 100755 Source/Texture/Cube_Map.h mode change 100644 => 100755 Source/Texture/Texture.cpp mode change 100644 => 100755 Source/Texture/Texture.h mode change 100644 => 100755 Source/Texture/Texture_Atlas.cpp mode change 100644 => 100755 Source/Texture/Texture_Atlas.h mode change 100644 => 100755 Source/Util/Array2D.h mode change 100644 => 100755 Source/Util/Array3D.h delete mode 100644 Source/Util/Config.cpp delete mode 100644 Source/Util/Config.h delete mode 100644 Source/Util/ConfigParser.cpp delete mode 100644 Source/Util/ConfigParser.h mode change 100644 => 100755 Source/Util/FileUtil.cpp mode change 100644 => 100755 Source/Util/FileUtil.h mode change 100644 => 100755 Source/Util/Hasher.h mode change 100644 => 100755 Source/Util/Loader.cpp mode change 100644 => 100755 Source/Util/Loader.h mode change 100644 => 100755 Source/Util/Log.h mode change 100644 => 100755 Source/Util/Native.h mode change 100644 => 100755 Source/Util/Random.cpp mode change 100644 => 100755 Source/Util/Random.h mode change 100644 => 100755 Source/Util/STDUtil.cpp mode change 100644 => 100755 Source/Util/STD_Util.h delete mode 100644 Source/Util/Singleton.h mode change 100644 => 100755 Source/Util/TimeCheck.cpp mode change 100644 => 100755 Source/Util/TimeCheck.h mode change 100644 => 100755 Source/World/Block/BlockData.cpp mode change 100644 => 100755 Source/World/Block/BlockData.h mode change 100644 => 100755 Source/World/Block/BlockDatabase.cpp mode change 100644 => 100755 Source/World/Block/BlockDatabase.h mode change 100644 => 100755 Source/World/Block/BlockID.h mode change 100644 => 100755 Source/World/Block/BlockPosition.h mode change 100644 => 100755 Source/World/Block/Types/BDefault.cpp mode change 100644 => 100755 Source/World/Block/Types/BDefault.h mode change 100644 => 100755 Source/World/Block/Types/BPlant.cpp mode change 100644 => 100755 Source/World/Block/Types/BPlant.h mode change 100644 => 100755 Source/World/Block/Types/BWater.cpp mode change 100644 => 100755 Source/World/Block/Types/BWater.h mode change 100644 => 100755 Source/World/Block/Types/BlockType.cpp mode change 100644 => 100755 Source/World/Block/Types/BlockType.h mode change 100644 => 100755 Source/World/Chunk/FullChunk.cpp mode change 100644 => 100755 Source/World/Chunk/FullChunk.h mode change 100644 => 100755 Source/World/Chunk/Mesh.cpp mode change 100644 => 100755 Source/World/Chunk/Mesh.h mode change 100644 => 100755 Source/World/Chunk/MeshBuilder.cpp mode change 100644 => 100755 Source/World/Chunk/MeshBuilder.h mode change 100644 => 100755 Source/World/Chunk/Nodes.cpp mode change 100644 => 100755 Source/World/Chunk/Nodes.h mode change 100644 => 100755 Source/World/Chunk/Section.cpp mode change 100644 => 100755 Source/World/Chunk/Section.h mode change 100644 => 100755 Source/World/Generators/Biome.cpp mode change 100644 => 100755 Source/World/Generators/Biome.h mode change 100644 => 100755 Source/World/Generators/Buildings.cpp mode change 100644 => 100755 Source/World/Generators/Buildings.h mode change 100644 => 100755 Source/World/Generators/GenerationType.cpp mode change 100644 => 100755 Source/World/Generators/GenerationType.h mode change 100644 => 100755 Source/World/Generators/Noise.cpp mode change 100644 => 100755 Source/World/Generators/Noise.h mode change 100644 => 100755 Source/World/Generators/Structures.cpp mode change 100644 => 100755 Source/World/Generators/Structures.h mode change 100644 => 100755 Source/World/Generators/StructuresBuilder.cpp mode change 100644 => 100755 Source/World/Generators/StructuresBuilder.h mode change 100644 => 100755 Source/World/Generators/Terrain.cpp mode change 100644 => 100755 Source/World/Generators/Terrain.h mode change 100644 => 100755 Source/World/Generators/Trees.cpp mode change 100644 => 100755 Source/World/Generators/Trees.h mode change 100644 => 100755 Source/World/IBlock_Accessible.h mode change 100644 => 100755 Source/World/World.cpp mode change 100644 => 100755 Source/World/World.h mode change 100644 => 100755 Source/World/WorldConstants.h mode change 100644 => 100755 Source/World/WorldSettings.h mode change 100644 => 100755 cmake_modules/FindSFML.cmake diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/CODESTYLE.md b/CODESTYLE.md old mode 100644 new mode 100755 diff --git a/Data/Blocks/Air.block b/Data/Blocks/Air.block old mode 100644 new mode 100755 diff --git a/Data/Blocks/Dirt.block b/Data/Blocks/Dirt.block old mode 100644 new mode 100755 diff --git a/Data/Blocks/Grass.block b/Data/Blocks/Grass.block old mode 100644 new mode 100755 diff --git a/Data/Blocks/Oak_Leaf.block b/Data/Blocks/Oak_Leaf.block old mode 100644 new mode 100755 diff --git a/Data/Blocks/Oak_Wood.block b/Data/Blocks/Oak_Wood.block old mode 100644 new mode 100755 diff --git a/Data/Blocks/Rose.block b/Data/Blocks/Rose.block old mode 100644 new mode 100755 diff --git a/Data/Blocks/Sand.block b/Data/Blocks/Sand.block old mode 100644 new mode 100755 diff --git a/Data/Blocks/Stone.block b/Data/Blocks/Stone.block old mode 100644 new mode 100755 diff --git a/Data/Blocks/Tall_Grass.block b/Data/Blocks/Tall_Grass.block old mode 100644 new mode 100755 diff --git a/Data/Blocks/Water.block b/Data/Blocks/Water.block old mode 100644 new mode 100755 diff --git a/Data/Blocks/_Example.block b/Data/Blocks/_Example.block old mode 100644 new mode 100755 diff --git a/Data/Fonts/rs.ttf b/Data/Fonts/rs.ttf old mode 100644 new mode 100755 diff --git a/Data/Music/Rue's Whistle.ogg b/Data/Music/Rue's Whistle.ogg old mode 100644 new mode 100755 diff --git a/Data/Music/Undertale - Once Upon A Time.ogg b/Data/Music/Undertale - Once Upon A Time.ogg old mode 100644 new mode 100755 diff --git a/Data/Shaders/Block_Fragment.glsl b/Data/Shaders/Block_Fragment.glsl old mode 100644 new mode 100755 diff --git a/Data/Shaders/Flora_Vertex.glsl b/Data/Shaders/Flora_Vertex.glsl old mode 100644 new mode 100755 diff --git a/Data/Shaders/Liquid_Vertex.glsl b/Data/Shaders/Liquid_Vertex.glsl old mode 100644 new mode 100755 diff --git a/Data/Shaders/Simple_Fragment.glsl b/Data/Shaders/Simple_Fragment.glsl old mode 100644 new mode 100755 diff --git a/Data/Shaders/Simple_Vertex.glsl b/Data/Shaders/Simple_Vertex.glsl old mode 100644 new mode 100755 diff --git a/Data/Shaders/Solid_Vertex.glsl b/Data/Shaders/Solid_Vertex.glsl old mode 100644 new mode 100755 diff --git a/Data/Textures/Atlas/Low.png b/Data/Textures/Atlas/Low.png old mode 100644 new mode 100755 diff --git a/Data/Textures/Crosshair.png b/Data/Textures/Crosshair.png old mode 100644 new mode 100755 diff --git a/Data/Textures/GUI.png b/Data/Textures/GUI.png old mode 100644 new mode 100755 diff --git a/Data/Textures/Logo.png b/Data/Textures/Logo.png old mode 100644 new mode 100755 diff --git a/Data/Textures/Menu_BG/1.png b/Data/Textures/Menu_BG/1.png old mode 100644 new mode 100755 diff --git a/Data/Textures/Vignette.png b/Data/Textures/Vignette.png old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Classic/Dense Forest.biome b/Data/WorldGen/Classic/Dense Forest.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Classic/Forest.biome b/Data/WorldGen/Classic/Forest.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Classic/Grassland.biome b/Data/WorldGen/Classic/Grassland.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Classic/Info.biome b/Data/WorldGen/Classic/Info.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Classic/Mountains.biome b/Data/WorldGen/Classic/Mountains.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Classic/Ocean.biome b/Data/WorldGen/Classic/Ocean.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Islands/Deep Trench.biome b/Data/WorldGen/Islands/Deep Trench.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Islands/Highland.biome b/Data/WorldGen/Islands/Highland.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Islands/Info.biome b/Data/WorldGen/Islands/Info.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Islands/Land.biome b/Data/WorldGen/Islands/Land.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Islands/Land2.biome b/Data/WorldGen/Islands/Land2.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Islands/Ocean.biome b/Data/WorldGen/Islands/Ocean.biome old mode 100644 new mode 100755 diff --git a/Data/WorldGen/Islands/Trench.biome b/Data/WorldGen/Islands/Trench.biome old mode 100644 new mode 100755 diff --git a/IMPLEMENTATION.md b/IMPLEMENTATION.md old mode 100644 new mode 100755 diff --git a/License.txt b/License.txt old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/Source/Application.cpp b/Source/Application.cpp old mode 100644 new mode 100755 diff --git a/Source/Application.h b/Source/Application.h old mode 100644 new mode 100755 diff --git a/Source/Camera.cpp b/Source/Camera.cpp old mode 100644 new mode 100755 diff --git a/Source/Camera.h b/Source/Camera.h old mode 100644 new mode 100755 diff --git a/Source/Display.cpp b/Source/Display.cpp old mode 100644 new mode 100755 diff --git a/Source/Display.h b/Source/Display.h old mode 100644 new mode 100755 diff --git a/Source/Entity/Cube.h b/Source/Entity/Cube.h old mode 100644 new mode 100755 diff --git a/Source/Entity/Entity.h b/Source/Entity/Entity.h old mode 100644 new mode 100755 diff --git a/Source/GUI/Background.cpp b/Source/GUI/Background.cpp old mode 100644 new mode 100755 diff --git a/Source/GUI/Background.h b/Source/GUI/Background.h old mode 100644 new mode 100755 diff --git a/Source/GUI/BasicButton.cpp b/Source/GUI/BasicButton.cpp old mode 100644 new mode 100755 diff --git a/Source/GUI/BasicButton.h b/Source/GUI/BasicButton.h old mode 100644 new mode 100755 diff --git a/Source/GUI/Button.cpp b/Source/GUI/Button.cpp old mode 100644 new mode 100755 diff --git a/Source/GUI/Button.h b/Source/GUI/Button.h old mode 100644 new mode 100755 diff --git a/Source/GUI/Component.cpp b/Source/GUI/Component.cpp old mode 100644 new mode 100755 diff --git a/Source/GUI/Component.h b/Source/GUI/Component.h old mode 100644 new mode 100755 diff --git a/Source/GUI/Image.cpp b/Source/GUI/Image.cpp old mode 100644 new mode 100755 diff --git a/Source/GUI/Image.h b/Source/GUI/Image.h old mode 100644 new mode 100755 diff --git a/Source/GUI/Imaged_Button.cpp b/Source/GUI/Imaged_Button.cpp old mode 100644 new mode 100755 diff --git a/Source/GUI/Imaged_Button.h b/Source/GUI/Imaged_Button.h old mode 100644 new mode 100755 diff --git a/Source/GUI/Menu.cpp b/Source/GUI/Menu.cpp old mode 100644 new mode 100755 diff --git a/Source/GUI/Menu.h b/Source/GUI/Menu.h old mode 100644 new mode 100755 diff --git a/Source/GUI/Panel.cpp b/Source/GUI/Panel.cpp old mode 100644 new mode 100755 diff --git a/Source/GUI/Panel.h b/Source/GUI/Panel.h old mode 100644 new mode 100755 diff --git a/Source/GUI/Text_Box.cpp b/Source/GUI/Text_Box.cpp old mode 100644 new mode 100755 diff --git a/Source/GUI/Text_Box.h b/Source/GUI/Text_Box.h old mode 100644 new mode 100755 diff --git a/Source/GUI/ToggleOptionButton.h b/Source/GUI/ToggleOptionButton.h old mode 100644 new mode 100755 diff --git a/Source/HUD/Crosshair.cpp b/Source/HUD/Crosshair.cpp old mode 100644 new mode 100755 diff --git a/Source/HUD/Crosshair.h b/Source/HUD/Crosshair.h old mode 100644 new mode 100755 diff --git a/Source/HUD/Debug.cpp b/Source/HUD/Debug.cpp old mode 100644 new mode 100755 diff --git a/Source/HUD/Debug.h b/Source/HUD/Debug.h old mode 100644 new mode 100755 diff --git a/Source/HUD/HUD.h b/Source/HUD/HUD.h old mode 100644 new mode 100755 diff --git a/Source/HUD/Vignette.cpp b/Source/HUD/Vignette.cpp old mode 100644 new mode 100755 diff --git a/Source/HUD/Vignette.h b/Source/HUD/Vignette.h old mode 100644 new mode 100755 diff --git a/Source/Input/FunctionToggleKey.cpp b/Source/Input/FunctionToggleKey.cpp old mode 100644 new mode 100755 diff --git a/Source/Input/FunctionToggleKey.h b/Source/Input/FunctionToggleKey.h old mode 100644 new mode 100755 diff --git a/Source/Input/KeyBinds.cpp b/Source/Input/KeyBinds.cpp old mode 100644 new mode 100755 diff --git a/Source/Input/KeyBinds.h b/Source/Input/KeyBinds.h old mode 100644 new mode 100755 diff --git a/Source/Main.cpp b/Source/Main.cpp old mode 100644 new mode 100755 index 05c488d..054e431 --- a/Source/Main.cpp +++ b/Source/Main.cpp @@ -3,8 +3,6 @@ #include #include "Util/Random.h" -#include "Util/Config.h" -#include "Util/Singleton.h" #include "Util/Native.h" #include "Application.h" @@ -51,17 +49,6 @@ namespace Random::intInRange(0, RAND_MAX); } } - - void loadConfig() - { - const std::string fileName = "HopsonCraft.conf"; - std::ifstream inFile (fileName); - - if(inFile.is_open()) - { - jesyspa::Singleton::get().loadFromStream(fileName, inFile); - } - } } //entry @@ -70,7 +57,6 @@ int main() try { initilize(); - loadConfig(); Application app; app.runMainGameLoop(); diff --git a/Source/Maths/Frustum.cpp b/Source/Maths/Frustum.cpp old mode 100644 new mode 100755 diff --git a/Source/Maths/Frustum.h b/Source/Maths/Frustum.h old mode 100644 new mode 100755 diff --git a/Source/Maths/GLM.h b/Source/Maths/GLM.h old mode 100644 new mode 100755 diff --git a/Source/Maths/General.cpp b/Source/Maths/General.cpp old mode 100644 new mode 100755 diff --git a/Source/Maths/General.h b/Source/Maths/General.h old mode 100644 new mode 100755 diff --git a/Source/Maths/Matrix.cpp b/Source/Maths/Matrix.cpp old mode 100644 new mode 100755 diff --git a/Source/Maths/Matrix.h b/Source/Maths/Matrix.h old mode 100644 new mode 100755 diff --git a/Source/Maths/Plane.h b/Source/Maths/Plane.h old mode 100644 new mode 100755 diff --git a/Source/Maths/PositionConversion.cpp b/Source/Maths/PositionConversion.cpp old mode 100644 new mode 100755 diff --git a/Source/Maths/PositionConversion.h b/Source/Maths/PositionConversion.h old mode 100644 new mode 100755 diff --git a/Source/Model.cpp b/Source/Model.cpp old mode 100644 new mode 100755 diff --git a/Source/Model.h b/Source/Model.h old mode 100644 new mode 100755 diff --git a/Source/ModelCoords.cpp b/Source/ModelCoords.cpp old mode 100644 new mode 100755 diff --git a/Source/ModelCoords.h b/Source/ModelCoords.h old mode 100644 new mode 100755 diff --git a/Source/MusicPlayer.cpp b/Source/MusicPlayer.cpp old mode 100644 new mode 100755 diff --git a/Source/MusicPlayer.h b/Source/MusicPlayer.h old mode 100644 new mode 100755 diff --git a/Source/Physics/AABB.cpp b/Source/Physics/AABB.cpp old mode 100644 new mode 100755 diff --git a/Source/Physics/AABB.h b/Source/Physics/AABB.h old mode 100644 new mode 100755 diff --git a/Source/Physics/Ray.cpp b/Source/Physics/Ray.cpp old mode 100644 new mode 100755 diff --git a/Source/Physics/Ray.h b/Source/Physics/Ray.h old mode 100644 new mode 100755 diff --git a/Source/Player/Player.cpp b/Source/Player/Player.cpp old mode 100644 new mode 100755 diff --git a/Source/Player/Player.h b/Source/Player/Player.h old mode 100644 new mode 100755 diff --git a/Source/Player/PlayerInput.cpp b/Source/Player/PlayerInput.cpp old mode 100644 new mode 100755 diff --git a/Source/Renderer/RFlora.cpp b/Source/Renderer/RFlora.cpp old mode 100644 new mode 100755 diff --git a/Source/Renderer/RFlora.h b/Source/Renderer/RFlora.h old mode 100644 new mode 100755 diff --git a/Source/Renderer/RInfo.h b/Source/Renderer/RInfo.h old mode 100644 new mode 100755 diff --git a/Source/Renderer/RLiquid.cpp b/Source/Renderer/RLiquid.cpp old mode 100644 new mode 100755 diff --git a/Source/Renderer/RLiquid.h b/Source/Renderer/RLiquid.h old mode 100644 new mode 100755 diff --git a/Source/Renderer/RMaster.cpp b/Source/Renderer/RMaster.cpp old mode 100644 new mode 100755 diff --git a/Source/Renderer/RMaster.h b/Source/Renderer/RMaster.h old mode 100644 new mode 100755 diff --git a/Source/Renderer/RSFML.cpp b/Source/Renderer/RSFML.cpp old mode 100644 new mode 100755 diff --git a/Source/Renderer/RSFML.h b/Source/Renderer/RSFML.h old mode 100644 new mode 100755 diff --git a/Source/Renderer/RSimple.cpp b/Source/Renderer/RSimple.cpp old mode 100644 new mode 100755 diff --git a/Source/Renderer/RSimple.h b/Source/Renderer/RSimple.h old mode 100644 new mode 100755 diff --git a/Source/Renderer/RSolid.cpp b/Source/Renderer/RSolid.cpp old mode 100644 new mode 100755 diff --git a/Source/Renderer/RSolid.h b/Source/Renderer/RSolid.h old mode 100644 new mode 100755 diff --git a/Source/ResourceManagers/ResourceHolder.cpp b/Source/ResourceManagers/ResourceHolder.cpp old mode 100644 new mode 100755 diff --git a/Source/ResourceManagers/ResourceHolder.h b/Source/ResourceManagers/ResourceHolder.h old mode 100644 new mode 100755 diff --git a/Source/ResourceManagers/ResourceManager.h b/Source/ResourceManagers/ResourceManager.h old mode 100644 new mode 100755 diff --git a/Source/Shaders/ChunkShader.cpp b/Source/Shaders/ChunkShader.cpp old mode 100644 new mode 100755 diff --git a/Source/Shaders/ChunkShader.h b/Source/Shaders/ChunkShader.h old mode 100644 new mode 100755 diff --git a/Source/Shaders/ShaderLoader.cpp b/Source/Shaders/ShaderLoader.cpp old mode 100644 new mode 100755 diff --git a/Source/Shaders/ShaderLoader.h b/Source/Shaders/ShaderLoader.h old mode 100644 new mode 100755 diff --git a/Source/Shaders/ShaderProgram.cpp b/Source/Shaders/ShaderProgram.cpp old mode 100644 new mode 100755 diff --git a/Source/Shaders/ShaderProgram.h b/Source/Shaders/ShaderProgram.h old mode 100644 new mode 100755 diff --git a/Source/Shaders/SimpleShader.cpp b/Source/Shaders/SimpleShader.cpp old mode 100644 new mode 100755 diff --git a/Source/Shaders/SimpleShader.h b/Source/Shaders/SimpleShader.h old mode 100644 new mode 100755 diff --git a/Source/States/Base.cpp b/Source/States/Base.cpp old mode 100644 new mode 100755 diff --git a/Source/States/Base.h b/Source/States/Base.h old mode 100644 new mode 100755 diff --git a/Source/States/MainMenu.cpp b/Source/States/MainMenu.cpp old mode 100644 new mode 100755 diff --git a/Source/States/MainMenu.h b/Source/States/MainMenu.h old mode 100644 new mode 100755 diff --git a/Source/States/Playing.cpp b/Source/States/Playing.cpp old mode 100644 new mode 100755 diff --git a/Source/States/Playing.h b/Source/States/Playing.h old mode 100644 new mode 100755 diff --git a/Source/States/SettingsMenu.cpp b/Source/States/SettingsMenu.cpp old mode 100644 new mode 100755 diff --git a/Source/States/SettingsMenu.h b/Source/States/SettingsMenu.h old mode 100644 new mode 100755 diff --git a/Source/Texture/Cube_Map.cpp b/Source/Texture/Cube_Map.cpp old mode 100644 new mode 100755 diff --git a/Source/Texture/Cube_Map.h b/Source/Texture/Cube_Map.h old mode 100644 new mode 100755 diff --git a/Source/Texture/Texture.cpp b/Source/Texture/Texture.cpp old mode 100644 new mode 100755 diff --git a/Source/Texture/Texture.h b/Source/Texture/Texture.h old mode 100644 new mode 100755 diff --git a/Source/Texture/Texture_Atlas.cpp b/Source/Texture/Texture_Atlas.cpp old mode 100644 new mode 100755 diff --git a/Source/Texture/Texture_Atlas.h b/Source/Texture/Texture_Atlas.h old mode 100644 new mode 100755 diff --git a/Source/Util/Array2D.h b/Source/Util/Array2D.h old mode 100644 new mode 100755 diff --git a/Source/Util/Array3D.h b/Source/Util/Array3D.h old mode 100644 new mode 100755 diff --git a/Source/Util/Config.cpp b/Source/Util/Config.cpp deleted file mode 100644 index 1e93871..0000000 --- a/Source/Util/Config.cpp +++ /dev/null @@ -1,104 +0,0 @@ -#include "Config.h" -#include -#include - -namespace jesyspa -{ - Config::Config() { - setDefaultVideoMode(); - setDefaultKeybindings(); - } - - void Config::loadFromStream(std::string const& filename, std::istream& is) - { - ConfigParser parser; - parser.parse(filename, is); - while (!parser.atEnd()) - { - if (parser.atKVP()) - { - parser.error("KVP without section"); - } - - auto header = parser.getHeader(); - - if (header == "screen") - { - loadScreenSettingsFromStream(parser); - } - else if (header == "keyboard") - { - loadKeybindingsFromStream(parser); - } - else - { - parser.error("Unrecognised section " + header); - } - } - } - - sf::Keyboard::Key Config::getKey(KeyBinds::Control control) const - { - return m_keybindings.at(control); - } - - sf::VideoMode Config::getVideoMode() const - { - return m_video_mode; - } - - void Config::setDefaultVideoMode() - { - m_video_mode = sf::VideoMode::getDesktopMode(); - } - - void Config::setDefaultKeybindings() - { - m_keybindings[KeyBinds::Control::Player_Forwards] = sf::Keyboard::W; - m_keybindings[KeyBinds::Control::Player_Back] = sf::Keyboard::S; - m_keybindings[KeyBinds::Control::Player_Left] = sf::Keyboard::A; - m_keybindings[KeyBinds::Control::Player_Right] = sf::Keyboard::D; - } - - void Config::loadScreenSettingsFromStream(ConfigParser& parser) - { - while (parser.atKVP()) - { - auto kvp = parser.getKVP(); - if (kvp.first == "width") - m_video_mode.width = std::stoi(kvp.second); - else if (kvp.first == "height") - m_video_mode.height = std::stoi(kvp.second); - else - parser.error("Unrecognised key \"" + kvp.first + "\""); - } - } - - void Config::loadKeybindingsFromStream(ConfigParser& parser) - { - while (parser.atKVP()) { - auto kvp = parser.getKVP(); - if (kvp.first == "Player_Forwards") - { - m_keybindings[KeyBinds::Control::Player_Forwards] = static_cast(std::stoi(kvp.second)); - } - else if (kvp.first == "Player_Back") - { - m_keybindings[KeyBinds::Control::Player_Back] = static_cast(std::stoi(kvp.second)); - } - else if (kvp.first == "Player_Left") - { - m_keybindings[KeyBinds::Control::Player_Left] = static_cast(std::stoi(kvp.second)); - } - else if (kvp.first == "Player_Right") - { - m_keybindings[KeyBinds::Control::Player_Right] = static_cast(std::stoi(kvp.second)); - } - else - { - parser.error("Unrecognised key \"" + kvp.first + "\""); - } - } - } - -} diff --git a/Source/Util/Config.h b/Source/Util/Config.h deleted file mode 100644 index 62cd8af..0000000 --- a/Source/Util/Config.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -#include "../Input/KeyBinds.h" -#include "ConfigParser.h" -#include -#include -#include - -namespace jesyspa -{ - class Config - { - public: - Config(); - // Overwrite the current config with the contents of the stream. - // The filename is used for error reporting. - void loadFromStream(std::string const& filename, std::istream&); - - sf::Keyboard::Key getKey(KeyBinds::Control) const; - sf::VideoMode getVideoMode() const; - - - private: - void setDefaultVideoMode(); - void setDefaultKeybindings(); - - void loadScreenSettingsFromStream(ConfigParser&); - void loadKeybindingsFromStream(ConfigParser&); - - sf::VideoMode m_video_mode; - std::map m_keybindings; - }; -} - -#endif diff --git a/Source/Util/ConfigParser.cpp b/Source/Util/ConfigParser.cpp deleted file mode 100644 index 35191a6..0000000 --- a/Source/Util/ConfigParser.cpp +++ /dev/null @@ -1,128 +0,0 @@ -#include "ConfigParser.h" - -namespace jesyspa -{ - ConfigParser::ConfigParser() - : m_position{} - {} - - void ConfigParser::parse(std::string const& filename, std::istream& is) - { - std::string line; - int line_no = 0; - while (std::getline(is, line)) - parseLine(std::move(line), filename, line_no++); - } - - bool ConfigParser::atHeader() const - { - return !atEnd() && m_lines[m_position].is_header; - } - - bool ConfigParser::atKVP() const - { - return !atEnd() && !m_lines[m_position].is_header; - } - - bool ConfigParser::atEnd() const - { - return m_position == m_lines.size(); - } - - std::string ConfigParser::getHeader() - { - if (!atHeader()) - error("header expected"); - return m_lines[m_position++].data; - } - - std::pair ConfigParser::getKVP() - { - if (!atKVP()) - { - error("KVP expected"); - } - auto result = std::make_pair(m_lines[m_position].data, m_lines[m_position].extra_data); - ++m_position; - return result; - } - - void ConfigParser::error(std::string str) - { - if (atEnd()) - { - if (m_position != 0) - { - --m_position; - } - throw ParseError(std::move(str), m_lines[m_position].filename, -1); - } - else - { - throw ParseError(std::move(str), m_lines[m_position].filename, m_lines[m_position].line_no); - } - } - - void ConfigParser::parseLine(std::string line, std::string const& filename, int line_no) - { - // maybe check for all-whitespace m_lines, too? - if (line.empty() || line.find('#') != std::string::npos) - { - return; - } - - Line result; - result.line_no = line_no; - result.filename = filename; - auto lbrace = line.find('['); - - if (lbrace != std::string::npos) - { - auto rbrace = line.find(']'); - if (rbrace == std::string::npos || rbrace < lbrace) - { - error("unmatched ["); - } - result.data = line.substr(lbrace+1, rbrace-lbrace-1); - result.is_header = true; - m_lines.push_back(result); - return; - } - - auto eq = line.find('='); - if (eq == std::string::npos) - { - error("unrecognised data"); - } - result.data = line.substr(0, eq); - result.extra_data = line.substr(eq+1); - m_lines.push_back(result); - } - - char const* ParseError::what() const noexcept - { - if (!m_err_msg.empty()) - { - return m_err_msg.c_str(); - } - - m_err_msg += "in "; - m_err_msg += m_file; - m_err_msg += ", at "; - - if (m_line != -1) - { - m_err_msg += "line " + std::to_string(m_line); - } - else - { - m_err_msg += "EOF"; - } - - m_err_msg += ": "; - m_err_msg += std::runtime_error::what(); - - return m_err_msg.c_str(); - } - -} diff --git a/Source/Util/ConfigParser.h b/Source/Util/ConfigParser.h deleted file mode 100644 index 471f200..0000000 --- a/Source/Util/ConfigParser.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef CONFIG_PARSER_H -#define CONFIG_PARSER_H - -#include -#include -#include -#include - -namespace jesyspa -{ - - class ConfigParser - { - public: - // Create an empty parser - ConfigParser(); - - // Parse the istream, appending to the existing data. - // The filename is used for error detection. - void parse(std::string const& filename, std::istream&); - - // Check whether the current line is of a certain type, or that we have - // reached the end of the file. - bool atHeader() const; - bool atKVP() const; - bool atEnd() const; - - // Get the current line, assuming it is a header or KVP respectively. - std::string getHeader(); - std::pair getKVP(); - - // Throw a parse error. - [[noreturn]] - void error(std::string); - - private: - void parseLine(std::string line, std::string const& filename, int line_no); - - struct Line - { - std::string filename; - int line_no; - std::string data; - std::string extra_data; - bool is_header = false; - }; - - std::vector m_lines; - size_t m_position; - }; - - struct ParseError : std::runtime_error - { - ParseError(std::string err, std::string file, int line) - : std::runtime_error(std::move(err)), m_file(std::move(file)), m_line(line) - {} - - char const* what() const noexcept override; - - private: - std::string m_file; - int m_line; - - // This member is needed to implement what. - mutable std::string m_err_msg; - }; - -} - -#endif diff --git a/Source/Util/FileUtil.cpp b/Source/Util/FileUtil.cpp old mode 100644 new mode 100755 diff --git a/Source/Util/FileUtil.h b/Source/Util/FileUtil.h old mode 100644 new mode 100755 diff --git a/Source/Util/Hasher.h b/Source/Util/Hasher.h old mode 100644 new mode 100755 diff --git a/Source/Util/Loader.cpp b/Source/Util/Loader.cpp old mode 100644 new mode 100755 diff --git a/Source/Util/Loader.h b/Source/Util/Loader.h old mode 100644 new mode 100755 diff --git a/Source/Util/Log.h b/Source/Util/Log.h old mode 100644 new mode 100755 diff --git a/Source/Util/Native.h b/Source/Util/Native.h old mode 100644 new mode 100755 diff --git a/Source/Util/Random.cpp b/Source/Util/Random.cpp old mode 100644 new mode 100755 diff --git a/Source/Util/Random.h b/Source/Util/Random.h old mode 100644 new mode 100755 diff --git a/Source/Util/STDUtil.cpp b/Source/Util/STDUtil.cpp old mode 100644 new mode 100755 diff --git a/Source/Util/STD_Util.h b/Source/Util/STD_Util.h old mode 100644 new mode 100755 diff --git a/Source/Util/Singleton.h b/Source/Util/Singleton.h deleted file mode 100644 index 4faed3c..0000000 --- a/Source/Util/Singleton.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef SINGLETON_H -#define SINGLETON_H - -#include -#include -#include - -namespace jesyspa -{ - // Class for accessing singleton instances. - template - class Singleton - { - public: - // Get a (possibly new) copy of the singleton. - static T& get() { - if (m_init_done) - return *get_underlying(); - std::unique_lock lock(m_mutex); - if (!m_init_done) { - get_underlying() = std::make_unique(); - m_init_done = true; - } - return *get_underlying(); - } - - private: - /* This implementation has the issue that the order of destruction of - * singletons is in inverse order to the construction. Hence, be careful of - * using singletons in the destructors of other singletons. - */ - static std::unique_ptr& get_underlying() { - static std::unique_ptr ptr; - return ptr; - } - - static std::atomic m_init_done; - static std::mutex m_mutex; - }; - - template - std::atomic Singleton::m_init_done; - - template - std::mutex Singleton::m_mutex; - -} - -#endif diff --git a/Source/Util/TimeCheck.cpp b/Source/Util/TimeCheck.cpp old mode 100644 new mode 100755 diff --git a/Source/Util/TimeCheck.h b/Source/Util/TimeCheck.h old mode 100644 new mode 100755 diff --git a/Source/World/Block/BlockData.cpp b/Source/World/Block/BlockData.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Block/BlockData.h b/Source/World/Block/BlockData.h old mode 100644 new mode 100755 diff --git a/Source/World/Block/BlockDatabase.cpp b/Source/World/Block/BlockDatabase.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Block/BlockDatabase.h b/Source/World/Block/BlockDatabase.h old mode 100644 new mode 100755 diff --git a/Source/World/Block/BlockID.h b/Source/World/Block/BlockID.h old mode 100644 new mode 100755 diff --git a/Source/World/Block/BlockPosition.h b/Source/World/Block/BlockPosition.h old mode 100644 new mode 100755 diff --git a/Source/World/Block/Types/BDefault.cpp b/Source/World/Block/Types/BDefault.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Block/Types/BDefault.h b/Source/World/Block/Types/BDefault.h old mode 100644 new mode 100755 diff --git a/Source/World/Block/Types/BPlant.cpp b/Source/World/Block/Types/BPlant.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Block/Types/BPlant.h b/Source/World/Block/Types/BPlant.h old mode 100644 new mode 100755 diff --git a/Source/World/Block/Types/BWater.cpp b/Source/World/Block/Types/BWater.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Block/Types/BWater.h b/Source/World/Block/Types/BWater.h old mode 100644 new mode 100755 diff --git a/Source/World/Block/Types/BlockType.cpp b/Source/World/Block/Types/BlockType.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Block/Types/BlockType.h b/Source/World/Block/Types/BlockType.h old mode 100644 new mode 100755 diff --git a/Source/World/Chunk/FullChunk.cpp b/Source/World/Chunk/FullChunk.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Chunk/FullChunk.h b/Source/World/Chunk/FullChunk.h old mode 100644 new mode 100755 diff --git a/Source/World/Chunk/Mesh.cpp b/Source/World/Chunk/Mesh.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Chunk/Mesh.h b/Source/World/Chunk/Mesh.h old mode 100644 new mode 100755 diff --git a/Source/World/Chunk/MeshBuilder.cpp b/Source/World/Chunk/MeshBuilder.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Chunk/MeshBuilder.h b/Source/World/Chunk/MeshBuilder.h old mode 100644 new mode 100755 diff --git a/Source/World/Chunk/Nodes.cpp b/Source/World/Chunk/Nodes.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Chunk/Nodes.h b/Source/World/Chunk/Nodes.h old mode 100644 new mode 100755 diff --git a/Source/World/Chunk/Section.cpp b/Source/World/Chunk/Section.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Chunk/Section.h b/Source/World/Chunk/Section.h old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Biome.cpp b/Source/World/Generators/Biome.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Biome.h b/Source/World/Generators/Biome.h old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Buildings.cpp b/Source/World/Generators/Buildings.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Buildings.h b/Source/World/Generators/Buildings.h old mode 100644 new mode 100755 diff --git a/Source/World/Generators/GenerationType.cpp b/Source/World/Generators/GenerationType.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Generators/GenerationType.h b/Source/World/Generators/GenerationType.h old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Noise.cpp b/Source/World/Generators/Noise.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Noise.h b/Source/World/Generators/Noise.h old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Structures.cpp b/Source/World/Generators/Structures.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Structures.h b/Source/World/Generators/Structures.h old mode 100644 new mode 100755 diff --git a/Source/World/Generators/StructuresBuilder.cpp b/Source/World/Generators/StructuresBuilder.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Generators/StructuresBuilder.h b/Source/World/Generators/StructuresBuilder.h old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Terrain.cpp b/Source/World/Generators/Terrain.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Terrain.h b/Source/World/Generators/Terrain.h old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Trees.cpp b/Source/World/Generators/Trees.cpp old mode 100644 new mode 100755 diff --git a/Source/World/Generators/Trees.h b/Source/World/Generators/Trees.h old mode 100644 new mode 100755 diff --git a/Source/World/IBlock_Accessible.h b/Source/World/IBlock_Accessible.h old mode 100644 new mode 100755 diff --git a/Source/World/World.cpp b/Source/World/World.cpp old mode 100644 new mode 100755 diff --git a/Source/World/World.h b/Source/World/World.h old mode 100644 new mode 100755 diff --git a/Source/World/WorldConstants.h b/Source/World/WorldConstants.h old mode 100644 new mode 100755 diff --git a/Source/World/WorldSettings.h b/Source/World/WorldSettings.h old mode 100644 new mode 100755 diff --git a/cmake_modules/FindSFML.cmake b/cmake_modules/FindSFML.cmake old mode 100644 new mode 100755