Skip to content

Bevy Simulation #558

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

Draft
Fyor wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Bevy Simulation #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2f6290f
Bevy Sim 2D
Fyor May 25, 2025
20094a1
Rebase fixes for bevy 0.16
Fyor May 25, 2025
1b7b719
Ball fixes
Fyor May 25, 2025
c41f803
Add ball physics and scoring
Fyor Jun 19, 2025
1ae4a63
Change colors
Fyor Jun 19, 2025
334e4ad
Add simulation command to sindri and update version
Fyor Jul 14, 2025
01493cc
Add ball rotation depending on veloctiy
Fyor Jul 15, 2025
7917fd2
Add ball image
Fyor Jul 15, 2025
9684488
Update dependencies and resolve merge conflicts in Cargo files
Fyor Jul 15, 2025
842737d
AI coocked??
Fyor Jul 18, 2025
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
12,336 changes: 12,336 additions & 0 deletions Cargo copy.lock
View file
Open in desktop

Large diffs are not rendered by default.

735 changes: 731 additions & 4 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 17 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
members = ["crates/*", "tools/sindri", "tools/yggdrasil_rerun", "yggdrasil"]
members = ["crates/*", "tools/*", "yggdrasil"]
resolver = "2"

[workspace.package]
Expand Down Expand Up @@ -65,7 +65,23 @@ apodize = "1.0.0"
async-std = "1.13.1"
bevy = { version = "0.16.0", default-features = false, features = [
"bevy_state",
"bevy_asset",
"bevy_core_pipeline",
"bevy_pbr",
"bevy_mesh_picking_backend",
"bevy_sprite",
"bevy_window",
"bevy_winit",
"bevy_text",
"bevy_picking",
"android-game-activity",
"png",
"tonemapping_luts",
"webgl2",
"x11",
"wayland",
] }
bevy_egui = { version = "0.34.0"}
byteorder = "1.5.0"
cargo_toml = "0.22.1"
chrono = "0.4.40"
Expand Down
1 change: 1 addition & 0 deletions deploy/assets/motions/standup_back.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"settings":{"interpolation_type":"Linear","exit_routine":"Standing","motion_order":["standup/on_back/ready_to_kick","standup/on_back/kick_up","standup/on_back/half_sit_to_crouch","standup/half_crouch_to_sit","standup/extend_legs"]},"submotions":{"standup/extend_legs":{"joint_stifness":0.8,"chest_angle_bound_upper":-0.4,"chest_angle_bound_lower":0.4,"exit_waittime":0.0,"fail_routine":"Retry","conditions":[],"keyframes":[{"target_position":{"head_yaw":0.0,"head_pitch":0.34906584,"left_shoulder_pitch":1.57,"left_shoulder_roll":0.2,"left_elbow_yaw":-1.57,"left_elbow_roll":-0.008,"left_wrist_yaw":0.0,"left_hip_yaw_pitch":0.0138,"left_hip_roll":0.0,"left_hip_pitch":-0.3,"left_knee_pitch":0.93,"left_ankle_pitch":-0.6,"left_ankle_roll":0.0,"right_shoulder_pitch":1.57,"right_shoulder_roll":-0.2,"right_elbow_yaw":1.57,"right_elbow_roll":0.008,"right_wrist_yaw":0.0,"right_hip_roll":0.0,"right_hip_pitch":-0.3,"right_knee_pitch":0.93,"right_ankle_pitch":-0.6,"right_ankle_roll":0.0,"left_hand":0.0,"right_hand":0.0},"duration":0.4},{"target_position":{"head_yaw":0.0,"head_pitch":0.34906584,"left_shoulder_pitch":1.57,"left_shoulder_roll":0.2,"left_elbow_yaw":-1.57,"left_elbow_roll":-0.008,"left_wrist_yaw":0.0,"left_hip_yaw_pitch":0.0138,"left_hip_roll":0.0,"left_hip_pitch":-0.3,"left_knee_pitch":0.93,"left_ankle_pitch":-0.6,"left_ankle_roll":0.0,"right_shoulder_pitch":1.57,"right_shoulder_roll":-0.2,"right_elbow_yaw":1.57,"right_elbow_roll":0.008,"right_wrist_yaw":0.0,"right_hip_roll":0.0,"right_hip_pitch":-0.3,"right_knee_pitch":0.93,"right_ankle_pitch":-0.6,"right_ankle_roll":0.0,"left_hand":0.0,"right_hand":0.0},"duration":0.4}]},"standup/on_back/kick_up":{"joint_stifness":0.8,"chest_angle_bound_upper":-0.4,"chest_angle_bound_lower":0.4,"exit_waittime":0.3,"fail_routine":"Retry","conditions":[],"keyframes":[{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.918992,"left_shoulder_roll":0.12421203,"left_elbow_yaw":0.20244598,"left_elbow_roll":-1.257838,"left_wrist_yaw":-0.052197933,"left_hip_yaw_pitch":0.0,"left_hip_roll":0.0,"left_hip_pitch":-1.5358897,"left_knee_pitch":-0.08726646,"left_ankle_pitch":0.0,"left_ankle_roll":0.0,"right_shoulder_pitch":1.962028,"right_shoulder_roll":-0.266958,"right_elbow_yaw":-0.14883995,"right_elbow_roll":1.37604,"right_wrist_yaw":0.056715965,"right_hip_roll":0.0,"right_hip_pitch":-1.5358897,"right_knee_pitch":-0.08726646,"right_ankle_pitch":0.0,"right_ankle_roll":0.0,"left_hand":0.0,"right_hand":0.0},"duration":0.8},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.918992,"left_shoulder_roll":0.12421203,"left_elbow_yaw":0.20244598,"left_elbow_roll":-1.257838,"left_wrist_yaw":-0.052197933,"left_hip_yaw_pitch":0.0,"left_hip_roll":0.0,"left_hip_pitch":-1.5358897,"left_knee_pitch":-0.08726646,"left_ankle_pitch":0.0,"left_ankle_roll":0.0,"right_shoulder_pitch":1.962028,"right_shoulder_roll":-0.266958,"right_elbow_yaw":-0.14883995,"right_elbow_roll":1.37604,"right_wrist_yaw":0.056715965,"right_hip_roll":0.0,"right_hip_pitch":-1.5358897,"right_knee_pitch":-0.08726646,"right_ankle_pitch":0.0,"right_ankle_roll":0.0,"left_hand":0.0,"right_hand":0.0},"duration":0.2},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.918992,"left_shoulder_roll":0.12421203,"left_elbow_yaw":0.20244598,"left_elbow_roll":-1.257838,"left_wrist_yaw":-0.052197933,"left_hip_yaw_pitch":0.0,"left_hip_roll":0.2268928,"left_hip_pitch":-0.27925268,"left_knee_pitch":-0.08726646,"left_ankle_pitch":1.0471976,"left_ankle_roll":0.08726646,"right_shoulder_pitch":1.962028,"right_shoulder_roll":-0.266958,"right_elbow_yaw":-0.14883995,"right_elbow_roll":1.37604,"right_wrist_yaw":0.056715965,"right_hip_roll":-0.2268928,"right_hip_pitch":-0.27925268,"right_knee_pitch":-0.08726646,"right_ankle_pitch":1.0471976,"right_ankle_roll":-0.08726646,"left_hand":0.0,"right_hand":0.0},"duration":0.4},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.918992,"left_shoulder_roll":0.12421203,"left_elbow_yaw":0.20244598,"left_elbow_roll":-1.257838,"left_wrist_yaw":-0.052197933,"left_hip_yaw_pitch":0.0,"left_hip_roll":0.0,"left_hip_pitch":-1.3962634,"left_knee_pitch":-0.08726646,"left_ankle_pitch":0.0,"left_ankle_roll":0.0,"right_shoulder_pitch":1.962028,"right_shoulder_roll":-0.266958,"right_elbow_yaw":-0.14883995,"right_elbow_roll":1.37604,"right_wrist_yaw":0.056715965,"right_hip_roll":0.0,"right_hip_pitch":-1.3962634,"right_knee_pitch":-0.08726646,"right_ankle_pitch":0.0,"right_ankle_roll":0.0,"left_hand":0.0,"right_hand":0.0},"duration":0.7}]},"standup/on_back/ready_to_kick":{"joint_stifness":0.8,"chest_angle_bound_upper":-0.4,"chest_angle_bound_lower":0.4,"exit_waittime":0.2,"fail_routine":"Retry","conditions":[],"keyframes":[{"target_position":{"head_yaw":0.0,"head_pitch":0.0,"left_shoulder_pitch":1.57,"left_shoulder_roll":0.0,"left_elbow_yaw":0.0,"left_elbow_roll":0.0,"left_wrist_yaw":0.0,"left_hip_yaw_pitch":0.0,"left_hip_roll":0.0,"left_hip_pitch":0.0,"left_knee_pitch":0.0,"left_ankle_pitch":0.0,"left_ankle_roll":0.0,"right_shoulder_pitch":1.57,"right_shoulder_roll":0.0,"right_elbow_yaw":0.0,"right_elbow_roll":0.0,"right_wrist_yaw":0.0,"right_hip_roll":0.0,"right_hip_pitch":0.0,"right_knee_pitch":0.0,"right_ankle_pitch":0.0,"right_ankle_roll":0.0,"left_hand":0.0,"right_hand":0.0},"duration":0.6},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.57,"left_shoulder_roll":0.0,"left_elbow_yaw":0.0,"left_elbow_roll":0.0,"left_wrist_yaw":0.113558054,"left_hip_yaw_pitch":0.0,"left_hip_roll":0.0,"left_hip_pitch":-0.21940398,"left_knee_pitch":0.829936,"left_ankle_pitch":1.0937839,"left_ankle_roll":0.0,"right_shoulder_pitch":1.57,"right_shoulder_roll":0.0,"right_elbow_yaw":0.0,"right_elbow_roll":0.0,"right_wrist_yaw":-0.113558054,"right_hip_roll":0.0,"right_hip_pitch":-0.21940398,"right_knee_pitch":0.829936,"right_ankle_pitch":1.0937839,"right_ankle_roll":0.0,"left_hand":0.0,"right_hand":0.0},"duration":0.3},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":2.146755,"left_shoulder_roll":0.0,"left_elbow_yaw":0.0,"left_elbow_roll":0.0,"left_wrist_yaw":0.113558054,"left_hip_yaw_pitch":0.0,"left_hip_roll":0.0,"left_hip_pitch":0.55219793,"left_knee_pitch":1.1198621,"left_ankle_pitch":0.40655208,"left_ankle_roll":0.0,"right_shoulder_pitch":2.146755,"right_shoulder_roll":0.0,"right_elbow_yaw":0.0,"right_elbow_roll":0.0,"right_wrist_yaw":-0.113558054,"right_hip_roll":0.0,"right_hip_pitch":0.55219793,"right_knee_pitch":1.1198621,"right_ankle_pitch":0.40655208,"right_ankle_roll":0.0,"left_hand":0.0,"right_hand":0.0},"duration":0.3},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.918992,"left_shoulder_roll":0.12421203,"left_elbow_yaw":0.20244598,"left_elbow_roll":-1.257838,"left_wrist_yaw":-0.052197933,"left_hip_yaw_pitch":0.0,"left_hip_roll":0.0,"left_hip_pitch":0.55219793,"left_knee_pitch":1.1198621,"left_ankle_pitch":0.40655208,"left_ankle_roll":0.0,"right_shoulder_pitch":1.962028,"right_shoulder_roll":-0.266958,"right_elbow_yaw":-0.14883995,"right_elbow_roll":1.37604,"right_wrist_yaw":0.056715965,"right_hip_roll":0.0,"right_hip_pitch":0.55219793,"right_knee_pitch":1.1198621,"right_ankle_pitch":0.40655208,"right_ankle_roll":0.0,"left_hand":0.0,"right_hand":0.0},"duration":0.3},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.918992,"left_shoulder_roll":0.12421203,"left_elbow_yaw":0.20244598,"left_elbow_roll":-1.257838,"left_wrist_yaw":-0.052197933,"left_hip_yaw_pitch":0.0,"left_hip_roll":0.0,"left_hip_pitch":0.0,"left_knee_pitch":1.9198622,"left_ankle_pitch":0.0,"left_ankle_roll":0.0,"right_shoulder_pitch":1.962028,"right_shoulder_roll":-0.266958,"right_elbow_yaw":-0.14883995,"right_elbow_roll":1.37604,"right_wrist_yaw":0.056715965,"right_hip_roll":0.0,"right_hip_pitch":0.0,"right_knee_pitch":1.9198622,"right_ankle_pitch":0.0,"right_ankle_roll":0.0,"left_hand":0.0,"right_hand":0.0},"duration":0.3}]},"standup/half_crouch_to_sit":{"joint_stifness":0.8,"chest_angle_bound_upper":-0.4,"chest_angle_bound_lower":0.4,"exit_waittime":0.0,"fail_routine":"Retry","conditions":[],"keyframes":[{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.7453293,"left_shoulder_roll":0.36651915,"left_elbow_yaw":-1.4835298,"left_elbow_roll":-0.2617994,"left_wrist_yaw":-1.5707964,"left_hip_yaw_pitch":-1.134464,"left_hip_roll":0.06981317,"left_hip_pitch":-0.55850536,"left_knee_pitch":2.1118484,"left_ankle_pitch":-1.012291,"left_ankle_roll":0.17453292,"right_shoulder_pitch":1.8675023,"right_shoulder_roll":-0.34906584,"right_elbow_yaw":1.727876,"right_elbow_roll":-0.15707964,"right_wrist_yaw":1.5707964,"right_hip_roll":-0.2617994,"right_hip_pitch":-0.31415927,"right_knee_pitch":-0.08726646,"right_ankle_pitch":0.9250245,"right_ankle_roll":0.06981317,"left_hand":0.0,"right_hand":0.0},"duration":0.7},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.5707964,"left_shoulder_roll":0.36651915,"left_elbow_yaw":-1.4835298,"left_elbow_roll":-0.2617994,"left_wrist_yaw":-1.5707964,"left_hip_yaw_pitch":-0.7592182,"left_hip_roll":0.20943952,"left_hip_pitch":-0.9599311,"left_knee_pitch":2.1118484,"left_ankle_pitch":-0.9773844,"left_ankle_roll":0.15707964,"right_shoulder_pitch":1.727876,"right_shoulder_roll":0.0,"right_elbow_yaw":1.727876,"right_elbow_roll":-0.15707964,"right_wrist_yaw":1.5707964,"right_hip_roll":0.23561946,"right_hip_pitch":-0.7679449,"right_knee_pitch":1.6580628,"right_ankle_pitch":-0.27925268,"right_ankle_roll":0.2617994,"left_hand":0.0,"right_hand":0.0},"duration":0.5},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.5184364,"left_shoulder_roll":0.33161256,"left_elbow_yaw":-1.4835298,"left_elbow_roll":-0.2443461,"left_wrist_yaw":-1.5707964,"left_hip_yaw_pitch":-0.57595867,"left_hip_roll":-0.12217305,"left_hip_pitch":-1.0471976,"left_knee_pitch":2.1118484,"left_ankle_pitch":-0.8552113,"left_ankle_roll":0.1308997,"right_shoulder_pitch":1.4137167,"right_shoulder_roll":-0.19198622,"right_elbow_yaw":1.727876,"right_elbow_roll":-0.13962634,"right_wrist_yaw":1.5707964,"right_hip_roll":0.15707964,"right_hip_pitch":-0.9948377,"right_knee_pitch":2.1118484,"right_ankle_pitch":-0.89011794,"right_ankle_roll":-0.15707964,"left_hand":0.0,"right_hand":0.0},"duration":0.4},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.5184364,"left_shoulder_roll":0.33161256,"left_elbow_yaw":-1.4835298,"left_elbow_roll":-0.2443461,"left_wrist_yaw":-1.5707964,"left_hip_yaw_pitch":-0.57595867,"left_hip_roll":-0.12217305,"left_hip_pitch":-1.0471976,"left_knee_pitch":2.1118484,"left_ankle_pitch":-0.8552113,"left_ankle_roll":0.1308997,"right_shoulder_pitch":1.4137167,"right_shoulder_roll":-0.19198622,"right_elbow_yaw":1.727876,"right_elbow_roll":-0.13962634,"right_wrist_yaw":1.5707964,"right_hip_roll":0.15707964,"right_hip_pitch":-0.9948377,"right_knee_pitch":2.1118484,"right_ankle_pitch":-0.89011794,"right_ankle_roll":-0.15707964,"left_hand":0.0,"right_hand":0.0},"duration":0.4},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.43117,"left_shoulder_roll":0.2268928,"left_elbow_yaw":-1.4660766,"left_elbow_roll":-0.20943952,"left_wrist_yaw":-1.5707964,"left_hip_yaw_pitch":0.0,"left_hip_roll":-0.06981317,"left_hip_pitch":-0.9250245,"left_knee_pitch":2.1118484,"left_ankle_pitch":-1.1693707,"left_ankle_roll":0.034906585,"right_shoulder_pitch":1.3089969,"right_shoulder_roll":-0.12217305,"right_elbow_yaw":1.727876,"right_elbow_roll":-0.12217305,"right_wrist_yaw":1.5707964,"right_hip_roll":0.10471976,"right_hip_pitch":-0.9075712,"right_knee_pitch":2.1118484,"right_ankle_pitch":-1.1693707,"right_ankle_roll":-0.08726646,"left_hand":0.0,"right_hand":0.0},"duration":0.2},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":1.43117,"left_shoulder_roll":0.2268928,"left_elbow_yaw":-1.4660766,"left_elbow_roll":-0.20943952,"left_wrist_yaw":-1.5707964,"left_hip_yaw_pitch":0.0,"left_hip_roll":-0.06981317,"left_hip_pitch":-0.9250245,"left_knee_pitch":2.1118484,"left_ankle_pitch":-1.1693707,"left_ankle_roll":0.034906585,"right_shoulder_pitch":1.3089969,"right_shoulder_roll":-0.12217305,"right_elbow_yaw":1.727876,"right_elbow_roll":-0.12217305,"right_wrist_yaw":1.5707964,"right_hip_roll":0.10471976,"right_hip_pitch":-0.9075712,"right_knee_pitch":2.1118484,"right_ankle_pitch":-1.1693707,"right_ankle_roll":-0.08726646,"left_hand":0.0,"right_hand":0.0},"duration":0.2}]},"standup/on_back/half_sit_to_crouch":{"joint_stifness":0.9,"chest_angle_bound_upper":-0.4,"chest_angle_bound_lower":0.4,"exit_waittime":0.0,"fail_routine":"Retry","conditions":[{"variable":"AngleY","min":-0.6,"max":0.6}],"keyframes":[{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":2.0943952,"left_shoulder_roll":-0.08726646,"left_elbow_yaw":-1.4835298,"left_elbow_roll":-0.33161256,"left_wrist_yaw":-1.5707964,"left_hip_yaw_pitch":-1.134464,"left_hip_roll":0.7330383,"left_hip_pitch":-1.3962634,"left_knee_pitch":1.3351768,"left_ankle_pitch":0.8552113,"left_ankle_roll":-0.12217305,"right_shoulder_pitch":2.1118484,"right_shoulder_roll":-0.017453292,"right_elbow_yaw":1.5184364,"right_elbow_roll":-0.38397244,"right_wrist_yaw":1.5707964,"right_hip_roll":-0.567232,"right_hip_pitch":-1.4660766,"right_knee_pitch":1.43117,"right_ankle_pitch":0.82030475,"right_ankle_roll":0.017453292,"left_hand":0.0,"right_hand":0.0},"duration":0.5},{"target_position":{"head_yaw":0.0,"head_pitch":0.38397244,"left_shoulder_pitch":2.024582,"left_shoulder_roll":-0.13962634,"left_elbow_yaw":-1.4835298,"left_elbow_roll":-0.27925268,"left_wrist_yaw":-1.5707964,"left_hip_yaw_pitch":-1.134464,"left_hip_roll":0.20943952,"left_hip_pitch":-0.5235988,"left_knee_pitch":2.1118484,"left_ankle_pitch":-0.715585,"left_ankle_roll":-0.33161256,"right_shoulder_pitch":2.1118484,"right_shoulder_roll":-0.6981317,"right_elbow_yaw":1.727876,"right_elbow_roll":-0.13962634,"right_wrist_yaw":1.5707964,"right_hip_roll":-0.34906584,"right_hip_pitch":-1.5358897,"right_knee_pitch":0.83775806,"right_ankle_pitch":0.9250245,"right_ankle_roll":-0.017453292,"left_hand":0.0,"right_hand":0.0},"duration":1.1}]}}}
Loading
Loading