random-mirrors
/
librw
mirror of https://github.com/aap/librw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix 'warning: implicit conversion from ‘rw::float32’ {aka ‘float’} to ‘double’ to match other operand of binary expression [-Wdouble-promotion]'

This commit is contained in:
Anonymous Maarten 2018-07-13 01:33:18 +02:00
parent b38cbc7961
commit add55f08c5
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/base.cpp
View File

@ -110,9 +110,9 @@ slerp(const Quat &q, const Quat &p, float32 a)
} }
float32 phi = acos(c); float32 phi = acos(c);
if(phi > 0.00001f){ if(phi > 0.00001f){
float32 s = sin(phi); float32 s = sinf(phi);
return add(scale(q1, sin((1.0f-a)*phi)/s), return add(scale(q1, sinf((1.0f-a)*phi)/s),
scale(p, sin(a*phi)/s)); scale(p, sinf(a*phi)/s));
} }
return q1; return q1;
} }
@ -424,25 +424,25 @@ Matrix::getRotation(void)
float32 tr = right.x + up.y + at.z; float32 tr = right.x + up.y + at.z;
float s; float s;
if(tr > 0.0f){ if(tr > 0.0f){
s = sqrt(1.0f + tr) * 2.0f; s = sqrtf(1.0f + tr) * 2.0f;
q.w = s / 4.0f; q.w = s / 4.0f;
q.x = (up.z - at.y) / s; q.x = (up.z - at.y) / s;
q.y = (at.x - right.z) / s; q.y = (at.x - right.z) / s;
q.z = (right.y - up.x) / s; q.z = (right.y - up.x) / s;
}else if(right.x > up.y && right.x > at.z){ }else if(right.x > up.y && right.x > at.z){
s = sqrt(1.0f + right.x - up.y - at.z) * 2.0f; s = sqrtf(1.0f + right.x - up.y - at.z) * 2.0f;
q.w = (up.z - at.y) / s; q.w = (up.z - at.y) / s;
q.x = s / 4.0f; q.x = s / 4.0f;
q.y = (up.x + right.y) / s; q.y = (up.x + right.y) / s;
q.z = (at.x + right.z) / s; q.z = (at.x + right.z) / s;
}else if(up.y > at.z){ }else if(up.y > at.z){
s = sqrt(1.0f + up.y - right.x - at.z) * 2.0f; s = sqrtf(1.0f + up.y - right.x - at.z) * 2.0f;
q.w = (at.x - right.z) / s; q.w = (at.x - right.z) / s;
q.x = (up.x + right.y) / s; q.x = (up.x + right.y) / s;
q.y = s / 4.0f; q.y = s / 4.0f;
q.z = (at.y + up.z) / s; q.z = (at.y + up.z) / s;
}else{ }else{
s = sqrt(1.0f + at.z - right.x - up.y) * 2.0f; s = sqrtf(1.0f + at.z - right.x - up.y) * 2.0f;
q.w = (right.y - up.x) / s; q.w = (right.y - up.x) / s;
q.x = (at.x + right.z) / s; q.x = (at.x + right.z) / s;
q.y = (at.y + up.z) / s; q.y = (at.y + up.z) / s;
@ -513,8 +513,8 @@ Matrix::invertGeneral(Matrix *dst, const Matrix *src)
// get the determinant from that // get the determinant from that
det = src->up.x * dst->right.y + src->at.x * dst->right.z + dst->right.x * src->right.x; det = src->up.x * dst->right.y + src->at.x * dst->right.z + dst->right.x * src->right.x;
invdet = 1.0; invdet = 1.0;
if(det != 0.0) if(det != 0.0f)
invdet = 1.0/det; invdet = 1.0f/det;
dst->right.x *= invdet; dst->right.x *= invdet;
dst->right.y *= invdet; dst->right.y *= invdet;
dst->right.z *= invdet; dst->right.z *= invdet;
@ -535,10 +535,10 @@ void
Matrix::makeRotation(Matrix *dst, V3d *axis, float32 angle) Matrix::makeRotation(Matrix *dst, V3d *axis, float32 angle)
{ {
V3d v = normalize(*axis); V3d v = normalize(*axis);
angle = angle*M_PI/180.0f; angle = angle*(float)M_PI/180.0f;
float32 s = sin(angle); float32 s = sin(angle);
float32 c = cos(angle); float32 c = cos(angle);
float32 t = 1.0f - cos(angle); float32 t = 1.0f - c;
dst->right.x = c + v.x*v.x*t; dst->right.x = c + v.x*v.x*t;
dst->right.y = v.x*v.y*t + v.z*s; dst->right.y = v.x*v.y*t + v.z*s;
@ -588,9 +588,9 @@ float32
Matrix::normalError(void) Matrix::normalError(void)
{ {
float32 x, y, z; float32 x, y, z;
x = dot(right, right) - 1.0; x = dot(right, right) - 1.0f;
y = dot(up, up) - 1.0; y = dot(up, up) - 1.0f;
z = dot(at, at) - 1.0; z = dot(at, at) - 1.0f;
return x*x + y*y + z*z; return x*x + y*y + z*z;
} }

4
src/camera.cpp
View File

@ -502,8 +502,8 @@ Camera::setFOV(float32 hfov, float32 ratio)
float ar1 = 4.0/3.0; float ar1 = 4.0/3.0;
float ar2 = w/h; float ar2 = w/h;
float vfov = atan(tan(hfov/2) / ar1) *2; float vfov = atanf(tanf(hfov/2) / ar1) *2;
hfov = atan(tan(vfov/2) * ar2) *2; hfov = atanf(tanf(vfov/2) * ar2) *2;
float32 a = tan(hfov); float32 a = tan(hfov);
v.set(a, a/ratio); v.set(a, a/ratio);