virtual keyboard now acts exactly like normal keyboard

Author: waxt0n

rcmds/Axis.pde

@@ -44,33 +44,33 @@ class Axis {
 
     //spring
     if (type == 1) {
-      data[variable] = 0;
+      data[variable] = min+max/2;
 
-      if (keyboardCtrl.isPressed(keyboardKey1)) {
-          data[variable] = min;
+      if (keyboardCtrl.isPressed(keyboardKey1)||virtualKeyboardButton.contains(keyboardKey1)) {
+        data[variable] = min;
       }
 
-      if (keyboardCtrl.isPressed(keyboardKey2)) {
-          data[variable] = max;
+      if (keyboardCtrl.isPressed(keyboardKey2)||virtualKeyboardButton.contains(keyboardKey2)) {
+        data[variable] = max;
       }
 
-      if (data[variable] == 0) {
+      if ((((!keyboardCtrl.isPressed(keyboardKey1)&&!virtualKeyboardButton.contains(keyboardKey1))||keyboardKey1==0)&&((!keyboardCtrl.isPressed(keyboardKey2)&&!virtualKeyboardButton.contains(keyboardKey2))||keyboardKey2==0))&&!gamepadAxis.equals(null)) {
         if (invert) {
-          data[variable] = (max-min)/2*-gamepadVal(gamepadAxis, data[variable])+(max+min)/2;
+          data[variable] = map(gamepadVal(gamepadAxis, data[variable]), 1, -1, min, max);
         } else {
-          data[variable] = (max-min)/2*gamepadVal(gamepadAxis, data[variable])+(max+min)/2;
+          data[variable] = map(gamepadVal(gamepadAxis, data[variable]), -1, 1, min, max);
         }
       }
     }
 
     //sticky
     if (type == 2) {      
-      if (keyboardCtrl.isPressed(int(keyboardKey1))) {
-          data[variable] -= step;
+      if (keyboardCtrl.isPressed(keyboardKey1)||virtualKeyboardButton.contains(keyboardKey1)) {
+        data[variable] -= step;
       }
 
-      if (keyboardCtrl.isPressed(int(keyboardKey2))) {
-          data[variable] += step;
+      if (keyboardCtrl.isPressed(keyboardKey2)||virtualKeyboardButton.contains(keyboardKey2)) {
+        data[variable] += step;
       }
 
       if (abs(gamepadVal(gamepadAxis, 0)) > 0.15) {
@@ -81,12 +81,7 @@ class Axis {
         }
       }
 
-      if (data[variable]>max) {
-        data[variable]=max;
-      }
-      if (data[variable]<min) {
-        data[variable]=min;
-      }
+      data[variable]=constrain(data[variable], min, max);
     }
 
     //more?

rcmds/UiButton.pde

@@ -36,15 +36,12 @@ class UIButton {
   }
   boolean runVar() {
     if (mousescreen.readPressed(mouseID)) {
-      virtualKeyboardButton.add(keyboardKey);
-      virtualGamepadButton.add(gamepadButton);
-    //} else {
-    //  if (virtualKeyboardButton.contains(keyboardKey)) {
-    //    virtualKeyboardButton.remove(keyboardKey);
-    //  }
-    //  if (virtualGamepadButton.contains(gamepadButton)) {
-    //    virtualGamepadButton.remove(gamepadButton);
-    //  }
+      if (keyboardKey!=0) {
+        virtualKeyboardButton.add(keyboardKey);
+      }
+      if (gamepadButton!=null) {
+        virtualGamepadButton.add(gamepadButton);
+      }
     }
 
     return true;

rcmds/data/bot2.txt

@@ -11,7 +11,7 @@ ping: ,var:ping;ip: ,var:ip;port: ,var:port;;0: ,var:0;1: ,var:1;2: ,var:2;3: ,v
 0,s,w,Y Axis,1,1,-1,1,true
 1,q,e,X Axis,1,1,-1,1,false
 2,a,d,X Rotation,1,1,-1,1,false
-4,g,t,Z Axis,2,0.03,-1,.75,true
+4,g,t,Z Axis,2,0.01,-1,.75,true
 
 v,Button 0,1,.7,.7,003366,004488,25
 f,Button 2,1,.7,.55,003366,004488,25

rcmds/data/bot3.txt

@@ -22,6 +22,8 @@ i,Button 3,1,.69,.35,002244,004488,25
 j,Button 1,1,.84,.65,004400,008800,25
 u,Button 5,1,.84,.35,004400,008800,25
 32,Button 4,2,.8125,.875,880000,FF0000,60
+h,,1,.8,.525,002244,004488,15
+y,,1,.8,.475,002244,004488,15
 
 
 2,0,.19,.6,888888,125

rcmds/data/test.txt

@@ -0,0 +1,26 @@
+Test template
+127.0.0.1
+25211
+ping: ,var:ping;ip: ,var:ip;port: ,var:port;Battery:; ,var:volt, volts;;0: ,var:0;1: ,var:1;2: ,var:2;3: ,var:3;4: ,var:4
+
+1,z,,1,-0.5,null,null,null
+
+0,s,w,Y Axis,1,0.003,-1,1,true
+1,a,d,X Axis,1,0.003,-1,1,false
+2,q,e,X Rotation,1,0.003,-1,1,false
+
+w,,1,.80,.53,000088,0000FF,30
+s,,1,.80,.65,000088,0000FF,30
+a,,1,.73,.65,000088,0000FF,30
+d,,1,.87,.65,000088,0000FF,30
+q,,1,.73,.53,008800,00FF00,30
+e,,1,.87,.53,008800,00FF00,30
+z,,1,.73,.77,880000,FF0000,30
+
+
+1,0,0.17,0.6,888888,100
+
+0,-1,1,.31,.6,FFFF00,1,20
+1,-1,1,.17,.84,FF00FF,2,20
+
+easter egg

rcmds/objects.pde

@@ -79,12 +79,12 @@ void runObjects () {
   for (int i=0; i<nums[2]; i++) {
     uibuttons.get(i).runVar();
   }
-  for (int i=0; i<nums[0]; i++) {
-    buttons.get(i).run();
-  }
   for (int i=0; i<nums[1]; i++) {
     axes.get(i).run();
   }
+  for (int i=0; i<nums[0]; i++) {
+    buttons.get(i).run();
+  }
   for (int i=0; i<nums[3]; i++) {
     uiindicators.get(i).runVar();
   }

rcmds/rcmds.pde

@@ -70,8 +70,6 @@ void draw() {
     }
 
     if (keyboardCtrl.justPressed(18)) {
-      println(keyboardCtrl.keys);
-      println(keyboardCtrl.oldKeys);
       if (fileExists(dataPath("setup.txt"))) {
         try {
           windowSetup("setup");