stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'undo_double' into 'master'

Browse source 
OpenGL cast to float, not store in double

See merge request STJr/SRB2Internal!617
This commit is contained in:
MascaraSnake 2019-12-06 14:28:41 -05:00
commit e105c2f749
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/hardware/r_opengl/r_opengl.c
View file

@ -1404,7 +1404,7 @@ EXPORT void HWRAPI(DrawPolygon) (FSurfaceInfo *pSurf,
typedef struct vbo_vertex_s typedef struct vbo_vertex_s
{ {
double x, y, z; float x, y, z;
float u, v; float u, v;
unsigned char r, g, b, a; unsigned char r, g, b, a;
} vbo_vertex_t; } vbo_vertex_t;
@ -1448,17 +1448,17 @@ static INT32 lasttex = -1;
static void SkyVertex(vbo_vertex_t *vbo, int r, int c) static void SkyVertex(vbo_vertex_t *vbo, int r, int c)
{ {
const double radians = (M_PIl / 180.0f); const float radians = (float)(M_PIl / 180.0f);
const double scale = 10000.0f; const float scale = 10000.0f;
const float maxSideAngle = 60.0f; const float maxSideAngle = 60.0f;
float topAngle = (c / (float)columns * 360.0f); float topAngle = (c / (float)columns * 360.0f);
float sideAngle = (maxSideAngle * (rows - r) / rows); float sideAngle = (maxSideAngle * (rows - r) / rows);
double height = sin(sideAngle * radians); float height = (float)(sin(sideAngle * radians));
double realRadius = scale * cos(sideAngle * radians); float realRadius = (float)(scale * cos(sideAngle * radians));
double x = realRadius * cos(topAngle * radians); float x = (float)(realRadius * cos(topAngle * radians));
double y = (!yflip) ? scale * height : -scale * height; float y = (!yflip) ? scale * height : -scale * height;
double z = realRadius * sin(topAngle * radians); float z = (float)(realRadius * sin(topAngle * radians));
float timesRepeat = (4 * (256.0f / texw)); float timesRepeat = (4 * (256.0f / texw));
if (fpclassify(timesRepeat) == FP_ZERO) if (fpclassify(timesRepeat) == FP_ZERO)
timesRepeat = 1.0f; timesRepeat = 1.0f;