summaryrefslogtreecommitdiff
path: root/src/extend/camera.c
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2020-07-11 00:29:49 +0800
committerchai <chaifix@163.com>2020-07-11 00:29:49 +0800
commite849a07762a2feb3f124a08d50adeed52f085d5b (patch)
tree69207f80cf3372c6d5801d006966888f219e2a19 /src/extend/camera.c
parent44e6647ab365a9261c904be839e356c06a545907 (diff)
*加internal前缀
Diffstat (limited to 'src/extend/camera.c')
-rw-r--r--src/extend/camera.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/extend/camera.c b/src/extend/camera.c
index dd77172..2e66afc 100644
--- a/src/extend/camera.c
+++ b/src/extend/camera.c
@@ -40,8 +40,8 @@ Camera* camera_create(wog_Window* wnd, CameraConfig* config) {
// camera local = world
cam->transform.parent = NULL ;
cam->transform.localposition = config->position;
- cam->transform.localscale = vec3_make(1, 1, 1);
- quat_fromeuler(&config->euler, &cam->transform.localrotation);
+ cam->transform.localscale = internal_vec3_make(1, 1, 1);
+ internal_quat_fromeuler(&config->euler, &cam->transform.localrotation);
cam->near = config->near;
cam->far = config->far;
@@ -86,7 +86,7 @@ void camera_getprojmatrix(Camera* cam, Mat4* out) {
if (out)*out = cam->cached_proj_matrix;
return;
}
- mat4_setperspective(cam->fov, cam->aspect, cam->near, cam->far, &cam->cached_proj_matrix);
+ internal_mat4_setperspective(cam->fov, cam->aspect, cam->near, cam->far, &cam->cached_proj_matrix);
if(out) *out = cam->cached_proj_matrix;
cam->is_projdirty = FALSE;
}
@@ -94,9 +94,9 @@ void camera_getprojmatrix(Camera* cam, Mat4* out) {
static void _onwheelscroll(Camera* cam, int wheel, float dt) {
Quat rot; transform_getrotation(&cam->transform, &rot);
Vec3 forward = {0,0,-1};
- quat_applytovec3(&rot, &forward, &forward);
- vec3_scale(&forward, cam->zoom_speed * wheel * dt * (cam->speedup ? cam->speedupv : 1), &forward);
- vec3_plus(&forward, &cam->transform.localposition, &cam->transform.localposition);
+ internal_quat_applytovec3(&rot, &forward, &forward);
+ internal_vec3_scale(&forward, cam->zoom_speed * wheel * dt * (cam->speedup ? cam->speedupv : 1), &forward);
+ internal_vec3_plus(&forward, &cam->transform.localposition, &cam->transform.localposition);
cam->is_viewdirty = TRUE;
}
@@ -112,7 +112,7 @@ static void _onlookaround(Camera* cam,float dt) {
cam->euler.pitch -= angle.x;
cam->euler.yaw += angle.y;
//printf("%f %f\n", cam->euler.pitch, cam->euler.yaw);
- quat_fromeuler(&cam->euler, &cam->transform.localrotation);
+ internal_quat_fromeuler(&cam->euler, &cam->transform.localrotation);
cam->mouse_prev.x = x; cam->mouse_prev.y = y;
cam->is_viewdirty = TRUE;
}
@@ -124,9 +124,9 @@ static void _onmovearound(Camera* cam, float dt) {
Vec3 dd = { cam->mouse_prev.x - x, y - cam->mouse_prev.y , 0};
dd.x *= cam->move_sensitivity.x * dt * (cam->speedup ? cam->speedupv : 1);
dd.y *= cam->move_sensitivity.y * dt * (cam->speedup ? cam->speedupv : 1);
- quat_applytovec3(&cam->transform.localrotation, &dd, &dd);
+ internal_quat_applytovec3(&cam->transform.localrotation, &dd, &dd);
//printf("%f %f %f\n", dd.x, dd.y, dd.z);
- vec3_plus(&cam->transform.localposition, &dd, &cam->transform.localposition);
+ internal_vec3_plus(&cam->transform.localposition, &dd, &cam->transform.localposition);
cam->mouse_prev.x = x; cam->mouse_prev.y = y;
cam->is_viewdirty = TRUE;
}