Skip to content

Update main.rs #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update main.rs #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
use bevy::prelude::*;
use bevy_rapier3d::{
dynamics::RigidBody,
dynamics::{RigidBody, Damping},
geometry::{Collider, ColliderMassProperties},
plugin::{NoUserData, RapierConfiguration, RapierPhysicsPlugin, TimestepMode},
render::RapierDebugRenderPlugin
// render::RapierDebugRenderPlugin
};

mod camera;

pub fn main() {
Expand All @@ -17,10 +16,10 @@ pub fn main() {
})
.insert_resource(RapierConfiguration {
timestep_mode: TimestepMode::Fixed { dt: 0.05, substeps: 20 },
// Useful settings for debugging
// physics_pipeline_active: false,
// query_pipeline_active: false,
// gravity: Vec3::ZERO,
physics_pipeline_active: true,
query_pipeline_active: true,
gravity: Vec3::new(0.0,-9.81,0.0),
// gravity:Vec3::ZERO,
..default()
})
.add_plugins(DefaultPlugins)
Expand All @@ -34,11 +33,11 @@ pub fn main() {
.run();
}

fn render_origin(mut gizmos: Gizmos) {
gizmos.line(Vec3::ZERO, Vec3::X, Color::RED);
gizmos.line(Vec3::ZERO, Vec3::Y, Color::GREEN);
gizmos.line(Vec3::ZERO, Vec3::Z, Color::BLUE);
}
// fn render_origin(mut gizmos: Gizmos) {
// gizmos.line(Vec3::ZERO, Vec3::X, Color::RED);
// gizmos.line(Vec3::ZERO, Vec3::Y, Color::GREEN);
// gizmos.line(Vec3::ZERO, Vec3::Z, Color::BLUE);
// }
Comment on lines -37 to +40
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commenting code in and out like this results in noise in your commit messages and makes it harder for me to see what has changed. Commits should always contain as few changes as possible.


fn setup(
mut commands: Commands,
Expand Down Expand Up @@ -82,21 +81,23 @@ fn setup(
commands
.spawn((Collider::cuboid(cube_size * 0.5, cube_size * 0.5, cube_size * 0.5), RigidBody::Dynamic))
.insert(ColliderMassProperties::Mass(1.0))
.insert(Damping { linear_damping: 0.1, angular_damping: 0.1 })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this, boxes of different masses should fall at the same acceleration and damping is (probably) not necessary for this project.

.insert(PbrBundle {
mesh: meshes.add(Mesh::from(Cuboid::new(cube_size, cube_size, cube_size))),
material: materials.add(cube_color),
transform: Transform::from_xyz(0.5, 0.5, 0.0),
transform: Transform::from_xyz(0.5, 100.0, 0.0),
..default()
});

// heavy cube (10 kg)
commands
.spawn((Collider::cuboid(cube_size * 0.5, cube_size * 0.5, cube_size * 0.5), RigidBody::Dynamic))
.insert(ColliderMassProperties::Mass(10.0))
.insert(Damping { linear_damping: 0.02, angular_damping: 0.02 })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this, boxes of different masses should fall at the same acceleration and damping is (probably) not necessary for this project.

.insert(PbrBundle {
mesh: meshes.add(Mesh::from(Cuboid::new(cube_size, cube_size, cube_size))),
material: materials.add(cube_color),
transform: Transform::from_xyz(-0.5, 0.5, 0.0),
transform: Transform::from_xyz(-0.5, 100.0, 0.0),
..default()
});

Expand Down