diff --git a/README.md b/README.md index 5c583cca5..f09c2015e 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ Entropia Engine++ * Backend based module, this means that you can easily create a backend for the window/input handling. - * Currently supports SDL 1.2, SDL 2 and SFML as backends. + * Currently supports SDL 2 and SFML as backends. - * Clipboard support ( SDL 2 backend and partial support with SDL 1.2 ). + * Clipboard support ( SDL 2 backend ). - * Color hardware cursors ( SDL 2 fully supported, partial support with SDL 1.2 and SFML ). + * Color hardware cursors ( SDL 2 fully supported, partial support with SFML ). * Multiple windows @@ -74,7 +74,7 @@ Entropia Engine++ * Provides all the basics stuffs for the full multi-threading support of the engine, file formats support for packing, clocks, resource manager, and much more. -*Core Module:* +**Core Module:** -------------- * Customizable Memory Manager. Used by default in debug mode to track memory leaks. diff --git a/include/eepp/graphics/arcdrawable.hpp b/include/eepp/graphics/arcdrawable.hpp index c91637e85..71a783176 100644 --- a/include/eepp/graphics/arcdrawable.hpp +++ b/include/eepp/graphics/arcdrawable.hpp @@ -6,7 +6,7 @@ namespace EE { namespace Graphics { -class ArcDrawable : public PrimitiveDrawable { +class EE_API ArcDrawable : public PrimitiveDrawable { public: ArcDrawable(); diff --git a/include/eepp/graphics/circledrawable.hpp b/include/eepp/graphics/circledrawable.hpp index 94d2668d5..cf368a416 100644 --- a/include/eepp/graphics/circledrawable.hpp +++ b/include/eepp/graphics/circledrawable.hpp @@ -5,7 +5,7 @@ namespace EE { namespace Graphics { -class CircleDrawable : public ArcDrawable { +class EE_API CircleDrawable : public ArcDrawable { public: CircleDrawable(); diff --git a/include/eepp/graphics/primitivedrawable.hpp b/include/eepp/graphics/primitivedrawable.hpp index fd7ca138e..f6f48881e 100644 --- a/include/eepp/graphics/primitivedrawable.hpp +++ b/include/eepp/graphics/primitivedrawable.hpp @@ -7,7 +7,7 @@ namespace EE { namespace Graphics { class VertexBuffer; -class PrimitiveDrawable : public Drawable { +class EE_API PrimitiveDrawable : public Drawable { public: PrimitiveDrawable( EE_DRAWABLE_TYPE drawableType ); @@ -36,7 +36,6 @@ class PrimitiveDrawable : public Drawable { EE_FILL_MODE mFillMode; EE_BLEND_MODE mBlendMode; Float mLineWidth; - Vector2f mPosition; bool mNeedsUpdate; bool mRecreateVertexBuffer; VertexBuffer * mVertexBuffer; diff --git a/include/eepp/graphics/rectangledrawable.hpp b/include/eepp/graphics/rectangledrawable.hpp index 6effd6a7b..a9bb3fae8 100644 --- a/include/eepp/graphics/rectangledrawable.hpp +++ b/include/eepp/graphics/rectangledrawable.hpp @@ -6,7 +6,7 @@ namespace EE { namespace Graphics { -class RectangleDrawable : public PrimitiveDrawable { +class EE_API RectangleDrawable : public PrimitiveDrawable { public: RectangleDrawable(); diff --git a/include/eepp/graphics/renderer/clippingmask.hpp b/include/eepp/graphics/renderer/clippingmask.hpp new file mode 100644 index 000000000..60e126a10 --- /dev/null +++ b/include/eepp/graphics/renderer/clippingmask.hpp @@ -0,0 +1,65 @@ +#ifndef EE_GRAPHICS_CLIPPINGMASK_HPP +#define EE_GRAPHICS_CLIPPINGMASK_HPP + +#include +#include +#include +#include + +namespace EE { namespace Graphics { + +class EE_API ClippingMask { + public: + enum Mode { + Inclusive, + Exclusive + }; + + /** Set the current Clipping area ( default the entire window, SCISSOR TEST ). */ + void clipEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ); + + /** Disable the Clipping area */ + void clipDisable(); + + /** Clip the area with a plane. */ + void clipPlaneEnable( const Int32& x, const Int32& y, const Int32& Width, const Int32& Height ); + + /** Disable the clip plane area. */ + void clipPlaneDisable(); + + std::size_t getMaskCount() const; + + const Drawable*& operator [](std::size_t index); + + const Drawable* const& operator [](std::size_t index) const; + + void clearMasks(); + + void appendMask(const Drawable& drawable); + + void removeMask(const Drawable& drawable); + + Mode getMaskMode() const; + + void setMaskMode(Mode theMode); + + void stencilMaskEnable(); + + void stencilMaskDisable( bool clearMasks = false ); + protected: + std::list mScissorsClipped; + bool mPushScissorClip; + + std::vector mDrawables; + Mode mMode; + + void drawMask(); + private: + friend class Renderer; + + ClippingMask(); +}; + +}} + +#endif diff --git a/include/eepp/graphics/renderer/renderer.hpp b/include/eepp/graphics/renderer/renderer.hpp index 334b647ee..6382c350e 100644 --- a/include/eepp/graphics/renderer/renderer.hpp +++ b/include/eepp/graphics/renderer/renderer.hpp @@ -4,6 +4,7 @@ #include #include #include +#include namespace EE { namespace Graphics { @@ -210,6 +211,8 @@ class EE_API Renderer { const bool& quadsSupported() const; const int& quadVertexs() const; + + ClippingMask * getClippingMask() const; protected: static Renderer * sSingleton; @@ -228,6 +231,7 @@ class EE_API Renderer { unsigned int mCurVAO; std::list mPlanesClipped; + ClippingMask * mClippingMask; private: void writeExtension( Uint8 Pos, Uint32 BitWrite ); }; diff --git a/include/eepp/ui/uicontrol.hpp b/include/eepp/ui/uicontrol.hpp index 62c3054a7..094e2d24e 100644 --- a/include/eepp/ui/uicontrol.hpp +++ b/include/eepp/ui/uicontrol.hpp @@ -301,7 +301,7 @@ class EE_API UIControl { virtual Uint32 onValueChange(); - virtual void onVisibleChange(); + virtual void onVisibilityChange(); virtual void onEnabledChange(); diff --git a/include/eepp/ui/uiwidget.hpp b/include/eepp/ui/uiwidget.hpp index 9a7dacaff..6eb3fe34c 100644 --- a/include/eepp/ui/uiwidget.hpp +++ b/include/eepp/ui/uiwidget.hpp @@ -100,6 +100,8 @@ class EE_API UIWidget : public UIControlAnim { virtual void onPositionChange(); + virtual void onVisibilityChange(); + virtual void onAutoSize(); void notifyLayoutAttrChange(); diff --git a/include/eepp/window/window.hpp b/include/eepp/window/window.hpp index b12661b57..53786a4c2 100644 --- a/include/eepp/window/window.hpp +++ b/include/eepp/window/window.hpp @@ -318,18 +318,6 @@ class EE_API Window { /** Get a frame per second limit. */ Uint32 getFrameRateLimit(); - /** Set the current Clipping area ( default the entire window, SCISSOR TEST ). */ - void clipEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ); - - /** Disable the Clipping area */ - void clipDisable(); - - /** Clip the area with a plane. */ - void clipPlaneEnable( const Int32& x, const Int32& y, const Int32& Width, const Int32& Height ); - - /** Disable the clip plane area. */ - void clipPlaneDisable(); - /** @return The clipboard manager */ Clipboard * getClipboard() const; @@ -492,8 +480,6 @@ class EE_API Window { }; FrameData mFrameData; - std::list mScissorsClipped; - bool mPushScissorClip; /** Set the flag state to be the current window */ virtual void setCurrent(); diff --git a/projects/linux/ee.files b/projects/linux/ee.files index 5f3603892..1bda16342 100644 --- a/projects/linux/ee.files +++ b/projects/linux/ee.files @@ -10,6 +10,7 @@ ../../include/eepp/graphics/primitivedrawable.hpp ../../include/eepp/graphics/rectangledrawable.hpp ../../include/eepp/graphics/renderer/base.hpp +../../include/eepp/graphics/renderer/clippingmask.hpp ../../include/eepp/graphics/renderer/opengl.hpp ../../include/eepp/graphics/renderer/renderer.hpp ../../include/eepp/graphics/renderer/renderer.hpp @@ -48,6 +49,7 @@ ../../src/eepp/graphics/pixelperfect.cpp ../../src/eepp/graphics/primitivedrawable.cpp ../../src/eepp/graphics/rectangledrawable.cpp +../../src/eepp/graphics/renderer/clippingmask.cpp ../../src/eepp/graphics/renderer/openglext.hpp ../../src/eepp/graphics/renderer/renderer.cpp ../../src/eepp/graphics/renderer/renderer.cpp diff --git a/projects/osx/ee.config b/projects/osx/ee.config index 3fbdaf4a8..2769b52ec 100644 --- a/projects/osx/ee.config +++ b/projects/osx/ee.config @@ -1,13 +1,15 @@ -#define EE_BACKEND_SDL_ACTIVE -#define EE_BACKEND_ALLEGRO_ACTIVE -#define EE_BACKEND_SFML_ACTIVE #define EE_SDL_VERSION_2 -#define EE_SDL_VERSION_1_2 -#define EE_BACKEND_SDL2 -#define EE_BACKEND_SDL_1_2 #define EE_X11_PLATFORM #define EE_DEBUG #define EE_LIBSNDFILE_ENABLED #define EE_MEMORY_MANAGER #define EE_GL3_ENABLED 1 #define EE_SHADERS_SUPPORTED +#define EE_GLEW_AVAILABLE +#define EE_SSL_SUPPORT +#define EE_OPENSSL +#define EE_BACKEND_SFML_ACTIVE +#define EE_BACKEND_SDL2 +#define EE_GL3_ENABLED +#define EE_SHADERS_SUPPORTED +#define EE_BACKEND_SDL_ACTIVE diff --git a/projects/osx/ee.files b/projects/osx/ee.files index 229e9379a..1bda16342 100644 --- a/projects/osx/ee.files +++ b/projects/osx/ee.files @@ -1,22 +1,101 @@ -../../include/eepp/audio/tsoundmanager.hpp -../../include/eepp/audio/tsoundloader.hpp -../../include/eepp/audio/csoundstream.hpp -../../include/eepp/audio/csoundbuffer.hpp -../../include/eepp/audio/csound.hpp -../../include/eepp/audio/cmusic.hpp -../../include/eepp/audio/caudiolistener.hpp -../../include/eepp/audio/caudiodevice.hpp +../../include/eepp/graphics/arcdrawable.hpp +../../include/eepp/graphics/circledrawable.hpp +../../include/eepp/graphics/drawable.hpp +../../include/eepp/graphics/drawablesearcher.hpp +../../include/eepp/graphics/font.hpp +../../include/eepp/graphics/fontstyleconfig.hpp +../../include/eepp/graphics/fonttruetype.hpp +../../include/eepp/graphics/fonttruetypeloader.hpp +../../include/eepp/graphics/graphicshelper.hpp +../../include/eepp/graphics/primitivedrawable.hpp +../../include/eepp/graphics/rectangledrawable.hpp +../../include/eepp/graphics/renderer/base.hpp +../../include/eepp/graphics/renderer/clippingmask.hpp +../../include/eepp/graphics/renderer/opengl.hpp +../../include/eepp/graphics/renderer/renderer.hpp +../../include/eepp/graphics/renderer/renderer.hpp +../../include/eepp/graphics/renderer/renderergl.hpp +../../include/eepp/graphics/renderer/renderergl3.hpp +../../include/eepp/graphics/renderer/renderergl3cp.hpp +../../include/eepp/graphics/renderer/renderergles2.hpp +../../include/eepp/graphics/renderer/rendererhelper.hpp +../../include/eepp/graphics/text.hpp +../../include/eepp/graphics/vertexbufferhelper.hpp +../../include/eepp/math/interpolation1d.hpp +../../include/eepp/math/interpolation2d.hpp +../../include/eepp/system/color.hpp +../../include/eepp/system/translator.hpp +../../include/eepp/ui/uidragablecontrol.hpp +../../include/eepp/ui/uiimage.hpp +../../include/eepp/ui/uilinearlayout.hpp +../../include/eepp/ui/uimenuseparator.hpp +../../include/eepp/ui/uirelativelayout.hpp +../../include/eepp/ui/uisubtexture.hpp +../../include/eepp/ui/uitable.hpp +../../include/eepp/ui/uitablecell.hpp +../../include/eepp/ui/uitextview.hpp +../../include/eepp/ui/uithemeconfig.hpp +../../include/eepp/ui/uithemedefault.hpp +../../include/eepp/ui/uiwidget.hpp +../../src/eepp/gaming/mapobjectlayer.cpp +../../src/eepp/graphics/arcdrawable.cpp +../../src/eepp/graphics/circledrawable.cpp +../../src/eepp/graphics/drawable.cpp +../../src/eepp/graphics/drawablesearcher.cpp +../../src/eepp/graphics/fonttruetype.cpp +../../src/eepp/graphics/fonttruetypeloader.cpp +../../src/eepp/graphics/globalbatchrenderer.cpp +../../src/eepp/graphics/pixeldensity.cpp +../../src/eepp/graphics/pixelperfect.cpp +../../src/eepp/graphics/primitivedrawable.cpp +../../src/eepp/graphics/rectangledrawable.cpp +../../src/eepp/graphics/renderer/clippingmask.cpp +../../src/eepp/graphics/renderer/openglext.hpp +../../src/eepp/graphics/renderer/renderer.cpp +../../src/eepp/graphics/renderer/renderer.cpp +../../src/eepp/graphics/renderer/renderergl.cpp +../../src/eepp/graphics/renderer/renderergl3.cpp +../../src/eepp/graphics/renderer/renderergl3cp.cpp +../../src/eepp/graphics/renderer/renderergles2.cpp +../../src/eepp/graphics/renderer/rendererstackhelper.hpp +../../src/eepp/graphics/renderer/rendererstackhelper.hpp +../../src/eepp/graphics/text.cpp +../../src/eepp/math/interpolation1d.cpp +../../src/eepp/math/interpolation2d.cpp +../../src/eepp/system/color.cpp +../../src/eepp/system/translator.cpp +../../src/eepp/ui/uidragablecontrol.cpp +../../src/eepp/ui/uihelper.cpp +../../src/eepp/ui/uiimage.cpp +../../src/eepp/ui/uilinearlayout.cpp +../../src/eepp/ui/uimenuseparator.cpp +../../src/eepp/ui/uirelativelayout.cpp +../../src/eepp/ui/uisubtexture.cpp +../../src/eepp/ui/uitable.cpp +../../src/eepp/ui/uitablecell.cpp +../../src/eepp/ui/uitextview.cpp +../../src/eepp/ui/uithemedefault.cpp +../../src/eepp/ui/uiwidget.cpp +../../../eeiv/src/capp.cpp +../../include/eepp/audio/soundmanager.hpp +../../include/eepp/audio/soundloader.hpp +../../include/eepp/audio/soundstream.hpp +../../include/eepp/audio/soundbuffer.hpp +../../include/eepp/audio/sound.hpp +../../include/eepp/audio/music.hpp +../../include/eepp/audio/audiolistener.hpp +../../include/eepp/audio/audiodevice.hpp ../../include/eepp/audio/base.hpp ../../src/eepp/audio/openal.cpp -../../src/eepp/audio/csoundstream.cpp -../../src/eepp/audio/csoundfileogg.cpp -../../src/eepp/audio/csoundfiledefault.cpp -../../src/eepp/audio/csoundfile.cpp -../../src/eepp/audio/csoundbuffer.cpp -../../src/eepp/audio/csound.cpp -../../src/eepp/audio/cmusic.cpp -../../src/eepp/audio/caudiolistener.cpp -../../src/eepp/audio/caudiodevice.cpp +../../src/eepp/audio/soundstream.cpp +../../src/eepp/audio/soundfileogg.cpp +../../src/eepp/audio/soundfiledefault.cpp +../../src/eepp/audio/soundfile.cpp +../../src/eepp/audio/soundbuffer.cpp +../../src/eepp/audio/sound.cpp +../../src/eepp/audio/music.cpp +../../src/eepp/audio/audiolistener.cpp +../../src/eepp/audio/audiodevice.cpp ../../include/eepp/core/utf.hpp ../../include/eepp/core/string.hpp ../../include/eepp/core/stlcontainers.hpp @@ -28,297 +107,278 @@ ../../src/eepp/core/string.cpp ../../src/eepp/core/memorymanager.cpp ../../src/eepp/core/debug.cpp -../../include/eepp/system/tsingleton.hpp -../../include/eepp/system/tresourcemanager.hpp -../../include/eepp/system/tcontainer.hpp -../../include/eepp/system/czip.hpp -../../include/eepp/system/cclock.hpp -../../include/eepp/system/cthread.hpp -../../include/eepp/system/cresourceloader.hpp -../../include/eepp/system/crc4.hpp -../../include/eepp/system/cpak.hpp -../../include/eepp/system/cpackmanager.hpp -../../include/eepp/system/cpack.hpp -../../include/eepp/system/cobjectloader.hpp -../../include/eepp/system/cmutex.hpp -../../include/eepp/system/clog.hpp -../../include/eepp/system/ciostreammemory.hpp -../../include/eepp/system/ciostreamfile.hpp -../../include/eepp/system/ciostream.hpp -../../include/eepp/system/cinifile.hpp +../../include/eepp/system/singleton.hpp +../../include/eepp/system/resourcemanager.hpp +../../include/eepp/system/container.hpp +../../include/eepp/system/zip.hpp +../../include/eepp/system/lock.hpp +../../include/eepp/system/thread.hpp +../../include/eepp/system/resourceloader.hpp +../../include/eepp/system/rc4.hpp +../../include/eepp/system/pak.hpp +../../include/eepp/system/packmanager.hpp +../../include/eepp/system/pack.hpp +../../include/eepp/system/objectloader.hpp +../../include/eepp/system/mutex.hpp +../../include/eepp/system/log.hpp +../../include/eepp/system/iostreammemory.hpp +../../include/eepp/system/iostreamfile.hpp +../../include/eepp/system/iostream.hpp +../../include/eepp/system/inifile.hpp ../../include/eepp/system/base.hpp -../../src/eepp/system/czip.cpp -../../src/eepp/system/cclock.cpp -../../src/eepp/system/cthread.cpp -../../src/eepp/system/cresourceloader.cpp -../../src/eepp/system/crc4.cpp -../../src/eepp/system/cpak.cpp -../../src/eepp/system/cpackmanager.cpp -../../src/eepp/system/cpack.cpp -../../src/eepp/system/cobjectloader.cpp -../../src/eepp/system/cmutex.cpp -../../src/eepp/system/clog.cpp -../../src/eepp/system/ciostreammemory.cpp -../../src/eepp/system/ciostreamfile.cpp -../../src/eepp/system/cinifile.cpp +../../src/eepp/system/zip.cpp +../../src/eepp/system/clock.cpp +../../src/eepp/system/thread.cpp +../../src/eepp/system/resourceloader.cpp +../../src/eepp/system/rc4.cpp +../../src/eepp/system/pak.cpp +../../src/eepp/system/packmanager.cpp +../../src/eepp/system/pack.cpp +../../src/eepp/system/objectloader.cpp +../../src/eepp/system/mutex.cpp +../../src/eepp/system/log.cpp +../../src/eepp/system/iostreammemory.cpp +../../src/eepp/system/iostreamfile.cpp +../../src/eepp/system/inifile.cpp ../../src/eepp/system/platform/platformimpl.hpp -../../src/eepp/system/platform/posix/cclockimpl.hpp -../../src/eepp/system/platform/posix/cthreadimpl.hpp -../../src/eepp/system/platform/posix/cmuteximpl.hpp -../../src/eepp/system/platform/posix/cclockimpl.cpp -../../src/eepp/system/platform/posix/cthreadimpl.cpp -../../src/eepp/system/platform/posix/cmuteximpl.cpp -../../src/eepp/system/platform/win/cclockimpl.hpp -../../src/eepp/system/platform/win/cthreadimpl.hpp -../../src/eepp/system/platform/win/cmuteximpl.hpp -../../src/eepp/system/platform/win/cclockimpl.cpp -../../src/eepp/system/platform/win/cthreadimpl.cpp -../../src/eepp/system/platform/win/cmuteximpl.cpp +../../src/eepp/system/platform/posix/clockimpl.hpp +../../src/eepp/system/platform/posix/threadimpl.hpp +../../src/eepp/system/platform/posix/muteximpl.hpp +../../src/eepp/system/platform/posix/clockimpl.cpp +../../src/eepp/system/platform/posix/threadimpl.cpp +../../src/eepp/system/platform/posix/muteximpl.cpp +../../src/eepp/system/platform/win/clockimpl.hpp +../../src/eepp/system/platform/win/threadimpl.hpp +../../src/eepp/system/platform/win/muteximpl.hpp +../../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/ctilelayer.hpp -../../include/eepp/gaming/cobjectlayer.hpp -../../include/eepp/gaming/cmap.hpp -../../include/eepp/gaming/clightmanager.hpp -../../include/eepp/gaming/clight.hpp -../../include/eepp/gaming/clayer.hpp -../../include/eepp/gaming/cgameobjectvirtual.hpp -../../include/eepp/gaming/cgameobjectsprite.hpp -../../include/eepp/gaming/cgameobjectsubtextureex.hpp -../../include/eepp/gaming/cgameobjectsubtexture.hpp -../../include/eepp/gaming/cgameobject.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/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 -../../src/eepp/gaming/mapeditor/clayerproperties.hpp -../../src/eepp/gaming/ctilelayer.cpp -../../src/eepp/gaming/cobjectlayer.cpp -../../src/eepp/gaming/cmap.cpp -../../src/eepp/gaming/clightmanager.cpp -../../src/eepp/gaming/clight.cpp -../../src/eepp/gaming/clayer.cpp -../../src/eepp/gaming/cgameobjectvirtual.cpp -../../src/eepp/gaming/cgameobjectsprite.cpp -../../src/eepp/gaming/cgameobjectsubtextureex.cpp -../../src/eepp/gaming/cgameobjectsubtexture.cpp -../../src/eepp/gaming/cgameobject.cpp -../../src/eepp/gaming/mapeditor/cuimapnew.cpp -../../src/eepp/gaming/mapeditor/cuimap.cpp -../../src/eepp/gaming/mapeditor/cuilayernew.cpp -../../src/eepp/gaming/mapeditor/cuigotypenew.cpp -../../src/eepp/gaming/mapeditor/cmapproperties.cpp -../../src/eepp/gaming/mapeditor/cmapeditor.cpp -../../src/eepp/gaming/mapeditor/clayerproperties.cpp +../../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/graphics/blendmode.hpp ../../src/eepp/graphics/blendmode.cpp -../../include/eepp/graphics/vbohelper.hpp -../../include/eepp/graphics/renders.hpp -../../include/eepp/graphics/pixelperfect.hpp ../../include/eepp/graphics/fonthelper.hpp -../../include/eepp/graphics/cvertexbuffervbo.hpp -../../include/eepp/graphics/cvertexbufferogl.hpp -../../src/eepp/graphics/cvertexbuffermanager.hpp -../../include/eepp/graphics/cvertexbuffer.hpp -../../include/eepp/graphics/cttffontloader.hpp -../../include/eepp/graphics/cttffont.hpp -../../src/eepp/graphics/ctexturepackertex.hpp -../../src/eepp/graphics/ctexturepackernode.hpp -../../include/eepp/graphics/ctexturepacker.hpp -../../include/eepp/graphics/ctextureloader.hpp -../../include/eepp/graphics/ctextureatlasloader.hpp -../../include/eepp/graphics/ctexturefontloader.hpp -../../include/eepp/graphics/ctexturefont.hpp -../../include/eepp/graphics/ctexturefactory.hpp -../../include/eepp/graphics/ctexture.hpp -../../include/eepp/graphics/ctextcache.hpp -../../include/eepp/graphics/csprite.hpp -../../include/eepp/graphics/ctextureatlasmanager.hpp -../../include/eepp/graphics/ctextureatlas.hpp -../../include/eepp/graphics/csubtexture.hpp -../../include/eepp/graphics/cshaderprogrammanager.hpp -../../include/eepp/graphics/cshaderprogram.hpp -../../include/eepp/graphics/cshader.hpp -../../include/eepp/graphics/cscrollparallax.hpp -../../include/eepp/graphics/cprimitives.hpp -../../include/eepp/graphics/cparticlesystem.hpp -../../include/eepp/graphics/cparticle.hpp -../../include/eepp/graphics/cimage.hpp -../../include/eepp/graphics/cglobaltextureatlas.hpp -../../include/eepp/graphics/cglobalbatchrenderer.hpp -../../src/eepp/graphics/cframebuffermanager.hpp -../../include/eepp/graphics/cframebuffer.hpp -../../include/eepp/graphics/cfontmanager.hpp -../../include/eepp/graphics/cfont.hpp -../../include/eepp/graphics/cconsole.hpp -../../include/eepp/graphics/cbatchrenderer.hpp +../../include/eepp/graphics/vertexbuffervbo.hpp +../../include/eepp/graphics/vertexbufferogl.hpp +../../src/eepp/graphics/vertexbuffermanager.hpp +../../include/eepp/graphics/vertexbuffer.hpp +../../include/eepp/graphics/ttffontloader.hpp +../../include/eepp/graphics/ttffont.hpp +../../src/eepp/graphics/texturepackertex.hpp +../../src/eepp/graphics/texturepackernode.hpp +../../include/eepp/graphics/texturepacker.hpp +../../include/eepp/graphics/textureloader.hpp +../../include/eepp/graphics/textureatlasloader.hpp +../../include/eepp/graphics/texturefontloader.hpp +../../include/eepp/graphics/texturefont.hpp +../../include/eepp/graphics/texturefactory.hpp +../../include/eepp/graphics/texture.hpp +../../include/eepp/graphics/textcache.hpp +../../include/eepp/graphics/sprite.hpp +../../include/eepp/graphics/textureatlasmanager.hpp +../../include/eepp/graphics/textureatlas.hpp +../../include/eepp/graphics/subtexture.hpp +../../include/eepp/graphics/shaderprogrammanager.hpp +../../include/eepp/graphics/shaderprogram.hpp +../../include/eepp/graphics/shader.hpp +../../include/eepp/graphics/scrollparallax.hpp +../../include/eepp/graphics/primitives.hpp +../../include/eepp/graphics/particlesystem.hpp +../../include/eepp/graphics/particle.hpp +../../include/eepp/graphics/image.hpp +../../include/eepp/graphics/globaltextureatlas.hpp +../../include/eepp/graphics/globalbatchrenderer.hpp +../../src/eepp/graphics/framebuffermanager.hpp +../../include/eepp/graphics/framebuffer.hpp +../../include/eepp/graphics/fontmanager.hpp +../../include/eepp/graphics/font.hpp +../../include/eepp/graphics/console.hpp +../../include/eepp/graphics/batchrenderer.hpp ../../include/eepp/graphics/base.hpp -../../include/eepp/graphics/renderer/crenderergl3.hpp -../../include/eepp/graphics/renderer/crenderergl.hpp -../../include/eepp/graphics/renderer/cgl.hpp +../../include/eepp/graphics/renderer/renderergl3.hpp +../../include/eepp/graphics/renderer/renderergl.hpp ../../include/eepp/graphics/renderer/base.hpp ../../include/eepp/math/math.hpp -../../include/eepp/math/cmtrand.hpp +../../include/eepp/math/mtrand.hpp ../../include/eepp/math/base.hpp -../../src/eepp/math/cmtrand.cpp +../../src/eepp/math/mtrand.cpp ../../include/eepp/physics/settings.hpp ../../include/eepp/physics/physicshelper.hpp ../../include/eepp/physics/moment.hpp -../../include/eepp/physics/cspace.hpp -../../include/eepp/physics/cshapesegment.hpp -../../include/eepp/physics/cshapepolysprite.hpp -../../include/eepp/physics/cshapepoly.hpp -../../include/eepp/physics/cshapecirclesprite.hpp -../../include/eepp/physics/cshapecircle.hpp -../../include/eepp/physics/cshape.hpp -../../include/eepp/physics/cphysicsmanager.hpp -../../include/eepp/physics/cbody.hpp -../../include/eepp/physics/carbiter.hpp +../../include/eepp/physics/space.hpp +../../include/eepp/physics/shapesegment.hpp +../../include/eepp/physics/shapepolysprite.hpp +../../include/eepp/physics/shapepoly.hpp +../../include/eepp/physics/shapecirclesprite.hpp +../../include/eepp/physics/shapecircle.hpp +../../include/eepp/physics/shape.hpp +../../include/eepp/physics/physicsmanager.hpp +../../include/eepp/physics/body.hpp +../../include/eepp/physics/arbiter.hpp ../../include/eepp/physics/base.hpp ../../include/eepp/physics/area.hpp -../../include/eepp/physics/constraints/cslidejoint.hpp -../../include/eepp/physics/constraints/csimplemotor.hpp -../../include/eepp/physics/constraints/crotarylimitjoint.hpp -../../include/eepp/physics/constraints/cratchetjoint.hpp -../../include/eepp/physics/constraints/cpivotjoint.hpp -../../include/eepp/physics/constraints/cpinjoint.hpp -../../include/eepp/physics/constraints/cgroovejoint.hpp -../../include/eepp/physics/constraints/cgearjoint.hpp -../../include/eepp/physics/constraints/cdampedspring.hpp -../../include/eepp/physics/constraints/cdampedrotaryspring.hpp -../../include/eepp/physics/constraints/cconstraint.hpp -../../src/eepp/physics/cspace.cpp -../../src/eepp/physics/cshapesegment.cpp -../../src/eepp/physics/cshapepolysprite.cpp -../../src/eepp/physics/cshapepoly.cpp -../../src/eepp/physics/cshapecirclesprite.cpp -../../src/eepp/physics/cshapecircle.cpp -../../src/eepp/physics/cshape.cpp -../../src/eepp/physics/cphysicsmanager.cpp -../../src/eepp/physics/cbody.cpp -../../src/eepp/physics/carbiter.cpp -../../src/eepp/physics/constraints/cslidejoint.cpp -../../src/eepp/physics/constraints/csimplemotor.cpp -../../src/eepp/physics/constraints/crotarylimitjoint.cpp -../../src/eepp/physics/constraints/cratchetjoint.cpp -../../src/eepp/physics/constraints/cpivotjoint.cpp -../../src/eepp/physics/constraints/cpinjoint.cpp -../../src/eepp/physics/constraints/cgroovejoint.cpp -../../src/eepp/physics/constraints/cgearjoint.cpp -../../src/eepp/physics/constraints/cdampedspring.cpp -../../src/eepp/physics/constraints/cdampedrotaryspring.cpp -../../src/eepp/physics/constraints/cconstraint.cpp +../../include/eepp/physics/constraints/slidejoint.hpp +../../include/eepp/physics/constraints/simplemotor.hpp +../../include/eepp/physics/constraints/rotarylimitjoint.hpp +../../include/eepp/physics/constraints/ratchetjoint.hpp +../../include/eepp/physics/constraints/pivotjoint.hpp +../../include/eepp/physics/constraints/pinjoint.hpp +../../include/eepp/physics/constraints/groovejoint.hpp +../../include/eepp/physics/constraints/gearjoint.hpp +../../include/eepp/physics/constraints/dampedspring.hpp +../../include/eepp/physics/constraints/dampedrotaryspring.hpp +../../include/eepp/physics/constraints/constraint.hpp +../../src/eepp/physics/space.cpp +../../src/eepp/physics/shapesegment.cpp +../../src/eepp/physics/shapepolysprite.cpp +../../src/eepp/physics/shapepoly.cpp +../../src/eepp/physics/shapecirclesprite.cpp +../../src/eepp/physics/shapecircle.cpp +../../src/eepp/physics/shape.cpp +../../src/eepp/physics/physicsmanager.cpp +../../src/eepp/physics/body.cpp +../../src/eepp/physics/arbiter.cpp +../../src/eepp/physics/constraints/slidejoint.cpp +../../src/eepp/physics/constraints/simplemotor.cpp +../../src/eepp/physics/constraints/rotarylimitjoint.cpp +../../src/eepp/physics/constraints/ratchetjoint.cpp +../../src/eepp/physics/constraints/pivotjoint.cpp +../../src/eepp/physics/constraints/pinjoint.cpp +../../src/eepp/physics/constraints/groovejoint.cpp +../../src/eepp/physics/constraints/gearjoint.cpp +../../src/eepp/physics/constraints/dampedspring.cpp +../../src/eepp/physics/constraints/dampedrotaryspring.cpp +../../src/eepp/physics/constraints/constraint.cpp ../../include/eepp/ui/uihelper.hpp -../../include/eepp/ui/tuiitemcontainer.hpp -../../include/eepp/ui/cuiwinmenu.hpp -../../include/eepp/ui/cuiwindow.hpp -../../include/eepp/ui/cuitooltip.hpp -../../include/eepp/ui/cuithememanager.hpp -../../include/eepp/ui/cuitheme.hpp -../../include/eepp/ui/cuitextinput.hpp -../../include/eepp/ui/cuitextedit.hpp -../../include/eepp/ui/cuitextbox.hpp -../../include/eepp/ui/cuitabwidget.hpp -../../include/eepp/ui/cuitab.hpp -../../include/eepp/ui/cuisprite.hpp -../../include/eepp/ui/cuispinbox.hpp -../../include/eepp/ui/cuisliderbutton.hpp -../../include/eepp/ui/cuislider.hpp -../../include/eepp/ui/cuiskinstate.hpp -../../include/eepp/ui/cuiskinsimple.hpp -../../include/eepp/ui/cuiskincomplex.hpp -../../include/eepp/ui/cuiskin.hpp -../../include/eepp/ui/cuiseparator.hpp -../../include/eepp/ui/cuiselectbutton.hpp -../../include/eepp/ui/cuiscrollbar.hpp -../../include/eepp/ui/cuiradiobutton.hpp -../../include/eepp/ui/cuipushbutton.hpp -../../include/eepp/ui/cuiprogressbar.hpp -../../include/eepp/ui/cuipopupmenu.hpp -../../include/eepp/ui/cuimessagebox.hpp -../../include/eepp/ui/cuimessage.hpp -../../include/eepp/ui/cuimenusubmenu.hpp -../../include/eepp/ui/cuimenuitem.hpp -../../include/eepp/ui/cuimenucheckbox.hpp -../../include/eepp/ui/cuimenu.hpp -../../include/eepp/ui/cuimanager.hpp -../../include/eepp/ui/cuilistboxitem.hpp -../../include/eepp/ui/cuilistbox.hpp -../../include/eepp/ui/cuigridcell.hpp -../../include/eepp/ui/cuigfx.hpp -../../include/eepp/ui/cuigenericgrid.hpp -../../include/eepp/ui/cuieventmouse.hpp -../../include/eepp/ui/cuieventkey.hpp -../../include/eepp/ui/cuievent.hpp -../../include/eepp/ui/cuidropdownlist.hpp -../../include/eepp/ui/cuidragable.hpp -../../include/eepp/ui/cuicontrolanim.hpp -../../include/eepp/ui/cuicontrol.hpp -../../include/eepp/ui/cuicomplexcontrol.hpp -../../include/eepp/ui/cuicommondialog.hpp -../../include/eepp/ui/cuicombobox.hpp -../../include/eepp/ui/cuicheckbox.hpp -../../include/eepp/ui/cuiborder.hpp -../../include/eepp/ui/cuibackground.hpp +../../include/eepp/ui/uiitemcontainer.hpp +../../include/eepp/ui/uiwinmenu.hpp +../../include/eepp/ui/uiwindow.hpp +../../include/eepp/ui/uitooltip.hpp +../../include/eepp/ui/uithememanager.hpp +../../include/eepp/ui/uitheme.hpp +../../include/eepp/ui/uitextinput.hpp +../../include/eepp/ui/uitextedit.hpp +../../include/eepp/ui/uitabwidget.hpp +../../include/eepp/ui/uitab.hpp +../../include/eepp/ui/uisprite.hpp +../../include/eepp/ui/uispinbox.hpp +../../include/eepp/ui/uisliderbutton.hpp +../../include/eepp/ui/uislider.hpp +../../include/eepp/ui/uiskinstate.hpp +../../include/eepp/ui/uiskinsimple.hpp +../../include/eepp/ui/uiskincomplex.hpp +../../include/eepp/ui/uiskin.hpp +../../include/eepp/ui/uiselectbutton.hpp +../../include/eepp/ui/uiscrollbar.hpp +../../include/eepp/ui/uiradiobutton.hpp +../../include/eepp/ui/uipushbutton.hpp +../../include/eepp/ui/uiprogressbar.hpp +../../include/eepp/ui/uipopupmenu.hpp +../../include/eepp/ui/uimessagebox.hpp +../../include/eepp/ui/uimessage.hpp +../../include/eepp/ui/uimenusubmenu.hpp +../../include/eepp/ui/uimenuitem.hpp +../../include/eepp/ui/uimenucheckbox.hpp +../../include/eepp/ui/uimenu.hpp +../../include/eepp/ui/uimanager.hpp +../../include/eepp/ui/uilistboxitem.hpp +../../include/eepp/ui/uilistbox.hpp +../../include/eepp/ui/uieventmouse.hpp +../../include/eepp/ui/uieventkey.hpp +../../include/eepp/ui/uievent.hpp +../../include/eepp/ui/uidropdownlist.hpp +../../include/eepp/ui/uicontrolanim.hpp +../../include/eepp/ui/uicontrol.hpp +../../include/eepp/ui/uicommondialog.hpp +../../include/eepp/ui/uicombobox.hpp +../../include/eepp/ui/uicheckbox.hpp +../../include/eepp/ui/uiborder.hpp +../../include/eepp/ui/uibackground.hpp ../../include/eepp/ui/base.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 -../../src/eepp/ui/cuitooltip.cpp -../../src/eepp/ui/cuithememanager.cpp -../../src/eepp/ui/cuitheme.cpp -../../src/eepp/ui/cuitextinput.cpp -../../src/eepp/ui/cuitextedit.cpp -../../src/eepp/ui/cuitextbox.cpp -../../src/eepp/ui/cuitabwidget.cpp -../../src/eepp/ui/cuitab.cpp -../../src/eepp/ui/cuisprite.cpp -../../src/eepp/ui/cuispinbox.cpp -../../src/eepp/ui/cuisliderbutton.cpp -../../src/eepp/ui/cuislider.cpp -../../src/eepp/ui/cuiskinstate.cpp -../../src/eepp/ui/cuiskinsimple.cpp -../../src/eepp/ui/cuiskincomplex.cpp -../../src/eepp/ui/cuiskin.cpp -../../src/eepp/ui/cuiseparator.cpp -../../src/eepp/ui/cuiselectbutton.cpp -../../src/eepp/ui/cuiscrollbar.cpp -../../src/eepp/ui/cuiradiobutton.cpp -../../src/eepp/ui/cuipushbutton.cpp -../../src/eepp/ui/cuiprogressbar.cpp -../../src/eepp/ui/cuipopupmenu.cpp -../../src/eepp/ui/cuimessagebox.cpp -../../src/eepp/ui/cuimessage.cpp -../../src/eepp/ui/cuimenusubmenu.cpp -../../src/eepp/ui/cuimenuitem.cpp -../../src/eepp/ui/cuimenucheckbox.cpp -../../src/eepp/ui/cuimenu.cpp -../../src/eepp/ui/cuimanager.cpp -../../src/eepp/ui/cuilistboxitem.cpp -../../src/eepp/ui/cuilistbox.cpp -../../src/eepp/ui/cuigridcell.cpp -../../src/eepp/ui/cuigfx.cpp -../../src/eepp/ui/cuigenericgrid.cpp -../../src/eepp/ui/cuieventmouse.cpp -../../src/eepp/ui/cuieventkey.cpp -../../src/eepp/ui/cuievent.cpp -../../src/eepp/ui/cuidropdownlist.cpp -../../src/eepp/ui/cuidragable.cpp -../../src/eepp/ui/cuicontrolanim.cpp -../../src/eepp/ui/cuicontrol.cpp -../../src/eepp/ui/cuicomplexcontrol.cpp -../../src/eepp/ui/cuicommondialog.cpp -../../src/eepp/ui/cuicombobox.cpp -../../src/eepp/ui/cuicheckbox.cpp -../../src/eepp/ui/cuiborder.cpp -../../src/eepp/ui/cuibackground.cpp -../../src/eepp/ui/tools/ctextureatlassubtextureeditor.cpp -../../src/eepp/ui/tools/ctextureatlasnew.cpp -../../src/eepp/ui/tools/ctextureatlaseditor.cpp +../../src/eepp/ui/tools/textureatlassubtextureeditor.hpp +../../src/eepp/ui/tools/textureatlasnew.hpp +../../include/eepp/ui/tools/textureatlaseditor.hpp +../../src/eepp/ui/uiwinmenu.cpp +../../src/eepp/ui/uiwindow.cpp +../../src/eepp/ui/uitooltip.cpp +../../src/eepp/ui/uithememanager.cpp +../../src/eepp/ui/uitheme.cpp +../../src/eepp/ui/uitextinput.cpp +../../src/eepp/ui/uitextedit.cpp +../../src/eepp/ui/uitabwidget.cpp +../../src/eepp/ui/uitab.cpp +../../src/eepp/ui/uisprite.cpp +../../src/eepp/ui/uispinbox.cpp +../../src/eepp/ui/uisliderbutton.cpp +../../src/eepp/ui/uislider.cpp +../../src/eepp/ui/uiskinstate.cpp +../../src/eepp/ui/uiskinsimple.cpp +../../src/eepp/ui/uiskincomplex.cpp +../../src/eepp/ui/uiskin.cpp +../../src/eepp/ui/uiselectbutton.cpp +../../src/eepp/ui/uiscrollbar.cpp +../../src/eepp/ui/uiradiobutton.cpp +../../src/eepp/ui/uipushbutton.cpp +../../src/eepp/ui/uiprogressbar.cpp +../../src/eepp/ui/uipopupmenu.cpp +../../src/eepp/ui/uimessagebox.cpp +../../src/eepp/ui/uimessage.cpp +../../src/eepp/ui/uimenusubmenu.cpp +../../src/eepp/ui/uimenuitem.cpp +../../src/eepp/ui/uimenucheckbox.cpp +../../src/eepp/ui/uimenu.cpp +../../src/eepp/ui/uimanager.cpp +../../src/eepp/ui/uilistboxitem.cpp +../../src/eepp/ui/uilistbox.cpp +../../src/eepp/ui/uieventmouse.cpp +../../src/eepp/ui/uieventkey.cpp +../../src/eepp/ui/uievent.cpp +../../src/eepp/ui/uidropdownlist.cpp +../../src/eepp/ui/uicontrolanim.cpp +../../src/eepp/ui/uicontrol.cpp +../../src/eepp/ui/uicommondialog.cpp +../../src/eepp/ui/uicombobox.cpp +../../src/eepp/ui/uicheckbox.cpp +../../src/eepp/ui/uiborder.cpp +../../src/eepp/ui/uibackground.cpp +../../src/eepp/ui/tools/textureatlassubtextureeditor.cpp +../../src/eepp/ui/tools/textureatlasnew.cpp +../../src/eepp/ui/tools/textureatlaseditor.cpp ../../include/eepp/math/vector3.hpp ../../include/eepp/math/vector2.hpp ../../include/eepp/system/bitop.hpp @@ -333,78 +393,73 @@ ../../include/eepp/math/line2.hpp ../../include/eepp/math/ease.hpp ../../include/eepp/math/easing.hpp -../../include/eepp/math/cwaypoints.hpp -../../include/eepp/math/cperlinnoise.hpp -../../include/eepp/system/colors.hpp -../../include/eepp/math/cinterpolation.hpp +../../include/eepp/math/perlinnoise.hpp ../../src/eepp/system/safedatapointer.cpp ../../src/eepp/math/easing.cpp -../../src/eepp/math/cwaypoints.cpp -../../src/eepp/math/cperlinnoise.cpp -../../src/eepp/math/cinterpolation.cpp +../../src/eepp/math/perlinnoise.cpp ../../include/eepp/window/keycodes.hpp ../../include/eepp/window/joycodes.hpp ../../include/eepp/window/inputhelper.hpp ../../include/eepp/window/inputevent.hpp -../../include/eepp/window/cwindow.hpp -../../include/eepp/window/cview.hpp +../../include/eepp/window/window.hpp +../../include/eepp/window/view.hpp ../../include/eepp/window/cursorhelper.hpp -../../include/eepp/window/cplatformimpl.hpp -../../include/eepp/window/cjoystickmanager.hpp -../../include/eepp/window/cjoystick.hpp -../../include/eepp/window/cinputtextbuffer.hpp -../../include/eepp/window/cinputfinger.hpp -../../include/eepp/window/cinput.hpp -../../include/eepp/window/cengine.hpp -../../include/eepp/window/ccursormanager.hpp -../../include/eepp/window/ccursor.hpp -../../include/eepp/window/cclipboard.hpp +../../include/eepp/window/platformimpl.hpp +../../include/eepp/window/joystickmanager.hpp +../../include/eepp/window/joystick.hpp +../../include/eepp/window/inputtextbuffer.hpp +../../include/eepp/window/inputfinger.hpp +../../include/eepp/window/input.hpp +../../include/eepp/window/engine.hpp +../../include/eepp/window/cursormanager.hpp +../../include/eepp/window/cursor.hpp +../../include/eepp/window/clipboard.hpp ../../include/eepp/window/base.hpp ../../src/eepp/window/inputhelper.cpp -../../src/eepp/window/cwindow.cpp -../../src/eepp/window/cview.cpp -../../src/eepp/window/cplatformimpl.cpp -../../src/eepp/window/cjoystickmanager.cpp -../../src/eepp/window/cjoystick.cpp -../../src/eepp/window/cinputtextbuffer.cpp -../../src/eepp/window/cinputfinger.cpp -../../src/eepp/window/cinput.cpp -../../src/eepp/window/cengine.cpp -../../src/eepp/window/ccursormanager.cpp -../../src/eepp/window/ccursor.cpp -../../src/eepp/window/cclipboard.cpp -../../src/eepp/window/backend/SDL/cwindowsdl.hpp -../../src/eepp/window/backend/SDL/cjoysticksdl.hpp -../../src/eepp/window/backend/SDL/cjoystickmanagersdl.hpp -../../src/eepp/window/backend/SDL/cinputsdl.hpp -../../src/eepp/window/backend/SDL/ccursorsdl.hpp -../../src/eepp/window/backend/SDL/ccursormanagersdl.hpp -../../src/eepp/window/backend/SDL/cclipboardsdl.hpp -../../src/eepp/window/backend/SDL/cbackendsdl.hpp +../../src/eepp/window/window.cpp +../../src/eepp/window/view.cpp +../../src/eepp/window/platformimpl.cpp +../../src/eepp/window/joystickmanager.cpp +../../src/eepp/window/joystick.cpp +../../src/eepp/window/inputtextbuffer.cpp +../../src/eepp/window/inputfinger.cpp +../../src/eepp/window/input.cpp +../../src/eepp/window/engine.cpp +../../src/eepp/window/cursormanager.cpp +../../src/eepp/window/cursor.cpp +../../src/eepp/window/clipboard.cpp +../../src/eepp/window/backend/SDL/windowsdl.hpp +../../src/eepp/window/backend/SDL/joysticksdl.hpp +../../src/eepp/window/backend/SDL/joystickmanagersdl.hpp +../../src/eepp/window/backend/SDL/inputsdl.hpp +../../src/eepp/window/backend/SDL/cursorsdl.hpp +../../src/eepp/window/backend/SDL/cursormanagersdl.hpp +../../src/eepp/window/backend/SDL/clipboardsdl.hpp +../../src/eepp/window/backend/SDL/backendsdl.hpp ../../src/eepp/window/backend/SDL/base.hpp -../../src/eepp/window/backend/SDL/cwindowsdl.cpp -../../src/eepp/window/backend/SDL/cjoysticksdl.cpp -../../src/eepp/window/backend/SDL/cjoystickmanagersdl.cpp -../../src/eepp/window/backend/SDL/cinputsdl.cpp -../../src/eepp/window/backend/SDL/ccursorsdl.cpp -../../src/eepp/window/backend/SDL/ccursormanagersdl.cpp -../../src/eepp/window/backend/SDL/cclipboardsdl.cpp -../../src/eepp/window/backend/SDL2/cwindowsdl2.hpp -../../src/eepp/window/backend/SDL2/cjoysticksdl2.hpp -../../src/eepp/window/backend/SDL2/cjoystickmanagersdl2.hpp -../../src/eepp/window/backend/SDL2/cinputsdl2.hpp -../../src/eepp/window/backend/SDL2/ccursorsdl2.hpp -../../src/eepp/window/backend/SDL2/ccursormanagersdl2.hpp -../../src/eepp/window/backend/SDL2/cclipboardsdl2.hpp -../../src/eepp/window/backend/SDL2/cbackendsdl2.hpp +../../src/eepp/window/backend/SDL/windowsdl.cpp +../../src/eepp/window/backend/SDL/joysticksdl.cpp +../../src/eepp/window/backend/SDL/joystickmanagersdl.cpp +../../src/eepp/window/backend/SDL/inputsdl.cpp +../../src/eepp/window/backend/SDL/cursorsdl.cpp +../../src/eepp/window/backend/SDL/cursormanagersdl.cpp +../../src/eepp/window/backend/SDL/clipboardsdl.cpp +../../src/eepp/window/backend/SDL2/windowsdl2.hpp +../../src/eepp/window/backend/SDL2/joysticksdl2.hpp +../../src/eepp/window/backend/SDL2/joystickmanagersdl2.hpp +../../src/eepp/window/backend/SDL2/inputsdl2.hpp +../../src/eepp/window/backend/SDL2/cursorsdl2.hpp +../../src/eepp/window/backend/SDL2/cursormanagersdl2.hpp +../../src/eepp/window/backend/SDL2/clipboardsdl2.hpp +../../src/eepp/window/backend/SDL2/backendsdl2.hpp ../../src/eepp/window/backend/SDL2/base.hpp -../../src/eepp/window/backend/SDL2/cwindowsdl2.cpp -../../src/eepp/window/backend/SDL2/cjoysticksdl2.cpp -../../src/eepp/window/backend/SDL2/cjoystickmanagersdl2.cpp -../../src/eepp/window/backend/SDL2/cinputsdl2.cpp -../../src/eepp/window/backend/SDL2/ccursorsdl2.cpp -../../src/eepp/window/backend/SDL2/ccursormanagersdl2.cpp -../../src/eepp/window/backend/SDL2/cclipboardsdl2.cpp +../../src/eepp/window/backend/SDL2/windowsdl2.cpp +../../src/eepp/window/backend/SDL2/joysticksdl2.cpp +../../src/eepp/window/backend/SDL2/joystickmanagersdl2.cpp +../../src/eepp/window/backend/SDL2/inputsdl2.cpp +../../src/eepp/window/backend/SDL2/cursorsdl2.cpp +../../src/eepp/window/backend/SDL2/cursormanagersdl2.cpp +../../src/eepp/window/backend/SDL2/clipboardsdl2.cpp ../../src/eepp/window/backend/allegro5/cwindowal.hpp ../../src/eepp/window/backend/allegro5/cjoystickmanageral.hpp ../../src/eepp/window/backend/allegro5/cjoystickal.hpp @@ -420,76 +475,74 @@ ../../src/eepp/window/backend/allegro5/ccursormanageral.cpp ../../src/eepp/window/backend/allegro5/ccursoral.cpp ../../src/eepp/window/backend/allegro5/cclipboardal.cpp -../../src/eepp/window/backend/null/cwindownull.hpp -../../src/eepp/window/backend/null/cjoysticknull.hpp -../../src/eepp/window/backend/null/cjoystickmanagernull.hpp -../../src/eepp/window/backend/null/cinputnull.hpp -../../src/eepp/window/backend/null/ccursornull.hpp -../../src/eepp/window/backend/null/ccursormanagernull.hpp -../../src/eepp/window/backend/null/cclipboardnull.hpp -../../src/eepp/window/backend/null/cbackendnull.hpp -../../src/eepp/window/backend/null/cwindownull.cpp -../../src/eepp/window/backend/null/cjoysticknull.cpp -../../src/eepp/window/backend/null/cjoystickmanagernull.cpp -../../src/eepp/window/backend/null/cinputnull.cpp -../../src/eepp/window/backend/null/ccursornull.cpp -../../src/eepp/window/backend/null/ccursormanagernull.cpp -../../src/eepp/window/backend/null/cclipboardnull.cpp -../../src/eepp/window/platform/null/cnullimpl.hpp -../../src/eepp/window/platform/null/cnullimpl.cpp -../../src/eepp/window/platform/osx/cosximpl.hpp -../../src/eepp/window/platform/osx/cosximpl.cpp -../../src/eepp/window/platform/win/cwinimpl.hpp -../../src/eepp/window/platform/win/ccursorwin.hpp -../../src/eepp/window/platform/win/cwinimpl.cpp -../../src/eepp/window/platform/win/ccursorwin.cpp -../../src/eepp/window/platform/x11/cx11impl.hpp -../../src/eepp/window/platform/x11/ccursorx11.hpp -../../src/eepp/window/platform/x11/cx11impl.cpp -../../src/eepp/window/platform/x11/ccursorx11.cpp +../../src/eepp/window/backend/null/windownull.hpp +../../src/eepp/window/backend/null/joysticknull.hpp +../../src/eepp/window/backend/null/joystickmanagernull.hpp +../../src/eepp/window/backend/null/inputnull.hpp +../../src/eepp/window/backend/null/cursornull.hpp +../../src/eepp/window/backend/null/cursormanagernull.hpp +../../src/eepp/window/backend/null/clipboardnull.hpp +../../src/eepp/window/backend/null/backendnull.hpp +../../src/eepp/window/backend/null/windownull.cpp +../../src/eepp/window/backend/null/joysticknull.cpp +../../src/eepp/window/backend/null/joystickmanagernull.cpp +../../src/eepp/window/backend/null/inputnull.cpp +../../src/eepp/window/backend/null/cursornull.cpp +../../src/eepp/window/backend/null/cursormanagernull.cpp +../../src/eepp/window/backend/null/clipboardnull.cpp +../../src/eepp/window/platform/null/nullimpl.hpp +../../src/eepp/window/platform/null/nullimpl.cpp +../../src/eepp/window/platform/osx/osximpl.hpp +../../src/eepp/window/platform/osx/osximpl.cpp +../../src/eepp/window/platform/win/winimpl.hpp +../../src/eepp/window/platform/win/cursorwin.hpp +../../src/eepp/window/platform/win/winimpl.cpp +../../src/eepp/window/platform/win/cursorwin.cpp +../../src/eepp/window/platform/x11/x11impl.hpp +../../src/eepp/window/platform/x11/cursorx11.hpp +../../src/eepp/window/platform/x11/x11impl.cpp +../../src/eepp/window/platform/x11/cursorx11.cpp ../../src/eepp/window/platform/platformimpl.hpp ../../src/eepp/graphics/pixelperfect.cpp -../../src/eepp/graphics/cvertexbuffervbo.cpp -../../src/eepp/graphics/cvertexbufferogl.cpp -../../src/eepp/graphics/cvertexbuffermanager.cpp -../../src/eepp/graphics/cvertexbuffer.cpp -../../src/eepp/graphics/cttffontloader.cpp -../../src/eepp/graphics/cttffont.cpp -../../src/eepp/graphics/ctexturepackertex.cpp -../../src/eepp/graphics/ctexturepackernode.cpp -../../src/eepp/graphics/ctexturepacker.cpp -../../src/eepp/graphics/ctextureloader.cpp -../../src/eepp/graphics/ctextureatlasloader.cpp -../../src/eepp/graphics/ctexturefontloader.cpp -../../src/eepp/graphics/ctexturefont.cpp -../../src/eepp/graphics/ctexturefactory.cpp -../../src/eepp/graphics/ctexture.cpp -../../src/eepp/graphics/ctextcache.cpp -../../src/eepp/graphics/csprite.cpp -../../src/eepp/graphics/ctextureatlasmanager.cpp -../../src/eepp/graphics/ctextureatlas.cpp -../../src/eepp/graphics/csubtexture.cpp -../../src/eepp/graphics/cshaderprogrammanager.cpp -../../src/eepp/graphics/cshaderprogram.cpp -../../src/eepp/graphics/cshader.cpp -../../src/eepp/graphics/cscrollparallax.cpp -../../src/eepp/graphics/cprimitives.cpp -../../src/eepp/graphics/cparticlesystem.cpp -../../src/eepp/graphics/cparticle.cpp -../../src/eepp/graphics/cimage.cpp -../../src/eepp/graphics/cglobaltextureatlas.cpp -../../src/eepp/graphics/cglobalbatchrenderer.cpp -../../src/eepp/graphics/cframebufferpbuffer.cpp -../../src/eepp/graphics/cframebuffermanager.cpp -../../src/eepp/graphics/cframebufferfbo.cpp -../../src/eepp/graphics/cframebuffer.cpp -../../src/eepp/graphics/cfontmanager.cpp -../../src/eepp/graphics/cfont.cpp -../../src/eepp/graphics/cconsole.cpp -../../src/eepp/graphics/cbatchrenderer.cpp -../../src/eepp/graphics/renderer/crenderergl3.cpp -../../src/eepp/graphics/renderer/crenderergl.cpp -../../src/eepp/graphics/renderer/cgl.cpp +../../src/eepp/graphics/vertexbuffervbo.cpp +../../src/eepp/graphics/vertexbufferogl.cpp +../../src/eepp/graphics/vertexbuffermanager.cpp +../../src/eepp/graphics/vertexbuffer.cpp +../../src/eepp/graphics/ttffontloader.cpp +../../src/eepp/graphics/ttffont.cpp +../../src/eepp/graphics/texturepackertex.cpp +../../src/eepp/graphics/texturepackernode.cpp +../../src/eepp/graphics/texturepacker.cpp +../../src/eepp/graphics/textureloader.cpp +../../src/eepp/graphics/textureatlasloader.cpp +../../src/eepp/graphics/texturefontloader.cpp +../../src/eepp/graphics/texturefont.cpp +../../src/eepp/graphics/texturefactory.cpp +../../src/eepp/graphics/texture.cpp +../../src/eepp/graphics/textcache.cpp +../../src/eepp/graphics/sprite.cpp +../../src/eepp/graphics/textureatlasmanager.cpp +../../src/eepp/graphics/textureatlas.cpp +../../src/eepp/graphics/subtexture.cpp +../../src/eepp/graphics/shaderprogrammanager.cpp +../../src/eepp/graphics/shaderprogram.cpp +../../src/eepp/graphics/shader.cpp +../../src/eepp/graphics/scrollparallax.cpp +../../src/eepp/graphics/primitives.cpp +../../src/eepp/graphics/particlesystem.cpp +../../src/eepp/graphics/particle.cpp +../../src/eepp/graphics/image.cpp +../../src/eepp/graphics/globaltextureatlas.cpp +../../src/eepp/graphics/globalbatchrenderer.cpp +../../src/eepp/graphics/framebuffermanager.cpp +../../src/eepp/graphics/framebufferfbo.cpp +../../src/eepp/graphics/framebuffer.cpp +../../src/eepp/graphics/fontmanager.cpp +../../src/eepp/graphics/font.cpp +../../src/eepp/graphics/console.cpp +../../src/eepp/graphics/batchrenderer.cpp +../../src/eepp/graphics/renderer/renderergl3.cpp +../../src/eepp/graphics/renderer/renderergl.cpp ../../src/examples/empty_window/empty_window.cpp ../../src/test/eetest.hpp ../../src/test/eetest.cpp @@ -501,8 +554,8 @@ ../../src/eepp/graphics/renderer/shaders/clipped.frag ../../src/eepp/graphics/renderer/shaders/base.vert ../../src/eepp/graphics/renderer/shaders/base.frag -../../src/eepp/graphics/renderer/crenderergles2.cpp -../../include/eepp/graphics/renderer/crenderergles2.hpp +../../src/eepp/graphics/renderer/renderergles2.cpp +../../include/eepp/graphics/renderer/renderergles2.hpp ../../include/eepp/ee.hpp ../../include/eepp/config.hpp ../../include/eepp/core.hpp @@ -531,29 +584,26 @@ ../../include/eepp/config.hpp ../../include/eepp/core.hpp ../../include/eepp/audio.hpp -../../src/eepp/window/backend/SFML/cwindowsfml.hpp -../../src/eepp/window/backend/SFML/cjoysticksfml.hpp -../../src/eepp/window/backend/SFML/cjoystickmanagersfml.hpp -../../src/eepp/window/backend/SFML/cinputsfml.hpp -../../src/eepp/window/backend/SFML/ccursorsfml.hpp -../../src/eepp/window/backend/SFML/ccursormanagersfml.hpp -../../src/eepp/window/backend/SFML/cclipboardsfml.hpp -../../src/eepp/window/backend/SFML/cbackendsfml.hpp -../../src/eepp/window/backend/SFML/cwindowsfml.cpp -../../src/eepp/window/backend/SFML/cjoysticksfml.cpp -../../src/eepp/window/backend/SFML/cjoystickmanagersfml.cpp -../../src/eepp/window/backend/SFML/cinputsfml.cpp -../../src/eepp/window/backend/SFML/ccursorsfml.cpp -../../src/eepp/window/backend/SFML/ccursormanagersfml.cpp -../../src/eepp/window/backend/SFML/cclipboardsfml.cpp -../../src/eepp/window/cbackend.hpp -../../src/eepp/graphics/cframebufferpbuffer.hpp -../../src/eepp/graphics/cframebufferfbo.hpp -../../src/eepp/graphics/renderer/rendererhelper.hpp +../../src/eepp/window/backend/SFML/windowsfml.hpp +../../src/eepp/window/backend/SFML/joysticksfml.hpp +../../src/eepp/window/backend/SFML/joystickmanagersfml.hpp +../../src/eepp/window/backend/SFML/inputsfml.hpp +../../src/eepp/window/backend/SFML/cursorsfml.hpp +../../src/eepp/window/backend/SFML/cursormanagersfml.hpp +../../src/eepp/window/backend/SFML/clipboardsfml.hpp +../../src/eepp/window/backend/SFML/backendsfml.hpp +../../src/eepp/window/backend/SFML/windowsfml.cpp +../../src/eepp/window/backend/SFML/joysticksfml.cpp +../../src/eepp/window/backend/SFML/joystickmanagersfml.cpp +../../src/eepp/window/backend/SFML/inputsfml.cpp +../../src/eepp/window/backend/SFML/cursorsfml.cpp +../../src/eepp/window/backend/SFML/cursormanagersfml.cpp +../../src/eepp/window/backend/SFML/clipboardsfml.cpp +../../src/eepp/window/backend.hpp +../../src/eepp/graphics/framebufferfbo.hpp ../../include/eepp/graphics/packerhelper.hpp ../../include/eepp/system/filesystem.hpp ../../src/eepp/system/filesystem.cpp -../../include/eepp/graphics/glhelper.hpp ../../include/eepp/window/windowhandle.hpp ../../include/eepp/window/windowcontext.hpp ../../include/eepp/version.hpp @@ -561,21 +611,19 @@ ../../src/eepp/physics/moment.cpp ../../src/eepp/physics/area.cpp ../../premake4.lua -../../src/eepp/audio/csoundfileogg.hpp -../../src/eepp/audio/csoundfiledefault.hpp -../../include/eepp/gaming/cgameobjectobject.hpp -../../src/eepp/gaming/cgameobjectobject.cpp -../../src/eepp/gaming/cgameobjectpolyline.cpp -../../src/eepp/gaming/cgameobjectpolygon.cpp -../../include/eepp/gaming/cgameobjectpolyline.hpp -../../include/eepp/gaming/cgameobjectpolygon.hpp -../../src/eepp/gaming/mapeditor/cobjectproperties.hpp -../../src/eepp/gaming/mapeditor/cobjectproperties.cpp +../../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/core/noncopyable.hpp ../../include/eepp/system/clock.hpp -../../src/eepp/system/clock.cpp -../../src/eepp/ui/cuidefaulttheme.cpp -../../include/eepp/ui/cuidefaulttheme.hpp +../../src/eepp/system/lock.cpp ../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pvr_c.h ../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pvr.h ../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pkm_c.h @@ -590,89 +638,98 @@ ../../src/eepp/helper/SOIL2/src/SOIL2/image_DXT.h ../../src/eepp/helper/SOIL2/src/SOIL2/etc1_utils.h ../../src/eepp/helper/SOIL2/src/SOIL2/SOIL2.h -../../src/eepp/helper/SOIL2/src/SOIL2/stb_image_write.c -../../src/eepp/helper/SOIL2/src/SOIL2/stb_image.c ../../src/eepp/helper/SOIL2/src/SOIL2/image_helper.c ../../src/eepp/helper/SOIL2/src/SOIL2/image_DXT.c ../../src/eepp/helper/SOIL2/src/SOIL2/etc1_utils.c ../../src/eepp/helper/SOIL2/src/SOIL2/SOIL2.c ../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext_c.h ../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext.h -../../src/eepp/audio/csoundfile.hpp +../../src/eepp/audio/soundfile.hpp ../../src/eepp/audio/openal.hpp -../../src/eepp/window/backend/SDL2/cbackendsdl2.cpp +../../src/eepp/window/backend/SDL2/backendsdl2.cpp ../../src/examples/sound/sound.cpp ../../src/examples/sprites/sprites.cpp ../../src/examples/fonts/fonts.cpp ../../src/examples/vbo_fbo_batch/vbo_fbo_batch.cpp ../../src/examples/physics/physics.cpp -../../src/eepp/physics/cshapepoint.cpp -../../include/eepp/physics/cshapepoint.hpp +../../src/eepp/physics/shapepoint.cpp +../../include/eepp/physics/shapepoint.hpp ../../include/eepp/math/originpoint.hpp -../../include/eepp/system/ccondition.hpp -../../src/eepp/system/ccondition.cpp -../../src/eepp/system/platform/win/cconditionimpl.hpp -../../src/eepp/system/platform/win/cconditionimpl.cpp -../../src/eepp/system/platform/posix/cconditionimpl.hpp -../../src/eepp/system/platform/posix/cconditionimpl.cpp -../../include/eepp/graphics/opengl.hpp -../../src/eepp/system/ctime.cpp -../../include/eepp/system/ctime.hpp -../../src/eepp/graphics/ctexturesaver.hpp -../../src/eepp/graphics/ctexturesaver.cpp -../../include/eepp/network/cudpsocket.hpp -../../include/eepp/network/ctcpsocket.hpp -../../include/eepp/network/ctcplistener.hpp +../../include/eepp/system/condition.hpp +../../src/eepp/system/condition.cpp +../../src/eepp/system/platform/win/conditionimpl.hpp +../../src/eepp/system/platform/win/conditionimpl.cpp +../../src/eepp/system/platform/posix/conditionimpl.hpp +../../src/eepp/system/platform/posix/conditionimpl.cpp +../../src/eepp/system/time.cpp +../../include/eepp/system/time.hpp +../../src/eepp/graphics/texturesaver.hpp +../../src/eepp/graphics/texturesaver.cpp +../../include/eepp/network/udpsocket.hpp +../../include/eepp/network/tcpsocket.hpp +../../include/eepp/network/tcplistener.hpp ../../include/eepp/network/base.hpp -../../include/eepp/network/csocketselector.hpp +../../include/eepp/network/socketselector.hpp ../../include/eepp/network/sockethandle.hpp -../../include/eepp/network/csocket.hpp -../../include/eepp/network/cpacket.hpp -../../include/eepp/network/cipaddress.hpp -../../include/eepp/network/chttp.hpp -../../include/eepp/network/cftp.hpp +../../include/eepp/network/socket.hpp +../../include/eepp/network/packet.hpp +../../include/eepp/network/ipaddress.hpp +../../include/eepp/network/http.hpp +../../include/eepp/network/ftp.hpp ../../include/eepp/network.hpp -../../src/eepp/network/cudpsocket.cpp -../../src/eepp/network/ctcpsocket.cpp -../../src/eepp/network/ctcplistener.cpp -../../src/eepp/network/csocketselector.cpp -../../src/eepp/network/csocket.cpp -../../src/eepp/network/cpacket.cpp -../../src/eepp/network/cipaddress.cpp -../../src/eepp/network/chttp.cpp -../../src/eepp/network/cftp.cpp -../../src/eepp/network/platform/unix/csocketimpl.hpp -../../src/eepp/network/platform/unix/csocketimpl.cpp -../../src/eepp/network/platform/win/csocketimpl.hpp -../../src/eepp/network/platform/win/csocketimpl.cpp +../../src/eepp/network/udpsocket.cpp +../../src/eepp/network/tcpsocket.cpp +../../src/eepp/network/tcplistener.cpp +../../src/eepp/network/socketselector.cpp +../../src/eepp/network/socket.cpp +../../src/eepp/network/packet.cpp +../../src/eepp/network/ipaddress.cpp +../../src/eepp/network/http.cpp +../../src/eepp/network/ftp.cpp +../../src/eepp/network/platform/unix/socketimpl.hpp +../../src/eepp/network/platform/unix/socketimpl.cpp +../../src/eepp/network/platform/win/socketimpl.hpp +../../src/eepp/network/platform/win/socketimpl.cpp ../../src/eepp/network/platform/platformimpl.hpp ../../Makefile.base ../../Makefile ../../src/examples/http_request/http_request.cpp -../../include/eepp/system/cthreadlocal.hpp -../../src/eepp/system/cthreadlocal.cpp -../../src/eepp/system/platform/win/cthreadlocalimpl.hpp -../../src/eepp/system/platform/win/cthreadlocalimpl.cpp -../../src/eepp/system/platform/posix/cthreadlocalimpl.hpp -../../src/eepp/system/platform/posix/cthreadlocalimpl.cpp -../../include/eepp/system/tthreadlocalptr.hpp +../../include/eepp/system/threadlocal.hpp +../../src/eepp/system/threadlocal.cpp +../../src/eepp/system/platform/win/threadlocalimpl.hpp +../../src/eepp/system/platform/win/threadlocalimpl.cpp +../../src/eepp/system/platform/posix/threadlocalimpl.hpp +../../src/eepp/system/platform/posix/threadlocalimpl.cpp +../../include/eepp/system/threadlocalptr.hpp ../../external_projects.lua -../../src/eepp/ui/cuitextinputpassword.cpp -../../include/eepp/ui/cuitextinputpassword.hpp -../../src/eepp/graphics/renderer/crenderergl3cp.cpp -../../include/eepp/graphics/renderer/crenderergl3cp.hpp +../../src/eepp/ui/uitextinputpassword.cpp +../../include/eepp/ui/uitextinputpassword.hpp +../../src/eepp/graphics/renderer/renderergl3cp.cpp +../../include/eepp/graphics/renderer/renderergl3cp.hpp ../../src/eepp/graphics/renderer/shaders/basegl3cp.vert ../../src/eepp/graphics/renderer/shaders/basegl3cp.frag -../../src/eepp/window/backend/SDL/cbackendsdl.cpp +../../src/eepp/window/backend/SDL/backendsdl.cpp ../../bin/assets/ee.ini -../../src/eepp/network/ssl/csslsocket.cpp -../../src/eepp/network/ssl/csslsocketimpl.hpp -../../src/eepp/network/ssl/backend/openssl/copensslsocket.hpp -../../src/eepp/network/ssl/backend/openssl/copensslsocket.cpp -../../include/eepp/network/ssl/csslsocket.hpp +../../src/eepp/network/ssl/sslsocket.cpp +../../src/eepp/network/ssl/sslsocketimpl.hpp +../../src/eepp/network/ssl/backend/openssl/opensslsocket.hpp +../../src/eepp/network/ssl/backend/openssl/opensslsocket.cpp +../../include/eepp/network/ssl/sslsocket.hpp ../../src/eepp/network/ssl/backend/openssl/curl_hostcheck.cpp ../../src/eepp/network/ssl/backend/openssl/curl_hostcheck.h ../../src/eepp/core/debug.cpp ../../src/eepp/core/memorymanager.cpp ../../src/eepp/core/string.cpp ../../src/eepp/core/version.cpp +../../include/eepp/system/clock.hpp +../../include/eepp/system/clock.hpp +../../src/eepp/window/backend/SDL2/wminfo.cpp +../../src/eepp/window/backend/SDL2/wminfo.hpp +../../include/eepp/network/uri.hpp +../../src/eepp/network/uri.cpp +../../include/eepp/system/base64.hpp +../../src/eepp/system/base64.cpp +../../include/eepp/system/md5.hpp +../../src/eepp/system/md5.cpp +../../src/examples/strobe/strobe.cpp +../../../eeiv/src/capp.hpp diff --git a/projects/osx/ee.includes b/projects/osx/ee.includes index eb8e42b7d..340342f92 100644 --- a/projects/osx/ee.includes +++ b/projects/osx/ee.includes @@ -1,2 +1,14 @@ ../../src/ ../../include/ +../../src/examples/strobe +../../../eeiv/src +. +../../include/eepp/graphics +../../src/eepp/graphics +../../include/eepp/ui +../../src/eepp/ui +../../src/eepp/helper/freetype2/include/ +../../include/eepp/system +../../src/eepp/system +../../src/eepp/graphics/renderer +../../include/eepp/graphics/renderer diff --git a/projects/windows/ee.files b/projects/windows/ee.files index 3ea205dfa..1bda16342 100644 --- a/projects/windows/ee.files +++ b/projects/windows/ee.files @@ -1,3 +1,5 @@ +../../include/eepp/graphics/arcdrawable.hpp +../../include/eepp/graphics/circledrawable.hpp ../../include/eepp/graphics/drawable.hpp ../../include/eepp/graphics/drawablesearcher.hpp ../../include/eepp/graphics/font.hpp @@ -5,7 +7,10 @@ ../../include/eepp/graphics/fonttruetype.hpp ../../include/eepp/graphics/fonttruetypeloader.hpp ../../include/eepp/graphics/graphicshelper.hpp +../../include/eepp/graphics/primitivedrawable.hpp +../../include/eepp/graphics/rectangledrawable.hpp ../../include/eepp/graphics/renderer/base.hpp +../../include/eepp/graphics/renderer/clippingmask.hpp ../../include/eepp/graphics/renderer/opengl.hpp ../../include/eepp/graphics/renderer/renderer.hpp ../../include/eepp/graphics/renderer/renderer.hpp @@ -33,6 +38,8 @@ ../../include/eepp/ui/uithemedefault.hpp ../../include/eepp/ui/uiwidget.hpp ../../src/eepp/gaming/mapobjectlayer.cpp +../../src/eepp/graphics/arcdrawable.cpp +../../src/eepp/graphics/circledrawable.cpp ../../src/eepp/graphics/drawable.cpp ../../src/eepp/graphics/drawablesearcher.cpp ../../src/eepp/graphics/fonttruetype.cpp @@ -40,6 +47,9 @@ ../../src/eepp/graphics/globalbatchrenderer.cpp ../../src/eepp/graphics/pixeldensity.cpp ../../src/eepp/graphics/pixelperfect.cpp +../../src/eepp/graphics/primitivedrawable.cpp +../../src/eepp/graphics/rectangledrawable.cpp +../../src/eepp/graphics/renderer/clippingmask.cpp ../../src/eepp/graphics/renderer/openglext.hpp ../../src/eepp/graphics/renderer/renderer.cpp ../../src/eepp/graphics/renderer/renderer.cpp diff --git a/src/eepp/gaming/tilemap.cpp b/src/eepp/gaming/tilemap.cpp index bd4bbf29e..325835d8f 100644 --- a/src/eepp/gaming/tilemap.cpp +++ b/src/eepp/gaming/tilemap.cpp @@ -214,7 +214,7 @@ void TileMap::draw() { GlobalBatchRenderer::instance()->draw(); if ( getClipedArea() ) { - mWindow->clipEnable( mScreenPos.x, mScreenPos.y, mViewSize.x, mViewSize.y ); + GLi->getClippingMask()->clipEnable( mScreenPos.x, mScreenPos.y, mViewSize.x, mViewSize.y ); } if ( getDrawBackground() ) { @@ -252,7 +252,7 @@ void TileMap::draw() { GLi->loadMatrixf( oldM ); if ( getClipedArea() ) { - mWindow->clipDisable(); + GLi->getClippingMask()->clipDisable(); } } diff --git a/src/eepp/graphics/renderer/clippingmask.cpp b/src/eepp/graphics/renderer/clippingmask.cpp new file mode 100644 index 000000000..d3d6b1253 --- /dev/null +++ b/src/eepp/graphics/renderer/clippingmask.cpp @@ -0,0 +1,120 @@ +#include +#include +#include +#include +#include +#include +#include + +using namespace EE::Window; + +namespace EE { namespace Graphics { + +void ClippingMask::clipEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ) { + EE::Window::Window * window = Engine::instance()->getCurrentWindow(); + GlobalBatchRenderer::instance()->draw(); + + Rectf r( x, y, x + Width, y + Height ); + + if ( !mScissorsClipped.empty() ) { + Rectf r2 = mScissorsClipped.back(); + r.shrink( r2 ); + } + + GLi->scissor( r.Left, window->getHeight() - r.Bottom, r.getWidth(), r.getHeight() ); + GLi->enable( GL_SCISSOR_TEST ); + + if ( mPushScissorClip ) { + mScissorsClipped.push_back( r ); + } +} + +void ClippingMask::clipDisable() { + GlobalBatchRenderer::instance()->draw(); + + if ( ! mScissorsClipped.empty() ) { // This should always be true + mScissorsClipped.pop_back(); + } + + if ( mScissorsClipped.empty() ) { + GLi->disable( GL_SCISSOR_TEST ); + } else { + Rectf R( mScissorsClipped.back() ); + mPushScissorClip = false; + clipEnable( R.Left, R.Top, R.getWidth(), R.getHeight() ); + mPushScissorClip = true; + } +} + +void ClippingMask::clipPlaneEnable( const Int32& x, const Int32& y, const Int32& Width, const Int32& Height ) { + GlobalBatchRenderer::instance()->draw(); + GLi->clip2DPlaneEnable( x, y, Width, Height ); +} + +void ClippingMask::clipPlaneDisable() { + GlobalBatchRenderer::instance()->draw(); + GLi->clip2DPlaneDisable(); +} + +ClippingMask::ClippingMask() : + mPushScissorClip( true ), + mMode( Inclusive ) +{ +} + +std::size_t ClippingMask::getMaskCount() const { + return mDrawables.size(); +} + +const Drawable*& ClippingMask::operator [](std::size_t index) { + return mDrawables[index]; +} + +const Drawable* const& ClippingMask::operator [](std::size_t index) const { + return mDrawables[index]; +} + +void ClippingMask::clearMasks() { + mDrawables.clear(); +} + +void ClippingMask::appendMask(const Drawable& drawable) { + mDrawables.push_back(&drawable); +} + +void ClippingMask::removeMask(const Drawable& drawable) { + mDrawables.erase(std::remove(mDrawables.begin(), mDrawables.end(), &drawable), mDrawables.end()); +} + +ClippingMask::Mode ClippingMask::getMaskMode() const { + return mMode; +} + +void ClippingMask::setMaskMode(Mode theMode) { + mMode = theMode; +} + +void ClippingMask::stencilMaskEnable() { + GLi->enable(GL_STENCIL_TEST); + GLi->stencilMask(0xFF); + GLi->stencilFunc(GL_NEVER, 1, 0xFF); + GLi->stencilOp(GL_REPLACE, GL_KEEP, GL_KEEP); + + drawMask(); + + GLi->stencilFunc(GL_EQUAL, getMaskMode() == Inclusive ? 1 : 0, 0xFF); +} + +void ClippingMask::stencilMaskDisable( bool clearMasks ) { + GLi->disable(GL_STENCIL_TEST); + + if ( clearMasks ) + this->clearMasks(); +} + +void ClippingMask::drawMask() { + for ( std::size_t i = 0; i < getMaskCount(); i++ ) + const_cast(mDrawables[i])->draw(); +} + +}} diff --git a/src/eepp/graphics/renderer/renderer.cpp b/src/eepp/graphics/renderer/renderer.cpp index 1f7862eaf..beb14a245 100644 --- a/src/eepp/graphics/renderer/renderer.cpp +++ b/src/eepp/graphics/renderer/renderer.cpp @@ -115,12 +115,14 @@ Renderer::Renderer() : mBlendEnabled( false ), mQuadVertexs( 4 ), mLineWidth( 1 ), - mCurVAO( 0 ) + mCurVAO( 0 ), + mClippingMask( eeNew( ClippingMask , () ) ) { GLi = this; } Renderer::~Renderer() { + eeSAFE_DELETE( mClippingMask ); GLi = NULL; } @@ -623,6 +625,10 @@ const int& Renderer::quadVertexs() const { return mQuadVertexs; } +ClippingMask * Renderer::getClippingMask() const { + return mClippingMask; +} + void Renderer::bindVertexArray ( unsigned int array ) { #if !defined( EE_GLES ) if ( mCurVAO != array ) { diff --git a/src/eepp/ui/uicontrol.cpp b/src/eepp/ui/uicontrol.cpp index 336da5902..a0f240f26 100644 --- a/src/eepp/ui/uicontrol.cpp +++ b/src/eepp/ui/uicontrol.cpp @@ -225,7 +225,7 @@ const Sizei& UIControl::getRealSize() { UIControl * UIControl::setVisible( const bool& visible ) { mVisible = visible; - onVisibleChange(); + onVisibilityChange(); return this; } @@ -663,7 +663,7 @@ void UIControl::toPosition( const Uint32& Pos ) { } } -void UIControl::onVisibleChange() { +void UIControl::onVisibilityChange() { sendCommonEvent( UIEvent::EventOnVisibleChange ); } diff --git a/src/eepp/ui/uimanager.cpp b/src/eepp/ui/uimanager.cpp index 067788239..ac82c6133 100644 --- a/src/eepp/ui/uimanager.cpp +++ b/src/eepp/ui/uimanager.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -286,19 +287,19 @@ const Uint32& UIManager::getLastPressTrigger() const { } void UIManager::clipPlaneEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ) { - mWindow->clipPlaneEnable( x, y, Width, Height ); + GLi->getClippingMask()->clipPlaneEnable( x, y, Width, Height ); } void UIManager::clipPlaneDisable() { - mWindow->clipPlaneDisable(); + GLi->getClippingMask()->clipPlaneDisable(); } void UIManager::clipEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ) { - mWindow->clipEnable( x, y, Width, Height ); + GLi->getClippingMask()->clipEnable( x, y, Width, Height ); } void UIManager::clipDisable() { - mWindow->clipDisable(); + GLi->getClippingMask()->clipDisable(); } void UIManager::clipSmartEnable(UIControl * ctrl, const Int32 & x, const Int32 & y, const Uint32 & Width, const Uint32 & Height) { diff --git a/src/eepp/ui/uiwidget.cpp b/src/eepp/ui/uiwidget.cpp index 204db3e88..2bc5a3373 100644 --- a/src/eepp/ui/uiwidget.cpp +++ b/src/eepp/ui/uiwidget.cpp @@ -264,6 +264,11 @@ void UIWidget::onPositionChange() { UIControlAnim::onPositionChange(); } +void UIWidget::onVisibilityChange() { + updateAnchorsDistances(); + UIControlAnim::onVisibilityChange(); +} + void UIWidget::onAutoSize() { } diff --git a/src/eepp/window/window.cpp b/src/eepp/window/window.cpp index cab6115d0..1d2d7b009 100644 --- a/src/eepp/window/window.cpp +++ b/src/eepp/window/window.cpp @@ -49,8 +49,7 @@ Window::Window( WindowSettings Settings, ContextSettings Context, Clipboard * Cl mInput( Input ), mCursorManager( CursorManager ), mPlatform( NULL ), - mNumCallBacks( 0 ), - mPushScissorClip( true ) + mNumCallBacks( 0 ) { mWindow.WindowConfig = Settings; mWindow.ContextConfig = Context; @@ -327,51 +326,6 @@ void Window::display( bool clear ) { limitFps(); } -void Window::clipEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ) { - GlobalBatchRenderer::instance()->draw(); - - Rectf r( x, y, x + Width, y + Height ); - - if ( !mScissorsClipped.empty() ) { - Rectf r2 = mScissorsClipped.back(); - r.shrink( r2 ); - } - - GLi->scissor( r.Left, getHeight() - r.Bottom, r.getWidth(), r.getHeight() ); - GLi->enable( GL_SCISSOR_TEST ); - - if ( mPushScissorClip ) { - mScissorsClipped.push_back( r ); - } -} - -void Window::clipDisable() { - GlobalBatchRenderer::instance()->draw(); - - if ( ! mScissorsClipped.empty() ) { // This should always be true - mScissorsClipped.pop_back(); - } - - if ( mScissorsClipped.empty() ) { - GLi->disable( GL_SCISSOR_TEST ); - } else { - Rectf R( mScissorsClipped.back() ); - mPushScissorClip = false; - clipEnable( R.Left, R.Top, R.getWidth(), R.getHeight() ); - mPushScissorClip = true; - } -} - -void Window::clipPlaneEnable( const Int32& x, const Int32& y, const Int32& Width, const Int32& Height ) { - GlobalBatchRenderer::instance()->draw(); - GLi->clip2DPlaneEnable( x, y, Width, Height ); -} - -void Window::clipPlaneDisable() { - GlobalBatchRenderer::instance()->draw(); - GLi->clip2DPlaneDisable(); -} - Clipboard * Window::getClipboard() const { return mClipboard; } diff --git a/src/examples/empty_window/empty_window.cpp b/src/examples/empty_window/empty_window.cpp index ccaa0d597..18ca2e9f4 100644 --- a/src/examples/empty_window/empty_window.cpp +++ b/src/examples/empty_window/empty_window.cpp @@ -1,16 +1,10 @@ #include -#define GL_STENCIL_TEST 0x0B90 -#define GL_EQUAL 0x0202 -#define GL_NEVER 0x0200 -#define GL_KEEP 0x1E00 -#define GL_REPLACE 0x1E01 - EE::Window::Window * win = NULL; float circ = 0, circ2 = 0; int op = 1; -ArcDrawable arcDrawable( 100, 64 ); -RectangleDrawable rectDrawable( Vector2f(0,0), Sizef(250,250) ); +ArcDrawable arcDrawable( 200, 64 ); +CircleDrawable circleDrawableMask( 150, 64 ); void mainLoop() { @@ -46,46 +40,20 @@ void mainLoop() Vector2f winCenter( win->getWidth() * 0.5f, win->getHeight() * 0.5f ); -/* - GLi->enable(GL_STENCIL_TEST); - GLi->stencilMask(0xFF); - GLi->stencilFunc(GL_NEVER, 1, 0xFF); - GLi->stencilOp(GL_REPLACE, GL_KEEP, GL_KEEP); + ClippingMask * clippingMask = Renderer::instance()->getClippingMask(); - p.drawCircle( winCenter, 150, 64 ); + circleDrawableMask.setPosition( winCenter ); - GLi->stencilFunc(GL_EQUAL, 0, 0xFF); + clippingMask->setMaskMode( ClippingMask::Exclusive ); + clippingMask->clearMasks(); + clippingMask->appendMask( circleDrawableMask ); + clippingMask->stencilMaskEnable(); - // Draw a circle - p.drawArc( winCenter, 200, 64, circ, circ2 ); - - GLi->disable(GL_STENCIL_TEST); -*/ -/* - GLi->Enable(GL_STENCIL_TEST); - - GLi->StencilFunc(GL_ALWAYS, 1, 1); - GLi->ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); - GLi->StencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE); - - p.SetColor( ColorA( 255, 255, 255, 255 ) ); - p.DrawCircle( winCenter, 150, 40 ); - - GLi->StencilFunc(GL_NOTEQUAL, 1, 1); - GLi->StencilOp(GL_KEEP, GL_KEEP, GL_KEEP); - GLi->ColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - - // Draw a circle - p.SetColor( ColorA( 0, 255, 0, 150 ) ); - p.DrawArc( winCenter, 200, 40, circ, circ2 ); - - GLi->Disable(GL_STENCIL_TEST); -*/ arcDrawable.setArcAngle( circ ); arcDrawable.setArcStartAngle( circ2 ); arcDrawable.draw( winCenter ); - rectDrawable.draw(); + clippingMask->stencilMaskDisable(); // Draw frame win->display(); @@ -102,12 +70,11 @@ EE_MAIN_FUNC int main (int argc, char * argv []) // Set window background color win->setClearColor( Color( 50, 50, 50 ) ); - arcDrawable.setColorFilter( ColorA( 0, 255, 0, 150 ) ); + arcDrawable.setColor( ColorA( 0, 255, 0, 150 ) ); arcDrawable.setFillMode( DRAW_FILL ); - rectDrawable.setColorFilter( ColorA( 255, 0, 0, 150 ) ); - rectDrawable.setFillMode( DRAW_FILL ); - rectDrawable.setCorners( 64 ); + circleDrawableMask.setColor( ColorA( 0, 255, 0, 150 ) ); + circleDrawableMask.setFillMode( DRAW_FILL ); // Set the MainLoop function and run it // This is the application loop, it will loop until the window is closed. diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp index 54696701c..dab7359c2 100644 --- a/src/test/eetest.cpp +++ b/src/test/eetest.cpp @@ -1427,9 +1427,9 @@ void EETest::render() { screen1(); mWindow->setView( mWindow->getDefaultView() ); - mWindow->clipEnable( (Int32)HWidth - 320, (Int32)HHeight - 240, 640, 480 ); + GLi->getClippingMask()->clipEnable( (Int32)HWidth - 320, (Int32)HHeight - 240, 640, 480 ); screen3(); - mWindow->clipDisable(); + GLi->getClippingMask()->clipDisable(); } ColorA ColRR1( 150, 150, 150, 220 );