Reorganize filesystem.
parent
e45baf8901
commit
ad029752ef
|
@ -5,6 +5,7 @@ runfile(_PATH .. "modules/math")
|
||||||
runfile(_PATH .. "modules/table")
|
runfile(_PATH .. "modules/table")
|
||||||
runfile(_PATH .. "modules/after")
|
runfile(_PATH .. "modules/after")
|
||||||
runfile(_PATH .. "modules/vector")
|
runfile(_PATH .. "modules/vector")
|
||||||
|
runfile(_PATH .. "modules/entity")
|
||||||
runfile(_PATH .. "modules/callbacks")
|
runfile(_PATH .. "modules/callbacks")
|
||||||
|
|
||||||
-- Register base models (if not on main menu)
|
-- Register base models (if not on main menu)
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
zepha.entities = {}
|
||||||
|
|
||||||
|
function zepha.__builtin.update_entities(delta)
|
||||||
|
for k, v in pairs(zepha.entities) do
|
||||||
|
if type(v.on_update) == "function" then v:on_update(delta) end
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,323 +1,329 @@
|
||||||
set(ZEPHA_SRC
|
set(ZEPHA_SRC
|
||||||
game/graph/meshtypes/ChunkMesh.cpp
|
def/DefinitionAtlas.cpp
|
||||||
game/graph/meshtypes/ChunkMesh.h
|
def/DefinitionAtlas.h
|
||||||
game/entity/Entity.cpp
|
def/gen/BiomeAtlas.cpp
|
||||||
game/entity/Entity.h
|
def/gen/BiomeAtlas.h
|
||||||
game/graph/shader/Shader.cpp
|
def/gen/BiomeDef.cpp
|
||||||
game/graph/shader/Shader.h
|
def/gen/BiomeDef.h
|
||||||
game/graph/window/Window.cpp
|
def/gen/LocalBiomeAtlas.cpp
|
||||||
game/graph/window/Window.h
|
|
||||||
game/graph/Camera.cpp
|
|
||||||
game/graph/Camera.h
|
|
||||||
game/graph/Texture.cpp
|
|
||||||
game/graph/Texture.h
|
|
||||||
game/scene/world/graph/ChunkMeshGenerator.cpp
|
|
||||||
game/scene/world/graph/ChunkMeshGenerator.h
|
|
||||||
util/Timer.cpp
|
|
||||||
util/Timer.h
|
|
||||||
def/LocalDefinitionAtlas.cpp
|
|
||||||
def/LocalDefinitionAtlas.h
|
|
||||||
def/item/MeshPart.cpp
|
|
||||||
def/item/MeshPart.h
|
|
||||||
def/item/ShaderMod.h
|
|
||||||
def/item/BlockModelVertex.h
|
|
||||||
game/scene/world/LocalWorld.cpp
|
|
||||||
game/scene/world/LocalWorld.h
|
|
||||||
world/chunk/Chunk.cpp
|
|
||||||
world/chunk/Chunk.h
|
|
||||||
game/scene/world/graph/MeshChunk.cpp
|
|
||||||
game/scene/world/graph/MeshChunk.h
|
|
||||||
game/scene/GameScene.cpp
|
|
||||||
game/scene/GameScene.h
|
|
||||||
game/graph/Renderer.cpp
|
|
||||||
game/graph/Renderer.h
|
|
||||||
lua/parser/LocalLuaParser.cpp
|
|
||||||
lua/parser/LocalLuaParser.h
|
|
||||||
game/hud/components/basic/GuiText.cpp
|
|
||||||
game/hud/components/basic/GuiText.h
|
|
||||||
game/hud/DebugGui.cpp
|
|
||||||
game/hud/DebugGui.h
|
|
||||||
game/scene/world/Player.cpp
|
|
||||||
game/scene/world/Player.h
|
|
||||||
util/Ray.cpp
|
|
||||||
util/Ray.h
|
|
||||||
game/Client.cpp
|
|
||||||
game/Client.h
|
|
||||||
game/graph/scene/SceneManager.cpp
|
|
||||||
game/graph/scene/SceneManager.h
|
|
||||||
game/graph/scene/Scene.h
|
|
||||||
game/ClientState.h
|
|
||||||
game/scene/MainMenuScene.cpp
|
|
||||||
game/scene/MainMenuScene.h
|
|
||||||
net/server/Server.cpp
|
|
||||||
net/server/Server.h
|
|
||||||
net/Packet.cpp
|
|
||||||
net/Packet.h
|
|
||||||
net/client/ClientNetworkInterpreter.cpp
|
|
||||||
net/client/ClientNetworkInterpreter.h
|
|
||||||
def/gen/MapGen.cpp
|
|
||||||
def/gen/MapGen.h
|
|
||||||
net/NetHandler.cpp
|
|
||||||
net/NetHandler.h
|
|
||||||
game/hud/GameGui.cpp
|
|
||||||
game/hud/GameGui.h
|
|
||||||
net/server/conn/ClientList.cpp
|
|
||||||
net/server/conn/ClientList.h
|
|
||||||
net/server/conn/ServerClient.h
|
|
||||||
net/PacketChannel.h
|
|
||||||
game/entity/engine/PlayerEntity.h
|
|
||||||
game/hud/components/basic/GuiRect.cpp
|
|
||||||
game/hud/components/basic/GuiRect.h
|
|
||||||
game/hud/components/basic/GuiGraph.cpp
|
|
||||||
game/hud/components/basic/GuiGraph.h
|
|
||||||
util/Interp.h
|
|
||||||
def/gen/NoiseSample.cpp
|
|
||||||
def/gen/NoiseSample.h
|
|
||||||
game/graph/frustum/Frustum.cpp
|
|
||||||
game/graph/frustum/Frustum.h
|
|
||||||
game/graph/frustum/FrustumPlane.cpp
|
|
||||||
game/graph/frustum/FrustumPlane.h
|
|
||||||
game/graph/frustum/FrustumAABB.cpp
|
|
||||||
game/graph/frustum/FrustumAABB.h
|
|
||||||
net/server/world/ServerWorld.cpp
|
|
||||||
net/server/world/ServerWorld.h
|
|
||||||
net/server/world/ServerGenStream.cpp
|
|
||||||
net/server/world/ServerGenStream.h
|
|
||||||
game/scene/world/WorldInterpolationStream.cpp
|
|
||||||
game/scene/world/WorldInterpolationStream.h
|
|
||||||
util/Space.h
|
|
||||||
game/scene/world/MeshGenStream.cpp
|
|
||||||
game/scene/world/MeshGenStream.h
|
|
||||||
util/Vec.h
|
|
||||||
world/LocalDimension.cpp
|
|
||||||
world/LocalDimension.h
|
|
||||||
world/chunk/Region.h
|
|
||||||
game/entity/engine/WireframeEntity.cpp
|
|
||||||
game/entity/engine/WireframeEntity.h
|
|
||||||
def/item/SelectionBox.h
|
|
||||||
game/graph/drawable/Drawable.h
|
|
||||||
game/graph/drawable/DrawableGroup.cpp
|
|
||||||
game/graph/drawable/DrawableGroup.h
|
|
||||||
game/graph/window/Input.cpp
|
|
||||||
game/graph/window/Input.h
|
|
||||||
game/entity/engine/BlockCrackEntity.cpp
|
|
||||||
game/entity/engine/BlockCrackEntity.h
|
|
||||||
def/texture/TextureAtlas.cpp
|
|
||||||
def/texture/TextureAtlas.h
|
|
||||||
def/texture/AtlasRef.h
|
|
||||||
world/chunk/MapBlock.h
|
|
||||||
def/LocalSubgame.cpp
|
|
||||||
def/LocalSubgame.h
|
|
||||||
world/chunk/Region.cpp
|
|
||||||
world/chunk/MapBlock.cpp
|
|
||||||
util/Util.h
|
|
||||||
world/PointedThing.h
|
|
||||||
game/hud/components/compound/GuiLabelledGraph.cpp
|
|
||||||
game/hud/components/compound/GuiLabelledGraph.cpp
|
|
||||||
game/entity/engine/ParticleEntity.cpp
|
|
||||||
game/entity/engine/ParticleEntity.h
|
|
||||||
def/ServerSubgame.cpp
|
|
||||||
def/ServerSubgame.h
|
|
||||||
def/ServerDefinitionAtlas.cpp
|
|
||||||
def/ServerDefinitionAtlas.h
|
|
||||||
def/item/BlockDef.cpp
|
|
||||||
def/item/BlockDef.h
|
|
||||||
def/DefinitionAtlas.h
|
|
||||||
lua/LuaParser.cpp
|
|
||||||
lua/LuaParser.h
|
|
||||||
lua/parser/ServerLuaParser.cpp
|
|
||||||
lua/parser/ServerLuaParser.h
|
|
||||||
util/Log.h
|
|
||||||
lua/Callback.h
|
|
||||||
game/graph/shader/GuiUniforms.h
|
|
||||||
game/graph/meshtypes/EntityMesh.cpp
|
|
||||||
game/graph/meshtypes/EntityMesh.h
|
|
||||||
net/server/conn/ServerClient.cpp
|
|
||||||
net/server/config/ServerConfig.cpp
|
|
||||||
net/server/config/ServerConfig.h
|
|
||||||
net/PacketType.h
|
|
||||||
net/NetState.h
|
|
||||||
game/scene/ConnectScene.cpp
|
|
||||||
game/scene/ConnectScene.h
|
|
||||||
net/Address.h
|
|
||||||
net/client/ServerConnection.cpp
|
|
||||||
net/client/ServerConnection.h
|
|
||||||
game/scene/world/ChunkMeshDetails.h
|
|
||||||
game/hud/components/GuiComponent.cpp
|
|
||||||
game/hud/components/GuiComponent.h
|
|
||||||
game/hud/components/basic/GuiContainer.cpp
|
|
||||||
game/hud/components/basic/GuiContainer.h
|
|
||||||
lua/LuaModFile.h
|
|
||||||
lua/LuaMod.h
|
|
||||||
lua/LuaModConfig.h
|
|
||||||
net/server/asset/ServerTexture.h
|
|
||||||
net/server/asset/AssetStorage.h
|
|
||||||
lua/LuaMod.cpp
|
|
||||||
def/ItemDef.h
|
|
||||||
def/DefinitionAtlas.cpp
|
|
||||||
def/item/BlockModel.h
|
|
||||||
def/texture/Font.cpp
|
|
||||||
def/texture/Font.h
|
|
||||||
game/entity/Model.cpp
|
|
||||||
game/entity/Model.h
|
|
||||||
game/graph/meshtypes/EntityVertex.h
|
|
||||||
game/graph/meshtypes/ChunkVertex.h
|
|
||||||
game/graph/meshtypes/Mesh.cpp
|
|
||||||
game/graph/meshtypes/Mesh.h
|
|
||||||
util/Mat4Conv.h
|
|
||||||
game/entity/ModelBone.cpp
|
|
||||||
game/entity/ModelBone.h
|
|
||||||
game/entity/ModelAnimation.cpp
|
|
||||||
game/entity/ModelAnimation.h
|
|
||||||
game/entity/AnimChannel.cpp
|
|
||||||
game/entity/AnimChannel.h
|
|
||||||
game/entity/AnimationState.cpp
|
|
||||||
game/entity/AnimationState.h
|
|
||||||
game/entity/AnimationSegment.h
|
|
||||||
lua/api/usertype/cLuaEntity.h
|
|
||||||
StartGame.h
|
|
||||||
game/graph/shader/SSAOShader.cpp
|
|
||||||
game/graph/shader/SSAOShader.h
|
|
||||||
game/graph/shader/BlurShader.cpp
|
|
||||||
game/graph/shader/BlurShader.h
|
|
||||||
game/graph/shader/LightingShader.cpp
|
|
||||||
game/graph/shader/LightingShader.h
|
|
||||||
game/graph/shader/WorldGeometryShader.cpp
|
|
||||||
game/graph/shader/WorldGeometryShader.h
|
|
||||||
game/graph/shader/EntityGeometryShader.cpp
|
|
||||||
game/graph/shader/EntityGeometryShader.h
|
|
||||||
game/scene/world/graph/ChunkRenderElem.h
|
|
||||||
world/ServerDimension.cpp
|
|
||||||
world/ServerDimension.h
|
|
||||||
def/item/CraftItemDef.cpp
|
|
||||||
def/item/CraftItemDef.h
|
|
||||||
lua/api/class/LocalLuaEntity.cpp
|
|
||||||
lua/api/class/LocalLuaEntity.h
|
|
||||||
def/model/SerializedModel.h
|
|
||||||
net/server/asset/AssetType.h
|
|
||||||
def/model/ModelStore.h
|
|
||||||
lua/api/functions/update_entities.h
|
|
||||||
lua/LuaKeybindHandler.cpp
|
|
||||||
lua/LuaKeybindHandler.h
|
|
||||||
lua/api/class/LocalLuaPlayer.cpp
|
|
||||||
lua/api/class/LocalLuaPlayer.h
|
|
||||||
game/entity/Collidable.cpp
|
|
||||||
game/entity/Collidable.h
|
|
||||||
game/hud/components/compound/GuiInventoryList.cpp
|
|
||||||
game/hud/components/compound/GuiInventoryList.h
|
|
||||||
game/hud/components/basic/GuiInventoryItem.cpp
|
|
||||||
game/hud/components/basic/GuiInventoryItem.h
|
|
||||||
game/inventory/ServerInventoryList.cpp
|
|
||||||
game/inventory/ServerInventoryList.h
|
|
||||||
game/inventory/ItemStack.h
|
|
||||||
net/server/LocalServerInstance.cpp
|
|
||||||
net/server/LocalServerInstance.h
|
|
||||||
game/hud/SerialGui.h
|
|
||||||
util/Voronoi3D.cpp
|
|
||||||
util/Voronoi3D.h
|
|
||||||
def/gen/BiomeDef.cpp
|
|
||||||
def/gen/BiomeDef.h
|
|
||||||
def/gen/BiomeAtlas.cpp
|
|
||||||
def/gen/BiomeAtlas.h
|
|
||||||
def/gen/ServerBiomeAtlas.cpp
|
|
||||||
def/gen/ServerBiomeAtlas.h
|
|
||||||
def/gen/LocalBiomeAtlas.cpp
|
|
||||||
def/gen/LocalBiomeAtlas.h
|
def/gen/LocalBiomeAtlas.h
|
||||||
world/DimensionBase.cpp
|
def/gen/MapGen.cpp
|
||||||
world/DimensionBase.h
|
def/gen/MapGen.h
|
||||||
def/texture/RawTexData.h
|
|
||||||
game/hud/components/compound/GuiImageButton.cpp
|
|
||||||
game/hud/components/compound/GuiImageButton.h
|
|
||||||
game/ClientState.cpp
|
|
||||||
game/scene/menu/SubgameDef.h
|
|
||||||
game/scene/menu/SubgameConfig.h
|
|
||||||
game/scene/menu/MenuSandbox.cpp
|
|
||||||
game/scene/menu/MenuSandbox.h
|
|
||||||
lua/api/menu/mSetGui.h
|
|
||||||
game/hud/GuiBuilder.cpp
|
|
||||||
game/hud/GuiBuilder.h
|
|
||||||
game/hud/GameGuiBuilder.cpp
|
|
||||||
game/hud/GameGuiBuilder.h
|
|
||||||
lua/api/menu/mStartGame.h
|
|
||||||
lua/api/class/ServerLuaInventoryList.cpp
|
|
||||||
lua/api/class/ServerLuaInventoryList.h
|
|
||||||
lua/api/class/ServerLuaInventory.cpp
|
|
||||||
lua/api/class/ServerLuaInventory.h
|
|
||||||
game/inventory/Inventory.cpp
|
|
||||||
game/inventory/Inventory.h
|
|
||||||
lua/api/class/LuaItemStack.cpp
|
|
||||||
lua/api/class/LuaItemStack.h
|
|
||||||
game/inventory/ItemStack.cpp
|
|
||||||
lua/api/usertype/cInventoryRef.h
|
|
||||||
lua/api/usertype/cItemStack.h
|
|
||||||
game/hud/components/basic/GuiModel.cpp
|
|
||||||
game/hud/components/basic/GuiModel.h
|
|
||||||
net/server/world/ServerEntity.cpp
|
|
||||||
net/server/world/ServerEntity.h
|
|
||||||
lua/api/class/ServerLuaEntity.cpp
|
|
||||||
lua/api/class/ServerLuaEntity.h
|
|
||||||
game/scene/LuaErrorScene.cpp
|
|
||||||
game/scene/LuaErrorScene.h
|
|
||||||
lua/api/usertype/sLuaEntity.h
|
|
||||||
net/Serializer.h
|
|
||||||
net/Deserializer.h
|
|
||||||
lua/api/class/ServerLocalLuaEntity.cpp
|
|
||||||
lua/api/class/ServerLocalLuaEntity.h
|
|
||||||
game/scene/world/World.cpp
|
|
||||||
game/scene/world/World.h
|
|
||||||
lua/register/RegisterBiomes.h
|
|
||||||
lua/register/RegisterBlocks.h
|
|
||||||
lua/register/RegisterItems.h
|
|
||||||
lua/register/RegisterKeybinds.h
|
|
||||||
lua/api/class/LocalLuaAnimationManager.cpp
|
|
||||||
lua/api/class/LocalLuaAnimationManager.h
|
|
||||||
lua/api/usertype/cAnimationManager.h
|
|
||||||
game/scene/world/Schematic.cpp
|
|
||||||
game/scene/world/Schematic.h
|
|
||||||
lua/ErrorFormatter.cpp
|
|
||||||
lua/ErrorFormatter.h
|
|
||||||
util/RIE.h
|
|
||||||
lua/api/class/ServerLuaPlayer.cpp
|
|
||||||
lua/api/class/ServerLuaPlayer.h
|
|
||||||
lua/api/functions/trigger_event.h
|
|
||||||
lua/parser/ServerModHandler.cpp
|
|
||||||
lua/parser/ServerModHandler.h
|
|
||||||
lua/parser/LocalModHandler.cpp
|
|
||||||
lua/parser/LocalModHandler.h
|
|
||||||
net/client/NetPlayerField.h
|
|
||||||
game/inventory/LocalInventoryRefs.cpp
|
|
||||||
game/inventory/LocalInventoryRefs.h
|
|
||||||
game/inventory/LocalInventory.cpp
|
|
||||||
game/inventory/LocalInventory.h
|
|
||||||
lua/api/class/LocalLuaInventory.cpp
|
|
||||||
lua/api/class/LocalLuaInventory.h
|
|
||||||
lua/api/class/LocalLuaInventoryList.cpp
|
|
||||||
lua/api/class/LocalLuaInventoryList.h
|
|
||||||
game/inventory/InventoryRefs.cpp
|
|
||||||
game/inventory/InventoryRefs.h
|
|
||||||
game/inventory/InventoryList.cpp
|
|
||||||
game/inventory/InventoryList.h
|
|
||||||
net/PacketView.cpp
|
|
||||||
net/PacketView.h
|
|
||||||
lua/api/modules/create_structure.h
|
|
||||||
util/Any.h
|
|
||||||
def/gen/MapGenProps.cpp
|
def/gen/MapGenProps.cpp
|
||||||
def/gen/MapGenProps.h
|
def/gen/MapGenProps.h
|
||||||
lua/api/class/LuaGuiElement.cpp
|
def/gen/NoiseSample.cpp
|
||||||
lua/api/class/LuaGuiElement.h
|
def/gen/NoiseSample.h
|
||||||
world/Dimension.cpp
|
def/gen/ServerBiomeAtlas.cpp
|
||||||
world/Dimension.h
|
def/gen/ServerBiomeAtlas.h
|
||||||
world/fs/FileManipulator.cpp
|
def/item/BlockDef.cpp
|
||||||
world/fs/FileManipulator.h
|
def/item/BlockDef.h
|
||||||
def/item/BlockModel.cpp
|
def/item/BlockModel.cpp
|
||||||
net/server/world/ServerPacketStream.cpp
|
def/item/BlockModel.h
|
||||||
net/server/world/ServerPacketStream.h
|
def/item/BlockModelVertex.h
|
||||||
|
def/item/CraftItemDef.cpp
|
||||||
|
def/item/CraftItemDef.h
|
||||||
|
def/item/MeshPart.cpp
|
||||||
|
def/item/MeshPart.h
|
||||||
|
def/item/SelectionBox.h
|
||||||
|
def/item/ShaderMod.h
|
||||||
|
def/ItemDef.h
|
||||||
|
def/LocalDefinitionAtlas.cpp
|
||||||
|
def/LocalDefinitionAtlas.h
|
||||||
|
def/LocalSubgame.cpp
|
||||||
|
def/LocalSubgame.h
|
||||||
|
def/model/ModelStore.h
|
||||||
|
def/model/SerializedModel.h
|
||||||
|
def/ServerDefinitionAtlas.cpp
|
||||||
|
def/ServerDefinitionAtlas.h
|
||||||
|
def/ServerSubgame.cpp
|
||||||
|
def/ServerSubgame.h
|
||||||
|
def/Subgame.h
|
||||||
|
def/texture/AtlasRef.h
|
||||||
|
def/texture/Font.cpp
|
||||||
|
def/texture/Font.h
|
||||||
|
def/texture/RawTexData.h
|
||||||
|
def/texture/TextureAtlas.cpp
|
||||||
|
def/texture/TextureAtlas.h
|
||||||
|
game/Client.cpp
|
||||||
|
game/Client.h
|
||||||
|
game/ClientState.cpp
|
||||||
|
game/ClientState.h
|
||||||
|
game/entity/AnimationSegment.h
|
||||||
|
game/entity/AnimationState.cpp
|
||||||
|
game/entity/AnimationState.h
|
||||||
|
game/entity/AnimChannel.cpp
|
||||||
|
game/entity/AnimChannel.h
|
||||||
|
game/entity/Collidable.cpp
|
||||||
|
game/entity/Collidable.h
|
||||||
|
game/entity/engine/BlockCrackEntity.cpp
|
||||||
|
game/entity/engine/BlockCrackEntity.h
|
||||||
|
game/entity/engine/ParticleEntity.cpp
|
||||||
|
game/entity/engine/ParticleEntity.h
|
||||||
|
game/entity/engine/PlayerEntity.h
|
||||||
|
game/entity/engine/WireframeEntity.cpp
|
||||||
|
game/entity/engine/WireframeEntity.h
|
||||||
|
game/entity/Entity.cpp
|
||||||
|
game/entity/Entity.h
|
||||||
|
game/entity/Model.cpp
|
||||||
|
game/entity/Model.h
|
||||||
|
game/entity/ModelAnimation.cpp
|
||||||
|
game/entity/ModelAnimation.h
|
||||||
|
game/entity/ModelBone.cpp
|
||||||
|
game/entity/ModelBone.h
|
||||||
|
game/graph/Camera.cpp
|
||||||
|
game/graph/Camera.h
|
||||||
|
game/graph/drawable/Drawable.h
|
||||||
|
game/graph/drawable/DrawableGroup.cpp
|
||||||
|
game/graph/drawable/DrawableGroup.h
|
||||||
|
game/graph/frustum/Frustum.cpp
|
||||||
|
game/graph/frustum/Frustum.h
|
||||||
|
game/graph/frustum/FrustumAABB.cpp
|
||||||
|
game/graph/frustum/FrustumAABB.h
|
||||||
|
game/graph/frustum/FrustumPlane.cpp
|
||||||
|
game/graph/frustum/FrustumPlane.h
|
||||||
|
game/graph/meshtypes/ChunkMesh.cpp
|
||||||
|
game/graph/meshtypes/ChunkMesh.h
|
||||||
|
game/graph/meshtypes/ChunkVertex.h
|
||||||
|
game/graph/meshtypes/EntityMesh.cpp
|
||||||
|
game/graph/meshtypes/EntityMesh.h
|
||||||
|
game/graph/meshtypes/EntityVertex.h
|
||||||
|
game/graph/meshtypes/Mesh.cpp
|
||||||
|
game/graph/meshtypes/Mesh.h
|
||||||
|
game/graph/Renderer.cpp
|
||||||
|
game/graph/Renderer.h
|
||||||
|
game/graph/scene/Scene.h
|
||||||
|
game/graph/scene/SceneManager.cpp
|
||||||
|
game/graph/scene/SceneManager.h
|
||||||
|
game/graph/shader/BlurShader.cpp
|
||||||
|
game/graph/shader/BlurShader.h
|
||||||
|
game/graph/shader/EntityGeometryShader.cpp
|
||||||
|
game/graph/shader/EntityGeometryShader.h
|
||||||
|
game/graph/shader/GuiUniforms.h
|
||||||
|
game/graph/shader/LightingShader.cpp
|
||||||
|
game/graph/shader/LightingShader.h
|
||||||
|
game/graph/shader/Shader.cpp
|
||||||
|
game/graph/shader/Shader.h
|
||||||
|
game/graph/shader/SSAOShader.cpp
|
||||||
|
game/graph/shader/SSAOShader.h
|
||||||
|
game/graph/shader/WorldGeometryShader.cpp
|
||||||
|
game/graph/shader/WorldGeometryShader.h
|
||||||
|
game/graph/Texture.cpp
|
||||||
|
game/graph/Texture.h
|
||||||
|
game/graph/window/Input.cpp
|
||||||
|
game/graph/window/Input.h
|
||||||
|
game/graph/window/Window.cpp
|
||||||
|
game/graph/window/Window.h
|
||||||
|
game/hud/components/basic/GuiContainer.cpp
|
||||||
|
game/hud/components/basic/GuiContainer.h
|
||||||
|
game/hud/components/basic/GuiGraph.cpp
|
||||||
|
game/hud/components/basic/GuiGraph.h
|
||||||
|
game/hud/components/basic/GuiInventoryItem.cpp
|
||||||
|
game/hud/components/basic/GuiInventoryItem.h
|
||||||
|
game/hud/components/basic/GuiModel.cpp
|
||||||
|
game/hud/components/basic/GuiModel.h
|
||||||
|
game/hud/components/basic/GuiRect.cpp
|
||||||
|
game/hud/components/basic/GuiRect.h
|
||||||
|
game/hud/components/basic/GuiText.cpp
|
||||||
|
game/hud/components/basic/GuiText.h
|
||||||
|
game/hud/components/compound/GuiImageButton.cpp
|
||||||
|
game/hud/components/compound/GuiImageButton.h
|
||||||
|
game/hud/components/compound/GuiInventoryList.cpp
|
||||||
|
game/hud/components/compound/GuiInventoryList.h
|
||||||
|
game/hud/components/compound/GuiLabelledGraph.cpp
|
||||||
|
game/hud/components/compound/GuiLabelledGraph.cpp
|
||||||
|
game/hud/components/GuiComponent.cpp
|
||||||
|
game/hud/components/GuiComponent.h
|
||||||
|
game/hud/DebugGui.cpp
|
||||||
|
game/hud/DebugGui.h
|
||||||
|
game/hud/GameGui.cpp
|
||||||
|
game/hud/GameGui.h
|
||||||
|
game/hud/GameGuiBuilder.cpp
|
||||||
|
game/hud/GameGuiBuilder.h
|
||||||
|
game/hud/GuiBuilder.cpp
|
||||||
|
game/hud/GuiBuilder.h
|
||||||
|
game/hud/SerialGui.h
|
||||||
|
game/inventory/Inventory.cpp
|
||||||
|
game/inventory/Inventory.h
|
||||||
|
game/inventory/InventoryList.cpp
|
||||||
|
game/inventory/InventoryList.h
|
||||||
|
game/inventory/InventoryRefs.cpp
|
||||||
|
game/inventory/InventoryRefs.h
|
||||||
|
game/inventory/ItemStack.cpp
|
||||||
|
game/inventory/ItemStack.h
|
||||||
|
game/inventory/LocalInventory.cpp
|
||||||
|
game/inventory/LocalInventory.h
|
||||||
|
game/inventory/LocalInventoryRefs.cpp
|
||||||
|
game/inventory/LocalInventoryRefs.h
|
||||||
|
game/inventory/ServerInventoryList.cpp
|
||||||
|
game/inventory/ServerInventoryList.h
|
||||||
|
game/scene/ConnectScene.cpp
|
||||||
|
game/scene/ConnectScene.h
|
||||||
|
game/scene/GameScene.cpp
|
||||||
|
game/scene/GameScene.h
|
||||||
|
game/scene/LuaErrorScene.cpp
|
||||||
|
game/scene/LuaErrorScene.h
|
||||||
|
game/scene/MainMenuScene.cpp
|
||||||
|
game/scene/MainMenuScene.h
|
||||||
|
game/scene/menu/MenuSandbox.cpp
|
||||||
|
game/scene/menu/MenuSandbox.h
|
||||||
|
game/scene/menu/SubgameConfig.h
|
||||||
|
game/scene/menu/SubgameDef.h
|
||||||
|
game/scene/world/ChunkMeshDetails.h
|
||||||
|
game/scene/world/graph/ChunkMeshGenerator.cpp
|
||||||
|
game/scene/world/graph/ChunkMeshGenerator.h
|
||||||
|
game/scene/world/graph/ChunkRenderElem.h
|
||||||
|
game/scene/world/graph/MeshChunk.cpp
|
||||||
|
game/scene/world/graph/MeshChunk.h
|
||||||
|
game/scene/world/LocalWorld.cpp
|
||||||
|
game/scene/world/LocalWorld.h
|
||||||
|
game/scene/world/MeshGenStream.cpp
|
||||||
|
game/scene/world/MeshGenStream.h
|
||||||
|
game/scene/world/Player.cpp
|
||||||
|
game/scene/world/Player.h
|
||||||
|
game/scene/world/Schematic.cpp
|
||||||
|
game/scene/world/Schematic.h
|
||||||
|
game/scene/world/World.cpp
|
||||||
|
game/scene/world/World.h
|
||||||
|
game/scene/world/WorldInterpolationStream.cpp
|
||||||
|
game/scene/world/WorldInterpolationStream.h
|
||||||
|
lua/Callback.h
|
||||||
|
lua/customization/vec3.hpp
|
||||||
|
lua/ErrorFormatter.cpp
|
||||||
|
lua/ErrorFormatter.h
|
||||||
|
lua/LocalLuaParser.cpp
|
||||||
|
lua/LocalLuaParser.h
|
||||||
|
lua/LocalModHandler.cpp
|
||||||
|
lua/LocalModHandler.h
|
||||||
|
lua/LuaKeybindHandler.cpp
|
||||||
|
lua/LuaKeybindHandler.h
|
||||||
|
lua/LuaMod.cpp
|
||||||
|
lua/LuaMod.h
|
||||||
|
lua/LuaParser.cpp
|
||||||
|
lua/LuaParser.h
|
||||||
|
lua/modules/BaseModule.cpp
|
||||||
|
lua/modules/BaseModule.h
|
||||||
|
lua/modules/Block.cpp
|
||||||
|
lua/modules/Block.h
|
||||||
|
lua/modules/create_structure.h
|
||||||
|
lua/modules/Entity.cpp
|
||||||
|
lua/modules/Entity.h
|
||||||
|
lua/modules/mSetGui.h
|
||||||
|
lua/modules/mStartGame.h
|
||||||
|
lua/modules/Register.cpp
|
||||||
|
lua/modules/Register.h
|
||||||
|
lua/modules/SubgameModule.cpp
|
||||||
|
lua/modules/SubgameModule.h
|
||||||
|
lua/modules/Time.cpp
|
||||||
|
lua/modules/Time.h
|
||||||
lua/register/CreateBlockModel.cpp
|
lua/register/CreateBlockModel.cpp
|
||||||
lua/register/CreateBlockModel.h
|
lua/register/CreateBlockModel.h
|
||||||
lua/customization/vec3.hpp
|
lua/register/RegisterBiomes.h
|
||||||
lua/api/modules/SubgameModule.h
|
lua/register/RegisterBlocks.h
|
||||||
lua/api/modules/Register.cpp
|
lua/register/RegisterItems.h
|
||||||
lua/api/modules/Register.h
|
lua/register/RegisterKeybinds.h
|
||||||
def/Subgame.h lua/api/modules/SubgameModule.cpp lua/api/modules/Block.cpp lua/api/modules/Block.h lua/api/modules/Entity.cpp lua/api/modules/Entity.h lua/api/modules/Time.cpp lua/api/modules/Time.h lua/api/modules/BaseModule.cpp lua/api/modules/BaseModule.h)
|
lua/ServerLuaParser.cpp
|
||||||
|
lua/ServerLuaParser.h
|
||||||
|
lua/ServerModHandler.cpp
|
||||||
|
lua/ServerModHandler.h
|
||||||
|
lua/usertype/cAnimationManager.h
|
||||||
|
lua/usertype/cInventoryRef.h
|
||||||
|
lua/usertype/cItemStack.h
|
||||||
|
lua/usertype/cLuaEntity.h
|
||||||
|
lua/usertype/LocalLuaAnimationManager.cpp
|
||||||
|
lua/usertype/LocalLuaAnimationManager.h
|
||||||
|
lua/usertype/LocalLuaEntity.cpp
|
||||||
|
lua/usertype/LocalLuaEntity.h
|
||||||
|
lua/usertype/LocalLuaInventory.cpp
|
||||||
|
lua/usertype/LocalLuaInventory.h
|
||||||
|
lua/usertype/LocalLuaInventoryList.cpp
|
||||||
|
lua/usertype/LocalLuaInventoryList.h
|
||||||
|
lua/usertype/LocalLuaPlayer.cpp
|
||||||
|
lua/usertype/LocalLuaPlayer.h
|
||||||
|
lua/usertype/LuaGuiElement.cpp
|
||||||
|
lua/usertype/LuaGuiElement.h
|
||||||
|
lua/usertype/LuaItemStack.cpp
|
||||||
|
lua/usertype/LuaItemStack.h
|
||||||
|
lua/usertype/ServerLocalLuaEntity.cpp
|
||||||
|
lua/usertype/ServerLocalLuaEntity.h
|
||||||
|
lua/usertype/ServerLuaEntity.cpp
|
||||||
|
lua/usertype/ServerLuaEntity.h
|
||||||
|
lua/usertype/ServerLuaInventory.cpp
|
||||||
|
lua/usertype/ServerLuaInventory.h
|
||||||
|
lua/usertype/ServerLuaInventoryList.cpp
|
||||||
|
lua/usertype/ServerLuaInventoryList.h
|
||||||
|
lua/usertype/ServerLuaPlayer.cpp
|
||||||
|
lua/usertype/ServerLuaPlayer.h
|
||||||
|
lua/usertype/sLuaEntity.h
|
||||||
|
net/Address.h
|
||||||
|
net/client/ClientNetworkInterpreter.cpp
|
||||||
|
net/client/ClientNetworkInterpreter.h
|
||||||
|
net/client/NetPlayerField.h
|
||||||
|
net/client/ServerConnection.cpp
|
||||||
|
net/client/ServerConnection.h
|
||||||
|
net/Deserializer.h
|
||||||
|
net/NetHandler.cpp
|
||||||
|
net/NetHandler.h
|
||||||
|
net/NetState.h
|
||||||
|
net/Packet.cpp
|
||||||
|
net/Packet.h
|
||||||
|
net/PacketChannel.h
|
||||||
|
net/PacketType.h
|
||||||
|
net/PacketView.cpp
|
||||||
|
net/PacketView.h
|
||||||
|
net/Serializer.h
|
||||||
|
net/server/asset/AssetStorage.h
|
||||||
|
net/server/asset/AssetType.h
|
||||||
|
net/server/asset/ServerTexture.h
|
||||||
|
net/server/config/ServerConfig.cpp
|
||||||
|
net/server/config/ServerConfig.h
|
||||||
|
net/server/conn/ClientList.cpp
|
||||||
|
net/server/conn/ClientList.h
|
||||||
|
net/server/conn/ServerClient.cpp
|
||||||
|
net/server/conn/ServerClient.h
|
||||||
|
net/server/LocalServerInstance.cpp
|
||||||
|
net/server/LocalServerInstance.h
|
||||||
|
net/server/Server.cpp
|
||||||
|
net/server/Server.h
|
||||||
|
net/server/world/ServerEntity.cpp
|
||||||
|
net/server/world/ServerEntity.h
|
||||||
|
net/server/world/ServerGenStream.cpp
|
||||||
|
net/server/world/ServerGenStream.h
|
||||||
|
net/server/world/ServerPacketStream.cpp
|
||||||
|
net/server/world/ServerPacketStream.h
|
||||||
|
net/server/world/ServerWorld.cpp
|
||||||
|
net/server/world/ServerWorld.h
|
||||||
|
StartGame.h
|
||||||
|
util/Any.h
|
||||||
|
util/Interp.h
|
||||||
|
util/Log.h
|
||||||
|
util/Mat4Conv.h
|
||||||
|
util/Ray.cpp
|
||||||
|
util/Ray.h
|
||||||
|
util/RIE.h
|
||||||
|
util/Space.h
|
||||||
|
util/Timer.cpp
|
||||||
|
util/Timer.h
|
||||||
|
util/Util.h
|
||||||
|
util/Vec.h
|
||||||
|
util/Voronoi3D.cpp
|
||||||
|
util/Voronoi3D.h
|
||||||
|
world/chunk/Chunk.cpp
|
||||||
|
world/chunk/Chunk.h
|
||||||
|
world/chunk/MapBlock.cpp
|
||||||
|
world/chunk/MapBlock.h
|
||||||
|
world/chunk/Region.cpp
|
||||||
|
world/chunk/Region.h
|
||||||
|
world/Dimension.cpp
|
||||||
|
world/Dimension.h
|
||||||
|
world/DimensionBase.cpp
|
||||||
|
world/DimensionBase.h
|
||||||
|
world/fs/FileManipulator.cpp
|
||||||
|
world/fs/FileManipulator.h
|
||||||
|
world/LocalDimension.cpp
|
||||||
|
world/LocalDimension.h
|
||||||
|
world/PointedThing.h
|
||||||
|
world/ServerDimension.cpp
|
||||||
|
world/ServerDimension.h
|
||||||
|
)
|
||||||
|
|
||||||
add_library (Zepha_Core ${ZEPHA_SRC})
|
add_library (Zepha_Core ${ZEPHA_SRC})
|
|
@ -13,7 +13,7 @@
|
||||||
#include "gen/LocalBiomeAtlas.h"
|
#include "gen/LocalBiomeAtlas.h"
|
||||||
#include "LocalDefinitionAtlas.h"
|
#include "LocalDefinitionAtlas.h"
|
||||||
#include "texture/TextureAtlas.h"
|
#include "texture/TextureAtlas.h"
|
||||||
#include "../lua/parser/LocalLuaParser.h"
|
#include "../lua/LocalLuaParser.h"
|
||||||
|
|
||||||
class Player;
|
class Player;
|
||||||
class LocalWorld;
|
class LocalWorld;
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
#include "../def/gen/ServerBiomeAtlas.h"
|
#include "../def/gen/ServerBiomeAtlas.h"
|
||||||
#include "../def/ServerDefinitionAtlas.h"
|
#include "../def/ServerDefinitionAtlas.h"
|
||||||
#include "../lua/parser/ServerLuaParser.h"
|
#include "../lua/ServerLuaParser.h"
|
||||||
#include "../net/server/asset/AssetStorage.h"
|
#include "../net/server/asset/AssetStorage.h"
|
||||||
|
|
||||||
class ServerWorld;
|
class ServerWorld;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include "SerialGui.h"
|
#include "SerialGui.h"
|
||||||
#include "components/GuiComponent.h"
|
#include "components/GuiComponent.h"
|
||||||
#include "../../def/LocalSubgame.h"
|
#include "../../def/LocalSubgame.h"
|
||||||
#include "../../lua/api/class/LuaGuiElement.h"
|
#include "../../lua/usertype/LuaGuiElement.h"
|
||||||
|
|
||||||
class GuiContainer;
|
class GuiContainer;
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include <glm/vec4.hpp>
|
#include <glm/vec4.hpp>
|
||||||
|
|
||||||
#include "../../util/Any.h"
|
#include "../../util/Any.h"
|
||||||
#include "../../lua/api/class/LuaGuiElement.h"
|
#include "../../lua/usertype/LuaGuiElement.h"
|
||||||
|
|
||||||
namespace SerialGui {
|
namespace SerialGui {
|
||||||
const float SCALE_MODIFIER = 3;
|
const float SCALE_MODIFIER = 3;
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#include "../../def/ItemDef.h"
|
#include "../../def/ItemDef.h"
|
||||||
#include "../../def/DefinitionAtlas.h"
|
#include "../../def/DefinitionAtlas.h"
|
||||||
#include "../../lua/api/class/LuaItemStack.h"
|
#include "../../lua/usertype/LuaItemStack.h"
|
||||||
|
|
||||||
InventoryList::InventoryList(DefinitionAtlas &defs) : defs(defs) {
|
InventoryList::InventoryList(DefinitionAtlas &defs) : defs(defs) {
|
||||||
initialize();
|
initialize();
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#include "../../def/ItemDef.h"
|
#include "../../def/ItemDef.h"
|
||||||
#include "../../def/DefinitionAtlas.h"
|
#include "../../def/DefinitionAtlas.h"
|
||||||
#include "../../lua/api/class/LuaItemStack.h"
|
#include "../../lua/usertype/LuaItemStack.h"
|
||||||
|
|
||||||
ItemStack::ItemStack(LuaItemStack &stack, const DefinitionAtlas &atlas) :
|
ItemStack::ItemStack(LuaItemStack &stack, const DefinitionAtlas &atlas) :
|
||||||
id((stack.get_count() == 0) ? DefinitionAtlas::AIR : atlas.fromStr(stack.get_name()).index),
|
id((stack.get_count() == 0) ? DefinitionAtlas::AIR : atlas.fromStr(stack.get_name()).index),
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include "../../net/Packet.h"
|
#include "../../net/Packet.h"
|
||||||
#include "../../net/Serializer.h"
|
#include "../../net/Serializer.h"
|
||||||
#include "../../lua/api/class/LuaItemStack.h"
|
#include "../../lua/usertype/LuaItemStack.h"
|
||||||
#include "../../net/server/conn/ClientList.h"
|
#include "../../net/server/conn/ClientList.h"
|
||||||
|
|
||||||
ServerInventoryList::ServerInventoryList(DefinitionAtlas& defs, ClientList* list,
|
ServerInventoryList::ServerInventoryList(DefinitionAtlas& defs, ClientList* list,
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include "../../def/LocalDefinitionAtlas.h"
|
#include "../../def/LocalDefinitionAtlas.h"
|
||||||
#include "../hud/components/basic/GuiText.h"
|
#include "../hud/components/basic/GuiText.h"
|
||||||
#include "../hud/components/basic/GuiRect.h"
|
#include "../hud/components/basic/GuiRect.h"
|
||||||
#include "../../lua/parser/LocalLuaParser.h"
|
#include "../../lua/LocalLuaParser.h"
|
||||||
#include "../../net/server/asset/AssetType.h"
|
#include "../../net/server/asset/AssetType.h"
|
||||||
|
|
||||||
ConnectScene::ConnectScene(ClientState &state, Address addr) : Scene(state),
|
ConnectScene::ConnectScene(ClientState &state, Address addr) : Scene(state),
|
||||||
|
|
|
@ -8,14 +8,15 @@
|
||||||
#include "MenuSandbox.h"
|
#include "MenuSandbox.h"
|
||||||
|
|
||||||
#include "SubgameDef.h"
|
#include "SubgameDef.h"
|
||||||
|
#include "../../../lua/LuaMod.h"
|
||||||
#include "../../../lua/ErrorFormatter.h"
|
#include "../../../lua/ErrorFormatter.h"
|
||||||
#include "../../hud/components/basic/GuiText.h"
|
#include "../../hud/components/basic/GuiText.h"
|
||||||
#include "../../hud/components/basic/GuiContainer.h"
|
#include "../../hud/components/basic/GuiContainer.h"
|
||||||
|
|
||||||
// Modules
|
// Modules
|
||||||
#include "../../../lua/api/modules/Time.h"
|
#include "../../../lua/modules/Time.h"
|
||||||
#include "../../../lua/api/menu/mSetGui.h"
|
#include "../../../lua/modules/mSetGui.h"
|
||||||
#include "../../../lua/api/menu/mStartGame.h"
|
#include "../../../lua/modules/mStartGame.h"
|
||||||
|
|
||||||
MenuSandbox::MenuSandbox(glm::ivec2 &win, ClientState& state, std::shared_ptr<GuiContainer> container) : LuaParser(state.defs),
|
MenuSandbox::MenuSandbox(glm::ivec2 &win, ClientState& state, std::shared_ptr<GuiContainer> container) : LuaParser(state.defs),
|
||||||
win(win),
|
win(win),
|
||||||
|
@ -78,7 +79,7 @@ void MenuSandbox::update(double delta) {
|
||||||
}
|
}
|
||||||
|
|
||||||
sol::protected_function_result MenuSandbox::runFileSandboxed(const std::string& file) {
|
sol::protected_function_result MenuSandbox::runFileSandboxed(const std::string& file) {
|
||||||
for (LuaModFile& f : mod.files) {
|
for (LuaMod::File& f : mod.files) {
|
||||||
if (f.path != file) continue;
|
if (f.path != file) continue;
|
||||||
|
|
||||||
sol::environment env(lua, sol::create, lua.globals());
|
sol::environment env(lua, sol::create, lua.globals());
|
||||||
|
@ -142,7 +143,7 @@ void MenuSandbox::loadAndRunMod(const std::string &modPath) {
|
||||||
std::ifstream t(file);
|
std::ifstream t(file);
|
||||||
std::string fileStr((std::istreambuf_iterator<char>(t)), std::istreambuf_iterator<char>());
|
std::string fileStr((std::istreambuf_iterator<char>(t)), std::istreambuf_iterator<char>());
|
||||||
|
|
||||||
LuaModFile f {modPath, fileStr};
|
LuaMod::File f {modPath, fileStr};
|
||||||
mod.files.push_back(f);
|
mod.files.push_back(f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -188,7 +189,7 @@ sol::protected_function_result MenuSandbox::errorCallback(sol::protected_functio
|
||||||
std::string fileName = errString.substr(0, lineNumStart);
|
std::string fileName = errString.substr(0, lineNumStart);
|
||||||
int lineNum = std::stoi(errString.substr(lineNumStart + 1, lineNumEnd - lineNumStart - 1));
|
int lineNum = std::stoi(errString.substr(lineNumStart + 1, lineNumEnd - lineNumStart - 1));
|
||||||
|
|
||||||
for (LuaModFile &f : mod.files)
|
for (LuaMod::File& f : mod.files)
|
||||||
if (f.path == fileName)
|
if (f.path == fileName)
|
||||||
throw std::runtime_error(ErrorFormatter::formatError(fileName, lineNum, errString, f.file));
|
throw std::runtime_error(ErrorFormatter::formatError(fileName, lineNum, errString, f.file));
|
||||||
|
|
||||||
|
|
|
@ -11,10 +11,10 @@
|
||||||
#include "../../../def/item/BlockDef.h"
|
#include "../../../def/item/BlockDef.h"
|
||||||
#include "../../../def/gen/LocalBiomeAtlas.h"
|
#include "../../../def/gen/LocalBiomeAtlas.h"
|
||||||
#include "../../../def/LocalDefinitionAtlas.h"
|
#include "../../../def/LocalDefinitionAtlas.h"
|
||||||
#include "../../../lua/parser/LocalLuaParser.h"
|
#include "../../../lua/LocalLuaParser.h"
|
||||||
#include "../../entity/engine/ParticleEntity.h"
|
#include "../../entity/engine/ParticleEntity.h"
|
||||||
#include "../../entity/engine/BlockCrackEntity.h"
|
#include "../../entity/engine/BlockCrackEntity.h"
|
||||||
#include "../../../lua/api/class/LocalLuaPlayer.h"
|
#include "../../../lua/usertype/LocalLuaPlayer.h"
|
||||||
#include "../../../net/client/ClientNetworkInterpreter.h"
|
#include "../../../net/client/ClientNetworkInterpreter.h"
|
||||||
|
|
||||||
LocalWorld::LocalWorld(LocalSubgame& defs, ClientNetworkInterpreter* server) :
|
LocalWorld::LocalWorld(LocalSubgame& defs, ClientNetworkInterpreter* server) :
|
||||||
|
|
|
@ -4,32 +4,30 @@
|
||||||
|
|
||||||
#include "LocalLuaParser.h"
|
#include "LocalLuaParser.h"
|
||||||
|
|
||||||
#include "../ErrorFormatter.h"
|
#include "ErrorFormatter.h"
|
||||||
#include "../../game/ClientState.h"
|
#include "../game/ClientState.h"
|
||||||
#include "../../game/graph/Renderer.h"
|
#include "../game/graph/Renderer.h"
|
||||||
#include "../register/RegisterItems.h"
|
#include "register/RegisterItems.h"
|
||||||
#include "../register/RegisterBlocks.h"
|
#include "register/RegisterBlocks.h"
|
||||||
#include "../register/RegisterBiomes.h"
|
#include "register/RegisterBiomes.h"
|
||||||
#include "../register/RegisterKeybinds.h"
|
#include "register/RegisterKeybinds.h"
|
||||||
|
|
||||||
// Usertypes
|
// Usertypes
|
||||||
#include "../api/class/LuaGuiElement.h"
|
#include "usertype/LuaGuiElement.h"
|
||||||
#include "../api/usertype/cItemStack.h"
|
#include "usertype/cItemStack.h"
|
||||||
#include "../api/class/LocalLuaPlayer.h"
|
#include "usertype/LocalLuaPlayer.h"
|
||||||
#include "../api/usertype/cLuaEntity.h"
|
#include "usertype/cLuaEntity.h"
|
||||||
#include "../api/usertype/cInventoryRef.h"
|
#include "usertype/cInventoryRef.h"
|
||||||
#include "../api/usertype/cAnimationManager.h"
|
#include "usertype/cAnimationManager.h"
|
||||||
|
|
||||||
// Modules
|
// Modules
|
||||||
#include "../api/modules/Time.h"
|
#include "modules/Time.h"
|
||||||
#include "../api/modules/Block.h"
|
#include "modules/Block.h"
|
||||||
#include "../api/modules/Entity.h"
|
#include "modules/Entity.h"
|
||||||
#include "../api/modules/Register.h"
|
#include "modules/Register.h"
|
||||||
|
|
||||||
#include "../api/modules/create_structure.h"
|
#include "modules/create_structure.h"
|
||||||
|
#include "LuaMod.h"
|
||||||
// Functions
|
|
||||||
#include "../api/functions/update_entities.h"
|
|
||||||
|
|
||||||
LocalLuaParser::LocalLuaParser(LocalSubgame& game): LuaParser(game), game(game), keybinds(this) {}
|
LocalLuaParser::LocalLuaParser(LocalSubgame& game): LuaParser(game), game(game), keybinds(this) {}
|
||||||
|
|
||||||
|
@ -83,9 +81,6 @@ void LocalLuaParser::loadApi(LocalSubgame &defs, LocalWorld &world, Player& play
|
||||||
|
|
||||||
Api::create_structure (lua, core);
|
Api::create_structure (lua, core);
|
||||||
|
|
||||||
// Functions
|
|
||||||
Api::update_entities(lua);
|
|
||||||
|
|
||||||
// Create sandboxed runfile()
|
// Create sandboxed runfile()
|
||||||
lua["dofile"] = lua["loadfile"] = sol::nil;
|
lua["dofile"] = lua["loadfile"] = sol::nil;
|
||||||
lua.set_function("runfile", &LocalLuaParser::runFileSandboxed, this);
|
lua.set_function("runfile", &LocalLuaParser::runFileSandboxed, this);
|
||||||
|
@ -143,7 +138,7 @@ sol::protected_function_result LocalLuaParser::runFileSandboxed(const std::strin
|
||||||
|
|
||||||
for (const LuaMod& mod : handler.cGetMods()) {
|
for (const LuaMod& mod : handler.cGetMods()) {
|
||||||
if (modname != mod.config.name) continue;
|
if (modname != mod.config.name) continue;
|
||||||
for (const LuaModFile& f : mod.files) {
|
for (const LuaMod::File& f : mod.files) {
|
||||||
if (f.path != file) continue;
|
if (f.path != file) continue;
|
||||||
|
|
||||||
sol::environment env(lua, sol::create, lua.globals());
|
sol::environment env(lua, sol::create, lua.globals());
|
|
@ -4,10 +4,10 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../LuaParser.h"
|
#include "LuaParser.h"
|
||||||
|
|
||||||
#include "LocalModHandler.h"
|
#include "LocalModHandler.h"
|
||||||
#include "../LuaKeybindHandler.h"
|
#include "LuaKeybindHandler.h"
|
||||||
|
|
||||||
class Player;
|
class Player;
|
||||||
class LocalWorld;
|
class LocalWorld;
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
#include "../LuaMod.h"
|
#include "LuaMod.h"
|
||||||
|
|
||||||
class LocalModHandler {
|
class LocalModHandler {
|
||||||
public:
|
public:
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include "LuaKeybindHandler.h"
|
#include "LuaKeybindHandler.h"
|
||||||
|
|
||||||
#include "parser/LocalLuaParser.h"
|
#include "LocalLuaParser.h"
|
||||||
|
|
||||||
LuaKeybindHandler::LuaKeybindHandler(LocalLuaParser* parser): parser(parser) {
|
LuaKeybindHandler::LuaKeybindHandler(LocalLuaParser* parser): parser(parser) {
|
||||||
for (auto &callback : callbacksDown) callback = {};
|
for (auto &callback : callbacksDown) callback = {};
|
||||||
|
|
|
@ -5,18 +5,28 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <string>
|
||||||
#include "LuaModFile.h"
|
|
||||||
#include "LuaModConfig.h"
|
|
||||||
|
|
||||||
class PacketView;
|
class PacketView;
|
||||||
|
|
||||||
class LuaMod {
|
class LuaMod {
|
||||||
public:
|
public:
|
||||||
std::vector<LuaModFile> files {};
|
struct File {
|
||||||
LuaModConfig config {};
|
std::string path;
|
||||||
|
std::string file;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Config {
|
||||||
|
std::string name;
|
||||||
|
std::string description;
|
||||||
|
std::string version;
|
||||||
|
std::vector<std::string> depends;
|
||||||
|
};
|
||||||
|
|
||||||
|
std::vector<File> files {};
|
||||||
|
Config config {};
|
||||||
std::string modPath;
|
std::string modPath;
|
||||||
std::string serialized;
|
std::string serialized;
|
||||||
|
|
||||||
static LuaMod fromPacket(PacketView& p);
|
static LuaMod fromPacket(PacketView& p);
|
||||||
};
|
};
|
|
@ -1,15 +0,0 @@
|
||||||
//
|
|
||||||
// Created by aurailus on 03/08/19.
|
|
||||||
//
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
struct LuaModConfig {
|
|
||||||
std::string name;
|
|
||||||
std::string description;
|
|
||||||
std::string version;
|
|
||||||
std::vector<std::string> depends;
|
|
||||||
};
|
|
|
@ -1,13 +0,0 @@
|
||||||
//
|
|
||||||
// Created by aurailus on 03/08/19.
|
|
||||||
//
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
struct LuaModFile {
|
|
||||||
std::string path;
|
|
||||||
std::string file;
|
|
||||||
};
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <glm/vec3.hpp>
|
#include <glm/vec3.hpp>
|
||||||
|
|
||||||
#include "api/modules/SubgameModule.h"
|
#include "modules/SubgameModule.h"
|
||||||
|
|
||||||
#include "Lua.h"
|
#include "Lua.h"
|
||||||
|
|
||||||
|
|
|
@ -7,30 +7,27 @@
|
||||||
|
|
||||||
#include "ServerLuaParser.h"
|
#include "ServerLuaParser.h"
|
||||||
|
|
||||||
#include "../ErrorFormatter.h"
|
#include "ErrorFormatter.h"
|
||||||
#include "../../net/Serializer.h"
|
#include "../net/Serializer.h"
|
||||||
#include "../register/RegisterItems.h"
|
#include "register/RegisterItems.h"
|
||||||
#include "../register/RegisterBiomes.h"
|
#include "register/RegisterBiomes.h"
|
||||||
#include "../register/RegisterBlocks.h"
|
#include "register/RegisterBlocks.h"
|
||||||
#include "../../net/server/world/ServerWorld.h"
|
#include "../net/server/world/ServerWorld.h"
|
||||||
|
|
||||||
// Usertypes
|
// Usertypes
|
||||||
#include "../api/class/ServerLuaPlayer.h"
|
#include "usertype/ServerLuaPlayer.h"
|
||||||
#include "../api/usertype/sLuaEntity.h"
|
#include "usertype/sLuaEntity.h"
|
||||||
#include "../api/usertype/sInventoryRef.h"
|
#include "usertype/sInventoryRef.h"
|
||||||
#include "../api/usertype/cItemStack.h"
|
#include "usertype/cItemStack.h"
|
||||||
|
|
||||||
// Modules
|
// Modules
|
||||||
#include "../api/modules/Time.h"
|
#include "modules/Time.h"
|
||||||
#include "../api/modules/Block.h"
|
#include "modules/Block.h"
|
||||||
#include "../api/modules/Entity.h"
|
#include "modules/Entity.h"
|
||||||
#include "../api/modules/Register.h"
|
#include "modules/Register.h"
|
||||||
|
|
||||||
#include "../api/modules/create_structure.h"
|
#include "modules/create_structure.h"
|
||||||
|
#include "LuaMod.h"
|
||||||
// Functions
|
|
||||||
#include "../api/functions/trigger_event.h"
|
|
||||||
#include "../api/functions/update_entities.h"
|
|
||||||
|
|
||||||
ServerLuaParser::ServerLuaParser(ServerSubgame& game) : LuaParser(game), game(game) {}
|
ServerLuaParser::ServerLuaParser(ServerSubgame& game) : LuaParser(game), game(game) {}
|
||||||
|
|
||||||
|
@ -110,13 +107,9 @@ void ServerLuaParser::loadApi(ServerSubgame &defs, ServerWorld &world) {
|
||||||
modules.emplace_back(std::make_unique<Api::Module::Entity>(Api::State::SERVER, core, game, world));
|
modules.emplace_back(std::make_unique<Api::Module::Entity>(Api::State::SERVER, core, game, world));
|
||||||
modules.emplace_back(std::make_unique<Api::Module::Register>(Api::State::SERVER, core, game, world));
|
modules.emplace_back(std::make_unique<Api::Module::Register>(Api::State::SERVER, core, game, world));
|
||||||
|
|
||||||
bindModules();
|
|
||||||
|
|
||||||
Api::create_structure (lua, core);
|
Api::create_structure (lua, core);
|
||||||
|
|
||||||
// Functions
|
bindModules();
|
||||||
Api::trigger_event (lua);
|
|
||||||
Api::update_entities(lua);
|
|
||||||
|
|
||||||
// Create sandboxed runfile()
|
// Create sandboxed runfile()
|
||||||
lua["dofile"] = lua["loadfile"] = sol::nil;
|
lua["dofile"] = lua["loadfile"] = sol::nil;
|
||||||
|
@ -174,7 +167,7 @@ sol::protected_function_result ServerLuaParser::runFileSandboxed(const std::stri
|
||||||
|
|
||||||
for (const LuaMod& mod : handler.cGetMods()) {
|
for (const LuaMod& mod : handler.cGetMods()) {
|
||||||
if (modname != mod.config.name) continue;
|
if (modname != mod.config.name) continue;
|
||||||
for (const LuaModFile& f : mod.files) {
|
for (const LuaMod::File& f : mod.files) {
|
||||||
if (f.path != file) continue;
|
if (f.path != file) continue;
|
||||||
|
|
||||||
sol::environment env(lua, sol::create, lua.globals());
|
sol::environment env(lua, sol::create, lua.globals());
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#include <enet/enet.h>
|
#include <enet/enet.h>
|
||||||
|
|
||||||
#include "../LuaParser.h"
|
#include "LuaParser.h"
|
||||||
|
|
||||||
#include "ServerModHandler.h"
|
#include "ServerModHandler.h"
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
|
|
||||||
#include "ServerModHandler.h"
|
#include "ServerModHandler.h"
|
||||||
|
|
||||||
#include "../../def/ServerSubgame.h"
|
#include "../net/Serializer.h"
|
||||||
#include "../../net/Serializer.h"
|
#include "../def/ServerSubgame.h"
|
||||||
|
|
||||||
void ServerModHandler::loadMods(ServerSubgame& defs, const std::string &path) {
|
void ServerModHandler::loadMods(ServerSubgame& defs, const std::string &path) {
|
||||||
auto modDirs = findModDirectories(path);
|
auto modDirs = findModDirectories(path);
|
||||||
|
@ -151,7 +151,7 @@ std::vector<LuaMod> ServerModHandler::initializeLuaMods(const std::list<std::str
|
||||||
modPath.insert(0, conf.name);
|
modPath.insert(0, conf.name);
|
||||||
modPath.resize(modPath.size() - 4);
|
modPath.resize(modPath.size() - 4);
|
||||||
|
|
||||||
LuaModFile f {modPath, fileStr};
|
LuaMod::File f {modPath, fileStr};
|
||||||
mod.files.push_back(f);
|
mod.files.push_back(f);
|
||||||
}
|
}
|
||||||
mods.push_back(mod);
|
mods.push_back(mod);
|
||||||
|
@ -291,7 +291,7 @@ void ServerModHandler::serializeMods(std::vector<LuaMod>& mods) {
|
||||||
|
|
||||||
s.append(depends);
|
s.append(depends);
|
||||||
|
|
||||||
for (LuaModFile& file : mod.files) {
|
for (LuaMod::File& file : mod.files) {
|
||||||
s.append(file.path).append(file.file);
|
s.append(file.path).append(file.file);
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "../LuaMod.h"
|
#include "LuaMod.h"
|
||||||
|
|
||||||
class ServerSubgame;
|
class ServerSubgame;
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
//
|
|
||||||
// Created by aurailus on 2020-02-18.
|
|
||||||
//
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../../Lua.h"
|
|
||||||
|
|
||||||
namespace Api {
|
|
||||||
static void trigger_event(sol::state& lua) {
|
|
||||||
lua.script(R"(
|
|
||||||
)");
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,21 +0,0 @@
|
||||||
//
|
|
||||||
// Created by aurailus on 11/10/19.
|
|
||||||
//
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../../Lua.h"
|
|
||||||
|
|
||||||
namespace Api {
|
|
||||||
static void update_entities(sol::state& lua) {
|
|
||||||
lua.script(R"(
|
|
||||||
zepha.__builtin.update_entities = function(delta)
|
|
||||||
for k, v in pairs(zepha.entities) do
|
|
||||||
if (type(v.on_update) == "function") then
|
|
||||||
v:on_update(delta)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
)");
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
#include "Block.h"
|
#include "Block.h"
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../../../def/ItemDef.h"
|
#include "../../def/ItemDef.h"
|
||||||
#include "../../../def/Subgame.h"
|
#include "../../def/Subgame.h"
|
||||||
#include "../../../def/DefinitionAtlas.h"
|
#include "../../def/DefinitionAtlas.h"
|
||||||
#include "../../../game/scene/world/World.h"
|
#include "../../game/scene/world/World.h"
|
||||||
|
|
||||||
void Api::Module::Block::bind() {
|
void Api::Module::Block::bind() {
|
||||||
core.set_function("get_block", Util::bind_this(this, &Block::getBlock));
|
core.set_function("get_block", Util::bind_this(this, &Block::getBlock));
|
|
@ -4,13 +4,13 @@
|
||||||
|
|
||||||
#include "Entity.h"
|
#include "Entity.h"
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../class/LocalLuaEntity.h"
|
#include "../usertype/LocalLuaEntity.h"
|
||||||
#include "../class/ServerLuaEntity.h"
|
#include "../usertype/ServerLuaEntity.h"
|
||||||
#include "../../../def/LocalSubgame.h"
|
#include "../../def/LocalSubgame.h"
|
||||||
#include "../../../def/ServerSubgame.h"
|
#include "../../def/ServerSubgame.h"
|
||||||
#include "../../../game/scene/world/LocalWorld.h"
|
#include "../../game/scene/world/LocalWorld.h"
|
||||||
#include "../../../net/server/world/ServerWorld.h"
|
#include "../../net/server/world/ServerWorld.h"
|
||||||
|
|
||||||
void Api::Module::Entity::bind() {
|
void Api::Module::Entity::bind() {
|
||||||
core["entities"] = lua.create_table();
|
core["entities"] = lua.create_table();
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include "Register.h"
|
#include "Register.h"
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
|
|
||||||
void Api::Module::Register::bind() {
|
void Api::Module::Register::bind() {
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#include "SubgameModule.h"
|
#include "SubgameModule.h"
|
||||||
|
|
||||||
#include "../../../def/Subgame.h"
|
#include "../../def/Subgame.h"
|
||||||
#include "../../../lua/LuaParser.h"
|
#include "../LuaParser.h"
|
||||||
|
|
||||||
Api::Module::SubgameModule::SubgameModule(State state, sol::table& core, Subgame& game, World& world) :
|
Api::Module::SubgameModule::SubgameModule(State state, sol::table& core, Subgame& game, World& world) :
|
||||||
BaseModule(state, game.getParser().lua, core), game(game), world(world) {}
|
BaseModule(state, game.getParser().lua, core), game(game), world(world) {}
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include "Time.h"
|
#include "Time.h"
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
|
|
||||||
void Api::Module::Time::bind() {
|
void Api::Module::Time::bind() {
|
||||||
auto time = lua.create_table();
|
auto time = lua.create_table();
|
|
@ -7,7 +7,7 @@
|
||||||
#include <glm/vec3.hpp>
|
#include <glm/vec3.hpp>
|
||||||
|
|
||||||
#include "SubgameModule.h"
|
#include "SubgameModule.h"
|
||||||
#include "../../../util/Timer.h"
|
#include "../../util/Timer.h"
|
||||||
|
|
||||||
namespace Api::Module {
|
namespace Api::Module {
|
||||||
class Time : public Api::Module::BaseModule {
|
class Time : public Api::Module::BaseModule {
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../../game/scene/world/Schematic.h"
|
#include "../../game/scene/world/Schematic.h"
|
||||||
|
|
||||||
namespace Api {
|
namespace Api {
|
||||||
static void create_structure(sol::state& lua, sol::table& core) {
|
static void create_structure(sol::state& lua, sol::table& core) {
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../../../game/hud/GuiBuilder.h"
|
#include "../../game/hud/GuiBuilder.h"
|
||||||
|
|
||||||
class LuaGuiElement;
|
class LuaGuiElement;
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../../../game/ClientState.h"
|
#include "../../game/ClientState.h"
|
||||||
|
|
||||||
namespace MenuApi {
|
namespace MenuApi {
|
||||||
void start_game(ClientState& state, sol::table& core) {
|
void start_game(ClientState& state, sol::table& core) {
|
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
#include "LocalLuaAnimationManager.h"
|
#include "LocalLuaAnimationManager.h"
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../../../game/entity/Entity.h"
|
#include "../../game/entity/Entity.h"
|
||||||
#include "../../../game/entity/AnimationSegment.h"
|
#include "../../game/entity/AnimationSegment.h"
|
||||||
|
|
||||||
LocalLuaAnimationManager::LocalLuaAnimationManager(Entity &entity) :
|
LocalLuaAnimationManager::LocalLuaAnimationManager(Entity &entity) :
|
||||||
entity(entity) {}
|
entity(entity) {}
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
|
|
||||||
class Entity;
|
class Entity;
|
||||||
|
|
|
@ -4,12 +4,12 @@
|
||||||
|
|
||||||
#include "LocalLuaEntity.h"
|
#include "LocalLuaEntity.h"
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../../LuaParser.h"
|
#include "../LuaParser.h"
|
||||||
#include "../../../def/LocalSubgame.h"
|
#include "../../def/LocalSubgame.h"
|
||||||
#include "../../../def/item/BlockDef.h"
|
#include "../../def/item/BlockDef.h"
|
||||||
#include "../../../def/item/CraftItemDef.h"
|
#include "../../def/item/CraftItemDef.h"
|
||||||
#include "../../../def/LocalDefinitionAtlas.h"
|
#include "../../def/LocalDefinitionAtlas.h"
|
||||||
|
|
||||||
void LocalLuaEntity::snap_pos(glm::vec3 pos) {
|
void LocalLuaEntity::snap_pos(glm::vec3 pos) {
|
||||||
entity->setPos(pos);
|
entity->setPos(pos);
|
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "LocalLuaAnimationManager.h"
|
#include "LocalLuaAnimationManager.h"
|
||||||
#include "../../../game/entity/Entity.h"
|
#include "../../game/entity/Entity.h"
|
||||||
|
|
||||||
class LocalSubgame;
|
class LocalSubgame;
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../../../game/inventory/LocalInventory.h"
|
#include "../../game/inventory/LocalInventory.h"
|
||||||
|
|
||||||
class LocalLuaInventory {
|
class LocalLuaInventory {
|
||||||
public:
|
public:
|
|
@ -5,8 +5,8 @@
|
||||||
#include "LocalLuaInventoryList.h"
|
#include "LocalLuaInventoryList.h"
|
||||||
|
|
||||||
#include "LuaItemStack.h"
|
#include "LuaItemStack.h"
|
||||||
#include "../../../def/ItemDef.h"
|
#include "../../def/ItemDef.h"
|
||||||
#include "../../../def/DefinitionAtlas.h"
|
#include "../../def/DefinitionAtlas.h"
|
||||||
|
|
||||||
int LocalLuaInventoryList::get_length() {
|
int LocalLuaInventoryList::get_length() {
|
||||||
return list.getLength();
|
return list.getLength();
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../../game/inventory/LocalInventoryList.h"
|
#include "../../game/inventory/LocalInventoryList.h"
|
||||||
|
|
||||||
class LocalLuaInventoryList {
|
class LocalLuaInventoryList {
|
||||||
public:
|
public:
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include "LuaItemStack.h"
|
#include "LuaItemStack.h"
|
||||||
#include "LocalLuaInventoryList.h"
|
#include "LocalLuaInventoryList.h"
|
||||||
#include "../../../game/scene/world/Player.h"
|
#include "../../game/scene/world/Player.h"
|
||||||
|
|
||||||
glm::vec3 LocalLuaPlayer::get_pos() {
|
glm::vec3 LocalLuaPlayer::get_pos() {
|
||||||
return player.getPos();
|
return player.getPos();
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
#include "LuaGuiElement.h"
|
#include "LuaGuiElement.h"
|
||||||
|
|
||||||
#include "../../../game/hud/SerialGui.h"
|
#include "../../game/hud/SerialGui.h"
|
||||||
|
|
||||||
std::shared_ptr<LuaGuiElement> LuaGuiElement::create(const std::string& type, sol::table data) {
|
std::shared_ptr<LuaGuiElement> LuaGuiElement::create(const std::string& type, sol::table data) {
|
||||||
auto elem = std::make_shared<LuaGuiElement>();
|
auto elem = std::make_shared<LuaGuiElement>();
|
|
@ -6,8 +6,8 @@
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../../../util/Any.h"
|
#include "../../util/Any.h"
|
||||||
|
|
||||||
class LuaGuiElement {
|
class LuaGuiElement {
|
||||||
public:
|
public:
|
|
@ -4,10 +4,10 @@
|
||||||
|
|
||||||
#include "LuaItemStack.h"
|
#include "LuaItemStack.h"
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../../../def/ItemDef.h"
|
#include "../../def/ItemDef.h"
|
||||||
#include "../../../def/DefinitionAtlas.h"
|
#include "../../def/DefinitionAtlas.h"
|
||||||
#include "../../../game/inventory/ItemStack.h"
|
#include "../../game/inventory/ItemStack.h"
|
||||||
|
|
||||||
LuaItemStack::LuaItemStack(const ItemStack &stack, const DefinitionAtlas &defs) :
|
LuaItemStack::LuaItemStack(const ItemStack &stack, const DefinitionAtlas &defs) :
|
||||||
name((stack.count == 0 ? "" : defs.fromId(stack.id).identifier)),
|
name((stack.count == 0 ? "" : defs.fromId(stack.id).identifier)),
|
|
@ -6,11 +6,11 @@
|
||||||
|
|
||||||
#include "ServerLocalLuaEntity.h"
|
#include "ServerLocalLuaEntity.h"
|
||||||
|
|
||||||
#include "../../../def/ItemDef.h"
|
#include "../../def/ItemDef.h"
|
||||||
#include "../../../def/LocalSubgame.h"
|
#include "../../def/LocalSubgame.h"
|
||||||
#include "../../../def/item/BlockDef.h"
|
#include "../../def/item/BlockDef.h"
|
||||||
#include "../../../def/item/CraftItemDef.h"
|
#include "../../def/item/CraftItemDef.h"
|
||||||
#include "../../../def/LocalDefinitionAtlas.h"
|
#include "../../def/LocalDefinitionAtlas.h"
|
||||||
|
|
||||||
ServerLocalLuaEntity::ServerLocalLuaEntity(unsigned int id, LocalSubgame &defs, const std::string &appearance,
|
ServerLocalLuaEntity::ServerLocalLuaEntity(unsigned int id, LocalSubgame &defs, const std::string &appearance,
|
||||||
const std::string &arg1, const std::string &arg2) :
|
const std::string &arg1, const std::string &arg2) :
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "../../../game/entity/Entity.h"
|
#include "../../game/entity/Entity.h"
|
||||||
|
|
||||||
class LocalSubgame;
|
class LocalSubgame;
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
|
|
||||||
#include "ServerLuaEntity.h"
|
#include "ServerLuaEntity.h"
|
||||||
|
|
||||||
#include "../../LuaParser.h"
|
#include "../LuaParser.h"
|
||||||
#include "../../../def/ItemDef.h"
|
#include "../../def/ItemDef.h"
|
||||||
#include "../../../def/ServerSubgame.h"
|
#include "../../def/ServerSubgame.h"
|
||||||
#include "../../../def/ServerDefinitionAtlas.h"
|
#include "../../def/ServerDefinitionAtlas.h"
|
||||||
|
|
||||||
void ServerLuaEntity::snap_pos(glm::vec3 pos) {
|
void ServerLuaEntity::snap_pos(glm::vec3 pos) {
|
||||||
entity->setPos(pos);
|
entity->setPos(pos);
|
|
@ -6,8 +6,8 @@
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../../../net/server/world/ServerEntity.h"
|
#include "../../net/server/world/ServerEntity.h"
|
||||||
|
|
||||||
class ServerSubgame;
|
class ServerSubgame;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../../game/inventory/Inventory.h"
|
#include "../../game/inventory/Inventory.h"
|
||||||
|
|
||||||
class ServerLuaInventory {
|
class ServerLuaInventory {
|
||||||
public:
|
public:
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#include "ServerLuaInventoryList.h"
|
#include "ServerLuaInventoryList.h"
|
||||||
|
|
||||||
#include "../../../def/ItemDef.h"
|
#include "../../def/ItemDef.h"
|
||||||
#include "../../../def/DefinitionAtlas.h"
|
#include "../../def/DefinitionAtlas.h"
|
||||||
|
|
||||||
void ServerLuaInventoryList::set_length(int length) {
|
void ServerLuaInventoryList::set_length(int length) {
|
||||||
list.setLength(length);
|
list.setLength(length);
|
|
@ -5,7 +5,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "LuaItemStack.h"
|
#include "LuaItemStack.h"
|
||||||
#include "../../../game/inventory/ServerInventoryList.h"
|
#include "../../game/inventory/ServerInventoryList.h"
|
||||||
|
|
||||||
class ServerLuaInventoryList {
|
class ServerLuaInventoryList {
|
||||||
public:
|
public:
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#include "ServerLuaPlayer.h"
|
#include "ServerLuaPlayer.h"
|
||||||
|
|
||||||
#include "../../LuaParser.h"
|
#include "../LuaParser.h"
|
||||||
#include "../../../net/NetHandler.h"
|
#include "../../net/NetHandler.h"
|
||||||
#include "ServerLuaInventoryList.h"
|
#include "ServerLuaInventoryList.h"
|
||||||
|
|
||||||
std::string ServerLuaPlayer::get_name() {
|
std::string ServerLuaPlayer::get_name() {
|
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "ServerLuaInventory.h"
|
#include "ServerLuaInventory.h"
|
||||||
#include "../../../net/server/conn/ServerClient.h"
|
#include "../../net/server/conn/ServerClient.h"
|
||||||
|
|
||||||
class ServerLuaPlayer {
|
class ServerLuaPlayer {
|
||||||
public:
|
public:
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../class/LocalLuaAnimationManager.h"
|
#include "LocalLuaAnimationManager.h"
|
||||||
|
|
||||||
namespace ClientApi {
|
namespace ClientApi {
|
||||||
void animation_manager(sol::state& lua) {
|
void animation_manager(sol::state& lua) {
|
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../class/LocalLuaInventory.h"
|
#include "LocalLuaInventory.h"
|
||||||
#include "../class/LocalLuaInventoryList.h"
|
#include "LocalLuaInventoryList.h"
|
||||||
|
|
||||||
namespace ClientApi {
|
namespace ClientApi {
|
||||||
static void inventory(sol::state& lua) {
|
static void inventory(sol::state& lua) {
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../class/LuaItemStack.h"
|
#include "LuaItemStack.h"
|
||||||
|
|
||||||
namespace ClientApi {
|
namespace ClientApi {
|
||||||
static void item_stack(sol::state& lua) {
|
static void item_stack(sol::state& lua) {
|
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../class/LocalLuaEntity.h"
|
#include "LocalLuaEntity.h"
|
||||||
#include "../../../game/scene/world/LocalWorld.h"
|
#include "../../game/scene/world/LocalWorld.h"
|
||||||
|
|
||||||
namespace ClientApi {
|
namespace ClientApi {
|
||||||
void entity(sol::state& lua) {
|
void entity(sol::state& lua) {
|
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../class/ServerLuaInventory.h"
|
#include "ServerLuaInventory.h"
|
||||||
#include "../class/ServerLuaInventoryList.h"
|
#include "ServerLuaInventoryList.h"
|
||||||
|
|
||||||
namespace ServerApi {
|
namespace ServerApi {
|
||||||
static void inventory(sol::state& lua) {
|
static void inventory(sol::state& lua) {
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../Lua.h"
|
#include "../Lua.h"
|
||||||
#include "../class/ServerLuaEntity.h"
|
#include "ServerLuaEntity.h"
|
||||||
|
|
||||||
namespace ServerApi {
|
namespace ServerApi {
|
||||||
void entity(sol::state& lua) {
|
void entity(sol::state& lua) {
|
|
@ -14,8 +14,8 @@
|
||||||
#include "../PacketChannel.h"
|
#include "../PacketChannel.h"
|
||||||
#include "../../def/item/BlockDef.h"
|
#include "../../def/item/BlockDef.h"
|
||||||
#include "../../def/ServerDefinitionAtlas.h"
|
#include "../../def/ServerDefinitionAtlas.h"
|
||||||
#include "../../lua/parser/ServerLuaParser.h"
|
#include "../../lua/ServerLuaParser.h"
|
||||||
#include "../../lua/api/class/ServerLuaPlayer.h"
|
#include "../../lua/usertype/ServerLuaPlayer.h"
|
||||||
|
|
||||||
Server::Server(unsigned short port, const std::string& subgame) :
|
Server::Server(unsigned short port, const std::string& subgame) :
|
||||||
seed(69),
|
seed(69),
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#include "../../../def/gen/BiomeDef.h"
|
#include "../../../def/gen/BiomeDef.h"
|
||||||
#include "../../../def/gen/ServerBiomeAtlas.h"
|
#include "../../../def/gen/ServerBiomeAtlas.h"
|
||||||
#include "../../../def/ServerDefinitionAtlas.h"
|
#include "../../../def/ServerDefinitionAtlas.h"
|
||||||
#include "../../../lua/parser/ServerLuaParser.h"
|
#include "../../../lua/ServerLuaParser.h"
|
||||||
|
|
||||||
ServerConfig::ServerConfig(ServerSubgame &defs) : game(defs) {}
|
ServerConfig::ServerConfig(ServerSubgame &defs) : game(defs) {}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#include "../../../util/Log.h"
|
#include "../../../util/Log.h"
|
||||||
#include "../../../def/ServerSubgame.h"
|
#include "../../../def/ServerSubgame.h"
|
||||||
#include "../../client/NetPlayerField.h"
|
#include "../../client/NetPlayerField.h"
|
||||||
#include "../../../lua/parser/ServerLuaParser.h"
|
#include "../../../lua/ServerLuaParser.h"
|
||||||
|
|
||||||
ClientList::ClientList(ServerSubgame& defs) :
|
ClientList::ClientList(ServerSubgame& defs) :
|
||||||
defs(defs) {}
|
defs(defs) {}
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#include "../../../world/chunk/MapBlock.h"
|
#include "../../../world/chunk/MapBlock.h"
|
||||||
#include "../../../world/fs/FileManipulator.h"
|
#include "../../../world/fs/FileManipulator.h"
|
||||||
#include "../../../def/ServerDefinitionAtlas.h"
|
#include "../../../def/ServerDefinitionAtlas.h"
|
||||||
#include "../../../lua/api/class/ServerLuaEntity.h"
|
#include "../../../lua/usertype/ServerLuaEntity.h"
|
||||||
|
|
||||||
ServerWorld::ServerWorld(unsigned int seed, ServerSubgame& game, ClientList& clients) :
|
ServerWorld::ServerWorld(unsigned int seed, ServerSubgame& game, ClientList& clients) :
|
||||||
clientList(clients),
|
clientList(clients),
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
#include "../game/graph/Renderer.h"
|
#include "../game/graph/Renderer.h"
|
||||||
#include "../world/chunk/MapBlock.h"
|
#include "../world/chunk/MapBlock.h"
|
||||||
#include "../def/LocalDefinitionAtlas.h"
|
#include "../def/LocalDefinitionAtlas.h"
|
||||||
#include "../lua/api/class/LocalLuaEntity.h"
|
#include "../lua/usertype/LocalLuaEntity.h"
|
||||||
#include "../game/scene/world/MeshGenStream.h"
|
#include "../game/scene/world/MeshGenStream.h"
|
||||||
#include "../game/scene/world/graph/MeshChunk.h"
|
#include "../game/scene/world/graph/MeshChunk.h"
|
||||||
#include "../game/scene/world/ChunkMeshDetails.h"
|
#include "../game/scene/world/ChunkMeshDetails.h"
|
||||||
#include "../lua/api/class/ServerLocalLuaEntity.h"
|
#include "../lua/usertype/ServerLocalLuaEntity.h"
|
||||||
|
|
||||||
LocalDimension::LocalDimension(LocalSubgame &game) : Dimension(*game.defs),
|
LocalDimension::LocalDimension(LocalSubgame &game) : Dimension(*game.defs),
|
||||||
meshGenStream(std::make_shared<MeshGenStream>(game, *this)),
|
meshGenStream(std::make_shared<MeshGenStream>(game, *this)),
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#include "../def/ServerDefinitionAtlas.h"
|
#include "../def/ServerDefinitionAtlas.h"
|
||||||
#include "../net/server/conn/ServerClient.h"
|
#include "../net/server/conn/ServerClient.h"
|
||||||
#include "../net/server/world/ServerWorld.h"
|
#include "../net/server/world/ServerWorld.h"
|
||||||
#include "../lua/api/class/ServerLuaEntity.h"
|
#include "../lua/usertype/ServerLuaEntity.h"
|
||||||
|
|
||||||
ServerDimension::ServerDimension(ServerSubgame &game) : Dimension(*game.defs), game(game) {}
|
ServerDimension::ServerDimension(ServerSubgame &game) : Dimension(*game.defs), game(game) {}
|
||||||
|
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
Loading…
Reference in New Issue