BrychanD/JavaECS-Examples
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Compare commits

base: BrychanD:d096f589aa2fd65a36bb289af66b1df0783f9374
Branches Tags
BrychanD:master
BrychanD:presentation
..
compare: BrychanD:1cfd392d871de74fe934f39e439ae1196af9431f
Branches Tags
BrychanD:master
BrychanD:presentation

No commits in common. "d096f589aa2fd65a36bb289af66b1df0783f9374" and "1cfd392d871de74fe934f39e439ae1196af9431f" have entirely different histories.
d096f589aa ... 1cfd392d87

9 changed files with 6 additions and 189 deletions
Show Stats Expand all files Collapse all files

BIN
content/Example1.mp4
View File

Binary file not shown.

28
demo1/src/main/java/nz/ac/massey/javaecs/examples/App.java
View File

@ -1,10 +1,7 @@
package nz.ac.massey.javaecs.examples; package nz.ac.massey.javaecs.examples;
import java.sql.Time;
import java.util.Random; import java.util.Random;
import javafx.scene.paint.Color;
import javafx.scene.text.Text;
import nz.ac.massey.javaecs.*; import nz.ac.massey.javaecs.*;
import nz.ac.massey.javaecs.examples.Components.*; import nz.ac.massey.javaecs.examples.Components.*;
import nz.ac.massey.javaecs.examples.Systems.*; import nz.ac.massey.javaecs.examples.Systems.*;
@ -31,9 +28,6 @@ public final class App {
gameEngine.registerComponent(LogUpdate.class); gameEngine.registerComponent(LogUpdate.class);
gameEngine.registerComponent(Render.class); gameEngine.registerComponent(Render.class);
gameEngine.registerComponent(BoxRender.class); gameEngine.registerComponent(BoxRender.class);
gameEngine.registerComponent(TimedExistence.class);
gameEngine.registerComponent(Reporter.class);
gameEngine.registerComponent(TextRender.class);
PhysicsSystem physicsSystem = new PhysicsSystem(gameEngine); PhysicsSystem physicsSystem = new PhysicsSystem(gameEngine);
gameEngine.registerSystem(PhysicsSystem.class, physicsSystem); gameEngine.registerSystem(PhysicsSystem.class, physicsSystem);
@ -48,12 +42,6 @@ public final class App {
RenderSystem renderSystem = new RenderSystem(gameEngine, 10.); RenderSystem renderSystem = new RenderSystem(gameEngine, 10.);
gameEngine.registerSystem(RenderSystem.class, renderSystem); gameEngine.registerSystem(RenderSystem.class, renderSystem);
ExistenceSystem existenceSystem = new ExistenceSystem(gameEngine);
gameEngine.registerSystem(ExistenceSystem.class, existenceSystem);
ReportSystem reportSystem = new ReportSystem(gameEngine);
gameEngine.registerSystem(ReportSystem.class, reportSystem);
// Define a play area 100 * 100, make sure to use worldspace not screenspace (top left is 0, 100, not 0,0) // Define a play area 100 * 100, make sure to use worldspace not screenspace (top left is 0, 100, not 0,0)
// Bottom boundary // Bottom boundary
Entity newEnt = gameEngine.createEntity(); Entity newEnt = gameEngine.createEntity();
@ -91,15 +79,9 @@ public final class App {
gameEngine.addComponent(newEnt, Gravity.class, new Gravity(0, -9.80665, 45., 45.)); // Terminal velocity is 45 m/s gameEngine.addComponent(newEnt, Gravity.class, new Gravity(0, -9.80665, 45., 45.)); // Terminal velocity is 45 m/s
gameEngine.addComponent(newEnt, Render.class, new Render(BoxRender.class)); gameEngine.addComponent(newEnt, Render.class, new Render(BoxRender.class));
gameEngine.addComponent(newEnt, BoxRender.class, new BoxRender(10, 10, 255, 64, 64)); gameEngine.addComponent(newEnt, BoxRender.class, new BoxRender(10, 10, 255, 64, 64));
newEnt = gameEngine.createEntity();
gameEngine.addComponent(newEnt, TextRender.class, new TextRender("", 24, Color.WHITE));
gameEngine.addComponent(newEnt, Render.class, new Render(TextRender.class));
gameEngine.addComponent(newEnt, Reporter.class, new Reporter());
gameEngine.addComponent(newEnt, Vec2D.class, new Vec2D(5,5,0));
// Other objects // Other objects
Random rand = new Random(); Random rand = new Random();
for (int i = 0; i < 20; i++) { for (int i = 0; i < 100; i++) {
newEnt = gameEngine.createEntity(); newEnt = gameEngine.createEntity();
gameEngine.addComponent(newEnt, Vec2D.class, new Vec2D(10 + rand.nextDouble()* 80, 10+ rand.nextDouble()* 80,0)); gameEngine.addComponent(newEnt, Vec2D.class, new Vec2D(10 + rand.nextDouble()* 80, 10+ rand.nextDouble()* 80,0));
gameEngine.addComponent(newEnt, RidgidBody.class, new RidgidBody(-2.5 + rand.nextDouble()* 5., 0., 0., 0., 0.f, 0., rand.nextDouble() * 20.)); gameEngine.addComponent(newEnt, RidgidBody.class, new RidgidBody(-2.5 + rand.nextDouble()* 5., 0., 0., 0., 0.f, 0., rand.nextDouble() * 20.));
@ -109,7 +91,6 @@ public final class App {
gameEngine.addComponent(newEnt, LogUpdate.class, null); // Add to object to print pos of gameEngine.addComponent(newEnt, LogUpdate.class, null); // Add to object to print pos of
gameEngine.addComponent(newEnt, Render.class, new Render(BoxRender.class)); gameEngine.addComponent(newEnt, Render.class, new Render(BoxRender.class));
gameEngine.addComponent(newEnt, BoxRender.class, new BoxRender(size, size, 30 + rand.nextInt(225), 30 + rand.nextInt(225), 30 + rand.nextInt(225))); gameEngine.addComponent(newEnt, BoxRender.class, new BoxRender(size, size, 30 + rand.nextInt(225), 30 + rand.nextInt(225), 30 + rand.nextInt(225)));
gameEngine.addComponent(newEnt, TimedExistence.class, new TimedExistence(5 + rand.nextDouble() * 90));
} }
//gameEngine.addComponent(newEnt, LogUpdate.class, null); //gameEngine.addComponent(newEnt, LogUpdate.class, null);
@ -119,10 +100,8 @@ public final class App {
collisionSystem.init(); collisionSystem.init();
logUpdateSystem.init(); logUpdateSystem.init();
renderSystem.init(); renderSystem.init();
existenceSystem.init();
reportSystem.init();
double dt = 0.001; double dt = 0.;
double frameRate = 1.0 / 144; // 1 second divided by target number of frames double frameRate = 1.0 / 144; // 1 second divided by target number of frames
double idleTime = 0.0; // the amount of time spent sleeping double idleTime = 0.0; // the amount of time spent sleeping
@ -133,8 +112,6 @@ public final class App {
collisionSystem.update(); collisionSystem.update();
physicsSystem.update(dt); physicsSystem.update(dt);
existenceSystem.update(dt);
reportSystem.update();
//logUpdateSystem.update(); //logUpdateSystem.update();
// The render system should be uncoupled from the physics and collision // The render system should be uncoupled from the physics and collision
renderSystem.update(); renderSystem.update();
@ -147,7 +124,6 @@ public final class App {
dt = (System.nanoTime() - startTime) / 1e9; dt = (System.nanoTime() - startTime) / 1e9;
startTime = System.nanoTime(); startTime = System.nanoTime();
} }
dt = 0.001;
} }
} }
} }

7
demo1/src/main/java/nz/ac/massey/javaecs/examples/Components/BoxRender.java
View File

@ -2,10 +2,9 @@ package nz.ac.massey.javaecs.examples.Components;
public class BoxRender { public class BoxRender {
public double r = 1.; public double r = 255;
public double g = 1.; public double g = 255;
public double b = 1.; public double b = 255;
public double a = 1.;
public double xSize = 0.0; public double xSize = 0.0;
public double ySize = 0.0; public double ySize = 0.0;

5
demo1/src/main/java/nz/ac/massey/javaecs/examples/Components/Reporter.java
View File

@ -1,5 +0,0 @@
package nz.ac.massey.javaecs.examples.Components;
public class Reporter {
}

15
demo1/src/main/java/nz/ac/massey/javaecs/examples/Components/TextRender.java
View File

@ -1,15 +0,0 @@
package nz.ac.massey.javaecs.examples.Components;
import javafx.scene.paint.Color;
public class TextRender {
public String content = "";
public double size = 10.;
public Color color = Color.WHITE;
public TextRender(String content, double size, Color color){
this.content = content;
this.size = size;
this.color = color;
}
}

9
demo1/src/main/java/nz/ac/massey/javaecs/examples/Components/TimedExistence.java
View File

@ -1,9 +0,0 @@
package nz.ac.massey.javaecs.examples.Components;
public class TimedExistence {
public double lifeTime = 0.0;
public TimedExistence(double lifeTime){
this.lifeTime = lifeTime;
}
}

80
demo1/src/main/java/nz/ac/massey/javaecs/examples/Systems/ExistenceSystem.java
View File

@ -1,80 +0,0 @@
package nz.ac.massey.javaecs.examples.Systems;
import java.util.BitSet;
import java.util.LinkedList;
import java.util.Queue;
import java.util.Random;
import nz.ac.massey.javaecs.ECSSystem;
import nz.ac.massey.javaecs.Engine;
import nz.ac.massey.javaecs.Entity;
import nz.ac.massey.javaecs.examples.Components.BoxRender;
import nz.ac.massey.javaecs.examples.Components.Collider;
import nz.ac.massey.javaecs.examples.Components.Gravity;
import nz.ac.massey.javaecs.examples.Components.LogUpdate;
import nz.ac.massey.javaecs.examples.Components.Render;
import nz.ac.massey.javaecs.examples.Components.RidgidBody;
import nz.ac.massey.javaecs.examples.Components.TimedExistence;
import nz.ac.massey.javaecs.examples.Components.Vec2D;
public class ExistenceSystem extends ECSSystem{
Engine gameEngine;
Random rand;
public ExistenceSystem(Engine gameEngine){
this.gameEngine = gameEngine;
// Set registrations
registrationSet = new BitSet();
registrationSet.set(gameEngine.getComponentIndex(TimedExistence.class));
registrationSet.set(gameEngine.getComponentIndex(BoxRender.class));
}
@Override
public void init() {
rand = new Random();
}
@Override
public void update() {
// TODO Auto-generated method stub
}
public void update(double dt){
Queue<Entity> deletions = new LinkedList<>();
for (Entity entity : entities) {
BoxRender shape = (BoxRender)gameEngine.getComponentData(entity, BoxRender.class);
TimedExistence timedExistence = (TimedExistence)gameEngine.getComponentData(entity, TimedExistence.class);
// Get the rate the fade should occur at our current frame rate.
double fadeRate = timedExistence.lifeTime / dt; // I.e. might say 200 frames left
// Fade the opacity
shape.a -= shape.a / fadeRate;
// Clauses to keep things safe
if (shape.a < 0) shape.a = 0.;
else if (shape.a > 1) shape.a = 1.;
// Reduce the time the shape may continue living for
timedExistence.lifeTime -= dt;
if (timedExistence.lifeTime <= 0){
deletions.add(entity);
}
}
while (deletions.size() > 0){
gameEngine.destroyEntity(deletions.remove());
}
// Finally, randomly add an entity as required
if (rand.nextInt(16384) < 8){
Entity newEnt = gameEngine.createEntity();
gameEngine.addComponent(newEnt, Vec2D.class, new Vec2D(10 + rand.nextDouble()* 80, 10+ rand.nextDouble()* 80,0));
gameEngine.addComponent(newEnt, RidgidBody.class, new RidgidBody(-2.5 + rand.nextDouble()* 5., 0., 0., 0., 0.f, 0., rand.nextDouble() * 20.));
double size = 3 + rand.nextDouble() * 7;
gameEngine.addComponent(newEnt, Collider.class, new Collider(size, size));
gameEngine.addComponent(newEnt, Gravity.class, new Gravity(0, -9.80665, 45., 45.)); // Terminal velocity is 45 m/s
gameEngine.addComponent(newEnt, Render.class, new Render(BoxRender.class));
gameEngine.addComponent(newEnt, BoxRender.class, new BoxRender(size, size, 30 + rand.nextInt(225), 30 + rand.nextInt(225), 30 + rand.nextInt(225)));
gameEngine.addComponent(newEnt, TimedExistence.class, new TimedExistence(5 + rand.nextDouble() * 90));
}
}
}

15
demo1/src/main/java/nz/ac/massey/javaecs/examples/Systems/RenderSystem.java
View File

@ -10,15 +10,12 @@ import javafx.scene.Scene;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.paint.Paint; import javafx.scene.paint.Paint;
import javafx.scene.shape.Rectangle; import javafx.scene.shape.Rectangle;
import javafx.scene.text.Font;
import javafx.scene.text.Text;
import javafx.stage.Stage; import javafx.stage.Stage;
import nz.ac.massey.javaecs.ECSSystem; import nz.ac.massey.javaecs.ECSSystem;
import nz.ac.massey.javaecs.Engine; import nz.ac.massey.javaecs.Engine;
import nz.ac.massey.javaecs.Entity; import nz.ac.massey.javaecs.Entity;
import nz.ac.massey.javaecs.examples.Components.BoxRender; import nz.ac.massey.javaecs.examples.Components.BoxRender;
import nz.ac.massey.javaecs.examples.Components.Render; import nz.ac.massey.javaecs.examples.Components.Render;
import nz.ac.massey.javaecs.examples.Components.TextRender;
import nz.ac.massey.javaecs.examples.Components.Vec2D; import nz.ac.massey.javaecs.examples.Components.Vec2D;
public class RenderSystem extends ECSSystem{ public class RenderSystem extends ECSSystem{
@ -34,7 +31,6 @@ public class RenderSystem extends ECSSystem{
// Set registrations // Set registrations
registrationSet = new BitSet(); registrationSet = new BitSet();
registrationSet.set(gameEngine.getComponentIndex(Render.class)); registrationSet.set(gameEngine.getComponentIndex(Render.class));
registrationSet.set(gameEngine.getComponentIndex(Vec2D.class));
this.renderScale = renderScale; this.renderScale = renderScale;
} }
@ -62,20 +58,11 @@ public class RenderSystem extends ECSSystem{
Vec2D vec2d = (Vec2D)gameEngine.getComponentData(entity, Vec2D.class); Vec2D vec2d = (Vec2D)gameEngine.getComponentData(entity, Vec2D.class);
Rectangle rect = new Rectangle(box.xSize* renderScale, box.ySize * renderScale); Rectangle rect = new Rectangle(box.xSize* renderScale, box.ySize * renderScale);
rect.setFill(new Color(box.r, box.g, box.b, box.a)); rect.setFill(new Color(box.r, box.g, box.b, 0.9));
rect.setX(12 + (vec2d.x * renderScale)); rect.setX(12 + (vec2d.x * renderScale));
rect.setY(1012 - (vec2d.y * renderScale) - rect.getHeight()); rect.setY(1012 - (vec2d.y * renderScale) - rect.getHeight());
renderScene.getChildren().add(rect); renderScene.getChildren().add(rect);
} }
else if (((Render)gameEngine.getComponentData(entity, Render.class)).renderType == TextRender.class){
Vec2D vec2d = (Vec2D)gameEngine.getComponentData(entity, Vec2D.class);
TextRender text = (TextRender)gameEngine.getComponentData(entity, TextRender.class);
Text t = new Text(vec2d.x * renderScale, vec2d.y * renderScale, text.content);
t.setFont(new Font(text.size));
t.setFill(text.color);
t.setStroke(text.color);
renderScene.getChildren().add(t);
}
} }
Platform.runLater(new Runnable(){ Platform.runLater(new Runnable(){
@Override @Override

36
demo1/src/main/java/nz/ac/massey/javaecs/examples/Systems/ReportSystem.java
View File

@ -1,36 +0,0 @@
package nz.ac.massey.javaecs.examples.Systems;
import java.util.BitSet;
import nz.ac.massey.javaecs.ECSSystem;
import nz.ac.massey.javaecs.Engine;
import nz.ac.massey.javaecs.Entity;
import nz.ac.massey.javaecs.examples.Components.Reporter;
import nz.ac.massey.javaecs.examples.Components.TextRender;
public class ReportSystem extends ECSSystem{
Engine gameEngine;
public ReportSystem(Engine gameEngine){
this.gameEngine = gameEngine;
// Set registrations
registrationSet = new BitSet();
registrationSet.set(gameEngine.getComponentIndex(Reporter.class));
registrationSet.set(gameEngine.getComponentIndex(TextRender.class));
}
@Override
public void init() {
// TODO Auto-generated method stub
}
@Override
public void update() {
for (Entity entity : entities) {
TextRender text = (TextRender)gameEngine.getComponentData(entity, TextRender.class);
text.content = "Num Entities: " + gameEngine.getNumEntities();
}
}
}