Update for latest version of Idlib

egoboo · Nov 21, 2017 · e5b58b8 · e5b58b8
1 parent 48327cf
commit e5b58b8
Show file tree

Hide file tree

Showing 107 changed files with 594 additions and 3,764 deletions.
diff --git a/cartman/src/cartman/cartman_gfx.h b/cartman/src/cartman/cartman_gfx.h
@@ -21,7 +21,6 @@
 
 #include "cartman/cartman_typedef.h"
 #include "cartman/cartman_math.h"
-#include "egolib/Core/Singleton.hpp"
 
 //--------------------------------------------------------------------------------------------
 
@@ -77,7 +76,7 @@ inline uint32_t make_rgba(const std::shared_ptr<const SDL_Surface>& surface, con
 
 extern camera_t cam;
 
-struct Resources : Ego::Core::Singleton<Resources> {
+struct Resources : id::singleton<Resources> {
  std::shared_ptr<SDL_Surface> bmphitemap; // Heightmap image
  std::shared_ptr<Ego::Texture> tx_point; // Vertex image
  std::shared_ptr<Ego::Texture> tx_pointon; // Vertex image ( select_vertsed )

diff --git a/cartman/src/cartman/cartman_gui.h b/cartman/src/cartman/cartman_gui.h
@@ -121,10 +121,10 @@ struct Window {
 
 namespace Cartman { namespace Gui {
 
-struct Manager : public Ego::Core::Singleton<Manager> {
+struct Manager : public id::singleton<Manager> {
 protected:
- friend struct Ego::Core::CreateFunctor<Manager>;
- friend struct Ego::Core::DestroyFunctor<Manager>;
+ friend id::default_new_functor<Manager>;
+ friend id::default_delete_functor<Manager>;
  Manager();
  ~Manager();
 public:

diff --git a/cartman/src/cartman/cartman_input.h b/cartman/src/cartman/cartman_input.h
@@ -135,14 +135,14 @@ namespace Cartman
 
 namespace Cartman
 {
- struct Input : Ego::Core::Singleton<Input>
+ struct Input : id::singleton<Input>
  {
  public:
  Mouse _mouse;
  Keyboard _keyboard;
  private:
- friend Ego::Core::Singleton<Input>::CreateFunctorType;
- friend Ego::Core::Singleton<Input>::DestroyFunctorType;
+ friend id::default_new_functor<Input>;
+ friend id::default_delete_functor<Input>;
  Input();
  virtual ~Input();
  public:

diff --git a/egolib/egolib-tests.vcxproj b/egolib/egolib-tests.vcxproj
@@ -41,7 +41,6 @@
  <ClCompile Include="tests\egolib\Tests\math\enclose.cpp" />
  <ClCompile Include="tests\egolib\Tests\math\is_intersecting.cpp" />
  <ClCompile Include="tests\egolib\Tests\math\matrix_4f_4f.cpp" />
- <ClCompile Include="tests\egolib\Tests\Singleton.cpp" />
  <ClCompile Include="tests\egolib\Tests\QuadTree.cpp" />
  <ClCompile Include="tests\egolib\Tests\StringUtilities.cpp" />
  <ClCompile Include="tests\egolib\Tests\text\document-erase.cpp" />

diff --git a/egolib/egolib-tests.vcxproj.filters b/egolib/egolib-tests.vcxproj.filters
@@ -29,9 +29,6 @@
  <ClCompile Include="tests\egolib\Tests\StringUtilities.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="tests\egolib\Tests\Singleton.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
  <ClCompile Include="tests\egolib\Tests\QuadTree.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>

diff --git a/egolib/egolib.vcxproj b/egolib/egolib.vcxproj
@@ -681,26 +681,22 @@
  <ClInclude Include="src\egolib\Events\_Include.hpp" />
  <ClInclude Include="src\egolib\Events\MouseMovedEventArgs.hpp" />
  <ClInclude Include="src\egolib\Math\Functors\is_intersecting_axis_aligned_box_axis_aligned_cube.hpp" />
- <ClInclude Include="src\egolib\Math\Discrete.hpp" />
  <ClInclude Include="src\egolib\App.hpp" />
  <ClInclude Include="src\egolib\Graphics\GraphicsWindow.hpp" />
  <ClInclude Include="src\egolib\TrigonometricTable.hpp" />
- <ClInclude Include="src\egolib\Math\Ray.hpp" />
  <ClInclude Include="src\egolib\Graphics\IndexBuffer.hpp" />
  <ClInclude Include="src\egolib\Graphics\IndexDescriptor.hpp" />
  <ClInclude Include="src\egolib\Graphics\VertexDescriptor.hpp" />
  <ClInclude Include="src\egolib\Math\VectorProjection.hpp" />
  <ClInclude Include="src\egolib\Math\VectorRejection.hpp" />
  <ClInclude Include="src\egolib\Profiles\GenderProfile.hpp" />
- <ClInclude Include="src\egolib\Math\Line.hpp" />
  <ClInclude Include="src\egolib\AI\AStar.hpp" />
  <ClInclude Include="src\egolib\Graphics\Buffer.hpp" />
  <ClInclude Include="src\egolib\Graphics\VertexElementDescriptor.hpp" />
  <ClInclude Include="src\egolib\Graphics\GraphicsSystem.hpp" />
  <ClInclude Include="src\egolib\Renderer\OpenGL\StencilBuffer.hpp" />
  <ClInclude Include="src\egolib\Renderer\RendererInfo.hpp" />
  <ClInclude Include="src\egolib\Graphics\ColourDepth.hpp" />
- <ClInclude Include="src\egolib\Core\Singleton.hpp" />
  <ClInclude Include="src\egolib\Logic\TreasureTables.hpp" />
  <ClInclude Include="src\egolib\Logic\MissileTreatment.hpp" />
  <ClInclude Include="src\egolib\Renderer\TextureSampler.hpp" />
@@ -730,24 +726,17 @@
  <ClInclude Include="src\egolib\Graphics\Camera.hpp" />
  <ClInclude Include="src\egolib\Math\Transform.hpp" />
  <ClInclude Include="src\egolib\Math\Matrix.hpp" />
- <ClInclude Include="src\egolib\Math\OrderedField.hpp" />
  <ClInclude Include="src\egolib\Logic\Attribute.hpp" />
  <ClInclude Include="src\egolib\Logic\Perk.hpp" />
  <ClInclude Include="src\egolib\Logic\PerkHandler.hpp" />
  <ClInclude Include="src\egolib\Renderer\DeferredTexture.hpp" />
- <ClInclude Include="src\egolib\Math\OrderedRing.hpp" />
- <ClInclude Include="src\egolib\Math\OrderedIntegralDomain.hpp" />
  <ClInclude Include="src\egolib\Renderer\RasterizationMode.hpp" />
  <ClInclude Include="src\egolib\Core\QuadTree.hpp" />
  <ClInclude Include="src\egolib\Time\LocalTime.hpp" />
  <ClInclude Include="src\egolib\Time\SlidingWindow.hpp" />
  <ClInclude Include="src\egolib\Time\Stopwatch.hpp" />
- <ClInclude Include="src\egolib\Math\VectorSpace.hpp" />
  <ClInclude Include="src\egolib\Logic\Team.hpp" />
- <ClInclude Include="src\egolib\Math\EuclideanSpace.hpp" />
- <ClInclude Include="src\egolib\Math\Scalar.hpp" />
  <ClInclude Include="src\egolib\Math\Standard.hpp" />
- <ClInclude Include="src\egolib\Math\AxisAlignedBox.hpp" />
  <ClInclude Include="src\egolib\VFS\VfsPath.hpp" />
  <ClInclude Include="src\egolib\AI\WaypointList.h" />
  <ClInclude Include="src\egolib\Graphics\ModelDescriptor.hpp" />
@@ -821,9 +810,6 @@
  <ClInclude Include="src\egolib\Renderer\TextureFilter.hpp" />
  <ClInclude Include="src\egolib\Renderer\OpenGL\Renderer.hpp" />
  <ClInclude Include="src\egolib\Renderer\Renderer.hpp" />
- <ClInclude Include="src\egolib\math\AxisAlignedCube.hpp" />
- <ClInclude Include="src\egolib\math\Sphere.hpp" />
- <ClInclude Include="src\egolib\math\Plane.hpp" />
  <ClInclude Include="src\egolib\math\Random.hpp" />
  <ClInclude Include="src\egolib\bbox.h" />
  <ClInclude Include="src\egolib\Clock.hpp" />

diff --git a/egolib/egolib.vcxproj.filters b/egolib/egolib.vcxproj.filters
@@ -704,9 +704,6 @@
  <ClInclude Include="src\egolib\Renderer\OpenGL\Renderer.hpp">
  <Filter>Header Files\Renderer\OpenGL</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\math\Plane.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Renderer\TextureFilter.hpp">
  <Filter>Header Files\Renderer</Filter>
  </ClInclude>
@@ -911,18 +908,12 @@
  <ClInclude Include="src\egolib\AI\WaypointList.h">
  <Filter>Header Files\AI</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Math\Scalar.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Math\Standard.hpp">
  <Filter>Header Files\Math</Filter>
  </ClInclude>
  <ClInclude Include="src\egolib\Logic\Team.hpp">
  <Filter>Header Files\Logic</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Math\VectorSpace.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Math\Cone3.hpp">
  <Filter>Header Files\Math</Filter>
  </ClInclude>
@@ -953,15 +944,6 @@
  <ClInclude Include="src\egolib\Logic\PerkHandler.hpp">
  <Filter>Header Files\Logic</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Math\OrderedIntegralDomain.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
- <ClInclude Include="src\egolib\Math\OrderedRing.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
- <ClInclude Include="src\egolib\Math\OrderedField.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Math\Matrix.hpp">
  <Filter>Header Files\Math</Filter>
  </ClInclude>
@@ -1055,9 +1037,6 @@
  <ClInclude Include="src\egolib\Logic\TreasureTables.hpp">
  <Filter>Header Files\Logic</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Core\Singleton.hpp">
- <Filter>Header Files\Core</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Renderer\RendererInfo.hpp">
  <Filter>Header Files\Renderer</Filter>
  </ClInclude>
@@ -1076,9 +1055,6 @@
  <ClInclude Include="src\egolib\AI\AStar.hpp">
  <Filter>Header Files\AI</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Math\Line.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Graphics\ColourDepth.hpp">
  <Filter>Header Files\Graphics</Filter>
  </ClInclude>
@@ -1091,9 +1067,6 @@
  <ClInclude Include="src\egolib\Math\VectorRejection.hpp">
  <Filter>Header Files\Math</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Math\EuclideanSpace.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Graphics\VertexDescriptor.hpp">
  <Filter>Header Files\Graphics</Filter>
  </ClInclude>
@@ -1103,30 +1076,15 @@
  <ClInclude Include="src\egolib\Graphics\IndexBuffer.hpp">
  <Filter>Header Files\Graphics</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Math\Ray.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\TrigonometricTable.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\math\Sphere.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Graphics\GraphicsWindow.hpp">
  <Filter>Header Files\Graphics</Filter>
  </ClInclude>
  <ClInclude Include="src\egolib\App.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Math\Discrete.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
- <ClInclude Include="src\egolib\Math\AxisAlignedBox.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
- <ClInclude Include="src\egolib\math\AxisAlignedCube.hpp">
- <Filter>Header Files\Math</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Events\MouseMovedEventArgs.hpp">
  <Filter>Header Files\Events</Filter>
  </ClInclude>

diff --git a/egolib/src/egolib/App.hpp b/egolib/src/egolib/App.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "egolib/Core/Singleton.hpp"
+#include "egolib/platform.h"
 
 namespace Ego {
 
@@ -21,7 +21,7 @@ struct AppImpl final
 /// Derive from this class for your own game, editor, tool, ...
 /// The App class has lots of dependencies and uses the PIMPL pattern to avoid including headers into this header file.
 template <typename T>
-struct App : public Ego::Core::Singleton<T>
+struct App : public id::singleton<T>
 {
 private:
  /// @brief The PIMPL pointer.

diff --git a/egolib/src/egolib/Audio/AudioSystem.cpp b/egolib/src/egolib/Audio/AudioSystem.cpp
@@ -25,6 +25,12 @@
 #include "game/Module/Module.hpp"
 #include "egolib/Entities/_Include.hpp"
 
+AudioSystem *AudioSystemCreateFunctor::operator()() const
+{ return new AudioSystem(); }
+
+void AudioSystemDestroyFunctor::operator()(AudioSystem *p) const
+{ delete p; }
+
 //Compatability fix for older versions of SDL
 #if SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) < SDL_VERSIONNUM(1, 2, 12)
 Mix_Music *Mix_LoadMUSType_RW(SDL_RWops *rw, Mix_MusicType, int freesrc) {

diff --git a/egolib/src/egolib/Audio/AudioSystem.hpp b/egolib/src/egolib/Audio/AudioSystem.hpp
@@ -24,7 +24,6 @@
 #include <SDL_mixer.h>
 #include "egolib/egoboo_setup.h"
 #include "egolib/Math/_Include.hpp"
-#include "egolib/Core/Singleton.hpp"
 
 typedef int MusicID;
 typedef int SoundID;
@@ -100,7 +99,19 @@ enum GlobalSound : uint8_t
  GSND_COUNT
 };
 
-class AudioSystem : public Ego::Core::Singleton<AudioSystem>
+class AudioSystem;
+
+struct AudioSystemCreateFunctor
+{
+ AudioSystem *operator()() const;
+};
+
+struct AudioSystemDestroyFunctor
+{
+ void operator()(AudioSystem *p) const;
+};
+
+class AudioSystem : public id::singleton<AudioSystem, AudioSystemCreateFunctor, AudioSystemDestroyFunctor>
 {
 public:
  static constexpr int MIX_HIGH_QUALITY = 44100;
@@ -111,8 +122,8 @@ class AudioSystem : public Ego::Core::Singleton<AudioSystem>
  static const float DEFAULT_MAX_DISTANCE; ///< Default max hearing distance (10 tiles)
 
 protected:
- friend Ego::Core::Singleton<AudioSystem>::CreateFunctorType;
- friend Ego::Core::Singleton<AudioSystem>::DestroyFunctorType;
+ friend AudioSystemCreateFunctor;
+ friend AudioSystemDestroyFunctor;
  AudioSystem();
  virtual ~AudioSystem();
 

diff --git a/egolib/src/egolib/Console/Console.cpp b/egolib/src/egolib/Console/Console.cpp
@@ -271,10 +271,10 @@ void Console::draw()
  {
  BufferScopedLock lock(vertexBuffer);
  Vertex *vertex = lock.get<Vertex>();
- vertex->x = rectangle.getMin().x(); vertex->y = rectangle.getMin().y(); ++vertex;
- vertex->x = rectangle.getMax().x(); vertex->y = rectangle.getMin().y(); ++vertex;
- vertex->x = rectangle.getMax().x(); vertex->y = rectangle.getMax().y(); ++vertex;
- vertex->x = rectangle.getMin().x(); vertex->y = rectangle.getMax().y();
+ vertex->x = rectangle.get_min().x(); vertex->y = rectangle.get_min().y(); ++vertex;
+ vertex->x = rectangle.get_max().x(); vertex->y = rectangle.get_min().y(); ++vertex;
+ vertex->x = rectangle.get_max().x(); vertex->y = rectangle.get_max().y(); ++vertex;
+ vertex->x = rectangle.get_min().x(); vertex->y = rectangle.get_max().y();
  }
  renderer.render(vertexBuffer, vertexDescriptor, PrimitiveType::LineLoop, 0, 4);
  renderer.setLineWidth(1);
@@ -287,12 +287,12 @@ void Console::draw()
 
  // clip the viewport
  renderer.setScissorTestEnabled(true);
- renderer.setScissorRectangle(rectangle.getMin().x(),
- windowHeight - rectangle.getMax().y(),
- rectangle.getSize().x(),
- rectangle.getSize().y());
+ renderer.setScissorRectangle(rectangle.get_min().x(),
+ windowHeight - rectangle.get_max().y(),
+ rectangle.get_size().x(),
+ rectangle.get_size().y());
 
- height = rectangle.getSize().y();
+ height = rectangle.get_size().y();
 
  char buffer[ConsoleSettings::InputSettings::Length];
 
@@ -305,7 +305,7 @@ void Console::draw()
  int text_width, text_height;
  this->pfont->getTextSize(buffer, &text_width, &text_height);
  height -= text_height;
- this->pfont->drawText(buffer, rectangle.getMin().x(), height - text_height, white);
+ this->pfont->drawText(buffer, rectangle.get_min().x(), height - text_height, white);
 
  if (m_document.get_text().empty())
  {
@@ -343,7 +343,7 @@ void Console::draw()
  auto txt = temporary.substr(l.get_range().get_start(),
  l.get_range().get_length());
  height -= l.get_height();
- this->pfont->drawText(txt, rectangle.getMin().x(), height - l.get_height(), white);
+ this->pfont->drawText(txt, rectangle.get_min().x(), height - l.get_height(), white);
  }
 
  renderer.setDepthTestEnabled(true);
@@ -406,13 +406,12 @@ void Console::hide()
 }
 
 ConsoleHistory& Console::getHistory()
-{
- return history;
-}
+{ return history; }
 
-Console *CreateFunctor<Console>::operator()(const Rectangle2f& rectangle) const
-{
- return new Console(rectangle);
-}
+Console *ConsoleCreateFunctor::operator()(const Rectangle2f& rectangle) const
+{ return new Console(rectangle); }
+
+void ConsoleDestroyFunctor::operator()(Console *p) const
+{ delete p; }
 
 } } // namespace Ego::Core