cash and enemy spawnpoints

src/alien.rs

@@ -1,8 +1,7 @@
-use avian3d::prelude::*;
 use bevy::prelude::*;
 use std::time::Duration;
 
-const ASSET_PATH: &str = "models/alien_naked.glb";
+pub const ALIEN_ASSET_PATH: &str = "models/alien_naked.glb";
 
 #[derive(Resource)]
 struct Animations {
@@ -22,8 +21,8 @@ fn setup(
 ) {
     // Build the animation graph
     let (graph, node_indices) = AnimationGraph::from_clips([
-        asset_server.load(GltfAssetLabel::Animation(1).from_asset(ASSET_PATH)),
-        asset_server.load(GltfAssetLabel::Animation(0).from_asset(ASSET_PATH)),
+        asset_server.load(GltfAssetLabel::Animation(1).from_asset(ALIEN_ASSET_PATH)),
+        asset_server.load(GltfAssetLabel::Animation(0).from_asset(ALIEN_ASSET_PATH)),
     ]);
 
     // Insert a resource with the current scene information
@@ -32,18 +31,6 @@ fn setup(
         animations: node_indices,
         graph: graph_handle,
     });
-
-    commands
-        .spawn((
-            RigidBody::Dynamic,
-            Collider::capsule(0.2, 1.),
-            LockedAxes::new().lock_rotation_z().lock_rotation_x(),
-            Name::from("Alien"),
-        ))
-        .with_child((
-            Transform::from_translation(Vec3::new(0., -0.6, 0.)),
-            SceneRoot(asset_server.load(GltfAssetLabel::Scene(0).from_asset(ASSET_PATH))),
-        ));
 }
 
 fn setup_once_loaded(

src/cash.rs

@@ -0,0 +1,16 @@
+use bevy::prelude::*;
+
+#[derive(Component, Reflect, Default)]
+#[reflect(Component)]
+#[require(Transform)]
+pub struct Cash;
+
+pub fn plugin(app: &mut App) {
+    app.add_systems(Update, rotate);
+}
+
+fn rotate(time: Res<Time>, mut query: Query<&mut Transform, With<Cash>>) {
+    for mut transform in query.iter_mut() {
+        transform.rotate(Quat::from_rotation_y(time.delta_secs()));
+    }
+}

src/main.rs

@@ -1,28 +1,15 @@
+mod alien;
+mod cash;
+mod tb_entities;
+
 use avian3d::PhysicsPlugins;
 use avian3d::prelude::*;
 use bevy::core_pipeline::tonemapping::Tonemapping;
-use bevy::ecs::component::ComponentId;
-use bevy::ecs::world::DeferredWorld;
-use bevy::math::*;
 use bevy::prelude::*;
 use bevy::render::view::ColorGrading;
 use bevy_flycam::prelude::*;
 use bevy_trenchbroom::prelude::*;
 
-mod alien;
-
-#[derive(SolidClass, Component, Reflect)]
-#[reflect(Component)]
-#[geometry(GeometryProvider::new().convex_collider().smooth_by_default_angle().render())]
-pub struct Worldspawn;
-
-#[derive(SolidClass, Component, Reflect, Default)]
-#[reflect(Component)]
-#[geometry(GeometryProvider::new().convex_collider().smooth_by_default_angle().render())]
-pub struct NamedEntity {
-    pub name: String,
-}
-
 #[derive(Resource, Reflect, Debug)]
 #[reflect(Resource)]
 struct DebugVisuals {
@@ -32,30 +19,6 @@ struct DebugVisuals {
     pub shadows: bool,
 }
 
-#[derive(PointClass, Component, Reflect, Default)]
-#[reflect(Component)]
-#[require(Transform)]
-#[component(on_add = Self::on_add)]
-#[model({ "path": "models/spawn.glb" })]
-pub struct SpawnPoint {}
-
-impl SpawnPoint {
-    fn on_add(mut world: DeferredWorld, entity: Entity, _id: ComponentId) {
-        let Some(asset_server) = world.get_resource::<AssetServer>() else {
-            return;
-        };
-
-        let mesh = asset_server.load(GltfAssetLabel::Scene(0).from_asset("models/spawn.glb"));
-
-        world.commands().entity(entity).insert((
-            Name::new("spawn"),
-            SceneRoot(mesh),
-            RigidBody::Static,
-            ColliderConstructorHierarchy::new(ColliderConstructor::TrimeshFromMesh),
-        ));
-    }
-}
-
 fn main() {
     let mut app = App::new();
 
@@ -72,12 +35,13 @@ fn main() {
     }));
 
     app.add_plugins(PhysicsPlugins::default());
-    app.add_plugins(PhysicsDebugPlugin::default());
+    // app.add_plugins(PhysicsDebugPlugin::default());
 
     // bevy_flycam setup so we can get a closer look at the scene, mainly for debugging
     app.add_plugins(PlayerPlugin);
 
     app.add_plugins(alien::plugin);
+    app.add_plugins(cash::plugin);
 
     app.insert_resource(MovementSettings {
         sensitivity: 0.00005,
@@ -119,7 +83,8 @@ fn setup_scene(mut commands: Commands, asset_server: Res<AssetServer>) {
 
     commands.spawn((
         SceneRoot(
-            asset_server.load(GltfAssetLabel::Scene(0).from_asset("models/angry_demonstrator.glb")),
+            asset_server
+                .load(GltfAssetLabel::Scene(0).from_asset("models/heads/angry_demonstrator.glb")),
         ),
         Transform::from_xyz(0.0, 5.0, 0.0),
     ));

src/tb_entities.rs

@@ -0,0 +1,97 @@
+use avian3d::prelude::*;
+use bevy::ecs::{component::ComponentId, world::DeferredWorld};
+use bevy::math::*;
+use bevy::prelude::*;
+use bevy_trenchbroom::prelude::*;
+
+use crate::cash::Cash;
+
+#[derive(PointClass, Component, Reflect, Default)]
+#[reflect(Component)]
+#[require(Transform)]
+#[component(on_add = Self::on_add)]
+#[model({ "path": "models/spawn.glb" })]
+pub struct SpawnPoint {}
+
+impl SpawnPoint {
+    fn on_add(mut world: DeferredWorld, entity: Entity, _id: ComponentId) {
+        let Some(asset_server) = world.get_resource::<AssetServer>() else {
+            return;
+        };
+
+        let mesh = asset_server.load(GltfAssetLabel::Scene(0).from_asset("models/spawn.glb"));
+
+        world.commands().entity(entity).insert((
+            Name::new("spawn"),
+            SceneRoot(mesh),
+            RigidBody::Static,
+            ColliderConstructorHierarchy::new(ColliderConstructor::TrimeshFromMesh),
+        ));
+    }
+}
+
+#[derive(SolidClass, Component, Reflect)]
+#[reflect(Component)]
+#[geometry(GeometryProvider::new().convex_collider().smooth_by_default_angle().render())]
+pub struct Worldspawn;
+
+#[derive(SolidClass, Component, Reflect, Default)]
+#[reflect(Component)]
+#[geometry(GeometryProvider::new().convex_collider().smooth_by_default_angle().render())]
+pub struct NamedEntity {
+    pub name: String,
+}
+
+#[derive(PointClass, Component, Reflect, Default)]
+#[reflect(Component)]
+#[require(Transform)]
+#[component(on_add = Self::on_add)]
+#[model({ "path": "models/alien_naked.glb" })]
+pub struct EnemySpawn {}
+
+impl EnemySpawn {
+    fn on_add(mut world: DeferredWorld, entity: Entity, _id: ComponentId) {
+        let Some(asset_server) = world.get_resource::<AssetServer>() else {
+            return;
+        };
+
+        let mesh = asset_server.load(GltfAssetLabel::Scene(0).from_asset("models/alien_naked.glb"));
+
+        world
+            .commands()
+            .entity(entity)
+            .insert((
+                Visibility::default(),
+                RigidBody::Dynamic,
+                Collider::capsule(0.2, 1.),
+                LockedAxes::new().lock_rotation_z().lock_rotation_x(),
+                Name::from("Enemy"),
+            ))
+            .with_child((
+                Transform::from_translation(Vec3::new(0., -0.6, 0.)),
+                SceneRoot(mesh),
+            ));
+    }
+}
+
+#[derive(PointClass, Component, Reflect, Default)]
+#[reflect(Component)]
+#[require(Transform)]
+#[component(on_add = Self::on_add)]
+#[model({ "path": "models/cash.glb" })]
+pub struct CashSpawn {}
+
+impl CashSpawn {
+    fn on_add(mut world: DeferredWorld, entity: Entity, _id: ComponentId) {
+        let Some(asset_server) = world.get_resource::<AssetServer>() else {
+            return;
+        };
+
+        let mesh = asset_server.load(GltfAssetLabel::Scene(0).from_asset("models/cash.glb"));
+
+        world
+            .commands()
+            .entity(entity)
+            .insert((Name::new("cash"), SceneRoot(mesh), Cash));
+    }
+}