Skip to content

Commit

Permalink
Implement character controller moving player
Browse files Browse the repository at this point in the history
  • Loading branch information
@janhohenheim
janhohenheim committed Sep 7, 2024
1 parent 2d4a64c commit ab237f2
Show file tree
Hide file tree
Showing 14 changed files with 223 additions and 57 deletions.
Binary file modified art/foxtrot.blend
View file
Binary file not shown.
Binary file added assets/blueprints/Fox.glb
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/blueprints/Fox.meta.ron
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(
assets:
[
]
)
Binary file modified assets/levels/World.glb
View file
Binary file not shown.
94 changes: 47 additions & 47 deletions assets/levels/World.meta.ron
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
(
assets:
[
("Bike", File ( path: "blueprints/Bike.glb" )),
("Bike", File ( path: "materials/Bike.glb" )),
("Box", File ( path: "blueprints/Box.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("Fox", File ( path: "blueprints/Fox.glb" )),
("fox_material", File ( path: "materials/fox_material.glb" )),
("Sidewalk Side", File ( path: "blueprints/Sidewalk Side.glb" )),
("Sidewalk", File ( path: "materials/Sidewalk.glb" )),
("Sidewalk Center", File ( path: "blueprints/Sidewalk Center.glb" )),
Expand All @@ -20,66 +18,66 @@
("Road Corner Curved", File ( path: "blueprints/Road Corner Curved.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("Car Blue", File ( path: "blueprints/Car Blue.glb" )),
("Blue", File ( path: "materials/Blue.glb" )),
("Headlights", File ( path: "materials/Headlights.glb" )),
("Windows", File ( path: "materials/Windows.glb" )),
("TailLights", File ( path: "materials/TailLights.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("Black", File ( path: "materials/Black.glb" )),
("TailLights", File ( path: "materials/TailLights.glb" )),
("Windows", File ( path: "materials/Windows.glb" )),
("Headlights", File ( path: "materials/Headlights.glb" )),
("Blue", File ( path: "materials/Blue.glb" )),
("Building Red", File ( path: "blueprints/Building Red.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("wood", File ( path: "materials/wood.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("Building Red Corner", File ( path: "blueprints/Building Red Corner.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("wood", File ( path: "materials/wood.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("Building Red Corner", File ( path: "blueprints/Building Red Corner.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("wood", File ( path: "materials/wood.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("Building Beige", File ( path: "blueprints/Building Beige.glb" )),
("brick_shadeGreen2", File ( path: "materials/brick_shadeGreen2.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("door_white", File ( path: "materials/door_white.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("brick_shadeGreen", File ( path: "materials/brick_shadeGreen.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("Building Beige Corner Pizza", File ( path: "blueprints/Building Beige Corner Pizza.glb" )),
("brick_shadeGreen2", File ( path: "materials/brick_shadeGreen2.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("brick_shadeGreen", File ( path: "materials/brick_shadeGreen.glb" )),
("red", File ( path: "materials/red.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("door_white", File ( path: "materials/door_white.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("White", File ( path: "materials/White.glb" )),
("red", File ( path: "materials/red.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("brick_shadeGreen", File ( path: "materials/brick_shadeGreen.glb" )),
("Building Black", File ( path: "blueprints/Building Black.glb" )),
("brick_shade3", File ( path: "materials/brick_shade3.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("Building Red Barren", File ( path: "blueprints/Building Red Barren.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("Building Red Barren", File ( path: "blueprints/Building Red Barren.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("window_glass", File ( path: "materials/window_glass.glb" )),
("window_frame", File ( path: "materials/window_frame.glb" )),
("sandstone", File ( path: "materials/sandstone.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("Buliding Big", File ( path: "blueprints/Buliding Big.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("Beige", File ( path: "materials/Beige.glb" )),
("LightYellow", File ( path: "materials/LightYellow.glb" )),
("Brown", File ( path: "materials/Brown.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("DarkGrey", File ( path: "materials/DarkGrey.glb" )),
("BrickRed", File ( path: "materials/BrickRed.glb" )),
("Beige", File ( path: "materials/Beige.glb" )),
("LightYellow", File ( path: "materials/LightYellow.glb" )),
("Air Conditioner", File ( path: "blueprints/Air Conditioner.glb" )),
("Mat", File ( path: "materials/Mat.glb" )),
("Fire Exit", File ( path: "blueprints/Fire Exit.glb" )),
Expand All @@ -91,41 +89,43 @@
("Traffic Light", File ( path: "blueprints/Traffic Light.glb" )),
("Atlas.052", File ( path: "materials/Atlas.052.glb" )),
("Mailbox", File ( path: "blueprints/Mailbox.glb" )),
("sign", File ( path: "materials/sign.glb" )),
("sign_shade2", File ( path: "materials/sign_shade2.glb" )),
("mailbox", File ( path: "materials/mailbox.glb" )),
("sign_shade2", File ( path: "materials/sign_shade2.glb" )),
("sign", File ( path: "materials/sign.glb" )),
("Trash Container", File ( path: "blueprints/Trash Container.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("Green", File ( path: "materials/Green.glb" )),
("DarkGrey", File ( path: "materials/DarkGrey.glb" )),
("Green", File ( path: "materials/Green.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("Cone", File ( path: "blueprints/Cone.glb" )),
("White", File ( path: "materials/White.glb" )),
("Black", File ( path: "materials/Black.glb" )),
("Dark_gray", File ( path: "materials/Dark_gray.glb" )),
("Orange", File ( path: "materials/Orange.glb" )),
("White", File ( path: "materials/White.glb" )),
("Trash Bag", File ( path: "blueprints/Trash Bag.glb" )),
("mat17", File ( path: "materials/mat17.glb" )),
("Bus Stop", File ( path: "blueprints/Bus Stop.glb" )),
("LightBlue_BusStop", File ( path: "materials/LightBlue_BusStop.glb" )),
("BlueBusStop", File ( path: "materials/BlueBusStop.glb" )),
("LightBlue_BusStop", File ( path: "materials/LightBlue_BusStop.glb" )),
("Bus Stop Sign", File ( path: "blueprints/Bus Stop Sign.glb" )),
("White", File ( path: "materials/White.glb" )),
("Orang", File ( path: "materials/Orang.glb" )),
("Silver", File ( path: "materials/Silver.glb" )),
("Grey", File ( path: "materials/Grey.glb" )),
("Black", File ( path: "materials/Black.glb" )),
("Orang", File ( path: "materials/Orang.glb" )),
("White", File ( path: "materials/White.glb" )),
("Box", File ( path: "blueprints/Box.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("Fence Piece", File ( path: "blueprints/Fence Piece.glb" )),
("metal_fence", File ( path: "materials/metal_fence.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("sandstone_light", File ( path: "materials/sandstone_light.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("metal_fence", File ( path: "materials/metal_fence.glb" )),
("Grass", File ( path: "blueprints/Grass.glb" )),
("Grass", File ( path: "materials/Grass.glb" )),
("Fence End", File ( path: "blueprints/Fence End.glb" )),
("metal_fence", File ( path: "materials/metal_fence.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("brick_shade1", File ( path: "materials/brick_shade1.glb" )),
("sandstone_light", File ( path: "materials/sandstone_light.glb" )),
("brick_shade2", File ( path: "materials/brick_shade2.glb" )),
("metal_fence", File ( path: "materials/metal_fence.glb" )),
("Bench", File ( path: "blueprints/Bench.glb" )),
("mat19", File ( path: "materials/mat19.glb" )),
("mat20", File ( path: "materials/mat20.glb" )),
Expand All @@ -136,20 +136,20 @@
("Metal Fence", File ( path: "blueprints/Metal Fence.glb" )),
("Silver", File ( path: "materials/Silver.glb" )),
("Overpass Tunnel", File ( path: "blueprints/Overpass Tunnel.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("Black", File ( path: "materials/Black.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("Overpass Block", File ( path: "blueprints/Overpass Block.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("citybits_texture", File ( path: "materials/citybits_texture.glb" )),
("concrete", File ( path: "materials/concrete.glb" )),
("Npc Pizza", File ( path: "blueprints/Npc Pizza.glb" )),
("Woman", File ( path: "materials/Woman.glb" )),
("Npc Mail", File ( path: "blueprints/Npc Mail.glb" )),
("Shirt", File ( path: "materials/Shirt.glb" )),
("Pants", File ( path: "materials/Pants.glb" )),
("Hair", File ( path: "materials/Hair.glb" )),
("Skin", File ( path: "materials/Skin.glb" )),
("Eyes", File ( path: "materials/Eyes.glb" )),
("Pants", File ( path: "materials/Pants.glb" )),
("Socks", File ( path: "materials/Socks.glb" )),
("Eyes", File ( path: "materials/Eyes.glb" )),
("Shirt", File ( path: "materials/Shirt.glb" )),
("Hair", File ( path: "materials/Hair.glb" )),
]
)
Binary file added assets/materials/BlueBusStop.001.glb
View file
Binary file not shown.
Binary file added assets/materials/LightBlue_BusStop.001.glb
View file
Binary file not shown.
Binary file added assets/materials/fox_material.glb
View file
Binary file not shown.
85 changes: 85 additions & 0 deletions assets/registry.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,32 @@
"type": "array",
"typeInfo": "Tuple"
},
"(foxtrot::character::controller::FloatHeight, foxtrot::character::controller::WalkSpeed, foxtrot::character::controller::JumpHeight)": {
"isComponent": false,
"isResource": false,
"items": false,
"long_name": "(foxtrot::character::controller::FloatHeight, foxtrot::character::controller::WalkSpeed, foxtrot::character::controller::JumpHeight)",
"prefixItems": [
{
"type": {
"$ref": "#/$defs/foxtrot::character::controller::FloatHeight"
}
},
{
"type": {
"$ref": "#/$defs/foxtrot::character::controller::WalkSpeed"
}
},
{
"type": {
"$ref": "#/$defs/foxtrot::character::controller::JumpHeight"
}
}
],
"short_name": "(FloatHeight, WalkSpeed, JumpHeight)",
"type": "array",
"typeInfo": "Tuple"
},
"(u8, u8)": {
"isComponent": false,
"isResource": false,
Expand Down Expand Up @@ -17444,6 +17470,65 @@
"type": "string",
"typeInfo": "Enum"
},
"foxtrot::character::controller::FloatHeight": {
"isComponent": true,
"isResource": false,
"items": false,
"long_name": "foxtrot::character::controller::FloatHeight",
"prefixItems": [
{
"type": {
"$ref": "#/$defs/f32"
}
}
],
"short_name": "FloatHeight",
"type": "array",
"typeInfo": "TupleStruct"
},
"foxtrot::character::controller::JumpHeight": {
"isComponent": true,
"isResource": false,
"items": false,
"long_name": "foxtrot::character::controller::JumpHeight",
"prefixItems": [
{
"type": {
"$ref": "#/$defs/f32"
}
}
],
"short_name": "JumpHeight",
"type": "array",
"typeInfo": "TupleStruct"
},
"foxtrot::character::controller::WalkSpeed": {
"isComponent": true,
"isResource": false,
"items": false,
"long_name": "foxtrot::character::controller::WalkSpeed",
"prefixItems": [
{
"type": {
"$ref": "#/$defs/f32"
}
}
],
"short_name": "WalkSpeed",
"type": "array",
"typeInfo": "TupleStruct"
},
"foxtrot::character::spawn::InsertCharacterController": {
"additionalProperties": false,
"isComponent": true,
"isResource": false,
"long_name": "foxtrot::character::spawn::InsertCharacterController",
"properties": {},
"required": [],
"short_name": "InsertCharacterController",
"type": "object",
"typeInfo": "Struct"
},
"foxtrot::collision_layer::CollisionLayerPreset": {
"isComponent": true,
"isResource": false,
Expand Down
20 changes: 13 additions & 7 deletions src/character/controller.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use super::action::CharacterAction;
use crate::system_set::VariableBeforeFixedGameSet;

pub(super) fn plugin(app: &mut App) {
app.register_type::<(FloatHeight, WalkSpeed, JumpHeight)>();
app.add_plugins((
TnuaAvian3dPlugin::new(RunFixedMainLoop),
TnuaControllerPlugin::new(RunFixedMainLoop),
Expand All @@ -26,11 +27,14 @@ fn apply_walking(
)>,
) {
for (mut controller, action_state, float_height, max_speed) in &mut character_query {
let direction = action_state
let axis = action_state
.axis_pair(&CharacterAction::Move)
.normalize_or_zero()
.extend(0.)
.xzy();
.normalize_or_zero();
let direction = Vec3 {
x: axis.x,
y: 0.0,
z: -axis.y,
};
let sprinting_factor = if action_state.pressed(&CharacterAction::Sprint) {
1.5
} else {
Expand Down Expand Up @@ -65,14 +69,16 @@ fn apply_jumping(
}
}

#[derive(Debug, Default, Clone, PartialEq, Component, Reflect, Deref, DerefMut)]
#[derive(Debug, Default, Clone, Copy, PartialEq, Component, Reflect, Deref, DerefMut)]
#[reflect(Component)]
/// Must be larger than the height of the entity's center from the bottom of its
/// collider, or else the character will not float and Tnua will not work properly
pub struct FloatHeight(pub(crate) f32);
#[derive(Debug, Default, Clone, PartialEq, Component, Reflect, Deref, DerefMut)]

#[derive(Debug, Default, Clone, Copy, PartialEq, Component, Reflect, Deref, DerefMut)]
#[reflect(Component)]
pub struct WalkSpeed(pub(crate) f32);
#[derive(Debug, Default, Clone, PartialEq, Component, Reflect, Deref, DerefMut)]

#[derive(Debug, Default, Clone, Copy, PartialEq, Component, Reflect, Deref, DerefMut)]
#[reflect(Component)]
pub struct JumpHeight(pub(crate) f32);
4 changes: 3 additions & 1 deletion src/character/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ use bevy::prelude::*;

pub mod action;
pub mod controller;
mod spawn;

pub(super) fn plugin(app: &mut App) {
app.add_plugins((action::plugin, controller::plugin));
app.add_plugins((action::plugin, controller::plugin, spawn::plugin));
}

33 changes: 33 additions & 0 deletions src/character/spawn.rs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
use bevy::{
ecs::component::{ComponentHooks, StorageType},
prelude::*,
};
use bevy_tnua::prelude::*;
use leafwing_input_manager::prelude::*;

use super::action::CharacterAction;

pub(super) fn plugin(app: &mut App) {
app.register_type::<InsertCharacterController>();
}

#[derive(Debug, Clone, Copy, Reflect)]
#[reflect(Component)]
struct InsertCharacterController;

impl Component for InsertCharacterController {
const STORAGE_TYPE: StorageType = StorageType::Table;

fn register_component_hooks(hooks: &mut ComponentHooks) {
hooks.on_add(|mut world, entity, _component_id| {
world
.commands()
.entity(entity)
.insert((
TnuaControllerBundle::default(),
ActionState::<CharacterAction>::default(),
))
.remove::<InsertCharacterController>();
});
}
}
Loading

0 comments on commit ab237f2

Please sign in to comment.