From e00d0d71d1af4d5d8062eb287f2b17de55bf7734 Mon Sep 17 00:00:00 2001 From: SeanOMik Date: Sat, 30 Mar 2024 22:17:12 -0400 Subject: [PATCH] examples: move assets outside of testbed for other examples --- examples/{testbed => }/assets/AntiqueCamera.glb | Bin examples/{testbed => }/assets/crate/Image.png | Bin examples/{testbed => }/assets/crate/container2.png | Bin examples/{testbed => }/assets/crate/crate.bin | Bin examples/{testbed => }/assets/crate/crate.gltf | 0 examples/{testbed => }/assets/cube-embedded.gltf | 0 examples/{testbed => }/assets/cube-texture-bin.glb | Bin .../{testbed => }/assets/cube-texture-embedded.gltf | 0 examples/{testbed => }/assets/happy-tree.png | Bin .../assets/lumberyard-bistro/.gitignore | 0 .../assets/pos-testing/child-node-cubes.glb | Bin .../assets/pos-testing/separate-nodes-two-cubes.glb | Bin examples/{testbed => }/assets/sponza/.gitignore | 0 examples/{testbed => }/assets/sponza/README.md | 0 .../assets/texture-sep/texture-sep.bin | Bin .../assets/texture-sep/texture-sep.gltf | 0 .../{testbed => }/assets/texture-sep/uvgrid.png | Bin .../{testbed => }/assets/texture-sep/uvgrid.png.bk | Bin examples/testbed/src/main.rs | 4 ++-- 19 files changed, 2 insertions(+), 2 deletions(-) rename examples/{testbed => }/assets/AntiqueCamera.glb (100%) rename examples/{testbed => }/assets/crate/Image.png (100%) rename examples/{testbed => }/assets/crate/container2.png (100%) rename examples/{testbed => }/assets/crate/crate.bin (100%) rename examples/{testbed => }/assets/crate/crate.gltf (100%) rename examples/{testbed => }/assets/cube-embedded.gltf (100%) rename examples/{testbed => }/assets/cube-texture-bin.glb (100%) rename examples/{testbed => }/assets/cube-texture-embedded.gltf (100%) rename examples/{testbed => }/assets/happy-tree.png (100%) rename examples/{testbed => }/assets/lumberyard-bistro/.gitignore (100%) rename examples/{testbed => }/assets/pos-testing/child-node-cubes.glb (100%) rename examples/{testbed => }/assets/pos-testing/separate-nodes-two-cubes.glb (100%) rename examples/{testbed => }/assets/sponza/.gitignore (100%) rename examples/{testbed => }/assets/sponza/README.md (100%) rename examples/{testbed => }/assets/texture-sep/texture-sep.bin (100%) rename examples/{testbed => }/assets/texture-sep/texture-sep.gltf (100%) rename examples/{testbed => }/assets/texture-sep/uvgrid.png (100%) rename examples/{testbed => }/assets/texture-sep/uvgrid.png.bk (100%) diff --git a/examples/testbed/assets/AntiqueCamera.glb b/examples/assets/AntiqueCamera.glb similarity index 100% rename from examples/testbed/assets/AntiqueCamera.glb rename to examples/assets/AntiqueCamera.glb diff --git a/examples/testbed/assets/crate/Image.png b/examples/assets/crate/Image.png similarity index 100% rename from examples/testbed/assets/crate/Image.png rename to examples/assets/crate/Image.png diff --git a/examples/testbed/assets/crate/container2.png b/examples/assets/crate/container2.png similarity index 100% rename from examples/testbed/assets/crate/container2.png rename to examples/assets/crate/container2.png diff --git a/examples/testbed/assets/crate/crate.bin b/examples/assets/crate/crate.bin similarity index 100% rename from examples/testbed/assets/crate/crate.bin rename to examples/assets/crate/crate.bin diff --git a/examples/testbed/assets/crate/crate.gltf b/examples/assets/crate/crate.gltf similarity index 100% rename from examples/testbed/assets/crate/crate.gltf rename to examples/assets/crate/crate.gltf diff --git a/examples/testbed/assets/cube-embedded.gltf b/examples/assets/cube-embedded.gltf similarity index 100% rename from examples/testbed/assets/cube-embedded.gltf rename to examples/assets/cube-embedded.gltf diff --git a/examples/testbed/assets/cube-texture-bin.glb b/examples/assets/cube-texture-bin.glb similarity index 100% rename from examples/testbed/assets/cube-texture-bin.glb rename to examples/assets/cube-texture-bin.glb diff --git a/examples/testbed/assets/cube-texture-embedded.gltf b/examples/assets/cube-texture-embedded.gltf similarity index 100% rename from examples/testbed/assets/cube-texture-embedded.gltf rename to examples/assets/cube-texture-embedded.gltf diff --git a/examples/testbed/assets/happy-tree.png b/examples/assets/happy-tree.png similarity index 100% rename from examples/testbed/assets/happy-tree.png rename to examples/assets/happy-tree.png diff --git a/examples/testbed/assets/lumberyard-bistro/.gitignore b/examples/assets/lumberyard-bistro/.gitignore similarity index 100% rename from examples/testbed/assets/lumberyard-bistro/.gitignore rename to examples/assets/lumberyard-bistro/.gitignore diff --git a/examples/testbed/assets/pos-testing/child-node-cubes.glb b/examples/assets/pos-testing/child-node-cubes.glb similarity index 100% rename from examples/testbed/assets/pos-testing/child-node-cubes.glb rename to examples/assets/pos-testing/child-node-cubes.glb diff --git a/examples/testbed/assets/pos-testing/separate-nodes-two-cubes.glb b/examples/assets/pos-testing/separate-nodes-two-cubes.glb similarity index 100% rename from examples/testbed/assets/pos-testing/separate-nodes-two-cubes.glb rename to examples/assets/pos-testing/separate-nodes-two-cubes.glb diff --git a/examples/testbed/assets/sponza/.gitignore b/examples/assets/sponza/.gitignore similarity index 100% rename from examples/testbed/assets/sponza/.gitignore rename to examples/assets/sponza/.gitignore diff --git a/examples/testbed/assets/sponza/README.md b/examples/assets/sponza/README.md similarity index 100% rename from examples/testbed/assets/sponza/README.md rename to examples/assets/sponza/README.md diff --git a/examples/testbed/assets/texture-sep/texture-sep.bin b/examples/assets/texture-sep/texture-sep.bin similarity index 100% rename from examples/testbed/assets/texture-sep/texture-sep.bin rename to examples/assets/texture-sep/texture-sep.bin diff --git a/examples/testbed/assets/texture-sep/texture-sep.gltf b/examples/assets/texture-sep/texture-sep.gltf similarity index 100% rename from examples/testbed/assets/texture-sep/texture-sep.gltf rename to examples/assets/texture-sep/texture-sep.gltf diff --git a/examples/testbed/assets/texture-sep/uvgrid.png b/examples/assets/texture-sep/uvgrid.png similarity index 100% rename from examples/testbed/assets/texture-sep/uvgrid.png rename to examples/assets/texture-sep/uvgrid.png diff --git a/examples/testbed/assets/texture-sep/uvgrid.png.bk b/examples/assets/texture-sep/uvgrid.png.bk similarity index 100% rename from examples/testbed/assets/texture-sep/uvgrid.png.bk rename to examples/assets/texture-sep/uvgrid.png.bk diff --git a/examples/testbed/src/main.rs b/examples/testbed/src/main.rs index be558ba..372ff32 100644 --- a/examples/testbed/src/main.rs +++ b/examples/testbed/src/main.rs @@ -73,7 +73,7 @@ async fn main() { //let diffuse_texture = resman.request::("assets/happy-tree.png").unwrap(); //let antique_camera_model = resman.request::("assets/AntiqueCamera.glb").unwrap(); //let cube_model = resman.request::("assets/cube-texture-bin.glb").unwrap(); - let cube_gltf = resman.request::("assets/texture-sep/texture-sep.gltf").unwrap(); + let cube_gltf = resman.request::("../assets/texture-sep/texture-sep.gltf").unwrap(); /*let crate_gltf = resman.request::("assets/crate/crate.gltf").unwrap(); let separate_gltf = resman.request::("assets/pos-testing/child-node-cubes.glb").unwrap(); */ @@ -88,7 +88,7 @@ async fn main() { let separate_scene = &separate_gltf.data_ref() .unwrap().scenes[0]; */ - let sponza_model = resman.request::("assets/sponza/Sponza.gltf").unwrap(); + let sponza_model = resman.request::("../assets/sponza/Sponza.gltf").unwrap(); drop(resman); sponza_model.wait_recurse_dependencies_load();