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

245 lines
6.4 KiB
C
Raw Normal View History

split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
/*
gl_mod_sprite.c
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
sprite model rendering
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
Copyright (C) 1996-1997 Id Software, Inc.
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
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
minor cleanups
2001-12-21 21:52:03 +00:00
#include "QF/model.h"
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
#include "QF/render.h"
nuke Con_Printf and Con_DPrintf and use Sys_* instead
2007-11-06 10:17:14 +00:00
#include "QF/sys.h"
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
[scene] Rename libQFentity to libQFscene And start working on scene management.
2021-07-24 05:19:52 +00:00
#include "QF/scene/entity.h"
#include "QF/GL/defines.h"
#include "QF/GL/funcs.h"
[renderer] Remove namehack.h Finally. I never liked it (felt bad adding it in the first place), and it has caused confusion with function and global variable names, but it did let me get the render plugins working.
2022-03-14 05:31:23 +00:00
#include "QF/GL/qf_sprite.h"
[scene] Rename libQFentity to libQFscene And start working on scene management.
2021-07-24 05:19:52 +00:00
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
#include "compat.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 "r_internal.h"
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
#include "varrays.h"
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
static int sVAsize;
static int *sVAindices;
varray_t2f_c4ub_v3f_t *gl_spriteVertexArray;
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
void (*gl_R_DrawSpriteModel) (struct entity_s ent);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
static void
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
R_DrawSpriteModel_f (entity_t e)
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
{
[renderer] Tidy up entity component access Since entity_t has a pointer to the registry owning the entity, there's no need to access a global to get at the registry. Also move component getting closer to where it's used.
2022-10-25 03:53:30 +00:00
renderer_t *renderer = Ent_GetComponent (e.id, scene_renderer, e.reg);
msprite_t *sprite = renderer->model->cache.data;
Minor optimization.
2002-06-05 06:46:21 +00:00
float modelalpha, color[4];
[renderer] Merge sprite billboarding code As the sw renderer's implementation was the closest to id's, it was used as the model (thus a fair bit of cleanup is still needed). This fixes some incorrect implementations in glsl and gl.
2021-12-10 05:34:04 +00:00
vec4f_t cameravec = {};
vec4f_t up = {}, right = {}, pn = {};
[gl] Fix the compressed sprites Seems to be an ancient bug.
2021-03-10 09:35:35 +00:00
vec4f_t origin, point;
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
mspriteframe_t *frame;
[renderer] Tidy up entity component access Since entity_t has a pointer to the registry owning the entity, there's no need to access a global to get at the registry. Also move component getting closer to where it's used.
2022-10-25 03:53:30 +00:00
transform_t transform = Entity_Transform (e);
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
origin = Transform_GetWorldPosition (transform);
[renderer] Clean up use of vup/vright/vpn This moves the common camera setup code out of the individual drivers, and completely removes vup/vright/vpn from the non-software renderers. This has highlighted the craziness around AngleVectors with it putting +X forward, -Y right and +Z up. The main issue with this is it requires a 90 degree pre-rotation about the Z axis to get the camera pointing in the right direction, and that's for the native sw renderer (vulkan needs a 90 degree pre-rotation about X, and gl and glsl need to invert an axis, too), though at least it's just a matrix swizzle and vector negation. However, it does mean the camera matrices can't be used directly. Also rename vpn to vfwd (still abbreviated, but fwd is much clearer in meaning (to me, at least) than pn (plane normal, I guess, but which way?)).
2022-03-14 00:34:24 +00:00
cameravec = r_refdef.frame.position - origin;
[renderer] Merge sprite billboarding code As the sw renderer's implementation was the closest to id's, it was used as the model (thus a fair bit of cleanup is still needed). This fixes some incorrect implementations in glsl and gl.
2021-12-10 05:34:04 +00:00
Fix failure to free cache for non-shadowed stuff (lightning, grenades, etc). Also a minor speedup (only mess with glHints once per frame, instead of dozens of times).
2001-12-19 18:32:26 +00:00
// don't bother culling, it's just a single polygon without a surface cache
[renderer] Tidy up entity component access Since entity_t has a pointer to the registry owning the entity, there's no need to access a global to get at the registry. Also move component getting closer to where it's used.
2022-10-25 03:53:30 +00:00
animation_t *animation = Ent_GetComponent (e.id, scene_animation, e.reg);
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
frame = R_GetSpriteFrame (sprite, animation);
[renderer] Merge sprite billboarding code As the sw renderer's implementation was the closest to id's, it was used as the model (thus a fair bit of cleanup is still needed). This fixes some incorrect implementations in glsl and gl.
2021-12-10 05:34:04 +00:00
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
if (!R_BillboardFrame (transform, sprite->type, cameravec,
&up, &right, &pn)) {
[renderer] Merge sprite billboarding code As the sw renderer's implementation was the closest to id's, it was used as the model (thus a fair bit of cleanup is still needed). This fixes some incorrect implementations in glsl and gl.
2021-12-10 05:34:04 +00:00
// the orientation is undefined so can't draw the sprite
return;
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
}
Minor optimization.
2002-06-05 06:46:21 +00:00
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
VectorCopy (renderer->colormod, color);
modelalpha = color[3] = renderer->colormod[3];
Minor optimization.
2002-06-05 06:46:21 +00:00
if (modelalpha < 1.0)
qfglDepthMask (GL_FALSE);
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
qfglBindTexture (GL_TEXTURE_2D, frame->gl_texturenum);
qfglBegin (GL_QUADS);
Add QSG2 colormod, alpha, and scale for sprites. Probably not used by anything, but there you go.
2002-06-05 05:56:13 +00:00
qfglColor4fv (color);
[gl] Fix the compressed sprites Seems to be an ancient bug.
2021-03-10 09:35:35 +00:00
point = origin + frame->down * up + frame->left * right;
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
qfglTexCoord2f (0, 1);
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
qfglVertex3fv ((vec_t*)&point);//FIXME
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
[gl] Fix the compressed sprites Seems to be an ancient bug.
2021-03-10 09:35:35 +00:00
point = origin + frame->up * up + frame->left * right;
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
qfglTexCoord2f (0, 0);
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
qfglVertex3fv ((vec_t*)&point);//FIXME
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
[gl] Fix the compressed sprites Seems to be an ancient bug.
2021-03-10 09:35:35 +00:00
point = origin + frame->up * up + frame->right * right;
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
qfglTexCoord2f (1, 0);
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
qfglVertex3fv ((vec_t*)&point);//FIXME
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
[gl] Fix the compressed sprites Seems to be an ancient bug.
2021-03-10 09:35:35 +00:00
point = origin + frame->down * up + frame->right * right;
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
qfglTexCoord2f (1, 1);
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
qfglVertex3fv ((vec_t*)&point);//FIXME
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
qfglEnd ();
Minor optimization.
2002-06-05 06:46:21 +00:00
if (modelalpha < 1.0)
qfglDepthMask (GL_TRUE);
split the sprite and alias model rendering code out from gl_rmain.c into their own files.
2001-10-23 17:20:56 +00:00
}
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
static void
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
R_DrawSpriteModel_VA_f (entity_t e)
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
{
[renderer] Tidy up entity component access Since entity_t has a pointer to the registry owning the entity, there's no need to access a global to get at the registry. Also move component getting closer to where it's used.
2022-10-25 03:53:30 +00:00
renderer_t *renderer = Ent_GetComponent (e.id, scene_renderer, e.reg);
msprite_t *psprite = renderer->model->cache.data;
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
unsigned char modelalpha, color[4];
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
vec4f_t up = {}, right = {};
[gl] Fix the compressed sprites Seems to be an ancient bug.
2021-03-10 09:35:35 +00:00
vec4f_t origin, point;
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
int i;
// unsigned int vacount;
mspriteframe_t *frame;
varray_t2f_c4ub_v3f_t *VA;
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
VA = gl_spriteVertexArray; // FIXME: Despair
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
// don't bother culling, it's just a single polygon without a surface cache
[renderer] Tidy up entity component access Since entity_t has a pointer to the registry owning the entity, there's no need to access a global to get at the registry. Also move component getting closer to where it's used.
2022-10-25 03:53:30 +00:00
animation_t *animation = Ent_GetComponent (e.id, scene_animation, e.reg);
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
frame = R_GetSpriteFrame (psprite, animation);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
qfglBindTexture (GL_TEXTURE_2D, frame->gl_texturenum); // FIXME: DESPAIR
[renderer] Tidy up entity component access Since entity_t has a pointer to the registry owning the entity, there's no need to access a global to get at the registry. Also move component getting closer to where it's used.
2022-10-25 03:53:30 +00:00
transform_t transform = Entity_Transform (e);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
if (psprite->type == SPR_ORIENTED) { // bullet marks on walls
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
up = Transform_Up (transform);
right = Transform_Right (transform);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
} else if (psprite->type == SPR_VP_PARALLEL_UPRIGHT) {
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
up = (vec4f_t) { 0, 0, 1, 0 };
[renderer] Clean up use of vup/vright/vpn This moves the common camera setup code out of the individual drivers, and completely removes vup/vright/vpn from the non-software renderers. This has highlighted the craziness around AngleVectors with it putting +X forward, -Y right and +Z up. The main issue with this is it requires a 90 degree pre-rotation about the Z axis to get the camera pointing in the right direction, and that's for the native sw renderer (vulkan needs a 90 degree pre-rotation about X, and gl and glsl need to invert an axis, too), though at least it's just a matrix swizzle and vector negation. However, it does mean the camera matrices can't be used directly. Also rename vpn to vfwd (still abbreviated, but fwd is much clearer in meaning (to me, at least) than pn (plane normal, I guess, but which way?)).
2022-03-14 00:34:24 +00:00
VectorCopy (r_refdef.frame.right, right);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
} else { // normal sprite
[renderer] Clean up use of vup/vright/vpn This moves the common camera setup code out of the individual drivers, and completely removes vup/vright/vpn from the non-software renderers. This has highlighted the craziness around AngleVectors with it putting +X forward, -Y right and +Z up. The main issue with this is it requires a 90 degree pre-rotation about the Z axis to get the camera pointing in the right direction, and that's for the native sw renderer (vulkan needs a 90 degree pre-rotation about X, and gl and glsl need to invert an axis, too), though at least it's just a matrix swizzle and vector negation. However, it does mean the camera matrices can't be used directly. Also rename vpn to vfwd (still abbreviated, but fwd is much clearer in meaning (to me, at least) than pn (plane normal, I guess, but which way?)).
2022-03-14 00:34:24 +00:00
VectorCopy (r_refdef.frame.up, up);
VectorCopy (r_refdef.frame.right, right);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
}
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
for (i = 0; i < 4; i++) {
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
color[i] = renderer->colormod[i] * 255;
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
}
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
memcpy (VA[0].color, color, 4);
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
memcpy (VA[1].color, color, 4);
memcpy (VA[2].color, color, 4);
memcpy (VA[3].color, color, 4);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
modelalpha = color[3];
if (modelalpha < 255)
qfglDepthMask (GL_FALSE);
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
origin = Transform_GetWorldPosition (transform);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
[gl] Fix the compressed sprites Seems to be an ancient bug.
2021-03-10 09:35:35 +00:00
point = origin + frame->down * up + frame->left * right;
VectorCopy (point, VA[0].vertex);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
[gl] Fix the compressed sprites Seems to be an ancient bug.
2021-03-10 09:35:35 +00:00
point = origin + frame->up * up + frame->left * right;
VectorCopy (point, VA[1].vertex);
point = origin + frame->up * up + frame->right * right;
VectorCopy (point, VA[2].vertex);
point = origin + frame->down * up + frame->right * right;
VectorCopy (point, VA[3].vertex);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
// VA += 4;
// vacount += 4;
// if (vacount + 4 > sVAsize) {
// qfglDrawElements (GL_QUADS, vacount, GL_UNSIGNED_INT, sVAindices);
qfglDrawElements (GL_QUADS, 4, GL_UNSIGNED_INT, sVAindices);
// vacount = 0;
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
// VA = gl_spriteVertexArray;
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
// }
if (modelalpha < 255)
qfglDepthMask (GL_TRUE);
}
void
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
gl_R_InitSprites (void)
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
{
int i;
if (r_init) {
[gl] Fix the compressed sprites Seems to be an ancient bug.
2021-03-10 09:35:35 +00:00
if (gl_va_capable) {
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
gl_R_DrawSpriteModel = R_DrawSpriteModel_VA_f;
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
#if 0
if (vaelements > 3)
sVAsize = min (vaelements - (vaelements % 4), 512);
else
sVAsize = 512;
#else
sVAsize = 4;
#endif
[util] Make developer flag names easier to manage They're now an enum, and the flag part of the name is all lowercase, but now the flag definitions and names list will never get out of sync.
2021-03-29 10:58:00 +00:00
Sys_MaskPrintf (SYS_dev, "Sprites: %i maximum vertex elements.\n",
Rename Sys_DPrintf to Sys_MaskPrintf. We now have finer runtime control over what gets printed. Need to do a SYS_DEV audit, creating new masks as apropriate.
2010-11-23 05:09:30 +00:00
sVAsize);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
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
if (gl_spriteVertexArray)
free (gl_spriteVertexArray);
gl_spriteVertexArray = (varray_t2f_c4ub_v3f_t *)
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
calloc (sVAsize, sizeof (varray_t2f_c4ub_v3f_t));
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
qfglInterleavedArrays (GL_T2F_C4UB_V3F, 0, gl_spriteVertexArray);
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
if (sVAindices)
free (sVAindices);
sVAindices = (int *) calloc (sVAsize, sizeof (int));
for (i = 0; i < sVAsize; i++)
sVAindices[i] = i;
for (i = 0; i < sVAsize / 4; i++) {
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
gl_spriteVertexArray[i * 4].texcoord[0] = 0.0;
gl_spriteVertexArray[i * 4].texcoord[1] = 1.0;
gl_spriteVertexArray[i * 4 + 1].texcoord[0] = 0.0;
gl_spriteVertexArray[i * 4 + 1].texcoord[1] = 0.0;
gl_spriteVertexArray[i * 4 + 2].texcoord[0] = 1.0;
gl_spriteVertexArray[i * 4 + 2].texcoord[1] = 0.0;
gl_spriteVertexArray[i * 4 + 3].texcoord[0] = 1.0;
gl_spriteVertexArray[i * 4 + 3].texcoord[1] = 1.0;
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
}
} else {
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
gl_R_DrawSpriteModel = R_DrawSpriteModel_f;
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
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
if (gl_spriteVertexArray) {
free (gl_spriteVertexArray);
gl_spriteVertexArray = 0;
Make sprite rendering use vertex arrays, as a test for detection of vertex array support (tests only for OpenGL 1.1 or better, at the moment, no driver blacklist yet).
2003-03-20 19:58:18 +00:00
}
if (sVAindices) {
free (sVAindices);
sVAindices = 0;
}
}
}
}
Reference in a new issue Copy permalink