-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathchanges.patch
More file actions
248 lines (248 loc) · 9.02 KB
/
Copy pathchanges.patch
File metadata and controls
248 lines (248 loc) · 9.02 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
diff --git a/changes.patch b/changes.patch
index 5d67cdd..e69de29 100644
--- a/changes.patch
+++ b/changes.patch
@@ -1,243 +0,0 @@
-diff --git a/src/main/index.ts b/src/main/index.ts
-index 06e06b4..882ceba 100644
---- a/src/main/index.ts
-+++ b/src/main/index.ts
-@@ -2,6 +2,7 @@ import { app, shell, BrowserWindow, ipcMain } from 'electron'
- import { join } from 'path'
- import { electronApp, optimizer, is } from '@electron-toolkit/utils'
- import icon from '../../resources/icon.png?asset'
-+import {app} from 'electron'
-
- function createWindow(): void {
- // Create the browser window.
-@@ -17,6 +18,10 @@ function createWindow(): void {
- }
- })
-
-+ if (app.isPackaged == false) {
-+ mainWindow.webContents.openDevTools({ mode: 'undocked'})
-+ }
-+
- mainWindow.on('ready-to-show', () => {
- mainWindow.show()
- })
-diff --git a/src/renderer/src/components/canvas.tsx b/src/renderer/src/components/canvas.tsx
-index 9089e2f..0ee4cb0 100644
---- a/src/renderer/src/components/canvas.tsx
-+++ b/src/renderer/src/components/canvas.tsx
-@@ -31,6 +31,7 @@ const Canvas: Component = () => {
- testDrone.findNextPoint();
- renderCircle(ctx, testDrone.x, testDrone.y);
- renderText(ctx, testDrone.z.toString(), testDrone.x + 10, testDrone.y + 5);
-+ // console.log("TestDroneAngle: " + testDrone.forwardAngle.toString() + ", " + testDrone.rearAngle.toString());
- }
- if (missile.alive == true) {
- missile.findNextPoint();
-@@ -101,11 +102,16 @@ const Canvas: Component = () => {
- }
- for (let i = 0; i < flareArr.length; i++) {
- let flare: flareState = flareArr[i];
-+ if (flare.real == true && !flare.hasBeenChecked && flare.alive == true) {
-+ missile.calculateChanceToTrackFlare(flare.MDF_angle, flare.id)
-+ flare.hasBeenChecked = true;
-+ }
- flare.lifespan -= 1;
- if (flare.lifespan > 0) {
- const successChance = Math.random();
-- if (successChance > .70) {
-+ if (successChance < missile.chanceToTrackFlare && flare.real == true) {
- missile.target = flare
-+ console.log("flare success!");
- }
- }
- }
-diff --git a/src/renderer/src/components/flaresButton.tsx b/src/renderer/src/components/flaresButton.tsx
-index 062c668..4a594c4 100644
---- a/src/renderer/src/components/flaresButton.tsx
-+++ b/src/renderer/src/components/flaresButton.tsx
-@@ -5,6 +5,8 @@ import { Show } from 'solid-js'
- import { testDrone } from '../utils/canvasUtils';
- import { TestingMode, setTestingMode, toggleTestingMode } from '../utils/testingMode';
- import { flareState } from "../utils/canvasUtils";
-+import {d3_distanceBetweenPoints, missile, angleFromThreePoints, pointFromAngleAndDistance } from "../utils/canvasUtils"
-+import test from 'node:test';
-
- let flareArr = [];
- const FlareButton: Component = () => {
-@@ -17,10 +19,35 @@ const FlareButton: Component = () => {
- if (frameCounter >= 15) {
- frameCounter = 0
- let flare = new flareState();
-- flare.x = testDrone.x;
-- flare.y = testDrone.y;
-+ const point = pointFromAngleAndDistance(testDrone.x, testDrone.y, testDrone.rearAngle, 20);
-+ flare.x = point.x;
-+ flare.y = point.y;
- flare.z = testDrone.z;
- flare.lifespan = 5;
-+ flare.id = curFlares;
-+
-+ // Only flare[1] is real, all others are just for show
-+ if (curFlares == 1) {
-+
-+ // Check for distance. If distance too far, flare.real =false
-+ const distance = d3_distanceBetweenPoints(
-+ flare.x, flare.y, flare.z,
-+ missile.x, missile.y, missile.z)
-+
-+ if (distance > 200) {
-+ console.log("flare FAILED: Distance too far!")
-+ } else {
-+ flare.real = true
-+ const MDF_angle = angleFromThreePoints(
-+ testDrone.x, testDrone.y,
-+ missile.x, missile.y,
-+ flare.x, flare.y
-+ )
-+ flare.MDF_angle = MDF_angle;
-+ // console.log("FDM angle: " + MDF_angle.toString())
-+ console.log("Spawned real flare")
-+ }
-+ }
- flare.startLifeCountdown();
- flareArr.push(flare);
- curFlares += 1;
-@@ -32,7 +59,7 @@ const FlareButton: Component = () => {
- }
-
- function handleClick() {
-- console.log("Flare button clicked");
-+ console.log("Flare button clicked1");
- // for (let i = 0; i < 5; i++) {
- const interval = setInterval(() => handleFrame(interval), 30)
- // }
-diff --git a/src/renderer/src/utils/canvasUtils.tsx b/src/renderer/src/utils/canvasUtils.tsx
-index eaffe36..933b448 100644
---- a/src/renderer/src/utils/canvasUtils.tsx
-+++ b/src/renderer/src/utils/canvasUtils.tsx
-@@ -12,6 +12,8 @@ class MissileState {
- curDirection: number = 270; // in degrees, 0 is to the right, increases counterclockwise
- turnRate: number = 3;
-
-+ chanceToTrackFlare: number = .5
-+
- zSpeed: number = 1;
- speed: number = 1;
-
-@@ -63,8 +65,27 @@ class MissileState {
- console.log("Hit detected!");
- this.alive = false;
- this.target.alive = false;
-+ this.x = this.launcherX
-+ this.y = this.launcherY
-+ this.z = 0
-+ this.chanceToTrackFlare = 0.5;
- }
- }
-+
-+ calculateChanceToTrackFlare(MDF_angle: number, flareId: number) {
-+ const maxAngle = 90; // maximum considered angle (degrees)
-+ const minChance = 0.1; // minimum chance
-+ const maxChance = 1.0; // maximum chance
-+
-+ const absAngle = Math.abs(MDF_angle);
-+ if (absAngle > maxAngle) {
-+ this.chanceToTrackFlare = minChance;
-+ } else {
-+ // Linear interpolation: closer to 0 angle, higher the chance
-+ this.chanceToTrackFlare = maxChance - ((absAngle / maxAngle) * (maxChance - minChance));
-+ }
-+ console.log("chanceToTrackFlare: " + this.chanceToTrackFlare.toString() + " \nMDF angle: " + MDF_angle.toString() + " \nflareId: " + flareId);
-+ }
- }
-
- class droneState {
-@@ -85,6 +106,9 @@ class droneState {
- { x: 500, y: 50, z: 10 }
- ];
-
-+ forwardAngle: number = 0;
-+ rearAngle: number = 0;
-+
- setId(id: string) {
- this.id = id;
- }
-@@ -99,6 +123,8 @@ class droneState {
- const angle = angleBetweenPoints(this.x, this.y, dest.x, dest.y);
- const nextPoint = pointFromAngleAndDistance(this.x, this.y, angle, this.speed);
-
-+ this.updateAngles(angle);
-+
- this.x = nextPoint.x;
- this.y = nextPoint.y;
- this.z = zPointFromDestination(this.z, dest.z, this.climbSpeed, this.fallSpeed);
-@@ -120,6 +146,12 @@ class droneState {
- }
- return false;
- }
-+
-+
-+ updateAngles(angle: number) {
-+ this.forwardAngle = angle;
-+ this.rearAngle = normalizeAngle(angle + 180);
-+ }
- }
-
- class flareState {
-@@ -127,14 +159,19 @@ class flareState {
- y: number = 0;
- z: number = 0;
-
-+ id: number = 0;
-+
- alive: boolean = true;
- zSpeed: number = 0;
-
- lifespan: number = 5;
-+ real: boolean = false; // only 1 flare will be used for countermeasure
-+
-+ hasBeenChecked: boolean = false;
-
- path: { x: number, y: number, z: number }[] = [];
-
--
-+ MDF_angle: number = 180; // used for calculating flare success chance. Angle between drone->missile and drone->flare.
-
- createFlarePath() {
-
-@@ -282,6 +319,25 @@ function zPointFromDestination(currentZ: number, destZ: number, climbSpeed: numb
- return currentZ;
- }
-
-+// find angle from 3 points: current point, point1, point2.
-+function angleFromThreePoints(
-+ cx: number, cy: number,
-+ x1: number, y1: number,
-+ x2: number, y2: number): number
-+{
-+ // Vectors from vertex to each point
-+ const v1 = { x: x1 - cx, y: y1 - cy };
-+ const v2 = { x: x2 - cx, y: y2 - cy };
-+
-+ const dotProduct = v1.x * v2.x + v1.y * v2.y;
-+ const magnitudeV1 = Math.sqrt(v1.x ** 2 + v1.y ** 2);
-+ const magnitudeV2 = Math.sqrt(v2.x ** 2 + v2.y ** 2);
-+
-+ const cosAngle = Math.max(-1, Math.min(1, dotProduct / (magnitudeV1 * magnitudeV2)));
-+
-+ return Math.acos(cosAngle) * (180 / Math.PI);
-+}
-+
- function normalizeAngle(angle: number): number {
- return (angle + 360) % 360;
- }
-@@ -300,6 +356,9 @@ export { utilFoo,
- flareState,
- drawLauncherDirection,
- changeLauncherDirection,
-+ d3_distanceBetweenPoints,
-+ angleFromThreePoints,
-+ pointFromAngleAndDistance,
- missile,
- drone1,
- drone2,