diff --git a/.gitmodules b/.gitmodules index da07503f..2cf9ee1a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,6 +38,3 @@ [submodule "external/z/zlib"] path = external/z/zlib url = https://github.com/madler/zlib.git -[submodule "external/ode"] - path = external/ode - url = https://github.com/HeeroYui/ode.git diff --git a/Makefile.mk b/Makefile.mk index 9721f8fc..1103a47f 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -19,7 +19,7 @@ USER_PACKAGES+= $(TMP_DIR)/external/portaudio USER_PACKAGES+= $(TMP_DIR)/external/tinyxml USER_PACKAGES+= $(TMP_DIR)/external/z USER_PACKAGES+= $(TMP_DIR)/external/zip -USER_PACKAGES+= $(TMP_DIR)/external/ode +USER_PACKAGES+= $(TMP_DIR)/external/ePhysics #include te generic toolchain : include $(TMP_DIR)/build/Makefile.mk diff --git a/external/etk b/external/etk index 033c9dd6..74a6e35f 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 033c9dd63a75db8afb448760cdb59bc8f89d5e7a +Subproject commit 74a6e35fa3de3bc5b2b0dc89992e6610db2014c2 diff --git a/external/ode b/external/ode deleted file mode 160000 index 7e4c9495..00000000 --- a/external/ode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7e4c9495b4688c4387402897922f0e258338a9ec diff --git a/sources/Linux.mk b/sources/Linux.mk index 1574fb60..182e50a9 100644 --- a/sources/Linux.mk +++ b/sources/Linux.mk @@ -12,7 +12,7 @@ LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/tag) $(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION)) # name of the dependency -LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua portaudio ode +LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua portaudio ephysics LOCAL_C_INCLUDES := diff --git a/sources/ewol/game/Element.h b/sources/ewol/game/Element.h index 63760ce3..df5d3356 100644 --- a/sources/ewol/game/Element.h +++ b/sources/ewol/game/Element.h @@ -11,6 +11,8 @@ #include +#include +#include #include namespace game diff --git a/sources/ewol/game/Engine.h b/sources/ewol/game/Engine.h index 9759397d..0b5f0c26 100644 --- a/sources/ewol/game/Engine.h +++ b/sources/ewol/game/Engine.h @@ -12,6 +12,7 @@ #include #include +#include namespace game { diff --git a/sources/ewol/renderer/resources/Mesh.h b/sources/ewol/renderer/resources/Mesh.h index 721723df..53760ad2 100644 --- a/sources/ewol/renderer/resources/Mesh.h +++ b/sources/ewol/renderer/resources/Mesh.h @@ -26,12 +26,12 @@ namespace ewol int32_t m_GLColor; int32_t m_GLtexture; int32_t m_GLtexID; - etk::Vector m_indices; - etk::Vector< vec3 > m_vertices; - etk::Vector< vec2 > m_uvTextures; - etk::Vector< vec3 > m_normals; - ewol::TextureFile* m_texture1; - etk::Vector m_coordColor; //!< internal color of the different point + etk::Vector m_indices; + etk::Vector< vec3 > m_vertices; + etk::Vector< vec2 > m_uvTextures; + etk::Vector< vec3 > m_normals; + ewol::TextureFile* m_texture1; + etk::Vector m_coordColor; //!< internal color of the different point public: Mesh(etk::UString genName); virtual ~Mesh(void); diff --git a/sources/ewol/widget/Scene.cpp b/sources/ewol/widget/Scene.cpp index e3d31db0..0a1a5698 100644 --- a/sources/ewol/widget/Scene.cpp +++ b/sources/ewol/widget/Scene.cpp @@ -14,7 +14,7 @@ #undef __class__ #define __class__ "Scene" -widget::Scene::Scene(ewol::GameEngine* gameEngine) : +widget::Scene::Scene(game::Engine* gameEngine) : m_gameEngine(gameEngine), m_isRunning(true), m_lastCallTime(-1) diff --git a/sources/ewol/widget/Scene.h b/sources/ewol/widget/Scene.h index dc92ccdc..acf4037d 100644 --- a/sources/ewol/widget/Scene.h +++ b/sources/ewol/widget/Scene.h @@ -11,8 +11,10 @@ #include #include +#include #include #include +#include #include @@ -28,7 +30,7 @@ namespace widget { * @brief Main scene constructor * @param[in] gameEngine Used game engine for the display (can be NULL). */ - Scene(ewol::GameEngine* gameEngine=NULL); + Scene(game::Engine* gameEngine=NULL); /** * @brief Destructor * @note The engine is not destroy, it is the reponsability of the user diff --git a/sources/file.mk b/sources/file.mk index 3b6c2118..2a3ffb07 100644 --- a/sources/file.mk +++ b/sources/file.mk @@ -80,7 +80,8 @@ FILE_LIST+= ewol/widget/Widget.cpp \ # game mode area : FILE_LIST+= ewol/widget/Scene.cpp \ - ewol/game/GameEngine.cpp + ewol/game/Engine.cpp \ + ewol/game/Element.cpp LOCAL_COPY_FILES := ../data/textured3D.prog:textured3D.prog \