调整浴盆旋转后的阴影

src/main/java/controller/MyPanel.java

@@ -35,8 +35,8 @@ public class MyPanel extends JPanel{
         drawAxis(config,g);
         Room room = new Room(config.getRoom());
         drawRoom(room,g);
-        drawTemplate(room,g);
-//        drawTemplateAndMove(room,g);
+//        drawTemplate(room,g);
+        drawTemplateAndMove(room,g);
     }
 
     /**
@@ -73,9 +73,10 @@ public class MyPanel extends JPanel{
     private void drawTemplateAndMove(Room room, Graphics g) {
         List<TemplateConfig> templateList = config.getTemplates();
         TemplateUtils.setRoom(room);
-        TemplateConfig templateConfig = templateList.get(0);
+        TemplateConfig templateConfig = templateList.get(1);
         Template template = new Template(templateConfig);
-        TemplateUtils.routeTemplate(template,1);
+        TemplateUtils.drawTemplate(template,g);
+        TemplateUtils.routeTemplate(template,3);
         TemplateUtils.drawTemplate(template,g);
     }
     private void drawRoom(Room room, Graphics g){

src/main/java/utils/TemplateUtils.java

@@ -26,7 +26,7 @@ public class TemplateUtils {
         }
         drawTemplateName(template,g);
         drawTemplateSelf(template,g);
-//        drawShadow(template,g);
+        drawShadow(template,g);
     }
 
     private static void drawTemplateName(Template template, Graphics g) {
@@ -132,19 +132,19 @@ public class TemplateUtils {
         int shadowY = shadow.getY();
         switch (rotateRange){
             case 1:
-                shadow.setX(-shadowY);
-                shadow.setY(shadowX);
+                shadow.setX(shadowY);
+                shadow.setY(-shadowX);
                 break;
             case 2:
                 shadow.setX(-shadowX);
                 shadow.setY(-shadowY);
                 break;
             case 3:
-                shadow.setX(shadowY);
-                shadow.setY(-shadowX);
+                shadow.setX(-shadowY);
+                shadow.setY(shadowX);
                 break;
         }
-        shadow.setDirect((shadow.getDirect()+rotateRange)%4);
+        shadow.setDirect((shadow.getDirect()+rotateRange-1)%4+1);
     }
 
     public static void changeTemplateAlignWall(Template template,int rotateRange){
@@ -162,7 +162,7 @@ public class TemplateUtils {
      * @param template
      * @param x,y
      */
-    private static void routeTemplate(TemplateConfig template, int x, int y) {
+    private static void moveTemplate(TemplateConfig template, int x, int y) {
         x = x*Constant.ENLARGE/Constant.NARROW;
         y = y*Constant.ENLARGE/Constant.NARROW;
         template.setX(template.getX()+x);
@@ -172,34 +172,39 @@ public class TemplateUtils {
         TemplateShadow shadow = template.getShadow();
         int cx = room.getX()+template.getX()+shadow.getX();
         int cy = room.getY()+template.getY()+shadow.getY();
+        System.out.println(template.getName()+"阴影接入点:"+cx+","+cy);
         int x1,y1,x2,y2;
+//        g.drawArc(cx,cy,6,6,0,360);
+//        if(1==1){
+//            return;
+//        }
         Graphics2D g2d = (Graphics2D) g.create();
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g2d.setColor(Color.GRAY);
+        int shadowWidth = shadow.getWidth();
+        if(shadowWidth < 0){
+            shadowWidth = -shadowWidth;
+        }
         switch (shadow.getDirect()){
-            case 0:
-                x1 = cx;
-                y1 = cy - template.getWidth()/2;
-                g2d.fillRect(x1,y1,shadow.getRadis(),template.getWidth());
-                break;
             case 1:
-                x1 = cx-shadow.getRadis()/2;
-                y1 = cy-template.getWidth();
-                g2d.fillRect(x1,y1,shadow.getRadis(),shadow.getRadis());
+                x1 = cx-shadow.getWidth()/2;
+                y1 = cy;
+                g2d.fillRect(x1,y1,shadowWidth,shadow.getRadis());
                 break;
             case 2:
-                x1 = cx-shadow.getRadis();
-                y1 = cy-template.getWidth();
-                x2 = cx+shadow.getRadis();
-                y2 = cy + template.getWidth()/2;
-                g2d.fillRect(x1,y1,shadow.getRadis(),shadow.getRadis());
+                x1 = cx;
+                y1 = cy - shadowWidth/2;
+                g2d.fillRect(x1,y1,shadow.getRadis(),shadowWidth);
                 break;
             case 3:
                 x1 = cx-shadow.getRadis()/2;
-                y1 = cy;
-                x2 = cx+shadow.getRadis();
-                y2 = cy + template.getWidth()/2;
-                g2d.fillRect(x1,y1,shadow.getRadis(),shadow.getRadis());
+                y1 = cy-shadowWidth;
+                g2d.fillRect(x1,y1,shadowWidth,shadow.getRadis());
+                break;
+            case 4:
+                x1 = cx-shadow.getRadis();
+                y1 = cy-shadowWidth/2;
+                g2d.fillRect(x1,y1,shadow.getRadis(),shadowWidth);
                 break;
             default:break;
         }

src/main/resources/config.yml

@@ -1,5 +1,5 @@
 enlarge: 1
-narrow: 6
+narrow: 10
 axisPoint:
   x: 200
   y: 2500
@@ -41,7 +41,8 @@ templates:
     x: 550
     y: 500
     width: 1000
-    direct: 0
+    #1:bottom 2:right 3:top 4:left 贴边向外，小于0向内
+    direct: 2
     radis: 800
 #浴盆
  - name: PY
@@ -61,7 +62,7 @@ templates:
  - name: MT
    length: 700
    width: 850
-   x: 2000
+   x: 0
    y: 0
    alignWall: [4]
    shadow:
@@ -69,6 +70,6 @@ templates:
     y: 425
     width: 800
     #数值等于坐标轴的朝向
-    direct: 0
+    direct: 2
     radis: 500
 zoom: 1