From 4e95ce139cd6d88ac4e6e98edf9f84cc5a55f2aa Mon Sep 17 00:00:00 2001 From: Nilstrieb Date: Fri, 25 Dec 2020 13:56:59 +0100 Subject: [PATCH] started renderer --- src/main/java/core/general/Master.java | 1 + .../java/core/objects/core/GameObject.java | 2 +- .../java/core/physics/hitboxes/Hitbox.java | 2 +- .../java/core/renderer/CircleRenderer.java | 14 ++++++++++++++ .../java/core/renderer/ComplexRenderer.java | 14 ++++++++++++++ .../core/{general => renderer}/Drawable.java | 2 +- src/main/java/core/renderer/Renderer.java | 8 ++++++++ target/classes/objects/ships/Shell.class | Bin 1417 -> 1415 bytes 8 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 src/main/java/core/renderer/CircleRenderer.java create mode 100644 src/main/java/core/renderer/ComplexRenderer.java rename src/main/java/core/{general => renderer}/Drawable.java (96%) create mode 100644 src/main/java/core/renderer/Renderer.java diff --git a/src/main/java/core/general/Master.java b/src/main/java/core/general/Master.java index 8141b56..c964354 100644 --- a/src/main/java/core/general/Master.java +++ b/src/main/java/core/general/Master.java @@ -7,6 +7,7 @@ import core.physics.Collision; import core.objects.base.DebugPos; import core.physics.hitboxes.Hitbox; import core.objects.core.GameObject; +import core.renderer.Drawable; import objects.Init; import javax.swing.*; diff --git a/src/main/java/core/objects/core/GameObject.java b/src/main/java/core/objects/core/GameObject.java index 984984f..3b26b43 100644 --- a/src/main/java/core/objects/core/GameObject.java +++ b/src/main/java/core/objects/core/GameObject.java @@ -1,7 +1,7 @@ package core.objects.core; import core.math.Coordinates; -import core.general.Drawable; +import core.renderer.Drawable; import core.general.Master; import core.math.Vector2D; diff --git a/src/main/java/core/physics/hitboxes/Hitbox.java b/src/main/java/core/physics/hitboxes/Hitbox.java index a7eebb9..4f8a1f4 100644 --- a/src/main/java/core/physics/hitboxes/Hitbox.java +++ b/src/main/java/core/physics/hitboxes/Hitbox.java @@ -1,6 +1,6 @@ package core.physics.hitboxes; -import core.general.Drawable; +import core.renderer.Drawable; import core.math.Vector2D; public abstract class Hitbox implements Drawable { diff --git a/src/main/java/core/renderer/CircleRenderer.java b/src/main/java/core/renderer/CircleRenderer.java new file mode 100644 index 0000000..a7af285 --- /dev/null +++ b/src/main/java/core/renderer/CircleRenderer.java @@ -0,0 +1,14 @@ +package core.renderer; + +import java.awt.*; + +public class CircleRenderer extends Renderer{ + + private double radius; + private Color color; + + @Override + public void draw(Graphics2D g2d) { + + } +} diff --git a/src/main/java/core/renderer/ComplexRenderer.java b/src/main/java/core/renderer/ComplexRenderer.java new file mode 100644 index 0000000..9f42080 --- /dev/null +++ b/src/main/java/core/renderer/ComplexRenderer.java @@ -0,0 +1,14 @@ +package core.renderer; + +import java.awt.*; +import java.util.ArrayList; + +public class ComplexRenderer extends Renderer{ + + private ArrayList renderers; + + @Override + public void draw(Graphics2D g2d) { + + } +} diff --git a/src/main/java/core/general/Drawable.java b/src/main/java/core/renderer/Drawable.java similarity index 96% rename from src/main/java/core/general/Drawable.java rename to src/main/java/core/renderer/Drawable.java index 7efc348..02c2900 100644 --- a/src/main/java/core/general/Drawable.java +++ b/src/main/java/core/renderer/Drawable.java @@ -1,4 +1,4 @@ -package core.general; +package core.renderer; import java.awt.Graphics2D; diff --git a/src/main/java/core/renderer/Renderer.java b/src/main/java/core/renderer/Renderer.java new file mode 100644 index 0000000..74a0543 --- /dev/null +++ b/src/main/java/core/renderer/Renderer.java @@ -0,0 +1,8 @@ +package core.renderer; + +import java.awt.*; + +public abstract class Renderer { + + public abstract void draw(Graphics2D g2d); +} diff --git a/target/classes/objects/ships/Shell.class b/target/classes/objects/ships/Shell.class index 47584c6f0c5f537fdcbbe582d8b80273b65e641e..f487acf589e08a53ffd44edab59acd337c914fe3 100644 GIT binary patch delta 29 kcmeC=Zs*=`jhTxxKQE*xGd(@EX!9fHE=ESx$+@gD0Gq-I-T(jq delta 31 mcmZqY?&RKZjhTl#KhHToCnvKwGe2+h1LiJ9MzzV=tTF(zEDE;(