mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-08-18 06:55:48 +03:00
Renamed EE::Gaming module to EE::Maps.
--HG-- branch : dev
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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
|
||||
@@ -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
15
include/eepp/maps.hpp
Normal 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
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef EE_GAMING_BASE
|
||||
#define EE_GAMING_BASE
|
||||
#ifndef EE_MAPS__BASE
|
||||
#define EE_MAPS__BASE
|
||||
|
||||
#include <eepp/core.hpp>
|
||||
|
||||
@@ -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:
|
||||
@@ -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;
|
||||
|
||||
@@ -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:
|
||||
@@ -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:
|
||||
@@ -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:
|
||||
@@ -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:
|
||||
@@ -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:
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
@@ -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)
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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:
|
||||
Reference in New Issue
Block a user