Renamed EE::Gaming module to EE::Maps.

--HG--
branch : dev
This commit is contained in:
Martí­n Lucas Golini
2017-04-10 00:28:04 -03:00
parent 118eb40c13
commit eee63bf784
56 changed files with 581 additions and 377 deletions

View File

@@ -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.

View File

@@ -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 <eepp/gaming.hpp>
using namespace EE::Gaming;
// Maps
#include <eepp/maps.hpp>
using namespace EE::Maps;
// Physics
#include <eepp/physics.hpp>

View File

@@ -1,15 +0,0 @@
#ifndef EEPP_GAMING_HPP
#define EEPP_GAMING_HPP
#include <eepp/gaming/maplight.hpp>
#include <eepp/gaming/gameobject.hpp>
#include <eepp/gaming/gameobjectsubtexture.hpp>
#include <eepp/gaming/gameobjectsubtextureex.hpp>
#include <eepp/gaming/gameobjectsprite.hpp>
#include <eepp/gaming/maplayer.hpp>
#include <eepp/gaming/tilemaplayer.hpp>
#include <eepp/gaming/mapobjectlayer.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/gaming/mapeditor/mapeditor.hpp>
#endif

View File

@@ -1,5 +1,5 @@
#ifndef EE_GAMINGCGLOBALBATCHRENDERER_H
#define EE_GAMINGCGLOBALBATCHRENDERER_H
#ifndef EE_MAPS_CGLOBALBATCHRENDERER_H
#define EE_MAPS_CGLOBALBATCHRENDERER_H
#include <eepp/graphics/base.hpp>
#include <eepp/graphics/batchrenderer.hpp>

15
include/eepp/maps.hpp Normal file
View File

@@ -0,0 +1,15 @@
#ifndef EEPP_MAPS_HPP
#define EEPP_MAPS_HPP
#include <eepp/maps/maplight.hpp>
#include <eepp/maps/gameobject.hpp>
#include <eepp/maps/gameobjectsubtexture.hpp>
#include <eepp/maps/gameobjectsubtextureex.hpp>
#include <eepp/maps/gameobjectsprite.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/maps/tilemaplayer.hpp>
#include <eepp/maps/mapobjectlayer.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/maps/mapeditor/mapeditor.hpp>
#endif

View File

@@ -1,5 +1,5 @@
#ifndef EE_GAMING_BASE
#define EE_GAMING_BASE
#ifndef EE_MAPS__BASE
#define EE_MAPS__BASE
#include <eepp/core.hpp>

View File

@@ -1,14 +1,14 @@
#ifndef EE_GAMINGCGAMEOBJECT_HPP
#define EE_GAMINGCGAMEOBJECT_HPP
#ifndef EE_MAPS_CGAMEOBJECT_HPP
#define EE_MAPS_CGAMEOBJECT_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/gaming/maphelper.hpp>
#include <eepp/gaming/maplayer.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/maps/maphelper.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/graphics/graphicshelper.hpp>
using namespace EE::Graphics;
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class EE_API GameObject {
public:

View File

@@ -1,12 +1,12 @@
#ifndef EE_GAMINGCGAMEOBJECTOBJECT_HPP
#define EE_GAMINGCGAMEOBJECTOBJECT_HPP
#ifndef EE_MAPS_CGAMEOBJECTOBJECT_HPP
#define EE_MAPS_CGAMEOBJECTOBJECT_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/gaming/gameobject.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/maps/gameobject.hpp>
#include <eepp/graphics/subtexture.hpp>
using namespace EE::Graphics;
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class MapLayer;

View File

@@ -1,9 +1,9 @@
#ifndef EE_GAMINGCGAMEOBJECTPOLYGON_HPP
#define EE_GAMINGCGAMEOBJECTPOLYGON_HPP
#ifndef EE_MAPS_CGAMEOBJECTPOLYGON_HPP
#define EE_MAPS_CGAMEOBJECTPOLYGON_HPP
#include <eepp/gaming/gameobjectobject.hpp>
#include <eepp/maps/gameobjectobject.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class EE_API GameObjectPolygon : public GameObjectObject {
public:

View File

@@ -1,9 +1,9 @@
#ifndef EE_GAMINGCGAMEOBJECTPOLYLINE_HPP
#define EE_GAMINGCGAMEOBJECTPOLYLINE_HPP
#ifndef EE_MAPS_CGAMEOBJECTPOLYLINE_HPP
#define EE_MAPS_CGAMEOBJECTPOLYLINE_HPP
#include <eepp/gaming/gameobjectpolygon.hpp>
#include <eepp/maps/gameobjectpolygon.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class EE_API GameObjectPolyline : public GameObjectPolygon {
public:

View File

@@ -1,14 +1,14 @@
#ifndef EE_GAMINGCGAMEOBJECTSPRITE_HPP
#define EE_GAMINGCGAMEOBJECTSPRITE_HPP
#ifndef EE_MAPS_CGAMEOBJECTSPRITE_HPP
#define EE_MAPS_CGAMEOBJECTSPRITE_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/gaming/gameobject.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/maps/gameobject.hpp>
namespace EE { namespace Graphics {
class Sprite;
}}
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class EE_API GameObjectSprite : public GameObject {
public:

View File

@@ -1,13 +1,13 @@
#ifndef EE_GAMINGCGAMEOBJECTSUBTEXTURE_HPP
#define EE_GAMINGCGAMEOBJECTSUBTEXTURE_HPP
#ifndef EE_MAPS_CGAMEOBJECTSUBTEXTURE_HPP
#define EE_MAPS_CGAMEOBJECTSUBTEXTURE_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/gaming/gameobject.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/maps/gameobject.hpp>
#include <eepp/graphics/subtexture.hpp>
using namespace EE::Graphics;
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class EE_API GameObjectSubTexture : public GameObject {
public:

View File

@@ -1,10 +1,10 @@
#ifndef CGAMEOBJECTSUBTEXTUREEX_HPP
#define CGAMEOBJECTSUBTEXTUREEX_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/gaming/gameobjectsubtexture.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/maps/gameobjectsubtexture.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class EE_API GameObjectSubTextureEx : public GameObjectSubTexture {
public:

View File

@@ -1,12 +1,12 @@
#ifndef EE_GAMINGCGAMEOBJECTVIRTUAL_HPP
#define EE_GAMINGCGAMEOBJECTVIRTUAL_HPP
#ifndef EE_MAPS_CGAMEOBJECTVIRTUAL_HPP
#define EE_MAPS_CGAMEOBJECTVIRTUAL_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/gaming/gameobject.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/maps/gameobject.hpp>
#include <eepp/graphics/subtexture.hpp>
using namespace EE::Graphics;
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class MapLayer;

View File

@@ -1,7 +1,7 @@
#ifndef EE_GAMINGCMAPEDITOR_HPP
#define EE_GAMINGCMAPEDITOR_HPP
#ifndef EE_MAPS_CMAPEDITOR_HPP
#define EE_MAPS_CMAPEDITOR_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/ui/uiwindow.hpp>
#include <eepp/ui/uimenucheckbox.hpp>
#include <eepp/ui/uisubtexture.hpp>
@@ -16,9 +16,9 @@
#include <eepp/ui/uimessagebox.hpp>
#include <eepp/ui/uitabwidget.hpp>
#include <eepp/ui/tools/textureatlaseditor.hpp>
#include <eepp/gaming/maplayer.hpp>
#include <eepp/gaming/maplight.hpp>
#include <eepp/gaming/gameobject.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/maps/maplight.hpp>
#include <eepp/maps/gameobject.hpp>
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;

View File

@@ -1,9 +1,9 @@
#ifndef EE_GAMINGMAPHELPER_HPP
#define EE_GAMINGMAPHELPER_HPP
#ifndef EE_MAPS_MAPHELPER_HPP
#define EE_MAPS_MAPHELPER_HPP
#include <eepp/config.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
#define MAP_PROPERTY_SIZE (64)
#define LAYER_NAME_SIZE (64)

View File

@@ -1,9 +1,9 @@
#ifndef EE_GAMINGCLAYER_HPP
#define EE_GAMINGCLAYER_HPP
#ifndef EE_MAPS_CLAYER_HPP
#define EE_MAPS_CLAYER_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/maps/base.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class TileMap;

View File

@@ -1,9 +1,9 @@
#ifndef EE_GAMINGCLIGHT_H
#define EE_GAMINGCLIGHT_H
#ifndef EE_MAPS_CLIGHT_H
#define EE_MAPS_CLIGHT_H
#include <eepp/gaming/base.hpp>
#include <eepp/maps/base.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
/** @enum LIGHT_TYPE Define the light spot type */
enum LIGHT_TYPE {

View File

@@ -1,11 +1,11 @@
#ifndef EE_GAMINGCLIGHTMANAGER_HPP
#define EE_GAMINGCLIGHTMANAGER_HPP
#ifndef EE_MAPS_CLIGHTMANAGER_HPP
#define EE_MAPS_CLIGHTMANAGER_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/gaming/maplight.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/maps/maplight.hpp>
#include <list>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class TileMap;

View File

@@ -1,11 +1,11 @@
#ifndef EE_GAMINGCOBJECTLAYER_HPP
#define EE_GAMINGCOBJECTLAYER_HPP
#ifndef EE_MAPS_COBJECTLAYER_HPP
#define EE_MAPS_COBJECTLAYER_HPP
#include <eepp/gaming/maplayer.hpp>
#include <eepp/gaming/gameobject.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/maps/gameobject.hpp>
#include <list>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class TileMap;

View File

@@ -1,13 +1,13 @@
#ifndef EE_GAMINGCTILEMAP_HPP
#define EE_GAMINGCTILEMAP_HPP
#ifndef EE_MAPS_CTILEMAP_HPP
#define EE_MAPS_CTILEMAP_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/gaming/gameobject.hpp>
#include <eepp/gaming/gameobjectobject.hpp>
#include <eepp/gaming/maplight.hpp>
#include <eepp/gaming/maplightmanager.hpp>
#include <eepp/gaming/maplayer.hpp>
#include <eepp/maps/gameobject.hpp>
#include <eepp/maps/gameobjectobject.hpp>
#include <eepp/maps/maplight.hpp>
#include <eepp/maps/maplightmanager.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/window/input.hpp>
#include <eepp/window/engine.hpp>
@@ -17,7 +17,7 @@ using namespace EE::Window;
#include <eepp/graphics/texture.hpp>
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();

View File

@@ -1,10 +1,10 @@
#ifndef EE_GAMINGCTILELAYER_HPP
#define EE_GAMINGCTILELAYER_HPP
#ifndef EE_MAPS_CTILELAYER_HPP
#define EE_MAPS_CTILELAYER_HPP
#include <eepp/gaming/maplayer.hpp>
#include <eepp/gaming/gameobject.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/maps/gameobject.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class EE_API TileMapLayer : public MapLayer {
public:

View File

@@ -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()

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1,7 +1,7 @@
#include <eepp/gaming/gameobject.hpp>
#include <eepp/gaming/tilemaplayer.hpp>
#include <eepp/maps/gameobject.hpp>
#include <eepp/maps/tilemaplayer.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
GameObject::GameObject( const Uint32& Flags, MapLayer * Layer ) :
mFlags( Flags ),

View File

@@ -1,12 +1,12 @@
#include <eepp/gaming/gameobjectobject.hpp>
#include <eepp/maps/gameobjectobject.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/gaming/maplayer.hpp>
#include <eepp/gaming/tilemaplayer.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/maps/tilemaplayer.hpp>
#include <eepp/graphics/primitives.hpp>
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 ),

View File

@@ -1,10 +1,10 @@
#include <eepp/gaming/gameobjectpolygon.hpp>
#include <eepp/maps/gameobjectpolygon.hpp>
#include <eepp/gaming/maplayer.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/graphics/primitives.hpp>
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 )

View File

@@ -1,10 +1,10 @@
#include <eepp/gaming/gameobjectpolyline.hpp>
#include <eepp/maps/gameobjectpolyline.hpp>
#include <eepp/gaming/maplayer.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/graphics/primitives.hpp>
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 )

View File

@@ -1,10 +1,10 @@
#include <eepp/gaming/gameobjectsprite.hpp>
#include <eepp/maps/gameobjectsprite.hpp>
#include <eepp/graphics/sprite.hpp>
#include <eepp/graphics/textureatlasmanager.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/gaming/tilemaplayer.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/maps/tilemaplayer.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
GameObjectSprite::GameObjectSprite( const Uint32& Flags, MapLayer * Layer, Graphics::Sprite * Sprite ) :
GameObject( Flags, Layer ),

View File

@@ -1,10 +1,10 @@
#include <eepp/gaming/gameobjectsubtexture.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/gaming/tilemaplayer.hpp>
#include <eepp/gaming/maplightmanager.hpp>
#include <eepp/maps/gameobjectsubtexture.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/maps/tilemaplayer.hpp>
#include <eepp/maps/maplightmanager.hpp>
#include <eepp/graphics/textureatlasmanager.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
GameObjectSubTexture::GameObjectSubTexture( const Uint32& Flags, MapLayer * Layer, Graphics::SubTexture * SubTexture, const Vector2f& Pos ) :
GameObject( Flags, Layer ),

View File

@@ -1,8 +1,8 @@
#include <eepp/gaming/gameobjectsubtextureex.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/gaming/tilemaplayer.hpp>
#include <eepp/maps/gameobjectsubtextureex.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/maps/tilemaplayer.hpp>
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 ),

View File

@@ -1,12 +1,12 @@
#include <eepp/gaming/gameobjectvirtual.hpp>
#include <eepp/maps/gameobjectvirtual.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/gaming/maplayer.hpp>
#include <eepp/gaming/tilemaplayer.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/maps/tilemaplayer.hpp>
#include <eepp/graphics/primitives.hpp>
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 ),

View File

@@ -1,20 +1,20 @@
#include <eepp/gaming/mapeditor/mapeditor.hpp>
#include <eepp/gaming/mapeditor/uimapnew.hpp>
#include <eepp/gaming/mapeditor/uimaplayernew.hpp>
#include <eepp/gaming/mapeditor/uigotypenew.hpp>
#include <eepp/gaming/mapeditor/tilemapproperties.hpp>
#include <eepp/gaming/mapeditor/maplayerproperties.hpp>
#include <eepp/gaming/mapeditor/uimap.hpp>
#include <eepp/maps/mapeditor/mapeditor.hpp>
#include <eepp/maps/mapeditor/uimapnew.hpp>
#include <eepp/maps/mapeditor/uimaplayernew.hpp>
#include <eepp/maps/mapeditor/uigotypenew.hpp>
#include <eepp/maps/mapeditor/tilemapproperties.hpp>
#include <eepp/maps/mapeditor/maplayerproperties.hpp>
#include <eepp/maps/mapeditor/uimap.hpp>
#include <eepp/gaming/tilemaplayer.hpp>
#include <eepp/gaming/mapobjectlayer.hpp>
#include <eepp/gaming/gameobjectvirtual.hpp>
#include <eepp/gaming/gameobjectsubtexture.hpp>
#include <eepp/gaming/gameobjectsubtextureex.hpp>
#include <eepp/gaming/gameobjectsprite.hpp>
#include <eepp/gaming/gameobjectobject.hpp>
#include <eepp/gaming/gameobjectpolygon.hpp>
#include <eepp/gaming/gameobjectpolyline.hpp>
#include <eepp/maps/tilemaplayer.hpp>
#include <eepp/maps/mapobjectlayer.hpp>
#include <eepp/maps/gameobjectvirtual.hpp>
#include <eepp/maps/gameobjectsubtexture.hpp>
#include <eepp/maps/gameobjectsubtextureex.hpp>
#include <eepp/maps/gameobjectsprite.hpp>
#include <eepp/maps/gameobjectobject.hpp>
#include <eepp/maps/gameobjectpolygon.hpp>
#include <eepp/maps/gameobjectpolyline.hpp>
#include <eepp/graphics/sprite.hpp>
#include <eepp/graphics/textureatlasmanager.hpp>
#include <eepp/graphics/globaltextureatlas.hpp>
@@ -23,11 +23,11 @@
#include <algorithm>
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." );

View File

@@ -1,7 +1,7 @@
#include <eepp/gaming/mapeditor/maplayerproperties.hpp>
#include <eepp/gaming/mapeditor/mapeditor.hpp>
#include <eepp/maps/mapeditor/maplayerproperties.hpp>
#include <eepp/maps/mapeditor/mapeditor.hpp>
namespace EE { namespace Gaming { namespace Private {
namespace EE { namespace Maps { namespace Private {
MapLayerProperties::MapLayerProperties( MapLayer * Map, RefreshLayerListCb Cb ) :
mUITheme( NULL ),

View File

@@ -1,16 +1,16 @@
#ifndef EE_GAMINGCLAYERPROPERTIES_HPP
#define EE_GAMINGCLAYERPROPERTIES_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/gaming/maphelper.hpp>
#include <eepp/gaming/maplayer.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/maps/maphelper.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/ui/uiwindow.hpp>
#include <eepp/ui/uitable.hpp>
#include <eepp/ui/uitextinput.hpp>
using namespace EE::UI;
namespace EE { namespace Gaming { namespace Private {
namespace EE { namespace Maps { namespace Private {
class MapEditor;

View File

@@ -1,7 +1,7 @@
#include <eepp/gaming/mapeditor/mapobjectproperties.hpp>
#include <eepp/gaming/mapeditor/mapeditor.hpp>
#include <eepp/maps/mapeditor/mapobjectproperties.hpp>
#include <eepp/maps/mapeditor/mapeditor.hpp>
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();

View File

@@ -1,16 +1,16 @@
#ifndef EE_GAMINGCLAYERPROPERTIES_HPP
#define EE_GAMINGCLAYERPROPERTIES_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/gaming/maphelper.hpp>
#include <eepp/gaming/gameobjectobject.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/maps/maphelper.hpp>
#include <eepp/maps/gameobjectobject.hpp>
#include <eepp/ui/uiwindow.hpp>
#include <eepp/ui/uitable.hpp>
#include <eepp/ui/uitextinput.hpp>
using namespace EE::UI;
namespace EE { namespace Gaming { namespace Private {
namespace EE { namespace Maps { namespace Private {
class MapEditor;

View File

@@ -1,6 +1,6 @@
#include <eepp/gaming/mapeditor/tilemapproperties.hpp>
#include <eepp/maps/mapeditor/tilemapproperties.hpp>
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();

View File

@@ -1,8 +1,8 @@
#ifndef EE_GAMINGCMAPPROPERTIES_HPP
#define EE_GAMINGCMAPPROPERTIES_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/ui/uiwindow.hpp>
#include <eepp/ui/uitable.hpp>
#include <eepp/ui/uitextinput.hpp>
@@ -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:

View File

@@ -1,6 +1,6 @@
#include <eepp/gaming/mapeditor/uigotypenew.hpp>
#include <eepp/maps/mapeditor/uigotypenew.hpp>
namespace EE { namespace Gaming { namespace Private {
namespace EE { namespace Maps { namespace Private {
UIGOTypeNew::UIGOTypeNew( cb::Callback2<void, std::string, Uint32> Cb ) :
mUITheme( NULL ),

View File

@@ -1,13 +1,13 @@
#ifndef EE_GAMINGCUIGOTYPENEW_HPP
#define EE_GAMINGCUIGOTYPENEW_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/ui/uiwindow.hpp>
#include <eepp/ui/uitextinput.hpp>
using namespace EE::UI;
namespace EE { namespace Gaming { namespace Private {
namespace EE { namespace Maps { namespace Private {
class EE_API UIGOTypeNew {
public:

View File

@@ -1,11 +1,11 @@
#include <eepp/gaming/mapeditor/uimap.hpp>
#include <eepp/gaming/mapeditor/mapobjectproperties.hpp>
#include <eepp/gaming/gameobjectobject.hpp>
#include <eepp/gaming/mapobjectlayer.hpp>
#include <eepp/maps/mapeditor/uimap.hpp>
#include <eepp/maps/mapeditor/mapobjectproperties.hpp>
#include <eepp/maps/gameobjectobject.hpp>
#include <eepp/maps/mapobjectlayer.hpp>
#include <eepp/ui/uimanager.hpp>
#include <eepp/ui/uipopupmenu.hpp>
namespace EE { namespace Gaming { namespace Private {
namespace EE { namespace Maps { namespace Private {
UIMap * UIMap::New( UITheme * Theme, TileMap * Map ) {
return eeNew( UIMap, ( Theme, Map ) );

View File

@@ -1,18 +1,18 @@
#ifndef EE_GAMINGCUIMAP_HPP
#define EE_GAMINGCUIMAP_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/ui/uiwidget.hpp>
#include <eepp/ui/uitextview.hpp>
#include <eepp/ui/uimessagebox.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/gaming/maplightmanager.hpp>
#include <eepp/gaming/maplight.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/maps/maplightmanager.hpp>
#include <eepp/maps/maplight.hpp>
#include <eepp/graphics/primitives.hpp>
using namespace EE::UI;
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
class GameObjectObject;

View File

@@ -1,6 +1,6 @@
#include <eepp/gaming/mapeditor/uimaplayernew.hpp>
#include <eepp/maps/mapeditor/uimaplayernew.hpp>
namespace EE { namespace Gaming { namespace Private {
namespace EE { namespace Maps { namespace Private {
UIMapLayerNew::UIMapLayerNew( UIMap * Map, EE_LAYER_TYPE Type, NewLayerCb newLayerCb ) :
mTheme( NULL ),

View File

@@ -1,14 +1,14 @@
#ifndef EE_GAMINGCUILAYERNEW_HPP
#define EE_GAMINGCUILAYERNEW_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/ui/uiwindow.hpp>
#include <eepp/gaming/mapeditor/uimap.hpp>
#include <eepp/maps/mapeditor/uimap.hpp>
#include <eepp/ui/uitextinput.hpp>
using namespace EE::UI;
namespace EE { namespace Gaming { namespace Private {
namespace EE { namespace Maps { namespace Private {
class EE_API UIMapLayerNew {
public:

View File

@@ -1,6 +1,6 @@
#include <eepp/gaming/mapeditor/uimapnew.hpp>
#include <eepp/maps/mapeditor/uimapnew.hpp>
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 ) );

View File

@@ -1,16 +1,16 @@
#ifndef EE_GAMINGCUIMAPNEW_HPP
#define EE_GAMINGCUIMAPNEW_HPP
#include <eepp/gaming/base.hpp>
#include <eepp/maps/base.hpp>
#include <eepp/ui/uiwindow.hpp>
#include <eepp/ui/uispinbox.hpp>
#include <eepp/ui/uicheckbox.hpp>
#include <eepp/ui/uislider.hpp>
#include <eepp/gaming/mapeditor/uimap.hpp>
#include <eepp/maps/mapeditor/uimap.hpp>
using namespace EE::UI;
namespace EE { namespace Gaming { namespace Private {
namespace EE { namespace Maps { namespace Private {
class EE_API UIMapNew {
public:

View File

@@ -1,7 +1,7 @@
#include <eepp/gaming/maplayer.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/maps/maplayer.hpp>
#include <eepp/maps/tilemap.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
MapLayer::MapLayer( TileMap * map, Uint32 type, Uint32 flags, std::string name, Vector2f offset ) :
mMap( map ),

View File

@@ -1,6 +1,6 @@
#include <eepp/gaming/maplight.hpp>
#include <eepp/maps/maplight.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
MapLight::MapLight() :
mRadius( 0 ),

View File

@@ -1,7 +1,7 @@
#include <eepp/gaming/maplightmanager.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/maps/maplightmanager.hpp>
#include <eepp/maps/tilemap.hpp>
namespace EE { namespace Gaming {
namespace EE { namespace Maps {
MapLightManager::MapLightManager( TileMap * Map, bool ByVertex ) :
mMap( Map ),

View File

@@ -1,14 +1,14 @@
#include <eepp/gaming/mapobjectlayer.hpp>
#include <eepp/gaming/gameobjectobject.hpp>
#include <eepp/gaming/gameobjectpolygon.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/maps/mapobjectlayer.hpp>
#include <eepp/maps/gameobjectobject.hpp>
#include <eepp/maps/gameobjectpolygon.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/graphics/texture.hpp>
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
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 )

View File

@@ -1,13 +1,13 @@
#include <eepp/gaming/tilemap.hpp>
#include <eepp/gaming/gameobjectvirtual.hpp>
#include <eepp/gaming/gameobjectsubtexture.hpp>
#include <eepp/gaming/gameobjectsubtextureex.hpp>
#include <eepp/gaming/gameobjectsprite.hpp>
#include <eepp/gaming/gameobjectobject.hpp>
#include <eepp/gaming/gameobjectpolygon.hpp>
#include <eepp/gaming/gameobjectpolyline.hpp>
#include <eepp/gaming/tilemaplayer.hpp>
#include <eepp/gaming/mapobjectlayer.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/maps/gameobjectvirtual.hpp>
#include <eepp/maps/gameobjectsubtexture.hpp>
#include <eepp/maps/gameobjectsubtextureex.hpp>
#include <eepp/maps/gameobjectsprite.hpp>
#include <eepp/maps/gameobjectobject.hpp>
#include <eepp/maps/gameobjectpolygon.hpp>
#include <eepp/maps/gameobjectpolyline.hpp>
#include <eepp/maps/tilemaplayer.hpp>
#include <eepp/maps/mapobjectlayer.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/graphics/renderer/opengl.hpp>
@@ -20,7 +20,7 @@ using namespace EE::Graphics;
#include <eepp/ui/uithememanager.hpp>
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 );

View File

@@ -1,12 +1,12 @@
#include <eepp/gaming/tilemaplayer.hpp>
#include <eepp/gaming/tilemap.hpp>
#include <eepp/maps/tilemaplayer.hpp>
#include <eepp/maps/tilemap.hpp>
#include <eepp/graphics/texture.hpp>
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
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 ),