maths

mstop4 · mstop4 · commit 640d3318c5b3 · 2020-09-08T21:34:14.000-04:00
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_drawing_demo/Create_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_drawing_demo/Create_0.gml
@@ -1,5 +1,5 @@
 surf_circle = surface_create(256, 256);
 surf_curved = surface_create(256, 256);
 
-percentage = new ValueDelta(1, -0.01, 0, 1);
-alpha = new ValueDelta(1, -0.001, 0.25, 1);
+percentage = new ValueDelta(1, -0.01, 0, 1, VDLimitMode.CLAMP);
+alpha = new ValueDelta(1, -0.001, 0.25, 1, VDLimitMode.CLAMP);
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_math_demo/Create_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_math_demo/Create_0.gml
@@ -3,5 +3,5 @@ vec_B = new Vector2(-1, 2);
 vec_C = new Vector3(-2, 3, 4);
 vec_D = new Vector3(10, -5, 7);
 
-pulse_counter = new ValueDelta(0, 0.01, 0, 1);
+pulse_counter = new ValueDelta(0, 0.01, 0, 1, VDLimitMode.WRAP);
 pulse_t = 0;
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_math_demo/Draw_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_math_demo/Draw_0.gml
@@ -1,4 +1,5 @@
 draw_set_font(fnt_title);
+draw_set_valign(fa_top);
 draw_set_halign(fa_center);
 draw_set_colour(c_white);
 draw_text(room_width/2, 16, "Math Demo");
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_math_demo/Step_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_math_demo/Step_0.gml
@@ -1,6 +1,2 @@
 pulse_counter.update();
-pulse_t = pulse(pulse_counter.v, 0.5, 1);
-
-if (pulse_counter.v == 1) {
-	pulse_counter.v = 0;
-}
+pulse_t = pulse(pulse_counter.v, 0.5, 1);
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_soft_mover/Create_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_soft_mover/Create_0.gml
@@ -0,0 +1,7 @@
+actual_xpos = new ValueDelta(start_v, start_d, actual_min, actual_max, VDLimitMode.NONE);
+soft_clamp_xpos = start_v;
+soft_ceiling_xpos = start_v;
+soft_floor_xpos = start_v;
+clamp_xpos = start_v;
+min_xpos = start_v;
+max_xpos = start_v;
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_soft_mover/Draw_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_soft_mover/Draw_0.gml
@@ -0,0 +1,38 @@
+draw_set_color(c_white);
+draw_line(limit_min, y-16, limit_min, y+224);
+draw_line(limit_max, y-16, limit_max, y+224);
+
+draw_set_color(c_gray);
+draw_line(actual_min, y-16, actual_min, y+224);
+draw_line(actual_max, y-16, actual_max, y+224);
+
+draw_set_color(c_white);
+draw_set_font(fnt_demo);
+draw_set_valign(fa_center);
+draw_set_halign(fa_left);
+draw_text(16, y, "Raw");
+draw_circle(actual_xpos.v, y, 16, false);
+
+draw_set_color($8080FF);
+draw_text(16, y+48, "Soft Clamp");
+draw_circle(soft_clamp_xpos, y+48, 16, false);
+
+draw_set_color($80FFFF);
+draw_text(16, y+80, "Soft Ceiling");
+draw_circle(soft_ceiling_xpos, y+80, 16, false);
+
+draw_set_color($80FF80);
+draw_text(16, y+112, "Soft Floor");
+draw_circle(soft_floor_xpos, y+112, 16, false);
+
+draw_set_color($FFFF80);
+draw_text(16, y+160, "Clamp");
+draw_circle(clamp_xpos, y+160, 16, false);
+
+draw_set_color($FF8080);
+draw_text(16, y+192, "Min");
+draw_circle(min_xpos, y+192, 16, false);
+
+draw_set_color($FF80FF);
+draw_text(16, y+224, "Max");
+draw_circle(max_xpos, y+224, 16, false);
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_soft_mover/Step_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_soft_mover/Step_0.gml
@@ -0,0 +1,12 @@
+actual_xpos.update();
+
+if (actual_xpos.v <= actual_xpos.min_v || actual_xpos.v >= actual_xpos.max_v) {
+	actual_xpos.d *= -1;
+}
+
+soft_clamp_xpos = soft_clamp(actual_xpos.v, actual_xpos.d, limit_min, limit_max);
+soft_ceiling_xpos = soft_ceiling(actual_xpos.v, actual_xpos.d, limit_max);
+soft_floor_xpos = soft_floor(actual_xpos.v, actual_xpos.d, limit_min);
+clamp_xpos = clamp(actual_xpos.v, limit_min, limit_max);
+min_xpos = min(actual_xpos.v, limit_max);
+max_xpos = max(actual_xpos.v, limit_min);
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_soft_mover/obj_soft_mover.yy b/current-scripts/Demos/useful-scripts/objects/obj_soft_mover/obj_soft_mover.yy
diff --git a/current-scripts/Demos/useful-scripts/rooms/room_math_demo/room_math_demo.yy b/current-scripts/Demos/useful-scripts/rooms/room_math_demo/room_math_demo.yy
diff --git a/current-scripts/Demos/useful-scripts/scripts/math_functions/math_functions.gml b/current-scripts/Demos/useful-scripts/scripts/math_functions/math_functions.gml
@@ -70,13 +70,7 @@ function pulse(_t, _min, _max) {
 /// @param {real} delta     
 /// @param {real} max            
 function soft_ceiling(_value, _delta, _max) {
-	var _new_value = _value + _delta;
-	
-	if (_value > _max) {
-		return _new_value;
-	} else {
-		return min(_new_value, _max);
-	}
+	return _value > _max && _delta > 0 ? min(_value, _max) : _value + _delta;
 }
 
 
@@ -86,13 +80,7 @@ function soft_ceiling(_value, _delta, _max) {
 /// @param {real} delta     
 /// @param {real} min            
 function soft_floor(_value, _delta, _min) {
-	var _new_value = _value + _delta;
-	
-	if (_value < _min) {
-		return _new_value;
-	} else {
-		return max(_new_value, _min);
-	}
+	return _value < _min && _delta < 0 ? max(_value, _min) : _value + _delta;
 }
 
 
@@ -103,13 +91,7 @@ function soft_floor(_value, _delta, _min) {
 /// @param {real} min            
 /// @param {real} max            
 function soft_clamp(_value, _delta, _min, _max) {
-	var _new_value = _value + _delta;
-	
-	if (_value < _min || _value > _max) {
-		return _new_value;
-	} else {
-		return clamp(_new_value, _min, _max);
-	}
+	return (_value > _max && _delta > 0) || (_value < _min && _delta < 0) ? clamp(_value, _min, _max) : _value + _delta;
 }
 
 
@@ -119,7 +101,7 @@ function soft_clamp(_value, _delta, _min, _max) {
 /// @apara {real} min   
 /// @param {real} max   
 function wrap(_value, _min, _max) {
-	var _range = _max - _min + 1;
+	var _range = _max - _min;
 
 	if (_range + _min == 0) return 0;
 
diff --git a/current-scripts/Demos/useful-scripts/scripts/math_structs/math_structs.gml b/current-scripts/Demos/useful-scripts/scripts/math_structs/math_structs.gml
@@ -19,16 +19,62 @@ function Vector3(_x, _y, _z) constructor {
 	}
 }
 
-/// @func ValueDelta(value, delta, min_v, max_v)
-function ValueDelta(_value, _delta, _min_v, _max_v) constructor {
+enum VDLimitMode {
+	NONE,
+	CEILING,
+	FLOOR,
+	CLAMP,
+	SOFT_CEILING,
+	SOFT_FLOOR,
+	SOFT_CLAMP,
+	WRAP
+}
+
+/// @func ValueDelta(value, delta, min_v, max_v, clamp_mode)
+function ValueDelta(_value, _delta, _min_v, _max_v, _clamp_mode) constructor {
 	v = _value;
 	d = _delta;
 	min_v = _min_v;
 	max_v = _max_v;
+	clamp_mode = _clamp_mode;
 
 	static update = function() {
 		if (d != 0) {
-			v = clamp(v + d, min_v, max_v);
+			switch (clamp_mode) {
+				case VDLimitMode.NONE:
+					v += d;
+					break;
+					
+				case VDLimitMode.CEILING:
+					v = min(v + d, max_v);
+					break;
+					
+				case VDLimitMode.FLOOR:
+					v = max(v + d, min_v);
+					break;			
+					
+				case VDLimitMode.CLAMP:
+					v = clamp(v + d, min_v, max_v);
+					break;
+					
+				case VDLimitMode.SOFT_CEILING:
+					v = soft_ceiling(v, d, max_v);
+					break;
+					
+				case VDLimitMode.SOFT_FLOOR:
+					v = soft_floor(v, d, min_v);
+					break;			
+					
+				case VDLimitMode.SOFT_CLAMP:
+					v = soft_clamp(v, d, min_v, max_v);
+					break;
+					
+				case VDLimitMode.WRAP:
+					v = wrap(v + d, min_v, max_v);
+					
+				default:
+					v += d;
+			}
 		}
 	}
 }
diff --git a/current-scripts/Demos/useful-scripts/useful-scripts.yyp b/current-scripts/Demos/useful-scripts/useful-scripts.yyp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`draw_set_font(fnt_title);`
	`2`	`+draw_set_valign(fa_top);`
`2`	`3`	`draw_set_halign(fa_center);`
`3`	`4`	`draw_set_colour(c_white);`
`4`	`5`	`draw_text(room_width/2, 16, "Math Demo");`