Skip to content

Commit 4b6303c

Browse files
sworleyssworleys
authored
Merge pull request #1 from sworleys/v0.4
V0.4
2 parents 102ebb2 + 8477232 commit 4b6303c

15 files changed

Lines changed: 605 additions & 318 deletions

File tree

‎rectangles/engine/GameObj.java‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
package engine;
22

33

4+
import java.io.File;
5+
import java.io.FileNotFoundException;
6+
import java.io.FileReader;
7+
import java.util.HashMap;
48
import java.util.UUID;
59

610
import engine.events.Event;
11+
import engine.scripting.ScriptManager;
712
import processing.core.PApplet;
813

914
public abstract class GameObj extends EngineObject {
@@ -67,4 +72,47 @@ public void setObjHeight(float objHeight) {
6772
public boolean isFloor() {
6873
return this.isFloor;
6974
}
75+
76+
public void handleEvent(Event e) {
77+
String file;
78+
FileReader script = null;
79+
try {
80+
file = new File("scripts/" + Rectangles.game + "/" + this.getType() + "/handler.js").getAbsolutePath();
81+
script = new FileReader(file);
82+
} catch (FileNotFoundException e1) {
83+
file = new File("scripts/" + Rectangles.game + "/handler.js").getAbsolutePath();
84+
try {
85+
script = new FileReader(file);
86+
} catch (FileNotFoundException e2) {
87+
e1.printStackTrace();
88+
}
89+
}
90+
ScriptManager.loadScript(script);
91+
ScriptManager.executeScript("handle_event", this, e, Rectangles.objectMap);
92+
}
93+
94+
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+
// }
102+
103+
// for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
104+
// System.out.println(ste);
105+
// }
106+
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+
114+
Rectangles.eventManager.raiseEvent(e);
115+
//System.out.println(Rectangles.player.getUUID());
116+
//System.out.println(e.getData().get("caller") + " : " + e.getType() + " : " + e.getTime());
117+
}
70118
}

‎rectangles/engine/Physics.java‎

Lines changed: 45 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,17 @@
55
import java.awt.geom.PathIterator;
66
import java.awt.geom.Point2D;
77
import java.awt.geom.Rectangle2D;
8+
import java.io.File;
9+
import java.io.FileNotFoundException;
10+
import java.io.FileReader;
811
import java.util.ArrayList;
912
import java.util.HashMap;
1013
import java.util.concurrent.CopyOnWriteArrayList;
1114

15+
import org.w3c.dom.css.Rect;
16+
1217
import engine.events.Event;
18+
import engine.scripting.ScriptManager;
1319
import processing.core.PApplet;
1420
import processing.core.PVector;
1521

@@ -41,56 +47,25 @@ public Physics(float x, float y, float objWidth, float objHeight, float mass, fl
4147
this.mass = mass;
4248
}
4349

44-
public void update(GameObj caller, CopyOnWriteArrayList<GameObj> objects) {
45-
//this.acceleration.setMag(0.2);
46-
47-
GameObj collidedWith = null;
48-
49-
for (GameObj obj : objects) {
50-
if (this.intersects(obj.getPy().getBounds2D()) && !obj.getUUID().equals(caller.getUUID()) && !obj.getType().equals("player")) {
51-
collidedWith = obj;
52-
// TODO: Need break here?
53-
break;
54-
}
55-
}
56-
57-
/**
58-
* TODO: Implement here so that if collision occurs, no movement below, let collision event handle
59-
* raising a new movement event
60-
*
61-
* else, just raise movement event here if object moved
62-
*
63-
* In replays, just worry about movement events! :D
64-
*/
65-
66-
if (collidedWith != null) {
67-
HashMap<String, Object> data = new HashMap<>();
68-
data.put("caller", caller.getUUID());
69-
data.put("collidedWith", collidedWith.getUUID());
70-
// TODO: Could just make the collision event also be movement?
71-
Event e = new Event(Event.EVENT_COLLISION, Rectangles.globalTimeline.getCurrentTime(), data);
72-
Rectangles.eventManager.raiseEvent(e);
73-
} else {
74-
this.velocity.add(this.acceleration);
75-
this.velocity.limit(this.topSpeed);
76-
if (this.velocity.mag() > 0) {
77-
PVector newLoc = new PVector(this.location.x, this.location.y);
78-
newLoc.add(this.velocity);
79-
HashMap<String, Object> data = new HashMap<>();
80-
data.put("caller", caller.getUUID());
81-
data.put("x", newLoc.x);
82-
data.put("y", newLoc.y);
83-
Event e = new Event(Event.EVENT_MOVEMENT, Rectangles.globalTimeline.getCurrentTime(), data);
84-
Rectangles.eventManager.raiseEvent(e);
85-
// Actually move
86-
//this.location.add(this.velocity);
50+
public void update(GameObj caller) {
51+
String file;
52+
FileReader script = null;
53+
try {
54+
file = new File("scripts/" + Rectangles.game + "/" + caller.getType() + "/physics.js").getAbsolutePath();
55+
script = new FileReader(file);
56+
} catch (FileNotFoundException e1) {
57+
file = new File("scripts/" + Rectangles.game + "/physics.js").getAbsolutePath();
58+
try {
59+
script = new FileReader(file);
60+
} catch (FileNotFoundException e2) {
61+
e1.printStackTrace();
8762
}
8863
}
89-
90-
// Reset acceleration?
91-
if (this.isGrav) {
92-
this.acceleration = new PVector(0, GRAV);
93-
}
64+
ScriptManager.bindArgument("objects", Rectangles.objects);
65+
ScriptManager.bindArgument("GRAV", GRAV);
66+
ScriptManager.bindArgument("globalTimeline", Rectangles.globalTimeline);
67+
ScriptManager.loadScript(script);
68+
ScriptManager.executeScript("update", this, caller);
9469
}
9570

9671
// From processing tutorial forces with vectors
@@ -114,11 +89,15 @@ public void setAcceleration(PVector acceleration) {
11489
public void setAccelerationX(float x) {
11590
this.acceleration.x = x;
11691
}
117-
92+
11893
public void setAccelerationY(float y) {
11994
this.acceleration.y = (y + GRAV);
12095
}
12196

97+
public void resetAcceleration() {
98+
this.acceleration = new PVector(0, GRAV);
99+
}
100+
122101
public PVector getLocation() {
123102
return location;
124103
}
@@ -203,4 +182,21 @@ public boolean intersects(double x, double y, double w, double h) {
203182
// TODO Auto-generated method stub
204183
return false;
205184
}
185+
186+
/*
187+
* Helper function for copying location in script
188+
*/
189+
public PVector copyLoc() {
190+
return new PVector(this.getLocation().x, this.getLocation().y);
191+
}
192+
/*
193+
* Helper function for getting new location in script
194+
*/
195+
public PVector newLoc(float x, float y) {
196+
return new PVector(x, y);
197+
}
198+
199+
public boolean isGrav() {
200+
return isGrav;
201+
}
206202
}

‎rectangles/engine/Platform.java‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -91,47 +91,4 @@ public static Platform deSerial(PApplet inst, String serial) {
9191
res.rend.setColor(color);
9292
return res;
9393
}
94-
95-
@Override
96-
public void handleEvent(Event e) {
97-
switch (e.getType()) {
98-
case (Event.EVENT_COLLISION):
99-
if (((UUID) e.getData().get("caller")).equals(this.getUUID())) {
100-
GameObj collidedWith = Rectangles.objectMap.get((UUID) e.getData().get("collidedWith"));
101-
if (collidedWith.getType().equals("boundary")) {
102-
this.getPy().getVelocity().mult(-1);
103-
}
104-
if (this.getPy().getVelocity().mag() > 0) {
105-
PVector newLoc = new PVector(this.getPy().getLocation().x, this.getPy().getLocation().y);
106-
newLoc.add(this.getPy().getVelocity());
107-
HashMap<String, Object> data = new HashMap<>();
108-
data.put("caller", this.getUUID());
109-
data.put("x", newLoc.x);
110-
data.put("y", newLoc.y);
111-
Event mov = new Event(Event.EVENT_MOVEMENT, Rectangles.globalTimeline.getCurrentTime(), data);
112-
Rectangles.eventManager.raiseEvent(mov);
113-
// Actually move
114-
//this.getPy().setLocation(newLoc);
115-
}
116-
}
117-
break;
118-
case(Event.EVENT_MOVEMENT):
119-
if (((UUID) e.getData().get("caller")).equals(this.getUUID())) {
120-
PVector newLoc = new PVector((float) (e.getData().get("x")), (float) e.getData().get("y"));
121-
this.getPy().setLocation(newLoc);
122-
}
123-
break;
124-
case (Event.EVENT_PHYSICS):
125-
if (((UUID) e.getData().get("caller")).equals(this.getUUID())) {
126-
this.getPy().update(this, Rectangles.objects);
127-
HashMap<String, Object> data = new HashMap<>();
128-
data.put("caller", this.getUUID());
129-
Event py = new Event(Event.EVENT_PHYSICS, e.getTime() + (long) Rectangles.physicsTimeline.getTickSize(), data);
130-
Rectangles.eventManager.raiseEvent(py);
131-
}
132-
break;
133-
default:
134-
break;
135-
}
136-
}
13794
}

‎rectangles/engine/Player.java‎

Lines changed: 6 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ public String toSerial() {
4040
return serial;
4141
}
4242

43+
/*
44+
* Helper to get spawn for script
45+
*/
46+
public Spawn getRandomSpawn() {
47+
return Rectangles.spawnPoints[Rectangles.generator.nextInt(2)];
48+
}
4349

4450
public static Player deSerial(PApplet inst, String serial) {
4551
float dim = 0;
@@ -82,110 +88,4 @@ public static Player deSerial(PApplet inst, String serial) {
8288
return res;
8389
}
8490

85-
@Override
86-
public void handleEvent(Event e) {
87-
88-
switch(e.getType()) {
89-
case(Event.EVENT_COLLISION):
90-
if (((UUID) e.getData().get("caller")).equals(this.getUUID())) {
91-
GameObj collidedWith = Rectangles.objectMap.get((UUID) e.getData().get("collidedWith"));
92-
if (collidedWith.isFloor()) {
93-
this.getPy().getVelocity().y = (float) -1;
94-
} else {
95-
switch (collidedWith.getType()) {
96-
case ("player"):
97-
System.out.println("player hit player");
98-
// Do nothing, clip-less
99-
break;
100-
case ("platform"):
101-
this.getPy().getAcceleration().mult((float) -1);
102-
if (this.getPy().getVelocity().y > 0) {
103-
this.getPy().getVelocity().y = (float) 0;
104-
} else {
105-
this.getPy().getVelocity().y = (float) -1;
106-
this.getPy().getVelocity().x = (float) 0;
107-
}
108-
break;
109-
case ("death-zone"):
110-
HashMap<String, Object> data = new HashMap<>();
111-
data.put("caller", this.getUUID());
112-
Event death = new Event(Event.EVENT_DEATH, e.getTime(), data);
113-
Rectangles.eventManager.raiseEvent(death);
114-
break;
115-
default:
116-
this.getPy().getVelocity().mult((float) -1);
117-
break;
118-
}
119-
}
120-
if (this.getPy().getVelocity().mag() > 0) {
121-
PVector newLoc = new PVector(this.getPy().getLocation().x, this.getPy().getLocation().y);
122-
newLoc.add(this.getPy().getVelocity());
123-
HashMap<String, Object> data = new HashMap<>();
124-
data.put("caller", this.getUUID());
125-
data.put("x", newLoc.x);
126-
data.put("y", newLoc.y);
127-
Event mov = new Event(Event.EVENT_MOVEMENT, e.getTime(), data);
128-
Rectangles.eventManager.raiseEvent(mov);
129-
// Actually move
130-
//this.getPy().setLocation(newLoc);
131-
}
132-
}
133-
break;
134-
case(Event.EVENT_DEATH):
135-
if (((UUID) e.getData().get("caller")).equals(this.getUUID())) {
136-
Rectangles.deathPoints++;
137-
HashMap<String, Object> data = new HashMap<>();
138-
data.put("caller", this.getUUID());
139-
Event spawn = new Event(Event.EVENT_SPAWN, e.getTime(), data);
140-
Rectangles.eventManager.raiseEvent(spawn);
141-
}
142-
break;
143-
case(Event.EVENT_SPAWN):
144-
if (((UUID) e.getData().get("caller")).equals(this.getUUID())) {
145-
Spawn s = Rectangles.spawnPoints[Rectangles.generator.nextInt(2)];
146-
HashMap<String, Object> data = new HashMap<>();
147-
data.put("caller", this.getUUID());
148-
data.put("x", s.getPy().getLocation().x);
149-
data.put("y", s.getPy().getLocation().y);
150-
Event mov = new Event(Event.EVENT_MOVEMENT, Rectangles.globalTimeline.getCurrentTime()
151-
+ (long) Rectangles.physicsTimeline.getTickSize(), data);
152-
Rectangles.eventManager.raiseEvent(mov);
153-
}
154-
break;
155-
case(Event.EVENT_INPUT):
156-
if (((UUID) e.getData().get("caller")).equals(this.getUUID())) {
157-
switch((int) e.getData().get("keyCode")) {
158-
case(PConstants.LEFT):
159-
this.getPy().setAccelerationX(-5);
160-
break;
161-
case(PConstants.RIGHT):
162-
this.getPy().setAccelerationX(5);
163-
break;
164-
case(' '):
165-
this.getPy().setAccelerationY(-20);
166-
break;
167-
}
168-
}
169-
break;
170-
case(Event.EVENT_MOVEMENT):
171-
if (((UUID) e.getData().get("caller")).equals(this.getUUID())) {
172-
PVector newLoc = new PVector((float) (e.getData().get("x")), (float) e.getData().get("y"));
173-
this.getPy().setLocation(newLoc);
174-
}
175-
break;
176-
case(Event.EVENT_PHYSICS):
177-
if (((UUID) e.getData().get("caller")).equals(this.getUUID())) {
178-
this.getPy().update(this, Rectangles.objects);
179-
HashMap<String, Object> data = new HashMap<>();
180-
data.put("caller", this.getUUID());
181-
Event py = new Event(Event.EVENT_PHYSICS, e.getTime() + (long) Rectangles.physicsTimeline.getTickSize(), data);
182-
Rectangles.eventManager.raiseEvent(py);
183-
}
184-
break;
185-
default:
186-
break;
187-
}
188-
189-
}
190-
19191
}

0 commit comments

Comments
 (0)