Merge branch 'main' of https://github.com/ucsd-cse125-sp24/group1 int…

…o main

assets/models/index.ts

@@ -15,6 +15,7 @@ import { magic_sauce } from "./magic_sauce";
 import { mushroom } from "./mushroom";
 import { pickaxe } from "./pickaxe";
 import { player_blue } from "./player_blue";
+import { player_blue_slap1, player_blue_slap2, player_blue_slap3 } from "./player_blue/slap";
 import { player_green } from "./player_green";
 import { player_red } from "./player_red";
 import { player_yellow } from "./player_yellow";
@@ -68,6 +69,10 @@ export const getModels = (engine: GraphicsEngine) =>
 		mushroom: GltfModelWrapper.from(engine.gltfMaterial, mushroom),
 		pickaxe: GltfModelWrapper.from(engine.gltfMaterial, pickaxe),
 		player_blue: GltfModelWrapper.from(engine.gltfMaterial, player_blue),
+		player_blue_slap1: GltfModelWrapper.from(engine.gltfMaterial, player_blue_slap1),
+		player_blue_slap2: GltfModelWrapper.from(engine.gltfMaterial, player_blue_slap2),
+		player_blue_slap3: GltfModelWrapper.from(engine.gltfMaterial, player_blue_slap3),
+
 		player_green: GltfModelWrapper.from(engine.gltfMaterial, player_green),
 		player_red: GltfModelWrapper.from(engine.gltfMaterial, player_red),
 		player_yellow: GltfModelWrapper.from(engine.gltfMaterial, player_yellow),

assets/models/player_blue/slap/index.ts

@@ -0,0 +1,11 @@
+import { parseGltf } from "../../../../common/gltf/gltf-parser";
+import bin1 from "./player_blue_slap1.bin";
+import bin2 from "./player_blue_slap2.bin";
+import bin3 from "./player_blue_slap3.bin";
+import root1 from "./player_blue_slap1.gltf";
+import root2 from "./player_blue_slap2.gltf";
+import root3 from "./player_blue_slap3.gltf";
+
+export const player_blue_slap1 = parseGltf(root1, { "player_blue_slap1.bin": bin1 });
+export const player_blue_slap2 = parseGltf(root2, { "player_blue_slap2.bin": bin2 });
+export const player_blue_slap3 = parseGltf(root3, { "player_blue_slap3.bin": bin3 });