diff --git a/assets/models/metis.gltf b/assets/models/metis.gltf index 0da0616..cc4e116 100644 --- a/assets/models/metis.gltf +++ b/assets/models/metis.gltf @@ -75,7 +75,7 @@ { "mimeType":"image/jpeg", "name":"mercury", - "uri":"../textures/mercury.jpg" + "uri":"textures/mercury.jpg" } ], "accessors":[ diff --git a/assets/models/pizzeria3.gltf b/assets/models/pizzeria3.gltf index 5ed5ea7..bde8bc2 100644 --- a/assets/models/pizzeria3.gltf +++ b/assets/models/pizzeria3.gltf @@ -1936,22 +1936,22 @@ { "mimeType":"image/jpeg", "name":"mercury", - "uri":"../textures/mercury.jpg" + "uri":"textures/mercury.jpg" }, { "mimeType":"image/jpeg", "name":"solarpanel", - "uri":"../textures/solarpanel.jpg" + "uri":"textures/solarpanel.jpg" }, { "mimeType":"image/jpeg", "name":"metal", - "uri":"../textures/metal.jpg" + "uri":"textures/metal.jpg" }, { "mimeType":"image/jpeg", "name":"plant", - "uri":"../textures/plant.jpg" + "uri":"textures/plant.jpg" } ], "accessors":[ diff --git a/assets/models/satellite.gltf b/assets/models/satellite.gltf index 971c8ff..3ce8f0d 100644 --- a/assets/models/satellite.gltf +++ b/assets/models/satellite.gltf @@ -299,7 +299,7 @@ { "mimeType":"image/jpeg", "name":"solarpanel", - "uri":"../textures/solarpanel.jpg" + "uri":"textures/solarpanel.jpg" } ], "accessors":[ diff --git a/assets/textures/callisto.jpg b/assets/models/textures/callisto.jpg similarity index 100% rename from assets/textures/callisto.jpg rename to assets/models/textures/callisto.jpg diff --git a/assets/textures/earth.jpg b/assets/models/textures/earth.jpg similarity index 100% rename from assets/textures/earth.jpg rename to assets/models/textures/earth.jpg diff --git a/assets/textures/europa.jpg b/assets/models/textures/europa.jpg similarity index 100% rename from assets/textures/europa.jpg rename to assets/models/textures/europa.jpg diff --git a/assets/textures/exhaust.png b/assets/models/textures/exhaust.png similarity index 100% rename from assets/textures/exhaust.png rename to assets/models/textures/exhaust.png diff --git a/assets/textures/ganymede.jpg b/assets/models/textures/ganymede.jpg similarity index 100% rename from assets/textures/ganymede.jpg rename to assets/models/textures/ganymede.jpg diff --git a/assets/textures/io.jpg b/assets/models/textures/io.jpg similarity index 100% rename from assets/textures/io.jpg rename to assets/models/textures/io.jpg diff --git a/assets/textures/jupiter.jpg b/assets/models/textures/jupiter.jpg similarity index 100% rename from assets/textures/jupiter.jpg rename to assets/models/textures/jupiter.jpg diff --git a/assets/textures/mars.jpg b/assets/models/textures/mars.jpg similarity index 100% rename from assets/textures/mars.jpg rename to assets/models/textures/mars.jpg diff --git a/assets/textures/mercury.jpg b/assets/models/textures/mercury.jpg similarity index 100% rename from assets/textures/mercury.jpg rename to assets/models/textures/mercury.jpg diff --git a/assets/textures/metal.jpg b/assets/models/textures/metal.jpg similarity index 100% rename from assets/textures/metal.jpg rename to assets/models/textures/metal.jpg diff --git a/assets/textures/neptune.jpg b/assets/models/textures/neptune.jpg similarity index 100% rename from assets/textures/neptune.jpg rename to assets/models/textures/neptune.jpg diff --git a/assets/textures/plant.jpg b/assets/models/textures/plant.jpg similarity index 100% rename from assets/textures/plant.jpg rename to assets/models/textures/plant.jpg diff --git a/assets/textures/saturn.jpg b/assets/models/textures/saturn.jpg similarity index 100% rename from assets/textures/saturn.jpg rename to assets/models/textures/saturn.jpg diff --git a/assets/textures/solarpanel.jpg b/assets/models/textures/solarpanel.jpg similarity index 100% rename from assets/textures/solarpanel.jpg rename to assets/models/textures/solarpanel.jpg diff --git a/assets/textures/uranus.jpg b/assets/models/textures/uranus.jpg similarity index 100% rename from assets/textures/uranus.jpg rename to assets/models/textures/uranus.jpg diff --git a/assets/textures/venus.jpg b/assets/models/textures/venus.jpg similarity index 100% rename from assets/textures/venus.jpg rename to assets/models/textures/venus.jpg diff --git a/assets/models/thebe.gltf b/assets/models/thebe.gltf index af55c80..88847aa 100644 --- a/assets/models/thebe.gltf +++ b/assets/models/thebe.gltf @@ -84,7 +84,7 @@ { "mimeType":"image/jpeg", "name":"mercury", - "uri":"../textures/mercury.jpg" + "uri":"textures/mercury.jpg" } ], "accessors":[ diff --git a/src/cmd.rs b/src/cmd.rs index 0f944fa..08f8cba 100644 --- a/src/cmd.rs +++ b/src/cmd.rs @@ -908,7 +908,7 @@ fn spawn_entities( actor.insert(Position::from(absolute_pos)); if state.is_sphere { let sphere_texture_handle = if let Some(model) = &state.model { - Some(asset_server.load(format!("textures/{}.jpg", model))) + Some(asset_server.load(format!("models/textures/{}.jpg", model))) } else { None }; diff --git a/src/visual.rs b/src/visual.rs index b498648..48fbfce 100644 --- a/src/visual.rs +++ b/src/visual.rs @@ -171,7 +171,7 @@ pub fn spawn_effects( )); } Effects::ThrusterParticle(pos, v) => { - let texture = asset_server.load("textures/exhaust.png"); + let texture = asset_server.load("models/textures/exhaust.png"); commands.spawn(( IsEffect, hud::ToggleableHudElement,