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

[DEV] continue removing STL

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

4
ege/camera/Camera.cpp
View File

@ -79,13 +79,13 @@ vec2 ege::Camera::tansformPositionToAngle(vec3 _vect) {
if (distance == 0.0f) { if (distance == 0.0f) {
return out; return out;
} }
out.setY(std::asin(_vect.z()/distance)); out.setY(etk::asin(_vect.z()/distance));
_vect.setZ(0.0f); _vect.setZ(0.0f);
if (_vect.x() == 0 && _vect.y() == 0) { if (_vect.x() == 0 && _vect.y() == 0) {
return out; return out;
} }
_vect.normalize(); _vect.normalize();
out.setX(std::asin(_vect.y())); out.setX(etk::asin(_vect.y()));
if (_vect.x() < 0) { if (_vect.x() < 0) {
out.setX(out.x()*-1 - M_PI); out.setX(out.x()*-1 - M_PI);
} }

12
ege/camera/ControlBase.cpp
View File

@ -27,7 +27,7 @@ void ege::camera::ControlBase::setCamera(const ememory::SharedPtr<ege::camera::V
} }
m_camera = _camera; m_camera = _camera;
m_camera->setTarget(vec3(0,0,0)); m_camera->setTarget(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); 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) { if (_event.getId() == 4) {
// scrool button ==> zoom in // scrool button ==> zoom in
m_distance += 0.01f; 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; return true;
} else if (_event.getId() == 5) { } else if (_event.getId() == 5) {
// scrool button ==> zoom OUT // scrool button ==> zoom OUT
@ -125,7 +125,7 @@ bool ege::camera::ControlBase::onEventInput(const ewol::event::Input& _event, co
if (m_distance <= 0.05f) { if (m_distance <= 0.05f) {
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; return true;
} else if (_event.getId() == 3) { } else if (_event.getId() == 3) {
// Middle button ==> move around the target position // 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; vec2 pos = _relativePosition;
m_angleTetha += (m_oldScreenPos.x()-pos.x())*0.02f; m_angleTetha += (m_oldScreenPos.x()-pos.x())*0.02f;
m_anglePsy += (m_oldScreenPos.y()-pos.y())*0.01f; 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; m_oldScreenPos = _relativePosition;
} }
return true; return true;
@ -147,8 +147,8 @@ bool ege::camera::ControlBase::onEventInput(const ewol::event::Input& _event, co
vec2 pos = _relativePosition*0.2; vec2 pos = _relativePosition*0.2;
pos -= m_oldScreenPos*0.2; pos -= m_oldScreenPos*0.2;
float cameraAngle = m_camera->getTetha(); float cameraAngle = m_camera->getTetha();
vec3 newPos = vec3(std::sin(cameraAngle)*pos.x() + std::cos(cameraAngle)*pos.y(), vec3 newPos = vec3(etk::sin(cameraAngle)*pos.x() + etk::cos(cameraAngle)*pos.y(),
std::cos(cameraAngle)*pos.x() + std::sin(cameraAngle)*pos.y(), etk::cos(cameraAngle)*pos.x() + etk::sin(cameraAngle)*pos.y(),
0); 0);
EGE_ERROR("apply offset = " << newPos << " from pos=" << pos << " angle=" << cameraAngle); EGE_ERROR("apply offset = " << newPos << " from pos=" << pos << " angle=" << cameraAngle);
newPos += m_camera->getTarget(); newPos += m_camera->getTarget();

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_haveImpact == true) {
if ( callbackObject.m_body == nullptr if ( callbackObject.m_body == nullptr
|| callbackObject.m_body->getUserData() == nullptr) { || callbackObject.m_body->getUserData() == nullptr) {
etk::Pair<ememory::SharedPtr<ege::Component>, etk::Pair<vec3,vec3>>(nullptr, std::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 ... // TODO: je n'ai pas une entity, main un component ...
ege::physics::Component* elem = static_cast<ege::physics::Component*>(callbackObject.m_body->getUserData()); 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(), std::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"); EGE_VERBOSE(" No Hit");
return etk::Pair<ememory::SharedPtr<ege::Component>, etk::Pair<vec3,vec3>>(nullptr, std::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)));
} }

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

@ -140,10 +140,10 @@ void ege::icoSphere::create(etk::Hash<ememory::SharedPtr<ege::Material>>& _mater
vec2 texturePos; vec2 texturePos;
// projection sur le plan XY: // projection sur le plan XY:
float proj = vert.x()*vert.x() + vert.y()*vert.y(); float proj = vert.x()*vert.x() + vert.y()*vert.y();
proj = std::sqrt(proj); proj = etk::sqrt(proj);
float angle = M_PI; float angle = M_PI;
if (proj != 0.0f) { 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.x()<0) {
if (vert.y()<0) { if (vert.y()<0) {
@ -159,7 +159,7 @@ void ege::icoSphere::create(etk::Hash<ememory::SharedPtr<ege::Material>>& _mater
//EGE_WARNING( "angle = " << (angle/M_PI*180.0f) << " from: vert=" << etk::toString(vert) << " proj=" << proj ); //EGE_WARNING( "angle = " << (angle/M_PI*180.0f) << " from: vert=" << etk::toString(vert) << " proj=" << proj );
texturePos.setX(angle/(2.0f*M_PI)+0.5f); 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) { if (vert.z()<0) {
angle = -angle; angle = -angle;
} }

2
sample/CameraPosition/appl/Windows.cpp
View File

@ -127,7 +127,7 @@ void appl::Windows::onCallbackPeriodicUpdateCamera(const ewol::event::Time& _eve
offset += 0.01; offset += 0.01;
static float offset2 = 0; static float offset2 = 0;
offset2 += 0.003; 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)));
} }

2
sample/CameraPosition/lutin_ege-sample-camera-position.py
View File

@ -47,7 +47,7 @@ def configure(target, my_module):
my_module.add_flag('c++', [ my_module.add_flag('c++', [
"-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", "-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: # set the package properties:

2
sample/Collision/lutin_ege-sample-collision.py
View File

@ -47,7 +47,7 @@ def configure(target, my_module):
my_module.add_flag('c++', [ my_module.add_flag('c++', [
"-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", "-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 : # set the package properties :

2
sample/DoubleView/lutin_ege-sample-double-view.py
View File

@ -47,7 +47,7 @@ def configure(target, my_module):
my_module.add_flag('c++', [ my_module.add_flag('c++', [
"-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", "-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: # set the package properties:

2
sample/LowPoly/lutin_ege-sample-low-poly.py
View File

@ -47,7 +47,7 @@ def configure(target, my_module):
my_module.add_flag('c++', [ my_module.add_flag('c++', [
"-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", "-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: # set the package properties:

2
sample/MeshCreator/appl/Windows.cpp
View File

@ -191,7 +191,7 @@ void appl::Windows::onCallbackPeriodicUpdateCamera(const ewol::event::Time& _eve
offset += 0.01; offset += 0.01;
static float offset2 = 0; static float offset2 = 0;
offset2 += 0.003; 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));
} }

2
sample/MeshCreator/lutin_ege-sample-mesh-creator.py
View File

@ -46,7 +46,7 @@ def configure(target, my_module):
my_module.add_flag('c++', [ my_module.add_flag('c++', [
"-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", "-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: # set the package properties:

2
sample/RayTest/lutin_ege-sample-raytracing.py
View File

@ -47,7 +47,7 @@ def configure(target, my_module):
my_module.add_flag('c++', [ my_module.add_flag('c++', [
"-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", "-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: # set the package properties:

2
sample/TorqueApply/lutin_ege-sample-torque-apply.py
View File

@ -47,7 +47,7 @@ def configure(target, my_module):
my_module.add_flag('c++', [ my_module.add_flag('c++', [
"-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", "-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 : # set the package properties :