Fix triangle overlap with peg for level designer

Author: s7u4rt99

ps4/peggleclone/Models/TriangleBlock.swift

@@ -19,23 +19,23 @@ class TriangleBlock: PeggleObject {
         self.base = base
         self.height = height
         self.vertexOne = Point(xCoordinate: center.xCoordinate,
-                               yCoordinate: center.yCoordinate + 2 * height / 3)
-        self.vertexTwo = Point(xCoordinate: center.xCoordinate + base / 2,
-                               yCoordinate: center.yCoordinate - height / 3)
-        self.vertexThree = Point(xCoordinate: center.xCoordinate - base / 2,
-                                 yCoordinate: center.yCoordinate - height / 3)
+                               yCoordinate: center.yCoordinate - height / 2)
+        self.vertexTwo = Point(xCoordinate: center.xCoordinate - base / 2,
+                               yCoordinate: center.yCoordinate + height / 2)
+        self.vertexThree = Point(xCoordinate: center.xCoordinate + base / 2,
+                                 yCoordinate: center.yCoordinate + height / 2)
         super.init(center: center)
     }
 
     init(id: UUID, center: Point, base: Double = 50, height: Double = 50) {
         self.base = base
         self.height = height
         self.vertexOne = Point(xCoordinate: center.xCoordinate,
-                               yCoordinate: center.yCoordinate + 2 * height / 3)
-        self.vertexTwo = Point(xCoordinate: center.xCoordinate + base / 2,
-                               yCoordinate: center.yCoordinate - height / 3)
-        self.vertexThree = Point(xCoordinate: center.xCoordinate - base / 2,
-                                 yCoordinate: center.yCoordinate - height / 3)
+                               yCoordinate: center.yCoordinate - height / 2)
+        self.vertexTwo = Point(xCoordinate: center.xCoordinate - base / 2,
+                               yCoordinate: center.yCoordinate + height / 2)
+        self.vertexThree = Point(xCoordinate: center.xCoordinate + base / 2,
+                                 yCoordinate: center.yCoordinate + height / 2)
         super.init(id: id, center: center)
     }
 
@@ -66,7 +66,6 @@ class TriangleBlock: PeggleObject {
             let c3x = peg.center.xCoordinate - vertexThree.xCoordinate
             let c3y = peg.center.yCoordinate - vertexThree.yCoordinate
 
-    //        &c3sqr = radiusSqr                     // ; reference to radiusSqr
              let c3sqr = c3x * c3x + c3y * c3y - radiusSqr
 
             if c3sqr <= 0 {
@@ -142,17 +141,17 @@ class TriangleBlock: PeggleObject {
             return false
         } else {
         // TODO: implemenation of trinagle triangle intersect
-        return false
+            return false
         }
     }
 
     override func shiftTo(location: Point) {
         self.center = location
         self.vertexOne = Point(xCoordinate: center.xCoordinate,
-                               yCoordinate: center.yCoordinate + 2 * height / 3)
-        self.vertexTwo = Point(xCoordinate: center.xCoordinate + base / 2,
-                               yCoordinate: center.yCoordinate - height / 3)
-        self.vertexThree = Point(xCoordinate: center.xCoordinate - base / 2,
-                                 yCoordinate: center.yCoordinate - height / 3)
+                               yCoordinate: center.yCoordinate - height / 2)
+        self.vertexTwo = Point(xCoordinate: center.xCoordinate - base / 2,
+                               yCoordinate: center.yCoordinate + height / 2)
+        self.vertexThree = Point(xCoordinate: center.xCoordinate + base / 2,
+                                 yCoordinate: center.yCoordinate + height / 2)
     }
 }

ps4/peggleclone/Views/LevelDesigner/LevelDesignerCanvasView.swift

@@ -39,6 +39,7 @@ struct LevelDesignerCanvasView: View {
                             })))
         } else if let triangle = peggleObject as? TriangleBlock {
             return AnyView(
+//                ZStack() {
                 TriangleView(location: .constant(CGPoint(x: triangle.center.xCoordinate,
                                                          y: triangle.center.yCoordinate)),
                              triangleBase: triangle.base,
@@ -60,7 +61,21 @@ struct LevelDesignerCanvasView: View {
                                                               newLocation: locationOfTriangle,
                                                               canvasDimensions: canvasDimensions)
                                 }
-                            })))
+                            }))
+//                    Circle()
+//                        .fill(Color.black)
+//                        .frame(width: 15, height: 15)
+//                        .position(x: triangle.vertexOne.xCoordinate, y: triangle.vertexOne.yCoordinate)
+//                    Circle()
+//                        .fill(Color.black)
+//                        .frame(width: 15, height: 15)
+//                        .position(x: triangle.vertexTwo.xCoordinate, y: triangle.vertexTwo.yCoordinate)
+//                    Circle()
+//                        .fill(Color.black)
+//                        .frame(width: 15, height: 15)
+//                        .position(x: triangle.vertexThree.xCoordinate, y: triangle.vertexThree.yCoordinate)
+//                }
+                    )
         } else {
             return AnyView(EmptyView())
         }