Skip to content

Feature/model testing #49

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

Merged
nixonyh merged 15 commits into from
Dec 8, 2024
Merged

Feature/model testing #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5f4ef63
create preset movement direction
kahboon0425 Nov 26, 2024
a79861d
apply lerping, add checkbox
kahboon0425 Nov 26, 2024
ba9841a
Merge branch 'main' into feature/model-testing
kahboon0425 Nov 26, 2024
c26f42f
generate testing data
kahboon0425 Dec 1, 2024
9a7f144
store testing data result into csv
kahboon0425 Dec 3, 2024
2b6c557
calculate accuracy
kahboon0425 Dec 3, 2024
f031c8f
set animation files to loopable
kahboon0425 Dec 7, 2024
f544bfd
FIx pose matching system set
nixonyh Dec 7, 2024
0295ab6
move bvh files
kahboon0425 Dec 7, 2024
c3a7da7
fix cargo clippy
kahboon0425 Dec 7, 2024
bdb914f
Add ResetPlayer event
nixonyh Dec 8, 2024
7b432f6
Merge branch 'feature/model-testing' of https://github.com/kahboon042…
nixonyh Dec 8, 2024
eff25df
Add reset player button
nixonyh Dec 8, 2024
b0c67b2
fix code based on review
kahboon0425 Dec 8, 2024
9e4877a
update kmeans k and max iter value
kahboon0425 Dec 8, 2024
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
22 changes: 22 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ bevy-inspector-egui = { version = "0.25", optional = true }
kdtree = "0.7.0"
peak_alloc = "0.2.1"
clustering = "0.2.1"
csv = "1.3.0"

[dev-dependencies]
bevy-inspector-egui = { version = "0.25" }
Expand Down
199 changes: 0 additions & 199 deletions assets/bvh/Jog/Slow Jogging.bvh
View file
Open in desktop

This file was deleted.

222 changes: 0 additions & 222 deletions assets/bvh/Jog/jogging_backward.bvh
View file
Open in desktop

This file was deleted.

224 changes: 0 additions & 224 deletions assets/bvh/Jog/jogging_forward.bvh
View file
Open in desktop

This file was deleted.

248 changes: 0 additions & 248 deletions assets/bvh/Jog/jogging_forward_long.bvh
View file
Open in desktop

This file was deleted.

399 changes: 0 additions & 399 deletions assets/bvh/Run/Running.bvh
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions assets/bvh/Run/Running.bvh.meta
View file
Open in desktop

This file was deleted.

0 assets/bvh/Jog/Jogging Backwards.bvh.meta → assets/bvh/Walk/Walk in Circle.bvh.meta
View file
Open in desktop
File renamed without changes.
902 changes: 902 additions & 0 deletions assets/bvh/Walk/Walk in Left Circle.bvh
View file
Open in desktop

Large diffs are not rendered by default.

0 ...s/bvh/Jog/Slow Jogging Backwards.bvh.meta → assets/bvh/Walk/Walk in Left Circle.bvh.meta
View file
Open in desktop
File renamed without changes.
902 changes: 902 additions & 0 deletions assets/bvh/Walk/Walk in Right Circle.bvh
View file
Open in desktop

Large diffs are not rendered by default.

0 assets/bvh/Jog/Slow Jogging.bvh.meta → ...ts/bvh/Walk/Walk in Right Circle.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Jog/Jogging Backwards.bvh → assets/bvh_not_use/Jog/Jogging Backwards.bvh
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions assets/bvh_not_use/Jog/Jogging Backwards.bvh.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_bvh_anim::bvh_asset::BvhAssetLoader",
settings: (
loopable: true,
),
),
)
0 assets/bvh/Jog/Slow Jogging Backwards.bvh → ...vh_not_use/Jog/Slow Jogging Backwards.bvh
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Jog/jogging_backward.bvh.meta → ...t_use/Jog/Slow Jogging Backwards.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Fast Run.bvh.meta → ...bvh_not_use/Jog/jogging_backward.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Fast Run.bvh → assets/bvh_not_use/Run/Fast Run.bvh
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions assets/bvh_not_use/Run/Fast Run.bvh.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_bvh_anim::bvh_asset::BvhAssetLoader",
settings: (
loopable: true,
),
),
)
0 assets/bvh/Run/Idle to Sprint.bvh → assets/bvh_not_use/Run/Idle to Sprint.bvh
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Idle to Sprint.bvh.meta → ...s/bvh_not_use/Run/Idle to Sprint.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Run to Left Turn.bvh → assets/bvh_not_use/Run/Run to Left Turn.bvh
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Run to Left Turn.bvh.meta → ...bvh_not_use/Run/Run to Left Turn.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Run to Right Turn.bvh → assets/bvh_not_use/Run/Run to Right Turn.bvh
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Run to Right Turn.bvh.meta → ...vh_not_use/Run/Run to Right Turn.bvh.meta
View file
Open in desktop
File renamed without changes.
0 ...s/bvh/Run/Running Backward Right Turn.bvh → ...t_use/Run/Running Backward Right Turn.bvh
View file
Open in desktop
File renamed without changes.
0 .../Run/Running Backward Right Turn.bvh.meta → .../Run/Running Backward Right Turn.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Running Change Direction.bvh → ..._not_use/Run/Running Change Direction.bvh
View file
Open in desktop
File renamed without changes.
0 ...bvh/Run/Running Change Direction.bvh.meta → ...use/Run/Running Change Direction.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Running Forward Arc Left.bvh → ..._not_use/Run/Running Forward Arc Left.bvh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...bvh/Run/Running Forward Arc Left.bvh.meta → ...use/Run/Running Forward Arc Left.bvh.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
asset: Load(
loader: "bevy_bvh_anim::bvh_asset::BvhAssetLoader",
settings: (
loopable: false,
loopable: true,
),
),
)
0 assets/bvh/Run/Running Forward Arc Right.bvh → ...not_use/Run/Running Forward Arc Right.bvh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...vh/Run/Running Forward Arc Right.bvh.meta → ...se/Run/Running Forward Arc Right.bvh.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
asset: Load(
loader: "bevy_bvh_anim::bvh_asset::BvhAssetLoader",
settings: (
loopable: false,
loopable: true,
),
),
)
0 assets/bvh/Run/Running Forward.bvh → assets/bvh_not_use/Run/Running Forward.bvh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion assets/bvh/Run/Running Forward.bvh.meta → .../bvh_not_use/Run/Running Forward.bvh.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
asset: Load(
loader: "bevy_bvh_anim::bvh_asset::BvhAssetLoader",
settings: (
loopable: false,
loopable: true,
),
),
)
0 assets/bvh/Run/Running To Turn.bvh → assets/bvh_not_use/Run/Running To Turn.bvh
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Running To Turn.bvh.meta → .../bvh_not_use/Run/Running To Turn.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Running Turn Left 180.bvh → ...bvh_not_use/Run/Running Turn Left 180.bvh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ts/bvh/Run/Running Turn Left 180.bvh.meta → ...ot_use/Run/Running Turn Left 180.bvh.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
asset: Load(
loader: "bevy_bvh_anim::bvh_asset::BvhAssetLoader",
settings: (
loopable: false,
loopable: true,
),
),
)
0 assets/bvh/Run/Running Turn Right 180.bvh → ...vh_not_use/Run/Running Turn Right 180.bvh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/bvh/Run/Running Turn Right 180.bvh.meta → ...t_use/Run/Running Turn Right 180.bvh.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
asset: Load(
loader: "bevy_bvh_anim::bvh_asset::BvhAssetLoader",
settings: (
loopable: false,
loopable: true,
),
),
)
0 ...ts/bvh/Run/Running backward Left Turn.bvh → ...ot_use/Run/Running backward Left Turn.bvh
View file
Open in desktop
File renamed without changes.
0 ...h/Run/Running backward Left Turn.bvh.meta → ...e/Run/Running backward Left Turn.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Running backwards.bvh → assets/bvh_not_use/Run/Running backwards.bvh
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Running backwards.bvh.meta → ...vh_not_use/Run/Running backwards.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Sprint Turn.bvh → assets/bvh_not_use/Run/Sprint Turn.bvh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion assets/bvh/Run/Sprint Turn.bvh.meta → assets/bvh_not_use/Run/Sprint Turn.bvh.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
asset: Load(
loader: "bevy_bvh_anim::bvh_asset::BvhAssetLoader",
settings: (
loopable: false,
loopable: true,
),
),
)
0 assets/bvh/Run/Sprint.bvh → assets/bvh_not_use/Run/Sprint.bvh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion assets/bvh/Run/Sprint.bvh.meta → assets/bvh_not_use/Run/Sprint.bvh.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
asset: Load(
loader: "bevy_bvh_anim::bvh_asset::BvhAssetLoader",
settings: (
loopable: false,
loopable: true,
),
),
)
0 assets/bvh/Run/Standard Run.bvh → assets/bvh_not_use/Run/Standard Run.bvh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion assets/bvh/Run/Standard Run.bvh.meta → assets/bvh_not_use/Run/Standard Run.bvh.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
asset: Load(
loader: "bevy_bvh_anim::bvh_asset::BvhAssetLoader",
settings: (
loopable: false,
loopable: true,
),
),
)
0 assets/bvh/Run/Turn To Running.bvh → assets/bvh_not_use/Run/Turn To Running.bvh
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Run/Turn To Running.bvh.meta → .../bvh_not_use/Run/Turn To Running.bvh.meta
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Walk/Walk Backwards.bvh → assets/bvh_not_use/Walk/Walk Backwards.bvh
View file
Open in desktop
File renamed without changes.
0 assets/bvh/Walk/Walk Backwards.bvh.meta → .../bvh_not_use/Walk/Walk Backwards.bvh.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion assets/motion_data/motion_data.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/testing_dataset.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions assets/testing_dataset.json.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_motion_matching::motion::motion_asset::MotionAssetLoader",
settings: (),
),
)
1,078 changes: 1,078 additions & 0 deletions assets/traj_matching_result.csv
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions assets/traj_matching_result.csv.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(
meta_format_version: "1.0",
asset: Ignore,
)
4 changes: 2 additions & 2 deletions examples/movement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ fn main() -> AppExit {
RecordPlugin::<Velocity>::default(),
))
.insert_resource(MovementConfig {
walk_speed: 2.0,
run_speed: 4.0,
walk_speed: 1.0,
run_speed: 2.0,
lerp_factor: 10.0,
})
.insert_resource(TrajectoryConfig {
Expand Down
14 changes: 0 additions & 14 deletions imported_assets/Default/bvh/Jog/Jogging Backwards.bvh.meta
View file
Open in desktop

This file was deleted.

Loading
Loading