Skip to content

Commit 857fb9c

Browse files
authored
Remove monkey.gltf (#9974)
# Objective - Fixes #9967 ## Solution - Remove `monkey.gltf` - Added `torus.gltf`, which is two torus meshes joined together, to replace `monkey.gltf` in the examples ## Examples I made `torus.gltf` mainly so that the multiple_windows example clearly shows the different camera angles ### asset_loading ![image](https://github.com/bevyengine/bevy/assets/425184/0ee51013-973d-4b23-9aa6-d254fecde7f1) ### hot_asset_reloading ![image](https://github.com/bevyengine/bevy/assets/425184/b2a2b1d8-167e-478b-b954-756ca0bbe469) ### multiple_windows: ![image](https://github.com/bevyengine/bevy/assets/425184/cb23de2c-9ff8-4843-a5c0-981e4d29ae49) ![image](https://github.com/bevyengine/bevy/assets/425184/b00bc2c7-66e8-4881-8fab-08269e223961)
1 parent 14db5b3 commit 857fb9c

File tree

5 files changed

+117
-129
lines changed

5 files changed

+117
-129
lines changed

assets/models/monkey/Monkey.gltf

Lines changed: 0 additions & 122 deletions
This file was deleted.

assets/models/torus/torus.gltf

Lines changed: 110 additions & 0 deletions
Large diffs are not rendered by default.

examples/asset/asset_loading.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@ fn setup(
4343
// to load.
4444
// If you want to keep the assets in the folder alive, make sure you store the returned handle
4545
// somewhere.
46-
let _loaded_folder: Handle<LoadedFolder> = asset_server.load_folder("models/monkey");
46+
let _loaded_folder: Handle<LoadedFolder> = asset_server.load_folder("models/torus");
4747

4848
// If you want a handle to a specific asset in a loaded folder, the easiest way to get one is to call load.
4949
// It will _not_ be loaded a second time.
5050
// The LoadedFolder asset will ultimately also hold handles to the assets, but waiting for it to load
5151
// and finding the right handle is more work!
52-
let monkey_handle = asset_server.load("models/monkey/Monkey.gltf#Mesh0/Primitive0");
52+
let torus_handle = asset_server.load("models/torus/torus.gltf#Mesh0/Primitive0");
5353

5454
// You can also add assets directly to their Assets<T> storage:
5555
let material_handle = materials.add(StandardMaterial {
5656
base_color: Color::rgb(0.8, 0.7, 0.6),
5757
..default()
5858
});
5959

60-
// monkey
60+
// torus
6161
commands.spawn(PbrBundle {
62-
mesh: monkey_handle,
62+
mesh: torus_handle,
6363
material: material_handle.clone(),
6464
transform: Transform::from_xyz(-3.0, 0.0, 0.0),
6565
..default()

examples/asset/hot_asset_reloading.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ fn main() {
1313

1414
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
1515
// Load our mesh:
16-
let scene_handle = asset_server.load("models/monkey/Monkey.gltf#Scene0");
16+
let scene_handle = asset_server.load("models/torus/torus.gltf#Scene0");
1717

18-
// Any changes to the mesh will be reloaded automatically! Try making a change to Monkey.gltf.
18+
// Any changes to the mesh will be reloaded automatically! Try making a change to torus.gltf.
1919
// You should see the changes immediately show up in your app.
2020

2121
// mesh

examples/window/multiple_windows.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fn main() {
1414
fn setup_scene(mut commands: Commands, asset_server: Res<AssetServer>) {
1515
// add entities to the world
1616
commands.spawn(SceneBundle {
17-
scene: asset_server.load("models/monkey/Monkey.gltf#Scene0"),
17+
scene: asset_server.load("models/torus/torus.gltf#Scene0"),
1818
..default()
1919
});
2020
// light

0 commit comments

Comments
 (0)