Merge pull request #84 from UmbrellaLeaf5/small_fixes

small fixes
UmbrellaLeaf5 · May 14, 2024 · e6a8b0a · e6a8b0a
2 parents bc42d52 + 038666e
commit e6a8b0a
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 57 deletions.
diff --git a/.extra/images/AA.png b/.extra/images/AA.png
diff --git a/.extra/images/target.png b/.extra/images/target.png
diff --git a/.extra/json/file.json b/.extra/json/file.json
diff --git a/.extra/json/shapes_2.json b/.extra/json/shapes_2.json
@@ -0,0 +1,226 @@
+{
+    "Hills": [
+        {
+            "Id": 40001,
+            "Vertices": [
+                {
+                    "X": -25.8437,
+                    "Y": 3.59211
+                },
+                {
+                    "X": -10.220724087645344,
+                    "Y": 46.575086389491545
+                },
+                {
+                    "X": 8.858454099199534,
+                    "Y": 47.67159088298838
+                },
+                {
+                    "X": 18.5077,
+                    "Y": 24.4257
+                }
+            ]
+        },
+        {
+            "Id": 40000,
+            "Vertices": [
+                {
+                    "X": 23.167871749486935,
+                    "Y": 36.31120476458979
+                },
+                {
+                    "X": 22.000234305563637,
+                    "Y": 0.2643686507672598
+                },
+                {
+                    "X": 55.51142894616228,
+                    "Y": -4.042111769910655
+                },
+                {
+                    "X": 35.1945374218969,
+                    "Y": 30.888229420032417
+                }
+            ]
+        }
+    ],
+    "Targets": [
+        {
+            "Id": 10000,
+            "X": 7.919552991488025,
+            "Y": 16.55916271383264
+        },
+        {
+            "Id": 10001,
+            "X": -13.889921384163955,
+            "Y": 47.129707992524295
+        },
+        {
+            "Id": 10002,
+            "X": 19.663116116839085,
+            "Y": 24.947422089083396
+        },
+        {
+            "Id": 10003,
+            "X": -23.396615342781484,
+            "Y": -3.3862540228747164
+        },
+        {
+            "Id": 10004,
+            "X": 59.92676111804275,
+            "Y": -2.08141367561349
+        },
+        {
+            "Id": 10005,
+            "X": 12.20688556106063,
+            "Y": -10.096861523075326
+        },
+        {
+            "Id": 10006,
+            "X": 18.122479668419928,
+            "Y": 62.43950441037006
+        },
+        {
+            "Id": 10007,
+            "X": 46.11954787154053,
+            "Y": -26.576930968956088
+        },
+        {
+            "Id": 10008,
+            "X": -30.435859806658286,
+            "Y": 29.9910692385465
+        },
+        {
+            "Id": 10009,
+            "X": 45.636433221160395,
+            "Y": 36.01659739916582
+        },
+        {
+            "Id": 10010,
+            "X": 32.70665404316481,
+            "Y": 35.137874542408824
+        },
+        {
+            "Id": 10011,
+            "X": 39.861968733900234,
+            "Y": 39.405956989514166
+        },
+        {
+            "Id": 10012,
+            "X": 18.647088335053105,
+            "Y": 40.912339029668985
+        },
+        {
+            "Id": 10013,
+            "X": 32.08443155230502,
+            "Y": 52.71233167754845
+        },
+        {
+            "Id": 10014,
+            "X": 34.21847277585769,
+            "Y": 51.205949637393616
+        },
+        {
+            "Id": 10015,
+            "X": 29.57379481871365,
+            "Y": 50.70382229067533
+        },
+        {
+            "Id": 10016,
+            "X": 32.20996338898459,
+            "Y": 48.946376577161374
+        }
+    ],
+    "Trappy_Circles": [
+        {
+            "Id": 20000,
+            "Radius": 10.14584,
+            "X": 0.883362,
+            "Y": 3.76028
+        },
+        {
+            "Id": 20004,
+            "Radius": 7.098120017227275,
+            "X": 14.343409181715266,
+            "Y": 52.865085174213014
+        },
+        {
+            "Id": 20002,
+            "Radius": 1.2906186630113354,
+            "X": 58.37746878313216,
+            "Y": -3.005475947971121
+        },
+        {
+            "Id": 20001,
+            "Radius": 6.871468522371515,
+            "X": 15.009247865260352,
+            "Y": 14.817571670134896
+        },
+        {
+            "Id": 20003,
+            "Radius": 9.108004552405431,
+            "X": 45.597530738654505,
+            "Y": -16.452272507642146
+        },
+        {
+            "Id": 20005,
+            "Radius": 2.846003583686265,
+            "X": 29.56835812617559,
+            "Y": 38.02510678603892
+        },
+        {
+            "Id": 20006,
+            "Radius": 3.9237485206983584,
+            "X": 39.11421440636088,
+            "Y": 33.1293651555357
+        },
+        {
+            "Id": 20007,
+            "Radius": 0.3969665227716981,
+            "X": 32.2099633889846,
+            "Y": 51.20594963739361
+        },
+        {
+            "Id": 20008,
+            "Radius": 12.593289788246313,
+            "X": -8.211288021836545,
+            "Y": 63.00594228527307
+        }
+    ],
+    "Trappy_Lines": [
+        {
+            "Id": 30000,
+            "Id_P1": 10006,
+            "Id_P2": 10004
+        },
+        {
+            "Id": 30001,
+            "Id_P1": 10010,
+            "Id_P2": 10005
+        },
+        {
+            "Id": 30002,
+            "Id_P1": 10009,
+            "Id_P2": 10007
+        },
+        {
+            "Id": 30003,
+            "Id_P1": 10012,
+            "Id_P2": 10011
+        },
+        {
+            "Id": 30004,
+            "Id_P1": 10015,
+            "Id_P2": 10014
+        },
+        {
+            "Id": 30005,
+            "Id_P1": 10016,
+            "Id_P2": 10013
+        },
+        {
+            "Id": 30006,
+            "Id_P1": 10001,
+            "Id_P2": 10008
+        }
+    ]
+}
diff --git a/README.md b/README.md
@@ -38,6 +38,7 @@ pacman -S mingw-w64-x86_64-ninja
 pacman -S mingw-w64-x86_64-cmake
 pacman -S mingw-w64-x86_64-qt-creator
 pacman -S mingw-w64-x86_64-boost
+pacman -S mingw-w64-x86_64-clang
 ```
 
 3) Install **[Git Bash](https://gitforwindows.org/)** to any convenient folder (if you haven't get it yet)