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

[DEV] update new ETK

Browse Source
This commit is contained in:
Edouard DUPIN 2017-09-29 09:25:39 +02:00
parent 6c7f6a4414
commit 4016367de0
13 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ege/Environement.cpp
View File

@ -16,7 +16,9 @@
#include <gale/renderer/openGL/openGL.hpp>
#include <etk/math/Matrix4x4.hpp>
#include <etk/typeInfo.hpp>
ETK_DECLARE_TYPE(ege::gameStatus);
void ege::Environement::addEngine(const ememory::SharedPtr<ege::Engine>& _ref) {
if (_ref == nullptr) {
@ -212,8 +214,8 @@ void ege::Environement::getEntityNearestFixed(const vec3& _sourcePosition,
}
*/
static etk::Hash<ege::createEntity_tf>& getHachTableCreating() {
static etk::Hash<ege::createEntity_tf> s_table;
static etk::Map<etk::String,ege::createEntity_tf>& getHachTableCreating() {
static etk::Map<etk::String,ege::createEntity_tf> s_table(0,false);
return s_table;
}
@ -532,7 +534,7 @@ void ege::Environement::onCallbackPeriodicCall(const ewol::event::Time& _event)
void ege::Environement::addCamera(const etk::String& _name, const ememory::SharedPtr<ege::Camera>& _camera) {
m_listCamera.insert(etk::makePair(_name, _camera));
m_listCamera.set(_name, _camera);
}
ememory::SharedPtr<ege::Camera> ege::Environement::getCamera(const etk::String& _name) {

2
ege/physics/Component.cpp
View File

@ -197,7 +197,7 @@ void ege::physics::Component::generate() {
EGE_DEBUG(" Concave");
const ege::physics::shape::Concave* tmpElement = it->toConcave();
if (tmpElement == nullptr) {
EGE_ERROR(" Concave ==> can not cast in Concave");
EGE_ERROR(" etkConcave ==> can not cast in Concave");
continue;
}
#if 0

6
ege/physics/Engine.cpp
View File

@ -226,13 +226,13 @@ etk::Pair<ememory::SharedPtr<ege::Component>, etk::Pair<vec3,vec3>> ege::physics
if (callbackObject.m_haveImpact == true) {
if ( callbackObject.m_body == nullptr
|| callbackObject.m_body->getUserData() == nullptr) {
etk::Pair<ememory::SharedPtr<ege::Component>, etk::Pair<vec3,vec3>>(nullptr, etk::pair<vec3,vec3>(callbackObject.m_position, callbackObject.m_normal));
etk::Pair<ememory::SharedPtr<ege::Component>, etk::Pair<vec3,vec3>>(nullptr, etk::Pair<vec3,vec3>(callbackObject.m_position, callbackObject.m_normal));
}
// TODO: je n'ai pas une entity, main un component ...
ege::physics::Component* elem = static_cast<ege::physics::Component*>(callbackObject.m_body->getUserData());
return etk::Pair<ememory::SharedPtr<ege::Component>, etk::Pair<vec3,vec3>>(elem->sharedFromThis(), etk::pair<vec3,vec3>(callbackObject.m_position, callbackObject.m_normal));
return etk::Pair<ememory::SharedPtr<ege::Component>, etk::Pair<vec3,vec3>>(elem->sharedFromThis(), etk::Pair<vec3,vec3>(callbackObject.m_position, callbackObject.m_normal));
}
EGE_VERBOSE(" No Hit");
return etk::Pair<ememory::SharedPtr<ege::Component>, etk::Pair<vec3,vec3>>(nullptr, etk::pair<vec3,vec3>(vec3(0,0,0),vec3(0,0,0)));
return etk::Pair<ememory::SharedPtr<ege::Component>, etk::Pair<vec3,vec3>>(nullptr, etk::Pair<vec3,vec3>(vec3(0,0,0),vec3(0,0,0)));
}

2
ege/resource/Mesh.cpp
View File

@ -24,6 +24,8 @@ ege::resource::Mesh::Mesh() :
m_GLColor(-1),
m_bufferOfset(-1),
m_numberOfElments(-1),
m_listFaces(0,false),
m_materials(0,false),
m_pointerShape(nullptr),
m_functionFreeShape(nullptr) {
addResourceType("ege::resource::Mesh");

6
ege/resource/Mesh.hpp
View File

@ -6,7 +6,7 @@
#pragma once
#include <etk/types.hpp>
#include <etk/Hash.hpp>
#include <etk/Map.hpp>
#include <gale/resource/Resource.hpp>
#include <ewol/resource/Image.hpp>
#include <gale/resource/Shader.hpp>
@ -110,8 +110,8 @@ namespace ege {
etk::Vector<etk::Color<float>> m_listColor; //!< List of all Color point in the mesh
etk::Vector<vec3> m_listFacesNormal; //!< List of all Face normal, when calculated
etk::Vector<vec3> m_listVertexNormal; //!< List of all Face normal, when calculated
etk::Hash<FaceIndexing> m_listFaces; //!< List of all Face for the mesh
etk::Hash<ememory::SharedPtr<ege::Material>> m_materials;
etk::Map<etk::String,FaceIndexing> m_listFaces; //!< List of all Face for the mesh
etk::Map<etk::String,ememory::SharedPtr<ege::Material>> m_materials;
etk::Vector<ememory::SharedPtr<ege::physics::Shape>> m_physics; //!< collision shape module ... (independent of bullet lib)
void clean();
protected:

2
ege/resource/MeshGird.cpp
View File

@ -79,7 +79,7 @@ ememory::SharedPtr<ege::resource::Mesh> ege::resource::Mesh::createGrid(int32_t
list.pushBack(_position+vec3(1,1,iii)*_size);
list.pushBack(_position+vec3(-1,1,iii)*_size);
list.pushBack(_position+vec3(-1,-1,iii)*_size);
out->addLines(_materialName, list, etk::color::gray);
out->addLines(_materialName, list, etk::Color<float>(etk::color::gray));
}
//out->addPoint(_materialName, vec3(iii,-_lineCount,0), etk::color::white);
//out->addPoint(_materialName, vec3(iii,_lineCount,0), etk::color::white);

2
ege/resource/tools/icoSphere.cpp
View File

@ -30,7 +30,7 @@ static int32_t addUV(etk::Vector<vec2>& _listUV, int32_t _uvId, float _add) {
return _listUV.size()-1;
}
void ege::icoSphere::create(etk::Hash<ememory::SharedPtr<ege::Material>>& _materials, etk::Hash<FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
void ege::icoSphere::create(etk::Map<etk::String,ememory::SharedPtr<ege::Material>>& _materials, etk::Map<etk::String,FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
const etk::String& _materialName, float _size, int32_t _recursionLevel) {
/*
5

4
ege/resource/tools/icoSphere.hpp
View File

@ -7,12 +7,12 @@
#include <ege/resource/tools/Face.hpp>
#include <ege/resource/tools/FaceIndexing.hpp>
#include <etk/Hash.hpp>
#include <etk/Map.hpp>
#include <ege/Material.hpp>
namespace ege {
namespace icoSphere {
void create(etk::Hash<ememory::SharedPtr<ege::Material>>& _materials, etk::Hash<FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
void create(etk::Map<etk::String,ememory::SharedPtr<ege::Material>>& _materials, etk::Map<etk::String,FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
const etk::String& _materialName, float _size, int32_t _recursionLevel);
}
}

2
ege/resource/tools/isoSphere.cpp
View File

@ -7,7 +7,7 @@
#include <ege/debug.hpp>
#include <ege/resource/tools/isoSphere.hpp>
void ege::isoSphere::create(etk::Hash<ememory::SharedPtr<ege::Material>>& _materials, etk::Hash<FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
void ege::isoSphere::create(etk::Map<etk::String,ememory::SharedPtr<ege::Material>>& _materials, etk::Map<etk::String,FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
const etk::String& _materialName, int32_t _recursionLevel) {
_recursionLevel = etk::max(_recursionLevel, 3);
float size = 1.0f;

4
ege/resource/tools/isoSphere.hpp
View File

@ -7,12 +7,12 @@
#include <ege/resource/tools/Face.hpp>
#include <ege/resource/tools/FaceIndexing.hpp>
#include <etk/Hash.hpp>
#include <etk/Map.hpp>
#include <ege/Material.hpp>
namespace ege {
namespace isoSphere {
void create(etk::Hash<ememory::SharedPtr<ege::Material>>& _materials, etk::Hash<FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
void create(etk::Map<etk::String,ememory::SharedPtr<ege::Material>>& _materials, etk::Map<etk::String,FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
const etk::String& _materialName, int32_t _recursionLevel);
}
}

2
ege/resource/tools/viewBox.cpp
View File

@ -9,7 +9,7 @@
void ege::viewBox::create(etk::Hash<ememory::SharedPtr<ege::Material>>& _materials, etk::Hash<FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
void ege::viewBox::create(etk::Map<etk::String,ememory::SharedPtr<ege::Material>>& _materials, etk::Map<etk::String,FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
const etk::String& _materialName, float _size) {
// This is the direct generation basis on the .obj system
/*

4
ege/resource/tools/viewBox.hpp
View File

@ -7,12 +7,12 @@
#include <ege/resource/tools/Face.hpp>
#include <ege/resource/tools/FaceIndexing.hpp>
#include <etk/Hash.hpp>
#include <etk/Map.hpp>
#include <ege/Material.hpp>
namespace ege {
namespace viewBox {
void create(etk::Hash<ememory::SharedPtr<ege::Material>>& _materials, etk::Hash<FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
void create(etk::Map<etk::String,ememory::SharedPtr<ege::Material>>& _materials, etk::Map<etk::String,FaceIndexing>& _listFaces, etk::Vector<vec3>& _listVertex, etk::Vector<vec2>& _listUV,
const etk::String& _materialName, float _size);
}
}

2
ege/widget/Scene.cpp
View File

@ -39,7 +39,7 @@ ege::widget::Scene::Scene() :
void ege::widget::Scene::init() {
ewol::Widget::init();
setKeyboardRepeate(false);
setKeyboardRepeat(false);
propertyCanFocus.set(true);
m_PCH = getObjectManager().periodicCall.connect(this, &ege::widget::Scene::periodicCall);
m_debugDrawProperty = ewol::resource::Colored3DObject::create();