From 02c59db98adb8bf329a033210b6a4200cea78f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Thu, 8 Mar 2018 01:54:01 -0300 Subject: [PATCH] Disabled EngineInitializer ( it doesn't work on windows ). --HG-- branch : dev --- projects/windows/ee.files | 145 +++++++++++++++++++++++++------------ src/eepp/window/engine.cpp | 1 - 2 files changed, 100 insertions(+), 46 deletions(-) diff --git a/projects/windows/ee.files b/projects/windows/ee.files index e6d6e8b49..70aab684b 100644 --- a/projects/windows/ee.files +++ b/projects/windows/ee.files @@ -1,3 +1,29 @@ +../../include/eepp/scene/event.hpp +../../include/eepp/scene/eventdispatcher.hpp +../../include/eepp/scene/scenemanager.hpp +../../include/eepp/ui/uieventdispatcher.hpp +../../include/eepp/scene/keyevent.hpp +../../include/eepp/scene/mouseevent.hpp +../../include/eepp/scene/scenenode.hpp +../../src/eepp/scene/scenemanager.cpp +../../src/eepp/ui/uiscenenode.cpp +../../include/eepp/ui/uiscenenode.hpp +../../include/eepp/window/displaymanager.hpp +../../src/eepp/graphics/renderer/shaders/basegl3cp.gles2.frag.h +../../src/eepp/graphics/renderer/shaders/basegl3cp.gles2.vert.h +../../src/eepp/scene/event.cpp +../../src/eepp/scene/eventdispatcher.cpp +../../src/eepp/ui/uieventdispatcher.cpp +../../src/eepp/scene/keyevent.cpp +../../src/eepp/scene/mouseevent.cpp +../../src/eepp/scene/scenenode.cpp +../../src/eepp/window/backend/SDL2/displaymanagersdl2.cpp +../../src/eepp/window/backend/SDL2/displaymanagersdl2.hpp +../../src/eepp/window/backend/SFML/displaymanagersfml.cpp +../../src/eepp/window/backend/SFML/displaymanagersfml.hpp +../../src/eepp/window/displaymanager.cpp +../../src/tools/mapeditor/mapeditor.cpp +../../src/tools/textureatlaseditor/textureatlaseditor.cpp ../../include/eepp/graphics/arcdrawable.hpp ../../include/eepp/graphics/circledrawable.hpp ../../include/eepp/graphics/convexshapedrawable.hpp @@ -6,8 +32,10 @@ ../../include/eepp/graphics/drawableresource.hpp ../../include/eepp/graphics/drawablesearcher.hpp ../../include/eepp/graphics/font.hpp +../../include/eepp/graphics/fontsprite.hpp ../../include/eepp/graphics/fontstyleconfig.hpp ../../include/eepp/graphics/fonttruetype.hpp +../../include/eepp/graphics/fontbmfont.hpp ../../include/eepp/graphics/fonttruetypeloader.hpp ../../include/eepp/graphics/ninepatch.hpp ../../include/eepp/graphics/ninepatchmanager.hpp @@ -23,24 +51,46 @@ ../../include/eepp/graphics/renderer/renderergl3.hpp ../../include/eepp/graphics/renderer/renderergl3cp.hpp ../../include/eepp/graphics/renderer/renderergles2.hpp +../../include/eepp/graphics/renderer/rendererglshader.hpp ../../include/eepp/graphics/renderer/rendererhelper.hpp ../../include/eepp/graphics/rendermode.hpp ../../include/eepp/graphics/text.hpp +../../include/eepp/graphics/textureregion.hpp ../../include/eepp/graphics/vertexbufferhelper.hpp ../../include/eepp/math/interpolation1d.hpp ../../include/eepp/math/interpolation2d.hpp +../../include/eepp/math/transform.hpp +../../include/eepp/math/transformable.hpp ../../include/eepp/system/color.hpp +../../include/eepp/system/directorypack.hpp +../../include/eepp/system/iostreampak.hpp +../../include/eepp/system/iostreamzip.hpp ../../include/eepp/system/translator.hpp -../../include/eepp/ui/uidragablecontrol.hpp -../../include/eepp/ui/uieventmouse.hpp +../../include/eepp/system/virtualfilesystem.hpp +../../include/eepp/scene/node.hpp +../../src/eepp/scene/node.cpp +../../include/eepp/scene/actions/actioninterpolation1d.hpp +../../include/eepp/scene/actions/actioninterpolation2d.hpp +../../include/eepp/scene/actions/delay.hpp +../../include/eepp/scene/actions/fade.hpp +../../include/eepp/scene/actions/marginmove.hpp +../../include/eepp/scene/actions/move.hpp +../../include/eepp/scene/actions/rotate.hpp +../../include/eepp/scene/actions/scale.hpp +../../include/eepp/scene/actions/sequence.hpp +../../include/eepp/scene/actions/spawn.hpp +../../include/eepp/ui/marginmove/scale.hpp +../../include/eepp/scene/action.hpp +../../include/eepp/scene/actionmanager.hpp ../../include/eepp/ui/uigridlayout.hpp ../../include/eepp/ui/uiimage.hpp ../../include/eepp/ui/uilayout.hpp ../../include/eepp/ui/uilinearlayout.hpp ../../include/eepp/ui/uimenuseparator.hpp +../../include/eepp/ui/uinode.hpp ../../include/eepp/ui/uirelativelayout.hpp ../../include/eepp/ui/uiscrollview.hpp -../../include/eepp/ui/uisubtexture.hpp +../../include/eepp/ui/uitextureregion.hpp ../../include/eepp/ui/uitable.hpp ../../include/eepp/ui/uitablecell.hpp ../../include/eepp/ui/uitextview.hpp @@ -52,8 +102,21 @@ ../../src/eepp/graphics/convexshapedrawable.cpp ../../src/eepp/graphics/drawablegroup.cpp ../../src/eepp/graphics/drawableresource.cpp +../../src/eepp/graphics/fontsprite.cpp ../../src/eepp/graphics/ninepatch.cpp ../../src/eepp/graphics/ninepatchmanager.cpp +../../src/eepp/graphics/renderer/shaders/base.frag.h +../../src/eepp/graphics/renderer/shaders/base.vert.h +../../src/eepp/graphics/renderer/shaders/basegl3.frag.h +../../src/eepp/graphics/renderer/shaders/basegl3.vert.h +../../src/eepp/graphics/renderer/shaders/basegl3cp.frag.h +../../src/eepp/graphics/renderer/shaders/basegl3cp.vert.h +../../src/eepp/graphics/renderer/shaders/clipped.frag.h +../../src/eepp/graphics/renderer/shaders/clipped.vert.h +../../src/eepp/graphics/renderer/shaders/pointsprite.frag.h +../../src/eepp/graphics/renderer/shaders/pointsprite.vert.h +../../src/eepp/graphics/renderer/shaders/primitive.frag.h +../../src/eepp/graphics/renderer/shaders/primitive.vert.h ../../src/eepp/maps/mapobjectlayer.cpp ../../src/eepp/graphics/arcdrawable.cpp ../../src/eepp/graphics/circledrawable.cpp @@ -61,6 +124,7 @@ ../../src/eepp/graphics/drawablesearcher.cpp ../../src/eepp/graphics/fonttruetype.cpp ../../src/eepp/graphics/fonttruetypeloader.cpp +../../src/eepp/graphics/fontbmfont.cpp ../../src/eepp/graphics/globalbatchrenderer.cpp ../../src/eepp/graphics/pixeldensity.cpp ../../src/eepp/graphics/pixelperfect.cpp @@ -74,23 +138,41 @@ ../../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/rendererglshader.cpp ../../src/eepp/graphics/renderer/rendererstackhelper.hpp ../../src/eepp/graphics/text.cpp ../../src/eepp/math/interpolation1d.cpp ../../src/eepp/math/interpolation2d.cpp +../../src/eepp/math/transform.cpp +../../src/eepp/math/transformable.cpp ../../src/eepp/system/color.cpp +../../src/eepp/system/directorypack.cpp +../../src/eepp/system/iostreampak.cpp +../../src/eepp/system/iostreamzip.cpp ../../src/eepp/system/translator.cpp -../../src/eepp/ui/uidragablecontrol.cpp +../../src/eepp/system/virtualfilesystem.cpp +../../src/eepp/scene/actions/actioninterpolation1d.cpp +../../src/eepp/scene/actions/actioninterpolation2d.cpp +../../src/eepp/scene/actions/delay.cpp +../../src/eepp/scene/actions/fade.cpp +../../src/eepp/scene/actions/move.cpp +../../src/eepp/scene/actions/rotate.cpp +../../src/eepp/scene/actions/scale.cpp +../../src/eepp/scene/actions/marginmove.cpp +../../src/eepp/scene/actions/sequence.cpp +../../src/eepp/scene/actions/spawn.cpp +../../src/eepp/scene/action.cpp +../../src/eepp/scene/actionmanager.cpp ../../src/eepp/ui/uigridlayout.cpp ../../src/eepp/ui/uiimage.cpp ../../src/eepp/ui/uilayout.cpp ../../src/eepp/ui/uilinearlayout.cpp ../../src/eepp/ui/uiloader.cpp ../../src/eepp/ui/uimenuseparator.cpp +../../src/eepp/ui/uinode.cpp ../../src/eepp/ui/uirelativelayout.cpp ../../src/eepp/ui/uiscrollview.cpp -../../src/eepp/ui/uisubtexture.cpp +../../src/eepp/ui/uitextureregion.cpp ../../src/eepp/ui/uitable.cpp ../../src/eepp/ui/uitablecell.cpp ../../src/eepp/ui/uitextview.cpp @@ -145,7 +227,6 @@ ../../include/eepp/system/iostreamfile.hpp ../../include/eepp/system/iostream.hpp ../../include/eepp/system/inifile.hpp -../../include/eepp/system/base.hpp ../../src/eepp/system/zip.cpp ../../src/eepp/system/clock.cpp ../../src/eepp/system/thread.cpp @@ -182,8 +263,8 @@ ../../include/eepp/maps/maplayer.hpp ../../include/eepp/maps/gameobjectvirtual.hpp ../../include/eepp/maps/gameobjectsprite.hpp -../../include/eepp/maps/gameobjectsubtextureex.hpp -../../include/eepp/maps/gameobjectsubtexture.hpp +../../include/eepp/maps/gameobjecttextureregionex.hpp +../../include/eepp/maps/gameobjecttextureregion.hpp ../../include/eepp/maps/gameobject.hpp ../../include/eepp/maps/base.hpp ../../src/eepp/maps/mapeditor/uimapnew.hpp @@ -200,8 +281,8 @@ ../../src/eepp/maps/maplayer.cpp ../../src/eepp/maps/gameobjectvirtual.cpp ../../src/eepp/maps/gameobjectsprite.cpp -../../src/eepp/maps/gameobjectsubtextureex.cpp -../../src/eepp/maps/gameobjectsubtexture.cpp +../../src/eepp/maps/gameobjecttextureregionex.cpp +../../src/eepp/maps/gameobjecttextureregion.cpp ../../src/eepp/maps/gameobject.cpp ../../src/eepp/maps/mapeditor/uimapnew.cpp ../../src/eepp/maps/mapeditor/uimap.cpp @@ -217,8 +298,6 @@ ../../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 @@ -232,7 +311,7 @@ ../../include/eepp/graphics/sprite.hpp ../../include/eepp/graphics/textureatlasmanager.hpp ../../include/eepp/graphics/textureatlas.hpp -../../include/eepp/graphics/subtexture.hpp +../../include/eepp/graphics/textureregion.hpp ../../include/eepp/graphics/shaderprogrammanager.hpp ../../include/eepp/graphics/shaderprogram.hpp ../../include/eepp/graphics/shader.hpp @@ -330,7 +409,7 @@ ../../include/eepp/ui/uiprogressbar.hpp ../../include/eepp/ui/uipopupmenu.hpp ../../include/eepp/ui/uimessagebox.hpp -../../include/eepp/ui/uimessage.hpp +../../include/eepp/scene/nodemessage.hpp ../../include/eepp/ui/uimenusubmenu.hpp ../../include/eepp/ui/uimenuitem.hpp ../../include/eepp/ui/uimenucheckbox.hpp @@ -338,19 +417,14 @@ ../../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/textureatlassubtextureeditor.hpp +../../src/eepp/ui/tools/textureatlastextureregioneditor.hpp ../../src/eepp/ui/tools/textureatlasnew.hpp ../../include/eepp/ui/tools/textureatlaseditor.hpp ../../src/eepp/ui/uiwidgetcreator.cpp @@ -378,7 +452,7 @@ ../../src/eepp/ui/uiprogressbar.cpp ../../src/eepp/ui/uipopupmenu.cpp ../../src/eepp/ui/uimessagebox.cpp -../../src/eepp/ui/uimessage.cpp +../../src/eepp/scene/nodemessage.cpp ../../src/eepp/ui/uimenusubmenu.cpp ../../src/eepp/ui/uimenuitem.cpp ../../src/eepp/ui/uimenucheckbox.cpp @@ -386,18 +460,13 @@ ../../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/textureatlastextureregioneditor.cpp ../../src/eepp/ui/tools/textureatlasnew.cpp ../../src/eepp/ui/tools/textureatlaseditor.cpp ../../include/eepp/math/vector3.hpp @@ -423,7 +492,7 @@ ../../include/eepp/window/inputhelper.hpp ../../include/eepp/window/inputevent.hpp ../../include/eepp/window/window.hpp -../../include/eepp/window/view.hpp +../../include/eepp/graphics/view.hpp ../../include/eepp/window/cursorhelper.hpp ../../include/eepp/window/platformimpl.hpp ../../include/eepp/window/joystickmanager.hpp @@ -443,7 +512,7 @@ ../../src/eepp/window/inputhelper.cpp ../../src/eepp/window/platformhelper.hpp ../../src/eepp/window/window.cpp -../../src/eepp/window/view.cpp +../../src/eepp/graphics/view.cpp ../../src/eepp/window/platformimpl.cpp ../../src/eepp/window/joystickmanager.cpp ../../src/eepp/window/joystick.cpp @@ -533,8 +602,6 @@ ../../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 @@ -548,7 +615,7 @@ ../../src/eepp/graphics/sprite.cpp ../../src/eepp/graphics/textureatlasmanager.cpp ../../src/eepp/graphics/textureatlas.cpp -../../src/eepp/graphics/subtexture.cpp +../../src/eepp/graphics/textureregion.cpp ../../src/eepp/graphics/shaderprogrammanager.cpp ../../src/eepp/graphics/shaderprogram.cpp ../../src/eepp/graphics/shader.cpp @@ -571,21 +638,11 @@ ../../src/examples/empty_window/empty_window.cpp ../../src/test/eetest.hpp ../../src/test/eetest.cpp -../../src/eepp/graphics/renderer/shaders/primitive.vert -../../src/eepp/graphics/renderer/shaders/primitive.frag -../../src/eepp/graphics/renderer/shaders/pointsprite.vert -../../src/eepp/graphics/renderer/shaders/pointsprite.frag -../../src/eepp/graphics/renderer/shaders/clipped.vert -../../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/renderergles2.cpp ../../include/eepp/graphics/renderer/renderergles2.hpp ../../include/eepp/ee.hpp ../../include/eepp/config.hpp ../../include/eepp/core.hpp -../../src/eepp/graphics/renderer/shaders/basegl3.vert -../../src/eepp/graphics/renderer/shaders/basegl3.frag ../../src/examples/external_shader/external_shader.cpp ../../include/eepp/window.hpp ../../include/eepp/ui.hpp @@ -720,8 +777,6 @@ ../../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/backendsdl.cpp ../../bin/assets/ee.ini ../../src/eepp/network/ssl/sslsocket.cpp diff --git a/src/eepp/window/engine.cpp b/src/eepp/window/engine.cpp index 6e4142167..a3f854b3f 100755 --- a/src/eepp/window/engine.cpp +++ b/src/eepp/window/engine.cpp @@ -395,7 +395,6 @@ struct EngineInitializer #if EE_PLATFORM != EE_PLATFORM_ANDROID && EE_PLATFORM != EE_PLATFORM_IOS -EngineInitializer engineInitializer; #else extern "C" int EE_SDL_main( int argc, char *argv[] );