|
@ -317,7 +317,7 @@ void UpdateCamera(Camera *camera) |
|
|
if (cameraTargetDistance > CAMERA_FREE_DISTANCE_MAX_CLAMP) cameraTargetDistance = CAMERA_FREE_DISTANCE_MAX_CLAMP; |
|
|
if (cameraTargetDistance > CAMERA_FREE_DISTANCE_MAX_CLAMP) cameraTargetDistance = CAMERA_FREE_DISTANCE_MAX_CLAMP; |
|
|
} |
|
|
} |
|
|
// Camera looking down |
|
|
// Camera looking down |
|
|
// TODO: Review, weird comparisson of cameraTargetDistance == 120.0f? |
|
|
|
|
|
|
|
|
// TODO: Review, weird comparisson of cameraTargetDistance == 120.0f? |
|
|
else if ((camera->position.y > camera->target.y) && (cameraTargetDistance == CAMERA_FREE_DISTANCE_MAX_CLAMP) && (mouseWheelMove < 0)) |
|
|
else if ((camera->position.y > camera->target.y) && (cameraTargetDistance == CAMERA_FREE_DISTANCE_MAX_CLAMP) && (mouseWheelMove < 0)) |
|
|
{ |
|
|
{ |
|
|
camera->target.x += mouseWheelMove*(camera->target.x - camera->position.x)*CAMERA_MOUSE_SCROLL_SENSITIVITY/cameraTargetDistance; |
|
|
camera->target.x += mouseWheelMove*(camera->target.x - camera->position.x)*CAMERA_MOUSE_SCROLL_SENSITIVITY/cameraTargetDistance; |
|
@ -338,7 +338,7 @@ void UpdateCamera(Camera *camera) |
|
|
if (cameraTargetDistance < CAMERA_FREE_DISTANCE_MIN_CLAMP) cameraTargetDistance = CAMERA_FREE_DISTANCE_MIN_CLAMP; |
|
|
if (cameraTargetDistance < CAMERA_FREE_DISTANCE_MIN_CLAMP) cameraTargetDistance = CAMERA_FREE_DISTANCE_MIN_CLAMP; |
|
|
} |
|
|
} |
|
|
// Camera looking up |
|
|
// Camera looking up |
|
|
// TODO: Review, weird comparisson of cameraTargetDistance == 120.0f? |
|
|
|
|
|
|
|
|
// TODO: Review, weird comparisson of cameraTargetDistance == 120.0f? |
|
|
else if ((camera->position.y < camera->target.y) && (cameraTargetDistance == CAMERA_FREE_DISTANCE_MAX_CLAMP) && (mouseWheelMove < 0)) |
|
|
else if ((camera->position.y < camera->target.y) && (cameraTargetDistance == CAMERA_FREE_DISTANCE_MAX_CLAMP) && (mouseWheelMove < 0)) |
|
|
{ |
|
|
{ |
|
|
camera->target.x += mouseWheelMove*(camera->target.x - camera->position.x)*CAMERA_MOUSE_SCROLL_SENSITIVITY/cameraTargetDistance; |
|
|
camera->target.x += mouseWheelMove*(camera->target.x - camera->position.x)*CAMERA_MOUSE_SCROLL_SENSITIVITY/cameraTargetDistance; |
|
@ -410,7 +410,7 @@ void UpdateCamera(Camera *camera) |
|
|
|
|
|
|
|
|
} break; |
|
|
} break; |
|
|
case CAMERA_FIRST_PERSON: |
|
|
case CAMERA_FIRST_PERSON: |
|
|
{ |
|
|
|
|
|
|
|
|
{ |
|
|
camera->position.x += (sinf(cameraAngle.x)*direction[MOVE_BACK] - |
|
|
camera->position.x += (sinf(cameraAngle.x)*direction[MOVE_BACK] - |
|
|
sinf(cameraAngle.x)*direction[MOVE_FRONT] - |
|
|
sinf(cameraAngle.x)*direction[MOVE_FRONT] - |
|
|
cosf(cameraAngle.x)*direction[MOVE_LEFT] + |
|
|
cosf(cameraAngle.x)*direction[MOVE_LEFT] + |
|
@ -432,7 +432,7 @@ void UpdateCamera(Camera *camera) |
|
|
// Camera orientation calculation |
|
|
// Camera orientation calculation |
|
|
cameraAngle.x += (mousePositionDelta.x*-CAMERA_MOUSE_MOVE_SENSITIVITY); |
|
|
cameraAngle.x += (mousePositionDelta.x*-CAMERA_MOUSE_MOVE_SENSITIVITY); |
|
|
cameraAngle.y += (mousePositionDelta.y*-CAMERA_MOUSE_MOVE_SENSITIVITY); |
|
|
cameraAngle.y += (mousePositionDelta.y*-CAMERA_MOUSE_MOVE_SENSITIVITY); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Angle clamp |
|
|
// Angle clamp |
|
|
if (cameraAngle.y > CAMERA_FIRST_PERSON_MIN_CLAMP*DEG2RAD) cameraAngle.y = CAMERA_FIRST_PERSON_MIN_CLAMP*DEG2RAD; |
|
|
if (cameraAngle.y > CAMERA_FIRST_PERSON_MIN_CLAMP*DEG2RAD) cameraAngle.y = CAMERA_FIRST_PERSON_MIN_CLAMP*DEG2RAD; |
|
|
else if (cameraAngle.y < CAMERA_FIRST_PERSON_MAX_CLAMP*DEG2RAD) cameraAngle.y = CAMERA_FIRST_PERSON_MAX_CLAMP*DEG2RAD; |
|
|
else if (cameraAngle.y < CAMERA_FIRST_PERSON_MAX_CLAMP*DEG2RAD) cameraAngle.y = CAMERA_FIRST_PERSON_MAX_CLAMP*DEG2RAD; |
|
@ -441,7 +441,7 @@ void UpdateCamera(Camera *camera) |
|
|
camera->target.x = camera->position.x - sinf(cameraAngle.x)*CAMERA_FIRST_PERSON_FOCUS_DISTANCE; |
|
|
camera->target.x = camera->position.x - sinf(cameraAngle.x)*CAMERA_FIRST_PERSON_FOCUS_DISTANCE; |
|
|
camera->target.y = camera->position.y + sinf(cameraAngle.y)*CAMERA_FIRST_PERSON_FOCUS_DISTANCE; |
|
|
camera->target.y = camera->position.y + sinf(cameraAngle.y)*CAMERA_FIRST_PERSON_FOCUS_DISTANCE; |
|
|
camera->target.z = camera->position.z - cosf(cameraAngle.x)*CAMERA_FIRST_PERSON_FOCUS_DISTANCE; |
|
|
camera->target.z = camera->position.z - cosf(cameraAngle.x)*CAMERA_FIRST_PERSON_FOCUS_DISTANCE; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (isMoving) swingCounter++; |
|
|
if (isMoving) swingCounter++; |
|
|
|
|
|
|
|
|
// Camera position update |
|
|
// Camera position update |
|
@ -469,12 +469,11 @@ void UpdateCamera(Camera *camera) |
|
|
sinf(cameraAngle.x)*direction[MOVE_LEFT] - |
|
|
sinf(cameraAngle.x)*direction[MOVE_LEFT] - |
|
|
sinf(cameraAngle.x)*direction[MOVE_RIGHT])/PLAYER_MOVEMENT_SENSITIVITY; |
|
|
sinf(cameraAngle.x)*direction[MOVE_RIGHT])/PLAYER_MOVEMENT_SENSITIVITY; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Camera orientation calculation |
|
|
// Camera orientation calculation |
|
|
cameraAngle.x += (mousePositionDelta.x*-CAMERA_MOUSE_MOVE_SENSITIVITY); |
|
|
cameraAngle.x += (mousePositionDelta.x*-CAMERA_MOUSE_MOVE_SENSITIVITY); |
|
|
cameraAngle.y += (mousePositionDelta.y*-CAMERA_MOUSE_MOVE_SENSITIVITY); |
|
|
cameraAngle.y += (mousePositionDelta.y*-CAMERA_MOUSE_MOVE_SENSITIVITY); |
|
|
|
|
|
|
|
|
// Angle clamp |
|
|
|
|
|
|
|
|
// Angle clamp |
|
|
if (cameraAngle.y > CAMERA_THIRD_PERSON_MIN_CLAMP*DEG2RAD) cameraAngle.y = CAMERA_THIRD_PERSON_MIN_CLAMP*DEG2RAD; |
|
|
if (cameraAngle.y > CAMERA_THIRD_PERSON_MIN_CLAMP*DEG2RAD) cameraAngle.y = CAMERA_THIRD_PERSON_MIN_CLAMP*DEG2RAD; |
|
|
else if (cameraAngle.y < CAMERA_THIRD_PERSON_MAX_CLAMP*DEG2RAD) cameraAngle.y = CAMERA_THIRD_PERSON_MAX_CLAMP*DEG2RAD; |
|
|
else if (cameraAngle.y < CAMERA_THIRD_PERSON_MAX_CLAMP*DEG2RAD) cameraAngle.y = CAMERA_THIRD_PERSON_MAX_CLAMP*DEG2RAD; |
|
|
|
|
|
|
|
@ -484,14 +483,15 @@ void UpdateCamera(Camera *camera) |
|
|
// Camera distance clamp |
|
|
// Camera distance clamp |
|
|
if (cameraTargetDistance < CAMERA_THIRD_PERSON_DISTANCE_CLAMP) cameraTargetDistance = CAMERA_THIRD_PERSON_DISTANCE_CLAMP; |
|
|
if (cameraTargetDistance < CAMERA_THIRD_PERSON_DISTANCE_CLAMP) cameraTargetDistance = CAMERA_THIRD_PERSON_DISTANCE_CLAMP; |
|
|
|
|
|
|
|
|
// TODO: It seems camera->position is not correctly updated or some rounding issue makes the camera move straight to camera->target... |
|
|
|
|
|
camera->position.x = sinf(cameraAngle.x)*cameraTargetDistance*cosf(cameraAngle.y) + camera->target.x; |
|
|
|
|
|
if (cameraAngle.y <= 0.0f) camera->position.y = sinf(cameraAngle.y)*cameraTargetDistance*sinf(cameraAngle.y) + camera->target.y; |
|
|
|
|
|
else camera->position.y = -sinf(cameraAngle.y)*cameraTargetDistance*sinf(cameraAngle.y) + camera->target.y; |
|
|
|
|
|
camera->position.z = cosf(cameraAngle.x)*cameraTargetDistance*cosf(cameraAngle.y) + camera->target.z; |
|
|
|
|
|
|
|
|
// TODO: It seems camera->position is not correctly updated or some rounding issue makes the camera move straight to camera->target... |
|
|
|
|
|
camera->position.x = sinf(cameraAngle.x)*cameraTargetDistance*cosf(cameraAngle.y) + camera->target.x; |
|
|
|
|
|
if (cameraAngle.y <= 0.0f) camera->position.y = sinf(cameraAngle.y)*cameraTargetDistance*sinf(cameraAngle.y) + camera->target.y; |
|
|
|
|
|
else camera->position.y = -sinf(cameraAngle.y)*cameraTargetDistance*sinf(cameraAngle.y) + camera->target.y; |
|
|
|
|
|
camera->position.z = cosf(cameraAngle.x)*cameraTargetDistance*cosf(cameraAngle.y) + camera->target.z; |
|
|
|
|
|
|
|
|
} break; |
|
|
} break; |
|
|
default: break; |
|
|
default: break; |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Set camera pan key to combine with mouse movement (free camera) |
|
|
// Set camera pan key to combine with mouse movement (free camera) |
|
|