Skip to content

Commit

Permalink
fixed camera controls in 3D views
Browse files Browse the repository at this point in the history
  • Loading branch information
DragoniteSpam committed Apr 18, 2021
1 parent bfd9463 commit 1c2bde8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions scripts/control_animator/control_animator.gml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ function control_animator(argument0) {
yspeed = yspeed + dcos(mode.direction) * mspd;
}
if (CONTROL_3D_LOOK) {
var camera_cx = view_get_xport(view_3d) + view_get_wport(view_3d) / 2;
var camera_cy = view_get_yport(view_3d) + view_get_hport(view_3d) / 2;
var camera_cx = (view_get_xport(view_3d) + view_get_wport(view_3d)) div 2;
var camera_cy = (view_get_yport(view_3d) + view_get_hport(view_3d)) div 2;
var dx = (mouse_x - camera_cx) / 16;
var dy = (mouse_y - camera_cy) / 16;
mode.direction = (360 + mode.direction - dx) % 360;
Expand Down
8 changes: 4 additions & 4 deletions scripts/control_map/control_map.gml
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ function control_map(mode) {
yspeed = yspeed + dcos(mode.direction) * mspd;
}
if (CONTROL_3D_LOOK) {
var camera_cx = view_get_xport(view_3d) + view_get_wport(view_3d) / 2;
var camera_cy = view_get_yport(view_3d) + view_get_hport(view_3d) / 2;
var camera_cx = view_get_xport(view_3d) + view_get_wport(view_3d) div 2;
var camera_cy = view_get_yport(view_3d) + view_get_hport(view_3d) div 2;
var dx = (mouse_x - camera_cx) / 16;
var dy = (mouse_y - camera_cy) / 16;
mode.direction = (360 + mode.direction - dx) % 360;
Expand Down Expand Up @@ -272,8 +272,8 @@ function control_map(mode) {
xspeed = xspeed + mspd;
}
if (CONTROL_3D_LOOK) {
var camera_cx = view_get_xport(view_3d) + view_get_wport(view_3d) / 2;
var camera_cy = view_get_yport(view_3d) + view_get_hport(view_3d) / 2;
var camera_cx = view_get_xport(view_3d) + view_get_wport(view_3d) div 2;
var camera_cy = view_get_yport(view_3d) + view_get_hport(view_3d) div 2;
xspeed = (mouse_x - camera_cx);
yspeed = (mouse_y - camera_cy);
window_mouse_set(camera_cx, camera_cy);
Expand Down
4 changes: 2 additions & 2 deletions scripts/control_terrain_3d/control_terrain_3d.gml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ function control_terrain_3d(terrain) {
yspeed = yspeed + dcos(Stuff.terrain.direction) * mspd;
}
if (CONTROL_3D_LOOK) {
var camera_cx = view_get_xport(view_3d) + view_get_wport(view_3d) / 2;
var camera_cy = view_get_yport(view_3d) + view_get_hport(view_3d) / 2;
var camera_cx = view_get_xport(view_3d) + view_get_wport(view_3d) div 2;
var camera_cy = view_get_yport(view_3d) + view_get_hport(view_3d) div 2;
var dx = (mouse_x - camera_cx) / 16;
var dy = (mouse_y - camera_cy) / 16;
Stuff.terrain.direction = (360 + Stuff.terrain.direction - dx) % 360;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ function ui_render_surface_control_map(surface, x1, y1, x2, y2) {
yspeed = yspeed + dcos(Stuff.event.direction) * mspd * Stuff.dt;
}
if (CONTROL_3D_LOOK) {
var camera_cx = view_get_xport(view_3d) + view_get_wport(view_3d) / 2;
var camera_cy = view_get_yport(view_3d) + view_get_hport(view_3d) / 2;
var camera_cx = view_get_xport(view_3d) + view_get_wport(view_3d) div 2;
var camera_cy = view_get_yport(view_3d) + view_get_hport(view_3d) div 2;
var dx = (mouse_x - camera_cx) / 16;
var dy = (mouse_y - camera_cy) / 16;
Stuff.event.direction = (360 + Stuff.event.direction - dx) % 360;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ function ui_render_surface_control_mesh_ed(surface, x1, y1, x2, y2) {
}

if (CONTROL_3D_LOOK) {
var camera_cx = x1 + (x2 - x1) / 2;
var camera_cy = y1 + (y2 - y1) / 2;
var camera_cx = x1 + (x2 - x1) div 2;
var camera_cy = y1 + (y2 - y1) div 2;
var dx = (mouse_x - camera_cx) / 16;
var dy = (mouse_y - camera_cy) / 16;
mode.direction = (360 + mode.direction - dx) % 360;
Expand Down

0 comments on commit 1c2bde8

Please sign in to comment.