qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[renderer] Clean up SCR_UpdateScreen a little

Browse source 
SCR_UpdateScreen_Legacy now takes only the screen functions pointer (it
didn't need camera or realtime), and the camera sizzle code has been
moved into one place to make cleaning it up easier (when I get around to
auditing AngleVectors etc).
This commit is contained in:
Bill Currie 2023-07-11 11:41:14 +09:00
parent d848a73aee
commit 1b89598b28
4 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/QF/plugin/vid_render.h
View file

@ -87,8 +87,7 @@ typedef void (*capfunc_t) (struct tex_s *screencap, void *data);
typedef struct vid_render_funcs_s {
void (*init) (void);
void (*UpdateScreen) (struct transform_s camera, double realtime,
SCR_Func *scr_funcs);
void (*UpdateScreen) (SCR_Func *scr_funcs);
void (*Draw_CharBuffer) (int x, int y, struct draw_charbuffer_s *buffer);
void (*Draw_SetScale) (int scale);
void (*Draw_Character) (int x, int y, unsigned ch);

3
include/QF/screen.h
View file

@ -40,8 +40,7 @@ typedef void (*SCR_Func)(void);
// scr_funcs is a null terminated array
void SCR_UpdateScreen (struct transform_s camera, double realtime,
SCR_Func *scr_funcs);
void SCR_UpdateScreen_legacy (struct transform_s camera, double realtime,
SCR_Func *scr_funcs);
void SCR_UpdateScreen_legacy (SCR_Func *scr_funcs);
void SCR_SetFOV (float fov);
// control whether the 3d viewport is user-controlled or always fullscreen
void SCR_SetFullscreen (bool fullscreen);

41
libs/video/renderer/r_screen.c
View file

@ -190,6 +190,22 @@ render_scene (void)
r_funcs->draw_transparent ();
}
static void
swizzle_camera (refdef_t *refdef)
{
// FIXME pre-rotate the camera 90 degrees about the z axis such that the
// camera forward vector (camera Y) points along the world +X axis and the
// camera right vector (camera X) points along the world -Y axis. This
// should not be necessary here but is due to AngleVectors (and thus
// AngleQuat for compatibility) treating X as forward and Y as left (or -Y
// as right). Fixing this would take an audit of the usage of both, but is
// probably worthwhile in the long run.
refdef->frame.mat[0] = -refdef->camera[1];
refdef->frame.mat[1] = refdef->camera[0];
refdef->frame.mat[2] = refdef->camera[2];
refdef->frame.mat[3] = refdef->camera[3];
}
static void
render_side (int side)
{
@ -203,13 +219,8 @@ render_side (int side)
mat4ftranspose (rotinv, box_rotations[side]);
mmulf (r_refdef.camera_inverse, rotinv, camera_inverse);
//FIXME see fixme in r_screen.c
r_refdef.frame.mat[0] = -r_refdef.camera[1];
r_refdef.frame.mat[1] = r_refdef.camera[0];
r_refdef.frame.mat[2] = r_refdef.camera[2];
r_refdef.frame.mat[3] = r_refdef.camera[3];
refdef_t *refdef = r_data->refdef;
swizzle_camera (refdef);//FIXME see comment in swizzle_camera
R_SetFrustum (refdef->frustum, &refdef->frame, 90, 90);
r_funcs->bind_framebuffer (&fisheye_cube_map[side]);
@ -220,8 +231,7 @@ render_side (int side)
}
void
SCR_UpdateScreen_legacy (transform_t camera, double realtime,
SCR_Func *scr_funcs)
SCR_UpdateScreen_legacy (SCR_Func *scr_funcs)
{
if (scr_fisheye && !fisheye_cube_map) {
fisheye_cube_map = r_funcs->create_cube_map (r_data->vid->height);
@ -291,17 +301,8 @@ SCR_UpdateScreen (transform_t camera, double realtime, SCR_Func *scr_funcs)
mat4fidentity (refdef->camera_inverse);
}
// FIXME pre-rotate the camera 90 degrees about the z axis such that the
// camera forward vector (camera Y) points along the world +X axis and the
// camera right vector (camera X) points along the world -Y axis. This
// should not be necessary here but is due to AngleVectors (and thus
// AngleQuat for compatibility) treating X as forward and Y as left (or -Y
// as right). Fixing this would take an audit of the usage of both, but is
// probably worthwhile in the long run.
refdef->frame.mat[0] = -refdef->camera[1];
refdef->frame.mat[1] = refdef->camera[0];
refdef->frame.mat[2] = refdef->camera[2];
refdef->frame.mat[3] = refdef->camera[3];
swizzle_camera (refdef);//FIXME see comment in swizzle_camera
R_SetFrustum (refdef->frustum, &refdef->frame, fov_x, fov_y);
r_data->realtime = realtime;
@ -325,7 +326,7 @@ SCR_UpdateScreen (transform_t camera, double realtime, SCR_Func *scr_funcs)
}
r_framecount++;
R_PushDlights (vec3_origin, &r_visstate);
r_funcs->UpdateScreen (camera, realtime, scr_funcs);
r_funcs->UpdateScreen (scr_funcs);
}
static void

2
libs/video/renderer/vid_render_vulkan.c
View file

@ -340,7 +340,7 @@ vulkan_set_2d (int scaled)
}
static void
vulkan_UpdateScreen (transform_t camera, double realtime, SCR_Func *scr_funcs)
vulkan_UpdateScreen (SCR_Func *scr_funcs)
{
vulkan_set_2d (1);//FIXME
Vulkan_SetScrFuncs (scr_funcs, vulkan_ctx);