File tree Expand file tree Collapse file tree 3 files changed +12
-6
lines changed Expand file tree Collapse file tree 3 files changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -61,6 +61,8 @@ public class Rectangles extends PApplet {
6161 private GameObj rightWall ;
6262
6363 private boolean setup = false ;
64+ public static Object lock = new Object ();
65+
6466
6567
6668 public Rectangles (String game , boolean isServer ) {
@@ -148,6 +150,7 @@ public void settings() {
148150 }
149151
150152 public void setup () {
153+ synchronized (lock ) {
151154 background (0 );
152155 // Just set to be unreasonably high
153156 frameRate (1000 );
@@ -228,6 +231,7 @@ public void setup() {
228231 }
229232
230233 this .setup = true ;
234+ }
231235 }
232236
233237 public void draw () {
@@ -299,14 +303,15 @@ public void setPlayer(Player p) {
299303 public static void main (String [] args ) {
300304 String [] processingArgs = {"Rectangles" };
301305 Rectangles sketch ;
302- if (args .length > 1 ) {
303- sketch = new Rectangles (args [ 0 ]. toLowerCase () , args [1 ].toLowerCase ().equals ("server" ));
306+ if (args .length > 0 ) {
307+ sketch = new Rectangles ("rectangles" , args [0 ].toLowerCase ().equals ("server" ));
304308 } else {
305- sketch = new Rectangles (args [ 0 ]. toLowerCase () , false );
309+ sketch = new Rectangles ("rectangles" , false );
306310 }
307311 PApplet .runSketch (processingArgs , sketch );
308312 while (!sketch .isSetup ()) {
309- System .out .println ("Waiting..." );
313+ synchronized (lock ) {
314+ }
310315 }
311316 sketch .runLoop ();
312317 }
Original file line number Diff line number Diff line change @@ -37,5 +37,6 @@ function update(self, caller) {
3737 // Reset acceleration?
3838 if ( self . isGrav ( ) ) {
3939 self . resetAcceleration ( ) ;
40+ self . setVelocityX ( 0 ) ;
4041 }
4142}
Original file line number Diff line number Diff line change @@ -70,10 +70,10 @@ function event_input(self, e) {
7070 if ( e . getData ( ) . get ( "caller" ) . equals ( self . getUUID ( ) ) ) {
7171 switch ( e . getData ( ) . get ( "keyCode" ) ) {
7272 case 37 :
73- self . getPy ( ) . setAccelerationX ( - 5 ) ;
73+ self . getPy ( ) . setVelocityX ( - 10 ) ;
7474 break ;
7575 case 39 :
76- self . getPy ( ) . setAccelerationX ( 5 ) ;
76+ self . getPy ( ) . setVelocityX ( 10 ) ;
7777 break ;
7878 case 32 :
7979 self . getPy ( ) . setAccelerationY ( - 20 ) ;
You can’t perform that action at this time.
0 commit comments