From 9fd2235ba086c9283b9fbb7f5eb3aa1342c5f29c Mon Sep 17 00:00:00 2001 From: Fp_Sviat Date: Wed, 3 Jun 2026 18:51:01 +0300 Subject: [PATCH] Changed Color range and line thickness --- src/gui/EditableCanvas.java | 3 ++- src/gui/render/DrawboxRectengleRenderingFunction.java | 7 ++++++- src/gui/render/HitboxCircleRenderingFunction.java | 5 +++++ src/gui/render/HitboxRectengleRenderingFunction.java | 5 +++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/gui/EditableCanvas.java b/src/gui/EditableCanvas.java index 23cb690..b07d957 100644 --- a/src/gui/EditableCanvas.java +++ b/src/gui/EditableCanvas.java @@ -1,5 +1,6 @@ package gui; +import java.awt.AlphaComposite; import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; @@ -89,7 +90,7 @@ public class EditableCanvas extends JPanel implements MouseListener, MouseMotion calculatedCenteringImagePoint(); g.drawImage(image, (int)centeringImage.x, (int)centeringImage.y, (int) (image.getWidth() * scaleIndex), (int) (image.getHeight() * scaleIndex), this); - g.setColor(Color.MAGENTA); + g.setColor(Color.gray); g.drawRect((int)centeringImage.x, (int)centeringImage.y,(int) (image.getWidth() * scaleIndex)-1, (int) (image.getHeight() * scaleIndex)-1); g.setColor(Color.green); diff --git a/src/gui/render/DrawboxRectengleRenderingFunction.java b/src/gui/render/DrawboxRectengleRenderingFunction.java index a52eaba..8c435ac 100644 --- a/src/gui/render/DrawboxRectengleRenderingFunction.java +++ b/src/gui/render/DrawboxRectengleRenderingFunction.java @@ -1,5 +1,7 @@ package gui.render; +import java.awt.AlphaComposite; +import java.awt.BasicStroke; import java.awt.Color; import java.awt.Graphics2D; import java.awt.event.MouseEvent; @@ -32,6 +34,9 @@ public class DrawboxRectengleRenderingFunction implements ShapeRenderingFunction @Override public void drawing(Graphics2D g) { + AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f); + g.setComposite(composite); + g.setStroke(new BasicStroke(2)); scaleIndex = entity.getScaleIndex(); Drawbox drawbox = entity.getDrawbox(); drawboxPoints = drawbox.getDrawboxlistPoints(); @@ -61,7 +66,7 @@ public class DrawboxRectengleRenderingFunction implements ShapeRenderingFunction g.drawLine((int)(x1*scaleIndex+centeringImage.x), (int)(y1*scaleIndex+centeringImage.y), (int)(x2*scaleIndex+centeringImage.x), (int)(y2*scaleIndex+centeringImage.y)); } // ОТРИСОВКА ОСНОВАНИЯ - g.setColor(Color.BLUE); + g.setColor(Color.CYAN); for(int i = 0; i < basePoints.size()-1;i++) { int x1 = (int)basePoints.get(i).x; int y1 = (int)basePoints.get(i).y; diff --git a/src/gui/render/HitboxCircleRenderingFunction.java b/src/gui/render/HitboxCircleRenderingFunction.java index e4b0cc4..c4852dd 100644 --- a/src/gui/render/HitboxCircleRenderingFunction.java +++ b/src/gui/render/HitboxCircleRenderingFunction.java @@ -1,5 +1,7 @@ package gui.render; +import java.awt.AlphaComposite; +import java.awt.BasicStroke; import java.awt.Graphics2D; import java.awt.event.MouseEvent; import java.util.ArrayList; @@ -30,6 +32,9 @@ public class HitboxCircleRenderingFunction implements ShapeRenderingFunction { @Override public void drawing(Graphics2D g) { + AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f); + g.setComposite(composite); + g.setStroke(new BasicStroke(2)); scaleIndex = entity.getScaleIndex(); HitboxCircle nowHitbox = (HitboxCircle)entity.getHitbox(); if(nowHitbox.getRadius()!=0) { diff --git a/src/gui/render/HitboxRectengleRenderingFunction.java b/src/gui/render/HitboxRectengleRenderingFunction.java index c212a9a..850b7d5 100644 --- a/src/gui/render/HitboxRectengleRenderingFunction.java +++ b/src/gui/render/HitboxRectengleRenderingFunction.java @@ -1,5 +1,7 @@ package gui.render; +import java.awt.AlphaComposite; +import java.awt.BasicStroke; import java.awt.Graphics2D; import java.awt.event.MouseEvent; import java.time.LocalTime; @@ -39,6 +41,9 @@ public class HitboxRectengleRenderingFunction implements ShapeRenderingFunction @Override public void drawing(Graphics2D g) { + AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.9f); + g.setComposite(composite); + g.setStroke(new BasicStroke(2)); scaleIndex = entity.getScaleIndex(); HitboxRectangle nowHitbox = (HitboxRectangle)entity.getHitbox(); if(nowHitbox.getListPointsIso().size() == 4) {