qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 12:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/video/renderer/r_main.c

117 lines
3 KiB
C
Raw Normal View History

the rcsid commit from hell }:>
2001-09-28 06:26:31 +00:00
/*
#FILENAME#
#DESCRIPTION#
Copyright (C) 2001 #AUTHOR#
Author: #AUTHOR#
Date: #DATE#
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
gcc 3.0 compile fixes
2001-06-19 22:05:13 +00:00
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
re-arrange things so __attribute__ and __builtin_expect are properly autoconfiscated so rcsid will continue to work with gcc 3.3
2003-01-15 15:31:36 +00:00
gcc 3.0 compile fixes
2001-06-19 22:05:13 +00:00
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
fix the persistent fires. For sanity's sake, the non-renderer specific parts of gl_dyn_fires.c have been moved to r_main.c (for now).
2001-06-29 02:43:04 +00:00
#include "QF/cvar.h"
sw_rmain.c is now client and chase clean.
2001-05-20 20:38:51 +00:00
#include "QF/qtypes.h"
move dlight stuff out of cl_* into r_main.c. nq dlights seem to be broken, but that seems to have been from before this work
2001-05-20 05:42:52 +00:00
#include "QF/render.h"
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
#include "QF/sys.h"
move dlight stuff out of cl_* into r_main.c. nq dlights seem to be broken, but that seems to have been from before this work
2001-05-20 05:42:52 +00:00
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
#include "r_internal.h"
move dlight stuff out of cl_* into r_main.c. nq dlights seem to be broken, but that seems to have been from before this work
2001-05-20 05:42:52 +00:00
Nuke qboolean from orbit I never liked it, but with C2x coming out, it's best to handle bools properly. I haven't gone through all the uses of int as bool (I'll leave that for fixing when I encounter them), but this gets QF working with both c2x (really, gnu2x because of raw strings).
2023-06-13 09:06:11 +00:00
bool r_dowarp, r_dowarpold;
bool r_inhibit_viewmodel;
bool r_force_fullscreen;
bool r_paused;
sw_rmain.c is now client and chase clean.
2001-05-20 20:38:51 +00:00
double r_realtime;
FINALLY, the nq and qw renderers are merged. the view and particle subsystems are not yet merged due to their dependence on the client, but that will come soon.
2001-05-24 19:22:35 +00:00
double r_frametime;
[renderer] Get timegraph and zgraph working Only for sw and gl right now, but this sorts out the issues that prevented the graphs working at all.
2022-03-15 06:42:43 +00:00
double r_time1;
sw and gl rmisc are now client clean. the graphing functions ahve been pulled out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and {gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
int r_lineadj;
Nuke qboolean from orbit I never liked it, but with C2x coming out, it's best to handle bools properly. I haven't gone through all the uses of int as bool (I'll leave that for fixing when I encounter them), but this gets QF working with both c2x (really, gnu2x because of raw strings).
2023-06-13 09:06:11 +00:00
bool r_active;
Clean up global symbols for the gl renderer. Where possible, symbols have been made static, prefixed with gl_/GL_ or moved into the code shared by all renderers. This will make doing plugins easier but done now for link testing.
2012-02-17 09:33:07 +00:00
int r_init;
Remove VISIBLE from the files that will go into the plugins.
2012-02-18 13:28:42 +00:00
int r_framecount = 1; // so frame counts initialized to 0 don't match
Clean up global symbols for the gl renderer. Where possible, symbols have been made static, prefixed with gl_/GL_ or moved into the code shared by all renderers. This will make doing plugins easier but done now for link testing.
2012-02-17 09:33:07 +00:00
vec3_t modelorg; // modelorg is the viewpoint relative to
// the currently rendering entity
vec3_t base_modelorg;
[renderer] Move a couple functions to using vec4f_t Makes for a few less FIXMEs and better consistency with vectors.
2022-03-30 14:50:12 +00:00
vec4f_t r_entorigin; // the currently rendering entity in world
Clean up global symbols for the gl renderer. Where possible, symbols have been made static, prefixed with gl_/GL_ or moved into the code shared by all renderers. This will make doing plugins easier but done now for link testing.
2012-02-17 09:33:07 +00:00
// coordinates
// screen size info
Remove VISIBLE from the files that will go into the plugins.
2012-02-18 13:28:42 +00:00
refdef_t r_refdef;
Clean up global symbols for the gl renderer. Where possible, symbols have been made static, prefixed with gl_/GL_ or moved into the code shared by all renderers. This will make doing plugins easier but done now for link testing.
2012-02-17 09:33:07 +00:00
int d_lightstylevalue[256]; // 8.8 fraction of base light value
client.h gone from gl_rlight.c and sw_rlight.c. cl_lightstyle -> r_lightstyle
2001-05-21 03:08:07 +00:00
glColor cleanup
2001-08-30 18:24:19 +00:00
byte color_white[4] = { 255, 255, 255, 0 }; // alpha will be explicitly set
byte color_black[4] = { 0, 0, 0, 0 }; // alpha will be explicitly set
Call R_SetFrustum in all renderers. It turns out glsl, sw and sw32 weren't getting any benefit from R_CullBox because the frustum wasn't setup :P. Get another 8% out of bigass1 (174->184fps). bigass1 now runs 2x as fast as it did before I started this optimisation run :)
2012-07-03 06:57:33 +00:00
static inline int
SignbitsForPlane (plane_t *out)
{
int bits, j;
// for fast box on planeside test
bits = 0;
for (j = 0; j < 3; j++) {
if (out->normal[j] < 0)
bits |= 1 << j;
}
return bits;
}
void
[mathlib] Remove frustum global It should never have been there and is now in the refdef (not its final home: it should probably be part of the camera).
2022-03-19 03:33:12 +00:00
R_SetFrustum (plane_t *frustum, const refframe_t *frame,
float fov_x, float fov_y)
Call R_SetFrustum in all renderers. It turns out glsl, sw and sw32 weren't getting any benefit from R_CullBox because the frustum wasn't setup :P. Get another 8% out of bigass1 (174->184fps). bigass1 now runs 2x as fast as it did before I started this optimisation run :)
2012-07-03 06:57:33 +00:00
{
int i;
[renderer] Clean up R_SetFrustum The only global it touches now is frustum, and that needs fixing in mathlib (good grief, we (probably I) did some weird things when merging the code).
2022-03-19 01:06:38 +00:00
vec4f_t right = frame->right;
vec4f_t fwd = frame->forward;
vec4f_t up = frame->up;
fov_x = 90 - fov_x / 2;
fov_y = 90 - fov_y / 2;
[renderer] Clean up some stray vup etc Now vup, vfwd, vright names are restricted to only the software renderer (the only one that has such global variables).
2022-03-17 02:55:58 +00:00
// rotate FWD right by FOV_X/2 degrees
Update vec3_t/vec4f_t hacks to work with clang Still work with gcc, of course, and I still need to fix them properly, but now they're actually slightly easier to find as they all have vec_t and FIXME on the same line.
2022-03-30 15:07:20 +00:00
RotatePointAroundVector (frustum[0].normal, (vec_t*)&up, (vec_t*)&fwd, -fov_x);//FIXME
[renderer] Clean up some stray vup etc Now vup, vfwd, vright names are restricted to only the software renderer (the only one that has such global variables).
2022-03-17 02:55:58 +00:00
// rotate FWD left by FOV_X/2 degrees
Update vec3_t/vec4f_t hacks to work with clang Still work with gcc, of course, and I still need to fix them properly, but now they're actually slightly easier to find as they all have vec_t and FIXME on the same line.
2022-03-30 15:07:20 +00:00
RotatePointAroundVector (frustum[1].normal, (vec_t*)&up, (vec_t*)&fwd, fov_x);//FIXME
[renderer] Clean up some stray vup etc Now vup, vfwd, vright names are restricted to only the software renderer (the only one that has such global variables).
2022-03-17 02:55:58 +00:00
// rotate FWD up by FOV_Y/2 degrees
Update vec3_t/vec4f_t hacks to work with clang Still work with gcc, of course, and I still need to fix them properly, but now they're actually slightly easier to find as they all have vec_t and FIXME on the same line.
2022-03-30 15:07:20 +00:00
RotatePointAroundVector (frustum[2].normal, (vec_t*)&right, (vec_t*)&fwd, fov_y);//FIXME
[renderer] Clean up some stray vup etc Now vup, vfwd, vright names are restricted to only the software renderer (the only one that has such global variables).
2022-03-17 02:55:58 +00:00
// rotate FWD down by FOV_Y/2 degrees
Update vec3_t/vec4f_t hacks to work with clang Still work with gcc, of course, and I still need to fix them properly, but now they're actually slightly easier to find as they all have vec_t and FIXME on the same line.
2022-03-30 15:07:20 +00:00
RotatePointAroundVector (frustum[3].normal, (vec_t*)&right, (vec_t*)&fwd, -fov_y);//FIXME
Call R_SetFrustum in all renderers. It turns out glsl, sw and sw32 weren't getting any benefit from R_CullBox because the frustum wasn't setup :P. Get another 8% out of bigass1 (174->184fps). bigass1 now runs 2x as fast as it did before I started this optimisation run :)
2012-07-03 06:57:33 +00:00
[renderer] Clean up R_SetFrustum The only global it touches now is frustum, and that needs fixing in mathlib (good grief, we (probably I) did some weird things when merging the code).
2022-03-19 01:06:38 +00:00
vec4f_t origin = frame->position;
Call R_SetFrustum in all renderers. It turns out glsl, sw and sw32 weren't getting any benefit from R_CullBox because the frustum wasn't setup :P. Get another 8% out of bigass1 (174->184fps). bigass1 now runs 2x as fast as it did before I started this optimisation run :)
2012-07-03 06:57:33 +00:00
for (i = 0; i < 4; i++) {
frustum[i].type = PLANE_ANYZ;
[model] Move plane info into mnode_t, and visframe out The main goal was to get visframe out of mnode_t to make it thread-safe (each thread can have its own visframe array), but moving the plane info into mnode_t made for better data access patters when traversing the bsp tree as the plane is right there with the child indices. Nicely, the size of mnode_t is the same as before (64 bytes due to alignment), with 4 bytes wasted. Performance-wise, there seems to be very little difference. Maybe slightly slower. The unfortunate thing about the change is the plane distance is negated, possibly leading to some confusion, particularly since the box and sphere culling functions were affected. However, this is so point-plane distance calculations can be done with a single 4d dot product.
2022-05-22 02:18:32 +00:00
frustum[i].dist = -DotProduct (origin, frustum[i].normal);
Call R_SetFrustum in all renderers. It turns out glsl, sw and sw32 weren't getting any benefit from R_CullBox because the frustum wasn't setup :P. Get another 8% out of bigass1 (174->184fps). bigass1 now runs 2x as fast as it did before I started this optimisation run :)
2012-07-03 06:57:33 +00:00
frustum[i].signbits = SignbitsForPlane (&frustum[i]);
}
}
Reference in a new issue Copy permalink