Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update includes to point to new lua/ directory

master
Webster Sheets 2020-01-20 18:13:45 -05:00
parent cfe2e75a8c
commit ec410f31d8
77 changed files with 136 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -103,6 +103,7 @@ list(APPEND SRC_FOLDERS
src/graphics/dummy
src/graphics/opengl
src/gui
src/lua
src/pigui
src/scenegraph
src/ship

6
src/Beam.cpp
View File

@ -8,8 +8,6 @@
#include "Game.h"
#include "GameSaveError.h"
#include "Json.h"
#include "LuaEvent.h"
#include "LuaUtils.h"
#include "Pi.h"
#include "Planet.h"
#include "Player.h"
@ -20,10 +18,12 @@
#include "collider/CollisionSpace.h"
#include "graphics/Graphics.h"
#include "graphics/Material.h"
#include "graphics/Renderer.h"
#include "graphics/RenderState.h"
#include "graphics/Renderer.h"
#include "graphics/TextureBuilder.h"
#include "graphics/VertexArray.h"
#include "lua/LuaEvent.h"
#include "lua/LuaUtils.h"
namespace {
static float lifetime = 0.1f;

2
src/Body.cpp
View File

@ -7,7 +7,6 @@
#include "Frame.h"
#include "GameSaveError.h"
#include "HyperspaceCloud.h"
#include "LuaEvent.h"
#include "Missile.h"
#include "Planet.h"
#include "Player.h"
@ -16,6 +15,7 @@
#include "Space.h"
#include "SpaceStation.h"
#include "Star.h"
#include "lua/LuaEvent.h"
Body::Body() :
PropertiedObject(Lua::manager),

2
src/Body.h
View File

@ -6,7 +6,7 @@
#include "FrameId.h"
#include "Object.h"
#include "PropertiedObject.h"
#include "lua/PropertiedObject.h"
#include "matrix3x3.h"
#include "vector3.h"
#include <string>

2
src/CargoBody.h
View File

@ -5,8 +5,8 @@
#define _CARGOBODY_H
#include "DynamicBody.h"
#include "LuaRef.h"
#include "libs.h"
#include "lua/LuaRef.h"
namespace Graphics {
class Renderer;

2
src/Color.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Color.h"
#include "LuaUtils.h"
#include "lua/LuaUtils.h"
const Color4f Color4f::BLACK = Color4f(0.0f, 0.0f, 0.0f, 1.0f);
const Color4f Color4f::WHITE = Color4f(1.0f, 1.0f, 1.0f, 1.0f);

2
src/DeleteEmitter.h
View File

@ -11,7 +11,7 @@
// including sigc++ directly so we don't get circular dependencies
#include <sigc++/sigc++.h>
#include "LuaWrappable.h"
#include "lua/LuaWrappable.h"
class DeleteEmitter : public LuaWrappable {
public:

4
src/Game.cpp
View File

@ -12,10 +12,10 @@
#include "GameLog.h"
#include "GameSaveError.h"
#include "HyperspaceCloud.h"
#include "LuaEvent.h"
#include "LuaSerializer.h"
#include "MathUtil.h"
#include "Object.h"
#include "lua/LuaEvent.h"
#include "lua/LuaSerializer.h"
#if WITH_OBJECTVIEWER
#include "ObjectViewerView.h"
#endif

2
src/GameLog.cpp
View File

@ -1,10 +1,10 @@
#include "GameLog.h"
#include "Game.h"
#include "LuaObject.h"
#include "Pi.h"
#include "StringF.h"
#include "graphics/Renderer.h"
#include "graphics/VertexArray.h"
#include "lua/Lua.h"
void GameLog::Add(const std::string &msg)
{

3
src/Missile.cpp
View File

@ -5,14 +5,13 @@
#include "Game.h"
#include "Lang.h"
#include "LuaEvent.h"
#include "Pi.h"
#include "Sfx.h"
#include "Ship.h"
#include "ShipAICmd.h"
#include "Space.h"
#include "collider/CollisionContact.h"
#include "lua/LuaEvent.h"
Missile::Missile(const ShipType::Id &shipId, Body *owner, int power)
{

2
src/ModelViewer.h
View File

@ -3,13 +3,13 @@
#ifndef MODELVIEWER_H
#define MODELVIEWER_H
#include "LuaManager.h"
#include "NavLights.h"
#include "Shields.h"
#include "graphics/Drawables.h"
#include "graphics/Renderer.h"
#include "graphics/Texture.h"
#include "libs.h"
#include "lua/LuaManager.h"
#include "scenegraph/SceneGraph.h"
#include "ui/Context.h"

8
src/PiGui.h
View File

@ -2,12 +2,12 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "FileSystem.h"
#include "Lua.h"
#include "LuaRef.h"
#include "LuaTable.h"
#include "RefCounted.h"
#include "graphics/opengl/RendererGL.h"
#include "imgui/imgui.h"
#include "lua/Lua.h"
#include "lua/LuaRef.h"
#include "lua/LuaTable.h"
class PiFace {
friend class PiGui; // need acces to some private data
@ -129,7 +129,7 @@ public:
void Cleanup();
static bool LowThrustButton(const char *label, const ImVec2 &size_arg, int thrust_level, const ImVec4 &bg_col, int frame_padding, ImColor gauge_fg, ImColor gauge_bg);
static bool ButtonImageSized(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& imgSize, const ImVec2& uv0, const ImVec2& uv1, int frame_padding, const ImVec4& bg_col, const ImVec4& tint_col);
static bool ButtonImageSized(ImTextureID user_texture_id, const ImVec2 &size, const ImVec2 &imgSize, const ImVec2 &uv0, const ImVec2 &uv1, int frame_padding, const ImVec4 &bg_col, const ImVec4 &tint_col);
static void ThrustIndicator(const std::string &id_string, const ImVec2 &size, const ImVec4 &thrust, const ImVec4 &velocity, const ImVec4 &bg_col, int frame_padding, ImColor vel_fg, ImColor vel_bg, ImColor thrust_fg, ImColor thrust_bg);

4
src/Player.cpp
View File

@ -10,16 +10,16 @@
#include "HyperspaceCloud.h"
#include "KeyBindings.h"
#include "Lang.h"
#include "LuaObject.h"
#include "Pi.h"
#include "SectorView.h"
#include "Sfx.h"
#include "ship/PlayerShipController.h"
#include "ShipCpanel.h"
#include "SpaceStation.h"
#include "StringF.h"
#include "SystemView.h" // for the transfer planner
#include "WorldView.h"
#include "lua/LuaObject.h"
#include "ship/PlayerShipController.h"
#include "sound/Sound.h"
//Some player specific sounds

6
src/Projectile.cpp
View File

@ -8,8 +8,6 @@
#include "Game.h"
#include "GameSaveError.h"
#include "Json.h"
#include "LuaEvent.h"
#include "LuaUtils.h"
#include "Pi.h"
#include "Planet.h"
#include "Player.h"
@ -21,10 +19,12 @@
#include "galaxy/StarSystem.h"
#include "graphics/Graphics.h"
#include "graphics/Material.h"
#include "graphics/Renderer.h"
#include "graphics/RenderState.h"
#include "graphics/Renderer.h"
#include "graphics/TextureBuilder.h"
#include "graphics/VertexArray.h"
#include "lua/LuaEvent.h"
#include "lua/LuaUtils.h"
std::unique_ptr<Graphics::VertexArray> Projectile::s_sideVerts;
std::unique_ptr<Graphics::VertexArray> Projectile::s_glowVerts;

2
src/RefCounted.h
View File

@ -4,8 +4,8 @@
#ifndef _REFCOUNTED_H
#define _REFCOUNTED_H
#include "LuaWrappable.h"
#include "SmartPtr.h"
#include "lua/LuaWrappable.h"
#include <atomic>
class RefCounted : public LuaWrappable {

4
src/SectorView.cpp
View File

@ -7,8 +7,6 @@
#include "GameConfig.h"
#include "GameSaveError.h"
#include "KeyBindings.h"
#include "LuaConstants.h"
#include "LuaObject.h"
#include "MathUtil.h"
#include "Pi.h"
#include "Player.h"
@ -22,6 +20,8 @@
#include "graphics/Material.h"
#include "graphics/Renderer.h"
#include "gui/Gui.h"
#include "lua/LuaConstants.h"
#include "lua/LuaObject.h"
#include <algorithm>
#include <sstream>
#include <unordered_set>

4
src/Ship-AI.cpp
View File

@ -3,8 +3,6 @@
#include "EnumStrings.h"
#include "Frame.h"
#include "LuaConstants.h"
#include "LuaEvent.h"
#include "Pi.h"
#include "Planet.h"
#include "Player.h"
@ -13,6 +11,8 @@
#include "Space.h"
#include "SpaceStation.h"
#include "libs.h"
#include "lua/LuaConstants.h"
#include "lua/LuaEvent.h"
#include "perlin.h"
#include "ship/Propulsion.h"

6
src/Ship.cpp
View File

@ -13,9 +13,6 @@
#include "HeatGradientPar.h"
#include "HyperspaceCloud.h"
#include "Lang.h"
#include "LuaEvent.h"
#include "LuaObject.h"
#include "LuaUtils.h"
#include "Missile.h"
#include "NavLights.h"
#include "Planet.h"
@ -30,6 +27,9 @@
#include "WorldView.h"
#include "collider/CollisionContact.h"
#include "graphics/TextureBuilder.h"
#include "lua/LuaEvent.h"
#include "lua/LuaObject.h"
#include "lua/LuaUtils.h"
#include "scenegraph/Animation.h"
#include "scenegraph/MatrixTransform.h"
#include "ship/PlayerShipController.h"

2
src/Ship.h
View File

@ -7,9 +7,9 @@
#include <unordered_map>
#include "DynamicBody.h"
#include "LuaRef.h"
#include "ShipType.h"
#include "galaxy/SystemPath.h"
#include "lua/LuaRef.h"
#include "scenegraph/ModelSkin.h"
#include "sound/Sound.h"

4
src/ShipCpanelMultiFuncDisplays.cpp
View File

@ -7,8 +7,6 @@
#include "HyperspaceCloud.h"
#include "KeyBindings.h"
#include "Lang.h"
#include "LuaConstants.h"
#include "LuaTable.h"
#include "Missile.h"
#include "Pi.h"
#include "Player.h"
@ -20,6 +18,8 @@
#include "graphics/Renderer.h"
#include "graphics/VertexArray.h"
#include "libs.h"
#include "lua/LuaConstants.h"
#include "lua/LuaTable.h"
#include "sound/Sound.h"
using namespace Graphics;

2
src/ShipType.cpp
View File

@ -5,10 +5,10 @@
#include "ShipType.h"
#if ALLOW_LUA_SHIP_DEF
#include "LuaConstants.h"
#include "LuaTable.h"
#include "LuaUtils.h"
#include "LuaVector.h"
#include "lua/LuaConstants.h"
#endif
#include "FileSystem.h"
#include "Json.h"

4
src/Space.cpp
View File

@ -10,8 +10,6 @@
#include "GameSaveError.h"
#include "HyperspaceCloud.h"
#include "Lang.h"
#include "LuaEvent.h"
#include "LuaTimer.h"
#include "MathUtil.h"
#include "Pi.h"
#include "Planet.h"
@ -22,6 +20,8 @@
#include "collider/CollisionSpace.h"
#include "galaxy/Galaxy.h"
#include "graphics/Graphics.h"
#include "lua/LuaEvent.h"
#include "lua/LuaTimer.h"
#include <algorithm>
#include <functional>

2
src/SpaceStation.cpp
View File

@ -11,7 +11,6 @@
#include "GameSaveError.h"
#include "Json.h"
#include "Lang.h"
#include "LuaEvent.h"
#include "NavLights.h"
#include "Pi.h"
#include "Planet.h"
@ -20,6 +19,7 @@
#include "Space.h"
#include "StringF.h"
#include "graphics/Renderer.h"
#include "lua/LuaEvent.h"
#include "scenegraph/Animation.h"
#include "scenegraph/MatrixTransform.h"
#include "scenegraph/ModelSkin.h"

4
src/SystemView.cpp
View File

@ -8,7 +8,6 @@
#include "Game.h"
#include "GameLog.h"
#include "Lang.h"
#include "LuaObject.h"
#include "Pi.h"
#include "Player.h"
#include "SectorView.h"
@ -19,6 +18,7 @@
#include "graphics/Material.h"
#include "graphics/Renderer.h"
#include "graphics/TextureBuilder.h"
#include "lua/LuaObject.h"
#include <iomanip>
#include <sstream>
@ -1053,7 +1053,7 @@ void SystemView::PrepareGrid()
m_displayed_sbody.clear();
if (m_gridDrawing == GridDrawing::GRID_AND_LEGS) {
m_displayed_sbody = m_system->GetRootBody()->CollectAllChildren();
m_displayed_sbody = m_system->GetRootBody()->CollectAllChildren();
}
}

4
src/enum_table.cpp
View File

@ -6,8 +6,6 @@
#include "enum_table.h"
#include "DynamicBody.h"
#include "LuaEngine.h"
#include "LuaFileSystem.h"
#include "Object.h"
#include "Ship.h"
#include "ShipAICmd.h"
@ -17,6 +15,8 @@
#include "galaxy/StarSystem.h"
#include "gameui/Face.h"
#include "gameui/LabelOverlay.h"
#include "lua/LuaEngine.h"
#include "lua/LuaFileSystem.h"
#include "scenegraph/Model.h"
#include "ship/PlayerShipController.h"
#include "ship/Propulsion.h"

40
src/galaxy/CustomSystem.cpp
View File

@ -6,14 +6,14 @@
#include "Galaxy.h"
#include "SystemPath.h"
#include "../gameconsts.h"
#include "Factions.h"
#include "FileSystem.h"
#include "LuaConstants.h"
#include "LuaFixed.h"
#include "LuaUtils.h"
#include "LuaVector.h"
#include "Polit.h"
#include "../gameconsts.h"
#include "lua/LuaConstants.h"
#include "lua/LuaFixed.h"
#include "lua/LuaUtils.h"
#include "lua/LuaVector.h"
#include <map>
const CustomSystemsDatabase::SystemList CustomSystemsDatabase::s_emptySystemList; // see: Null Object pattern
@ -708,8 +708,10 @@ CustomSystem::~CustomSystem()
void CustomSystem::SanityChecks()
{
if (IsRandom()) return;
else sBody->SanityChecks();
if (IsRandom())
return;
else
sBody->SanityChecks();
}
CustomSystemBody::CustomSystemBody() :
@ -743,31 +745,26 @@ static void checks(CustomSystemBody &csb)
if (csb.radius <= 0 && csb.mass <= 0) {
if (csb.type != SystemBody::TYPE_STARPORT_ORBITAL &&
csb.type != SystemBody::TYPE_STARPORT_SURFACE &&
csb.type != SystemBody::TYPE_GRAVPOINT
) Error("custom system body '%s' with both radius ans mass left undefined!", csb.name.c_str());
csb.type != SystemBody::TYPE_GRAVPOINT) Error("custom system body '%s' with both radius ans mass left undefined!", csb.name.c_str());
}
if (csb.radius <= 0 && csb.type != SystemBody::TYPE_STARPORT_ORBITAL &&
csb.type != SystemBody::TYPE_STARPORT_SURFACE &&
csb.type != SystemBody::TYPE_GRAVPOINT
) {
csb.type != SystemBody::TYPE_STARPORT_SURFACE &&
csb.type != SystemBody::TYPE_GRAVPOINT) {
Output("Warning: 'radius' is %f for body '%s'\n", csb.radius.ToFloat(), csb.name.c_str());
}
if (csb.mass <= 0 && csb.type != SystemBody::TYPE_STARPORT_ORBITAL &&
csb.type != SystemBody::TYPE_STARPORT_SURFACE &&
csb.type != SystemBody::TYPE_GRAVPOINT
) {
csb.type != SystemBody::TYPE_STARPORT_SURFACE &&
csb.type != SystemBody::TYPE_GRAVPOINT) {
Output("Warning: 'mass' is %f for body '%s'\n", csb.mass.ToFloat(), csb.name.c_str());
}
if (csb.averageTemp <= 0 && csb.type != SystemBody::TYPE_STARPORT_ORBITAL &&
csb.type != SystemBody::TYPE_STARPORT_SURFACE &&
csb.type != SystemBody::TYPE_GRAVPOINT
) {
csb.type != SystemBody::TYPE_STARPORT_SURFACE &&
csb.type != SystemBody::TYPE_GRAVPOINT) {
Output("Warning: 'averageTemp' is %i for body '%s'\n", csb.averageTemp, csb.name.c_str());
}
if (csb.type == SystemBody::TYPE_STAR_S_BH ||
csb.type == SystemBody::TYPE_STAR_IM_BH ||
csb.type == SystemBody::TYPE_STAR_SM_BH
) {
csb.type == SystemBody::TYPE_STAR_SM_BH) {
double schwarzschild = 2 * csb.mass.ToDouble() * ((G * SOL_MASS) / (LIGHT_SPEED * LIGHT_SPEED));
schwarzschild /= SOL_RADIUS;
if (csb.radius < schwarzschild) {
@ -780,5 +777,6 @@ static void checks(CustomSystemBody &csb)
void CustomSystemBody::SanityChecks()
{
checks(*this);
for (CustomSystemBody *csb:children) csb->SanityChecks();
for (CustomSystemBody *csb : children)
csb->SanityChecks();
}

8
src/galaxy/Factions.cpp
View File

@ -12,12 +12,12 @@
#include "FileSystem.h"
#include "GameSaveError.h"
#include "Lang.h"
#include "LuaConstants.h"
#include "LuaFixed.h"
#include "LuaUtils.h"
#include "LuaVector.h"
#include "Pi.h"
#include "Polit.h"
#include "lua/LuaConstants.h"
#include "lua/LuaFixed.h"
#include "lua/LuaUtils.h"
#include "lua/LuaVector.h"
#include <algorithm>
#include <list>
#include <set>

2
src/galaxy/StarSystem.cpp
View File

@ -10,10 +10,10 @@
#include "EnumStrings.h"
#include "GameSaveError.h"
#include "Lang.h"
#include "LuaEvent.h"
#include "Orbit.h"
#include "StringF.h"
#include "enum_table.h"
#include "lua/LuaEvent.h"
#include "utils.h"
#include <SDL_stdinc.h>
#include <algorithm>

6
src/galaxy/StarSystemGenerator.cpp
View File

@ -8,10 +8,10 @@
#include "Galaxy.h"
#include "Json.h"
#include "Lang.h"
#include "LuaNameGen.h"
#include "Sector.h"
#include "utils.h"
#include "Pi.h"
#include "Sector.h"
#include "lua/LuaNameGen.h"
#include "utils.h"
static const fixed SUN_MASS_TO_EARTH_MASS = fixed(332998, 1); // XXX Duplication from StarSystem.cpp
// if binary stars have separation s, planets can have stable

2
src/galaxy/SystemPath.h
View File

@ -5,7 +5,7 @@
#define _SYSTEMPATH_H
#include "JsonFwd.h"
#include "LuaWrappable.h"
#include "lua/LuaWrappable.h"
#include <SDL_stdinc.h>
#include <cassert>
#include <stdexcept>

2
src/gameui/Lua.h
View File

@ -5,7 +5,7 @@
#define GAMEUI_LUA_H
#include "GameUI.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace GameUI {
namespace Lua {

4
src/gameui/LuaBindingCapture.cpp
View File

@ -2,8 +2,8 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "BindingCapture.h"
#include "LuaObject.h"
#include "LuaPushPull.h"
#include "lua/LuaObject.h"
#include "lua/LuaPushPull.h"
#include "ui/LuaSignal.h"
inline void pi_lua_generic_push(lua_State *l, const KeyBindings::KeyBinding &value)

4
src/gameui/LuaFace.cpp
View File

@ -2,8 +2,8 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Face.h"
#include "LuaConstants.h"
#include "LuaObject.h"
#include "lua/LuaConstants.h"
#include "lua/LuaObject.h"
namespace GameUI {

4
src/gameui/LuaGalaxyMap.cpp
View File

@ -2,8 +2,8 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "GalaxyMap.h"
#include "LuaConstants.h"
#include "LuaObject.h"
#include "lua/LuaConstants.h"
#include "lua/LuaObject.h"
#include "ui/Lua.h"
#include "ui/LuaSignal.h"
#include "vector2.h"

2
src/gameui/LuaModelSpinner.cpp
View File

@ -1,9 +1,9 @@
// Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "LuaObject.h"
#include "ModelSpinner.h"
#include "Pi.h"
#include "lua/LuaObject.h"
namespace GameUI {

10
src/pigui/LuaFace.cpp
View File

@ -2,11 +2,11 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Face.h"
#include "LuaConstants.h"
#include "LuaObject.h"
#include "LuaPiGui.h"
#include "LuaTable.h"
#include "LuaVector2.h"
#include "lua/LuaConstants.h"
#include "lua/LuaObject.h"
#include "lua/LuaPiGui.h"
#include "lua/LuaTable.h"
#include "lua/LuaVector2.h"
namespace PiGUI {

10
src/pigui/LuaImage.cpp
View File

@ -2,11 +2,11 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Image.h"
#include "LuaConstants.h"
#include "LuaObject.h"
#include "LuaPiGui.h"
#include "LuaTable.h"
#include "LuaVector2.h"
#include "lua/LuaConstants.h"
#include "lua/LuaObject.h"
#include "lua/LuaPiGui.h"
#include "lua/LuaTable.h"
#include "lua/LuaVector2.h"
namespace PiGUI {

8
src/pigui/LuaModelSpinner.cpp
View File

@ -1,9 +1,9 @@
#include "LuaObject.h"
#include "LuaPushPull.h"
#include "LuaVector.h"
#include "LuaVector2.h"
#include "Pi.h"
#include "lua/LuaObject.h"
#include "lua/LuaPushPull.h"
#include "lua/LuaVector.h"
#include "lua/LuaVector2.h"
#include "pigui/ModelSpinner.h"
namespace PiGUI {

2
src/pigui/PiGuiLua.h
View File

@ -4,7 +4,7 @@
#ifndef PIGUI_LUA_H
#define PIGUI_LUA_H
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace PiGUI {
namespace Lua {

2
src/scenegraph/Lua.cpp
View File

@ -2,9 +2,9 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Lua.h"
#include "LuaObject.h"
#include "Model.h"
#include "ModelSkin.h"
#include "lua/LuaObject.h"
namespace SceneGraph {
namespace Lua {

4
src/scenegraph/LuaModel.cpp
View File

@ -1,9 +1,9 @@
// Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "LuaConstants.h"
#include "LuaObject.h"
#include "Model.h"
#include "lua/LuaConstants.h"
#include "lua/LuaObject.h"
namespace SceneGraph {

2
src/scenegraph/LuaModelSkin.cpp
View File

@ -1,9 +1,9 @@
// Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "LuaObject.h"
#include "ModelSkin.h"
#include "Serializer.h"
#include "lua/LuaObject.h"
namespace SceneGraph {

2
src/scenegraph/ModelSkin.h
View File

@ -6,8 +6,8 @@
#include "Color.h"
#include "Json.h"
#include "LuaWrappable.h"
#include "Random.h"
#include "lua/LuaWrappable.h"
#include <string>
namespace Serializer {

2
src/ship/PlayerShipController.cpp
View File

@ -7,13 +7,13 @@
#include "GameConfig.h"
#include "GameSaveError.h"
#include "KeyBindings.h"
#include "LuaObject.h"
#include "OS.h"
#include "Pi.h"
#include "Player.h"
#include "Ship.h"
#include "Space.h"
#include "WorldView.h"
#include "lua/LuaObject.h"
#include <algorithm>

2
src/sound/SoundMusic.cpp
View File

@ -2,9 +2,9 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "SoundMusic.h"
#include "LuaEvent.h"
#include "Pi.h"
#include "libs.h" //for clamp
#include "lua/LuaEvent.h"
#include <map>
namespace Sound {

2
src/ui/CellSpec.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "CellSpec.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

4
src/ui/Context.h
View File

@ -41,8 +41,8 @@
#include "MousePointer.h"
#include "Lua.h"
#include "LuaTable.h"
#include "lua/LuaTable.h"
#include "ui/Lua.h"
#include <stack>

2
src/ui/Event.cpp
View File

@ -3,7 +3,7 @@
#include "Event.h"
#include "EnumStrings.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/Lua.h
View File

@ -5,7 +5,7 @@
#define UI_LUA_H
#include "Context.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {
namespace Lua {

2
src/ui/LuaAlign.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Align.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaAnimation.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Animation.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaBackground.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Background.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaBox.cpp
View File

@ -3,7 +3,7 @@
#include "Box.h"
#include "Lua.h"
#include "LuaConstants.h"
#include "lua/LuaConstants.h"
namespace UI {

2
src/ui/LuaButton.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Button.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaCheckBox.cpp
View File

@ -2,8 +2,8 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "CheckBox.h"
#include "LuaObject.h"
#include "LuaSignal.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaColorBackground.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "ColorBackground.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaContainer.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Container.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

4
src/ui/LuaContext.cpp
View File

@ -2,9 +2,9 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Context.h"
#include "LuaConstants.h"
#include "LuaObject.h"
#include "LuaSignal.h"
#include "lua/LuaConstants.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaDropDown.cpp
View File

@ -2,8 +2,8 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "DropDown.h"
#include "LuaObject.h"
#include "LuaSignal.h"
#include "lua/LuaObject.h"
namespace UI {
class LuaDropDown {

2
src/ui/LuaExpand.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Expand.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaGauge.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Gauge.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaGradient.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Gradient.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaIcon.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Icon.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaImage.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Image.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaLabel.cpp
View File

@ -2,7 +2,7 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Label.h"
#include "LuaObject.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaList.cpp
View File

@ -2,8 +2,8 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "List.h"
#include "LuaObject.h"
#include "LuaSignal.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaMargin.cpp
View File

@ -1,8 +1,8 @@
// Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "LuaObject.h"
#include "Margin.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaMultiLineText.cpp
View File

@ -1,8 +1,8 @@
// Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "LuaObject.h"
#include "MultiLineText.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaNumberLabel.cpp
View File

@ -1,8 +1,8 @@
// Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "LuaObject.h"
#include "NumberLabel.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaSignal.h
View File

@ -5,8 +5,8 @@
#define UI_LUASIGNAL_H
#include "Event.h"
#include "LuaPushPull.h"
#include "Widget.h"
#include "lua/LuaPushPull.h"
inline void pi_lua_generic_push(lua_State *l, const UI::Event &value) { value.ToLuaTable(l); }

2
src/ui/LuaSlider.cpp
View File

@ -1,9 +1,9 @@
// Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "LuaObject.h"
#include "LuaSignal.h"
#include "Slider.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaSmallButton.cpp
View File

@ -1,8 +1,8 @@
// Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "LuaObject.h"
#include "SmallButton.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/LuaTable.cpp
View File

@ -2,9 +2,9 @@
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "Lua.h"
#include "LuaConstants.h"
#include "LuaSignal.h"
#include "Table.h"
#include "lua/LuaConstants.h"
namespace UI {

4
src/ui/LuaTextEntry.cpp
View File

@ -1,10 +1,10 @@
// Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "LuaObject.h"
#include "LuaPushPull.h"
#include "LuaSignal.h"
#include "TextEntry.h"
#include "lua/LuaObject.h"
#include "lua/LuaPushPull.h"
namespace UI {

4
src/ui/LuaWidget.cpp
View File

@ -1,10 +1,10 @@
// Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details
// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
#include "LuaConstants.h"
#include "LuaObject.h"
#include "LuaSignal.h"
#include "Widget.h"
#include "lua/LuaConstants.h"
#include "lua/LuaObject.h"
namespace UI {

2
src/ui/NumberLabel.h
View File

@ -5,7 +5,7 @@
#define UI_NUMBERLABEL_H
#include "Label.h"
#include "PropertyMap.h"
#include "lua/PropertyMap.h"
namespace UI {

2
src/ui/Widget.h
View File

@ -6,10 +6,10 @@
#include "Event.h"
#include "Point.h"
#include "PropertiedObject.h"
#include "RefCounted.h"
#include "WidgetSet.h"
#include "libs.h"
#include "lua/PropertiedObject.h"
#include <climits>
#include <set>