rustunit/HEDZReloaded
1
0
Fork 0
Code Issues 2 Pull Requests Actions 2 Packages Projects 1 Releases Wiki Activity

more asset loader usage

Browse Source
This commit is contained in:
extrawurst
2025-03-26 08:32:40 +01:00
parent 7dd9999860
commit 91e5435c64
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tb_entities.rs
View File

@@ -6,6 +6,7 @@ use bevy_trenchbroom::class::Target;
use bevy_trenchbroom::prelude::*;
use crate::cash::Cash;
use crate::loading_assets::GameAssets;
use crate::physics_layers::GameLayer;
#[derive(PointClass, Component, Reflect, Default)]
@@ -17,7 +18,7 @@ pub struct SpawnPoint {}
impl SpawnPoint {
fn on_add(mut world: DeferredWorld, entity: Entity, _id: ComponentId) {
let Some(asset_server) = world.get_resource::<AssetServer>() else {
let Some(assets) = world.get_resource::<GameAssets>() else {
return;
};
@@ -30,7 +31,7 @@ impl SpawnPoint {
let mut this_transform = *this_transform;
this_transform.translation += Vec3::new(0., -0.3, 0.);
let mesh = asset_server.load(GltfAssetLabel::Scene(0).from_asset("models/spawn.glb"));
let mesh = assets.mesh_spawn.clone();
world.commands().entity(entity).insert((
this_transform,
@@ -125,6 +126,10 @@ impl EnemySpawn {
return;
};
let Some(assets) = world.get_resource::<GameAssets>() else {
return;
};
let this = world.get_entity(entity).unwrap().get::<Self>().unwrap();
let this_transform = world
.get_entity(entity)
@@ -135,7 +140,7 @@ impl EnemySpawn {
let mut this_transform = *this_transform;
this_transform.translation += Vec3::new(0., 1., 0.);
let mesh = asset_server.load(GltfAssetLabel::Scene(0).from_asset("models/alien_naked.glb"));
let mesh = assets.mesh_alien.clone();
let head_mesh = asset_server
.load(GltfAssetLabel::Scene(0).from_asset(format!("models/heads/{}.glb", this.head)));
@@ -179,11 +184,11 @@ pub struct CashSpawn {}
impl CashSpawn {
fn on_add(mut world: DeferredWorld, entity: Entity, _id: ComponentId) {
let Some(asset_server) = world.get_resource::<AssetServer>() else {
let Some(assets) = world.get_resource::<GameAssets>() else {
return;
};
let mesh = asset_server.load(GltfAssetLabel::Scene(0).from_asset("models/cash.glb"));
let mesh = assets.mesh_cash.clone();
world.commands().entity(entity).insert((
Name::new("cash"),