big overhaul 2.4

objects/__obj_stanncam_manager/Create_0.gml

@@ -3,10 +3,14 @@ resolution_w = 0;
 resolution_h = 0;
 number_of_cams = 0;
 keep_aspect_ratio = true;
+gui_keep_aspect_ratio = true;
 
 resize_width = 0;
 resize_height = 0;
 
 __display_scale_x = 1;
 __display_scale_y = 1;
 draw_zones = false;
+
+__gui_res_w = 1;
+__gui_res_h = 1;

objects/obj_camera/Create_0.gml

@@ -1,8 +1,11 @@
 //camera
-stanncam_init(320, 180, 1920, 1080);
+stanncam_init(320, 180, 1280, 720, 640, 360);
 cam1 = new stanncam(obj_player.x, obj_player.y, global.game_w, global.game_h, 0, 0);
 cam1.follow = obj_player;
 
+cam1.bounds_w = 0;
+cam1.bounds_h = 0;
+
 cam2 = undefined;
 
 split_screen = false;
@@ -19,7 +22,8 @@ speed_mode = 1;
 
 game_res = 2;
 gui_hires = false;
-gui_res = 0;
+gui_res = 1;
+gui_hires_scale = 6; //how much bigger the hires font is than the pixel one
 
 resolutions = [
 	{w:400, h:400}, //1:1
@@ -30,3 +34,11 @@ resolutions = [
 	{w:1920, h:1080},
 	{w:2560, h:1440}
 ];
+
+gui_resolutions = [
+	{w:320, h:180}, //16:9
+	{w:640, h:360},
+	{w:1280, h:720}
+];
+
+stanncam_debug_set_draw_zones(true);

objects/obj_camera/Draw_0.gml

@@ -0,0 +1,3 @@
+var _x = cam1.get_mouse_x();
+var _y = cam1.get_mouse_y();
+draw_circle(_x, _y, 10, true);

objects/obj_camera/Draw_64.gml

@@ -95,3 +95,9 @@ if(pointer){
 		draw_sprite_ext(spr_arrow_small, 0, _arrow_x, _arrow_y, 1, 1, 180, -1, 1);
 	}
 }
+
+var _x = cam1.get_mouse_x();
+var _y = cam1.get_mouse_y();
+draw_set_color(c_red);
+draw_circle(cam1.room_to_gui_x(_x), cam1.room_to_gui_y(_y), 15, true);
+draw_set_color(c_white);

objects/obj_camera/Draw_77.gml

@@ -2,3 +2,9 @@ cam1.draw(0, 0);
 if(split_screen){
 	cam2.draw(global.game_w * 0.5, 0);
 }
+
+var _x = cam1.get_mouse_x();
+var _y = cam1.get_mouse_y();
+draw_set_color(c_green);
+draw_circle(cam1.room_to_display_x(_x), cam1.room_to_display_y(_y), 18, false);
+draw_set_color(c_white);

objects/obj_camera/Mouse_60.gml

@@ -1,4 +1,4 @@
 var _zoom_amount = cam1.zoom_amount;
-_zoom_amount -= 0.05;
+_zoom_amount -= 0.01;
 _zoom_amount = clamp(_zoom_amount, 0.1, 2);
-cam1.zoom(_zoom_amount, 0);
+cam1.zoom(_zoom_amount, 0);

objects/obj_camera/Mouse_61.gml

@@ -1,4 +1,4 @@
 var _zoom_amount = cam1.zoom_amount;
-_zoom_amount += 0.05;
+_zoom_amount += 0.01;
 _zoom_amount = clamp(_zoom_amount, 0.1, 2);
 cam1.zoom(_zoom_amount, 0);

objects/obj_camera/Step_0.gml

@@ -22,16 +22,6 @@ if(keyboard_check_pressed(vk_f5)){
 	}
 }
 
-//toggle hires gui
-if(keyboard_check_pressed(vk_alt)){
-	gui_hires = !gui_hires;
-	if(gui_hires){
-		stanncam_set_gui_resolution(1920, 1080);
-	} else {
-		stanncam_set_gui_resolution(global.game_w, global.game_h);
-	}
-}
-
 //moves camera to mouse press location
 if(mouse_check_button_pressed(mb_left)){
 	var _x = cam1.get_mouse_x();
@@ -40,8 +30,8 @@ if(mouse_check_button_pressed(mb_left)){
 	cam1.move(_x, _y, GAME_SPEED * 1);
 	alarm[0] = GAME_SPEED * 1.1;
 	pointer = true;
-	pointer_x = cam1.get_mouse_x();
-	pointer_y = cam1.get_mouse_y();
+	pointer_x = _x;
+	pointer_y = _y;
 }
 
 //toggle zoom in
@@ -126,10 +116,27 @@ if(keyboard_check_pressed(vk_f1))
 //switch gui resolutions
 if(keyboard_check_pressed(vk_f2)){
 	gui_res++
-	if(gui_res > 6) gui_res = 0;
-	var _gui_w = resolutions[gui_res].w;
-	var _gui_h = resolutions[gui_res].h;
-	stanncam_set_gui_resolution(_gui_w, _gui_h);
+	if(gui_res >= array_length(gui_resolutions)) gui_res = 0;
+	var _gui_w = gui_resolutions[gui_res].w;
+	var _gui_h = gui_resolutions[gui_res].h;
+	if(gui_hires){
+		stanncam_set_gui_resolution(_gui_w * gui_hires_scale, _gui_h * gui_hires_scale);
+	} else {
+		stanncam_set_gui_resolution(_gui_w, _gui_h);
+	}
+}
+
+//toggle hires gui
+if(keyboard_check_pressed(vk_alt)){
+	gui_hires = !gui_hires;
+
+	var _gui_w = gui_resolutions[gui_res].w;
+	var _gui_h = gui_resolutions[gui_res].h;
+	if(gui_hires){
+		stanncam_set_gui_resolution(_gui_w * gui_hires_scale, _gui_h * gui_hires_scale);
+	} else {
+		stanncam_set_gui_resolution(_gui_w, _gui_h);
+	}
 }
 
 //toggle keep aspect ratio

objects/obj_camera_pixel_grid/Create_0.gml

@@ -6,6 +6,7 @@ zoom_mode = 0;
 zoom_text = cam1.zoom_amount
 
 game_res = 0;
+
 resolutions = [
 	{w:400, h:400}, //1:1
 	{w:500, h:250}, //2:1

objects/obj_camera_pixel_grid/Draw_0.gml

@@ -0,0 +1,6 @@
+var _dx = cam1.get_mouse_x();
+var _dy = cam1.get_mouse_y();
+
+draw_set_color(c_red);
+draw_point(_dx, _dy);
+draw_set_color(c_white);

objects/obj_camera_pixel_grid/Draw_64.gml

@@ -1,3 +1,15 @@
+//draw circle over cursor pos
+
+var _dx = cam1.get_mouse_x();
+var _dy = cam1.get_mouse_y();
+var _size = 10;
+
+_dx = cam1.room_to_gui_x(_dx);
+_dy = cam1.room_to_gui_y(_dy);
+
+draw_line(_dx - _size, _dy, _dx + _size, _dy);
+draw_line(_dx, _dy - _size, _dx, _dy + _size);
+
 var _outline_width = 1;
 var _precision = 8;
 var _offset = 10;
@@ -37,9 +49,7 @@ switch (global.window_mode) {
 
 draw_text_outline(global.gui_w - 1, _offset * 3, "window mode: " + _window_mode_text + " [F4]", _outline_width, _precision);
 
-var mx = cam1.room_to_gui_x(cam1.get_mouse_x());
-var my = cam1.room_to_gui_y(cam1.get_mouse_y());
+var _mx = cam1.room_to_gui_x(cam1.get_mouse_x());
+var _my = cam1.room_to_gui_y(cam1.get_mouse_y());
 draw_set_halign(fa_left);
-draw_text(mx, my, $"{mx} {my}");
-
-
+draw_text(_mx, _my, $"{_mx} {_my}");

objects/obj_camera_pixel_grid/Draw_77.gml

@@ -1 +1,5 @@
-cam1.draw(0, 0);
+cam1.draw(0, 0);
+
+var _dx = cam1.room_to_display_x(cam1.get_mouse_x());
+var _dy = cam1.room_to_display_y(cam1.get_mouse_y());
+draw_circle(_dx, _dy, 10, false);

objects/obj_camera_pixel_grid/Step_0.gml

@@ -66,10 +66,10 @@ if(keyboard_check_pressed(vk_f4)){
 var _hinput = keyboard_check(vk_right) - keyboard_check(vk_left);
 var _vinput = keyboard_check(vk_down) - keyboard_check(vk_up);
 
-if(_hinput != 0) hspd += _hinput*acceleration_spd;
+if(_hinput != 0) hspd += _hinput * acceleration_spd;
 else hspd -= min(abs(hspd), deacceleration_spd) * sign(hspd);
 
-if(_vinput != 0) vspd += _vinput*acceleration_spd;
+if(_vinput != 0) vspd += _vinput * acceleration_spd;
 else vspd -= min(abs(vspd), deacceleration_spd) * sign(vspd);
 
 hspd = clamp(hspd, -max_spd, max_spd);

objects/obj_player/Create_0.gml

@@ -2,7 +2,7 @@
 hspd = 0;
 vspd = 0;
 
-spd = 1.5;
+spd = 1;
 
 anim_spd = sprite_get_speed(spr_player_moving);
 

objects/obj_player2/Step_0.gml

@@ -5,4 +5,4 @@ x += hspd;
 y += vspd;
 
 x = clamp(x, 0, room_width);
-y = clamp(y, 0, room_height);
+y = clamp(y, 0, room_height);