YourWishes/dusk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Matrices

Browse Source
This commit is contained in:
Dominic Masters
2025-08-18 19:18:55 -05:00
parent 38127d9260
commit bcb1616201
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/dusksdl2/display/camera/camera.c
View File

@@ -17,11 +17,15 @@ void cameraUIPush(void) {
glLoadIdentity(); glLoadIdentity();
glViewport(0, 0, RENDER_WIDTH, RENDER_HEIGHT); glViewport(0, 0, RENDER_WIDTH, RENDER_HEIGHT);
glOrtho(
mat4 ortho;
glm_ortho(
0.0f, (float_t)RENDER_WIDTH, 0.0f, (float_t)RENDER_WIDTH,
(float_t)RENDER_HEIGHT, 0.0f, (float_t)RENDER_HEIGHT, 0.0f,
-1.0f, 1.0f -1.0f, 1.0f,
ortho
); );
glLoadMatrixf((const GLfloat*)ortho);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
@@ -37,23 +41,27 @@ void cameraScreenPush(void) {
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
mat4 ortho;
#if RENDER_USE_FRAMEBUFFER #if RENDER_USE_FRAMEBUFFER
int32_t windowWidth, windowHeight; int32_t windowWidth, windowHeight;
SDL_GetWindowSize(RENDER_WINDOW, &windowWidth, &windowHeight); SDL_GetWindowSize(RENDER_WINDOW, &windowWidth, &windowHeight);
glViewport(0, 0, windowWidth, windowHeight); glViewport(0, 0, windowWidth, windowHeight);
glOrtho( glm_ortho(
0.0f, (float_t)windowWidth, 0.0f, (float_t) windowWidth,
(float_t)windowHeight, 0.0f, (float_t)windowHeight, 0.0f,
-1.0f, 1.0f -1.0f, 1.0f,
ortho
); );
#else #else
glOrtho( glm_ortho(
0.0f, (float_t)RENDER_WIDTH, 0.0f, (float_t)RENDER_WIDTH,
(float_t)RENDER_HEIGHT, 0.0f, (float_t)RENDER_HEIGHT, 0.0f,
-1.0f, 1.0f -1.0f, 1.0f,
ortho
); );
#endif #endif
glLoadMatrixf((const GLfloat*)ortho);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
@@ -66,7 +74,10 @@ void cameraScreenPop(void) {
void cameraOverworldPush(void) { void cameraOverworldPush(void) {
glPushMatrix(); glPushMatrix();
glLoadIdentity(); glLoadIdentity();
glViewport(0, 0, RENDER_WIDTH, RENDER_HEIGHT);
#if RENDER_USE_FRAMEBUFFER
glViewport(0, 0, RENDER_WIDTH, RENDER_HEIGHT);
#endif
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
@@ -107,18 +118,6 @@ void cameraOverworldPush(void) {
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
// glOrtho(
// 0.0f, (float_t)RENDER_WIDTH,
// (float_t)RENDER_HEIGHT, 0.0f,
// -1.0f, 1.0f
// );
// glTranslatef(
// -((float_t)OVERWORLD_CAMERA_X) + ((float_t)RENDER_WIDTH / 2.0f),
// -((float_t)OVERWORLD_CAMERA_Y) + ((float_t)RENDER_HEIGHT / 2.0f),
// 0.0f
// );
} }
void cameraOverworldPop(void) { void cameraOverworldPop(void) {