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

[DEV] update esignal removing ISignal

Browse Source
This commit is contained in:
Edouard DUPIN 2016-08-04 22:23:19 +02:00
parent 944e8bd0b5
commit 2ea37d4211
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ege/Environement.h
View File

@ -79,7 +79,7 @@ namespace ege {
class Environement : public ewol::Object { class Environement : public ewol::Object {
public: public:
// Signals // Signals
esignal::ISignal<float> signalPlayTimeChange; esignal::Signal<float> signalPlayTimeChange;
// properties: // properties:
eproperty::List<enum gameStatus> propertyStatus; //!< the display is running (not in pause) eproperty::List<enum gameStatus> propertyStatus; //!< the display is running (not in pause)
eproperty::Value<float> propertyRatio; //!< Speed ratio eproperty::Value<float> propertyRatio; //!< Speed ratio

6
ege/Material.cpp
View File

@ -43,13 +43,13 @@ ege::Material::~Material() {
} }
void ege::Material::draw(ememory::SharedPtr<gale::resource::Program> _prog, const MaterialGlId& _glID) { void ege::Material::draw(ememory::SharedPtr<gale::resource::Program> _prog, const MaterialGlId& _glID) {
EGE_INFO("draw Material : (start)"); EGE_VERBOSE("draw Material : (start)");
_prog->uniform4(_glID.m_GL_ambientFactor, m_ambientFactor); _prog->uniform4(_glID.m_GL_ambientFactor, m_ambientFactor);
_prog->uniform4(_glID.m_GL_diffuseFactor, m_diffuseFactor); _prog->uniform4(_glID.m_GL_diffuseFactor, m_diffuseFactor);
_prog->uniform4(_glID.m_GL_specularFactor, m_specularFactor); _prog->uniform4(_glID.m_GL_specularFactor, m_specularFactor);
_prog->uniform1f(_glID.m_GL_shininess, m_shininess); _prog->uniform1f(_glID.m_GL_shininess, m_shininess);
if (m_texture0 != nullptr) { if (m_texture0 != nullptr) {
EGE_INFO(" set texture: " << _glID.m_GL_texture0 << " " << m_texture0->getId()); EGE_VERBOSE(" set texture: " << _glID.m_GL_texture0 << " " << m_texture0->getId());
_prog->setTexture0(_glID.m_GL_texture0, m_texture0->getRendererId()); _prog->setTexture0(_glID.m_GL_texture0, m_texture0->getRendererId());
#if DEBUG #if DEBUG
if (_prog->checkIdValidity(_glID.m_GL_texture0) == false) { if (_prog->checkIdValidity(_glID.m_GL_texture0) == false) {
@ -63,7 +63,7 @@ void ege::Material::draw(ememory::SharedPtr<gale::resource::Program> _prog, cons
} }
#endif #endif
} }
EGE_INFO("draw Material: ( end )"); EGE_VERBOSE("draw Material: ( end )");
} }
void ege::Material::setTexture0(const std::string& _filename) { void ege::Material::setTexture0(const std::string& _filename) {

9
ege/resource/Mesh.cpp
View File

@ -41,7 +41,7 @@ void ege::resource::Mesh::init(const std::string& _fileName, const std::string&
m_light.setDiffuseColor(vec4(1.0f,1.0f,1.0f,1.0f)); m_light.setDiffuseColor(vec4(1.0f,1.0f,1.0f,1.0f));
m_light.setSpecularColor(vec4(0.0f,0.0f,0.0f,1.0f)); m_light.setSpecularColor(vec4(0.0f,0.0f,0.0f,1.0f));
EGE_ERROR(m_name << " " << m_light << " shader=" << _shaderName); EGE_VERBOSE(m_name << " " << m_light << " shader=" << _shaderName);
m_GLprogram = gale::resource::Program::create(_shaderName); m_GLprogram = gale::resource::Program::create(_shaderName);
if (m_GLprogram != nullptr) { if (m_GLprogram != nullptr) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d"); m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");
@ -107,10 +107,9 @@ void ege::resource::Mesh::clean() {
void ege::resource::Mesh::draw(mat4& _positionMatrix, void ege::resource::Mesh::draw(mat4& _positionMatrix,
bool _enableDepthTest, bool _enableDepthTest,
bool _enableDepthUpdate) { bool _enableDepthUpdate) {
// TODO : Remove this, it is just for test the 23-04-2016 // TODO : Remove this, it is just for test the 23-04-2016
//m_checkNormal = false; //m_checkNormal = false;
EGE_INFO("draw Mesh : " << m_name << " (start)"); EGE_VERBOSE("draw Mesh : " << m_name << " (start)");
if (m_GLprogram == nullptr) { if (m_GLprogram == nullptr) {
EGE_ERROR("No shader ..."); EGE_ERROR("No shader ...");
return; return;
@ -238,7 +237,7 @@ void ege::resource::Mesh::draw(mat4& _positionMatrix,
} }
// TODO : UNDERSTAND why ... it is needed // TODO : UNDERSTAND why ... it is needed
glBindBuffer(GL_ARRAY_BUFFER,0); glBindBuffer(GL_ARRAY_BUFFER,0);
EGE_INFO("draw Mesh : " << m_name << " ( end )"); EGE_VERBOSE("draw Mesh : " << m_name << " ( end )");
} }
// normal calculation of the normal face is really easy : // normal calculation of the normal face is really easy :
@ -246,7 +245,7 @@ void ege::resource::Mesh::draw(mat4& _positionMatrix,
void ege::resource::Mesh::calculateNormaleFace(const std::string& _materialName) { void ege::resource::Mesh::calculateNormaleFace(const std::string& _materialName) {
m_listFacesNormal.clear(); m_listFacesNormal.clear();
if (m_normalMode == ege::resource::Mesh::normalModeFace) { if (m_normalMode == ege::resource::Mesh::normalModeFace) {
EGE_INFO("calculateNormaleFace(" << _materialName << ")"); EGE_VERBOSE("calculateNormaleFace(" << _materialName << ")");
gale::openGL::renderMode tmpRenderMode = m_materials[_materialName]->getRenderMode(); gale::openGL::renderMode tmpRenderMode = m_materials[_materialName]->getRenderMode();
if ( tmpRenderMode == gale::openGL::renderMode::point if ( tmpRenderMode == gale::openGL::renderMode::point
|| tmpRenderMode == gale::openGL::renderMode::line || tmpRenderMode == gale::openGL::renderMode::line

2
ege/widget/Mesh.h
View File

@ -16,7 +16,7 @@ namespace ege {
*/ */
class Mesh :public ewol::Widget { class Mesh :public ewol::Widget {
public: public:
esignal::ISignal<> signalPressed; esignal::Signal<> signalPressed;
private: private:
// mesh name : // mesh name :
std::string m_meshName; std::string m_meshName;

6
ege/widget/Scene.cpp
View File

@ -100,7 +100,7 @@ void ege::widget::Scene::onDraw() {
if (world != nullptr) { if (world != nullptr) {
m_env->getOrderedElementForDisplay(m_displayElementOrdered, camera->getEye(), camera->getViewVector()); m_env->getOrderedElementForDisplay(m_displayElementOrdered, camera->getEye(), camera->getViewVector());
EGE_DEBUG("DRAW : " << m_displayElementOrdered.size() << "/" << m_env->getElement().size() << " elements"); EGE_VERBOSE("DRAW : " << m_displayElementOrdered.size() << "/" << m_env->getElement().size() << " elements");
// TODO : remove this == > no more needed ==> checked in the generate the list of the element ordered // TODO : remove this == > no more needed ==> checked in the generate the list of the element ordered
for (size_t iii=0; iii<m_displayElementOrdered.size(); iii++) { for (size_t iii=0; iii<m_displayElementOrdered.size(); iii++) {
@ -206,6 +206,6 @@ void ege::widget::Scene::calculateSize() {
} }
} }
#include <esignal/details/ISignal.hxx> #include <esignal/details/Signal.hxx>
template class esignal::ISignal<ememory::SharedPtr<ewol::resource::Colored3DObject>>; ESIGNAL_DECLARE_SIGNAL(ememory::SharedPtr<ewol::resource::Colored3DObject>);

2
ege/widget/Scene.h
View File

@ -35,7 +35,7 @@ namespace ege {
class Scene : public ewol::Widget { class Scene : public ewol::Widget {
public: public:
// signals // signals
esignal::ISignal<ememory::SharedPtr<ewol::resource::Colored3DObject>/*, ememory::SharedPtr<ege::Camera>*/> signalDisplayDebug; //!< emit a signal to the application to draw the debug (@ref setDebugPhysic) esignal::Signal<ememory::SharedPtr<ewol::resource::Colored3DObject>/*, ememory::SharedPtr<ege::Camera>*/> signalDisplayDebug; //!< emit a signal to the application to draw the debug (@ref setDebugPhysic)
// properties // properties
eproperty::Value<bool> propertyDebugPhysic; //!< display Physic Debug eproperty::Value<bool> propertyDebugPhysic; //!< display Physic Debug
eproperty::Value<bool> propertyDebugApplication; //!< display Application Debug eproperty::Value<bool> propertyDebugApplication; //!< display Application Debug