Fix: Better scrollwheel on Windows

Author: kozec

share/default_profiles/Desktop.sccprofile

@@ -19,7 +19,7 @@
 	"gyro": {}, 
 
 	"pad_left": {
-		"action": "feedback(LEFT, 4096, 16, XY(mouse(Rels.REL_HWHEEL, 1.0), mouse(Rels.REL_WHEEL, 1.0)))"
+		"action": "feedback(LEFT, 4096, 16, ball(XY(mouse(REL_HWHEEL), mouse(REL_WHEEL))))"
 	},
 
 	"pad_right": {

src/actions/ball.c

@@ -197,8 +197,10 @@ static void whole(Action* a, Mapper* m, AxisValue x, AxisValue y, PadStickTrigge
 		double t = mono_time_d();
 		if (b->old_pos_set && m->was_touched(m, what)) {
 			double dt = t - b->last_time;
+			if (dt < 0.0075) return;
 			double dx = (double)(x - b->old_pos.x);
 			double dy = (double)(y - b->old_pos.y);
+			LOG("Added movement over %g", dt);
 			add(b, dx / dt, dy / dt);
 			if (b->child->extended.change != NULL) {
 				wholehaptic_change(&b->whdata, m, dx, dy);
@@ -272,7 +274,7 @@ static ActionOE ball_constructor(const char* keyword, ParameterList params) {
 	b->child = scc_parameter_as_action(params->items[6]);
 
 	size_t mean_len = scc_parameter_as_int(params->items[2]);
-	float fampli = scc_parameter_as_float(params->items[4]);
+	double fampli = scc_parameter_as_float(params->items[4]);
 	b->radscale = (b->degree * M_PI / 180.0) / fampli;
 	b->i = (2.0 * b->mass * (b->r * b->r)) / 5.0;
 	b->a = b->r * b->friction / b->i;
@@ -305,3 +307,4 @@ void scc_actions_init_ball() {
 			0.02, 65536, 40.0);
 	scc_action_register(KW_BALL, &ball_constructor);
 }
+

src/virtual-device/uinput-win32/winapi_device.c

@@ -11,8 +11,8 @@
 
 #define XSCALE 0.006
 #define YSCALE 0.006
-#define SCR_XSCALE 0.0005
-#define SCR_YSCALE 0.0005
+#define SCR_XSCALE 0.01
+#define SCR_YSCALE 0.01
 
 
 VirtualDevice* setup_winapi_device(VirtualDeviceType type, const VirtualDeviceSettings* settings) {