diff --git a/README.md b/README.md index f09c2015e..bfb426287 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Entropia Engine++ * Batch Renderer ( all the rendering is automatically batched by the engine ). - * TTF and Texture fonts support. + * True type fonts support. * Frame Buffer support. @@ -38,6 +38,8 @@ Entropia Engine++ * Animated Sprites. * Texture Atlas support ( automatic creation and update of the texture atlas ). + + * Clipping Masks ( stencil, scissors, planes ) **Window Module:** @@ -114,10 +116,14 @@ Entropia Engine++ * All the basic controls are implemented ( button, textbox, combobox, inputbox, menu, listbox, scrollbars, etc ). + * Layout system similar to Androids layouts. + * Features as text selection and key bindings. + + * Load layouts from XMLs -**Gaming Module:** +**Maps Module:** ------------------ * Tiled Maps with software dynamic lights. diff --git a/include/eepp/ee.hpp b/include/eepp/ee.hpp index b1817c04b..429c91bcd 100755 --- a/include/eepp/ee.hpp +++ b/include/eepp/ee.hpp @@ -34,7 +34,7 @@ EE::Network documented. EE::UI Not documented at all. EE::Physics Not documented at all, chipmunk documentation should help. - EE::Gaming Not documented at all. + EE::Maps Not documented at all. @todo Add more commented examples, showing at least the basic usage of the engine ( 10 or more examples at least ). STATE: 7 examples available. @@ -94,9 +94,9 @@ using namespace EE::UI; using namespace EE::UI::Tools; - // Gaming - #include - using namespace EE::Gaming; + // Maps + #include + using namespace EE::Maps; // Physics #include diff --git a/include/eepp/gaming.hpp b/include/eepp/gaming.hpp deleted file mode 100644 index 3cb8edfe1..000000000 --- a/include/eepp/gaming.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef EEPP_GAMING_HPP -#define EEPP_GAMING_HPP - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/include/eepp/graphics/globalbatchrenderer.hpp b/include/eepp/graphics/globalbatchrenderer.hpp index 31a218aa6..c96612780 100755 --- a/include/eepp/graphics/globalbatchrenderer.hpp +++ b/include/eepp/graphics/globalbatchrenderer.hpp @@ -1,5 +1,5 @@ -#ifndef EE_GAMINGCGLOBALBATCHRENDERER_H -#define EE_GAMINGCGLOBALBATCHRENDERER_H +#ifndef EE_MAPS_CGLOBALBATCHRENDERER_H +#define EE_MAPS_CGLOBALBATCHRENDERER_H #include #include diff --git a/include/eepp/maps.hpp b/include/eepp/maps.hpp new file mode 100644 index 000000000..f8542f730 --- /dev/null +++ b/include/eepp/maps.hpp @@ -0,0 +1,15 @@ +#ifndef EEPP_MAPS_HPP +#define EEPP_MAPS_HPP + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/include/eepp/gaming/base.hpp b/include/eepp/maps/base.hpp similarity index 90% rename from include/eepp/gaming/base.hpp rename to include/eepp/maps/base.hpp index 758d7a7c7..3afe18d16 100644 --- a/include/eepp/gaming/base.hpp +++ b/include/eepp/maps/base.hpp @@ -1,5 +1,5 @@ -#ifndef EE_GAMING_BASE -#define EE_GAMING_BASE +#ifndef EE_MAPS__BASE +#define EE_MAPS__BASE #include diff --git a/include/eepp/gaming/gameobject.hpp b/include/eepp/maps/gameobject.hpp similarity index 86% rename from include/eepp/gaming/gameobject.hpp rename to include/eepp/maps/gameobject.hpp index 263a497e9..7b9150141 100644 --- a/include/eepp/gaming/gameobject.hpp +++ b/include/eepp/maps/gameobject.hpp @@ -1,14 +1,14 @@ -#ifndef EE_GAMINGCGAMEOBJECT_HPP -#define EE_GAMINGCGAMEOBJECT_HPP +#ifndef EE_MAPS_CGAMEOBJECT_HPP +#define EE_MAPS_CGAMEOBJECT_HPP -#include -#include -#include +#include +#include +#include #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class EE_API GameObject { public: diff --git a/include/eepp/gaming/gameobjectobject.hpp b/include/eepp/maps/gameobjectobject.hpp similarity index 90% rename from include/eepp/gaming/gameobjectobject.hpp rename to include/eepp/maps/gameobjectobject.hpp index a665c4a2a..093e2884e 100644 --- a/include/eepp/gaming/gameobjectobject.hpp +++ b/include/eepp/maps/gameobjectobject.hpp @@ -1,12 +1,12 @@ -#ifndef EE_GAMINGCGAMEOBJECTOBJECT_HPP -#define EE_GAMINGCGAMEOBJECTOBJECT_HPP +#ifndef EE_MAPS_CGAMEOBJECTOBJECT_HPP +#define EE_MAPS_CGAMEOBJECTOBJECT_HPP -#include -#include +#include +#include #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class MapLayer; diff --git a/include/eepp/gaming/gameobjectpolygon.hpp b/include/eepp/maps/gameobjectpolygon.hpp similarity index 76% rename from include/eepp/gaming/gameobjectpolygon.hpp rename to include/eepp/maps/gameobjectpolygon.hpp index 21fc39e42..46e25fde1 100644 --- a/include/eepp/gaming/gameobjectpolygon.hpp +++ b/include/eepp/maps/gameobjectpolygon.hpp @@ -1,9 +1,9 @@ -#ifndef EE_GAMINGCGAMEOBJECTPOLYGON_HPP -#define EE_GAMINGCGAMEOBJECTPOLYGON_HPP +#ifndef EE_MAPS_CGAMEOBJECTPOLYGON_HPP +#define EE_MAPS_CGAMEOBJECTPOLYGON_HPP -#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class EE_API GameObjectPolygon : public GameObjectObject { public: diff --git a/include/eepp/gaming/gameobjectpolyline.hpp b/include/eepp/maps/gameobjectpolyline.hpp similarity index 70% rename from include/eepp/gaming/gameobjectpolyline.hpp rename to include/eepp/maps/gameobjectpolyline.hpp index 3580a331f..72f6bef55 100644 --- a/include/eepp/gaming/gameobjectpolyline.hpp +++ b/include/eepp/maps/gameobjectpolyline.hpp @@ -1,9 +1,9 @@ -#ifndef EE_GAMINGCGAMEOBJECTPOLYLINE_HPP -#define EE_GAMINGCGAMEOBJECTPOLYLINE_HPP +#ifndef EE_MAPS_CGAMEOBJECTPOLYLINE_HPP +#define EE_MAPS_CGAMEOBJECTPOLYLINE_HPP -#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class EE_API GameObjectPolyline : public GameObjectPolygon { public: diff --git a/include/eepp/gaming/gameobjectsprite.hpp b/include/eepp/maps/gameobjectsprite.hpp similarity index 82% rename from include/eepp/gaming/gameobjectsprite.hpp rename to include/eepp/maps/gameobjectsprite.hpp index 2c76b124e..fd05c6d3a 100644 --- a/include/eepp/gaming/gameobjectsprite.hpp +++ b/include/eepp/maps/gameobjectsprite.hpp @@ -1,14 +1,14 @@ -#ifndef EE_GAMINGCGAMEOBJECTSPRITE_HPP -#define EE_GAMINGCGAMEOBJECTSPRITE_HPP +#ifndef EE_MAPS_CGAMEOBJECTSPRITE_HPP +#define EE_MAPS_CGAMEOBJECTSPRITE_HPP -#include -#include +#include +#include namespace EE { namespace Graphics { class Sprite; }} -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class EE_API GameObjectSprite : public GameObject { public: diff --git a/include/eepp/gaming/gameobjectsubtexture.hpp b/include/eepp/maps/gameobjectsubtexture.hpp similarity index 82% rename from include/eepp/gaming/gameobjectsubtexture.hpp rename to include/eepp/maps/gameobjectsubtexture.hpp index de2d28232..bb92e4bfb 100644 --- a/include/eepp/gaming/gameobjectsubtexture.hpp +++ b/include/eepp/maps/gameobjectsubtexture.hpp @@ -1,13 +1,13 @@ -#ifndef EE_GAMINGCGAMEOBJECTSUBTEXTURE_HPP -#define EE_GAMINGCGAMEOBJECTSUBTEXTURE_HPP +#ifndef EE_MAPS_CGAMEOBJECTSUBTEXTURE_HPP +#define EE_MAPS_CGAMEOBJECTSUBTEXTURE_HPP -#include -#include +#include +#include #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class EE_API GameObjectSubTexture : public GameObject { public: diff --git a/include/eepp/gaming/gameobjectsubtextureex.hpp b/include/eepp/maps/gameobjectsubtextureex.hpp similarity index 87% rename from include/eepp/gaming/gameobjectsubtextureex.hpp rename to include/eepp/maps/gameobjectsubtextureex.hpp index 78ae47da7..2326fb52e 100644 --- a/include/eepp/gaming/gameobjectsubtextureex.hpp +++ b/include/eepp/maps/gameobjectsubtextureex.hpp @@ -1,10 +1,10 @@ #ifndef CGAMEOBJECTSUBTEXTUREEX_HPP #define CGAMEOBJECTSUBTEXTUREEX_HPP -#include -#include +#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class EE_API GameObjectSubTextureEx : public GameObjectSubTexture { public: diff --git a/include/eepp/gaming/gameobjectvirtual.hpp b/include/eepp/maps/gameobjectvirtual.hpp similarity index 85% rename from include/eepp/gaming/gameobjectvirtual.hpp rename to include/eepp/maps/gameobjectvirtual.hpp index 47539e8cc..beb00bb34 100644 --- a/include/eepp/gaming/gameobjectvirtual.hpp +++ b/include/eepp/maps/gameobjectvirtual.hpp @@ -1,12 +1,12 @@ -#ifndef EE_GAMINGCGAMEOBJECTVIRTUAL_HPP -#define EE_GAMINGCGAMEOBJECTVIRTUAL_HPP +#ifndef EE_MAPS_CGAMEOBJECTVIRTUAL_HPP +#define EE_MAPS_CGAMEOBJECTVIRTUAL_HPP -#include -#include +#include +#include #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class MapLayer; diff --git a/include/eepp/gaming/mapeditor/mapeditor.hpp b/include/eepp/maps/mapeditor/mapeditor.hpp similarity index 95% rename from include/eepp/gaming/mapeditor/mapeditor.hpp rename to include/eepp/maps/mapeditor/mapeditor.hpp index 8e5d11b22..e0c4dc79b 100644 --- a/include/eepp/gaming/mapeditor/mapeditor.hpp +++ b/include/eepp/maps/mapeditor/mapeditor.hpp @@ -1,7 +1,7 @@ -#ifndef EE_GAMINGCMAPEDITOR_HPP -#define EE_GAMINGCMAPEDITOR_HPP +#ifndef EE_MAPS_CMAPEDITOR_HPP +#define EE_MAPS_CMAPEDITOR_HPP -#include +#include #include #include #include @@ -16,9 +16,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace EE { namespace UI { class UIMessageBox; @@ -27,7 +27,7 @@ class UITextView; using namespace EE::UI; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { namespace Private { class UIMapLayerNew; diff --git a/include/eepp/gaming/maphelper.hpp b/include/eepp/maps/maphelper.hpp similarity index 96% rename from include/eepp/gaming/maphelper.hpp rename to include/eepp/maps/maphelper.hpp index 287031443..12efdd038 100644 --- a/include/eepp/gaming/maphelper.hpp +++ b/include/eepp/maps/maphelper.hpp @@ -1,9 +1,9 @@ -#ifndef EE_GAMINGMAPHELPER_HPP -#define EE_GAMINGMAPHELPER_HPP +#ifndef EE_MAPS_MAPHELPER_HPP +#define EE_MAPS_MAPHELPER_HPP #include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { #define MAP_PROPERTY_SIZE (64) #define LAYER_NAME_SIZE (64) diff --git a/include/eepp/gaming/maplayer.hpp b/include/eepp/maps/maplayer.hpp similarity index 91% rename from include/eepp/gaming/maplayer.hpp rename to include/eepp/maps/maplayer.hpp index 73327e342..ef22f10c3 100644 --- a/include/eepp/gaming/maplayer.hpp +++ b/include/eepp/maps/maplayer.hpp @@ -1,9 +1,9 @@ -#ifndef EE_GAMINGCLAYER_HPP -#define EE_GAMINGCLAYER_HPP +#ifndef EE_MAPS_CLAYER_HPP +#define EE_MAPS_CLAYER_HPP -#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class TileMap; diff --git a/include/eepp/gaming/maplight.hpp b/include/eepp/maps/maplight.hpp similarity index 93% rename from include/eepp/gaming/maplight.hpp rename to include/eepp/maps/maplight.hpp index 526e0c08e..32a5efcf5 100644 --- a/include/eepp/gaming/maplight.hpp +++ b/include/eepp/maps/maplight.hpp @@ -1,9 +1,9 @@ -#ifndef EE_GAMINGCLIGHT_H -#define EE_GAMINGCLIGHT_H +#ifndef EE_MAPS_CLIGHT_H +#define EE_MAPS_CLIGHT_H -#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { /** @enum LIGHT_TYPE Define the light spot type */ enum LIGHT_TYPE { diff --git a/include/eepp/gaming/maplightmanager.hpp b/include/eepp/maps/maplightmanager.hpp similarity index 85% rename from include/eepp/gaming/maplightmanager.hpp rename to include/eepp/maps/maplightmanager.hpp index 6ace25ef5..0ec46e849 100644 --- a/include/eepp/gaming/maplightmanager.hpp +++ b/include/eepp/maps/maplightmanager.hpp @@ -1,11 +1,11 @@ -#ifndef EE_GAMINGCLIGHTMANAGER_HPP -#define EE_GAMINGCLIGHTMANAGER_HPP +#ifndef EE_MAPS_CLIGHTMANAGER_HPP +#define EE_MAPS_CLIGHTMANAGER_HPP -#include -#include +#include +#include #include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class TileMap; diff --git a/include/eepp/gaming/mapobjectlayer.hpp b/include/eepp/maps/mapobjectlayer.hpp similarity index 83% rename from include/eepp/gaming/mapobjectlayer.hpp rename to include/eepp/maps/mapobjectlayer.hpp index b217a200d..885748e1b 100644 --- a/include/eepp/gaming/mapobjectlayer.hpp +++ b/include/eepp/maps/mapobjectlayer.hpp @@ -1,11 +1,11 @@ -#ifndef EE_GAMINGCOBJECTLAYER_HPP -#define EE_GAMINGCOBJECTLAYER_HPP +#ifndef EE_MAPS_COBJECTLAYER_HPP +#define EE_MAPS_COBJECTLAYER_HPP -#include -#include +#include +#include #include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class TileMap; diff --git a/include/eepp/gaming/tilemap.hpp b/include/eepp/maps/tilemap.hpp similarity index 93% rename from include/eepp/gaming/tilemap.hpp rename to include/eepp/maps/tilemap.hpp index f07ecb66d..cb9bada13 100644 --- a/include/eepp/gaming/tilemap.hpp +++ b/include/eepp/maps/tilemap.hpp @@ -1,13 +1,13 @@ -#ifndef EE_GAMINGCTILEMAP_HPP -#define EE_GAMINGCTILEMAP_HPP +#ifndef EE_MAPS_CTILEMAP_HPP +#define EE_MAPS_CTILEMAP_HPP -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -17,7 +17,7 @@ using namespace EE::Window; #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { namespace Private { class UIMapNew; } @@ -56,7 +56,7 @@ class EE_API TileMap { virtual bool loadFromMemory( const char * Data, const Uint32& DataSize ); - virtual void save( const std::string& path ); + virtual void saveToFile( const std::string& path ); virtual void saveToStream( IOStream& IOS ); @@ -223,7 +223,7 @@ class EE_API TileMap { const ColorA& setGridLinesColor() const; protected: - friend class EE::Gaming::Private::UIMapNew; + friend class EE::Maps::Private::UIMapNew; class ForcedHeaders { @@ -282,7 +282,7 @@ class EE_API TileMap { PolyObjMap mPolyObjs; ForcedHeaders* mForcedHeaders; - virtual GameObject * CreateGameObject( const Uint32& Type, const Uint32& Flags, MapLayer * Layer, const Uint32& DataId = 0 ); + virtual GameObject * createGameObject( const Uint32& Type, const Uint32& Flags, MapLayer * Layer, const Uint32& DataId = 0 ); void calcTilesClip(); diff --git a/include/eepp/gaming/tilemaplayer.hpp b/include/eepp/maps/tilemaplayer.hpp similarity index 84% rename from include/eepp/gaming/tilemaplayer.hpp rename to include/eepp/maps/tilemaplayer.hpp index 203baf560..d2ba9c0d0 100644 --- a/include/eepp/gaming/tilemaplayer.hpp +++ b/include/eepp/maps/tilemaplayer.hpp @@ -1,10 +1,10 @@ -#ifndef EE_GAMINGCTILELAYER_HPP -#define EE_GAMINGCTILELAYER_HPP +#ifndef EE_MAPS_CTILELAYER_HPP +#define EE_MAPS_CTILELAYER_HPP -#include -#include +#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class EE_API TileMapLayer : public MapLayer { public: diff --git a/premake4.lua b/premake4.lua index 68bc21182..2794bb660 100644 --- a/premake4.lua +++ b/premake4.lua @@ -704,8 +704,8 @@ function build_eepp( build_name ) "src/eepp/ui/tools/*.cpp", "src/eepp/physics/*.cpp", "src/eepp/physics/constraints/*.cpp", - "src/eepp/gaming/*.cpp", - "src/eepp/gaming/mapeditor/*.cpp" + "src/eepp/maps/*.cpp", + "src/eepp/maps/mapeditor/*.cpp" } check_ssl_support() diff --git a/projects/linux/ee.files b/projects/linux/ee.files index 2216c4f0a..9fa0ab237 100644 --- a/projects/linux/ee.files +++ b/projects/linux/ee.files @@ -37,7 +37,7 @@ ../../include/eepp/ui/uithemeconfig.hpp ../../include/eepp/ui/uithemedefault.hpp ../../include/eepp/ui/uiwidget.hpp -../../src/eepp/gaming/mapobjectlayer.cpp +../../src/eepp/maps/mapobjectlayer.cpp ../../src/eepp/graphics/arcdrawable.cpp ../../src/eepp/graphics/circledrawable.cpp ../../src/eepp/graphics/drawable.cpp @@ -154,43 +154,43 @@ ../../src/eepp/system/platform/win/clockimpl.cpp ../../src/eepp/system/platform/win/threadimpl.cpp ../../src/eepp/system/platform/win/muteximpl.cpp -../../include/eepp/gaming/maphelper.hpp -../../include/eepp/gaming/tilemaplayer.hpp -../../include/eepp/gaming/mapobjectlayer.hpp -../../include/eepp/gaming/tilemap.hpp -../../include/eepp/gaming/maplightmanager.hpp -../../include/eepp/gaming/maplight.hpp -../../include/eepp/gaming/maplayer.hpp -../../include/eepp/gaming/gameobjectvirtual.hpp -../../include/eepp/gaming/gameobjectsprite.hpp -../../include/eepp/gaming/gameobjectsubtextureex.hpp -../../include/eepp/gaming/gameobjectsubtexture.hpp -../../include/eepp/gaming/gameobject.hpp -../../include/eepp/gaming/base.hpp -../../src/eepp/gaming/mapeditor/uimapnew.hpp -../../src/eepp/gaming/mapeditor/uimap.hpp -../../src/eepp/gaming/mapeditor/uimaplayernew.hpp -../../src/eepp/gaming/mapeditor/uigotypenew.hpp -../../src/eepp/gaming/mapeditor/tilemapproperties.hpp -../../include/eepp/gaming/mapeditor/mapeditor.hpp -../../src/eepp/gaming/mapeditor/maplayerproperties.hpp -../../src/eepp/gaming/tilemaplayer.cpp -../../src/eepp/gaming/tilemap.cpp -../../src/eepp/gaming/maplightmanager.cpp -../../src/eepp/gaming/maplight.cpp -../../src/eepp/gaming/maplayer.cpp -../../src/eepp/gaming/gameobjectvirtual.cpp -../../src/eepp/gaming/gameobjectsprite.cpp -../../src/eepp/gaming/gameobjectsubtextureex.cpp -../../src/eepp/gaming/gameobjectsubtexture.cpp -../../src/eepp/gaming/gameobject.cpp -../../src/eepp/gaming/mapeditor/uimapnew.cpp -../../src/eepp/gaming/mapeditor/uimap.cpp -../../src/eepp/gaming/mapeditor/uimaplayernew.cpp -../../src/eepp/gaming/mapeditor/uigotypenew.cpp -../../src/eepp/gaming/mapeditor/tilemapproperties.cpp -../../src/eepp/gaming/mapeditor/mapeditor.cpp -../../src/eepp/gaming/mapeditor/maplayerproperties.cpp +../../include/eepp/maps/maphelper.hpp +../../include/eepp/maps/tilemaplayer.hpp +../../include/eepp/maps/mapobjectlayer.hpp +../../include/eepp/maps/tilemap.hpp +../../include/eepp/maps/maplightmanager.hpp +../../include/eepp/maps/maplight.hpp +../../include/eepp/maps/maplayer.hpp +../../include/eepp/maps/gameobjectvirtual.hpp +../../include/eepp/maps/gameobjectsprite.hpp +../../include/eepp/maps/gameobjectsubtextureex.hpp +../../include/eepp/maps/gameobjectsubtexture.hpp +../../include/eepp/maps/gameobject.hpp +../../include/eepp/maps/base.hpp +../../src/eepp/maps/mapeditor/uimapnew.hpp +../../src/eepp/maps/mapeditor/uimap.hpp +../../src/eepp/maps/mapeditor/uimaplayernew.hpp +../../src/eepp/maps/mapeditor/uigotypenew.hpp +../../src/eepp/maps/mapeditor/tilemapproperties.hpp +../../include/eepp/maps/mapeditor/mapeditor.hpp +../../src/eepp/maps/mapeditor/maplayerproperties.hpp +../../src/eepp/maps/tilemaplayer.cpp +../../src/eepp/maps/tilemap.cpp +../../src/eepp/maps/maplightmanager.cpp +../../src/eepp/maps/maplight.cpp +../../src/eepp/maps/maplayer.cpp +../../src/eepp/maps/gameobjectvirtual.cpp +../../src/eepp/maps/gameobjectsprite.cpp +../../src/eepp/maps/gameobjectsubtextureex.cpp +../../src/eepp/maps/gameobjectsubtexture.cpp +../../src/eepp/maps/gameobject.cpp +../../src/eepp/maps/mapeditor/uimapnew.cpp +../../src/eepp/maps/mapeditor/uimap.cpp +../../src/eepp/maps/mapeditor/uimaplayernew.cpp +../../src/eepp/maps/mapeditor/uigotypenew.cpp +../../src/eepp/maps/mapeditor/tilemapproperties.cpp +../../src/eepp/maps/mapeditor/mapeditor.cpp +../../src/eepp/maps/mapeditor/maplayerproperties.cpp ../../include/eepp/graphics/blendmode.hpp ../../src/eepp/graphics/blendmode.cpp ../../include/eepp/graphics/fonthelper.hpp @@ -580,7 +580,7 @@ ../../include/eepp/physics.hpp ../../include/eepp/math.hpp ../../include/eepp/graphics.hpp -../../include/eepp/gaming.hpp +../../include/eepp/maps.hpp ../../include/eepp/ee.hpp ../../include/eepp/config.hpp ../../include/eepp/core.hpp @@ -614,14 +614,14 @@ ../../premake4.lua ../../src/eepp/audio/soundfileogg.hpp ../../src/eepp/audio/soundfiledefault.hpp -../../include/eepp/gaming/gameobjectobject.hpp -../../src/eepp/gaming/gameobjectobject.cpp -../../src/eepp/gaming/gameobjectpolyline.cpp -../../src/eepp/gaming/gameobjectpolygon.cpp -../../include/eepp/gaming/gameobjectpolyline.hpp -../../include/eepp/gaming/gameobjectpolygon.hpp -../../src/eepp/gaming/mapeditor/mapobjectproperties.hpp -../../src/eepp/gaming/mapeditor/mapobjectproperties.cpp +../../include/eepp/maps/gameobjectobject.hpp +../../src/eepp/maps/gameobjectobject.cpp +../../src/eepp/maps/gameobjectpolyline.cpp +../../src/eepp/maps/gameobjectpolygon.cpp +../../include/eepp/maps/gameobjectpolyline.hpp +../../include/eepp/maps/gameobjectpolygon.hpp +../../src/eepp/maps/mapeditor/mapobjectproperties.hpp +../../src/eepp/maps/mapeditor/mapobjectproperties.cpp ../../include/eepp/core/noncopyable.hpp ../../include/eepp/system/clock.hpp ../../src/eepp/system/lock.cpp diff --git a/projects/linux/ee.includes b/projects/linux/ee.includes index 340342f92..b235c68ae 100644 --- a/projects/linux/ee.includes +++ b/projects/linux/ee.includes @@ -12,3 +12,199 @@ ../../src/eepp/system ../../src/eepp/graphics/renderer ../../include/eepp/graphics/renderer +../../include/eepp/network +../../include/eepp/physics +../../include/eepp/maps +../../include/eepp/ui/tools +../../include/eepp/helper/PlusCallback +../../include/eepp/maps/mapeditor +../../include/eepp/math +../../include/eepp/physics/constraints +../../include/eepp/audio +../../include/eepp/network/ssl +../../include/eepp/core +../../include/eepp/window +../../include/eepp +../../include/eepp/helper/chipmunk/constraints +../../include/eepp/helper/chipmunk +../../src/eepp/helper/SDL2/src/audio/xaudio2 +../../src/eepp/helper/SDL2/src/main/windows +../../src/eepp/helper/freetype2/include/freetype/internal/services +../../src/eepp/helper/SDL2/src/audio +../../src/eepp/helper/SDL2/src/timer +../../src/eepp/helper/SDL2/src/timer/psp +../../src/eepp/core +../../src/eepp/system/platform/win +../../src/eepp/helper/SDL2/src/thread/stdcpp +../../src/eepp/helper/glm/gtx +../../src/eepp/helper/SDL2/src/haptic/windows +../../src/eepp/helper/SDL2/src/joystick/bsd +../../src/eepp/window/backend/SDL2 +../../src/eepp/helper/SDL2/src/thread/pthread +../../src/eepp/helper/SDL2/src/loadso/haiku +../../src/eepp/window/platform/null +../../src/eepp/helper/SDL2/src/core/android +../../src/eepp/helper/freetype2/src/bdf +../../src/eepp/helper/SDL2/src/libm +../../src/eepp/helper/SDL2/src/audio/bsd +../../src/eepp/window/platform/win +../../src/eepp/helper/SDL2/src/video/uikit +../../src/eepp/system/platform/posix +../../src/eepp/helper/SDL2/src/dynapi +../../src/eepp/helper/SDL2/src/thread/windows +../../src/eepp/maps/mapeditor +../../src/eepp/helper/freetype2/src/smooth +../../src/eepp/helper/SDL2/src/power/linux +../../src/eepp/helper/SDL2/src/main/winrt +../../src/eepp/helper/SDL2/src/audio/android +../../src/eepp/helper/SDL2/src/audio/arts +../../src/eepp/audio +../../src/eepp/helper/SDL2/src/thread/psp +../../src/eepp/helper/freetype2/src/pfr +../../src/eepp/helper/SDL2/src/test +../../src/eepp/helper/SDL2/src/events +../../src/eepp/helper/freetype2/src/pshinter +../../src/eepp/helper/SDL2/src/timer/unix +../../src/eepp/helper/SDL2/src/timer/windows +../../src/eepp/helper/freetype2/src/lzw +../../src/eepp/helper/SDL2/src/haptic/darwin +../../src/eepp/helper/SDL2/src/video/dummy +../../src/eepp/helper/SDL2/src/audio/dsp +../../src/eepp/helper/SDL2/src/main/dummy +../../src/eepp/helper/SDL2/src/video +../../src/eepp/helper/freetype2/src/truetype +../../src/eepp/helper/SOIL2/src/test +../../src/eepp/helper/freetype2/src/cache +../../src/eepp/helper/SDL2/src/render/direct3d +../../src/eepp/helper/SDL2/src/power/haiku +../../src/eepp/network/platform +../../src/eepp/helper/freetype2/src/raster +../../src/eepp/helper/SDL2/src/audio/nas +../../src/eepp/helper/SDL2/src/audio/dummy +../../src/eepp/helper/SDL2/src/haptic/dummy +../../src/eepp/helper/SDL2/src/joystick/darwin +../../src/eepp/helper/SDL2/src/power/uikit +../../src/eepp/helper/SDL2/src/audio/sun +../../src/eepp/helper/SDL2/src/video/x11 +../../src/eepp/helper/freetype2/src/cid +../../src/eepp/helper/openal-soft/Alc/backends +../../src/eepp/helper/openal-soft +../../src/eepp/helper/SDL2/src/video/winrt +../../src/eepp/helper/SDL2/src/joystick/linux +../../src/eepp/helper/SOIL2/src/SOIL2 +../../src/eepp/helper/freetype2/include/freetype +../../src/eepp/helper/SDL2/src/joystick/psp +../../src/eepp/helper/freetype2/src/otvalid +../../src/eepp/helper/glm/core +../../src/eepp/helper/SDL2/src/video/psp +../../src/eepp/helper/SOIL2/src/common +../../src/eepp/helper/SDL2/src/timer/dummy +../../src/eepp/helper/SOIL2/src/perf_test +../../src/eepp/physics +../../src/eepp/helper/SDL2/src/render/opengl +../../src/eepp/helper/SDL2/src/core/linux +../../src/eepp/helper/SDL2/src/audio/paudio +../../src/eepp/helper/SDL2/src/video/windows +../../src/eepp/helper/SDL2/src/loadso/dummy +../../src/eepp/helper/SDL2/src/main/haiku +../../src/eepp/network +../../src/eepp/ui/tools +../../src/eepp/helper/SDL2/src/audio/winmm +../../src/eepp/math +../../src/eepp/helper/freetype2/src/type42 +../../src/eepp/helper/SDL2/src/video/wayland +../../src/eepp/helper/SDL2/src/render/psp +../../src/eepp/helper/freetype2/src/cff +../../src/eepp/helper/SDL2/src/audio/disk +../../src/eepp/helper/SDL2/src/render/opengles +../../src/eepp/helper/SDL2/src/filesystem/haiku +../../src/eepp/window/platform/x11 +../../src/eepp/helper/SDL2/src/loadso/windows +../../src/eepp/helper/SDL2/src/joystick +../../src/eepp/helper/freetype2/include/freetype/internal +../../src/eepp/helper/SDL2/src/atomic +../../src/eepp/helper/SDL2/src/video/pandora +../../src/eepp/helper/freetype2/include/freetype/config +../../src/eepp/helper/glm/gtc +../../src/eepp/window/platform +../../src/eepp/helper/SDL2/src/power/android +../../src/eepp/window +../../src/eepp/helper/SDL2/src/thread/generic +../../src/eepp/helper/SDL2/src/file +../../src/eepp/helper/freetype2/src/psaux +../../src/eepp/helper/SDL2/src/core/winrt +../../src/eepp/helper/SDL2/src/audio/coreaudio +../../src/eepp/helper/SDL2/src/audio/fusionsound +../../src/eepp/helper/freetype2/src/gxvalid +../../src/eepp/network/platform/win +../../src/eepp/helper/SDL2/src/render/software +../../src/eepp/helper/SDL2/src/file/cocoa +../../src/eepp/helper/SDL2/src/video/raspberry +../../src/eepp/system/platform +../../src/eepp/window/platform/osx +../../src/eepp/network/ssl +../../src/eepp/helper/freetype2/src/gzip +../../src/eepp/helper/SDL2/src/filesystem/winrt +../../src/eepp/helper/SDL2/src/joystick/winrt +../../src/eepp/helper/SDL2/src/filesystem/dummy +../../src/eepp/helper/SDL2/src/render +../../src/eepp/helper/freetype2/src/pcf +../../src/eepp/helper/SDL2/src/main/psp +../../src/eepp/helper/SDL2/src/haptic +../../src/eepp/helper/SDL2/src/video/mir +../../src/eepp/helper/openal-soft/Alc +../../src/eepp/helper/SDL2/src/timer/haiku +../../src/eepp/helper/SDL2/src/power/windows +../../src/eepp/helper/SDL2/src/filesystem/windows +../../src/eepp/helper/SDL2/src/cpuinfo +../../src/eepp/helper/SDL2/src/video/android +../../src/eepp/helper/SDL2/src/render/opengles2 +../../src/eepp/helper/SDL2/src/joystick/android +../../src/eepp/maps +../../src/eepp/helper/openal-soft/include/AL +../../src/eepp/helper/freetype2/src/winfonts +../../src/eepp/helper/SDL2/src/power +../../src/eepp/helper/SDL2/src +../../src/eepp/helper/SDL2/src/power/macosx +../../src/eepp/helper/SDL2/src/core/windows +../../src/eepp/helper/SDL2/src/joystick/iphoneos +../../src/eepp/helper/SDL2/src/stdlib +../../src/eepp/helper/SDL2/src/loadso/dlopen +../../src/eepp/helper/SDL2/src/main/android +../../src/eepp/helper/SDL2/src/thread +../../src/eepp/helper/SDL2/src/video/directfb +../../src/eepp/helper/SDL2/src/audio/qsa +../../src/eepp/helper/glm +../../src/eepp/helper/SDL2/src/joystick/dummy +../../src/eepp/window/backend/SFML +../../src/eepp/helper/freetype2/src/type1 +../../src/eepp/helper/freetype2/src/sfnt +../../src/eepp/main +../../src/eepp/helper/freetype2/src/psnames +../../src/eepp/helper/openal-soft/OpenAL32 +../../src/eepp/graphics/renderer/shaders +../../src/eepp/helper/SDL2/src/audio/psp +../../src/eepp/helper/SDL2/src/joystick/haiku +../../src/eepp/helper/SDL2/src/audio/directsound +../../src/eepp/helper/SDL2/src/audio/pulseaudio +../../src/eepp/helper/freetype2/src/autofit +../../src/eepp/helper/openal-soft/OpenAL32/Include +../../src/eepp/network/ssl/backend/openssl +../../src/eepp/helper/freetype2/src/base +../../src/eepp/helper/freetype2/src/bzip2 +../../src/eepp/helper/SDL2/src/audio/haiku +../../src/eepp/helper/SDL2/src/power/psp +../../src/eepp/helper/SDL2/src/joystick/windows +../../src/eepp/helper/SDL2/src/audio/sndio +../../src/eepp/helper/SDL2/src/audio/esd +../../src/eepp/helper/SDL2/include +../../src/eepp/helper/SDL2/src/haptic/linux +../../src/eepp/window/backend/null +../../src/eepp/helper/SDL2/src/audio/alsa +../../src/eepp/helper/SDL2/src/render/direct3d11 +../../src/eepp/helper/SDL2/src/video/haiku +../../src/eepp/network/platform/unix +../../src/eepp/helper/SDL2/src/power/winrt +../../src/eepp/helper/SDL2/src/filesystem/unix +../../src/eepp/physics/constraints +../../src/eepp/helper/SDL2/src/video/cocoa diff --git a/projects/osx/ee.files b/projects/osx/ee.files index 1bda16342..9fa0ab237 100644 --- a/projects/osx/ee.files +++ b/projects/osx/ee.files @@ -37,7 +37,7 @@ ../../include/eepp/ui/uithemeconfig.hpp ../../include/eepp/ui/uithemedefault.hpp ../../include/eepp/ui/uiwidget.hpp -../../src/eepp/gaming/mapobjectlayer.cpp +../../src/eepp/maps/mapobjectlayer.cpp ../../src/eepp/graphics/arcdrawable.cpp ../../src/eepp/graphics/circledrawable.cpp ../../src/eepp/graphics/drawable.cpp @@ -68,6 +68,7 @@ ../../src/eepp/ui/uihelper.cpp ../../src/eepp/ui/uiimage.cpp ../../src/eepp/ui/uilinearlayout.cpp +../../src/eepp/ui/uiloader.cpp ../../src/eepp/ui/uimenuseparator.cpp ../../src/eepp/ui/uirelativelayout.cpp ../../src/eepp/ui/uisubtexture.cpp @@ -153,43 +154,43 @@ ../../src/eepp/system/platform/win/clockimpl.cpp ../../src/eepp/system/platform/win/threadimpl.cpp ../../src/eepp/system/platform/win/muteximpl.cpp -../../include/eepp/gaming/maphelper.hpp -../../include/eepp/gaming/tilemaplayer.hpp -../../include/eepp/gaming/mapobjectlayer.hpp -../../include/eepp/gaming/tilemap.hpp -../../include/eepp/gaming/maplightmanager.hpp -../../include/eepp/gaming/maplight.hpp -../../include/eepp/gaming/maplayer.hpp -../../include/eepp/gaming/gameobjectvirtual.hpp -../../include/eepp/gaming/gameobjectsprite.hpp -../../include/eepp/gaming/gameobjectsubtextureex.hpp -../../include/eepp/gaming/gameobjectsubtexture.hpp -../../include/eepp/gaming/gameobject.hpp -../../include/eepp/gaming/base.hpp -../../src/eepp/gaming/mapeditor/uimapnew.hpp -../../src/eepp/gaming/mapeditor/uimap.hpp -../../src/eepp/gaming/mapeditor/uimaplayernew.hpp -../../src/eepp/gaming/mapeditor/uigotypenew.hpp -../../src/eepp/gaming/mapeditor/tilemapproperties.hpp -../../include/eepp/gaming/mapeditor/mapeditor.hpp -../../src/eepp/gaming/mapeditor/maplayerproperties.hpp -../../src/eepp/gaming/tilemaplayer.cpp -../../src/eepp/gaming/tilemap.cpp -../../src/eepp/gaming/maplightmanager.cpp -../../src/eepp/gaming/maplight.cpp -../../src/eepp/gaming/maplayer.cpp -../../src/eepp/gaming/gameobjectvirtual.cpp -../../src/eepp/gaming/gameobjectsprite.cpp -../../src/eepp/gaming/gameobjectsubtextureex.cpp -../../src/eepp/gaming/gameobjectsubtexture.cpp -../../src/eepp/gaming/gameobject.cpp -../../src/eepp/gaming/mapeditor/uimapnew.cpp -../../src/eepp/gaming/mapeditor/uimap.cpp -../../src/eepp/gaming/mapeditor/uimaplayernew.cpp -../../src/eepp/gaming/mapeditor/uigotypenew.cpp -../../src/eepp/gaming/mapeditor/tilemapproperties.cpp -../../src/eepp/gaming/mapeditor/mapeditor.cpp -../../src/eepp/gaming/mapeditor/maplayerproperties.cpp +../../include/eepp/maps/maphelper.hpp +../../include/eepp/maps/tilemaplayer.hpp +../../include/eepp/maps/mapobjectlayer.hpp +../../include/eepp/maps/tilemap.hpp +../../include/eepp/maps/maplightmanager.hpp +../../include/eepp/maps/maplight.hpp +../../include/eepp/maps/maplayer.hpp +../../include/eepp/maps/gameobjectvirtual.hpp +../../include/eepp/maps/gameobjectsprite.hpp +../../include/eepp/maps/gameobjectsubtextureex.hpp +../../include/eepp/maps/gameobjectsubtexture.hpp +../../include/eepp/maps/gameobject.hpp +../../include/eepp/maps/base.hpp +../../src/eepp/maps/mapeditor/uimapnew.hpp +../../src/eepp/maps/mapeditor/uimap.hpp +../../src/eepp/maps/mapeditor/uimaplayernew.hpp +../../src/eepp/maps/mapeditor/uigotypenew.hpp +../../src/eepp/maps/mapeditor/tilemapproperties.hpp +../../include/eepp/maps/mapeditor/mapeditor.hpp +../../src/eepp/maps/mapeditor/maplayerproperties.hpp +../../src/eepp/maps/tilemaplayer.cpp +../../src/eepp/maps/tilemap.cpp +../../src/eepp/maps/maplightmanager.cpp +../../src/eepp/maps/maplight.cpp +../../src/eepp/maps/maplayer.cpp +../../src/eepp/maps/gameobjectvirtual.cpp +../../src/eepp/maps/gameobjectsprite.cpp +../../src/eepp/maps/gameobjectsubtextureex.cpp +../../src/eepp/maps/gameobjectsubtexture.cpp +../../src/eepp/maps/gameobject.cpp +../../src/eepp/maps/mapeditor/uimapnew.cpp +../../src/eepp/maps/mapeditor/uimap.cpp +../../src/eepp/maps/mapeditor/uimaplayernew.cpp +../../src/eepp/maps/mapeditor/uigotypenew.cpp +../../src/eepp/maps/mapeditor/tilemapproperties.cpp +../../src/eepp/maps/mapeditor/mapeditor.cpp +../../src/eepp/maps/mapeditor/maplayerproperties.cpp ../../include/eepp/graphics/blendmode.hpp ../../src/eepp/graphics/blendmode.cpp ../../include/eepp/graphics/fonthelper.hpp @@ -579,7 +580,7 @@ ../../include/eepp/physics.hpp ../../include/eepp/math.hpp ../../include/eepp/graphics.hpp -../../include/eepp/gaming.hpp +../../include/eepp/maps.hpp ../../include/eepp/ee.hpp ../../include/eepp/config.hpp ../../include/eepp/core.hpp @@ -613,14 +614,14 @@ ../../premake4.lua ../../src/eepp/audio/soundfileogg.hpp ../../src/eepp/audio/soundfiledefault.hpp -../../include/eepp/gaming/gameobjectobject.hpp -../../src/eepp/gaming/gameobjectobject.cpp -../../src/eepp/gaming/gameobjectpolyline.cpp -../../src/eepp/gaming/gameobjectpolygon.cpp -../../include/eepp/gaming/gameobjectpolyline.hpp -../../include/eepp/gaming/gameobjectpolygon.hpp -../../src/eepp/gaming/mapeditor/mapobjectproperties.hpp -../../src/eepp/gaming/mapeditor/mapobjectproperties.cpp +../../include/eepp/maps/gameobjectobject.hpp +../../src/eepp/maps/gameobjectobject.cpp +../../src/eepp/maps/gameobjectpolyline.cpp +../../src/eepp/maps/gameobjectpolygon.cpp +../../include/eepp/maps/gameobjectpolyline.hpp +../../include/eepp/maps/gameobjectpolygon.hpp +../../src/eepp/maps/mapeditor/mapobjectproperties.hpp +../../src/eepp/maps/mapeditor/mapobjectproperties.cpp ../../include/eepp/core/noncopyable.hpp ../../include/eepp/system/clock.hpp ../../src/eepp/system/lock.cpp diff --git a/projects/windows/ee.files b/projects/windows/ee.files index 1bda16342..9fa0ab237 100644 --- a/projects/windows/ee.files +++ b/projects/windows/ee.files @@ -37,7 +37,7 @@ ../../include/eepp/ui/uithemeconfig.hpp ../../include/eepp/ui/uithemedefault.hpp ../../include/eepp/ui/uiwidget.hpp -../../src/eepp/gaming/mapobjectlayer.cpp +../../src/eepp/maps/mapobjectlayer.cpp ../../src/eepp/graphics/arcdrawable.cpp ../../src/eepp/graphics/circledrawable.cpp ../../src/eepp/graphics/drawable.cpp @@ -68,6 +68,7 @@ ../../src/eepp/ui/uihelper.cpp ../../src/eepp/ui/uiimage.cpp ../../src/eepp/ui/uilinearlayout.cpp +../../src/eepp/ui/uiloader.cpp ../../src/eepp/ui/uimenuseparator.cpp ../../src/eepp/ui/uirelativelayout.cpp ../../src/eepp/ui/uisubtexture.cpp @@ -153,43 +154,43 @@ ../../src/eepp/system/platform/win/clockimpl.cpp ../../src/eepp/system/platform/win/threadimpl.cpp ../../src/eepp/system/platform/win/muteximpl.cpp -../../include/eepp/gaming/maphelper.hpp -../../include/eepp/gaming/tilemaplayer.hpp -../../include/eepp/gaming/mapobjectlayer.hpp -../../include/eepp/gaming/tilemap.hpp -../../include/eepp/gaming/maplightmanager.hpp -../../include/eepp/gaming/maplight.hpp -../../include/eepp/gaming/maplayer.hpp -../../include/eepp/gaming/gameobjectvirtual.hpp -../../include/eepp/gaming/gameobjectsprite.hpp -../../include/eepp/gaming/gameobjectsubtextureex.hpp -../../include/eepp/gaming/gameobjectsubtexture.hpp -../../include/eepp/gaming/gameobject.hpp -../../include/eepp/gaming/base.hpp -../../src/eepp/gaming/mapeditor/uimapnew.hpp -../../src/eepp/gaming/mapeditor/uimap.hpp -../../src/eepp/gaming/mapeditor/uimaplayernew.hpp -../../src/eepp/gaming/mapeditor/uigotypenew.hpp -../../src/eepp/gaming/mapeditor/tilemapproperties.hpp -../../include/eepp/gaming/mapeditor/mapeditor.hpp -../../src/eepp/gaming/mapeditor/maplayerproperties.hpp -../../src/eepp/gaming/tilemaplayer.cpp -../../src/eepp/gaming/tilemap.cpp -../../src/eepp/gaming/maplightmanager.cpp -../../src/eepp/gaming/maplight.cpp -../../src/eepp/gaming/maplayer.cpp -../../src/eepp/gaming/gameobjectvirtual.cpp -../../src/eepp/gaming/gameobjectsprite.cpp -../../src/eepp/gaming/gameobjectsubtextureex.cpp -../../src/eepp/gaming/gameobjectsubtexture.cpp -../../src/eepp/gaming/gameobject.cpp -../../src/eepp/gaming/mapeditor/uimapnew.cpp -../../src/eepp/gaming/mapeditor/uimap.cpp -../../src/eepp/gaming/mapeditor/uimaplayernew.cpp -../../src/eepp/gaming/mapeditor/uigotypenew.cpp -../../src/eepp/gaming/mapeditor/tilemapproperties.cpp -../../src/eepp/gaming/mapeditor/mapeditor.cpp -../../src/eepp/gaming/mapeditor/maplayerproperties.cpp +../../include/eepp/maps/maphelper.hpp +../../include/eepp/maps/tilemaplayer.hpp +../../include/eepp/maps/mapobjectlayer.hpp +../../include/eepp/maps/tilemap.hpp +../../include/eepp/maps/maplightmanager.hpp +../../include/eepp/maps/maplight.hpp +../../include/eepp/maps/maplayer.hpp +../../include/eepp/maps/gameobjectvirtual.hpp +../../include/eepp/maps/gameobjectsprite.hpp +../../include/eepp/maps/gameobjectsubtextureex.hpp +../../include/eepp/maps/gameobjectsubtexture.hpp +../../include/eepp/maps/gameobject.hpp +../../include/eepp/maps/base.hpp +../../src/eepp/maps/mapeditor/uimapnew.hpp +../../src/eepp/maps/mapeditor/uimap.hpp +../../src/eepp/maps/mapeditor/uimaplayernew.hpp +../../src/eepp/maps/mapeditor/uigotypenew.hpp +../../src/eepp/maps/mapeditor/tilemapproperties.hpp +../../include/eepp/maps/mapeditor/mapeditor.hpp +../../src/eepp/maps/mapeditor/maplayerproperties.hpp +../../src/eepp/maps/tilemaplayer.cpp +../../src/eepp/maps/tilemap.cpp +../../src/eepp/maps/maplightmanager.cpp +../../src/eepp/maps/maplight.cpp +../../src/eepp/maps/maplayer.cpp +../../src/eepp/maps/gameobjectvirtual.cpp +../../src/eepp/maps/gameobjectsprite.cpp +../../src/eepp/maps/gameobjectsubtextureex.cpp +../../src/eepp/maps/gameobjectsubtexture.cpp +../../src/eepp/maps/gameobject.cpp +../../src/eepp/maps/mapeditor/uimapnew.cpp +../../src/eepp/maps/mapeditor/uimap.cpp +../../src/eepp/maps/mapeditor/uimaplayernew.cpp +../../src/eepp/maps/mapeditor/uigotypenew.cpp +../../src/eepp/maps/mapeditor/tilemapproperties.cpp +../../src/eepp/maps/mapeditor/mapeditor.cpp +../../src/eepp/maps/mapeditor/maplayerproperties.cpp ../../include/eepp/graphics/blendmode.hpp ../../src/eepp/graphics/blendmode.cpp ../../include/eepp/graphics/fonthelper.hpp @@ -579,7 +580,7 @@ ../../include/eepp/physics.hpp ../../include/eepp/math.hpp ../../include/eepp/graphics.hpp -../../include/eepp/gaming.hpp +../../include/eepp/maps.hpp ../../include/eepp/ee.hpp ../../include/eepp/config.hpp ../../include/eepp/core.hpp @@ -613,14 +614,14 @@ ../../premake4.lua ../../src/eepp/audio/soundfileogg.hpp ../../src/eepp/audio/soundfiledefault.hpp -../../include/eepp/gaming/gameobjectobject.hpp -../../src/eepp/gaming/gameobjectobject.cpp -../../src/eepp/gaming/gameobjectpolyline.cpp -../../src/eepp/gaming/gameobjectpolygon.cpp -../../include/eepp/gaming/gameobjectpolyline.hpp -../../include/eepp/gaming/gameobjectpolygon.hpp -../../src/eepp/gaming/mapeditor/mapobjectproperties.hpp -../../src/eepp/gaming/mapeditor/mapobjectproperties.cpp +../../include/eepp/maps/gameobjectobject.hpp +../../src/eepp/maps/gameobjectobject.cpp +../../src/eepp/maps/gameobjectpolyline.cpp +../../src/eepp/maps/gameobjectpolygon.cpp +../../include/eepp/maps/gameobjectpolyline.hpp +../../include/eepp/maps/gameobjectpolygon.hpp +../../src/eepp/maps/mapeditor/mapobjectproperties.hpp +../../src/eepp/maps/mapeditor/mapobjectproperties.cpp ../../include/eepp/core/noncopyable.hpp ../../include/eepp/system/clock.hpp ../../src/eepp/system/lock.cpp diff --git a/src/eepp/gaming/gameobject.cpp b/src/eepp/maps/gameobject.cpp similarity index 96% rename from src/eepp/gaming/gameobject.cpp rename to src/eepp/maps/gameobject.cpp index fab26f01e..9633e3a7e 100644 --- a/src/eepp/gaming/gameobject.cpp +++ b/src/eepp/maps/gameobject.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { GameObject::GameObject( const Uint32& Flags, MapLayer * Layer ) : mFlags( Flags ), diff --git a/src/eepp/gaming/gameobjectobject.cpp b/src/eepp/maps/gameobjectobject.cpp similarity index 94% rename from src/eepp/gaming/gameobjectobject.cpp rename to src/eepp/maps/gameobjectobject.cpp index 50439b7bd..834314e77 100644 --- a/src/eepp/gaming/gameobjectobject.cpp +++ b/src/eepp/maps/gameobjectobject.cpp @@ -1,12 +1,12 @@ -#include +#include -#include -#include -#include +#include +#include +#include #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { GameObjectObject::GameObjectObject( Uint32 DataId, const Rectf& rect, MapLayer * Layer, const Uint32& Flags ) : GameObject( Flags, Layer ), diff --git a/src/eepp/gaming/gameobjectpolygon.cpp b/src/eepp/maps/gameobjectpolygon.cpp similarity index 92% rename from src/eepp/gaming/gameobjectpolygon.cpp rename to src/eepp/maps/gameobjectpolygon.cpp index db7e59317..551caa29e 100644 --- a/src/eepp/gaming/gameobjectpolygon.cpp +++ b/src/eepp/maps/gameobjectpolygon.cpp @@ -1,10 +1,10 @@ -#include +#include -#include +#include #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { GameObjectPolygon::GameObjectPolygon( Uint32 DataId, Polygon2f poly, MapLayer * Layer, const Uint32& Flags ) : GameObjectObject( DataId, poly.toAABB(), Layer, Flags ) diff --git a/src/eepp/gaming/gameobjectpolyline.cpp b/src/eepp/maps/gameobjectpolyline.cpp similarity index 88% rename from src/eepp/gaming/gameobjectpolyline.cpp rename to src/eepp/maps/gameobjectpolyline.cpp index 9a8a64440..e2201014a 100644 --- a/src/eepp/gaming/gameobjectpolyline.cpp +++ b/src/eepp/maps/gameobjectpolyline.cpp @@ -1,10 +1,10 @@ -#include +#include -#include +#include #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { GameObjectPolyline::GameObjectPolyline( Uint32 DataId, Polygon2f poly, MapLayer * Layer, const Uint32& Flags ) : GameObjectPolygon( DataId, poly, Layer, Flags ) diff --git a/src/eepp/gaming/gameobjectsprite.cpp b/src/eepp/maps/gameobjectsprite.cpp similarity index 96% rename from src/eepp/gaming/gameobjectsprite.cpp rename to src/eepp/maps/gameobjectsprite.cpp index 6f99adfae..247379403 100644 --- a/src/eepp/gaming/gameobjectsprite.cpp +++ b/src/eepp/maps/gameobjectsprite.cpp @@ -1,10 +1,10 @@ -#include +#include #include #include -#include -#include +#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { GameObjectSprite::GameObjectSprite( const Uint32& Flags, MapLayer * Layer, Graphics::Sprite * Sprite ) : GameObject( Flags, Layer ), diff --git a/src/eepp/gaming/gameobjectsubtexture.cpp b/src/eepp/maps/gameobjectsubtexture.cpp similarity index 94% rename from src/eepp/gaming/gameobjectsubtexture.cpp rename to src/eepp/maps/gameobjectsubtexture.cpp index 29407c162..391fa05fa 100644 --- a/src/eepp/gaming/gameobjectsubtexture.cpp +++ b/src/eepp/maps/gameobjectsubtexture.cpp @@ -1,10 +1,10 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { GameObjectSubTexture::GameObjectSubTexture( const Uint32& Flags, MapLayer * Layer, Graphics::SubTexture * SubTexture, const Vector2f& Pos ) : GameObject( Flags, Layer ), diff --git a/src/eepp/gaming/gameobjectsubtextureex.cpp b/src/eepp/maps/gameobjectsubtextureex.cpp similarity index 94% rename from src/eepp/gaming/gameobjectsubtextureex.cpp rename to src/eepp/maps/gameobjectsubtextureex.cpp index 87b970209..3f8c5db95 100644 --- a/src/eepp/gaming/gameobjectsubtextureex.cpp +++ b/src/eepp/maps/gameobjectsubtextureex.cpp @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { GameObjectSubTextureEx::GameObjectSubTextureEx( const Uint32& Flags, MapLayer * Layer, Graphics::SubTexture * SubTexture, const Vector2f& Pos, EE_BLEND_MODE Blend, EE_RENDER_MODE Render, Float Angle, Vector2f Scale, ColorA Color ) : GameObjectSubTexture( Flags, Layer, SubTexture, Pos ), diff --git a/src/eepp/gaming/gameobjectvirtual.cpp b/src/eepp/maps/gameobjectvirtual.cpp similarity index 95% rename from src/eepp/gaming/gameobjectvirtual.cpp rename to src/eepp/maps/gameobjectvirtual.cpp index f6a15c0e2..b55b0e0bc 100644 --- a/src/eepp/gaming/gameobjectvirtual.cpp +++ b/src/eepp/maps/gameobjectvirtual.cpp @@ -1,12 +1,12 @@ -#include +#include -#include -#include -#include +#include +#include +#include #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { GameObjectVirtual::GameObjectVirtual( Uint32 DataId, MapLayer * Layer, const Uint32& Flags, Uint32 Type, const Vector2f& Pos ) : GameObject( Flags, Layer ), diff --git a/src/eepp/gaming/mapeditor/mapeditor.cpp b/src/eepp/maps/mapeditor/mapeditor.cpp similarity index 98% rename from src/eepp/gaming/mapeditor/mapeditor.cpp rename to src/eepp/maps/mapeditor/mapeditor.cpp index 8d7b718c2..49dfc3dff 100644 --- a/src/eepp/gaming/mapeditor/mapeditor.cpp +++ b/src/eepp/maps/mapeditor/mapeditor.cpp @@ -1,20 +1,20 @@ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -23,11 +23,11 @@ #include using namespace EE::Graphics; -using namespace EE::Gaming::Private; +using namespace EE::Maps::Private; #define TAB_CONT_X_DIST 3 -namespace EE { namespace Gaming { +namespace EE { namespace Maps { static UITextView * createTextBox( const String& Text = "", UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE, const Uint32& fontStyle = Text::Regular ) { UITextView * Ctrl = UITextView::New(); @@ -905,7 +905,7 @@ void MapEditor::mapSave( const UIEvent * Event ) { path += ".eem"; } - mUIMap->Map()->save( path ); + mUIMap->Map()->saveToFile( path ); } void MapEditor::fileMenuClick( const UIEvent * Event ) { @@ -932,7 +932,7 @@ void MapEditor::fileMenuClick( const UIEvent * Event ) { TGDialog->show(); } else if ( "Save" == txt ) { if ( mUIMap->Map()->getPath().size() ) { - mUIMap->Map()->save( mUIMap->Map()->getPath() ); + mUIMap->Map()->saveToFile( mUIMap->Map()->getPath() ); } } else if ( "Close" == txt ) { UIMessageBox * MsgBox = UIMessageBox::New( MSGBOX_OKCANCEL, "Do you really want to close the current map?\nAll changes will be lost." ); diff --git a/src/eepp/gaming/mapeditor/maplayerproperties.cpp b/src/eepp/maps/mapeditor/maplayerproperties.cpp similarity index 97% rename from src/eepp/gaming/mapeditor/maplayerproperties.cpp rename to src/eepp/maps/mapeditor/maplayerproperties.cpp index dbc727e30..9bc33bd03 100644 --- a/src/eepp/gaming/mapeditor/maplayerproperties.cpp +++ b/src/eepp/maps/mapeditor/maplayerproperties.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { MapLayerProperties::MapLayerProperties( MapLayer * Map, RefreshLayerListCb Cb ) : mUITheme( NULL ), diff --git a/src/eepp/gaming/mapeditor/maplayerproperties.hpp b/src/eepp/maps/mapeditor/maplayerproperties.hpp similarity index 85% rename from src/eepp/gaming/mapeditor/maplayerproperties.hpp rename to src/eepp/maps/mapeditor/maplayerproperties.hpp index 949e9d1e3..c5fc75bd4 100644 --- a/src/eepp/gaming/mapeditor/maplayerproperties.hpp +++ b/src/eepp/maps/mapeditor/maplayerproperties.hpp @@ -1,16 +1,16 @@ #ifndef EE_GAMINGCLAYERPROPERTIES_HPP #define EE_GAMINGCLAYERPROPERTIES_HPP -#include -#include -#include +#include +#include +#include #include #include #include using namespace EE::UI; -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { class MapEditor; diff --git a/src/eepp/gaming/mapeditor/mapobjectproperties.cpp b/src/eepp/maps/mapeditor/mapobjectproperties.cpp similarity index 98% rename from src/eepp/gaming/mapeditor/mapobjectproperties.cpp rename to src/eepp/maps/mapeditor/mapobjectproperties.cpp index affe8f46b..f95b19d6d 100644 --- a/src/eepp/gaming/mapeditor/mapobjectproperties.cpp +++ b/src/eepp/maps/mapeditor/mapobjectproperties.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { static UITextView * createTextBox( const String& Text = "", UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE, const Uint32& fontStyle = Text::Regular ) { UITextView * Ctrl = UITextView::New(); diff --git a/src/eepp/gaming/mapeditor/mapobjectproperties.hpp b/src/eepp/maps/mapeditor/mapobjectproperties.hpp similarity index 83% rename from src/eepp/gaming/mapeditor/mapobjectproperties.hpp rename to src/eepp/maps/mapeditor/mapobjectproperties.hpp index 8655d8d10..17567e230 100644 --- a/src/eepp/gaming/mapeditor/mapobjectproperties.hpp +++ b/src/eepp/maps/mapeditor/mapobjectproperties.hpp @@ -1,16 +1,16 @@ #ifndef EE_GAMINGCLAYERPROPERTIES_HPP #define EE_GAMINGCLAYERPROPERTIES_HPP -#include -#include -#include +#include +#include +#include #include #include #include using namespace EE::UI; -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { class MapEditor; diff --git a/src/eepp/gaming/mapeditor/tilemapproperties.cpp b/src/eepp/maps/mapeditor/tilemapproperties.cpp similarity index 99% rename from src/eepp/gaming/mapeditor/tilemapproperties.cpp rename to src/eepp/maps/mapeditor/tilemapproperties.cpp index ceab1018c..d2ad64a3f 100644 --- a/src/eepp/gaming/mapeditor/tilemapproperties.cpp +++ b/src/eepp/maps/mapeditor/tilemapproperties.cpp @@ -1,6 +1,6 @@ -#include +#include -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { static UITextView * createTextBox( const String& Text = "", UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE, const Uint32& fontStyle = Text::Regular ) { UITextView * Ctrl = UITextView::New(); diff --git a/src/eepp/gaming/mapeditor/tilemapproperties.hpp b/src/eepp/maps/mapeditor/tilemapproperties.hpp similarity index 90% rename from src/eepp/gaming/mapeditor/tilemapproperties.hpp rename to src/eepp/maps/mapeditor/tilemapproperties.hpp index c051d74d0..4ebca6ec2 100644 --- a/src/eepp/gaming/mapeditor/tilemapproperties.hpp +++ b/src/eepp/maps/mapeditor/tilemapproperties.hpp @@ -1,8 +1,8 @@ #ifndef EE_GAMINGCMAPPROPERTIES_HPP #define EE_GAMINGCMAPPROPERTIES_HPP -#include -#include +#include +#include #include #include #include @@ -10,7 +10,7 @@ using namespace EE::UI; -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { class EE_API TileMapProperties { public: diff --git a/src/eepp/gaming/mapeditor/uigotypenew.cpp b/src/eepp/maps/mapeditor/uigotypenew.cpp similarity index 96% rename from src/eepp/gaming/mapeditor/uigotypenew.cpp rename to src/eepp/maps/mapeditor/uigotypenew.cpp index 3c6fc01cb..5d28d597b 100644 --- a/src/eepp/gaming/mapeditor/uigotypenew.cpp +++ b/src/eepp/maps/mapeditor/uigotypenew.cpp @@ -1,6 +1,6 @@ -#include +#include -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { UIGOTypeNew::UIGOTypeNew( cb::Callback2 Cb ) : mUITheme( NULL ), diff --git a/src/eepp/gaming/mapeditor/uigotypenew.hpp b/src/eepp/maps/mapeditor/uigotypenew.hpp similarity index 87% rename from src/eepp/gaming/mapeditor/uigotypenew.hpp rename to src/eepp/maps/mapeditor/uigotypenew.hpp index 23b539d9a..3768443ab 100644 --- a/src/eepp/gaming/mapeditor/uigotypenew.hpp +++ b/src/eepp/maps/mapeditor/uigotypenew.hpp @@ -1,13 +1,13 @@ #ifndef EE_GAMINGCUIGOTYPENEW_HPP #define EE_GAMINGCUIGOTYPENEW_HPP -#include +#include #include #include using namespace EE::UI; -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { class EE_API UIGOTypeNew { public: diff --git a/src/eepp/gaming/mapeditor/uimap.cpp b/src/eepp/maps/mapeditor/uimap.cpp similarity index 98% rename from src/eepp/gaming/mapeditor/uimap.cpp rename to src/eepp/maps/mapeditor/uimap.cpp index 493ce5ce4..81c56ad0d 100644 --- a/src/eepp/gaming/mapeditor/uimap.cpp +++ b/src/eepp/maps/mapeditor/uimap.cpp @@ -1,11 +1,11 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include #include -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { UIMap * UIMap::New( UITheme * Theme, TileMap * Map ) { return eeNew( UIMap, ( Theme, Map ) ); diff --git a/src/eepp/gaming/mapeditor/uimap.hpp b/src/eepp/maps/mapeditor/uimap.hpp similarity index 94% rename from src/eepp/gaming/mapeditor/uimap.hpp rename to src/eepp/maps/mapeditor/uimap.hpp index e3176a9fc..0173608b0 100644 --- a/src/eepp/gaming/mapeditor/uimap.hpp +++ b/src/eepp/maps/mapeditor/uimap.hpp @@ -1,18 +1,18 @@ #ifndef EE_GAMINGCUIMAP_HPP #define EE_GAMINGCUIMAP_HPP -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include using namespace EE::UI; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { class GameObjectObject; diff --git a/src/eepp/gaming/mapeditor/uimaplayernew.cpp b/src/eepp/maps/mapeditor/uimaplayernew.cpp similarity index 97% rename from src/eepp/gaming/mapeditor/uimaplayernew.cpp rename to src/eepp/maps/mapeditor/uimaplayernew.cpp index de76c65c0..c7a614fc1 100644 --- a/src/eepp/gaming/mapeditor/uimaplayernew.cpp +++ b/src/eepp/maps/mapeditor/uimaplayernew.cpp @@ -1,6 +1,6 @@ -#include +#include -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { UIMapLayerNew::UIMapLayerNew( UIMap * Map, EE_LAYER_TYPE Type, NewLayerCb newLayerCb ) : mTheme( NULL ), diff --git a/src/eepp/gaming/mapeditor/uimaplayernew.hpp b/src/eepp/maps/mapeditor/uimaplayernew.hpp similarity index 87% rename from src/eepp/gaming/mapeditor/uimaplayernew.hpp rename to src/eepp/maps/mapeditor/uimaplayernew.hpp index 6e7a97af2..e939cc63e 100644 --- a/src/eepp/gaming/mapeditor/uimaplayernew.hpp +++ b/src/eepp/maps/mapeditor/uimaplayernew.hpp @@ -1,14 +1,14 @@ #ifndef EE_GAMINGCUILAYERNEW_HPP #define EE_GAMINGCUILAYERNEW_HPP -#include +#include #include -#include +#include #include using namespace EE::UI; -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { class EE_API UIMapLayerNew { public: diff --git a/src/eepp/gaming/mapeditor/uimapnew.cpp b/src/eepp/maps/mapeditor/uimapnew.cpp similarity index 99% rename from src/eepp/gaming/mapeditor/uimapnew.cpp rename to src/eepp/maps/mapeditor/uimapnew.cpp index 2ba301c11..63ac6458a 100644 --- a/src/eepp/gaming/mapeditor/uimapnew.cpp +++ b/src/eepp/maps/mapeditor/uimapnew.cpp @@ -1,6 +1,6 @@ -#include +#include -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { static UITextView * createTextBox( const String& Text = "", UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE, const Uint32& fontStyle = Text::Regular ) { UITextView * Ctrl = UITextView::New(); @@ -253,7 +253,7 @@ void UIMapNew::onOKClick( const UIEvent * Event ) { } else { std::string oldPath( mUIMap->Map()->getPath() ); std::string mapPath( Sys::getTempPath() + "temp.eepp.map.eem" ); - mUIMap->Map()->save( mapPath ); + mUIMap->Map()->saveToFile( mapPath ); TileMap * Map = eeNew( TileMap, () ); Map->setBackColor( ColorA( 100, 100, 100, 100 ) ); diff --git a/src/eepp/gaming/mapeditor/uimapnew.hpp b/src/eepp/maps/mapeditor/uimapnew.hpp similarity index 91% rename from src/eepp/gaming/mapeditor/uimapnew.hpp rename to src/eepp/maps/mapeditor/uimapnew.hpp index ab9c00d44..91a636e50 100644 --- a/src/eepp/gaming/mapeditor/uimapnew.hpp +++ b/src/eepp/maps/mapeditor/uimapnew.hpp @@ -1,16 +1,16 @@ #ifndef EE_GAMINGCUIMAPNEW_HPP #define EE_GAMINGCUIMAPNEW_HPP -#include +#include #include #include #include #include -#include +#include using namespace EE::UI; -namespace EE { namespace Gaming { namespace Private { +namespace EE { namespace Maps { namespace Private { class EE_API UIMapNew { public: diff --git a/src/eepp/gaming/maplayer.cpp b/src/eepp/maps/maplayer.cpp similarity index 94% rename from src/eepp/gaming/maplayer.cpp rename to src/eepp/maps/maplayer.cpp index b9bcfb13e..9c315f26f 100644 --- a/src/eepp/gaming/maplayer.cpp +++ b/src/eepp/maps/maplayer.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { MapLayer::MapLayer( TileMap * map, Uint32 type, Uint32 flags, std::string name, Vector2f offset ) : mMap( map ), diff --git a/src/eepp/gaming/maplight.cpp b/src/eepp/maps/maplight.cpp similarity index 98% rename from src/eepp/gaming/maplight.cpp rename to src/eepp/maps/maplight.cpp index 0dc2b1b98..73fbbd7e1 100755 --- a/src/eepp/gaming/maplight.cpp +++ b/src/eepp/maps/maplight.cpp @@ -1,6 +1,6 @@ -#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { MapLight::MapLight() : mRadius( 0 ), diff --git a/src/eepp/gaming/maplightmanager.cpp b/src/eepp/maps/maplightmanager.cpp similarity index 98% rename from src/eepp/gaming/maplightmanager.cpp rename to src/eepp/maps/maplightmanager.cpp index 900d1c76d..378b001c3 100644 --- a/src/eepp/gaming/maplightmanager.cpp +++ b/src/eepp/maps/maplightmanager.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { MapLightManager::MapLightManager( TileMap * Map, bool ByVertex ) : mMap( Map ), diff --git a/src/eepp/gaming/mapobjectlayer.cpp b/src/eepp/maps/mapobjectlayer.cpp similarity index 94% rename from src/eepp/gaming/mapobjectlayer.cpp rename to src/eepp/maps/mapobjectlayer.cpp index 74a97cca7..1f5a3bd27 100644 --- a/src/eepp/gaming/mapobjectlayer.cpp +++ b/src/eepp/maps/mapobjectlayer.cpp @@ -1,14 +1,14 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { MapObjectLayer::MapObjectLayer( TileMap * map, Uint32 flags, std::string name, Vector2f offset ) : MapLayer( map, MAP_LAYER_OBJECT, flags, name, offset ) diff --git a/src/eepp/gaming/tilemap.cpp b/src/eepp/maps/tilemap.cpp similarity index 98% rename from src/eepp/gaming/tilemap.cpp rename to src/eepp/maps/tilemap.cpp index 325835d8f..f7a77886d 100644 --- a/src/eepp/gaming/tilemap.cpp +++ b/src/eepp/maps/tilemap.cpp @@ -1,13 +1,13 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -20,7 +20,7 @@ using namespace EE::Graphics; #include -namespace EE { namespace Gaming { +namespace EE { namespace Maps { TileMap::TileMap() : mWindow( Engine::instance()->getCurrentWindow() ), @@ -599,7 +599,7 @@ GameObjectPolyData& TileMap::getPolyObjData( Uint32 Id ) { return mPolyObjs[ Id ]; } -GameObject * TileMap::CreateGameObject( const Uint32& Type, const Uint32& Flags, MapLayer * Layer, const Uint32& DataId ) { +GameObject * TileMap::createGameObject( const Uint32& Type, const Uint32& Flags, MapLayer * Layer, const Uint32& DataId ) { switch ( Type ) { case GAMEOBJECT_TYPE_SUBTEXTURE: { @@ -923,7 +923,7 @@ bool TileMap::loadFromStream( IOStream& IOS ) { IOS.read( (char*)&tTGOHdr, sizeof(sMapTileGOHdr) ); - tGO = CreateGameObject( tTGOHdr.Type, tTGOHdr.Flags, mLayers[i], tTGOHdr.Id ); + tGO = createGameObject( tTGOHdr.Type, tTGOHdr.Flags, mLayers[i], tTGOHdr.Id ); tTLayer->addGameObject( tGO, Vector2i( x, y ) ); } @@ -988,7 +988,7 @@ bool TileMap::loadFromStream( IOStream& IOS ) { mLastObjId = eemax( mLastObjId, tOGOHdr.Id ); } - tGO = CreateGameObject( tOGOHdr.Type, tOGOHdr.Flags, mLayers[i], tOGOHdr.Id ); + tGO = createGameObject( tOGOHdr.Type, tOGOHdr.Flags, mLayers[i], tOGOHdr.Id ); tGO->setPosition( Vector2f( tOGOHdr.PosX, tOGOHdr.PosY ) ); @@ -1361,7 +1361,7 @@ void TileMap::saveToStream( IOStream& IOS ) { } } -void TileMap::save( const std::string& path ) { +void TileMap::saveToFile( const std::string& path ) { if ( !FileSystem::isDirectory( path ) ) { IOStreamFile IOS( path, std::ios::out | std::ios::binary ); diff --git a/src/eepp/gaming/tilemaplayer.cpp b/src/eepp/maps/tilemaplayer.cpp similarity index 97% rename from src/eepp/gaming/tilemaplayer.cpp rename to src/eepp/maps/tilemaplayer.cpp index fe0961fde..82cd366b0 100644 --- a/src/eepp/gaming/tilemaplayer.cpp +++ b/src/eepp/maps/tilemaplayer.cpp @@ -1,12 +1,12 @@ -#include -#include +#include +#include #include #include #include using namespace EE::Graphics; -namespace EE { namespace Gaming { +namespace EE { namespace Maps { TileMapLayer::TileMapLayer( TileMap * map, Sizei size, Uint32 flags, std::string name, Vector2f offset ) : MapLayer( map, MAP_LAYER_TILED, flags, name, offset ),