Skip to content

Commit 8041462

Browse files
committed
Fixed rotation of game objects.
1 parent b657589 commit 8041462

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

NeonEngine/imgui.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Size=1441,1038
5656
Collapsed=0
5757

5858
[Docking][Data]
59-
DockSpace ID=0x3BC79352 Window=0x4647B76E Pos=853,537 Size=1920,1054 Split=X Selected=0x13926F0B
59+
DockSpace ID=0x3BC79352 Window=0x4647B76E Pos=87,147 Size=1920,1054 Split=X Selected=0x13926F0B
6060
DockNode ID=0x00000003 Parent=0x3BC79352 SizeRef=1388,527 Split=Y Selected=0x13926F0B
6161
DockNode ID=0x00000005 Parent=0x00000003 SizeRef=1387,772 CentralNode=1 Selected=0x13926F0B
6262
DockNode ID=0x00000006 Parent=0x00000003 SizeRef=1387,280 Selected=0xBF096F38

NeonEngine/src/transform3d.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@ class Transform3D {
144144
glm::vec2 arrow(model_view_projection * axis);
145145
arrow = glm::normalize(arrow);
146146
float delta_transformation = glm::dot(arrow, transform_vector);
147-
rendering->last_selected_object->rotation *= glm::angleAxis(delta_transformation * VELOCITY_ROTATION, glm::vec3(axis));
147+
glm::vec3 rotated_axis = rendering->last_selected_object->rotation * glm::vec3(axis);
148+
rendering->last_selected_object->rotation = glm::angleAxis(delta_transformation * VELOCITY_ROTATION, rotated_axis) * rendering->last_selected_object->rotation;
148149
rendering->last_selected_object->set_model_matrices_standard();
149150
}
150151
else { // SCALING

0 commit comments

Comments
 (0)