diff --git a/include/eepp/ee.hpp b/include/eepp/ee.hpp index 44939e994..255b8bc6e 100755 --- a/include/eepp/ee.hpp +++ b/include/eepp/ee.hpp @@ -23,6 +23,7 @@ /** @TODO Improve documentation. + @TODO Add support for the native on-screen keyboard on iOS and Android. @TODO Improve Premake4 support. It should be really easy to compile eepp in Windows and OS X ( Linux is always easy thanks to package managers ). @TODO Add more examples, showing at least the basic usage of the engine ( 10 or more examples at least ). @TODO Create a default UI Theme for the engine ( get rid off the ugly Aqua Theme ). diff --git a/include/eepp/gaming/mapeditor/base.hpp b/include/eepp/gaming/mapeditor/base.hpp deleted file mode 100644 index c20f84c59..000000000 --- a/include/eepp/gaming/mapeditor/base.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef EE_GAMINGME_BASE_CPP -#define EE_GAMINGME_BASE_CPP - -#include - -#endif diff --git a/include/eepp/gaming/mapeditor/cmapeditor.hpp b/include/eepp/gaming/mapeditor/cmapeditor.hpp index 63a8cb523..9a1004bfb 100644 --- a/include/eepp/gaming/mapeditor/cmapeditor.hpp +++ b/include/eepp/gaming/mapeditor/cmapeditor.hpp @@ -4,13 +4,16 @@ #include #include #include -#include +#include +#include +#include using namespace EE::UI; namespace EE { namespace Gaming { namespace MapEditor { class cUILayerNew; +class cUIMap; class EE_API cMapEditor { public: diff --git a/include/eepp/ui/tools/ctextureatlaseditor.hpp b/include/eepp/ui/tools/ctextureatlaseditor.hpp index d8e47848f..cb1e00da7 100644 --- a/include/eepp/ui/tools/ctextureatlaseditor.hpp +++ b/include/eepp/ui/tools/ctextureatlaseditor.hpp @@ -2,7 +2,6 @@ #define EE_UITOOLSCTEXTUREATLASEDITOR_HPP #include -#include #include #include #include @@ -13,6 +12,8 @@ namespace EE { namespace UI { namespace Tools { +class cTextureAtlasSubTextureEditor; + class EE_API cTextureAtlasEditor { public: typedef cb::Callback0 TGEditorCloseCb; diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index ff3c8c698..a3a40f87f 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/projects/linux/ee.files b/projects/linux/ee.files index 5bed5d021..094618491 100644 --- a/projects/linux/ee.files +++ b/projects/linux/ee.files @@ -96,14 +96,13 @@ ../../include/eepp/gaming/cgameobjectsubtexture.hpp ../../include/eepp/gaming/cgameobject.hpp ../../include/eepp/gaming/base.hpp -../../include/eepp/gaming/mapeditor/cuimapnew.hpp -../../include/eepp/gaming/mapeditor/cuimap.hpp -../../include/eepp/gaming/mapeditor/cuilayernew.hpp -../../include/eepp/gaming/mapeditor/cuigotypenew.hpp -../../include/eepp/gaming/mapeditor/cmapproperties.hpp +../../src/eepp/gaming/mapeditor/cuimapnew.hpp +../../src/eepp/gaming/mapeditor/cuimap.hpp +../../src/eepp/gaming/mapeditor/cuilayernew.hpp +../../src/eepp/gaming/mapeditor/cuigotypenew.hpp +../../src/eepp/gaming/mapeditor/cmapproperties.hpp ../../include/eepp/gaming/mapeditor/cmapeditor.hpp -../../include/eepp/gaming/mapeditor/clayerproperties.hpp -../../include/eepp/gaming/mapeditor/base.hpp +../../src/eepp/gaming/mapeditor/clayerproperties.hpp ../../src/eepp/gaming/ctilelayer.cpp ../../src/eepp/gaming/cobjectlayer.cpp ../../src/eepp/gaming/cmap.cpp @@ -275,8 +274,8 @@ ../../include/eepp/ui/cuibackground.hpp ../../include/eepp/ui/cuiaquatheme.hpp ../../include/eepp/ui/base.hpp -../../include/eepp/ui/tools/ctextureatlassubtextureeditor.hpp -../../include/eepp/ui/tools/ctextureatlasnew.hpp +../../src/eepp/ui/tools/ctextureatlassubtextureeditor.hpp +../../src/eepp/ui/tools/ctextureatlasnew.hpp ../../include/eepp/ui/tools/ctextureatlaseditor.hpp ../../src/eepp/ui/cuiwinmenu.cpp ../../src/eepp/ui/cuiwindow.cpp diff --git a/include/eepp/gaming/mapeditor/clayerproperties.hpp b/src/eepp/gaming/mapeditor/clayerproperties.hpp similarity index 100% rename from include/eepp/gaming/mapeditor/clayerproperties.hpp rename to src/eepp/gaming/mapeditor/clayerproperties.hpp diff --git a/src/eepp/gaming/mapeditor/cmapeditor.cpp b/src/eepp/gaming/mapeditor/cmapeditor.cpp index a45c95f4b..d80c6a36b 100644 --- a/src/eepp/gaming/mapeditor/cmapeditor.cpp +++ b/src/eepp/gaming/mapeditor/cmapeditor.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include diff --git a/include/eepp/gaming/mapeditor/cmapproperties.hpp b/src/eepp/gaming/mapeditor/cmapproperties.hpp similarity index 100% rename from include/eepp/gaming/mapeditor/cmapproperties.hpp rename to src/eepp/gaming/mapeditor/cmapproperties.hpp diff --git a/include/eepp/gaming/mapeditor/cuigotypenew.hpp b/src/eepp/gaming/mapeditor/cuigotypenew.hpp similarity index 100% rename from include/eepp/gaming/mapeditor/cuigotypenew.hpp rename to src/eepp/gaming/mapeditor/cuigotypenew.hpp diff --git a/include/eepp/gaming/mapeditor/cuilayernew.hpp b/src/eepp/gaming/mapeditor/cuilayernew.hpp similarity index 100% rename from include/eepp/gaming/mapeditor/cuilayernew.hpp rename to src/eepp/gaming/mapeditor/cuilayernew.hpp diff --git a/include/eepp/gaming/mapeditor/cuimap.hpp b/src/eepp/gaming/mapeditor/cuimap.hpp similarity index 100% rename from include/eepp/gaming/mapeditor/cuimap.hpp rename to src/eepp/gaming/mapeditor/cuimap.hpp diff --git a/include/eepp/gaming/mapeditor/cuimapnew.hpp b/src/eepp/gaming/mapeditor/cuimapnew.hpp similarity index 100% rename from include/eepp/gaming/mapeditor/cuimapnew.hpp rename to src/eepp/gaming/mapeditor/cuimapnew.hpp diff --git a/src/eepp/ui/tools/ctextureatlaseditor.cpp b/src/eepp/ui/tools/ctextureatlaseditor.cpp index 9a19e9bda..23ff0e98d 100644 --- a/src/eepp/ui/tools/ctextureatlaseditor.cpp +++ b/src/eepp/ui/tools/ctextureatlaseditor.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/include/eepp/ui/tools/ctextureatlasnew.hpp b/src/eepp/ui/tools/ctextureatlasnew.hpp similarity index 100% rename from include/eepp/ui/tools/ctextureatlasnew.hpp rename to src/eepp/ui/tools/ctextureatlasnew.hpp diff --git a/include/eepp/ui/tools/ctextureatlassubtextureeditor.hpp b/src/eepp/ui/tools/ctextureatlassubtextureeditor.hpp similarity index 100% rename from include/eepp/ui/tools/ctextureatlassubtextureeditor.hpp rename to src/eepp/ui/tools/ctextureatlassubtextureeditor.hpp