From 48099a92bb36496f1b2399bc8793b08fd7438748 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 6 Sep 2013 21:31:02 +0200 Subject: [PATCH] [DEV] update at the new resource definition methode --- ege/ElementGame.cpp | 9 +++------ ege/Scene.cpp | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ege/ElementGame.cpp b/ege/ElementGame.cpp index a047013..aa84048 100644 --- a/ege/ElementGame.cpp +++ b/ege/ElementGame.cpp @@ -64,10 +64,7 @@ ege::ElementGame::~ElementGame(void) // same ... DynamicDisable(); RemoveShape(); - if (NULL != m_mesh) { - // release the mesh - ewol::resource::Release(m_mesh); - } + ewol::Mesh::Release(m_mesh); if (NULL != m_body) { delete(m_body); m_body = NULL; @@ -107,7 +104,7 @@ void ege::ElementGame::FunctionFreeShape(void* _pointer) bool ege::ElementGame::LoadMesh(const etk::UString& _meshFileName) { ewol::Mesh* tmpMesh=NULL; - ewol::resource::Keep(_meshFileName, tmpMesh); + tmpMesh = ewol::Mesh::Keep(_meshFileName); if(NULL==tmpMesh) { EGE_ERROR("can not load the resources : " << _meshFileName); return false; @@ -119,7 +116,7 @@ bool ege::ElementGame::SetMesh(ewol::Mesh* _mesh) { if (NULL!=m_mesh) { RemoveShape(); - ewol::resource::Release(m_mesh); + ewol::Mesh::Release(m_mesh); } m_mesh = _mesh; // auto load the shape : diff --git a/ege/Scene.cpp b/ege/Scene.cpp index efaf7d4..c3b21fe 100644 --- a/ege/Scene.cpp +++ b/ege/Scene.cpp @@ -51,7 +51,7 @@ ege::Scene::Scene(bool _setAutoBullet, bool _setAutoCamera) : AddEventId(eventPlayTimeChange); AddEventId(eventKillEnemy); - ewol::resource::Keep(m_debugDrawing); + m_debugDrawing = ewol::Colored3DObject::Keep(); m_ratioTime = 1.0f; if (_setAutoBullet==true) { @@ -117,7 +117,7 @@ void ege::Scene::SetCamera(ege::Camera* _camera) ege::Scene::~Scene(void) { - ewol::resource::Release(m_debugDrawing); + ewol::Colored3DObject::Release(m_debugDrawing); /* ewol::resource::Release(m_directDrawObject); //cleanup in the reverse order of creation/initialization