diff --git a/ege/Environement.cpp b/ege/Environement.cpp index ac83cf9..17a6c19 100644 --- a/ege/Environement.cpp +++ b/ege/Environement.cpp @@ -312,7 +312,7 @@ void ege::Environement::clear() { void ege::Environement::periodicCall(const ewol::event::Time& _event) { float curentDelta = _event.getDeltaCall(); - EGE_INFO("periodic call : " << _event); + EGE_VERBOSE("periodic call : " << _event); // small hack to change speed ... curentDelta *= m_ratio; // check if the processing is availlable @@ -323,7 +323,7 @@ void ege::Environement::periodicCall(const ewol::event::Time& _event) { int32_t lastGameTime = m_gameTime*0.000001f; m_gameTime += curentDelta; if (lastGameTime != (int32_t)(m_gameTime*0.000001f)) { - EGE_INFO(" Emit Signal"); + EGE_VERBOSE(" Emit Signal"); signalPlayTimeChange.emit(m_gameTime*0.000001f); } @@ -332,19 +332,19 @@ void ege::Environement::periodicCall(const ewol::event::Time& _event) { // update camera positions: for (auto &it : m_listCamera) { if (it.second != nullptr) { - EGE_INFO(" update camera : '" << it.first << "'"); + EGE_VERBOSE(" update camera : '" << it.first << "'"); it.second->periodicCall(curentDelta); } } //EGE_DEBUG("stepSimulation (start)"); ///step the simulation if (m_physicEngine.getDynamicWorld() != nullptr) { - EGE_INFO(" step simulation : " << curentDelta); + EGE_VERBOSE(" step simulation : " << curentDelta); m_physicEngine.getDynamicWorld()->stepSimulation(curentDelta); //optional but useful: debug drawing m_physicEngine.getDynamicWorld()->debugDrawWorld(); } - EGE_INFO(" Update particule engine"); + EGE_VERBOSE(" Update particule engine"); m_particuleEngine.update(curentDelta); // remove all element that requested it ... { @@ -358,7 +358,7 @@ void ege::Environement::periodicCall(const ewol::event::Time& _event) { numberEnnemyKilled++; victoryPoint++; } - EGE_DEBUG("[" << (*it)->getUID() << "] element Removing ... " << (*it)->getType()); + EGE_VERBOSE("[" << (*it)->getUID() << "] element Removing ... " << (*it)->getType()); rmElement((*it)); it = m_listElement.begin(); } else { diff --git a/ege/elements/ElementPhysic.cpp b/ege/elements/ElementPhysic.cpp index a0f5035..faa2f84 100644 --- a/ege/elements/ElementPhysic.cpp +++ b/ege/elements/ElementPhysic.cpp @@ -91,9 +91,9 @@ bool ege::ElementPhysic::setMesh(const std::shared_ptr& _me m_shape = static_cast(m_mesh->getShape()); return true; } - EGE_WARNING("create the mesh shape with the mesh"); + EGE_DEBUG("create the mesh shape with the mesh"); m_mesh->setShape(ege::collision::createShape(m_mesh)); - EGE_WARNING("set remove function shape"); + EGE_DEBUG("set remove function shape"); m_mesh->setFreeShapeFunction(&FunctionFreeShape); m_shape = static_cast(m_mesh->getShape()); vec3 localInertia(0,0,0); @@ -103,7 +103,7 @@ bool ege::ElementPhysic::setMesh(const std::shared_ptr& _me bool ege::ElementPhysic::setShape(btCollisionShape* _shape) { - EGE_WARNING("Set Shape"); + EGE_DEBUG("Set Shape"); removeShape(); m_shape = _shape; if (_shape == nullptr) { @@ -369,13 +369,8 @@ void ege::ElementPhysic::draw(int32_t _pass) { btDefaultMotionState* myMotionState = (btDefaultMotionState*)m_body->getMotionState(); myMotionState->m_graphicsWorldTrans.getOpenGLMatrix(mmm); - /*mat4 transformationMatrix(mmm); + mat4 transformationMatrix(mmm); transformationMatrix.transpose(); - */ - mat4 transformationMatrix; - transformationMatrix.identity(); - transformationMatrix.translate(getPosition()); - EGE_INFO("element pos = " << getPosition() << " mat=" << transformationMatrix); m_mesh->draw(transformationMatrix); } } @@ -386,11 +381,11 @@ void ege::ElementPhysic::dynamicEnable() { return; } if(m_body != nullptr) { - EGE_ERROR("dynamicEnable : RigidBody"); + EGE_VERBOSE("dynamicEnable : RigidBody"); m_env->getPhysicEngine().getDynamicWorld()->addRigidBody(m_body); } if(m_IA != nullptr) { - EGE_ERROR("dynamicEnable : IA"); + EGE_VERBOSE("dynamicEnable : IA"); m_env->getPhysicEngine().getDynamicWorld()->addAction(m_IA); } m_elementInPhysicsSystem = true; @@ -401,11 +396,11 @@ void ege::ElementPhysic::dynamicDisable() { return; } if(m_IA != nullptr) { - EGE_ERROR("dynamicDisable : IA"); + EGE_VERBOSE("dynamicDisable : IA"); m_env->getPhysicEngine().getDynamicWorld()->removeAction(m_IA); } if(m_body != nullptr) { - EGE_ERROR("dynamicDisable : RigidBody"); + EGE_VERBOSE("dynamicDisable : RigidBody"); // Unlink element from the engine m_env->getPhysicEngine().getDynamicWorld()->removeRigidBody(m_body); m_env->getPhysicEngine().getDynamicWorld()->removeCollisionObject(m_body); diff --git a/ege/resource/Mesh.cpp b/ege/resource/Mesh.cpp index a563dc1..d88d3c2 100644 --- a/ege/resource/Mesh.cpp +++ b/ege/resource/Mesh.cpp @@ -102,7 +102,7 @@ void ege::resource::Mesh::clean() { } -#define DISPLAY_NB_VERTEX_DISPLAYED +//#define DISPLAY_NB_VERTEX_DISPLAYED void ege::resource::Mesh::draw(mat4& _positionMatrix, bool _enableDepthTest, @@ -128,14 +128,10 @@ void ege::resource::Mesh::draw(mat4& _positionMatrix, mat4 tmpMatrix = projMatrix * camMatrix; m_GLprogram->uniformMatrix(m_GLMatrix, tmpMatrix); m_GLprogram->uniformMatrix(m_GLMatrixPosition, _positionMatrix); - EGE_DEBUG(" m_GLMatrix=" << m_GLMatrix << " ==> " << tmpMatrix); - EGE_DEBUG(" m_GLMatrixPosition=" << m_GLMatrixPosition << " ==> " << _positionMatrix); // position : m_GLprogram->sendAttributePointer(m_GLPosition, m_verticesVBO, MESH_VBO_VERTICES); - EGE_DEBUG(" m_GLPosition=" << m_GLPosition << " ==> " << ""); // Texture : m_GLprogram->sendAttributePointer(m_GLtexture, m_verticesVBO, MESH_VBO_TEXTURE); - EGE_DEBUG(" m_GLtexture=" << m_GLtexture << " ==> " << ""); // position : if (m_normalMode != normalModeNone) { m_GLprogram->sendAttributePointer(m_GLNormal, m_verticesVBO, MESH_VBO_VERTICES_NORMAL); @@ -149,14 +145,8 @@ void ege::resource::Mesh::draw(mat4& _positionMatrix, #else } #endif - EGE_DEBUG(" m_GLNormal=" << m_GLNormal << " ==> " << ""); // position : m_GLprogram->sendAttributePointer(m_GLColor, m_verticesVBO, MESH_VBO_COLOR); - EGE_DEBUG(" m_GLColor=" << m_GLColor << " ==> " << ""); - EGE_ERROR(" VBO size V=" << m_verticesVBO->getElementSize(MESH_VBO_VERTICES) - << " T=" << m_verticesVBO->getElementSize(MESH_VBO_TEXTURE) - << " N=" << m_verticesVBO->getElementSize(MESH_VBO_VERTICES_NORMAL) - << " C=" << m_verticesVBO->getElementSize(MESH_VBO_COLOR) << " "); // draw lights : m_light.draw(m_GLprogram); #ifdef DISPLAY_NB_VERTEX_DISPLAYED @@ -170,7 +160,6 @@ void ege::resource::Mesh::draw(mat4& _positionMatrix, } m_materials[m_listFaces.getKey(kkk)]->draw(m_GLprogram, m_GLMaterial); if (m_checkNormal == false) { - EGE_ERROR("NO normal ... mode =" << m_materials[m_listFaces.getKey(kkk)]->getRenderModeOpenGl() << " list = " << m_listFaces.getValue(kkk).m_index.size() ); ewol::openGL::drawElements(m_materials[m_listFaces.getKey(kkk)]->getRenderModeOpenGl(), m_listFaces.getValue(kkk).m_index); #ifdef DISPLAY_NB_VERTEX_DISPLAYED nbElementDraw += m_listFaces.getValue(kkk).m_index.size(); @@ -210,7 +199,6 @@ void ege::resource::Mesh::draw(mat4& _positionMatrix, } break; default: - EGE_INFO("draw without filtering ... *********************"); for(size_t iii=0; iii= 0; iii--) { m_displayElementOrdered[iii].element->drawDebug(m_debugDrawProperty, camera); } - */ } else { EGE_WARNING("No Dynamic world ..."); }