-
Notifications
You must be signed in to change notification settings - Fork 42
feat(engine): Add Spring Constraint #1572
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
Open
JoaoTRoxo
wants to merge
9
commits into
main
Choose a base branch
from
1237-implement-spring-constraint
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
9edd429
feat(engine): add spring constraint
JoaoTRoxo 54975eb
feat(engine): add spring constraint
JoaoTRoxo 6629cd1
feat(engine): add spring constraint
JoaoTRoxo d103d6a
Merge branch 'main' into 1237-implement-spring-constraint
JoaoTRoxo 2fc294c
fix(Cmake)
JoaoTRoxo 85881b4
fix(spring_constraint)
JoaoTRoxo 5b7137f
feat(engine): add spring constraint
JoaoTRoxo 5860812
feat(engine): add spring constraint
JoaoTRoxo 2a6839e
fix(documentation): Four -> three
JoaoTRoxo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
engine/include/cubos/engine/physics/constraints/spring_constraint.hpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /// @file | ||
| /// @brief Component @ref cubos::engine::SpringConstraint. | ||
| /// @ingroup physics-solver-plugin | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <vector> | ||
|
|
||
| #include <glm/vec3.hpp> | ||
|
|
||
| #include <cubos/core/ecs/entity/entity.hpp> | ||
| #include <cubos/core/reflection/reflect.hpp> | ||
|
|
||
| namespace cubos::engine | ||
| { | ||
| /// @brief Relation which holds the information for a spring constraint between two bodies. | ||
| /// @ingroup physics-solver-plugin | ||
| struct SpringConstraint | ||
| { | ||
| CUBOS_REFLECT; | ||
| float stiffness; ///< Spring stiffness (force per unit extension) | ||
| float damping; ///< Damping coefficient | ||
| float restLength; ///< Rest length of spring | ||
| glm::vec3 localAnchor1; ///< The local contact point relative to the center of mass of the first body. | ||
| glm::vec3 localAnchor2; ///< The local contact point relative to the center of mass of the second body. | ||
| }; | ||
| } // namespace cubos::engine | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You did a sample just for the spring constraint so I think you can remove the changes you did to this file (if they are different move it to the other sample) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { | ||
| "actions": { | ||
| "camera-toggle": [ | ||
| {"keys": ["LControl"]} | ||
| ], | ||
| "reset": [ | ||
| {"keys": ["Space"]} | ||
| ] | ||
| }, | ||
| "axes": { | ||
| "move-lateral": { | ||
| "positive": [ | ||
| {"keys": ["D"]} | ||
| ], | ||
| "negative": [ | ||
| {"keys": ["A"]} | ||
| ] | ||
| }, | ||
| "move-vertical": { | ||
| "positive": [ | ||
| {"keys": ["E"]} | ||
| ], | ||
| "negative": [ | ||
| {"keys": ["Q"]} | ||
| ] | ||
| }, | ||
| "move-longitudinal": { | ||
| "positive": [ | ||
| {"keys": ["W"]} | ||
| ], | ||
| "negative": [ | ||
| {"keys": ["S"]} | ||
| ] | ||
| }, | ||
| "change-speed": { | ||
| "positive": [ | ||
| {"keys": ["Tab"]} | ||
| ], | ||
| "negative": [ | ||
| {"keys": ["LShift"]} | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "id": "53d85d6f-42a8-4eb8-aeae-1754a4cb20df" | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it needs
CUBOS_ENGINE_APIafter struct so that it is accessible in the dll for us to use in games