Warwick/c-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some inconsistencies that broke rotation and rendering

Browse source
This commit is contained in:
Warwick 2025-08-18 15:11:42 +01:00
parent 199eeb4ee1
commit 966027815c
4 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shaders/vert.glsl
View file

@ -5,6 +5,6 @@ uniform mat4 MVP;
void main()
{
gl_Position = vec4(aPos.x, aPos.y, aPos.z, 1.0) * MVP;
gl_Position = MVP * vec4(aPos.x, aPos.y, aPos.z, 1.0);
}

30
src/camera.c
View file

@ -20,21 +20,21 @@ void camera_tick(Camera *camera) {
// Mouse input
SDL_GetRelativeMouseState(&mouse_x, &mouse_y);
camera->yaw += mouse_x * glm_rad(MOUSE_SENSITIVITY);
camera->pitch += mouse_y * glm_rad(MOUSE_SENSITIVITY);
camera->pitch -= mouse_y * glm_rad(MOUSE_SENSITIVITY);
// Restrict pitch
if (camera->pitch > 89.0f)
camera->pitch = 89.0f;
if (camera->pitch < -89.0f)
camera->pitch = -89.0f;
if (camera->pitch > glm_rad(89.0f))
camera->pitch = glm_rad(89.0f);
if (camera->pitch < glm_rad(-89.0f))
camera->pitch = glm_rad(-89.0f);
// Camera Direction
camera->forward[0] = cos(camera->yaw) * cos(camera->pitch);
camera->forward[1] = sin(camera->pitch);
camera->forward[2] = sin(camera->yaw) * cos(camera->pitch);
camera->forward[0] = cosf(camera->yaw) * cosf(camera->pitch);
camera->forward[1] = sinf(camera->pitch);
camera->forward[2] = sinf(camera->yaw) * cosf(camera->pitch);
glm_normalize(camera->forward);
vec3 camera_right = GLM_VEC3_ZERO_INIT;
vec3 up = GLM_VEC3_ZERO_INIT;
up[2] = 1.0f;
vec3 camera_right;
vec3 up = {0.0f, 1.0f ,0.0f};
glm_cross(up, camera->forward, camera_right);
glm_normalize(camera_right);
@ -62,12 +62,11 @@ void camera_tick(Camera *camera) {
}
}
void calc_camera_mvp(mat4 *mvp_result, Camera *camera) {
void camera_calc_mvp(mat4 *mvp_result, Camera *camera) {
// Get position to look and up vector
vec3 camera_target;
glm_vec3_add(camera->position , camera->forward, camera_target);
vec3 up = GLM_VEC3_ZERO_INIT;
up[2] = 1.0f;
vec3 up = {0.0f, 1.0f ,0.0f};
mat4 model;
glm_mat4_identity(model);
@ -82,6 +81,5 @@ void calc_camera_mvp(mat4 *mvp_result, Camera *camera) {
float far = 100.0f;
glm_perspective(fov, aspect, near, far, projection);
glm_mat4_mul(model, view, *mvp_result);
glm_mat4_mul(*mvp_result, projection, *mvp_result);
glm_mat4_mulN((mat4*[]){&projection, &view, &model}, 3, *mvp_result);
}

2
src/camera.h
View file

@ -14,7 +14,7 @@ struct Camera_s {
typedef struct Camera_s Camera;
extern Camera Camera_default;
void calc_camera_mvp (mat4 *mvp_result, Camera *camera);
void camera_calc_mvp (mat4 *mvp_result, Camera *camera);
void get_camera_position (vec3 *position_result, Camera *camera);

15
src/main.c
View file

@ -1,10 +1,8 @@
#include <SDL3/SDL_init.h>
#include <SDL3/SDL_log.h>
#include <SDL3/SDL_render.h>
#include <SDL3/SDL_video.h>
#include <SDL3/SDL.h>
#include <GL/glew.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "camera.h"
#include "cglm/io.h"
@ -146,6 +144,11 @@ int main(int argc, char *argv[]) {
// Initialise camera
Camera camera = Camera_default;
// Lock and hide mouse to window
SDL_SetWindowRelativeMouseMode(window, true);
SDL_GetRelativeMouseState(NULL, NULL);
while (1) {
// handle input
@ -159,8 +162,8 @@ int main(int argc, char *argv[]) {
// TODO: make shader file
mat4 mvp;
calc_camera_mvp(&mvp, &camera);
glm_mat4_print(mvp,stdout);
camera_calc_mvp(&mvp, &camera);
//glm_mat4_print(mvp,stdout);
int mvp_uniform_location = glGetUniformLocation(shaderProgram, "MVP");
glUniformMatrix4fv(mvp_uniform_location, 1, GL_FALSE, &mvp[0][0]);