Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-05 13:18:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Temp commit

Browse Source
This commit is contained in:
korenkonder
2022-07-06 14:13:11 +03:00
parent 8a0f0d4aa3
commit 935d7ffeb6
126 changed files with 6163 additions and 4157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/camera.cpp
+10 -18
View File
@@ -205,17 +205,17 @@ void camera::reset() {
update();
}
void camera::move(vec2d& move) {
if (memcmp(&move, &vec2d_null, sizeof(vec2d))) {
void camera::move(double_t move_x, double_t move_y) {
if (move_x != 0.0 || move_y != 0.0) {
vec3 temp;
vec3 view_point;
vec3 interest;
vec3 up = { 0.0f, 1.0f, 0.0f };
vec3_cross(forward, up, temp);
vec3_normalize(temp, temp);
vec3_mult_scalar(temp, (float_t)move.y, temp);
vec3_mult_scalar(temp, (float_t)move_y, temp);
vec3_add(this->view_point, temp, view_point);
vec3_mult_scalar(forward, (float_t)move.x, temp);
vec3_mult_scalar(forward, (float_t)move_x, temp);
vec3_add(view_point, temp, view_point);
vec3_add(view_point, forward, interest);
@@ -224,18 +224,14 @@ void camera::move(vec2d& move) {
}
}
void camera::move(vec2d&& move) {
this->move(*(vec2d*)&move);
}
void camera::rotate(double_t rotate_x, double_t rotate_y) {
if (rotate_x != 0.0)
set_yaw(get_yaw() + rotate_x);
void camera::rotate(vec2d& rotate) {
if (rotate.x != 0.0)
set_yaw(get_yaw() + rotate.x);
if (rotate_y != 0.0)
set_pitch(get_pitch() + rotate_y);
if (rotate.y != 0.0)
set_pitch(get_pitch() + rotate.y);
if (memcmp(&rotate, &vec2d_null, sizeof(vec2d))) {
if (rotate_x != 0.0 || rotate_y != 0.0) {
camera_calculate_forward(this);
vec3 interest;
@@ -244,10 +240,6 @@ void camera::rotate(vec2d& rotate) {
}
}
void camera::rotate(vec2d&& rotate) {
this->rotate(*(vec2d*)&rotate);
}
void camera::set(const vec3& view_point, const vec3& interest,
const vec3& trans, const vec3& rot, const vec3& scale, double_t roll, double_t fov) {
vec3 _vp;