Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/ucsd-cse125-sp24/group1
Browse files Browse the repository at this point in the history
  • Loading branch information
@dowhep
dowhep committed Jun 7, 2024
2 parents dbdac10 + 212bdb7 commit 0d2593a
Show file tree
Hide file tree
Showing 30 changed files with 1,089 additions and 82 deletions.
11 changes: 11 additions & 0 deletions assets/models/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ import { player_blue_walk1, player_blue_walk2 } from "./player_blue/walk";
import { player_green_walk1, player_green_walk2 } from "./player_green/walk";
import { player_red_walk1, player_red_walk2 } from "./player_red/walk";
import { player_yellow_walk1, player_yellow_walk2 } from "./player_yellow/walk";
import { anvilHelp, furnaceHelp, workstationHelp } from "./workstation_help";
import { big_boss_hit1, big_boss_hit2 } from "./mushroom_king/hit";

export const getModels = (engine: GraphicsEngine) =>
({
Expand Down Expand Up @@ -124,9 +126,18 @@ export const getModels = (engine: GraphicsEngine) =>
anvil: GltfModelWrapper.from(engine.gltfMaterial, anvil),
armor: GltfModelWrapper.from(engine.gltfMaterial, armor),
gamer_armor: GltfModelWrapper.from(engine.gltfMaterial, gamer_armor),

// Mushroom king
mushroom_king: GltfModelWrapper.from(engine.gltfMaterial, mushroom_king),
big_boss_hit1: GltfModelWrapper.from(engine.gltfMaterial, big_boss_hit1),
big_boss_hit2: GltfModelWrapper.from(engine.gltfMaterial, big_boss_hit2),

trap: GltfModelWrapper.from(engine.gltfMaterial, trap),

workstationHelp: GltfModelWrapper.from(engine.gltfMaterial, workstationHelp),
anvilHelp: GltfModelWrapper.from(engine.gltfMaterial, anvilHelp),
furnaceHelp: GltfModelWrapper.from(engine.gltfMaterial, furnaceHelp),

rockpile: GltfModelWrapper.from(engine.gltfMaterial, rockpile),
minecart: GltfModelWrapper.from(engine.gltfMaterial, minecart),

Expand Down
Binary file added assets/models/mushroom_king/hit/big_boss_hit1.bin
View file
Binary file not shown.
319 changes: 319 additions & 0 deletions assets/models/mushroom_king/hit/big_boss_hit1.gltf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,319 @@
{
"asset":{
"generator":"Khronos glTF Blender I/O v4.1.63",
"version":"2.0"
},
"scene":0,
"scenes":[
{
"name":"Scene",
"nodes":[
0,
1
]
}
],
"nodes":[
{
"mesh":0,
"name":"Cube.119",
"scale":[
1.1018846035003662,
0.457942396402359,
1.3445651531219482
],
"translation":[
0,
3.6763336658477783,
0
]
},
{
"mesh":1,
"name":"head.027",
"rotation":[
0,
0,
-0.1302284598350525,
0.9914840459823608
],
"scale":[
2.052353620529175,
1.9658100605010986,
2.190054416656494
],
"translation":[
0.5338709354400635,
5.623793125152588,
0
]
}
],
"materials":[
{
"doubleSided":true,
"name":"Material.049",
"pbrMetallicRoughness":{
"baseColorFactor":[
0.8110413551330566,
0.6465651988983154,
0.4139544367790222,
1
],
"metallicFactor":0,
"roughnessFactor":0.5
}
},
{
"doubleSided":true,
"name":"Material.050",
"pbrMetallicRoughness":{
"baseColorFactor":[
0.32843300700187683,
0.003659324487671256,
0.00805484876036644,
1
],
"metallicFactor":0,
"roughnessFactor":0.5
}
},
{
"doubleSided":true,
"name":"Material.048",
"pbrMetallicRoughness":{
"baseColorFactor":[
0.7697931528091431,
0.8131840825080872,
0.767202615737915,
1
],
"metallicFactor":0,
"roughnessFactor":0.5
}
}
],
"meshes":[
{
"name":"Cube.366",
"primitives":[
{
"attributes":{
"POSITION":0,
"NORMAL":1,
"TEXCOORD_0":2
},
"indices":3,
"material":0
}
]
},
{
"name":"Cube.365",
"primitives":[
{
"attributes":{
"POSITION":4,
"NORMAL":5,
"TEXCOORD_0":6
},
"indices":7,
"material":1
},
{
"attributes":{
"POSITION":8,
"NORMAL":9,
"TEXCOORD_0":10
},
"indices":11,
"material":2
}
]
}
],
"accessors":[
{
"bufferView":0,
"componentType":5126,
"count":806,
"max":[
1.0081584453582764,
4.656164169311523,
2.294546604156494
],
"min":[
-1.8085438013076782,
-8.654031753540039,
-2.7389161586761475
],
"type":"VEC3"
},
{
"bufferView":1,
"componentType":5126,
"count":806,
"type":"VEC3"
},
{
"bufferView":2,
"componentType":5126,
"count":806,
"type":"VEC2"
},
{
"bufferView":3,
"componentType":5123,
"count":1284,
"type":"SCALAR"
},
{
"bufferView":4,
"componentType":5126,
"count":674,
"max":[
0.8909956216812134,
0.881177544593811,
1.100779414176941
],
"min":[
-1.2380445003509521,
-0.998572587966919,
-0.9585068821907043
],
"type":"VEC3"
},
{
"bufferView":5,
"componentType":5126,
"count":674,
"type":"VEC3"
},
{
"bufferView":6,
"componentType":5126,
"count":674,
"type":"VEC2"
},
{
"bufferView":7,
"componentType":5123,
"count":948,
"type":"SCALAR"
},
{
"bufferView":8,
"componentType":5126,
"count":52,
"max":[
0.8909956216812134,
0.8359712362289429,
1.0844653844833374
],
"min":[
-1.2402560710906982,
-0.9466270208358765,
-0.9585078954696655
],
"type":"VEC3"
},
{
"bufferView":9,
"componentType":5126,
"count":52,
"type":"VEC3"
},
{
"bufferView":10,
"componentType":5126,
"count":52,
"type":"VEC2"
},
{
"bufferView":11,
"componentType":5123,
"count":72,
"type":"SCALAR"
}
],
"bufferViews":[
{
"buffer":0,
"byteLength":9672,
"byteOffset":0,
"target":34962
},
{
"buffer":0,
"byteLength":9672,
"byteOffset":9672,
"target":34962
},
{
"buffer":0,
"byteLength":6448,
"byteOffset":19344,
"target":34962
},
{
"buffer":0,
"byteLength":2568,
"byteOffset":25792,
"target":34963
},
{
"buffer":0,
"byteLength":8088,
"byteOffset":28360,
"target":34962
},
{
"buffer":0,
"byteLength":8088,
"byteOffset":36448,
"target":34962
},
{
"buffer":0,
"byteLength":5392,
"byteOffset":44536,
"target":34962
},
{
"buffer":0,
"byteLength":1896,
"byteOffset":49928,
"target":34963
},
{
"buffer":0,
"byteLength":624,
"byteOffset":51824,
"target":34962
},
{
"buffer":0,
"byteLength":624,
"byteOffset":52448,
"target":34962
},
{
"buffer":0,
"byteLength":416,
"byteOffset":53072,
"target":34962
},
{
"buffer":0,
"byteLength":144,
"byteOffset":53488,
"target":34963
}
],
"buffers":[
{
"byteLength":53632,
"uri":"big_boss_hit1.bin"
}
]
}
Binary file added assets/models/mushroom_king/hit/big_boss_hit2.bin
View file
Binary file not shown.
Loading

0 comments on commit 0d2593a

Please sign in to comment.