Compare commits

..

No commits in common. "cacb322fac7347c9f4353c2cc3512ef0553dd3db" and "0592ae588a1e1c36ebdbe4dea4e4aff19364ca05" have entirely different histories.

5 changed files with 752 additions and 1369 deletions

2081
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,13 +1,13 @@
[package]
name = "cyber_rider"
version = "0.1.0"
edition = "2024"
edition = "2021"
[dependencies]
rand = "0.8"
# bevy_polyline = "0.4"
noise = "0.9"
hexasphere = "15"
hexasphere = "14"
#wgpu = "0.20"
# bevy-inspector-egui = "0.18"
@ -15,13 +15,13 @@ hexasphere = "15"
inspector = []
[dependencies.bevy]
version = "0.15"
version = "0.14"
default-features = true
features = ["bevy_dev_tools"]
[dependencies.avian3d]
default-features = false
version = "0.2"
version = "0.1"
features = ["3d", "f32", "parry-f32", "debug-plugin", "default-collider", "collider-from-mesh"]
# Maybe also enable only a small amount of optimization for our code:

View file

@ -100,7 +100,7 @@ pub(super) fn apply_inputs(
// steering
let mut steering = steering.single_mut();
let angle = yaw_to_angle(input.yaw);
let angle = if angle.is_normal() { -angle } else { 0.0 };
let angle = if angle.is_normal() { angle } else { 0.0 };
let limit = AngleLimit::new(angle - 0.01, angle + 0.01);
steering.angle_limit = Some(limit);
}

View file

@ -1,8 +1,4 @@
use avian3d::prelude::{
AngularDamping, AngularVelocity, CoefficientCombine, Collider, ColliderDensity,
CollisionLayers, ExternalTorque, Friction, LinearDamping, LinearVelocity, Restitution,
RigidBody, SleepingDisabled,
};
use avian3d::prelude::*;
use bevy::{
core::Name,
prelude::{AssetServer, BuildChildren, Commands, Quat, Res, SpatialBundle, Transform, Vec3},

View file

@ -1,14 +1,5 @@
use avian3d::{
math::FRAC_PI_2,
prelude::{
Collider, ColliderDensity, CollisionLayers, CollisionMargin, ExternalTorque, FixedJoint,
Friction, Joint, MassPropertiesBundle, Restitution, RevoluteJoint, RigidBody, SweptCcd,
},
};
use bevy::prelude::{
AlphaMode, Assets, Color, Commands, Entity, Mesh, Name, PbrBundle, Quat, ResMut, Sphere,
StandardMaterial, Torus, Transform, Vec3,
};
use avian3d::{math::FRAC_PI_2, prelude::*};
use bevy::prelude::*;
use super::{CyberSteering, CyberWheel, Meshterial, WheelConfig};
use crate::ColliderGroups;
@ -59,7 +50,6 @@ pub fn spawn_wheels(
mesh.clone(),
collider.clone(),
conf,
steering.is_some(),
);
if let Some(steering) = steering {
@ -85,7 +75,6 @@ fn wheels_helper(
tire_mesh: Mesh,
collider: Collider,
conf: &WheelConfig,
is_front: bool,
) -> Entity {
let wheel_material = &StandardMaterial {
base_color: Color::srgb(0.01, 0.01, 0.01),
@ -94,17 +83,14 @@ fn wheels_helper(
..Default::default()
};
let pos_name = if is_front { "front" } else { "rear" };
let xform = Transform::from_translation(position);
let hub_mesh: Mesh = Sphere::new(0.1).into();
let hub = commands
.spawn((
Name::new(format!("{pos_name} hub")),
Name::new("hub"),
RigidBody::Dynamic,
MassPropertiesBundle::new_computed(&Collider::sphere(0.1), 1000.0),
CollisionLayers::NONE,
MassPropertiesBundle::new_computed(&Collider::sphere(0.1), 200.0),
PbrBundle {
mesh: meshes.add(hub_mesh),
material: materials.add(wheel_material.clone()),
@ -116,7 +102,7 @@ fn wheels_helper(
let tire = commands
.spawn((
Name::new(format!("{pos_name} tire")),
Name::new("tire"),
PbrBundle {
mesh: meshes.add(tire_mesh),
material: materials.add(wheel_material.clone()),