diff --git a/ege/Material.cpp b/ege/Material.cpp index cafbf92..005bc07 100644 --- a/ege/Material.cpp +++ b/ege/Material.cpp @@ -33,7 +33,7 @@ ege::Material::Material() : m_diffuseFactor(0,0,0,1), m_specularFactor(0,0,0,1), m_shininess(1), - m_renderMode(gale::openGL::render_triangle), + m_renderMode(gale::openGL::renderMode::triangle), m_texture0(nullptr) { // nothing to do else ... } @@ -107,39 +107,39 @@ enum gale::openGL::renderMode ege::Material::getRenderModeOpenGl() { void ege::Material::setRenderMode(enum gale::openGL::renderMode _val) { switch (_val) { - case gale::openGL::render_point: + case gale::openGL::renderMode::point: break; - case gale::openGL::render_line: + case gale::openGL::renderMode::line: break; - case gale::openGL::render_lineStrip: + case gale::openGL::renderMode::lineStrip: EGE_INFO("Does not support " << _val << " auto convert it in 'LINE'"); - _val = gale::openGL::render_line; + _val = gale::openGL::renderMode::line; break; - case gale::openGL::render_lineLoop: + case gale::openGL::renderMode::lineLoop: EGE_INFO("Does not support " << _val << " auto convert it in 'LINE'"); - _val = gale::openGL::render_line; + _val = gale::openGL::renderMode::line; break; - case gale::openGL::render_triangle: + case gale::openGL::renderMode::triangle: break; - case gale::openGL::render_triangleStrip: + case gale::openGL::renderMode::triangleStrip: EGE_INFO("Does not support " << _val << " auto convert it in 'TRIANGLE'"); - _val = gale::openGL::render_triangle; + _val = gale::openGL::renderMode::triangle; break; - case gale::openGL::render_triangleFan: + case gale::openGL::renderMode::triangleFan: EGE_INFO("Does not support " << _val << " auto convert it in 'TRIANGLE'"); - _val = gale::openGL::render_triangle; + _val = gale::openGL::renderMode::triangle; break; - case gale::openGL::render_quad: + case gale::openGL::renderMode::quad: EGE_INFO("Does not support " << _val << " auto convert it in 'TRIANGLE'"); - _val = gale::openGL::render_triangle; + _val = gale::openGL::renderMode::triangle; break; - case gale::openGL::render_quadStrip: + case gale::openGL::renderMode::quadStrip: EGE_INFO("Does not support " << _val << " auto convert it in 'TRIANGLE'"); - _val = gale::openGL::render_triangle; + _val = gale::openGL::renderMode::triangle; break; - case gale::openGL::render_polygon: + case gale::openGL::renderMode::polygon: EGE_ERROR("Does not support " << _val << " try convert it in 'TRIANGLE'"); - _val = gale::openGL::render_triangle; + _val = gale::openGL::renderMode::triangle; break; } m_renderMode = _val; diff --git a/ege/resource/Mesh.cpp b/ege/resource/Mesh.cpp index a8d7bbc..5a8b896 100644 --- a/ege/resource/Mesh.cpp +++ b/ege/resource/Mesh.cpp @@ -248,10 +248,10 @@ void ege::resource::Mesh::calculateNormaleFace(const std::string& _materialName) if (m_normalMode == ege::resource::Mesh::normalModeFace) { EGE_INFO("calculateNormaleFace(" << _materialName << ")"); gale::openGL::renderMode tmpRenderMode = m_materials[_materialName]->getRenderMode(); - if ( tmpRenderMode == gale::openGL::render_point - || tmpRenderMode == gale::openGL::render_line - || tmpRenderMode == gale::openGL::render_lineStrip - || tmpRenderMode == gale::openGL::render_lineLoop) { + if ( tmpRenderMode == gale::openGL::renderMode::point + || tmpRenderMode == gale::openGL::renderMode::line + || tmpRenderMode == gale::openGL::renderMode::lineStrip + || tmpRenderMode == gale::openGL::renderMode::lineLoop) { EGE_ERROR("calculateNormaleFace(" << _materialName << ") : can not calculate normal on lines ..."); m_normalMode = ege::resource::Mesh::normalModeNone; return; @@ -270,10 +270,10 @@ void ege::resource::Mesh::calculateNormaleEdge(const std::string& _materialName) if (m_normalMode == ege::resource::Mesh::normalModeVertex) { EGE_INFO("calculateNormaleEdge(" << _materialName << ")"); gale::openGL::renderMode tmpRenderMode = m_materials[_materialName]->getRenderMode(); - if ( tmpRenderMode == gale::openGL::render_point - || tmpRenderMode == gale::openGL::render_line - || tmpRenderMode == gale::openGL::render_lineStrip - || tmpRenderMode == gale::openGL::render_lineLoop) { + if ( tmpRenderMode == gale::openGL::renderMode::point + || tmpRenderMode == gale::openGL::renderMode::line + || tmpRenderMode == gale::openGL::renderMode::lineStrip + || tmpRenderMode == gale::openGL::renderMode::lineLoop) { EGE_ERROR("calculateNormaleEdge(" << _materialName << ") : can not calculate normal on lines ..."); m_normalMode = ege::resource::Mesh::normalModeNone; return; @@ -319,24 +319,24 @@ void ege::resource::Mesh::generateVBO() { m_listFaces.getValue(kkk).m_index.clear(); int32_t nbIndicInFace = 3; switch (m_materials[m_listFaces.getKey(kkk)]->getRenderMode()) { - case gale::openGL::render_triangle: - case gale::openGL::render_triangleStrip: - case gale::openGL::render_triangleFan: + case gale::openGL::renderMode::triangle: + case gale::openGL::renderMode::triangleStrip: + case gale::openGL::renderMode::triangleFan: nbIndicInFace = 3; break; - case gale::openGL::render_line: - case gale::openGL::render_lineStrip: - case gale::openGL::render_lineLoop: + case gale::openGL::renderMode::line: + case gale::openGL::renderMode::lineStrip: + case gale::openGL::renderMode::lineLoop: nbIndicInFace = 2; break; - case gale::openGL::render_point: + case gale::openGL::renderMode::point: nbIndicInFace = 1; break; - case gale::openGL::render_quad: - case gale::openGL::render_quadStrip: + case gale::openGL::renderMode::quad: + case gale::openGL::renderMode::quadStrip: nbIndicInFace = 4; break; - case gale::openGL::render_polygon: + case gale::openGL::renderMode::polygon: nbIndicInFace = 3; break; } @@ -494,7 +494,7 @@ void ege::resource::Mesh::addPoint(const std::string& _layerName, const vec3& _p return; } gale::openGL::renderMode tmpRenderMode = m_materials[_layerName]->getRenderMode(); - if (tmpRenderMode != gale::openGL::render_point) { + if (tmpRenderMode != gale::openGL::renderMode::point) { EGE_ERROR("try to add Point in a mesh material section that not support Point"); return; } @@ -515,9 +515,9 @@ void ege::resource::Mesh::addLine(const std::string& _layerName, const vec3& _po return; } gale::openGL::renderMode tmpRenderMode = m_materials[_layerName]->getRenderMode(); - if ( tmpRenderMode != gale::openGL::render_line - && tmpRenderMode != gale::openGL::render_lineStrip - && tmpRenderMode != gale::openGL::render_lineLoop) { + if ( tmpRenderMode != gale::openGL::renderMode::line + && tmpRenderMode != gale::openGL::renderMode::lineStrip + && tmpRenderMode != gale::openGL::renderMode::lineLoop) { EGE_ERROR("try to add Line in a mesh material section that not support Line"); return; } @@ -561,9 +561,9 @@ void ege::resource::Mesh::addTriangle(const std::string& _layerName, return; } gale::openGL::renderMode tmpRenderMode = m_materials[_layerName]->getRenderMode(); - if ( tmpRenderMode != gale::openGL::render_triangle - && tmpRenderMode != gale::openGL::render_triangleStrip - && tmpRenderMode != gale::openGL::render_triangleFan) { + if ( tmpRenderMode != gale::openGL::renderMode::triangle + && tmpRenderMode != gale::openGL::renderMode::triangleStrip + && tmpRenderMode != gale::openGL::renderMode::triangleFan) { EGE_ERROR("try to add Line in a mesh material section that not support Line"); return; } @@ -595,12 +595,12 @@ void ege::resource::Mesh::addTriangle(const std::string& _layerName, const vec3& return; } gale::openGL::renderMode tmpRenderMode = m_materials[_layerName]->getRenderMode(); - if ( tmpRenderMode == gale::openGL::render_quad - || tmpRenderMode == gale::openGL::render_quadStrip) { + if ( tmpRenderMode == gale::openGL::renderMode::quad + || tmpRenderMode == gale::openGL::renderMode::quadStrip) { EGE_TODO("Create quad interface ..."); - } else if ( tmpRenderMode == gale::openGL::render_triangle - || tmpRenderMode == gale::openGL::render_lineStrip - || tmpRenderMode == gale::openGL::render_triangleFan) { + } else if ( tmpRenderMode == gale::openGL::renderMode::triangle + || tmpRenderMode == gale::openGL::renderMode::lineStrip + || tmpRenderMode == gale::openGL::renderMode::triangleFan) { // try to find position: int32_t pos1 = findPositionInList(_pos1); diff --git a/ege/resource/MeshCube.cpp b/ege/resource/MeshCube.cpp index 98924c5..4a9603e 100644 --- a/ege/resource/MeshCube.cpp +++ b/ege/resource/MeshCube.cpp @@ -17,7 +17,7 @@ std::shared_ptr ege::resource::Mesh::createCube(float _size material->setDiffuseFactor(vec4(0,0,0,1)); material->setSpecularFactor(vec4(0,0,0,1)); material->setShininess(1); - material->setRenderMode(gale::openGL::render_triangle); + material->setRenderMode(gale::openGL::renderMode::triangle); out->addMaterial(_materialName, material); out->addFaceIndexing(_materialName); diff --git a/ege/resource/MeshGird.cpp b/ege/resource/MeshGird.cpp index e3e3bde..c935747 100644 --- a/ege/resource/MeshGird.cpp +++ b/ege/resource/MeshGird.cpp @@ -16,8 +16,8 @@ std::shared_ptr ege::resource::Mesh::createGrid(int32_t _li material->setDiffuseFactor(vec4(0,0,0,1)); material->setSpecularFactor(vec4(0,0,0,1)); material->setShininess(1); - material->setRenderMode(gale::openGL::render_line); - //material->setRenderMode(gale::openGL::render_point); + material->setRenderMode(gale::openGL::renderMode::line); + //material->setRenderMode(gale::openGL::renderMode::point); out->addMaterial(_materialName, material); out->addFaceIndexing(_materialName); diff --git a/ege/resource/ParticuleMesh.cpp b/ege/resource/ParticuleMesh.cpp index d0452e0..cdb4ff1 100644 --- a/ege/resource/ParticuleMesh.cpp +++ b/ege/resource/ParticuleMesh.cpp @@ -71,7 +71,7 @@ void ege::resource::ParticuleMesh::draw(mat4& _positionMatrix, } m_materials[m_listFaces.getKey(kkk)]->draw(m_GLprogram, m_GLMaterial); if (m_checkNormal == false) { - gale::openGL::drawElements(gale::openGL::render_triangle, m_listFaces.getValue(kkk).m_index); + gale::openGL::drawElements(gale::openGL::renderMode::triangle, m_listFaces.getValue(kkk).m_index); #ifdef DISPLAY_NB_VERTEX_DISPLAYED nbElementDraw += m_listFaces.getValue(kkk).m_index.size(); nbElementDrawTheoric += m_listFaces.getValue(kkk).m_index.size(); @@ -107,7 +107,7 @@ void ege::resource::ParticuleMesh::draw(mat4& _positionMatrix, } } } - gale::openGL::drawElements(gale::openGL::render_triangle, tmpIndexResult); + gale::openGL::drawElements(gale::openGL::renderMode::triangle, tmpIndexResult); #ifdef DISPLAY_NB_VERTEX_DISPLAYED nbElementDraw += tmpIndexResult.size(); nbElementDrawTheoric += m_listFaces.getValue(kkk).m_index.size(); diff --git a/ege/widget/Mesh.cpp b/ege/widget/Mesh.cpp index bf64e55..f549985 100644 --- a/ege/widget/Mesh.cpp +++ b/ege/widget/Mesh.cpp @@ -76,7 +76,7 @@ void ege::widget::Mesh::periodicCall(const ewol::event::Time& _event) { bool ege::widget::Mesh::onEventInput(const ewol::event::Input& _event) { //EGE_DEBUG("Event on BT ..."); if (_event.getId() == 1) { - if(_event.getStatus() == gale::key::status_single) { + if(_event.getStatus() == gale::key::status::pressSingle) { signalPressed.emit(); return true; } diff --git a/sample/Collision/appl/Windows.cpp b/sample/Collision/appl/Windows.cpp index 9302e30..e30dabb 100644 --- a/sample/Collision/appl/Windows.cpp +++ b/sample/Collision/appl/Windows.cpp @@ -157,7 +157,7 @@ namespace appl { bool appl::Windows::onEventInput(const ewol::event::Input& _event) { static float ploppp=1; if (_event.getId() == 1) { - if (_event.getStatus() == gale::key::status_down) { + if (_event.getStatus() == gale::key::status::down) { vec2 pos = relativePosition(_event.getPos()); ege::Ray ray = m_camera->getRayFromScreenPosition(pos, m_size); @@ -187,10 +187,10 @@ bool appl::Windows::onEventInput(const ewol::event::Input& _event) { } m_camera->setEye(vec3(100*std::sin(m_angleTetha),100*std::cos(m_angleTetha),80*std::cos(m_anglePsy))*ploppp); } else if (_event.getId() == 3) { - if (_event.getStatus() == gale::key::status_down) { + if (_event.getStatus() == gale::key::status::down) { m_oldScreenPos = relativePosition(_event.getPos()); return true; - } else if (_event.getStatus() == gale::key::status_move) { + } else if (_event.getStatus() == gale::key::status::move) { vec2 pos = relativePosition(_event.getPos()); m_angleTetha -= (m_oldScreenPos.x()-pos.x())*0.05f; m_anglePsy += (m_oldScreenPos.y()-pos.y())*0.01f; @@ -199,10 +199,10 @@ bool appl::Windows::onEventInput(const ewol::event::Input& _event) { return true; } } else if (_event.getId() == 2) { - if (_event.getStatus() == gale::key::status_down) { + if (_event.getStatus() == gale::key::status::down) { m_oldScreenPos = relativePosition(_event.getPos()); return true; - } else if (_event.getStatus() == gale::key::status_move) { + } else if (_event.getStatus() == gale::key::status::move) { vec2 pos = relativePosition(_event.getPos())*0.2; pos -= m_oldScreenPos*0.2; float cameraAngle = m_camera->getTetha(); diff --git a/sample/DoubleView/appl/Windows.cpp b/sample/DoubleView/appl/Windows.cpp index eeac442..51fbb93 100644 --- a/sample/DoubleView/appl/Windows.cpp +++ b/sample/DoubleView/appl/Windows.cpp @@ -191,10 +191,10 @@ bool appl::Windows::onEventInput(const ewol::event::Input& _event) { } m_camera->setEye(vec3(100*std::sin(m_angleTetha),100*std::cos(m_angleTetha),80*std::cos(m_anglePsy))*ploppp); } else if (_event.getId() == 3) { - if (_event.getStatus() == gale::key::status_down) { + if (_event.getStatus() == gale::key::status::down) { m_oldScreenPos = relativePosition(_event.getPos()); return true; - } else if (_event.getStatus() == gale::key::status_move) { + } else if (_event.getStatus() == gale::key::status::move) { vec2 pos = relativePosition(_event.getPos()); m_angleTetha -= (m_oldScreenPos.x()-pos.x())*0.05f; m_anglePsy += (m_oldScreenPos.y()-pos.y())*0.01f; @@ -203,10 +203,10 @@ bool appl::Windows::onEventInput(const ewol::event::Input& _event) { return true; } } else if (_event.getId() == 2) { - if (_event.getStatus() == gale::key::status_down) { + if (_event.getStatus() == gale::key::status::down) { m_oldScreenPos = relativePosition(_event.getPos()); return true; - } else if (_event.getStatus() == gale::key::status_move) { + } else if (_event.getStatus() == gale::key::status::move) { vec2 pos = relativePosition(_event.getPos())*0.2; pos -= m_oldScreenPos*0.2; float cameraAngle = m_camera->getTetha(); diff --git a/sample/RayTest/appl/Windows.cpp b/sample/RayTest/appl/Windows.cpp index c89afb1..6e19e22 100644 --- a/sample/RayTest/appl/Windows.cpp +++ b/sample/RayTest/appl/Windows.cpp @@ -158,10 +158,10 @@ bool appl::Windows::onEventInput(const ewol::event::Input& _event) { } m_camera->setEye(vec3(100*std::sin(m_angleTetha),100*std::cos(m_angleTetha),40*std::cos(m_anglePsy))*ploppp); } else if (_event.getId() == 3) { - if (_event.getStatus() == gale::key::status_down) { + if (_event.getStatus() == gale::key::status::down) { m_oldScreenPos = relativePosition(_event.getPos()); return true; - } else if (_event.getStatus() == gale::key::status_move) { + } else if (_event.getStatus() == gale::key::status::move) { vec2 pos = relativePosition(_event.getPos()); m_angleTetha -= (m_oldScreenPos.x()-pos.x())*0.05f; m_anglePsy += (m_oldScreenPos.y()-pos.y())*0.05f;