CleanUp and add RealTimeSyncedDrawable

Bun133 · Bun133 · commit 9a7be29fbc2f · 2020-07-08T15:13:28.000+09:00
diff --git a/graphics/src/main/java/com/ndsl/graphics/Debugger.java b/graphics/src/main/java/com/ndsl/graphics/Debugger.java
@@ -1,9 +1,9 @@
 package com.ndsl.graphics;
 
 import com.ndsl.graphics.display.Display;
-import com.ndsl.graphics.display.drawable.Drawable;
-import com.ndsl.graphics.display.drawable.GUIBase;
-import com.ndsl.graphics.display.drawable.StringGui;
+import com.ndsl.graphics.display.drawable.base.Drawable;
+import com.ndsl.graphics.display.drawable.base.GUIBase;
+import com.ndsl.graphics.display.drawable.non_sync.ui.StringGui;
 import com.ndsl.graphics.display.fps.FPSLimiter;
 import com.ndsl.graphics.display.key.KeyInputHandler;
 import com.ndsl.graphics.display.layer.Layer;
diff --git a/graphics/src/main/java/com/ndsl/graphics/GraphicsMain.java b/graphics/src/main/java/com/ndsl/graphics/GraphicsMain.java
@@ -1,13 +1,13 @@
 package com.ndsl.graphics;
 
 import com.ndsl.graphics.display.Display;
-import com.ndsl.graphics.display.drawable.Drawable;
-import com.ndsl.graphics.display.drawable.RectDrawable;
-import com.ndsl.graphics.display.drawable.StringDrawable;
+import com.ndsl.graphics.display.drawable.base.Drawable;
+import com.ndsl.graphics.display.drawable.non_sync.RectDrawable;
+import com.ndsl.graphics.display.drawable.non_sync.StringDrawable;
 import com.ndsl.graphics.display.drawable.animate.TimeScaledAnimator;
 import com.ndsl.graphics.display.drawable.img.GImage;
 import com.ndsl.graphics.display.drawable.img.ImageDrawable;
-import com.ndsl.graphics.display.drawable.ui.Button;
+import com.ndsl.graphics.display.drawable.non_sync.ui.Button;
 import com.ndsl.graphics.display.layer.Layer;
 import com.ndsl.graphics.pos.Pos;
 import com.ndsl.graphics.pos.Rect;
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/Display.java b/graphics/src/main/java/com/ndsl/graphics/display/Display.java
@@ -2,9 +2,9 @@
 
 import com.ndsl.graphics.Debugger;
 import com.ndsl.graphics.GraphicsMain;
-import com.ndsl.graphics.display.drawable.Drawable;
-import com.ndsl.graphics.display.drawable.GUIBase;
-import com.ndsl.graphics.display.drawable.RealTimeDrawable;
+import com.ndsl.graphics.display.drawable.base.Drawable;
+import com.ndsl.graphics.display.drawable.base.GUIBase;
+import com.ndsl.graphics.display.drawable.non_sync.RealTimeDrawable;
 import com.ndsl.graphics.display.fps.FPSAttitude;
 import com.ndsl.graphics.display.fps.FPSLimiter;
 import com.ndsl.graphics.display.key.KeyInputHandler;
@@ -19,8 +19,6 @@
 import javax.swing.*;
 import java.awt.*;
 import java.awt.image.BufferStrategy;
-import java.util.ArrayList;
-import java.util.List;
 
 public class Display extends JFrame {
 
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/ICustomGui.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/ICustomGui.java
@@ -3,7 +3,7 @@
 import com.ndsl.graphics.pos.Rect;
 
 import java.awt.*;
-
+@Deprecated
 public interface ICustomGui {
     void onDraw(Graphics g, Rect showingRect);
 }
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/IRealTimeCustomDrawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/IRealTimeCustomDrawable.java
@@ -3,7 +3,7 @@
 import com.ndsl.graphics.pos.Rect;
 
 import java.awt.*;
-
+@Deprecated
 public interface IRealTimeCustomDrawable {
     void onDraw(Graphics g, Rect showingRect);
     Rect getShowingRect();
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/base/Drawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/base/Drawable.java
@@ -1,6 +1,6 @@
-package com.ndsl.graphics.display.drawable;
+package com.ndsl.graphics.display.drawable.base;
 
-import com.ndsl.graphics.pos.Pos;
+import com.ndsl.graphics.display.drawable.IDrawable;
 import com.ndsl.graphics.pos.Rect;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/base/DrawableUtil.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/base/DrawableUtil.java
@@ -1,4 +1,4 @@
-package com.ndsl.graphics.display.drawable;
+package com.ndsl.graphics.display.drawable.base;
 
 import com.ndsl.graphics.pos.Pos;
 import com.ndsl.graphics.pos.Rect;
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/base/GUIBase.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/base/GUIBase.java
@@ -1,12 +1,12 @@
-package com.ndsl.graphics.display.drawable;
+package com.ndsl.graphics.display.drawable.base;
 
 import com.ndsl.graphics.display.Display;
-import com.ndsl.graphics.pos.Pos;
+import com.ndsl.graphics.display.drawable.IDrawable;
 import com.ndsl.graphics.pos.Rect;
 
 import java.awt.*;
 
-public class GUIBase implements IDrawable{
+public class GUIBase implements IDrawable {
     public IDrawable drawObject;
     public String id;
     public GUIBase(IDrawable drawObject) {
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/LineDrawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/LineDrawable.java
@@ -1,7 +1,8 @@
-package com.ndsl.graphics.display.drawable;
+package com.ndsl.graphics.display.drawable.non_sync;
 
 import com.ndsl.graphics.GraphicsMain;
 import com.ndsl.graphics.display.Display;
+import com.ndsl.graphics.display.drawable.IDrawable;
 import com.ndsl.graphics.pos.Line;
 import com.ndsl.graphics.pos.Rect;
 
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/PointDrawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/PointDrawable.java
@@ -1,13 +1,14 @@
-package com.ndsl.graphics.display.drawable;
+package com.ndsl.graphics.display.drawable.non_sync;
 
 import com.ndsl.graphics.GraphicsMain;
 import com.ndsl.graphics.display.Display;
+import com.ndsl.graphics.display.drawable.IDrawable;
 import com.ndsl.graphics.pos.Pos;
 import com.ndsl.graphics.pos.Rect;
 
 import java.awt.*;
 
-public class PointDrawable implements IDrawable{
+public class PointDrawable implements IDrawable {
     public Color drawColor= GraphicsMain.Default_Color;
     public Pos pos;
     public Rect rect;
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/RealTimeDrawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/RealTimeDrawable.java
@@ -1,11 +1,12 @@
-package com.ndsl.graphics.display.drawable;
+package com.ndsl.graphics.display.drawable.non_sync;
 
 import com.ndsl.graphics.display.Display;
+import com.ndsl.graphics.display.drawable.IDrawable;
 import com.ndsl.graphics.pos.Rect;
 
 import java.awt.*;
 
-public class RealTimeDrawable implements IDrawable{
+public class RealTimeDrawable implements IDrawable {
     public IDrawable d;
     public Rect rect;
     public String id;
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/RectDrawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/RectDrawable.java
@@ -1,12 +1,13 @@
-package com.ndsl.graphics.display.drawable;
+package com.ndsl.graphics.display.drawable.non_sync;
 
 import com.ndsl.graphics.GraphicsMain;
 import com.ndsl.graphics.display.Display;
+import com.ndsl.graphics.display.drawable.IDrawable;
 import com.ndsl.graphics.pos.Rect;
 
 import java.awt.*;
 
-public class RectDrawable implements IDrawable{
+public class RectDrawable implements IDrawable {
     public Color c= GraphicsMain.Default_Color;
     public Rect r;
     public String id;
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/StringDrawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/StringDrawable.java
@@ -1,12 +1,14 @@
-package com.ndsl.graphics.display.drawable;
+package com.ndsl.graphics.display.drawable.non_sync;
 
 import com.ndsl.graphics.display.Display;
+import com.ndsl.graphics.display.drawable.IDrawable;
+import com.ndsl.graphics.display.drawable.base.DrawableUtil;
 import com.ndsl.graphics.pos.Rect;
 
 import java.awt.*;
 import java.util.Objects;
 
-public class StringDrawable implements IDrawable{
+public class StringDrawable implements IDrawable {
     public static final String Default_Font_String="Meiryo UI";
     public static final int Default_Font_Size=12;
     public static final Font Default_Font=new Font(Default_Font_String, Font.PLAIN, Default_Font_Size);
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/ui/Button.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/ui/Button.java
@@ -1,7 +1,9 @@
-package com.ndsl.graphics.display.drawable.ui;
+package com.ndsl.graphics.display.drawable.non_sync.ui;
 
 import com.ndsl.graphics.display.Display;
 import com.ndsl.graphics.display.drawable.*;
+import com.ndsl.graphics.display.drawable.base.Drawable;
+import com.ndsl.graphics.display.drawable.base.DrawableUtil;
 import com.ndsl.graphics.pos.Rect;
 import org.jetbrains.annotations.NotNull;
 
@@ -46,7 +48,7 @@ public String getID() {
         return id;
     }
 
-    public static Drawable genButtonUI(Rect rect,Display display,String id){
+    public static Drawable genButtonUI(Rect rect, Display display, String id){
         return new Drawable(new Button(rect,display,id));
     }
 
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/ui/ICustomUI.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/ui/ICustomUI.java
@@ -1,9 +1,9 @@
-package com.ndsl.graphics.display.drawable.ui;
+package com.ndsl.graphics.display.drawable.non_sync.ui;
 
 import com.ndsl.graphics.pos.Rect;
 
 import java.awt.*;
-
+@Deprecated
 public interface ICustomUI {
     void onDraw(Graphics g, Rect showingRect);
 }
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/ui/MouseInputListener.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/ui/MouseInputListener.java
@@ -1,4 +1,4 @@
-package com.ndsl.graphics.display.drawable.ui;
+package com.ndsl.graphics.display.drawable.non_sync.ui;
 
 import com.ndsl.graphics.display.Display;
 import com.ndsl.graphics.display.mouse.MouseInputHandler;
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/ui/MouseUIListener.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/ui/MouseUIListener.java
@@ -1,10 +1,10 @@
-package com.ndsl.graphics.display.drawable.ui;
+package com.ndsl.graphics.display.drawable.non_sync.ui;
 
 import com.ndsl.graphics.display.Display;
 import com.ndsl.graphics.display.mouse.CustomMouseEvent;
-import com.ndsl.graphics.pos.Pos;
 import com.ndsl.graphics.pos.Rect;
 
+@Deprecated
 public interface MouseUIListener {
     void onHover(CustomMouseEvent e);
     void onClick(CustomMouseEvent e);
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/ui/StringGui.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/non_sync/ui/StringGui.java
@@ -1,14 +1,14 @@
-package com.ndsl.graphics.display.drawable;
+package com.ndsl.graphics.display.drawable.non_sync.ui;
 
 import com.ndsl.graphics.display.Display;
-import com.ndsl.graphics.pos.Pos;
+import com.ndsl.graphics.display.drawable.IDrawable;
+import com.ndsl.graphics.display.drawable.base.DrawableUtil;
 import com.ndsl.graphics.pos.Rect;
 import org.jetbrains.annotations.NotNull;
 
 import java.awt.*;
-import java.util.Objects;
 
-public class StringGui implements IDrawable{
+public class StringGui implements IDrawable {
     public static final String Default_Font_String="Arial";
     public static final int Default_Font_Size=12;
     public static final Font Default_Font=new Font(Default_Font_String, Font.PLAIN, Default_Font_Size);
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/synced/SyncedLineDrawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/synced/SyncedLineDrawable.java
@@ -0,0 +1,25 @@
+package com.ndsl.graphics.display.drawable.synced;
+
+import com.ndsl.graphics.display.drawable.non_sync.LineDrawable;
+import com.ndsl.graphics.pos.Line;
+
+import java.awt.*;
+
+public class SyncedLineDrawable extends LineDrawable {
+    public SyncedLineDrawable(Line line, String id) {
+        super(line, id);
+    }
+
+    public SyncedLineDrawable(Line line, Color color, String id) {
+        super(line, color, id);
+    }
+
+    public Line getLine(){
+        return this.line;
+    }
+
+    public SyncedLineDrawable setLine(Line line){
+        this.line=line;
+        return this;
+    }
+}
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/synced/SyncedPointDrawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/synced/SyncedPointDrawable.java
@@ -0,0 +1,22 @@
+package com.ndsl.graphics.display.drawable.synced;
+
+import com.ndsl.graphics.display.drawable.non_sync.PointDrawable;
+import com.ndsl.graphics.pos.Pos;
+
+import java.awt.*;
+
+public class SyncedPointDrawable extends PointDrawable {
+    public SyncedPointDrawable(Pos pos, Color color, String id) {
+        super(pos, color, id);
+    }
+
+    public SyncedPointDrawable(Pos pos, String id) {
+        super(pos, id);
+    }
+
+    public Pos getPos(){
+        return this.pos;
+    }
+
+    public SyncedPointDrawable setPos(Pos pos){this.pos=pos;return this;}
+}
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/synced/SyncedRectDrawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/synced/SyncedRectDrawable.java
@@ -0,0 +1,25 @@
+package com.ndsl.graphics.display.drawable.synced;
+
+import com.ndsl.graphics.display.drawable.non_sync.RectDrawable;
+import com.ndsl.graphics.pos.Rect;
+
+import java.awt.*;
+
+public class SyncedRectDrawable extends RectDrawable {
+    public SyncedRectDrawable(Rect r, Color c, String id) {
+        super(r, c, id);
+    }
+
+    public SyncedRectDrawable(Rect r, Color c, String id, boolean isFill) {
+        super(r, c, id, isFill);
+    }
+
+    public Rect getRect(){
+        return this.r;
+    }
+
+    public SyncedRectDrawable setRect(Rect rect){
+        this.r=rect;
+        return this;
+    }
+}
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/drawable/synced/SyncedStringDrawable.java b/graphics/src/main/java/com/ndsl/graphics/display/drawable/synced/SyncedStringDrawable.java
@@ -0,0 +1,38 @@
+package com.ndsl.graphics.display.drawable.synced;
+
+import com.ndsl.graphics.display.drawable.non_sync.StringDrawable;
+import com.ndsl.graphics.pos.Rect;
+
+import java.awt.*;
+
+public class SyncedStringDrawable extends StringDrawable {
+    public SyncedStringDrawable(String s, Rect r, Font f, String id) {
+        super(s, r, f, id);
+    }
+
+    public SyncedStringDrawable(String s, Rect r, int size, String id) {
+        super(s, r, size, id);
+    }
+
+    public SyncedStringDrawable(String s, Rect r, String id) {
+        super(s, r, id);
+    }
+
+    public String getText(){
+        return this.data;
+    }
+
+    public SyncedStringDrawable setText(String s){
+        this.data=s;
+        return this;
+    }
+
+    public Rect getRect(){
+        return this.r;
+    }
+
+    public SyncedStringDrawable setRect(Rect r){
+        this.r=r;
+        return this;
+    }
+}
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/fps/FPSLimiter.java b/graphics/src/main/java/com/ndsl/graphics/display/fps/FPSLimiter.java
@@ -1,9 +1,9 @@
 package com.ndsl.graphics.display.fps;
 
 import com.ndsl.graphics.display.Display;
-import com.ndsl.graphics.display.drawable.Drawable;
-import com.ndsl.graphics.display.drawable.GUIBase;
-import com.ndsl.graphics.display.drawable.StringGui;
+import com.ndsl.graphics.display.drawable.base.Drawable;
+import com.ndsl.graphics.display.drawable.base.GUIBase;
+import com.ndsl.graphics.display.drawable.non_sync.ui.StringGui;
 import com.ndsl.graphics.display.layer.Layer;
 import com.ndsl.graphics.pos.Pos;
 import com.ndsl.graphics.pos.Rect;
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/key/KeyInputHandler.java b/graphics/src/main/java/com/ndsl/graphics/display/key/KeyInputHandler.java
@@ -2,9 +2,9 @@
 
 import com.ndsl.graphics.display.Display;
 import com.ndsl.graphics.display.DisplayAttitude;
-import com.ndsl.graphics.display.drawable.Drawable;
-import com.ndsl.graphics.display.drawable.GUIBase;
-import com.ndsl.graphics.display.drawable.StringDrawable;
+import com.ndsl.graphics.display.drawable.base.Drawable;
+import com.ndsl.graphics.display.drawable.base.GUIBase;
+import com.ndsl.graphics.display.drawable.non_sync.StringDrawable;
 import com.ndsl.graphics.pos.Pos;
 import com.ndsl.graphics.pos.Rect;
 
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/layer/Layer.java b/graphics/src/main/java/com/ndsl/graphics/display/layer/Layer.java
@@ -1,6 +1,6 @@
 package com.ndsl.graphics.display.layer;
 
-import com.ndsl.graphics.display.drawable.Drawable;
+import com.ndsl.graphics.display.drawable.base.Drawable;
 import com.ndsl.graphics.display.drawable.IDrawable;
 import com.ndsl.graphics.display.scene.Scene;
 import org.jetbrains.annotations.Nullable;
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/mouse/MouseInputHandler.java b/graphics/src/main/java/com/ndsl/graphics/display/mouse/MouseInputHandler.java
diff --git a/graphics/src/main/java/com/ndsl/graphics/display/scene/Scene.java b/graphics/src/main/java/com/ndsl/graphics/display/scene/Scene.java

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`import com.ndsl.graphics.pos.Rect;`
`4`	`4`
`5`	`5`	`import java.awt.*;`
`6`		`-`
	`6`	`+@Deprecated`
`7`	`7`	`public interface ICustomGui {`
`8`	`8`	`void onDraw(Graphics g, Rect showingRect);`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.ndsl.graphics.display.drawable;`
	`1`	`+package com.ndsl.graphics.display.drawable.base;`
`2`	`2`
`3`	`3`	`import com.ndsl.graphics.pos.Pos;`
`4`	`4`	`import com.ndsl.graphics.pos.Rect;`