adrien/netradiant-custom
1
Fork 0
mirror of https://github.com/Garux/netradiant-custom.git synced 2026-09-28 00:00:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove some odd static_cast<>

Browse Source
This commit is contained in:
Garux
2025-11-01 20:49:05 +05:00
parent 17d6588d1a
commit 2f17128f06
26 changed files with 372 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/bobtoolz/DEntity.cpp
+2 -2
View File
@@ -532,10 +532,10 @@ void DEntity::SpawnInt( const char* key, const char* defaultstring, int* out ){
void DEntity::SpawnFloat( const char* key, const char* defaultstring, float* out ){
DEPair* pEP = FindEPairByKey( key );
if ( pEP ) {
*out = static_cast<float>( atof( pEP->value.c_str() ) );
*out = atof( pEP->value.c_str() );
}
else {
*out = static_cast<float>( atof( defaultstring ) );
*out = atof( defaultstring );
}
}
contrib/bobtoolz/DTreePlanter.h
+2 -2
View File
@@ -171,12 +171,12 @@ public:
GT;
CT;
m_minScale = static_cast<float>( atof( pToken ) );
m_minScale = atof( pToken );
GT;
CT;
m_maxScale = static_cast<float>( atof( pToken ) );
m_maxScale = atof( pToken );
m_useScale = true;
}
contrib/bobtoolz/cportals.cpp
+2 -2
View File
@@ -47,11 +47,11 @@ void ClampFloat( float* p ){
}
if ( std::fabs( *p - ceil( *p ) ) < MAX_ROUND_ERROR ) {
*p = static_cast<float>( ceil( *p ) );
*p = ceil( *p );
}
if ( std::fabs( *p - floor( *p ) ) < MAX_ROUND_ERROR ) {
*p = static_cast<float>( floor( *p ) );
*p = floor( *p );
}
}
libs/math/frustum.h
+46 -46
View File
@@ -32,21 +32,21 @@
inline Matrix4 matrix4_frustum( float left, float right, float bottom, float top, float nearval, float farval ){
return Matrix4(
static_cast<float>( ( 2 * nearval ) / ( right - left ) ),
( 2 * nearval ) / ( right - left ),
0,
0,
0,
0,
static_cast<float>( ( 2 * nearval ) / ( top - bottom ) ),
( 2 * nearval ) / ( top - bottom ),
0,
0,
static_cast<float>( ( right + left ) / ( right - left ) ),
static_cast<float>( ( top + bottom ) / ( top - bottom ) ),
static_cast<float>( -( farval + nearval ) / ( farval - nearval ) ),
( right + left ) / ( right - left ),
( top + bottom ) / ( top - bottom ),
-( farval + nearval ) / ( farval - nearval ),
-1,
0,
0,
static_cast<float>( -( 2 * farval * nearval ) / ( farval - nearval ) ),
-( 2 * farval * nearval ) / ( farval - nearval ),
0
);
}
@@ -106,12 +106,12 @@ public:
if ( b0 ^ b1 ) {
*out = vector4_subtracted( *next, *i );
double scale = ClipPlane::scale( *i, *out );
const double scale = ClipPlane::scale( *i, *out );
( *out )[0] = static_cast<float>( ( *i )[0] + scale * ( ( *out )[0] ) );
( *out )[1] = static_cast<float>( ( *i )[1] + scale * ( ( *out )[1] ) );
( *out )[2] = static_cast<float>( ( *i )[2] + scale * ( ( *out )[2] ) );
( *out )[3] = static_cast<float>( ( *i )[3] + scale * ( ( *out )[3] ) );
( *out )[0] = ( *i )[0] + scale * ( ( *out )[0] );
( *out )[1] = ( *i )[1] + scale * ( ( *out )[1] );
( *out )[2] = ( *i )[2] + scale * ( ( *out )[2] );
( *out )[3] = ( *i )[3] + scale * ( ( *out )[3] );
++out;
}
@@ -231,12 +231,12 @@ inline std::size_t homogenous_clip_line( Vector4 clipped[2] ){
if ( index ^ CLIP_X_LT_W( p1 ) ) {
Vector4 clip( vector4_subtracted( p1, p0 ) );
double scale = ( p0[0] - p0[3] ) / ( clip[3] - clip[0] );
const double scale = ( p0[0] - p0[3] ) / ( clip[3] - clip[0] );
clip[0] = static_cast<float>( p0[0] + scale * clip[0] );
clip[1] = static_cast<float>( p0[1] + scale * clip[1] );
clip[2] = static_cast<float>( p0[2] + scale * clip[2] );
clip[3] = static_cast<float>( p0[3] + scale * clip[3] );
clip[0] = p0[0] + scale * clip[0];
clip[1] = p0[1] + scale * clip[1];
clip[2] = p0[2] + scale * clip[2];
clip[3] = p0[3] + scale * clip[3];
clipped[index] = clip;
}
@@ -250,12 +250,12 @@ inline std::size_t homogenous_clip_line( Vector4 clipped[2] ){
if ( index ^ CLIP_X_GT_W( p1 ) ) {
Vector4 clip( vector4_subtracted( p1, p0 ) );
double scale = ( p0[0] + p0[3] ) / ( -clip[3] - clip[0] );
const double scale = ( p0[0] + p0[3] ) / ( -clip[3] - clip[0] );
clip[0] = static_cast<float>( p0[0] + scale * clip[0] );
clip[1] = static_cast<float>( p0[1] + scale * clip[1] );
clip[2] = static_cast<float>( p0[2] + scale * clip[2] );
clip[3] = static_cast<float>( p0[3] + scale * clip[3] );
clip[0] = p0[0] + scale * clip[0];
clip[1] = p0[1] + scale * clip[1];
clip[2] = p0[2] + scale * clip[2];
clip[3] = p0[3] + scale * clip[3];
clipped[index] = clip;
}
@@ -269,12 +269,12 @@ inline std::size_t homogenous_clip_line( Vector4 clipped[2] ){
if ( index ^ CLIP_Y_LT_W( p1 ) ) {
Vector4 clip( vector4_subtracted( p1, p0 ) );
double scale = ( p0[1] - p0[3] ) / ( clip[3] - clip[1] );
const double scale = ( p0[1] - p0[3] ) / ( clip[3] - clip[1] );
clip[0] = static_cast<float>( p0[0] + scale * clip[0] );
clip[1] = static_cast<float>( p0[1] + scale * clip[1] );
clip[2] = static_cast<float>( p0[2] + scale * clip[2] );
clip[3] = static_cast<float>( p0[3] + scale * clip[3] );
clip[0] = p0[0] + scale * clip[0];
clip[1] = p0[1] + scale * clip[1];
clip[2] = p0[2] + scale * clip[2];
clip[3] = p0[3] + scale * clip[3];
clipped[index] = clip;
}
@@ -288,12 +288,12 @@ inline std::size_t homogenous_clip_line( Vector4 clipped[2] ){
if ( index ^ CLIP_Y_GT_W( p1 ) ) {
Vector4 clip( vector4_subtracted( p1, p0 ) );
double scale = ( p0[1] + p0[3] ) / ( -clip[3] - clip[1] );
const double scale = ( p0[1] + p0[3] ) / ( -clip[3] - clip[1] );
clip[0] = static_cast<float>( p0[0] + scale * clip[0] );
clip[1] = static_cast<float>( p0[1] + scale * clip[1] );
clip[2] = static_cast<float>( p0[2] + scale * clip[2] );
clip[3] = static_cast<float>( p0[3] + scale * clip[3] );
clip[0] = p0[0] + scale * clip[0];
clip[1] = p0[1] + scale * clip[1];
clip[2] = p0[2] + scale * clip[2];
clip[3] = p0[3] + scale * clip[3];
clipped[index] = clip;
}
@@ -307,12 +307,12 @@ inline std::size_t homogenous_clip_line( Vector4 clipped[2] ){
if ( index ^ CLIP_Z_LT_W( p1 ) ) {
Vector4 clip( vector4_subtracted( p1, p0 ) );
double scale = ( p0[2] - p0[3] ) / ( clip[3] - clip[2] );
const double scale = ( p0[2] - p0[3] ) / ( clip[3] - clip[2] );
clip[0] = static_cast<float>( p0[0] + scale * clip[0] );
clip[1] = static_cast<float>( p0[1] + scale * clip[1] );
clip[2] = static_cast<float>( p0[2] + scale * clip[2] );
clip[3] = static_cast<float>( p0[3] + scale * clip[3] );
clip[0] = p0[0] + scale * clip[0];
clip[1] = p0[1] + scale * clip[1];
clip[2] = p0[2] + scale * clip[2];
clip[3] = p0[3] + scale * clip[3];
clipped[index] = clip;
}
@@ -326,12 +326,12 @@ inline std::size_t homogenous_clip_line( Vector4 clipped[2] ){
if ( index ^ CLIP_Z_GT_W( p1 ) ) {
Vector4 clip( vector4_subtracted( p1, p0 ) );
double scale = ( p0[2] + p0[3] ) / ( -clip[3] - clip[2] );
const double scale = ( p0[2] + p0[3] ) / ( -clip[3] - clip[2] );
clip[0] = static_cast<float>( p0[0] + scale * clip[0] );
clip[1] = static_cast<float>( p0[1] + scale * clip[1] );
clip[2] = static_cast<float>( p0[2] + scale * clip[2] );
clip[3] = static_cast<float>( p0[3] + scale * clip[3] );
clip[0] = p0[0] + scale * clip[0];
clip[1] = p0[1] + scale * clip[1];
clip[2] = p0[2] + scale * clip[2];
clip[3] = p0[3] + scale * clip[3];
clipped[index] = clip;
}
@@ -388,12 +388,12 @@ inline std::size_t matrix4_clip_line_by_nearplane( const Matrix4& self, Line& li
if ( index ^ CLIP_Z_GT_W( p1 ) ) {
Vector4 clip( vector4_subtracted( p1, p0 ) );
double scale = ( p0[2] + p0[3] ) / ( -clip[3] - clip[2] );
const double scale = ( p0[2] + p0[3] ) / ( -clip[3] - clip[2] );
clip[0] = static_cast<float>( p0[0] + scale * clip[0] );
clip[1] = static_cast<float>( p0[1] + scale * clip[1] );
clip[2] = static_cast<float>( p0[2] + scale * clip[2] );
clip[3] = static_cast<float>( p0[3] + scale * clip[3] );
clip[0] = p0[0] + scale * clip[0];
clip[1] = p0[1] + scale * clip[1];
clip[2] = p0[2] + scale * clip[2];
clip[3] = p0[3] + scale * clip[3];
points[index] = clip;
}
libs/math/matrix.h
+129 -129
View File
@@ -448,24 +448,24 @@ inline Matrix4 matrix4_affine_inverse( const Matrix4& self ){
double det
= self[0] * ( self[5] * self[10] - self[9] * self[6] )
- self[1] * ( self[4] * self[10] - self[8] * self[6] )
+ self[2] * ( self[4] * self[9] - self[8] * self[5] );
+ self[2] * ( self[4] * self[9] - self[8] * self[5] );
// throw exception here if (det*det < 1e-25)
// invert rotation submatrix
det = 1.0 / det;
result[0] = static_cast<float>( ( self[5] * self[10] - self[6] * self[9] ) * det );
result[1] = static_cast<float>( -( self[1] * self[10] - self[2] * self[9] ) * det );
result[2] = static_cast<float>( ( self[1] * self[6] - self[2] * self[5] ) * det );
result[3] = 0;
result[4] = static_cast<float>( -( self[4] * self[10] - self[6] * self[8] ) * det );
result[5] = static_cast<float>( ( self[0] * self[10] - self[2] * self[8] ) * det );
result[6] = static_cast<float>( -( self[0] * self[6] - self[2] * self[4] ) * det );
result[7] = 0;
result[8] = static_cast<float>( ( self[4] * self[9] - self[5] * self[8] ) * det );
result[9] = static_cast<float>( -( self[0] * self[9] - self[1] * self[8] ) * det );
result[10] = static_cast<float>( ( self[0] * self[5] - self[1] * self[4] ) * det );
result[0] = ( self[5] * self[10] - self[6] * self[9] ) * det;
result[1] = -( self[1] * self[10] - self[2] * self[9] ) * det;
result[2] = ( self[1] * self[6] - self[2] * self[5] ) * det;
result[3] = 0;
result[4] = -( self[4] * self[10] - self[6] * self[8] ) * det;
result[5] = ( self[0] * self[10] - self[2] * self[8] ) * det;
result[6] = -( self[0] * self[6] - self[2] * self[4] ) * det;
result[7] = 0;
result[8] = ( self[4] * self[9] - self[5] * self[8] ) * det;
result[9] = -( self[0] * self[9] - self[1] * self[8] ) * det;
result[10] = ( self[0] * self[5] - self[1] * self[4] ) * det;
result[11] = 0;
// multiply translation part by rotation
@@ -535,25 +535,25 @@ inline double matrix4_determinant( const Matrix4& self ){
/// \brief Returns the inverse of \p self using the Adjoint method.
/// \todo Throw an exception if the determinant is zero.
inline Matrix4 matrix4_full_inverse( const Matrix4& self ){
double determinant = 1.0 / matrix4_determinant( self );
const double determinant = 1.0 / matrix4_determinant( self );
return Matrix4(
static_cast<float>( Matrix4Cofactor< Cofactor4<0>, Cofactor4<0> >::apply( self ) * determinant ),
static_cast<float>( -Matrix4Cofactor< Cofactor4<1>, Cofactor4<0> >::apply( self ) * determinant ),
static_cast<float>( Matrix4Cofactor< Cofactor4<2>, Cofactor4<0> >::apply( self ) * determinant ),
static_cast<float>( -Matrix4Cofactor< Cofactor4<3>, Cofactor4<0> >::apply( self ) * determinant ),
static_cast<float>( -Matrix4Cofactor< Cofactor4<0>, Cofactor4<1> >::apply( self ) * determinant ),
static_cast<float>( Matrix4Cofactor< Cofactor4<1>, Cofactor4<1> >::apply( self ) * determinant ),
static_cast<float>( -Matrix4Cofactor< Cofactor4<2>, Cofactor4<1> >::apply( self ) * determinant ),
static_cast<float>( Matrix4Cofactor< Cofactor4<3>, Cofactor4<1> >::apply( self ) * determinant ),
static_cast<float>( Matrix4Cofactor< Cofactor4<0>, Cofactor4<2> >::apply( self ) * determinant ),
static_cast<float>( -Matrix4Cofactor< Cofactor4<1>, Cofactor4<2> >::apply( self ) * determinant ),
static_cast<float>( Matrix4Cofactor< Cofactor4<2>, Cofactor4<2> >::apply( self ) * determinant ),
static_cast<float>( -Matrix4Cofactor< Cofactor4<3>, Cofactor4<2> >::apply( self ) * determinant ),
static_cast<float>( -Matrix4Cofactor< Cofactor4<0>, Cofactor4<3> >::apply( self ) * determinant ),
static_cast<float>( Matrix4Cofactor< Cofactor4<1>, Cofactor4<3> >::apply( self ) * determinant ),
static_cast<float>( -Matrix4Cofactor< Cofactor4<2>, Cofactor4<3> >::apply( self ) * determinant ),
static_cast<float>( Matrix4Cofactor< Cofactor4<3>, Cofactor4<3> >::apply( self ) * determinant )
Matrix4Cofactor< Cofactor4<0>, Cofactor4<0> >::apply( self ) * determinant,
-Matrix4Cofactor< Cofactor4<1>, Cofactor4<0> >::apply( self ) * determinant,
Matrix4Cofactor< Cofactor4<2>, Cofactor4<0> >::apply( self ) * determinant,
-Matrix4Cofactor< Cofactor4<3>, Cofactor4<0> >::apply( self ) * determinant,
-Matrix4Cofactor< Cofactor4<0>, Cofactor4<1> >::apply( self ) * determinant,
Matrix4Cofactor< Cofactor4<1>, Cofactor4<1> >::apply( self ) * determinant,
-Matrix4Cofactor< Cofactor4<2>, Cofactor4<1> >::apply( self ) * determinant,
Matrix4Cofactor< Cofactor4<3>, Cofactor4<1> >::apply( self ) * determinant,
Matrix4Cofactor< Cofactor4<0>, Cofactor4<2> >::apply( self ) * determinant,
-Matrix4Cofactor< Cofactor4<1>, Cofactor4<2> >::apply( self ) * determinant,
Matrix4Cofactor< Cofactor4<2>, Cofactor4<2> >::apply( self ) * determinant,
-Matrix4Cofactor< Cofactor4<3>, Cofactor4<2> >::apply( self ) * determinant,
-Matrix4Cofactor< Cofactor4<0>, Cofactor4<3> >::apply( self ) * determinant,
Matrix4Cofactor< Cofactor4<1>, Cofactor4<3> >::apply( self ) * determinant,
-Matrix4Cofactor< Cofactor4<2>, Cofactor4<3> >::apply( self ) * determinant,
Matrix4Cofactor< Cofactor4<3>, Cofactor4<3> >::apply( self ) * determinant
);
}
@@ -608,24 +608,24 @@ inline Matrix4 matrix4_translated_by_vec3( const Matrix4& self, const Vector3& t
/// \brief Returns \p angle modulated by the range [0, 360).
/// \p angle must be in the range [-360, 360).
inline float angle_modulate_degrees_range( float angle ){
return static_cast<float>( float_mod_range( angle, 360.0 ) );
return float_mod_range( angle, 360.0 );
}
/// \brief Returns \p euler angles converted from radians to degrees.
inline Vector3 euler_radians_to_degrees( const Vector3& euler ){
return Vector3(
static_cast<float>( radians_to_degrees( euler.x() ) ),
static_cast<float>( radians_to_degrees( euler.y() ) ),
static_cast<float>( radians_to_degrees( euler.z() ) )
radians_to_degrees( euler.x() ),
radians_to_degrees( euler.y() ),
radians_to_degrees( euler.z() )
);
}
/// \brief Returns \p euler angles converted from degrees to radians.
inline Vector3 euler_degrees_to_radians( const Vector3& euler ){
return Vector3(
static_cast<float>( degrees_to_radians( euler.x() ) ),
static_cast<float>( degrees_to_radians( euler.y() ) ),
static_cast<float>( degrees_to_radians( euler.z() ) )
degrees_to_radians( euler.x() ),
degrees_to_radians( euler.y() ),
degrees_to_radians( euler.z() )
);
}
@@ -643,7 +643,7 @@ inline Matrix4 matrix4_rotation_for_sincos_x( float s, float c ){
/// \brief Constructs a pure-rotation matrix about the x axis from an angle in radians.
inline Matrix4 matrix4_rotation_for_x( double x ){
return matrix4_rotation_for_sincos_x( static_cast<float>( sin( x ) ), static_cast<float>( cos( x ) ) );
return matrix4_rotation_for_sincos_x( sin( x ), cos( x ) );
}
/// \brief Constructs a pure-rotation matrix about the x axis from an angle in degrees.
@@ -663,7 +663,7 @@ inline Matrix4 matrix4_rotation_for_sincos_y( float s, float c ){
/// \brief Constructs a pure-rotation matrix about the y axis from an angle in radians.
inline Matrix4 matrix4_rotation_for_y( double y ){
return matrix4_rotation_for_sincos_y( static_cast<float>( sin( y ) ), static_cast<float>( cos( y ) ) );
return matrix4_rotation_for_sincos_y( sin( y ), cos( y ) );
}
/// \brief Constructs a pure-rotation matrix about the y axis from an angle in degrees.
@@ -683,7 +683,7 @@ inline Matrix4 matrix4_rotation_for_sincos_z( float s, float c ){
/// \brief Constructs a pure-rotation matrix about the z axis from an angle in radians.
inline Matrix4 matrix4_rotation_for_z( double z ){
return matrix4_rotation_for_sincos_z( static_cast<float>( sin( z ) ), static_cast<float>( cos( z ) ) );
return matrix4_rotation_for_sincos_z( sin( z ), cos( z ) );
}
/// \brief Constructs a pure-rotation matrix about the z axis from an angle in degrees.
@@ -717,25 +717,25 @@ inline Matrix4 matrix4_rotation_for_z_degrees( float z ){
inline Matrix4 matrix4_rotation_for_euler_xyz( const Vector3& euler ){
#if 1
double cx = cos( euler[0] );
double sx = sin( euler[0] );
double cy = cos( euler[1] );
double sy = sin( euler[1] );
double cz = cos( euler[2] );
double sz = sin( euler[2] );
const double cx = cos( euler[0] );
const double sx = sin( euler[0] );
const double cy = cos( euler[1] );
const double sy = sin( euler[1] );
const double cz = cos( euler[2] );
const double sz = sin( euler[2] );
return Matrix4(
static_cast<float>( cy * cz ),
static_cast<float>( cy * sz ),
static_cast<float>( -sy ),
cy * cz,
cy * sz,
-sy,
0,
static_cast<float>( sx * sy * cz + cx * -sz ),
static_cast<float>( sx * sy * sz + cx * cz ),
static_cast<float>( sx * cy ),
sx * sy * cz + cx * -sz,
sx * sy * sz + cx * cz,
sx * cy,
0,
static_cast<float>( cx * sy * cz + sx * sz ),
static_cast<float>( cx * sy * sz + -sx * cz ),
static_cast<float>( cx * cy ),
cx * sy * cz + sx * sz,
cx * sy * sz + -sx * cz,
cx * cy,
0,
0,
0,
@@ -809,25 +809,25 @@ inline Matrix4 matrix4_rotation_for_euler_xzy_degrees( const Vector3& euler ){
inline Matrix4 matrix4_rotation_for_euler_yxz( const Vector3& euler ){
#if 1
double cx = cos( euler[0] );
double sx = sin( euler[0] );
double cy = cos( euler[1] );
double sy = sin( euler[1] );
double cz = cos( euler[2] );
double sz = sin( euler[2] );
const double cx = cos( euler[0] );
const double sx = sin( euler[0] );
const double cy = cos( euler[1] );
const double sy = sin( euler[1] );
const double cz = cos( euler[2] );
const double sz = sin( euler[2] );
return Matrix4(
static_cast<float>( cy * cz + sx * sy * -sz ),
static_cast<float>( cy * sz + sx * sy * cz ),
static_cast<float>( -cx * sy ),
cy * cz + sx * sy * -sz,
cy * sz + sx * sy * cz,
-cx * sy,
0,
static_cast<float>( cx * -sz ),
static_cast<float>( cx * cz ),
static_cast<float>( sx ),
cx * -sz,
cx * cz,
sx,
0,
static_cast<float>( sy * cz + -sx * cy * -sz ),
static_cast<float>( sy * sz + -sx * cy * cz ),
static_cast<float>( cx * cy ),
sy * cz + -sx * cy * -sz,
sy * sz + -sx * cy * cz,
cx * cy,
0,
0,
0,
@@ -876,25 +876,25 @@ inline Matrix4 matrix4_rotation_for_euler_zxy( const Vector3& euler ){
matrix4_rotation_for_y( euler[1] )
);
#else
double cx = cos( euler[0] );
double sx = sin( euler[0] );
double cy = cos( euler[1] );
double sy = sin( euler[1] );
double cz = cos( euler[2] );
double sz = sin( euler[2] );
const double cx = cos( euler[0] );
const double sx = sin( euler[0] );
const double cy = cos( euler[1] );
const double sy = sin( euler[1] );
const double cz = cos( euler[2] );
const double sz = sin( euler[2] );
return Matrix4(
static_cast<float>( cz * cy + sz * sx * sy ),
static_cast<float>( sz * cx ),
static_cast<float>( cz * -sy + sz * sx * cy ),
cz * cy + sz * sx * sy,
sz * cx,
cz * -sy + sz * sx * cy,
0,
static_cast<float>( -sz * cy + cz * sx * sy ),
static_cast<float>( cz * cx ),
static_cast<float>( -sz * -sy + cz * cx * cy ),
-sz * cy + cz * sx * sy,
cz * cx,
-sz * -sy + cz * cx * cy,
0,
static_cast<float>( cx * sy ),
static_cast<float>( -sx ),
static_cast<float>( cx * cy ),
cx * sy,
-sx,
cx * cy,
0,
0,
0,
@@ -925,25 +925,25 @@ inline void matrix4_rotate_by_euler_zxy_degrees( Matrix4& self, const Vector3& e
inline Matrix4 matrix4_rotation_for_euler_zyx( const Vector3& euler ){
#if 1
double cx = cos( euler[0] );
double sx = sin( euler[0] );
double cy = cos( euler[1] );
double sy = sin( euler[1] );
double cz = cos( euler[2] );
double sz = sin( euler[2] );
const double cx = cos( euler[0] );
const double sx = sin( euler[0] );
const double cy = cos( euler[1] );
const double sy = sin( euler[1] );
const double cz = cos( euler[2] );
const double sz = sin( euler[2] );
return Matrix4(
static_cast<float>( cy * cz ),
static_cast<float>( sx * sy * cz + cx * sz ),
static_cast<float>( cx * -sy * cz + sx * sz ),
cy * cz,
sx * sy * cz + cx * sz,
cx * -sy * cz + sx * sz,
0,
static_cast<float>( cy * -sz ),
static_cast<float>( sx * sy * -sz + cx * cz ),
static_cast<float>( cx * -sy * -sz + sx * cz ),
cy * -sz,
sx * sy * -sz + cx * cz,
cx * -sy * -sz + sx * cz,
0,
static_cast<float>( sy ),
static_cast<float>( -sx * cy ),
static_cast<float>( cx * cy ),
sy,
-sx * cy,
cx * cy,
0,
0,
0,
@@ -978,16 +978,16 @@ inline Vector3 matrix4_get_rotation_euler_xyz( const Matrix4& self ){
if ( std::fabs( ca ) > 0.005 ) { // Gimbal lock?
return Vector3(
static_cast<float>( atan2( self[6] / ca, self[10] / ca ) ),
static_cast<float>( a ),
static_cast<float>( atan2( self[1] / ca, self[0] / ca ) )
atan2( self[6] / ca, self[10] / ca ),
a,
atan2( self[1] / ca, self[0] / ca )
);
}
else // Gimbal lock has occurred
{
return Vector3(
static_cast<float>( atan2( -self[9], self[5] ) ),
static_cast<float>( a ),
atan2( -self[9], self[5] ),
a,
0
);
}
@@ -1006,16 +1006,16 @@ inline Vector3 matrix4_get_rotation_euler_yxz( const Matrix4& self ){
if ( std::fabs( ca ) > 0.005 ) { // Gimbal lock?
return Vector3(
static_cast<float>( a ),
static_cast<float>( atan2( -self[2] / ca, self[10] / ca ) ),
static_cast<float>( atan2( -self[4] / ca, self[5] / ca ) )
a,
atan2( -self[2] / ca, self[10] / ca ),
atan2( -self[4] / ca, self[5] / ca )
);
}
else // Gimbal lock has occurred
{
return Vector3(
static_cast<float>( a ),
static_cast<float>( atan2( self[8], self[0] ) ),
a,
atan2( self[8], self[0] ),
0
);
}
@@ -1029,22 +1029,22 @@ inline Vector3 matrix4_get_rotation_euler_yxz_degrees( const Matrix4& self ){
/// \brief Calculates and returns a set of euler angles that produce the rotation component of \p self when applied in the order (z, x, y).
/// \p self must be affine and orthonormal (unscaled) to produce a meaningful result.
inline Vector3 matrix4_get_rotation_euler_zxy( const Matrix4& self ){
double a = asin( -self[9] );
double ca = cos( a );
const double a = asin( -self[9] );
const double ca = cos( a );
if ( std::fabs( ca ) > 0.005 ) { // Gimbal lock?
return Vector3(
static_cast<float>( a ),
static_cast<float>( atan2( self[8] / ca, self[10] / ca ) ),
static_cast<float>( atan2( self[1] / ca, self[5] / ca ) )
a,
atan2( self[8] / ca, self[10] / ca ),
atan2( self[1] / ca, self[5] / ca )
);
}
else // Gimbal lock has occurred
{
return Vector3(
static_cast<float>( a ),
a,
0,
static_cast<float>( atan2( -self[4], self[0] ) )
atan2( -self[4], self[0] )
);
}
}
@@ -1057,22 +1057,22 @@ inline Vector3 matrix4_get_rotation_euler_zxy_degrees( const Matrix4& self ){
/// \brief Calculates and returns a set of euler angles that produce the rotation component of \p self when applied in the order (z, y, x).
/// \p self must be affine and orthonormal (unscaled) to produce a meaningful result.
inline Vector3 matrix4_get_rotation_euler_zyx( const Matrix4& self ){
double a = asin( self[8] );
double ca = cos( a );
const double a = asin( self[8] );
const double ca = cos( a );
if ( std::fabs( ca ) > 0.005 ) { // Gimbal lock?
return Vector3(
static_cast<float>( atan2( -self[9] / ca, self[10] / ca ) ),
static_cast<float>( a ),
static_cast<float>( atan2( -self[4] / ca, self[0] / ca ) )
atan2( -self[9] / ca, self[10] / ca ),
a,
atan2( -self[4] / ca, self[0] / ca )
);
}
else // Gimbal lock has occurred
{
return Vector3(
0,
static_cast<float>( a ),
static_cast<float>( atan2( self[1], self[5] ) )
a,
atan2( self[1], self[5] )
);
}
}
@@ -1105,9 +1105,9 @@ inline Matrix4 matrix4_scale_for_vec3( const Vector3& scale ){
/// \p self must be affine and orthogonal to produce a meaningful result.
inline Vector3 matrix4_get_scale_vec3( const Matrix4& self ){
return Vector3(
static_cast<float>( vector3_length( self.x().vec3() ) ),
static_cast<float>( vector3_length( self.y().vec3() ) ),
static_cast<float>( vector3_length( self.z().vec3() ) )
vector3_length( self.x().vec3() ),
vector3_length( self.y().vec3() ),
vector3_length( self.z().vec3() )
);
}
@@ -1116,9 +1116,9 @@ inline Vector3 matrix4_get_scale_vec3( const Matrix4& self ){
/// \p self must not contain rotation to produce meaningful signs.
inline Vector3 matrix4_get_scale_vec3_signed( const Matrix4& self ){
return Vector3(
static_cast<float>( std::copysign( vector3_length( self.x().vec3() ), vector3_dot( self.x().vec3(), g_vector3_axis_x ) ) ),
static_cast<float>( std::copysign( vector3_length( self.y().vec3() ), vector3_dot( self.y().vec3(), g_vector3_axis_y ) ) ),
static_cast<float>( std::copysign( vector3_length( self.z().vec3() ), vector3_dot( self.z().vec3(), g_vector3_axis_z ) ) )
std::copysign( vector3_length( self.x().vec3() ), vector3_dot( self.x().vec3(), g_vector3_axis_x ) ),
std::copysign( vector3_length( self.y().vec3() ), vector3_dot( self.y().vec3(), g_vector3_axis_y ) ),
std::copysign( vector3_length( self.z().vec3() ), vector3_dot( self.z().vec3(), g_vector3_axis_z ) )
);
}
libs/math/quaternion.h
+63 -63
View File
@@ -47,28 +47,28 @@ inline void quaternion_multiply_by_quaternion( Quaternion& quaternion, const Qua
/// \brief Constructs a quaternion which rotates between two points on the unit-sphere, \p from and \p to.
/// warning: wrong math!
inline Quaternion quaternion_for_sphere_vectors( const Vector3& from, const Vector3& to ){
return Quaternion( vector3_cross( from, to ), static_cast<float>( vector3_dot( from, to ) ) );
return Quaternion( vector3_cross( from, to ), vector3_dot( from, to ) );
}
inline Quaternion quaternion_for_axisangle( const Vector3& axis, double angle ){
angle *= 0.5;
float sa = static_cast<float>( sin( angle ) );
return Quaternion( axis[0] * sa, axis[1] * sa, axis[2] * sa, static_cast<float>( cos( angle ) ) );
const float sa = sin( angle );
return Quaternion( axis[0] * sa, axis[1] * sa, axis[2] * sa, cos( angle ) );
}
inline Quaternion quaternion_for_x( double angle ){
angle *= 0.5;
return Quaternion( static_cast<float>( sin( angle ) ), 0, 0, static_cast<float>( cos( angle ) ) );
return Quaternion( sin( angle ), 0, 0, cos( angle ) );
}
inline Quaternion quaternion_for_y( double angle ){
angle *= 0.5;
return Quaternion( 0, static_cast<float>( sin( angle ) ), 0, static_cast<float>( cos( angle ) ) );
return Quaternion( 0, sin( angle ), 0, cos( angle ) );
}
inline Quaternion quaternion_for_z( double angle ){
angle *= 0.5;
return Quaternion( 0, 0, static_cast<float>( sin( angle ) ), static_cast<float>( cos( angle ) ) );
return Quaternion( 0, 0, sin( angle ), cos( angle ) );
}
inline Quaternion quaternion_inverse( const Quaternion& quaternion ){
@@ -82,10 +82,10 @@ inline void quaternion_conjugate( Quaternion& quaternion ){
inline Quaternion quaternion_normalised( const Quaternion& quaternion ){
const double n = ( 1.0 / sqrt( quaternion[0] * quaternion[0] + quaternion[1] * quaternion[1] + quaternion[2] * quaternion[2] + quaternion[3] * quaternion[3] ) );
return Quaternion(
static_cast<float>( quaternion[0] * n ),
static_cast<float>( quaternion[1] * n ),
static_cast<float>( quaternion[2] * n ),
static_cast<float>( quaternion[3] * n )
quaternion[0] * n,
quaternion[1] * n,
quaternion[2] * n,
quaternion[3] * n
);
}
@@ -124,17 +124,17 @@ inline Matrix4 matrix4_rotation_for_quaternion( const Quaternion& quaternion ){
const double zw = quaternion[2] * quaternion[3];
return Matrix4(
static_cast<float>( 1 - 2 * ( yy + zz ) ),
static_cast<float>( 2 * ( xy + zw ) ),
static_cast<float>( 2 * ( xz - yw ) ),
1 - 2 * ( yy + zz ),
2 * ( xy + zw ),
2 * ( xz - yw ),
0,
static_cast<float>( 2 * ( xy - zw ) ),
static_cast<float>( 1 - 2 * ( xx + zz ) ),
static_cast<float>( 2 * ( yz + xw ) ),
2 * ( xy - zw ),
1 - 2 * ( xx + zz ),
2 * ( yz + xw ),
0,
static_cast<float>( 2 * ( xz + yw ) ),
static_cast<float>( 2 * ( yz - xw ) ),
static_cast<float>( 1 - 2 * ( xx + yy ) ),
2 * ( xz + yw ),
2 * ( yz - xw ),
1 - 2 * ( xx + yy ),
0,
0,
0,
@@ -157,17 +157,17 @@ inline Matrix4 matrix4_rotation_for_quaternion( const Quaternion& quaternion ){
const double wz = quaternion[3] * z2;
return Matrix4(
static_cast<float>( 1.0 - ( yy + zz ) ),
static_cast<float>( xy + wz ),
static_cast<float>( xz - wy ),
1.0 - ( yy + zz ),
xy + wz,
xz - wy,
0,
static_cast<float>( xy - wz ),
static_cast<float>( 1.0 - ( xx + zz ) ),
static_cast<float>( yz + wx ),
xy - wz,
1.0 - ( xx + zz ),
yz + wx,
0,
static_cast<float>( xz + wy ),
static_cast<float>( yz - wx ),
static_cast<float>( 1.0 - ( xx + yy ) ),
xz + wy,
yz - wx,
1.0 - ( xx + yy ),
0,
0,
0,
@@ -211,46 +211,46 @@ inline Matrix4 matrix4_rotation_for_quaternion_quantised( const Quaternion& quat
}
inline Quaternion quaternion_for_matrix4_rotation( const Matrix4& matrix4 ){
Matrix4 transposed = matrix4_transposed( matrix4 );
const Matrix4 transposed = matrix4_transposed( matrix4 );
double trace = transposed[0] + transposed[5] + transposed[10] + 1.0;
const double trace = transposed[0] + transposed[5] + transposed[10] + 1.0;
if ( trace > 0.0001 ) {
double S = 0.5 / sqrt( trace );
const double S = 0.5 / sqrt( trace );
return Quaternion(
static_cast<float>( ( transposed[9] - transposed[6] ) * S ),
static_cast<float>( ( transposed[2] - transposed[8] ) * S ),
static_cast<float>( ( transposed[4] - transposed[1] ) * S ),
static_cast<float>( 0.25 / S )
( transposed[9] - transposed[6] ) * S,
( transposed[2] - transposed[8] ) * S,
( transposed[4] - transposed[1] ) * S,
0.25 / S
);
}
if ( transposed[0] >= transposed[5] && transposed[0] >= transposed[10] ) {
double S = 2.0 * sqrt( 1.0 + transposed[0] - transposed[5] - transposed[10] );
const double S = 2.0 * sqrt( 1.0 + transposed[0] - transposed[5] - transposed[10] );
return Quaternion(
static_cast<float>( 0.25 / S ),
static_cast<float>( ( transposed[1] + transposed[4] ) / S ),
static_cast<float>( ( transposed[2] + transposed[8] ) / S ),
static_cast<float>( ( transposed[6] + transposed[9] ) / S )
0.25 / S,
( transposed[1] + transposed[4] ) / S,
( transposed[2] + transposed[8] ) / S,
( transposed[6] + transposed[9] ) / S
);
}
if ( transposed[5] >= transposed[0] && transposed[5] >= transposed[10] ) {
double S = 2.0 * sqrt( 1.0 + transposed[5] - transposed[0] - transposed[10] );
const double S = 2.0 * sqrt( 1.0 + transposed[5] - transposed[0] - transposed[10] );
return Quaternion(
static_cast<float>( ( transposed[1] + transposed[4] ) / S ),
static_cast<float>( 0.25 / S ),
static_cast<float>( ( transposed[6] + transposed[9] ) / S ),
static_cast<float>( ( transposed[2] + transposed[8] ) / S )
( transposed[1] + transposed[4] ) / S,
0.25 / S,
( transposed[6] + transposed[9] ) / S,
( transposed[2] + transposed[8] ) / S
);
}
double S = 2.0 * sqrt( 1.0 + transposed[10] - transposed[0] - transposed[5] );
const double S = 2.0 * sqrt( 1.0 + transposed[10] - transposed[0] - transposed[5] );
return Quaternion(
static_cast<float>( ( transposed[2] + transposed[8] ) / S ),
static_cast<float>( ( transposed[6] + transposed[9] ) / S ),
static_cast<float>( 0.25 / S ),
static_cast<float>( ( transposed[1] + transposed[4] ) / S )
( transposed[2] + transposed[8] ) / S,
( transposed[6] + transposed[9] ) / S,
0.25 / S,
( transposed[1] + transposed[4] ) / S
);
}
@@ -274,22 +274,22 @@ inline void matrix4_pivoted_rotate_by_quaternion( Matrix4& self, const Quaternio
}
inline Vector3 quaternion_transformed_point( const Quaternion& quaternion, const Vector3& point ){
double xx = quaternion.x() * quaternion.x();
double yy = quaternion.y() * quaternion.y();
double zz = quaternion.z() * quaternion.z();
double ww = quaternion.w() * quaternion.w();
const double xx = quaternion.x() * quaternion.x();
const double yy = quaternion.y() * quaternion.y();
const double zz = quaternion.z() * quaternion.z();
const double ww = quaternion.w() * quaternion.w();
double xy2 = quaternion.x() * quaternion.y() * 2;
double xz2 = quaternion.x() * quaternion.z() * 2;
double xw2 = quaternion.x() * quaternion.w() * 2;
double yz2 = quaternion.y() * quaternion.z() * 2;
double yw2 = quaternion.y() * quaternion.w() * 2;
double zw2 = quaternion.z() * quaternion.w() * 2;
const double xy2 = quaternion.x() * quaternion.y() * 2;
const double xz2 = quaternion.x() * quaternion.z() * 2;
const double xw2 = quaternion.x() * quaternion.w() * 2;
const double yz2 = quaternion.y() * quaternion.z() * 2;
const double yw2 = quaternion.y() * quaternion.w() * 2;
const double zw2 = quaternion.z() * quaternion.w() * 2;
return Vector3(
static_cast<float>( ww * point.x() + yw2 * point.z() - zw2 * point.y() + xx * point.x() + xy2 * point.y() + xz2 * point.z() - zz * point.x() - yy * point.x() ),
static_cast<float>( xy2 * point.x() + yy * point.y() + yz2 * point.z() + zw2 * point.x() - zz * point.y() + ww * point.y() - xw2 * point.z() - xx * point.y() ),
static_cast<float>( xz2 * point.x() + yz2 * point.y() + zz * point.z() - yw2 * point.x() - yy * point.z() + xw2 * point.y() - xx * point.z() + ww * point.z() )
ww * point.x() + yw2 * point.z() - zw2 * point.y() + xx * point.x() + xy2 * point.y() + xz2 * point.z() - zz * point.x() - yy * point.x(),
xy2 * point.x() + yy * point.y() + yz2 * point.z() + zw2 * point.x() - zz * point.y() + ww * point.y() - xw2 * point.z() - xx * point.y(),
xz2 * point.x() + yz2 * point.y() + zz * point.z() - yw2 * point.x() - yy * point.z() + xw2 * point.y() - xx * point.z() + ww * point.z()
);
}
libs/math/vector.h
+3 -3
View File
@@ -545,9 +545,9 @@ inline void vector3_snap_to_zero( BasicVector3<Element>& self, const OtherElemen
inline Vector3 vector3_for_spherical( double theta, double phi ){
return Vector3(
static_cast<float>( cos( theta ) * cos( phi ) ),
static_cast<float>( sin( theta ) * cos( phi ) ),
static_cast<float>( sin( phi ) )
cos( theta ) * cos( phi ),
sin( theta ) * cos( phi ),
sin( phi )
);
}
libs/pivot.h
+3 -3
View File
@@ -139,9 +139,9 @@ inline void ConstructDevice2Object( Matrix4& device2object, const Matrix4& objec
//! S = ( Inverse(Object2Screen *post ScaleOf(Object2Screen) ) *post Object2Screen
inline void pivot_scale( Matrix4& scale, const Matrix4& pivot2screen ){
Matrix4 pre_scale( g_matrix4_identity );
pre_scale[0] = static_cast<float>( vector3_length( pivot2screen.x().vec3() ) );
pre_scale[5] = static_cast<float>( vector3_length( pivot2screen.y().vec3() ) );
pre_scale[10] = static_cast<float>( vector3_length( pivot2screen.z().vec3() ) );
pre_scale[0] = vector3_length( pivot2screen.x().vec3() );
pre_scale[5] = vector3_length( pivot2screen.y().vec3() );
pre_scale[10] = vector3_length( pivot2screen.z().vec3() );
scale = pivot2screen;
matrix4_multiply_by_matrix4( scale, pre_scale );
libs/profile/profile.cpp
+1 -1
View File
@@ -270,7 +270,7 @@ float profile_load_float( const char *filename, const char *section, const char
char value[1024];
if ( read_var( filename, section, key, value ) ) {
return static_cast<float>( atof( value ) );
return atof( value );
}
else{
return default_value;
libs/render.h
+5 -5
View File
@@ -676,9 +676,9 @@ inline spherical_t spherical_from_normal3f( const Normal3f& normal ){
inline Normal3f normal3f_from_spherical( const spherical_t& spherical ){
return Normal3f(
static_cast<float>( cos( spherical.longditude ) * sin( spherical.latitude ) ),
static_cast<float>( sin( spherical.longditude ) * sin( spherical.latitude ) ),
static_cast<float>( cos( spherical.latitude ) )
cos( spherical.longditude ) * sin( spherical.latitude ),
sin( spherical.longditude ) * sin( spherical.latitude ),
cos( spherical.latitude )
);
}
@@ -1045,8 +1045,8 @@ inline void draw_circle( const std::size_t segments, const float radius, PointVe
{
const double theta = increment * count;
x = static_cast<float>( radius * cos( theta ) );
y = static_cast<float>( radius * sin( theta ) );
x = radius * cos( theta );
y = radius * sin( theta );
}
remap_policy::set( j->vertex, y,-x, 0 );
libs/stringio.h
+1 -1
View File
@@ -30,7 +30,7 @@
#include "generic/callback.h"
inline float string_read_float( const char* string ){
return static_cast<float>( atof( string ) );
return atof( string );
}
inline int string_read_int( const char* string ){
plugins/entity/angle.h
+1 -1
View File
@@ -33,7 +33,7 @@ inline void default_angle( float& angle ){
angle = ANGLEKEY_IDENTITY;
}
inline void normalise_angle( float& angle ){
angle = static_cast<float>( float_mod( angle, 360.0 ) );
angle = float_mod( angle, 360.0 );
}
inline void read_angle( float& angle, const char* value ){
if ( !string_parse_float( value, angle ) ) {
plugins/entity/angles.h
+3 -3
View File
@@ -37,9 +37,9 @@ inline void default_angles( Vector3& angles ){
angles = ANGLESKEY_IDENTITY;
}
inline void normalise_angles( Vector3& angles ){
angles[0] = static_cast<float>( float_mod( angles[0], 360 ) );
angles[1] = static_cast<float>( float_mod( angles[1], 360 ) );
angles[2] = static_cast<float>( float_mod( angles[2], 360 ) );
angles[0] = float_mod( angles[0], 360 );
angles[1] = float_mod( angles[1], 360 );
angles[2] = float_mod( angles[2], 360 );
}
inline void read_angle( Vector3& angles, const char* value ){
if ( !string_parse_float( value, angles[2] ) ) {
plugins/entity/light.cpp
+13 -13
View File
@@ -179,7 +179,7 @@ void cartesian( const double Long, const double Lat, float cart[3] ) {
void sphere_construct_fill( Vector3 radiiPoints[SPHERE_FILL_POINTS] ){
float cart[3];
int k = 0;
const double step = c_pi / static_cast<double>( SPHERE_FILL_SIDES );
const double step = c_pi / SPHERE_FILL_SIDES;
radiiPoints[k++] = Vector3( 0.0, 0.0, -1.0 );
for( int i = 0; i < SPHERE_FILL_SIDES * 2; i += 2 ) {
@@ -408,40 +408,40 @@ void sphere_construct_wire( Vector3 radiiPoints[SPHERE_WIRE_POINTS] ){
for ( int i = 0; i < SPHERE_WIRE_SIDES; ++i )
{
double ds = sin( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
double dc = cos( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
const double ds = sin( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
const double dc = cos( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
radiiPoints[k++] =
Vector3(
static_cast<float>( dc ),
static_cast<float>( ds ),
dc,
ds,
0.f
);
}
for ( int i = 0; i < SPHERE_WIRE_SIDES; ++i )
{
double ds = sin( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
double dc = cos( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
const double ds = sin( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
const double dc = cos( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
radiiPoints[k++] =
Vector3(
static_cast<float>( dc ),
dc,
0.f,
static_cast<float>( ds )
ds
);
}
for ( int i = 0; i < SPHERE_WIRE_SIDES; ++i )
{
double ds = sin( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
double dc = cos( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
const double ds = sin( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
const double dc = cos( ( i * 2 * c_pi ) / SPHERE_WIRE_SIDES );
radiiPoints[k++] =
Vector3(
0.f,
static_cast<float>( dc ),
static_cast<float>( ds )
dc,
ds
);
}
}
radiant/brush.h
+3 -3
View File
@@ -218,9 +218,9 @@ inline void planepts_snap( PlanePoints& planepts, double snap ){
inline PointVertex pointvertex_for_planept( const DoubleVector3& point, const Colour4b& colour ){
return PointVertex(
Vertex3f(
static_cast<float>( point.x() ),
static_cast<float>( point.y() ),
static_cast<float>( point.z() )
point.x(),
point.y(),
point.z()
),
colour
);
radiant/brush_primit.cpp
+28 -28
View File
@@ -100,12 +100,12 @@ inline void Texdef_toTransform( const texdef_t& texdef, float width, float heigh
inverse_scale[1] = 1 / ( texdef.scale[1] * -height );
transform[12] = texdef.shift[0] / width;
transform[13] = -texdef.shift[1] / -height;
double c = cos( degrees_to_radians( -texdef.rotate ) );
double s = sin( degrees_to_radians( -texdef.rotate ) );
transform[0] = static_cast<float>( c * inverse_scale[0] );
transform[1] = static_cast<float>( s * inverse_scale[1] );
transform[4] = static_cast<float>( -s * inverse_scale[0] );
transform[5] = static_cast<float>( c * inverse_scale[1] );
const double c = cos( degrees_to_radians( -texdef.rotate ) );
const double s = sin( degrees_to_radians( -texdef.rotate ) );
transform[0] = c * inverse_scale[0];
transform[1] = s * inverse_scale[1];
transform[4] = -s * inverse_scale[0];
transform[5] = c * inverse_scale[1];
transform[2] = transform[3] = transform[6] = transform[7] = transform[8] = transform[9] = transform[11] = transform[14] = 0;
transform[10] = transform[15] = 1;
}
@@ -158,10 +158,10 @@ inline double arctangent_yx( double y, double x ){
}
inline void Texdef_fromTransform( texdef_t& texdef, float width, float height, const Matrix4& transform ){
texdef.scale[0] = static_cast<float>( ( 1.0 / vector2_length( Vector2( transform[0], transform[4] ) ) ) / width );
texdef.scale[1] = static_cast<float>( ( 1.0 / vector2_length( Vector2( transform[1], transform[5] ) ) ) / height );
texdef.scale[0] = ( 1.0 / vector2_length( Vector2( transform[0], transform[4] ) ) ) / width;
texdef.scale[1] = ( 1.0 / vector2_length( Vector2( transform[1], transform[5] ) ) ) / height;
texdef.rotate = static_cast<float>( -radians_to_degrees( arctangent_yx( -transform[4], transform[0] ) ) );
texdef.rotate = -radians_to_degrees( arctangent_yx( -transform[4], transform[0] ) );
if ( texdef.rotate == -180.0f ) {
texdef.rotate = 180.0f;
@@ -279,7 +279,7 @@ void Texdef_EmitTextureCoordinates( const TextureProjection& projection, std::si
Matrix4 local2tex;
Texdef_toTransform( projection, (float)width, (float)height, local2tex );
//globalOutputStream() << "texdef: " << static_cast<const Vector3&>( local2tex.x() ) << static_cast<const Vector3&>( local2tex.y() ) << '\n';
//globalOutputStream() << "texdef: " << local2tex.x().vec3() << local2tex.y().vec3() << '\n';
#if 0
{
@@ -295,7 +295,7 @@ void Texdef_EmitTextureCoordinates( const TextureProjection& projection, std::si
Matrix4 xyz2st;
// we don't care if it's not normalised...
Texdef_basisForNormal( projection, matrix4_transformed_direction( localToWorld, normal ), xyz2st );
//globalOutputStream() << "basis: " << static_cast<const Vector3&>( xyz2st.x() ) << static_cast<const Vector3&>( xyz2st.y() ) << static_cast<const Vector3&>( xyz2st.z() ) << '\n';
//globalOutputStream() << "basis: " << xyz2st.x().vec3() << xyz2st.y().vec3() << xyz2st.z().vec3() << '\n';
matrix4_multiply_by_matrix4( local2tex, xyz2st );
}
@@ -628,10 +628,10 @@ void ConvertTexMatWithQTexture( const brushprimit_texdef_t *texMat1, const qtext
void TexMatToFakeTexCoords( const brushprimit_texdef_t& bp_texdef, texdef_t& texdef ){
#if 0
texdef.scale[0] = static_cast<float>( 1.0 / vector2_length( Vector2( bp_texdef.coords[0][0], bp_texdef.coords[1][0] ) ) );
texdef.scale[1] = static_cast<float>( 1.0 / vector2_length( Vector2( bp_texdef.coords[0][1], bp_texdef.coords[1][1] ) ) );
texdef.scale[0] = 1.0 / vector2_length( Vector2( bp_texdef.coords[0][0], bp_texdef.coords[1][0] ) );
texdef.scale[1] = 1.0 / vector2_length( Vector2( bp_texdef.coords[0][1], bp_texdef.coords[1][1] ) );
texdef.rotate = -static_cast<float>( radians_to_degrees( arctangent_yx( bp_texdef.coords[1][0], bp_texdef.coords[0][0] ) ) );
texdef.rotate = -radians_to_degrees( arctangent_yx( bp_texdef.coords[1][0], bp_texdef.coords[0][0] ) );
texdef.shift[0] = -bp_texdef.coords[0][2];
texdef.shift[1] = bp_texdef.coords[1][2];
@@ -653,8 +653,8 @@ void TexMatToFakeTexCoords( const brushprimit_texdef_t& bp_texdef, texdef_t& tex
}
}
#else
texdef.scale[0] = static_cast<float>( 1.0 / vector2_length( Vector2( bp_texdef.coords[0][0], bp_texdef.coords[0][1] ) ) );
texdef.scale[1] = static_cast<float>( 1.0 / vector2_length( Vector2( bp_texdef.coords[1][0], bp_texdef.coords[1][1] ) ) );
texdef.scale[0] = 1.0 / vector2_length( Vector2( bp_texdef.coords[0][0], bp_texdef.coords[0][1] ) );
texdef.scale[1] = 1.0 / vector2_length( Vector2( bp_texdef.coords[1][0], bp_texdef.coords[1][1] ) );
if( bp_texdef.coords[0][0] < 0 ){
texdef.scale[0] = -texdef.scale[0];
}
@@ -662,12 +662,12 @@ void TexMatToFakeTexCoords( const brushprimit_texdef_t& bp_texdef, texdef_t& tex
texdef.scale[1] = -texdef.scale[1];
}
#if 1
texdef.rotate = static_cast<float>( radians_to_degrees( acos( vector2_normalised( Vector2( bp_texdef.coords[0][0], bp_texdef.coords[0][1] ) )[0] ) ) );
texdef.rotate = radians_to_degrees( acos( vector2_normalised( Vector2( bp_texdef.coords[0][0], bp_texdef.coords[0][1] ) )[0] ) );
if( bp_texdef.coords[0][1] > 0 ){
texdef.rotate = -texdef.rotate;
}
#else
texdef.rotate = static_cast<float>( radians_to_degrees( arctangent_yx( bp_texdef.coords[0][1], bp_texdef.coords[0][0] ) ) );
texdef.rotate = radians_to_degrees( arctangent_yx( bp_texdef.coords[0][1], bp_texdef.coords[0][0] ) );
#endif
texdef.shift[0] = -bp_texdef.coords[0][2];
texdef.shift[1] = bp_texdef.coords[1][2];
@@ -681,10 +681,10 @@ void FakeTexCoordsToTexMat( const texdef_t& texdef, brushprimit_texdef_t& bp_tex
double s = sin( r );
double x = 1.0f / texdef.scale[0];
double y = 1.0f / texdef.scale[1];
bp_texdef.coords[0][0] = static_cast<float>( x * c );
bp_texdef.coords[1][0] = static_cast<float>( x * s );
bp_texdef.coords[0][1] = static_cast<float>( y * -s );
bp_texdef.coords[1][1] = static_cast<float>( y * c );
bp_texdef.coords[0][0] = x * c;
bp_texdef.coords[1][0] = x * s;
bp_texdef.coords[0][1] = y * -s;
bp_texdef.coords[1][1] = y * c;
bp_texdef.coords[0][2] = -texdef.shift[0];
bp_texdef.coords[1][2] = texdef.shift[1];
// globalOutputStream() << "[ " << bp_texdef.coords[0][0] << ' ' << bp_texdef.coords[0][1] << " ][ " << bp_texdef.coords[1][0] << ' ' << bp_texdef.coords[1][1] << " ]\n";
@@ -2004,7 +2004,7 @@ void AP_from_BP( TextureProjection& projection, const Plane3& plane, std::size_t
return;
}
const Vector3 invariant( static_cast<Vector3>( plane.normal() * plane.dist() ) );
const Vector3 invariant( plane.normal() * plane.dist() );
Matrix4 local2tex;
Texdef_Construct_local2tex( projection, width, height, plane.normal(), local2tex );
@@ -2024,14 +2024,14 @@ void Valve220_from_BP( TextureProjection& projection, const Plane3& plane, std::
projection.m_texdef.scale[1] = 1.0 / ( vector2_length( Vector2( projection.m_brushprimit_texdef.coords[1][0], projection.m_brushprimit_texdef.coords[1][1] ) ) * (double)height );
projection.m_texdef.shift[0] = projection.m_brushprimit_texdef.coords[0][2] * (float)width;
projection.m_texdef.shift[1] = projection.m_brushprimit_texdef.coords[1][2] * (float)height;
projection.m_texdef.rotate = static_cast<float>( -radians_to_degrees( arctangent_yx( projection.m_brushprimit_texdef.coords[0][1], projection.m_brushprimit_texdef.coords[0][0] ) ) );
projection.m_texdef.rotate = -radians_to_degrees( arctangent_yx( projection.m_brushprimit_texdef.coords[0][1], projection.m_brushprimit_texdef.coords[0][0] ) );
if( projection.m_brushprimit_texdef.coords[0][0] * projection.m_brushprimit_texdef.coords[1][1] < 0 )
projection.m_texdef.rotate = -projection.m_texdef.rotate;
DoubleVector3 texX, texY;
ComputeAxisBase( plane.normal(), texX, texY );
projection.m_basis_s = vector3_normalised( texX * static_cast<double>( projection.m_brushprimit_texdef.coords[0][0] ) + texY * static_cast<double>( projection.m_brushprimit_texdef.coords[0][1] ) );
projection.m_basis_t = vector3_normalised( texX * static_cast<double>( projection.m_brushprimit_texdef.coords[1][0] ) + texY * static_cast<double>( projection.m_brushprimit_texdef.coords[1][1] ) );
projection.m_basis_s = vector3_normalised( texX * projection.m_brushprimit_texdef.coords[0][0] + texY * projection.m_brushprimit_texdef.coords[0][1] );
projection.m_basis_t = vector3_normalised( texX * projection.m_brushprimit_texdef.coords[1][0] + texY * projection.m_brushprimit_texdef.coords[1][1] );
#else
/* more reliable values this way */
DoubleVector3 texX, texY;
@@ -2044,8 +2044,8 @@ void Valve220_from_BP( TextureProjection& projection, const Plane3& plane, std::
projection.m_texdef.scale[1] = Texdef_getDefaultTextureScale();
return;
}
projection.m_basis_s = vector3_normalised( texX * static_cast<double>( projection.m_brushprimit_texdef.coords[0][0] ) + texY * static_cast<double>( projection.m_brushprimit_texdef.coords[0][1] ) );
projection.m_basis_t = vector3_normalised( texX * static_cast<double>( projection.m_brushprimit_texdef.coords[1][0] ) + texY * static_cast<double>( projection.m_brushprimit_texdef.coords[1][1] ) );
projection.m_basis_s = vector3_normalised( texX * projection.m_brushprimit_texdef.coords[0][0] + texY * projection.m_brushprimit_texdef.coords[0][1] );
projection.m_basis_t = vector3_normalised( texX * projection.m_brushprimit_texdef.coords[1][0] + texY * projection.m_brushprimit_texdef.coords[1][1] );
projection.m_brushprimit_texdef.removeScale( width, height );
TexMatToFakeTexCoords( projection.m_brushprimit_texdef, projection.m_texdef );
projection.m_texdef.shift[0] *= -1.f;
radiant/brushmodule.cpp
+1 -1
View File
@@ -166,7 +166,7 @@ void Brush_Construct( EBrushType type ){
g_texdef_default_scale = 0.5f;
const char* value = g_pGameDescription->getKeyValue( "default_scale" );
if ( !string_empty( value ) ) {
float scale = static_cast<float>( atof( value ) );
const float scale = atof( value );
if ( scale != 0 ) {
g_texdef_default_scale = scale;
}
radiant/brushxml.h
+11 -11
View File
@@ -29,21 +29,21 @@
inline void FaceTexdef_BP_importXML( FaceTexdef& texdef, const char* xmlContent ){
StringTokeniser content( xmlContent );
texdef.m_projection.m_brushprimit_texdef.coords[0][0] = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_brushprimit_texdef.coords[0][1] = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_brushprimit_texdef.coords[0][2] = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_brushprimit_texdef.coords[1][0] = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_brushprimit_texdef.coords[1][1] = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_brushprimit_texdef.coords[1][2] = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_brushprimit_texdef.coords[0][0] = atof( content.getToken() );
texdef.m_projection.m_brushprimit_texdef.coords[0][1] = atof( content.getToken() );
texdef.m_projection.m_brushprimit_texdef.coords[0][2] = atof( content.getToken() );
texdef.m_projection.m_brushprimit_texdef.coords[1][0] = atof( content.getToken() );
texdef.m_projection.m_brushprimit_texdef.coords[1][1] = atof( content.getToken() );
texdef.m_projection.m_brushprimit_texdef.coords[1][2] = atof( content.getToken() );
}
inline void FaceTexdef_importXML( FaceTexdef& texdef, const char* xmlContent ){
StringTokeniser content( xmlContent );
texdef.m_projection.m_texdef.shift[0] = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_texdef.shift[1] = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_texdef.rotate = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_texdef.scale[0] = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_texdef.scale[1] = static_cast<float>( atof( content.getToken() ) );
texdef.m_projection.m_texdef.shift[0] = atof( content.getToken() );
texdef.m_projection.m_texdef.shift[1] = atof( content.getToken() );
texdef.m_projection.m_texdef.rotate = atof( content.getToken() );
texdef.m_projection.m_texdef.scale[0] = atof( content.getToken() );
texdef.m_projection.m_texdef.scale[1] = atof( content.getToken() );
ASSERT_MESSAGE( texdef_sane( texdef.m_projection.m_texdef ), "FaceTexdef_importXML: bad texdef" );
}
radiant/camwindow.cpp
+10 -10
View File
@@ -267,7 +267,7 @@ const float camera_t::near_z = 1.f;
camera_draw_mode camera_t::draw_mode = cd_texture;
inline Matrix4 projection_for_camera( float near_z, float far_z, float fieldOfView, int width, int height ){
float half_width = static_cast<float>( near_z * tan( degrees_to_radians( fieldOfView * 0.5 ) ) );
float half_width = near_z * tan( degrees_to_radians( fieldOfView * 0.5 ) );
const bool swap = height > width;
if( swap )
std::swap( width, height );
@@ -329,8 +329,8 @@ void Camera_Move_updateAxes( camera_t& camera ){
double ya = degrees_to_radians( camera.angles[CAMERA_YAW] );
// the movement matrix is kept 2d
camera.forward[0] = static_cast<float>( cos( ya ) );
camera.forward[1] = static_cast<float>( sin( ya ) );
camera.forward[0] = cos( ya );
camera.forward[1] = sin( ya );
camera.forward[2] = 0;
camera.right[0] = camera.forward[1];
camera.right[1] = -camera.forward[0];
@@ -1217,7 +1217,7 @@ static void selection_button_release_freemove( QWidget* widget, const QMouseEven
}
void CamWnd::selection_motion_freemove( const MotionDeltaValues& delta ){
m_rightClickMove += sqrt( static_cast<double>( delta.x * delta.x + delta.y * delta.y ) );
m_rightClickMove += sqrt( delta.x * delta.x + delta.y * delta.y );
m_window_observer->incMouseMove( WindowVector( delta.x, delta.y ) );
m_window_observer->onMouseMotion( windowvector_for_widget_centre( m_gl_widget ), modifiers_for_state( delta.mouseMoveEvent.modifiers() ) );
}
@@ -1231,7 +1231,7 @@ void camera_orbit_scroll( camera_t& camera ){
float offset = vector3_length( camera.m_orbit_center - camera.m_orbit_initial_pos );
const int off = camera.m_orbit_offset;
if( off < 0 || off > 16 ){
offset -= offset * off / 8 * pow( 2.0f, static_cast<float>( off < 0 ? -off : off - 16 ) / 8.f );
offset -= offset * off / 8 * pow( 2.0f, ( off < 0 ? -off : off - 16 ) / 8.f );
}
else if( off == 8 ){
offset = std::min( 8.f, offset / 16.f ); //prevent zero offset, resulting in NAN viewvector in the next scroll step
@@ -2105,12 +2105,12 @@ void CamWnd::Cam_Draw(){
}
if ( g_camwindow_globals.m_showStats ) {
gl().glRasterPos3f( 1.0f, static_cast<float>( m_Camera.height ), 0.0f );
gl().glRasterPos3f( 1.0f, m_Camera.height, 0.0f );
extern const char* Renderer_GetStats( int frame2frame );
GlobalOpenGL().drawString( Renderer_GetStats( m_render_time.elapsed_msec() ) );
m_render_time.start();
gl().glRasterPos3f( 1.0f, static_cast<float>( m_Camera.height ) - GlobalOpenGL().m_font->getPixelHeight(), 0.0f );
gl().glRasterPos3f( 1.0f, m_Camera.height - GlobalOpenGL().m_font->getPixelHeight(), 0.0f );
extern const char* Cull_GetStats();
GlobalOpenGL().drawString( Cull_GetStats() );
}
@@ -2139,7 +2139,7 @@ void CamWnd::BenchMark(){
Vector3 angles;
angles[CAMERA_ROLL] = 0;
angles[CAMERA_PITCH] = 0;
angles[CAMERA_YAW] = static_cast<float>( i * ( 360.0 / 100.0 ) );
angles[CAMERA_YAW] = i * ( 360.0 / 100.0 );
Camera_setAngles( *this, angles );
}
globalOutputStream() << timer.elapsed_msec() << " milliseconds\n";
@@ -2150,7 +2150,7 @@ void GlobalCamera_ResetAngles(){
CamWnd& camwnd = *g_camwnd;
Vector3 angles;
angles[CAMERA_ROLL] = angles[CAMERA_PITCH] = 0;
angles[CAMERA_YAW] = static_cast<float>( 22.5 * floor( ( Camera_getAngles( camwnd )[CAMERA_YAW] + 11 ) / 22.5 ) );
angles[CAMERA_YAW] = 22.5 * floor( ( Camera_getAngles( camwnd )[CAMERA_YAW] + 11 ) / 22.5 );
Camera_setAngles( camwnd, angles );
}
@@ -2198,7 +2198,7 @@ Vector3 Camera_getFocusPos( camera_t& camera ){
const int off = camera.m_focus_offset;
if( off < 0 || off > 16 ){
offset -= offset * off / 8 * pow( 2.0f, static_cast<float>( off < 0 ? -off : off - 16 ) / 8.f );
offset -= offset * off / 8 * pow( 2.0f, ( off < 0 ? -off : off - 16 ) / 8.f );
}
else{
offset -= offset * off / 8;
radiant/modelwindow.cpp
+2 -2
View File
@@ -789,8 +789,8 @@ void ModelBrowser_render(){
Matrix4 m_projection;
m_projection[0] = 1.0f / static_cast<float>( W / 2.f );
m_projection[5] = 1.0f / static_cast<float>( H / 2.f );
m_projection[0] = 1.0f / ( W / 2.f );
m_projection[5] = 1.0f / ( H / 2.f );
m_projection[10] = 1.0f / ( 9999 );
m_projection[12] = 0.0f;
radiant/patch.cpp
+4 -4
View File
@@ -528,8 +528,8 @@ void Patch::ScaleTexture( float s, float t ){
void Patch::RotateTexture( float angle ){
undoSave();
const float s = static_cast<float>( sin( degrees_to_radians( angle ) ) );
const float c = static_cast<float>( cos( degrees_to_radians( angle ) ) );
const float s = sin( degrees_to_radians( angle ) );
const float c = cos( degrees_to_radians( angle ) );
for ( PatchControlIter i = m_ctrl.data(); i != m_ctrl.data() + m_ctrl.size(); ++i )
{
@@ -699,7 +699,7 @@ void Patch::NaturalTexture(){
{
PatchControl* pHeight = pWidth;
for ( std::size_t h = 0; h < m_height; ++h, pHeight += m_width )
pHeight->m_texcoord[0] = static_cast<float>( tex );
pHeight->m_texcoord[0] = tex;
}
if ( w + 1 == m_width ) {
@@ -732,7 +732,7 @@ void Patch::NaturalTexture(){
{
PatchControl* pWidth = pHeight;
for ( std::size_t w = 0; w < m_width; ++w, ++pWidth )
pWidth->m_texcoord[1] = static_cast<float>( tex );
pWidth->m_texcoord[1] = tex;
}
if ( h + 1 == m_height ) {
radiant/points.cpp
+2 -2
View File
@@ -178,8 +178,8 @@ void Pointfile_UpdateViews( CPointfile::const_iterator i ){
{
Vector3 dir( vector3_normalised( vector3_subtracted( *( ++i ), Camera_getOrigin( camwnd ) ) ) );
Vector3 angles( Camera_getAngles( camwnd ) );
angles[CAMERA_YAW] = static_cast<float>( radians_to_degrees( atan2( dir[1], dir[0] ) ) );
angles[CAMERA_PITCH] = static_cast<float>( radians_to_degrees( asin( dir[2] ) ) );
angles[CAMERA_YAW] = radians_to_degrees( atan2( dir[1], dir[0] ) );
angles[CAMERA_PITCH] = radians_to_degrees( asin( dir[2] ) );
Camera_setAngles( camwnd, angles );
}
}
radiant/selection.cpp
+26 -26
View File
@@ -143,10 +143,10 @@ inline Vector3 point_on_plane( const Plane3& plane, const Matrix4& object2device
//! a and b are unit vectors .. returns angle in radians
inline float angle_between( const Vector3& a, const Vector3& b ){
return static_cast<float>( 2.0 * atan2(
vector3_length( vector3_subtracted( a, b ) ),
vector3_length( vector3_added( a, b ) )
) );
return 2.0 * atan2(
vector3_length( vector3_subtracted( a, b ) ),
vector3_length( vector3_added( a, b ) )
);
}
@@ -180,7 +180,7 @@ inline float angle_for_axis( const Vector3& a, const Vector3& b, const Vector3&
}
inline float distance_for_axis( const Vector3& a, const Vector3& b, const Vector3& axis ){
return static_cast<float>( vector3_dot( b, axis ) - vector3_dot( a, axis ) );
return vector3_dot( b, axis ) - vector3_dot( a, axis );
}
@@ -1370,7 +1370,7 @@ enum clipcull_t
inline SelectionIntersection select_point_from_clipped( Vector4& clipped ){
return SelectionIntersection( clipped[2] / clipped[3], static_cast<float>( vector3_length_squared( Vector3( clipped[0] / clipped[3], clipped[1] / clipped[3], 0 ) ) ) );
return SelectionIntersection( clipped[2] / clipped[3], vector3_length_squared( Vector3( clipped[0] / clipped[3], clipped[1] / clipped[3], 0 ) ) );
}
void BestPoint( std::size_t count, Vector4 clipped[9], SelectionIntersection& best, clipcull_t cull, const Plane3* plane = 0 ){
@@ -1409,9 +1409,9 @@ void BestPoint( std::size_t count, Vector4 clipped[9], SelectionIntersection& be
for ( point_iterator_t previous = end - 1, current = normalised; current != end; previous = current, ++current )
{
Vector3 point = line_closest_point( Line( *previous, *current ), Vector3( 0, 0, 0 ) );
float depth = point.z();
const float depth = point.z();
point.z() = 0;
float distance = static_cast<float>( vector3_length_squared( point ) );
const float distance = vector3_length_squared( point );
if( plane->c == 0 ){
assign_if_closer( best, SelectionIntersection( depth, distance ) );
@@ -1421,10 +1421,10 @@ void BestPoint( std::size_t count, Vector4 clipped[9], SelectionIntersection& be
Ray( Vector3( 0, 0, 0 ), Vector3( 0, 0, 1 ) ),
*plane
) ) );
// globalOutputStream() << static_cast<float>( ray_distance_to_plane(
// globalOutputStream() << ray_distance_to_plane(
// Ray( Vector3( 0, 0, 0 ), Vector3( 0, 0, 1 ) ),
// plane
// ) ) << '\n';
// ) << '\n';
}
}
}
@@ -1920,8 +1920,8 @@ inline void draw_semicircle( const std::size_t segments, const float radius, Poi
{
const double theta = increment * count;
x = static_cast<float>( radius * cos( theta ) );
y = static_cast<float>( radius * sin( theta ) );
x = radius * cos( theta );
y = radius * sin( theta );
}
remap_policy::set( j->vertex, y,-x, 0 );
@@ -2234,11 +2234,11 @@ inline void draw_arrowhead( const std::size_t segments, const float length, Flat
{
FlatShadedVertex& point = vertices[i * 6 + 0];
VertexRemap::x( point.vertex ) = length - arrowhead_length;
VertexRemap::y( point.vertex ) = arrowhead_radius * static_cast<float>( cos( i * head_segment ) );
VertexRemap::z( point.vertex ) = arrowhead_radius * static_cast<float>( sin( i * head_segment ) );
VertexRemap::y( point.vertex ) = arrowhead_radius * cos( i * head_segment );
VertexRemap::z( point.vertex ) = arrowhead_radius * sin( i * head_segment );
NormalRemap::x( point.normal ) = arrowhead_radius / arrowhead_length;
NormalRemap::y( point.normal ) = static_cast<float>( cos( i * head_segment ) );
NormalRemap::z( point.normal ) = static_cast<float>( sin( i * head_segment ) );
NormalRemap::y( point.normal ) = cos( i * head_segment );
NormalRemap::z( point.normal ) = sin( i * head_segment );
}
{
FlatShadedVertex& point = vertices[i * 6 + 1];
@@ -2246,17 +2246,17 @@ inline void draw_arrowhead( const std::size_t segments, const float length, Flat
VertexRemap::y( point.vertex ) = 0;
VertexRemap::z( point.vertex ) = 0;
NormalRemap::x( point.normal ) = arrowhead_radius / arrowhead_length;
NormalRemap::y( point.normal ) = static_cast<float>( cos( ( i + 0.5 ) * head_segment ) );
NormalRemap::z( point.normal ) = static_cast<float>( sin( ( i + 0.5 ) * head_segment ) );
NormalRemap::y( point.normal ) = cos( ( i + 0.5 ) * head_segment );
NormalRemap::z( point.normal ) = sin( ( i + 0.5 ) * head_segment );
}
{
FlatShadedVertex& point = vertices[i * 6 + 2];
VertexRemap::x( point.vertex ) = length - arrowhead_length;
VertexRemap::y( point.vertex ) = arrowhead_radius * static_cast<float>( cos( ( i + 1 ) * head_segment ) );
VertexRemap::z( point.vertex ) = arrowhead_radius * static_cast<float>( sin( ( i + 1 ) * head_segment ) );
VertexRemap::y( point.vertex ) = arrowhead_radius * cos( ( i + 1 ) * head_segment );
VertexRemap::z( point.vertex ) = arrowhead_radius * sin( ( i + 1 ) * head_segment );
NormalRemap::x( point.normal ) = arrowhead_radius / arrowhead_length;
NormalRemap::y( point.normal ) = static_cast<float>( cos( ( i + 1 ) * head_segment ) );
NormalRemap::z( point.normal ) = static_cast<float>( sin( ( i + 1 ) * head_segment ) );
NormalRemap::y( point.normal ) = cos( ( i + 1 ) * head_segment );
NormalRemap::z( point.normal ) = sin( ( i + 1 ) * head_segment );
}
{
@@ -2271,8 +2271,8 @@ inline void draw_arrowhead( const std::size_t segments, const float length, Flat
{
FlatShadedVertex& point = vertices[i * 6 + 4];
VertexRemap::x( point.vertex ) = length - arrowhead_length;
VertexRemap::y( point.vertex ) = arrowhead_radius * static_cast<float>( cos( i * head_segment ) );
VertexRemap::z( point.vertex ) = arrowhead_radius * static_cast<float>( sin( i * head_segment ) );
VertexRemap::y( point.vertex ) = arrowhead_radius * cos( i * head_segment );
VertexRemap::z( point.vertex ) = arrowhead_radius * sin( i * head_segment );
NormalRemap::x( point.normal ) = -1;
NormalRemap::y( point.normal ) = 0;
NormalRemap::z( point.normal ) = 0;
@@ -2280,8 +2280,8 @@ inline void draw_arrowhead( const std::size_t segments, const float length, Flat
{
FlatShadedVertex& point = vertices[i * 6 + 5];
VertexRemap::x( point.vertex ) = length - arrowhead_length;
VertexRemap::y( point.vertex ) = arrowhead_radius * static_cast<float>( cos( ( i + 1 ) * head_segment ) );
VertexRemap::z( point.vertex ) = arrowhead_radius * static_cast<float>( sin( ( i + 1 ) * head_segment ) );
VertexRemap::y( point.vertex ) = arrowhead_radius * cos( ( i + 1 ) * head_segment );
VertexRemap::z( point.vertex ) = arrowhead_radius * sin( ( i + 1 ) * head_segment );
NormalRemap::x( point.normal ) = -1;
NormalRemap::y( point.normal ) = 0;
NormalRemap::z( point.normal ) = 0;
radiant/surfacedialog.cpp
+3 -3
View File
@@ -305,8 +305,8 @@ si_globals_t g_si_globals;
// For regular it's 0.5f (128 pixels cover 64 world units), for BP it's simply 1.0f
// see fenris #2810
void DoSnapTToGrid( float hscale, float vscale ){
g_si_globals.shift[0] = static_cast<float>( float_to_integer( static_cast<float>( GetGridSize() ) / hscale ) );
g_si_globals.shift[1] = static_cast<float>( float_to_integer( static_cast<float>( GetGridSize() ) / vscale ) );
g_si_globals.shift[0] = float_to_integer( GetGridSize() / hscale );
g_si_globals.shift[1] = float_to_integer( GetGridSize() / vscale );
getSurfaceInspector().queueDraw();
}
@@ -1072,7 +1072,7 @@ void SurfaceInspector::ApplyTexdef_VScale(){
void SurfaceInspector::ApplyTexdef_Rotation(){
const float value = m_rotateIncrement.m_spin->value();
const auto command = StringStream<64>( "textureProjectionSetSelected -rotation ", static_cast<float>( float_to_integer( value * 100.f ) ) / 100.f );
const auto command = StringStream<64>( "textureProjectionSetSelected -rotation ", float_to_integer( value * 100.f ) / 100.f );
UndoableCommand undo( command );
Select_SetTexdef( 0, 0, 0, 0, &value );
Patch_SetTexdef( 0, 0, 0, 0, &value );
radiant/textures.cpp
+3 -11
View File
@@ -134,23 +134,15 @@ bool g_TextureAnisotropy = true;
byte g_gammatable[256];
void ResampleGamma( float fGamma ){
int i, inf;
if ( fGamma == 1.0 ) {
for ( i = 0; i < 256; ++i )
for ( int i = 0; i < 256; ++i )
g_gammatable[i] = i;
}
else
{
for ( i = 0; i < 256; ++i )
for ( int i = 0; i < 256; ++i )
{
inf = (int)( 255 * pow( static_cast<double>( ( i + 0.5 ) / 255.5 ), static_cast<double>( fGamma ) ) + 0.5 );
if ( inf < 0 ) {
inf = 0;
}
if ( inf > 255 ) {
inf = 255;
}
g_gammatable[i] = inf;
g_gammatable[i] = std::clamp( (int)( 255 * pow( ( i + 0.5 ) / 255.5, fGamma ) + 0.5 ), 0, 255 );
}
}
}
radiant/xywindow.cpp
+5 -5
View File
@@ -646,7 +646,7 @@ void XYWnd_OrientCamera( XYWnd* xywnd, int x, int y, CamWnd& camwnd ){
const int nAngle = ( viewtype == XY ) ? CAMERA_YAW : CAMERA_PITCH;
if ( point[nDim2] || point[nDim1] ) {
Vector3 angles( Camera_getAngles( camwnd ) );
angles[nAngle] = static_cast<float>( radians_to_degrees( atan2( point[nDim2], point[nDim1] ) ) );
angles[nAngle] = radians_to_degrees( atan2( point[nDim2], point[nDim1] ) );
if( angles[CAMERA_YAW] < 0 )
angles[CAMERA_YAW] += 360;
if ( nAngle == CAMERA_PITCH ){
@@ -1585,9 +1585,9 @@ void XYWnd::DrawCameraIcon( const Vector3& origin, const Vector3& angles ){
gl().glEnd();
gl().glBegin( GL_LINE_STRIP );
gl().glVertex3f( x + static_cast<float>( fov * cos( a + c_pi / 4 ) ), y + static_cast<float>( fov * sin( a + c_pi / 4 ) ), 0 );
gl().glVertex3f( x + fov * cos( a + c_pi / 4 ), y + fov * sin( a + c_pi / 4 ), 0 );
gl().glVertex3f( x, y, 0 );
gl().glVertex3f( x + static_cast<float>( fov * cos( a - c_pi / 4 ) ), y + static_cast<float>( fov * sin( a - c_pi / 4 ) ), 0 );
gl().glVertex3f( x + fov * cos( a - c_pi / 4 ), y + fov * sin( a - c_pi / 4 ), 0 );
gl().glEnd();
}
@@ -1713,8 +1713,8 @@ private:
};
void XYWnd::updateProjection(){
m_projection[0] = 1.0f / static_cast<float>( m_nWidth / 2 );
m_projection[5] = 1.0f / static_cast<float>( m_nHeight / 2 );
m_projection[0] = 1.0f / ( m_nWidth / 2 );
m_projection[5] = 1.0f / ( m_nHeight / 2 );
m_projection[10] = 1.0f / ( g_MaxWorldCoord * m_fScale );
m_projection[12] = 0.0f;