atria-soft/ege
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update new URI

Browse Source
This commit is contained in:
Edouard DUPIN 2018-10-09 23:03:07 +02:00
parent 436ae2c58d
commit 02c8b0ec81
16 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ege/resource/Mesh.hpp
View File

@ -119,8 +119,8 @@ namespace ege {
protected: protected:
Mesh(); Mesh();
void init(const etk::String& _fileName="---", void init(const etk::String& _fileName="---",
//const etk::String& _shaderName="DATA:textured3D2.prog" //const etk::String& _shaderName="DATA:///textured3D2.prog"
const etk::String& _shaderName="DATA:material3D.prog" const etk::String& _shaderName="DATA:///material3D.prog"
); );
public: public:
virtual ~Mesh(); virtual ~Mesh();

2
ege/resource/MeshCapsule.cpp
View File

@ -9,7 +9,7 @@
ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createCapsule(float _radius, float _size, const etk::String& _materialName, const etk::Color<float>& _color, int32_t _lats, int32_t _longs) { ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createCapsule(float _radius, float _size, const etk::String& _materialName, const etk::Color<float>& _color, int32_t _lats, int32_t _longs) {
EGE_VERBOSE(" create a capsule _size=" << _size << " _materialName=" << _materialName << " _color=" << _color); EGE_VERBOSE(" create a capsule _size=" << _size << " _materialName=" << _materialName << " _color=" << _color);
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:color3.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:///color3.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the element material properties : // set the element material properties :

2
ege/resource/MeshCone.cpp
View File

@ -9,7 +9,7 @@
ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createCone(float _radius, float _size, const etk::String& _materialName, const etk::Color<float>& _color, int32_t _lats, int32_t _longs) { ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createCone(float _radius, float _size, const etk::String& _materialName, const etk::Color<float>& _color, int32_t _lats, int32_t _longs) {
EGE_VERBOSE(" create a cylinder _size=" << _size << " _materialName=" << _materialName << " _color=" << _color); EGE_VERBOSE(" create a cylinder _size=" << _size << " _materialName=" << _materialName << " _color=" << _color);
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:color3.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:///color3.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the element material properties : // set the element material properties :

2
ege/resource/MeshCube.cpp
View File

@ -13,7 +13,7 @@ ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createCube(float _s
ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createCube(const vec3& _size, const etk::String& _materialName, const etk::Color<float>& _color) { ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createCube(const vec3& _size, const etk::String& _materialName, const etk::Color<float>& _color) {
EGE_VERBOSE(" create a cube _size=" << _size << " _materialName=" << _materialName << " _color=" << _color); EGE_VERBOSE(" create a cube _size=" << _size << " _materialName=" << _materialName << " _color=" << _color);
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:color3.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:///color3.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the element material properties : // set the element material properties :

2
ege/resource/MeshCylinder.cpp
View File

@ -9,7 +9,7 @@
ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createCylinder(float _radius, float _size, const etk::String& _materialName, const etk::Color<float>& _color, int32_t _lats, int32_t _longs) { ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createCylinder(float _radius, float _size, const etk::String& _materialName, const etk::Color<float>& _color, int32_t _lats, int32_t _longs) {
EGE_VERBOSE(" create a cylinder _size=" << _size << " _materialName=" << _materialName << " _color=" << _color); EGE_VERBOSE(" create a cylinder _size=" << _size << " _materialName=" << _materialName << " _color=" << _color);
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:color3.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:///color3.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the element material properties : // set the element material properties :

2
ege/resource/MeshGird.cpp
View File

@ -8,7 +8,7 @@
#include <ege/resource/Mesh.hpp> #include <ege/resource/Mesh.hpp>
ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createGrid(int32_t _lineCount, const vec3& _position, float _size, const etk::String& _materialName) { ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createGrid(int32_t _lineCount, const vec3& _position, float _size, const etk::String& _materialName) {
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:color3.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:///color3.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the element material properties : // set the element material properties :

2
ege/resource/MeshSphere.cpp
View File

@ -9,7 +9,7 @@
ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createSphere(float _radius, const etk::String& _materialName, const etk::Color<float>& _color, int32_t _lats, int32_t _longs) { ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createSphere(float _radius, const etk::String& _materialName, const etk::Color<float>& _color, int32_t _lats, int32_t _longs) {
EGE_VERBOSE(" create a sphere _size=" << _radius << " _materialName=" << _materialName << " _color=" << _color); EGE_VERBOSE(" create a sphere _size=" << _radius << " _materialName=" << _materialName << " _color=" << _color);
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:color3.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:///color3.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the element material properties : // set the element material properties :

2
ege/resource/ParticuleMesh.hpp
View File

@ -14,7 +14,7 @@ namespace ege {
int32_t m_GLMainColor; int32_t m_GLMainColor;
protected: protected:
ParticuleMesh(); 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: public:
DECLARE_RESOURCE_NAMED_FACTORY(ParticuleMesh); DECLARE_RESOURCE_NAMED_FACTORY(ParticuleMesh);
virtual ~ParticuleMesh(); virtual ~ParticuleMesh();

2
sample/CameraPosition/appl/Windows.cpp
View File

@ -31,7 +31,7 @@ appl::Windows::Windows() {
static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() { static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() {
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the entity material properties : // set the entity material properties :

2
sample/Collision/appl/Windows.cpp
View File

@ -33,7 +33,7 @@ appl::Windows::Windows() {
static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() { static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() {
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog");
if (out == null) { if (out == null) {
return out; return out;
} }

2
sample/DoubleView/appl/Windows.cpp
View File

@ -32,7 +32,7 @@ appl::Windows::Windows() {
static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() { static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() {
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the entity material properties : // set the entity material properties :

6
sample/IA/appl/Windows.cpp
View File

@ -32,7 +32,7 @@ appl::Windows::Windows() {
static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() { static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() {
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the entity material properties : // set the entity material properties :
@ -119,7 +119,7 @@ void appl::Windows::init() {
// add it .. // add it ..
m_env->addEntity(entity); m_env->addEntity(entity);
} }
myMesh = ege::resource::Mesh::create("DATA:tower.emf"); myMesh = ege::resource::Mesh::create("DATA:///tower.emf");
if (myMesh != null) { if (myMesh != null) {
ememory::SharedPtr<ege::Entity> entity = ememory::makeShared<ege::Entity>(m_env); ememory::SharedPtr<ege::Entity> entity = ememory::makeShared<ege::Entity>(m_env);
// add all component: // add all component:
@ -134,7 +134,7 @@ void appl::Windows::init() {
componentPhysics->generate(); componentPhysics->generate();
entity->addComponent(componentPhysics); entity->addComponent(componentPhysics);
// 3rd this object have some intelligence: // 3rd this object have some intelligence:
ememory::SharedPtr<ege::ia::Component> componentIA = ememory::makeShared<ege::ia::ComponentLua>("DATA:tower.lua"); ememory::SharedPtr<ege::ia::Component> componentIA = ememory::makeShared<ege::ia::ComponentLua>("DATA:///tower.lua");
entity->addComponent(componentIA); entity->addComponent(componentIA);
// add it .. // add it ..
m_env->addEntity(entity); m_env->addEntity(entity);

4
sample/LowPoly/appl/Windows.cpp
View File

@ -31,7 +31,7 @@ appl::Windows::Windows() {
static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() { static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() {
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the entity material properties : // set the entity material properties :
@ -118,7 +118,7 @@ void appl::Windows::init() {
// add it .. // add it ..
m_env->addEntity(entity); 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) { if (myMesh != null) {
ememory::SharedPtr<ege::Entity> entity = ememory::makeShared<ege::Entity>(m_env); ememory::SharedPtr<ege::Entity> entity = ememory::makeShared<ege::Entity>(m_env);
// add all component: // add all component:

4
sample/MeshCreator/appl/Windows.cpp
View File

@ -31,7 +31,7 @@ appl::Windows::Windows() {
} }
static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() { static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() {
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:texturedNoMaterial.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("---", "DATA:///texturedNoMaterial.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the entity material properties : // set the entity material properties :
@ -73,7 +73,7 @@ static ememory::SharedPtr<ege::resource::Mesh> createMars() {
material->setDiffuseFactor(vec4(0.512f,0.512f,0.512f,1.0f)); material->setDiffuseFactor(vec4(0.512f,0.512f,0.512f,1.0f));
material->setSpecularFactor(vec4(0.5f,0.5f,0.5f,1.0f)); material->setSpecularFactor(vec4(0.5f,0.5f,0.5f,1.0f));
material->setShininess(96.078431f); material->setShininess(96.078431f);
material->setTexture0("DATA:texture_mars.png"); material->setTexture0("DATA:///texture_mars.png");
out->addMaterial("basics", material); out->addMaterial("basics", material);
out->createIcoSphere("basics", 16, 3); out->createIcoSphere("basics", 16, 3);
out->generateVBO(); out->generateVBO();

2
sample/RayTest/appl/Windows.cpp
View File

@ -30,7 +30,7 @@ appl::Windows::Windows() {
} }
static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() { static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() {
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog");
if (out != null) { if (out != null) {
ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>(); ememory::SharedPtr<ege::Material> material = ememory::makeShared<ege::Material>();
// set the entity material properties : // set the entity material properties :

2
sample/TorqueApply/appl/Windows.cpp
View File

@ -33,7 +33,7 @@ appl::Windows::Windows() {
static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() { static ememory::SharedPtr<ege::resource::Mesh> createViewBoxStar() {
ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:texturedNoMaterial.prog"); ememory::SharedPtr<ege::resource::Mesh> out = ege::resource::Mesh::create("viewBoxStar", "DATA:///texturedNoMaterial.prog");
if (out == null) { if (out == null) {
return out; return out;
} }