Skip to content

Fixed physics collider visualization offset #555

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
erikrl2 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fixed physics collider visualization offset #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee8e738
Fixed physics collider offset location
erikrl2 Jun 11, 2022
03c5e98
Resolved conflicts with latest commit
erikrl2 Jun 17, 2022
6ab928a
Fixed circle collider visualizer scaling
erikrl2 Jun 19, 2022
3e08551
Fixed physics collider offset location
erikrl2 Jun 11, 2022
7933f16
Fixed circle collider visualizer scaling
erikrl2 Jun 19, 2022
6ebd804
Merge branch 'collider-fix' of https://github.com/erikrl2/Hazel into …
erikrl2 Jun 20, 2022
921ebd4
Remove rotation
erikrl2 Jul 4, 2022
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
2 changes: 1 addition & 1 deletion Hazel/src/Hazel/Scene/Scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ namespace Hazel {
auto& bc2d = entity.GetComponent<BoxCollider2DComponent>();

b2PolygonShape boxShape;
boxShape.SetAsBox(bc2d.Size.x * transform.Scale.x, bc2d.Size.y * transform.Scale.y);
boxShape.SetAsBox(bc2d.Size.x * transform.Scale.x, bc2d.Size.y * transform.Scale.y, b2Vec2(bc2d.Offset.x, bc2d.Offset.y), 0.0f);

b2FixtureDef fixtureDef;
fixtureDef.shape = &boxShape;
Expand Down
11 changes: 6 additions & 5 deletions Hazelnut/src/EditorLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,11 +528,11 @@ namespace Hazel {
{
auto [tc, bc2d] = view.get<TransformComponent, BoxCollider2DComponent>(entity);

glm::vec3 translation = tc.Translation + glm::vec3(bc2d.Offset, 0.001f);
glm::vec3 scale = tc.Scale * glm::vec3(bc2d.Size * 2.0f, 1.0f);

glm::mat4 transform = glm::translate(glm::mat4(1.0f), translation)
glm::mat4 transform = glm::translate(glm::mat4(1.0f), tc.Translation)
* glm::rotate(glm::mat4(1.0f), tc.Rotation.z, glm::vec3(0.0f, 0.0f, 1.0f))
* glm::translate(glm::mat4(1.0f), glm::vec3(bc2d.Offset, 0.001f))
* glm::scale(glm::mat4(1.0f), scale);

Renderer2D::DrawRect(transform, glm::vec4(0, 1, 0, 1));
Expand All @@ -546,11 +546,12 @@ namespace Hazel {
{
auto [tc, cc2d] = view.get<TransformComponent, CircleCollider2DComponent>(entity);

glm::vec3 translation = tc.Translation + glm::vec3(cc2d.Offset, 0.001f);
glm::vec3 scale = tc.Scale * glm::vec3(cc2d.Radius * 2.0f);

glm::mat4 transform = glm::translate(glm::mat4(1.0f), translation)
* glm::scale(glm::mat4(1.0f), scale);
glm::mat4 transform = glm::translate(glm::mat4(1.0f), tc.Translation)
* glm::rotate(glm::mat4(1.0f), tc.Rotation.z, glm::vec3(0.0f, 0.0f, 1.0f))
* glm::translate(glm::mat4(1.0f), glm::vec3(cc2d.Offset, 0.001f))
* glm::scale(glm::mat4(1.0f), glm::vec3(scale.x, scale.x, scale.z));

Renderer2D::DrawCircle(transform, glm::vec4(0, 1, 0, 1), 0.01f);
}
Expand Down