From 6c7f6a441457a1afe7837df0e52e460ab4b51eac Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 14 Sep 2017 00:59:21 +0200 Subject: [PATCH] [DEV] continue removing STL --- ege/camera/Camera.cpp | 4 ++-- ege/camera/ControlBase.cpp | 12 ++++++------ ege/physics/Engine.cpp | 6 +++--- ege/resource/tools/icoSphere.cpp | 6 +++--- sample/CameraPosition/appl/Windows.cpp | 2 +- .../lutin_ege-sample-camera-position.py | 2 +- sample/Collision/lutin_ege-sample-collision.py | 2 +- sample/DoubleView/lutin_ege-sample-double-view.py | 2 +- sample/LowPoly/lutin_ege-sample-low-poly.py | 2 +- sample/MeshCreator/appl/Windows.cpp | 2 +- sample/MeshCreator/lutin_ege-sample-mesh-creator.py | 2 +- sample/RayTest/lutin_ege-sample-raytracing.py | 2 +- sample/TorqueApply/lutin_ege-sample-torque-apply.py | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ege/camera/Camera.cpp b/ege/camera/Camera.cpp index 8da52ae..eadbce8 100644 --- a/ege/camera/Camera.cpp +++ b/ege/camera/Camera.cpp @@ -79,13 +79,13 @@ vec2 ege::Camera::tansformPositionToAngle(vec3 _vect) { if (distance == 0.0f) { return out; } - out.setY(std::asin(_vect.z()/distance)); + out.setY(etk::asin(_vect.z()/distance)); _vect.setZ(0.0f); if (_vect.x() == 0 && _vect.y() == 0) { return out; } _vect.normalize(); - out.setX(std::asin(_vect.y())); + out.setX(etk::asin(_vect.y())); if (_vect.x() < 0) { out.setX(out.x()*-1 - M_PI); } diff --git a/ege/camera/ControlBase.cpp b/ege/camera/ControlBase.cpp index 1bfedf3..765fe35 100644 --- a/ege/camera/ControlBase.cpp +++ b/ege/camera/ControlBase.cpp @@ -27,7 +27,7 @@ void ege::camera::ControlBase::setCamera(const ememory::SharedPtrsetTarget(vec3(0,0,0)); - m_camera->setEye(vec3(100*std::sin(m_angleTetha),100*std::cos(m_angleTetha),80*std::cos(m_anglePsy))*m_distance); + m_camera->setEye(vec3(100*etk::sin(m_angleTetha),100*etk::cos(m_angleTetha),80*etk::cos(m_anglePsy))*m_distance); m_PCH = ewol::Object::getObjectManager().periodicCall.connect(this, &ege::camera::ControlBase::periodicCall); } @@ -117,7 +117,7 @@ bool ege::camera::ControlBase::onEventInput(const ewol::event::Input& _event, co if (_event.getId() == 4) { // scrool button ==> zoom in m_distance += 0.01f; - m_camera->setEye(vec3(100*std::sin(m_angleTetha),100*std::cos(m_angleTetha),80*std::cos(m_anglePsy))*m_distance); + m_camera->setEye(vec3(100*etk::sin(m_angleTetha),100*etk::cos(m_angleTetha),80*etk::cos(m_anglePsy))*m_distance); return true; } else if (_event.getId() == 5) { // scrool button ==> zoom OUT @@ -125,7 +125,7 @@ bool ege::camera::ControlBase::onEventInput(const ewol::event::Input& _event, co if (m_distance <= 0.05f) { m_distance = 0.05f; } - m_camera->setEye(vec3(100*std::sin(m_angleTetha),100*std::cos(m_angleTetha),80*std::cos(m_anglePsy))*m_distance); + m_camera->setEye(vec3(100*etk::sin(m_angleTetha),100*etk::cos(m_angleTetha),80*etk::cos(m_anglePsy))*m_distance); return true; } else if (_event.getId() == 3) { // Middle button ==> move around the target position @@ -135,7 +135,7 @@ bool ege::camera::ControlBase::onEventInput(const ewol::event::Input& _event, co vec2 pos = _relativePosition; m_angleTetha += (m_oldScreenPos.x()-pos.x())*0.02f; m_anglePsy += (m_oldScreenPos.y()-pos.y())*0.01f; - m_camera->setEye(m_camera->getTarget() + vec3(100*std::sin(m_angleTetha),100*std::cos(m_angleTetha),80*std::cos(m_anglePsy))*m_distance); + m_camera->setEye(m_camera->getTarget() + vec3(100*etk::sin(m_angleTetha),100*etk::cos(m_angleTetha),80*etk::cos(m_anglePsy))*m_distance); m_oldScreenPos = _relativePosition; } return true; @@ -147,8 +147,8 @@ bool ege::camera::ControlBase::onEventInput(const ewol::event::Input& _event, co vec2 pos = _relativePosition*0.2; pos -= m_oldScreenPos*0.2; float cameraAngle = m_camera->getTetha(); - vec3 newPos = vec3(std::sin(cameraAngle)*pos.x() + std::cos(cameraAngle)*pos.y(), - std::cos(cameraAngle)*pos.x() + std::sin(cameraAngle)*pos.y(), + vec3 newPos = vec3(etk::sin(cameraAngle)*pos.x() + etk::cos(cameraAngle)*pos.y(), + etk::cos(cameraAngle)*pos.x() + etk::sin(cameraAngle)*pos.y(), 0); EGE_ERROR("apply offset = " << newPos << " from pos=" << pos << " angle=" << cameraAngle); newPos += m_camera->getTarget(); diff --git a/ege/physics/Engine.cpp b/ege/physics/Engine.cpp index de564cc..8f3e2b2 100644 --- a/ege/physics/Engine.cpp +++ b/ege/physics/Engine.cpp @@ -226,13 +226,13 @@ etk::Pair, etk::Pair> ege::physics if (callbackObject.m_haveImpact == true) { if ( callbackObject.m_body == nullptr || callbackObject.m_body->getUserData() == nullptr) { - etk::Pair, etk::Pair>(nullptr, std::pair(callbackObject.m_position, callbackObject.m_normal)); + etk::Pair, etk::Pair>(nullptr, etk::pair(callbackObject.m_position, callbackObject.m_normal)); } // TODO: je n'ai pas une entity, main un component ... ege::physics::Component* elem = static_cast(callbackObject.m_body->getUserData()); - return etk::Pair, etk::Pair>(elem->sharedFromThis(), std::pair(callbackObject.m_position, callbackObject.m_normal)); + return etk::Pair, etk::Pair>(elem->sharedFromThis(), etk::pair(callbackObject.m_position, callbackObject.m_normal)); } EGE_VERBOSE(" No Hit"); - return etk::Pair, etk::Pair>(nullptr, std::pair(vec3(0,0,0),vec3(0,0,0))); + return etk::Pair, etk::Pair>(nullptr, etk::pair(vec3(0,0,0),vec3(0,0,0))); } \ No newline at end of file diff --git a/ege/resource/tools/icoSphere.cpp b/ege/resource/tools/icoSphere.cpp index 4709934..6266d50 100644 --- a/ege/resource/tools/icoSphere.cpp +++ b/ege/resource/tools/icoSphere.cpp @@ -140,10 +140,10 @@ void ege::icoSphere::create(etk::Hash>& _mater vec2 texturePos; // projection sur le plan XY: float proj = vert.x()*vert.x() + vert.y()*vert.y(); - proj = std::sqrt(proj); + proj = etk::sqrt(proj); float angle = M_PI; if (proj != 0.0f) { - angle = std::acos(std::abs(vert.x()) / proj); + angle = etk::acos(etk::abs(vert.x()) / proj); } if (vert.x()<0) { if (vert.y()<0) { @@ -159,7 +159,7 @@ void ege::icoSphere::create(etk::Hash>& _mater //EGE_WARNING( "angle = " << (angle/M_PI*180.0f) << " from: vert=" << etk::toString(vert) << " proj=" << proj ); texturePos.setX(angle/(2.0f*M_PI)+0.5f); - angle = std::acos(proj/1.0f); + angle = etk::acos(proj/1.0f); if (vert.z()<0) { angle = -angle; } diff --git a/sample/CameraPosition/appl/Windows.cpp b/sample/CameraPosition/appl/Windows.cpp index e2cdf57..c03fbb8 100644 --- a/sample/CameraPosition/appl/Windows.cpp +++ b/sample/CameraPosition/appl/Windows.cpp @@ -127,7 +127,7 @@ void appl::Windows::onCallbackPeriodicUpdateCamera(const ewol::event::Time& _eve offset += 0.01; static float offset2 = 0; offset2 += 0.003; - m_camera->setEye(vec3(100*std::sin(offset),100*std::cos(offset),40*std::cos(offset2))); + m_camera->setEye(vec3(100*etk::sin(offset),100*etk::cos(offset),40*etk::cos(offset2))); } diff --git a/sample/CameraPosition/lutin_ege-sample-camera-position.py b/sample/CameraPosition/lutin_ege-sample-camera-position.py index 04ca52e..904ff90 100644 --- a/sample/CameraPosition/lutin_ege-sample-camera-position.py +++ b/sample/CameraPosition/lutin_ege-sample-camera-position.py @@ -47,7 +47,7 @@ def configure(target, my_module): my_module.add_flag('c++', [ "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_toString(get_version()) + "\\\"\"" + "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" ]) # set the package properties: diff --git a/sample/Collision/lutin_ege-sample-collision.py b/sample/Collision/lutin_ege-sample-collision.py index b0f3c30..b941c3b 100644 --- a/sample/Collision/lutin_ege-sample-collision.py +++ b/sample/Collision/lutin_ege-sample-collision.py @@ -47,7 +47,7 @@ def configure(target, my_module): my_module.add_flag('c++', [ "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_toString(get_version()) + "\\\"\"" + "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" ]) # set the package properties : diff --git a/sample/DoubleView/lutin_ege-sample-double-view.py b/sample/DoubleView/lutin_ege-sample-double-view.py index 8e769c5..a5990f2 100644 --- a/sample/DoubleView/lutin_ege-sample-double-view.py +++ b/sample/DoubleView/lutin_ege-sample-double-view.py @@ -47,7 +47,7 @@ def configure(target, my_module): my_module.add_flag('c++', [ "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_toString(get_version()) + "\\\"\"" + "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" ]) # set the package properties: diff --git a/sample/LowPoly/lutin_ege-sample-low-poly.py b/sample/LowPoly/lutin_ege-sample-low-poly.py index feb0e57..f8facb3 100644 --- a/sample/LowPoly/lutin_ege-sample-low-poly.py +++ b/sample/LowPoly/lutin_ege-sample-low-poly.py @@ -47,7 +47,7 @@ def configure(target, my_module): my_module.add_flag('c++', [ "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_toString(get_version()) + "\\\"\"" + "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" ]) # set the package properties: diff --git a/sample/MeshCreator/appl/Windows.cpp b/sample/MeshCreator/appl/Windows.cpp index 2bc19d6..adeaf61 100644 --- a/sample/MeshCreator/appl/Windows.cpp +++ b/sample/MeshCreator/appl/Windows.cpp @@ -191,7 +191,7 @@ void appl::Windows::onCallbackPeriodicUpdateCamera(const ewol::event::Time& _eve offset += 0.01; static float offset2 = 0; offset2 += 0.003; - m_camera->setEye(vec3(100*std::sin(offset),100*std::cos(offset),40*std::cos(offset2))+vec3(50,0,0)); + m_camera->setEye(vec3(100*etk::sin(offset),100*etk::cos(offset),40*etk::cos(offset2))+vec3(50,0,0)); } diff --git a/sample/MeshCreator/lutin_ege-sample-mesh-creator.py b/sample/MeshCreator/lutin_ege-sample-mesh-creator.py index 3dbf9d7..a2c9b20 100644 --- a/sample/MeshCreator/lutin_ege-sample-mesh-creator.py +++ b/sample/MeshCreator/lutin_ege-sample-mesh-creator.py @@ -46,7 +46,7 @@ def configure(target, my_module): my_module.add_flag('c++', [ "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_toString(get_version()) + "\\\"\"" + "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" ]) # set the package properties: diff --git a/sample/RayTest/lutin_ege-sample-raytracing.py b/sample/RayTest/lutin_ege-sample-raytracing.py index e5d008e..1011b6f 100644 --- a/sample/RayTest/lutin_ege-sample-raytracing.py +++ b/sample/RayTest/lutin_ege-sample-raytracing.py @@ -47,7 +47,7 @@ def configure(target, my_module): my_module.add_flag('c++', [ "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_toString(get_version()) + "\\\"\"" + "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" ]) # set the package properties: diff --git a/sample/TorqueApply/lutin_ege-sample-torque-apply.py b/sample/TorqueApply/lutin_ege-sample-torque-apply.py index 56093af..9da478b 100644 --- a/sample/TorqueApply/lutin_ege-sample-torque-apply.py +++ b/sample/TorqueApply/lutin_ege-sample-torque-apply.py @@ -47,7 +47,7 @@ def configure(target, my_module): my_module.add_flag('c++', [ "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_toString(get_version()) + "\\\"\"" + "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" ]) # set the package properties :