Resolve cyclic dependencies problems

Egoboo and Egolib had cyclic includes. These were removed by moving all source code (except of a sole main function) from Egoboo into Egolib.
egoboo · Jan 27, 2018 · 41fe0b0 · 41fe0b0
1 parent 350bf49
commit 41fe0b0
Show file tree

Hide file tree

Showing 242 changed files with 815 additions and 861 deletions.
diff --git a/egolib/src/egolib/AI/AStar.cpp b/egolib/src/egolib/AI/AStar.cpp
@@ -23,9 +23,9 @@
 
 #include "egolib/AI/AStar.hpp"
 
-#include "game/renderer_3d.h" // for point debugging
+#include "egolib/game/renderer_3d.h" // for point debugging
 #include "egolib/Script/script.h" // for waypoint list control
-#include "game/mesh.h"
+#include "egolib/game/mesh.h"
 
 AStar::AStar() : 
  final_node(nullptr), 

diff --git a/egolib/src/egolib/AI/LineOfSight.cpp b/egolib/src/egolib/AI/LineOfSight.cpp
@@ -19,7 +19,7 @@
 
 #include "egolib/AI/LineOfSight.hpp"
 #include "egolib/Mesh/Info.hpp"
-#include "game/mesh.h"
+#include "egolib/game/mesh.h"
 
 bool line_of_sight_info_t::blocked(line_of_sight_info_t& self, std::shared_ptr<const ego_mesh_t> mesh) {
  bool mesh_hit = with_mesh(self, mesh);

diff --git a/egolib/src/egolib/Audio/AudioSystem.cpp b/egolib/src/egolib/Audio/AudioSystem.cpp
@@ -20,9 +20,9 @@
 
 #include "egolib/Audio/AudioSystem.hpp"
 
-#include "game/Graphics/CameraSystem.hpp"
-#include "game/game.h"
-#include "game/Module/Module.hpp"
+#include "egolib/game/Graphics/CameraSystem.hpp"
+#include "egolib/game/game.h"
+#include "egolib/game/Module/Module.hpp"
 #include "egolib/Entities/_Include.hpp"
 
 AudioSystem *AudioSystemCreateFunctor::operator()() const

diff --git a/egolib/src/egolib/Entities/Common.hpp b/egolib/src/egolib/Entities/Common.hpp
@@ -18,8 +18,8 @@
 //********************************************************************************************
 #pragma once
 
-#include "game/mesh.h"
-#include "game/physics.h"
+#include "egolib/game/mesh.h"
+#include "egolib/game/physics.h"
 
 /**
  * @brief

diff --git a/egolib/src/egolib/Entities/Enchant.cpp b/egolib/src/egolib/Entities/Enchant.cpp
@@ -17,13 +17,13 @@
 //*
 //********************************************************************************************
 
-/// @file  game/Entities/Enchant.cpp
+/// @file egolib/game/Entities/Enchant.cpp
 /// @brief Enchantment entities.
 
 #define GAME_ENTITIES_PRIVATE 1
 #include "egolib/Entities/Enchant.hpp"
 #include "egolib/Graphics/ModelDescriptor.hpp"
-#include "game/Core/GameEngine.hpp"
+#include "egolib/game/Core/GameEngine.hpp"
 
 namespace Ego
 {

diff --git a/egolib/src/egolib/Entities/Enchant.hpp b/egolib/src/egolib/Entities/Enchant.hpp
@@ -17,7 +17,7 @@
 //*
 //********************************************************************************************
 
-/// @file  game/Entities/Enchant.hpp
+/// @file egolib/game/Entities/Enchant.hpp
 /// @brief Enchantment entities.
 
 #pragma once

diff --git a/egolib/src/egolib/Entities/Object.cpp b/egolib/src/egolib/Entities/Object.cpp
@@ -17,7 +17,7 @@
 //*
 //********************************************************************************************
 
-/// @file game/Entities/Object.hpp
+/// @file egolib/game/Entities/Object.hpp
 /// @details An object representing instances of in-game egoboo objects (Object)
 /// @author Johan Jansen
 
@@ -28,19 +28,19 @@
 #include "egolib/Entities/ObjectHandler.hpp"
 #include "egolib/Entities/ParticleHandler.hpp"
 #include "egolib/Entities/Enchant.hpp"
-#include "game/Logic/Player.hpp"
-#include "game/game.h"
+#include "egolib/game/Logic/Player.hpp"
+#include "egolib/game/game.h"
 #include "egolib/Graphics/ModelDescriptor.hpp"
-#include "game/script_implementation.h" //for stealth
-#include "game/CharacterMatrix.h"
-#include "game/Graphics/CameraSystem.hpp"
-#include "game/Graphics/TileList.hpp"
-#include "game/Graphics/Billboard.hpp"
+#include "egolib/game/script_implementation.h" //for stealth
+#include "egolib/game/CharacterMatrix.h"
+#include "egolib/game/Graphics/CameraSystem.hpp"
+#include "egolib/game/Graphics/TileList.hpp"
+#include "egolib/game/Graphics/Billboard.hpp"
 
 //For the minimap
-#include "game/Core/GameEngine.hpp"
-#include "game/GameStates/PlayingState.hpp"
-#include "game/GUI/MiniMap.hpp"
+#include "egolib/game/Core/GameEngine.hpp"
+#include "egolib/game/GameStates/PlayingState.hpp"
+#include "egolib/game/GUI/MiniMap.hpp"
 
 //Declare class static constants
 const std::shared_ptr<Object> Object::INVALID_OBJECT = nullptr;

diff --git a/egolib/src/egolib/Entities/Object.hpp b/egolib/src/egolib/Entities/Object.hpp
@@ -17,7 +17,7 @@
 //*
 //********************************************************************************************
 
-/// @file game/Entities/Object.hpp
+/// @file egolib/game/Entities/Object.hpp
 /// @details An object representing instances of in-game egoboo objects (Object)
 /// @author Johan Jansen
 
@@ -30,16 +30,16 @@
 #include "egolib/Logic/Team.hpp"
 #include "egolib/InputControl/InputDevice.hpp"
 
-#include "game/egoboo.h"
-#include "game/Module/Module.hpp"
-#include "game/physics.h"
-#include "game/graphic_mad.h"
+#include "egolib/game/egoboo.h"
+#include "egolib/game/Module/Module.hpp"
+#include "egolib/game/physics.h"
+#include "egolib/game/graphic_mad.h"
 #include "egolib/Entities/Common.hpp"
-#include "game/Graphics/BillboardSystem.hpp"
-#include "game/Inventory.hpp"
-#include "game/Physics/Collidable.hpp"
-#include "game/Physics/ObjectPhysics.hpp"
-#include "game/Graphics/ObjectGraphics.hpp"
+#include "egolib/game/Graphics/BillboardSystem.hpp"
+#include "egolib/game/Inventory.hpp"
+#include "egolib/game/Physics/Collidable.hpp"
+#include "egolib/game/Physics/ObjectPhysics.hpp"
+#include "egolib/game/Graphics/ObjectGraphics.hpp"
 
 //Forward declarations
 namespace Ego { class Enchantment; }

diff --git a/egolib/src/egolib/Entities/ObjectHandler.hpp b/egolib/src/egolib/Entities/ObjectHandler.hpp
@@ -17,7 +17,7 @@
 //*
 //********************************************************************************************
 
-/// @file game/Entities/ObjectHandler.hpp
+/// @file egolib/game/Entities/ObjectHandler.hpp
 /// @details Memory and access managment for instances of in-game egoboo objects (Object)
 /// @author Johan Jansen
 
@@ -26,7 +26,7 @@
 #error(do not include directly, include `game/Entities/_Include.hpp` instead)
 #endif
 
-#include "game/egoboo.h"
+#include "egolib/game/egoboo.h"
 #include "egolib/Core/QuadTree.hpp"
 
 //Forward declarations

diff --git a/egolib/src/egolib/Entities/Particle.cpp b/egolib/src/egolib/Entities/Particle.cpp
@@ -17,19 +17,19 @@
 //*
 //********************************************************************************************
 
-/// @file game/Entities/Particle.cpp
+/// @file egolib/Entities/Particle.cpp
 /// @brief Particle entities.
 /// @author Johan Jansen aka Zefz
 
 #define GAME_ENTITIES_PRIVATE 1
 
-#include "Particle.hpp"
-#include "game/Core/GameEngine.hpp"
-#include "game/Module/Module.hpp"
+#include "egolib/Entities/Particle.hpp"
+#include "egolib/game/Core/GameEngine.hpp"
+#include "egolib/game/Module/Module.hpp"
 #include "egolib/Entities/_Include.hpp"
-#include "game/game.h"
-#include "game/Physics/PhysicalConstants.hpp"
-#include "game/CharacterMatrix.h"
+#include "egolib/game/game.h"
+#include "egolib/game/Physics/PhysicalConstants.hpp"
+#include "egolib/game/CharacterMatrix.h"
 
 namespace Ego
 {

diff --git a/egolib/src/egolib/Entities/Particle.hpp b/egolib/src/egolib/Entities/Particle.hpp
@@ -26,13 +26,13 @@
 #error(do not include directly, include `game/Entities/_Include.hpp` instead)
 #endif
 
-#include "game/egoboo.h"
-#include "game/graphic_prt.h"
+#include "egolib/game/egoboo.h"
+#include "egolib/game/graphic_prt.h"
 #include "egolib/Entities/Common.hpp"
-#include "game/Graphics/ParticleGraphics.hpp"
+#include "egolib/game/Graphics/ParticleGraphics.hpp"
 #include "egolib/Graphics/Animation2D.hpp"
-#include "game/Physics/Collidable.hpp"
-#include "game/Physics/ParticlePhysics.hpp"
+#include "egolib/game/Physics/Collidable.hpp"
+#include "egolib/game/Physics/ParticlePhysics.hpp"
 
 namespace Ego
 {

diff --git a/egolib/src/egolib/Entities/ParticleHandler.cpp b/egolib/src/egolib/Entities/ParticleHandler.cpp
@@ -17,7 +17,7 @@
 //*
 //********************************************************************************************
 
-/// @file  game/Entities/ParticleHandler.cpp
+/// @file egolib/game/Entities/ParticleHandler.cpp
 /// @brief Handler of particle entities.
 
 #define GAME_ENTITIES_PRIVATE 1

diff --git a/egolib/src/egolib/Entities/ParticleHandler.hpp b/egolib/src/egolib/Entities/ParticleHandler.hpp
@@ -17,15 +17,15 @@
 //*
 //********************************************************************************************
 
-/// @file  game/Entities/ParticleHandler.hpp
+/// @file egolib/game/Entities/ParticleHandler.hpp
 /// @brief Handler of particle entities.
 
 #pragma once
 #if !defined(GAME_ENTITIES_PRIVATE) || GAME_ENTITIES_PRIVATE != 1
 #error(do not include directly, include `game/Entities/_Include.hpp` instead)
 #endif
 
-#include "game/egoboo.h"
+#include "egolib/game/egoboo.h"
 #include "egolib/Entities/Particle.hpp"
 
 class ParticleHandler : public id::singleton<ParticleHandler>

diff --git a/egolib/src/egolib/Extensions/ogl_extensions.h b/egolib/src/egolib/Extensions/ogl_extensions.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "egolib/platform.h"
+#include <GL/glew.h>
 
 //--------------------------------------------------------------------------------------------
 

diff --git a/egolib/src/egolib/Graphics/SDL/GraphicsContext.cpp b/egolib/src/egolib/Graphics/SDL/GraphicsContext.cpp
@@ -2,6 +2,7 @@
 
 #include "egolib/Graphics/SDL/GraphicsWindow.hpp"
 #include "egolib/egoboo_setup.h"
+#include <GL/glew.h>
 
 namespace Ego {
 namespace SDL {

diff --git a/egolib/src/egolib/Logic/Team.cpp b/egolib/src/egolib/Logic/Team.cpp
@@ -25,7 +25,7 @@
 
 #include "Team.hpp"
 #include "egolib/Entities/_Include.hpp"
-#include "game/Module/Module.hpp"
+#include "egolib/game/Module/Module.hpp"
 
 Team::Team(const TEAM_REF teamID) :
  _teamID(teamID),

diff --git a/egolib/src/egolib/Logic/Team.hpp b/egolib/src/egolib/Logic/Team.hpp
@@ -25,7 +25,7 @@
 #pragma once
 
 #include "egolib/platform.h"
-#include "game/egoboo.h"
+#include "egolib/game/egoboo.h"
 
 /// The description of a single team
 class Team : public id::equal_to_expr<Team>

diff --git a/egolib/src/egolib/Profiles/ObjectProfile.cpp b/egolib/src/egolib/Profiles/ObjectProfile.cpp
@@ -24,7 +24,7 @@
 
 #define EGOLIB_PROFILES_PRIVATE 1
 #include "egolib/Profiles/ObjectProfile.hpp"
-#include "game/Core/GameEngine.hpp"
+#include "egolib/game/Core/GameEngine.hpp"
 #include "egolib/Entities/_Include.hpp"
 #include "egolib/Graphics/ModelDescriptor.hpp"
 #include "egolib/Audio/AudioSystem.hpp"

diff --git a/egolib/src/egolib/Profiles/ProfileSystem.cpp b/egolib/src/egolib/Profiles/ProfileSystem.cpp
@@ -26,10 +26,10 @@
 #include "egolib/Profiles/ProfileSystem.hpp"
 #include "egolib/Profiles/ObjectProfile.hpp"
 #include "egolib/Profiles/ModuleProfile.hpp"
-#include "game/GameStates/LoadPlayerElement.hpp"
+#include "egolib/game/GameStates/LoadPlayerElement.hpp"
 #include "egolib/Entities/_Include.hpp"
-#include "game/game.h"
-#include "game/script_compile.h"
+#include "egolib/game/game.h"
+#include "egolib/game/script_compile.h"
 
 AbstractProfileSystem<EnchantProfile, EnchantProfileRef> EnchantProfileSystem("enchant", "/debug/enchant_profile_usage.txt");
 AbstractProfileSystem<ParticleProfile, ParticleProfileRef> ParticleProfileSystem("particle", "/debug/particle_profile_usage.txt");

diff --git a/egolib/src/egolib/Renderer/OpenGL/DefaultTexture.hpp b/egolib/src/egolib/Renderer/OpenGL/DefaultTexture.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "egolib/Image/SDL_Image_Extensions.h"
+#include <GL/glew.h>
 
 namespace Ego { namespace OpenGL {
 

diff --git a/egolib/src/egolib/Renderer/OpenGL/OpenGL.inl b/egolib/src/egolib/Renderer/OpenGL/OpenGL.inl
diff --git a/egolib/src/egolib/Renderer/OpenGL/Renderer.cpp b/egolib/src/egolib/Renderer/OpenGL/Renderer.cpp
@@ -28,35 +28,6 @@
 #include "egolib/Renderer/OpenGL/RendererInfo.hpp"
 #include "egolib/Renderer/OpenGL/DefaultTexture.hpp"
 
-// The following code ensures that for each OpenGL function variable static PF...PROC gl... = NULL; is declared/defined.
-#define GLPROC(variable,type,name) \
- static type variable = NULL;
-#include "egolib/Renderer/OpenGL/OpenGL.inl"
-#undef GLPROC
-
-namespace Ego {
-namespace OpenGL {
-
-// The following function dynamically links the OpenGL function.
-static bool link() {
- static bool linked = false;
- if (!linked) {
-#define GLPROC(variable,type,name) \
- variable = (type)SDL_GL_GetProcAddress(name); \
- if (!variable) \
- { \
- return false; \
- }
-#include "egolib/Renderer/OpenGL/OpenGL.inl"
-#undef GLPROC
- }
- linked = true;
- return true;
-}
-
-} // namespace OpenGL
-} // namespace Ego
-
 namespace Ego {
 namespace OpenGL {
 
@@ -65,7 +36,6 @@ Renderer::Renderer(const std::shared_ptr<RendererInfo>& info) :
 {
  try
  {
- OpenGL::link();
  m_defaultTexture1d = std::make_unique<DefaultTexture>(m_info, "<default texture 1D>", id::texture_type::_1D);
  try
  {

diff --git a/egolib/src/egolib/Renderer/OpenGL/Renderer.hpp b/egolib/src/egolib/Renderer/OpenGL/Renderer.hpp
@@ -32,6 +32,7 @@
 #include "egolib/Renderer/OpenGL/TextureUnit.hpp"
 #include "egolib/platform.h"
 #include "egolib/Math/_Include.hpp"
+#include <GL/glew.h>
 
 namespace Ego {
 namespace OpenGL {

diff --git a/egolib/src/egolib/Renderer/OpenGL/Utilities.hpp b/egolib/src/egolib/Renderer/OpenGL/Utilities.hpp
@@ -2,21 +2,7 @@
 
 #include "egolib/integrations/idlib.hpp"
 #include "egolib/Graphics/PixelFormat.hpp"
-
-#if defined (ID_WINDOWS) && 1 == ID_WINDOWS
-extern "C" {
-#if !defined(WIN32_LEAN_AND_MEAN)
- #define WIN32_LEAN_AND_MEAN
-#endif
-#if !defined (NOMINMAX)
- #define NOMINMAX
-#endif
-#include <Windows.h>
-}
-#endif
-extern "C" {
-#include <gl/GL.h>
-}
+#include <GL/glew.h>
 
 namespace Ego {
 namespace OpenGL {