thi-sjsu-project/theia
0
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix initialLPD, but drones still broken

Browse Source
This commit is contained in:
Polfish 2024-05-09 15:31:03 -07:00
parent 4a6a5c9a24
commit c86bdf19b7
No known key found for this signature in database
GPG Key ID: E706CA7CBC58FD52
6 changed files with 151 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/Prototype.tsx
View File

@ -16,8 +16,7 @@ import useWorldSim from 'src/hooks/useWorldSim';
import assimilator from 'src/prototype/assimilator';
import selector from 'src/prototype/selector';
// ~~~~~~~ Constants ~~~~~~~
import { ownship, drones, initialShips } from 'src/utils/initialShips';
import { initialSections } from 'src/utils/initialSections';
import { ownship, drones } from 'src/prototype/lpd/initialLPD';
import Home from 'src/components/Home';
import monitor from 'src/prototype/monitor';
@ -38,9 +37,9 @@ const Prototype = () => {
audioComplexity: 0,
ownship,
drones,
widgets: { ...initialShips },
messages: [],
sections: [...initialSections],
// Initial sections, widgets, and elements
...selector(),
};
dispatch(initializeState(initialState));

367
src/prototype/lpd/initialLPD.ts
View File

@ -5,132 +5,150 @@ import type { Widget, WidgetMap } from 'src/types/widget';
import lpdHelper from 'src/utils/lpdHelper';
export const ownship: Widget = {
...lpdHelper.generateVehicleWidget(lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
400,
950,
50,
50,
'minimap',
false,
false,
1,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
OWNSHIP_LOGO,
'ownship',
),
],
)),
...lpdHelper.generateVehicleWidget(
lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
400,
950,
50,
50,
'/minimap',
false,
false,
1,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
OWNSHIP_LOGO,
'ownship',
),
],
),
0,
),
};
export const drones: Widget[] = [
{
...lpdHelper.generateVehicleWidget(lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
500,
200,
50,
50,
'minimap',
false,
false,
10,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
DRONE_LOGO,
'drone',
),
],
)),
...lpdHelper.generateVehicleWidget(
lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
500,
200,
50,
50,
'/minimap',
false,
false,
10,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
DRONE_LOGO,
'drone',
),
],
),
1,
),
},
{
...lpdHelper.generateVehicleWidget(lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
1500,
550,
50,
50,
'minimap',
false,
false,
10,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
DRONE_LOGO,
'drone',
),
],
)),
...lpdHelper.generateVehicleWidget(
lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
1500,
550,
50,
50,
'/minimap',
false,
false,
10,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
DRONE_LOGO,
'drone',
),
],
),
2,
),
},
{
...lpdHelper.generateVehicleWidget(lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
1500,
350,
50,
50,
'minimap',
false,
false,
10,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
DRONE_LOGO,
'drone',
),
],
)),
...lpdHelper.generateVehicleWidget(
lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
1500,
350,
50,
50,
'/minimap',
false,
false,
10,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
DRONE_LOGO,
'drone',
),
],
),
3,
),
},
{
...lpdHelper.generateVehicleWidget(lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
200,
900,
50,
50,
'minimap',
false,
false,
10,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
DRONE_LOGO,
'drone',
),
],
)),
...lpdHelper.generateVehicleWidget(
lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
200,
900,
50,
50,
'/minimap',
false,
false,
10,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
DRONE_LOGO,
'drone',
),
],
),
4,
),
},
{
...lpdHelper.generateVehicleWidget(lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
1150,
750,
50,
50,
'minimap',
false,
false,
10,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
DRONE_LOGO,
'drone',
),
],
)),
...lpdHelper.generateVehicleWidget(
lpdHelper.generateBaseWidget(
uuid(),
'vehicle',
1150,
750,
50,
50,
'/minimap',
false,
false,
10,
[
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
DRONE_LOGO,
'drone',
),
],
),
5,
),
},
];
@ -146,7 +164,7 @@ const initialLPD = {
sections: [
lpdHelper.generateSection(
uuid(),
'minimap',
'/minimap',
50,
40,
350,
@ -157,7 +175,7 @@ const initialLPD = {
),
lpdHelper.generateSection(
uuid(),
'minimap',
'/minimap',
50,
850,
800,
@ -168,7 +186,7 @@ const initialLPD = {
),
lpdHelper.generateSection(
uuid(),
'minimap',
'/minimap',
800,
200,
500,
@ -179,7 +197,7 @@ const initialLPD = {
),
lpdHelper.generateSection(
uuid(),
'minimap',
'/minimap',
1800,
450,
500,
@ -190,7 +208,7 @@ const initialLPD = {
),
lpdHelper.generateSection(
uuid(),
'minimap',
'/minimap',
1800,
200,
200,
@ -201,117 +219,6 @@ const initialLPD = {
),
],
widgets: initialShips,
// widgets: [
// // Ownship
// lpdHelper.generateWidget(
// uuid(),
// 'vehicle',
// 400,
// 950,
// 50,
// 50,
// false,
// false,
// 1,
// [
// lpdHelper.generateIconElement(
// lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
// OWNSHIP_LOGO,
// 'ownship',
// ),
// ],
// ),
// // Drones
// lpdHelper.generateWidget(
// uuid(),
// 'vehicle',
// 500,
// 200,
// 50,
// 50,
// false,
// false,
// 10,
// [
// lpdHelper.generateIconElement(
// lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
// DRONE_LOGO,
// 'drone',
// ),
// ],
// ),
// lpdHelper.generateWidget(
// uuid(),
// 'vehicle',
// 1500,
// 550,
// 50,
// 50,
// false,
// false,
// 10,
// [
// lpdHelper.generateIconElement(
// lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
// DRONE_LOGO,
// 'drone',
// ),
// ],
// ),
// lpdHelper.generateWidget(
// uuid(),
// 'vehicle',
// 1500,
// 350,
// 50,
// 50,
// false,
// false,
// 10,
// [
// lpdHelper.generateIconElement(
// lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
// DRONE_LOGO,
// 'drone',
// ),
// ],
// ),
// lpdHelper.generateWidget(
// uuid(),
// 'vehicle',
// 200,
// 900,
// 50,
// 50,
// false,
// false,
// 10,
// [
// lpdHelper.generateIconElement(
// lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
// DRONE_LOGO,
// 'drone',
// ),
// ],
// ),
// lpdHelper.generateWidget(
// uuid(),
// 'vehicle',
// 1150,
// 750,
// 50,
// 50,
// false,
// false,
// 10,
// [
// lpdHelper.generateIconElement(
// lpdHelper.generateBaseElement(uuid(), 'visual', 50, 50, 0, 0),
// DRONE_LOGO,
// 'drone',
// ),
// ],
};
export default initialLPD;

9
src/prototype/selector.ts
View File

@ -30,14 +30,15 @@ type SelectorProps = {
*/
const selector = ({ message, stressLevel }: SelectorProps = {}) => {
// Call the LPD function that corresponds to the stress level from the message
if (message && stressLevel) {
if (!message && !stressLevel) {
// If no message and no stress provided, return the initial LPD
return initialLPD;
} else {
// Transform range of stress levels from 0-1 to 0-2 only returning integers
stressLevel = Math.floor(stressLevel * 3);
console.log(stressLevel);
return stressLevelLPDFunctions[stressLevel](message);
} else {
// If no message is provided, return the initial LPD
return initialLPD;
}
// const selector = ({ message }: SelectorProps) => {
// const possibleWidgets: Widget[] = [];

2
src/redux/slices/minimapSlice.ts
View File

@ -28,6 +28,8 @@ export type InitialMinimapState = {
const initialState: InitialMinimapState = {
visualComplexity: 0,
audioComplexity: 0,
ownship,
drones,
messages: [],
// Initial sections, widgets, and elements
...selector(),

4
src/utils/lpdHelper.ts
View File

@ -9,7 +9,7 @@ import type { ScreenType, Section, SectionType } from "src/types/support-types";
// Functions to create sections, widgets, and elements
const generateSection = (
id: string,
screen: "pearce" | "minimap" | "boring-right",
screen: ScreenType,
x: number,
y: number,
w: number,
@ -85,9 +85,11 @@ const generateGridWidget = (
const generateVehicleWidget = (
baseWidget: Widget.BaseWidget,
vehicleId: number,
): Widget.VehicleWidget => ({
...baseWidget,
type: "vehicle",
vehicleId,
});
const generateCustomWidget = (

2
submodules/message-schemas

@ -1 +1 @@
Subproject commit ce12c3c5617c1dd30124481e795b6791daa7f3b0
Subproject commit e92d57ab4226c46e97bdd5164f8121db67caf808