Skip to content

Commit

Permalink
Move files from Game into EgoLib
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelheilmann committed Sep 23, 2017
1 parent d615a20 commit 146b272
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion game/src/game/GameStates/PlayingState.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "egolib/Graphics/Viewport.hpp"

//For cheats
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"
#include "game/Module/Module.hpp"

PlayingState::PlayingState() :
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/Graphics/Camera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "game/game.h" // TODO: remove only needed for mesh

#include "game/mesh.h"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"

const Ego::Math::Degrees Camera::DEFAULT_FOV = Ego::Math::Degrees(60.0f);

Expand Down
2 changes: 1 addition & 1 deletion game/src/game/Graphics/CameraSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "game/Logic/Player.hpp"
#include "game/Core/GameEngine.hpp"

#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"

CameraSystem::CameraSystem() :
_initialized(false),
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/Graphics/ParticleGraphics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "game/Graphics/Camera.hpp"
#include "game/lighting.h"
#include "game/graphic.h"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"

namespace Ego {
namespace Graphics {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "game/Graphics/RenderPasses/EntityShadowsRenderPass.hpp"
#include "game/Module/Module.hpp"
#include "game/graphic.h"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"

namespace Ego {
namespace Graphics {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "game/Module/Module.hpp"
#include "game/graphic_mad.h"
#include "game/graphic_prt.h"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"

namespace Ego {
namespace Graphics {
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/Module/Module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "game/game.h"
#include "game/graphic.h"
#include "game/Logic/Player.hpp"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"
#include "game/CharacterMatrix.h"

#include "game/Physics/CollisionSystem.hpp"
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/Module/Passage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "game/Module/Passage.hpp"
#include "game/game.h"
#include "game/mesh.h"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"

const ObjectRef Passage::SHOP_NOOWNER = ObjectRef::Invalid;

Expand Down
2 changes: 1 addition & 1 deletion game/src/game/Physics/ObjectPhysics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/// @brief Code for handling object physics
/// @author Johan Jansen aka Zefz
#include "ObjectPhysics.hpp"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"
#include "game/Core/GameEngine.hpp"
#include "game/Shop.hpp"
#include "game/CharacterMatrix.h"
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/graphic.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#include "game/Graphics/DefaultMd2ModelRenderer.hpp"
#include "game/Graphics/BillboardSystem.hpp"
#include "game/Graphics/CameraSystem.hpp"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"
#include "game/Graphics/TextureAtlasManager.hpp"
#include "game/Module/Passage.hpp"
#include "game/GUI/Material.hpp"
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/graphic_mad.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "game/lighting.h"
#include "game/graphic.h"
#include "game/Graphics/CameraSystem.hpp"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"
#include "game/Graphics/DefaultMd2ModelRenderer.hpp"

struct Md2VertexBuffer {
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/graphic_prt.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "game/game.h"
#include "game/lighting.h"
#include "game/Graphics/CameraSystem.hpp"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"
#include "game/CharacterMatrix.h"

float ParticleGraphicsRenderer::CALCULATE_PRT_U0(const Ego::Texture& texture, int CNT) {
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/link.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "game/Logic/Player.hpp"
#include "game/egoboo.h"
#include "game/Module/Module.hpp"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"

//--------------------------------------------------------------------------------------------
//--------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/physics.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "game/physics.h"
#include "game/game.h"
#include "game/mesh.h"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"
#include "egolib/Float.hpp"

//--------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/script_functions.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "game/Graphics/BillboardSystem.hpp"
#include "game/script_implementation.h"
#include "game/Inventory.hpp"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"
#include "game/mesh.h"
#include "game/Core/GameEngine.hpp"
#include "game/Module/Passage.hpp"
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/script_implementation.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "egolib/egolib.h"

#include "game/game.h"
#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"
#include "game/mesh.h"
#include "game/Module/Module.hpp"
#include "game/Module/Passage.hpp"
Expand Down
2 changes: 1 addition & 1 deletion game/src/game/script_variables.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "game/script_variables.h"

#include "game/Entities/_Include.hpp"
#include "egolib/Entities/_Include.hpp"
#include "egolib/Script/script.h"
#include "game/game.h"
#include "game/Graphics/CameraSystem.hpp"
Expand Down

0 comments on commit 146b272

Please sign in to comment.