From e6af3384e1bd32045c217135192a37a60fabf71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= Date: Sun, 23 Jan 2022 16:48:57 +0100 Subject: [PATCH] Move convex decomposition example models to the assets folder. --- .../models => assets/3d}/camel_decimated.obj | 0 .../media/models => assets/3d}/chair.obj | 0 .../models => assets/3d}/cup_decimated.obj | 0 .../models => assets/3d}/dilo_decimated.obj | 0 .../models => assets/3d}/feline_decimated.obj | 0 .../models => assets/3d}/genus3_decimated.obj | 0 .../models => assets/3d}/hand2_decimated.obj | 0 .../models => assets/3d}/hand_decimated.obj | 0 .../media/models => assets/3d}/hornbug.obj | 0 .../3d}/octopus_decimated.obj | 0 .../models => assets/3d}/rabbit_decimated.obj | 0 .../3d}/rust_logo_simplified.obj | 0 .../3d}/screwdriver_decimated.obj | 0 .../media/models => assets/3d}/table.obj | 0 .../models => assets/3d}/tstTorusModel.obj | 0 .../models => assets/3d}/tstTorusModel2.obj | 0 .../models => assets/3d}/tstTorusModel3.obj | 0 examples3d/convex_decomposition3.rs | 36 +++++++++---------- 18 files changed, 18 insertions(+), 18 deletions(-) rename {examples3d/media/models => assets/3d}/camel_decimated.obj (100%) rename {examples3d/media/models => assets/3d}/chair.obj (100%) rename {examples3d/media/models => assets/3d}/cup_decimated.obj (100%) rename {examples3d/media/models => assets/3d}/dilo_decimated.obj (100%) rename {examples3d/media/models => assets/3d}/feline_decimated.obj (100%) rename {examples3d/media/models => assets/3d}/genus3_decimated.obj (100%) rename {examples3d/media/models => assets/3d}/hand2_decimated.obj (100%) rename {examples3d/media/models => assets/3d}/hand_decimated.obj (100%) rename {examples3d/media/models => assets/3d}/hornbug.obj (100%) rename {examples3d/media/models => assets/3d}/octopus_decimated.obj (100%) rename {examples3d/media/models => assets/3d}/rabbit_decimated.obj (100%) rename {examples3d/media/models => assets/3d}/rust_logo_simplified.obj (100%) rename {examples3d/media/models => assets/3d}/screwdriver_decimated.obj (100%) rename {examples3d/media/models => assets/3d}/table.obj (100%) rename {examples3d/media/models => assets/3d}/tstTorusModel.obj (100%) rename {examples3d/media/models => assets/3d}/tstTorusModel2.obj (100%) rename {examples3d/media/models => assets/3d}/tstTorusModel3.obj (100%) diff --git a/examples3d/media/models/camel_decimated.obj b/assets/3d/camel_decimated.obj similarity index 100% rename from examples3d/media/models/camel_decimated.obj rename to assets/3d/camel_decimated.obj diff --git a/examples3d/media/models/chair.obj b/assets/3d/chair.obj similarity index 100% rename from examples3d/media/models/chair.obj rename to assets/3d/chair.obj diff --git a/examples3d/media/models/cup_decimated.obj b/assets/3d/cup_decimated.obj similarity index 100% rename from examples3d/media/models/cup_decimated.obj rename to assets/3d/cup_decimated.obj diff --git a/examples3d/media/models/dilo_decimated.obj b/assets/3d/dilo_decimated.obj similarity index 100% rename from examples3d/media/models/dilo_decimated.obj rename to assets/3d/dilo_decimated.obj diff --git a/examples3d/media/models/feline_decimated.obj b/assets/3d/feline_decimated.obj similarity index 100% rename from examples3d/media/models/feline_decimated.obj rename to assets/3d/feline_decimated.obj diff --git a/examples3d/media/models/genus3_decimated.obj b/assets/3d/genus3_decimated.obj similarity index 100% rename from examples3d/media/models/genus3_decimated.obj rename to assets/3d/genus3_decimated.obj diff --git a/examples3d/media/models/hand2_decimated.obj b/assets/3d/hand2_decimated.obj similarity index 100% rename from examples3d/media/models/hand2_decimated.obj rename to assets/3d/hand2_decimated.obj diff --git a/examples3d/media/models/hand_decimated.obj b/assets/3d/hand_decimated.obj similarity index 100% rename from examples3d/media/models/hand_decimated.obj rename to assets/3d/hand_decimated.obj diff --git a/examples3d/media/models/hornbug.obj b/assets/3d/hornbug.obj similarity index 100% rename from examples3d/media/models/hornbug.obj rename to assets/3d/hornbug.obj diff --git a/examples3d/media/models/octopus_decimated.obj b/assets/3d/octopus_decimated.obj similarity index 100% rename from examples3d/media/models/octopus_decimated.obj rename to assets/3d/octopus_decimated.obj diff --git a/examples3d/media/models/rabbit_decimated.obj b/assets/3d/rabbit_decimated.obj similarity index 100% rename from examples3d/media/models/rabbit_decimated.obj rename to assets/3d/rabbit_decimated.obj diff --git a/examples3d/media/models/rust_logo_simplified.obj b/assets/3d/rust_logo_simplified.obj similarity index 100% rename from examples3d/media/models/rust_logo_simplified.obj rename to assets/3d/rust_logo_simplified.obj diff --git a/examples3d/media/models/screwdriver_decimated.obj b/assets/3d/screwdriver_decimated.obj similarity index 100% rename from examples3d/media/models/screwdriver_decimated.obj rename to assets/3d/screwdriver_decimated.obj diff --git a/examples3d/media/models/table.obj b/assets/3d/table.obj similarity index 100% rename from examples3d/media/models/table.obj rename to assets/3d/table.obj diff --git a/examples3d/media/models/tstTorusModel.obj b/assets/3d/tstTorusModel.obj similarity index 100% rename from examples3d/media/models/tstTorusModel.obj rename to assets/3d/tstTorusModel.obj diff --git a/examples3d/media/models/tstTorusModel2.obj b/assets/3d/tstTorusModel2.obj similarity index 100% rename from examples3d/media/models/tstTorusModel2.obj rename to assets/3d/tstTorusModel2.obj diff --git a/examples3d/media/models/tstTorusModel3.obj b/assets/3d/tstTorusModel3.obj similarity index 100% rename from examples3d/media/models/tstTorusModel3.obj rename to assets/3d/tstTorusModel3.obj diff --git a/examples3d/convex_decomposition3.rs b/examples3d/convex_decomposition3.rs index 98cf4a9f5..6daf4d759 100644 --- a/examples3d/convex_decomposition3.rs +++ b/examples3d/convex_decomposition3.rs @@ -110,23 +110,23 @@ pub fn init_world(testbed: &mut Testbed) { fn models() -> Vec { vec![ - "media/models/camel_decimated.obj".to_string(), - "media/models/chair.obj".to_string(), - "media/models/cup_decimated.obj".to_string(), - "media/models/dilo_decimated.obj".to_string(), - "media/models/feline_decimated.obj".to_string(), - "media/models/genus3_decimated.obj".to_string(), - "media/models/hand2_decimated.obj".to_string(), - "media/models/hand_decimated.obj".to_string(), - "media/models/hornbug.obj".to_string(), - "media/models/octopus_decimated.obj".to_string(), - "media/models/rabbit_decimated.obj".to_string(), - // "media/models/rust_logo.obj".to_string(), - "media/models/rust_logo_simplified.obj".to_string(), - "media/models/screwdriver_decimated.obj".to_string(), - "media/models/table.obj".to_string(), - "media/models/tstTorusModel.obj".to_string(), - // "media/models/tstTorusModel2.obj".to_string(), - // "media/models/tstTorusModel3.obj".to_string(), + "assets/3d/camel_decimated.obj".to_string(), + "assets/3d/chair.obj".to_string(), + "assets/3d/cup_decimated.obj".to_string(), + "assets/3d/dilo_decimated.obj".to_string(), + "assets/3d/feline_decimated.obj".to_string(), + "assets/3d/genus3_decimated.obj".to_string(), + "assets/3d/hand2_decimated.obj".to_string(), + "assets/3d/hand_decimated.obj".to_string(), + "assets/3d/hornbug.obj".to_string(), + "assets/3d/octopus_decimated.obj".to_string(), + "assets/3d/rabbit_decimated.obj".to_string(), + // "assets/3d/rust_logo.obj".to_string(), + "assets/3d/rust_logo_simplified.obj".to_string(), + "assets/3d/screwdriver_decimated.obj".to_string(), + "assets/3d/table.obj".to_string(), + "assets/3d/tstTorusModel.obj".to_string(), + // "assets/3d/tstTorusModel2.obj".to_string(), + // "assets/3d/tstTorusModel3.obj".to_string(), ] }