Skip to content

Commit

Permalink
Fix textures and add preload screen
Browse files Browse the repository at this point in the history
  • Loading branch information
DotWith committed Aug 23, 2024
1 parent d72cd37 commit 8b8ac36
Show file tree
Hide file tree
Showing 41 changed files with 311 additions and 799 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ bevy-panic-handler = "3.0.0"
avian3d = "0.1.2"
leafwing-input-manager = "0.15.0"
bevy_mod_billboard = "0.7.0"
bevy-inspector-egui = "0.25.2"
Binary file modified art/map.blend
Binary file not shown.
Binary file modified art/map.blend1
Binary file not shown.
Binary file modified art/map0.blend
Binary file not shown.
Binary file modified art/map0.blend1
Binary file not shown.
Binary file modified art/map1.blend
Binary file not shown.
Binary file modified art/map1.blend1
Binary file not shown.
Binary file modified art/map2.blend
Binary file not shown.
Binary file modified art/map2.blend1
Binary file not shown.
Binary file modified art/map3.blend
Binary file not shown.
Binary file modified art/map3.blend1
Binary file not shown.
Binary file modified art/map4.blend
Binary file not shown.
Binary file modified art/map4.blend1
Binary file not shown.
Binary file modified art/map5.blend
Binary file not shown.
Binary file modified art/map5.blend1
Binary file not shown.
Binary file modified art/map6.blend
Binary file not shown.
Binary file modified art/map6.blend1
Binary file not shown.
Binary file modified assets/map/rooms/map.bin
Binary file not shown.
122 changes: 18 additions & 104 deletions assets/map/rooms/map.gltf
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,6 @@
"baseColorTexture":{
"index":0
},
"metallicFactor":0.5
}
},
{
"doubleSided":true,
"name":"Celing",
"pbrMetallicRoughness":{
"baseColorTexture":{
"index":1
},
"metallicFactor":0
}
},
Expand All @@ -44,7 +34,7 @@
"name":"Walls",
"pbrMetallicRoughness":{
"baseColorTexture":{
"index":2
"index":1
},
"metallicFactor":0
}
Expand All @@ -71,15 +61,6 @@
},
"indices":7,
"material":1
},
{
"attributes":{
"POSITION":8,
"NORMAL":9,
"TEXCOORD_0":10
},
"indices":11,
"material":2
}
]
}
Expand All @@ -92,37 +73,28 @@
{
"sampler":0,
"source":1
},
{
"sampler":0,
"source":2
}
],
"images":[
{
"mimeType":"image/jpeg",
"name":"concretefloor.jpg",
"name":"concretefloor.jpg.001",
"uri":"concretefloor.jpg"
},
{
"mimeType":"image/jpeg",
"name":"white.jpg",
"uri":"white.jpg"
},
{
"mimeType":"image/jpeg",
"name":"brickwall.jpg",
"name":"brickwall.jpg.001",
"uri":"brickwall.jpg"
}
],
"accessors":[
{
"bufferView":0,
"componentType":5126,
"count":136,
"count":152,
"max":[
8,
-2.000000238418579,
0,
5.999999523162842
],
"min":[
Expand All @@ -135,58 +107,24 @@
{
"bufferView":1,
"componentType":5126,
"count":136,
"count":152,
"type":"VEC3"
},
{
"bufferView":2,
"componentType":5126,
"count":136,
"count":152,
"type":"VEC2"
},
{
"bufferView":3,
"componentType":5123,
"count":210,
"count":240,
"type":"SCALAR"
},
{
"bufferView":4,
"componentType":5126,
"count":16,
"max":[
8,
0,
5.999999523162842
],
"min":[
0,
-2.0000009536743164,
0
],
"type":"VEC3"
},
{
"bufferView":5,
"componentType":5126,
"count":16,
"type":"VEC3"
},
{
"bufferView":6,
"componentType":5126,
"count":16,
"type":"VEC2"
},
{
"bufferView":7,
"componentType":5123,
"count":30,
"type":"SCALAR"
},
{
"bufferView":8,
"componentType":5126,
"count":96,
"max":[
8,
Expand All @@ -201,19 +139,19 @@
"type":"VEC3"
},
{
"bufferView":9,
"bufferView":5,
"componentType":5126,
"count":96,
"type":"VEC3"
},
{
"bufferView":10,
"bufferView":6,
"componentType":5126,
"count":96,
"type":"VEC2"
},
{
"bufferView":11,
"bufferView":7,
"componentType":5123,
"count":240,
"type":"SCALAR"
Expand All @@ -222,50 +160,26 @@
"bufferViews":[
{
"buffer":0,
"byteLength":1632,
"byteLength":1824,
"byteOffset":0,
"target":34962
},
{
"buffer":0,
"byteLength":1632,
"byteOffset":1632,
"byteLength":1824,
"byteOffset":1824,
"target":34962
},
{
"buffer":0,
"byteLength":1088,
"byteOffset":3264,
"byteLength":1216,
"byteOffset":3648,
"target":34962
},
{
"buffer":0,
"byteLength":420,
"byteOffset":4352,
"target":34963
},
{
"buffer":0,
"byteLength":192,
"byteOffset":4772,
"target":34962
},
{
"buffer":0,
"byteLength":192,
"byteOffset":4964,
"target":34962
},
{
"buffer":0,
"byteLength":128,
"byteOffset":5156,
"target":34962
},
{
"buffer":0,
"byteLength":60,
"byteOffset":5284,
"byteLength":480,
"byteOffset":4864,
"target":34963
},
{
Expand Down
Binary file modified assets/map/rooms/map0.bin
Binary file not shown.
Loading

0 comments on commit 8b8ac36

Please sign in to comment.