Skip to content

Commit 597e442

Browse files
sworleyssworleys
committed
Rectangles scripting done
1 parent a60c84c commit 597e442

File tree

7 files changed

+35
-29
lines changed

7 files changed

+35
-29
lines changed

‎rectangles/engine/GameObj.java‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,27 @@ public void handleEvent(Event e) {
9292
}
9393

9494
public void raiseEvent(int type, long time, HashMap<String, Object> data) {
95-
if (time < 0) {
96-
time = Rectangles.globalTimeline.getCurrentTime()
97-
+ (long) Rectangles.eventTimeline.getTickSize();
98-
}
99-
if (type == Event.EVENT_PHYSICS) {
100-
time += (long) Rectangles.physicsTimeline.getTickSize();
101-
}
95+
// if (time < 0) {
96+
// time = Rectangles.globalTimeline.getCurrentTime()
97+
// + (long) Rectangles.eventTimeline.getTickSize();
98+
// }
99+
// if (type == Event.EVENT_PHYSICS) {
100+
// time += (long) Rectangles.physicsTimeline.getTickSize();
101+
// }
102102

103+
// for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
104+
// System.out.println(ste);
105+
// }
103106
Event e = new Event(type, time, data);
107+
if (!data.get("caller").equals(Rectangles.player.getUUID()) && e.getType() == Event.EVENT_PHYSICS) {
108+
//System.out.println("platform" + e.getTime());
109+
}
110+
if (data.get("caller").equals(Rectangles.player.getUUID()) && e.getType() == Event.EVENT_PHYSICS) {
111+
//System.out.println(e.getTime());
112+
}
113+
104114
Rectangles.eventManager.raiseEvent(e);
115+
//System.out.println(Rectangles.player.getUUID());
116+
//System.out.println(e.getData().get("caller") + " : " + e.getType() + " : " + e.getTime());
105117
}
106118
}

‎rectangles/engine/Rectangles.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ public void runLoop() {
9393
}
9494
HashMap<String, Object> data = new HashMap<>();
9595
data.put("caller", obj.getUUID());
96-
Event e = new Event(Event.EVENT_PHYSICS,
97-
globalTimeline.getCurrentTime() + (long) physicsTimeline.getTickSize(), data);
96+
Event e = new Event(Event.EVENT_PHYSICS, physicsTimeline.getCurrentTime(), data);
9897
eventManager.raiseEvent(e);
9998
}
10099

@@ -117,7 +116,6 @@ private void gameLoop(boolean delta) {
117116
if (delta) {
118117
if (this.isServer) {
119118
this.updateEvent(eventTimeline.resetDelta());
120-
// this.updatePhysics(physicsTimeline.getAndResetDelta());
121119
this.updateNetwork(networkTimeline.resetDelta());
122120
}
123121
this.updateRender(renderTimeline.resetDelta());
@@ -177,7 +175,6 @@ public void setup() {
177175
objects.add(this.rightWall);
178176
objectMap.put(this.rightWall.getUUID(), this.rightWall);
179177

180-
181178

182179
/**
183180
* Begin game definitions
@@ -206,7 +203,7 @@ public void setup() {
206203
/**
207204
* End game definitions
208205
*/
209-
206+
210207

211208
// Server
212209
this.server = new Server(this, 9200, Rectangles.threadPool, player);
@@ -295,9 +292,6 @@ public boolean isSetup() {
295292

296293
public void setPlayer(Player p) {
297294
player = p;
298-
objectMap.put(player.getUUID(), player);
299-
objects.add(player);
300-
movObjects.add(player);
301295
}
302296

303297
// API stuff from https://happycoding.io/tutorials/java/processing-in-java

‎rectangles/engine/events/EventManager.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,14 @@ public void raiseEvent(Event e) {
5454
@Override
5555
public void run() {
5656
Event next = this.eventQueue.poll();
57-
// System.out.println(next.getType() + " : " +
58-
// Rectangles.objectMap.get(next.getData().get("caller")).getType());
57+
//System.out.println(this.eventQueue.size());
58+
//System.out.println(next.getType() + " : " +
59+
//Rectangles.objectMap.get(next.getData().get("caller")).getType());
5960
// System.out.println(next.getData().getOrDefault("isReplay", false));
6061
if (next != null) {
62+
if (next.getType() == Event.EVENT_PHYSICS) {
63+
//System.out.println(this.registrar.get(next.getType()).size());
64+
}
6165
for (EngineObject handler : this.registrar.get(next.getType())) {
6266
handler.handleEvent(next);
6367
// Rectangles.threadPool.execute(handler.getReader(next));

‎rectangles/networking/Client.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ public Client(PApplet inst, ExecutorService threadPool, Player player) {
3939
this.inst = inst;
4040
this.threadPool = threadPool;
4141
this.player = player;
42-
Rectangles.objectMap.put(player.getUUID(), player);
43-
Rectangles.objects.add(player);
44-
Rectangles.movObjects.add(player);
4542
}
4643

4744
public Client(PApplet inst, Socket s, ExecutorService threadPool, Player player) {
@@ -90,7 +87,6 @@ public synchronized ConcurrentHashMap<UUID, GameObj> getState() {
9087
return this.state;
9188
}
9289

93-
@SuppressWarnings("unchecked")
9490
@Override
9591
/*
9692
* Listening socket thread for each client (non-Javadoc) ExecutorService
@@ -142,7 +138,6 @@ private synchronized boolean isStopped() {
142138
*
143139
*/
144140
private class ClientRead implements Runnable {
145-
private Packet p;
146141
private Client client;
147142
private String recv;
148143

@@ -154,7 +149,7 @@ public ClientRead(String recv, Client client) {
154149
@Override
155150
public void run() {
156151
// Just force processing
157-
this.p = new Packet(this.client.inst, this.recv);
152+
new Packet(this.client.inst, this.recv);
158153
}
159154
}
160155

‎scripts/rectangles/init.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ objectMap.put(dz_1.getUUID(), dz_1);
3232
var rand = spawnPoints[generator.nextInt(2)];
3333
player = new Player(self, sqrDim, rand.getPy().getLocation().x,
3434
rand.getPy().getLocation().y);
35+
objects.add(player);
36+
objectMap.put(player.getUUID(), player);
37+
movObjects.add(player);
3538

3639
self.setPlayer(player);
3740

@@ -67,7 +70,6 @@ for each (var p in staticPlatforms) {
6770
objectMap.put(p.getUUID(), p);
6871

6972
}
70-
7173
for each (var p in movPlatforms) {
7274
objects.add(p);
7375
objectMap.put(p.getUUID(), p);
@@ -89,4 +91,3 @@ for each (var p in movPlatforms) {
8991

9092

9193

92-

‎scripts/rectangles/platform/handler.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function event_collision(self, e, object_map) {
1818
data["caller"] = self.getUUID();
1919
data["x"] = newLoc.x;
2020
data["y"] = newLoc.y;
21-
self.raiseEvent(EVENT.EVENT_MOVEMENT, -1, data);
21+
self.raiseEvent(EVENT.EVENT_MOVEMENT, e.getTime(), data);
2222
}
2323
}
2424
}
@@ -37,7 +37,7 @@ function event_physics(self, e) {
3737
self.getPy().update(self);
3838
var data = new (java.util.HashMap)();
3939
data["caller"] = self.getUUID();
40-
self.raiseEvent(EVENT.EVENT_PHYSICS, e.getTime(), data);
40+
self.raiseEvent(EVENT.EVENT_PHYSICS, e.getTime() + 1, data);
4141
}
4242
}
4343

‎scripts/rectangles/player/handler.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function event_spawn(self, e) {
6262
data["caller"] = self.getUUID();
6363
data["x"] = s.getPy().getLocation().x;
6464
data["y"] = s.getPy().getLocation().y;
65-
self.raiseEvent(EVENT.EVENT_MOVEMENT, -1, data);
65+
self.raiseEvent(EVENT.EVENT_MOVEMENT, e.getTime(), data);
6666
}
6767
}
6868

@@ -95,7 +95,7 @@ function event_physics(self, e) {
9595
self.getPy().update(self);
9696
var data = new (java.util.HashMap)();
9797
data["caller"] = self.getUUID();
98-
self.raiseEvent(EVENT.EVENT_PHYSICS, e.getTime(), data);
98+
self.raiseEvent(EVENT.EVENT_PHYSICS, e.getTime() + 1, data);
9999
}
100100
}
101101

0 commit comments

Comments
 (0)