From 02c8b0ec81cae9dc09346542bbebf7ce22cf1be8 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 9 Oct 2018 23:03:07 +0200 Subject: [PATCH] [DEV] update new URI --- ege/resource/Mesh.hpp | 4 ++-- ege/resource/MeshCapsule.cpp | 2 +- ege/resource/MeshCone.cpp | 2 +- ege/resource/MeshCube.cpp | 2 +- ege/resource/MeshCylinder.cpp | 2 +- ege/resource/MeshGird.cpp | 2 +- ege/resource/MeshSphere.cpp | 2 +- ege/resource/ParticuleMesh.hpp | 2 +- sample/CameraPosition/appl/Windows.cpp | 2 +- sample/Collision/appl/Windows.cpp | 2 +- sample/DoubleView/appl/Windows.cpp | 2 +- sample/IA/appl/Windows.cpp | 6 +++--- sample/LowPoly/appl/Windows.cpp | 4 ++-- sample/MeshCreator/appl/Windows.cpp | 4 ++-- sample/RayTest/appl/Windows.cpp | 2 +- sample/TorqueApply/appl/Windows.cpp | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ege/resource/Mesh.hpp b/ege/resource/Mesh.hpp index 2b9901c..2a38105 100644 --- a/ege/resource/Mesh.hpp +++ b/ege/resource/Mesh.hpp @@ -119,8 +119,8 @@ namespace ege { protected: Mesh(); void init(const etk::String& _fileName="---", - //const etk::String& _shaderName="DATA:textured3D2.prog" - const etk::String& _shaderName="DATA:material3D.prog" + //const etk::String& _shaderName="DATA:///textured3D2.prog" + const etk::String& _shaderName="DATA:///material3D.prog" ); public: virtual ~Mesh(); diff --git a/ege/resource/MeshCapsule.cpp b/ege/resource/MeshCapsule.cpp index 25c3df5..8ad83a8 100644 --- a/ege/resource/MeshCapsule.cpp +++ b/ege/resource/MeshCapsule.cpp @@ -9,7 +9,7 @@ ememory::SharedPtr ege::resource::Mesh::createCapsule(float _radius, float _size, const etk::String& _materialName, const etk::Color& _color, int32_t _lats, int32_t _longs) { EGE_VERBOSE(" create a capsule _size=" << _size << " _materialName=" << _materialName << " _color=" << _color); - ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:color3.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:///color3.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the element material properties : diff --git a/ege/resource/MeshCone.cpp b/ege/resource/MeshCone.cpp index e662341..ce88bae 100644 --- a/ege/resource/MeshCone.cpp +++ b/ege/resource/MeshCone.cpp @@ -9,7 +9,7 @@ ememory::SharedPtr ege::resource::Mesh::createCone(float _radius, float _size, const etk::String& _materialName, const etk::Color& _color, int32_t _lats, int32_t _longs) { EGE_VERBOSE(" create a cylinder _size=" << _size << " _materialName=" << _materialName << " _color=" << _color); - ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:color3.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:///color3.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the element material properties : diff --git a/ege/resource/MeshCube.cpp b/ege/resource/MeshCube.cpp index dff53fe..1d67c6b 100644 --- a/ege/resource/MeshCube.cpp +++ b/ege/resource/MeshCube.cpp @@ -13,7 +13,7 @@ ememory::SharedPtr ege::resource::Mesh::createCube(float _s ememory::SharedPtr ege::resource::Mesh::createCube(const vec3& _size, const etk::String& _materialName, const etk::Color& _color) { EGE_VERBOSE(" create a cube _size=" << _size << " _materialName=" << _materialName << " _color=" << _color); - ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:color3.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:///color3.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the element material properties : diff --git a/ege/resource/MeshCylinder.cpp b/ege/resource/MeshCylinder.cpp index 4142e8a..43cef9d 100644 --- a/ege/resource/MeshCylinder.cpp +++ b/ege/resource/MeshCylinder.cpp @@ -9,7 +9,7 @@ ememory::SharedPtr ege::resource::Mesh::createCylinder(float _radius, float _size, const etk::String& _materialName, const etk::Color& _color, int32_t _lats, int32_t _longs) { EGE_VERBOSE(" create a cylinder _size=" << _size << " _materialName=" << _materialName << " _color=" << _color); - ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:color3.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:///color3.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the element material properties : diff --git a/ege/resource/MeshGird.cpp b/ege/resource/MeshGird.cpp index 85ab1d4..a4debe8 100644 --- a/ege/resource/MeshGird.cpp +++ b/ege/resource/MeshGird.cpp @@ -8,7 +8,7 @@ #include ememory::SharedPtr ege::resource::Mesh::createGrid(int32_t _lineCount, const vec3& _position, float _size, const etk::String& _materialName) { - ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:color3.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:///color3.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the element material properties : diff --git a/ege/resource/MeshSphere.cpp b/ege/resource/MeshSphere.cpp index 5c7661e..14304a9 100644 --- a/ege/resource/MeshSphere.cpp +++ b/ege/resource/MeshSphere.cpp @@ -9,7 +9,7 @@ ememory::SharedPtr ege::resource::Mesh::createSphere(float _radius, const etk::String& _materialName, const etk::Color& _color, int32_t _lats, int32_t _longs) { EGE_VERBOSE(" create a sphere _size=" << _radius << " _materialName=" << _materialName << " _color=" << _color); - ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:color3.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:///color3.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the element material properties : diff --git a/ege/resource/ParticuleMesh.hpp b/ege/resource/ParticuleMesh.hpp index 07affb3..c0c99d9 100644 --- a/ege/resource/ParticuleMesh.hpp +++ b/ege/resource/ParticuleMesh.hpp @@ -14,7 +14,7 @@ namespace ege { int32_t m_GLMainColor; protected: ParticuleMesh(); - void init(const etk::String& _fileName, const etk::String& _shaderName="DATA:ParticuleMesh.prog"); + void init(const etk::String& _fileName, const etk::String& _shaderName="DATA:///ParticuleMesh.prog"); public: DECLARE_RESOURCE_NAMED_FACTORY(ParticuleMesh); virtual ~ParticuleMesh(); diff --git a/sample/CameraPosition/appl/Windows.cpp b/sample/CameraPosition/appl/Windows.cpp index b0a9287..beeb6d4 100644 --- a/sample/CameraPosition/appl/Windows.cpp +++ b/sample/CameraPosition/appl/Windows.cpp @@ -31,7 +31,7 @@ appl::Windows::Windows() { static ememory::SharedPtr createViewBoxStar() { - ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the entity material properties : diff --git a/sample/Collision/appl/Windows.cpp b/sample/Collision/appl/Windows.cpp index d7d82be..bd1b450 100644 --- a/sample/Collision/appl/Windows.cpp +++ b/sample/Collision/appl/Windows.cpp @@ -33,7 +33,7 @@ appl::Windows::Windows() { static ememory::SharedPtr createViewBoxStar() { - ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog"); if (out == null) { return out; } diff --git a/sample/DoubleView/appl/Windows.cpp b/sample/DoubleView/appl/Windows.cpp index bbf9a98..f779a64 100644 --- a/sample/DoubleView/appl/Windows.cpp +++ b/sample/DoubleView/appl/Windows.cpp @@ -32,7 +32,7 @@ appl::Windows::Windows() { static ememory::SharedPtr createViewBoxStar() { - ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the entity material properties : diff --git a/sample/IA/appl/Windows.cpp b/sample/IA/appl/Windows.cpp index 4c53815..6155d32 100644 --- a/sample/IA/appl/Windows.cpp +++ b/sample/IA/appl/Windows.cpp @@ -32,7 +32,7 @@ appl::Windows::Windows() { static ememory::SharedPtr createViewBoxStar() { - ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the entity material properties : @@ -119,7 +119,7 @@ void appl::Windows::init() { // add it .. m_env->addEntity(entity); } - myMesh = ege::resource::Mesh::create("DATA:tower.emf"); + myMesh = ege::resource::Mesh::create("DATA:///tower.emf"); if (myMesh != null) { ememory::SharedPtr entity = ememory::makeShared(m_env); // add all component: @@ -134,7 +134,7 @@ void appl::Windows::init() { componentPhysics->generate(); entity->addComponent(componentPhysics); // 3rd this object have some intelligence: - ememory::SharedPtr componentIA = ememory::makeShared("DATA:tower.lua"); + ememory::SharedPtr componentIA = ememory::makeShared("DATA:///tower.lua"); entity->addComponent(componentIA); // add it .. m_env->addEntity(entity); diff --git a/sample/LowPoly/appl/Windows.cpp b/sample/LowPoly/appl/Windows.cpp index 93b07c2..71d3d3c 100644 --- a/sample/LowPoly/appl/Windows.cpp +++ b/sample/LowPoly/appl/Windows.cpp @@ -31,7 +31,7 @@ appl::Windows::Windows() { static ememory::SharedPtr createViewBoxStar() { - ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the entity material properties : @@ -118,7 +118,7 @@ void appl::Windows::init() { // add it .. m_env->addEntity(entity); } - myMesh = ege::resource::Mesh::create("DATA:tree_1.emf"); + myMesh = ege::resource::Mesh::create("DATA:///tree_1.emf"); if (myMesh != null) { ememory::SharedPtr entity = ememory::makeShared(m_env); // add all component: diff --git a/sample/MeshCreator/appl/Windows.cpp b/sample/MeshCreator/appl/Windows.cpp index ab1c8f7..b30c9bc 100644 --- a/sample/MeshCreator/appl/Windows.cpp +++ b/sample/MeshCreator/appl/Windows.cpp @@ -31,7 +31,7 @@ appl::Windows::Windows() { } static ememory::SharedPtr createViewBoxStar() { - ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:texturedNoMaterial.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:///texturedNoMaterial.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the entity material properties : @@ -73,7 +73,7 @@ static ememory::SharedPtr createMars() { material->setDiffuseFactor(vec4(0.512f,0.512f,0.512f,1.0f)); material->setSpecularFactor(vec4(0.5f,0.5f,0.5f,1.0f)); material->setShininess(96.078431f); - material->setTexture0("DATA:texture_mars.png"); + material->setTexture0("DATA:///texture_mars.png"); out->addMaterial("basics", material); out->createIcoSphere("basics", 16, 3); out->generateVBO(); diff --git a/sample/RayTest/appl/Windows.cpp b/sample/RayTest/appl/Windows.cpp index e1c6639..4398ac7 100644 --- a/sample/RayTest/appl/Windows.cpp +++ b/sample/RayTest/appl/Windows.cpp @@ -30,7 +30,7 @@ appl::Windows::Windows() { } static ememory::SharedPtr createViewBoxStar() { - ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog"); if (out != null) { ememory::SharedPtr material = ememory::makeShared(); // set the entity material properties : diff --git a/sample/TorqueApply/appl/Windows.cpp b/sample/TorqueApply/appl/Windows.cpp index a3b0fb2..5a5fecb 100644 --- a/sample/TorqueApply/appl/Windows.cpp +++ b/sample/TorqueApply/appl/Windows.cpp @@ -33,7 +33,7 @@ appl::Windows::Windows() { static ememory::SharedPtr createViewBoxStar() { - ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); + ememory::SharedPtr out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog"); if (out == null) { return out; }