Skip to content
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.

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

feat: Components & Groups w. new Muscle structure in Arms & Legs #31

Merged
merged 35 commits into from
Dec 11, 2024

Conversation

bkje14
Copy link
Contributor

@bkje14 bkje14 commented Oct 28, 2024

PR to implement new AnyComponentDefinitions in the BodyModel. This replaces the old implementation with regex searching.

New Muscle groups are also implemented with the new AnyComponentGroup class.
This means that the Arm and Leg models have switched to the same folder structure as the Trunk model.
Individual muscle elements are collected into AnyFolders for AMS version < 8.2 and AnyComponentGroup for new AMS versions.

The "old" structure with muscles in a flat list can be activated with the new temporary BM switch: BM_COMPATIBILITY_30_MUSCLE_STRUCTURE - this will create ref objects to allow users to gracefully switch to the new structure.

A few side quests got handled also:

  • Moved the ...Trunk.Mesh folder inside the ...Trunk.Abdominal folder where it belongs
  • Moved the ...Trunk.LayerConstraints into the ...Trunk.Abdominal where it belongs
  • Reordered the objects inside ...ShoulderArm.Mus so all none muscle objects are displayed at the bottom.
  • disabling AnyFixedRefFrame for the InterpolFunWithSPar.any as I believe they are only a debug tool

@bkje14 bkje14 added the feature label Oct 28, 2024
@bkje14 bkje14 changed the title Components & Groups w. new Muscle structure in Arms & Legs feat: Components & Groups w. new Muscle structure in Arms & Legs Oct 28, 2024
@bkje14 bkje14 requested a review from melund October 29, 2024 07:11
@melund
Copy link
Member

melund commented Oct 30, 2024

Let us take the rest of the review tomorrow or next week. Whatever, you prefer.

@bkje14
Copy link
Contributor Author

bkje14 commented Nov 15, 2024

@melund The component & group PR in AMS has been merged now so there is support for this feature in AMS 8.2 now (Y)

@melund melund requested a review from Copilot November 15, 2024 21:14

Choose a reason for hiding this comment

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

Copilot reviewed 43 out of 43 changed files in this pull request and generated no suggestions.

@bkje14 bkje14 requested a review from melund December 9, 2024 14:06
@melund melund requested a review from Copilot December 11, 2024 11:39

Choose a reason for hiding this comment

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

Copilot reviewed 27 out of 47 changed files in this pull request and generated no suggestions.

Files not reviewed (20)
  • Application/Examples/AirlinePassenger/AirlinePassenger.main.any: Language not supported
  • Application/Examples/StandingModel/StandingModel.Main.any: Language not supported
  • Body/AAUHuman/Arm/Calibration/ArmCal1.any: Language not supported
  • Body/AAUHuman/Arm/EvaluateMomentArmsStudy.any: Language not supported
  • Body/AAUHuman/Arm/LeftArmMusclesSelectedOutput.any: Language not supported
  • Body/AAUHuman/Arm/RightArmMusclesSelectedOutput.any: Language not supported
  • Body/AAUHuman/Arm/ShoulderArmModel.root.any: Language not supported
  • Body/AAUHuman/Arm/ThoraxWrappingSurfaces.any: Language not supported
  • Body/AAUHuman/Arm/ammr_3.0_compatibility_structure.any: Language not supported
  • Body/AAUHuman/Arm/armmuscles_for_output.any: Language not supported
  • Body/AAUHuman/Arm/levator_scapulae.any: Language not supported
  • Body/AAUHuman/Arm/sternocleidomastoid.any: Language not supported
  • Body/AAUHuman/Arm/trapezius_clavicular.any: Language not supported
  • Body/AAUHuman/Arm/trapezius_scapular.any: Language not supported
  • Body/AAUHuman/BodyModels/GenericBodyModel/BodyModel.any: Language not supported
  • Body/AAUHuman/BodyModels/GenericBodyModel/BodyModel.config_info.any: Language not supported
  • Body/AAUHuman/BodyModels/GenericBodyModel/BodyModel.defaults.any: Language not supported
  • Body/AAUHuman/BodyModels/GenericBodyModel/ComponentAndGroupDefinitions.ClassTemplate.any: Language not supported
  • Body/AAUHuman/BodyModels/GenericBodyModel/ComponentDefinitions.any: Language not supported
  • Body/AAUHuman/BodyModels/GenericBodyModel/ComponentTreeConfig.any: Language not supported
@melund melund merged commit fc66af9 into ammr4-beta Dec 11, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants