mgs/ecsgame
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Improve mouse rotation code

Browse Source 
This had some quirks previously, now it works cleanly with quaternions.
This commit is contained in:
karl 2020-10-02 22:47:27 +02:00
parent 2889a6fa8a
commit 8138c506d9
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ECS/Systems/MouseLookSystem.h
View File

@ -41,19 +41,15 @@ public:
void tick(World *pWorld, float deltaTime) override { void tick(World *pWorld, float deltaTime) override {
pWorld->each<Transform, MouseLook, Camera>([&](Entity *ent, ComponentHandle<Transform> transform, ComponentHandle<MouseLook> mouse, ComponentHandle<Camera> camera) { pWorld->each<Transform, MouseLook, Camera>([&](Entity *ent, ComponentHandle<Transform> transform, ComponentHandle<MouseLook> mouse, ComponentHandle<Camera> camera) {
if(mouse->pitch > 50.0f) if(mouse->pitch > 80.0f)
mouse->pitch = 50.0f; mouse->pitch = 80.0f;
if(mouse->pitch < -50.0f) if(mouse->pitch < -80.0f)
mouse->pitch = -50.0f; mouse->pitch = -80.0f;
glm::mat4x4 newTransform = glm::mat4x4(1.0); glm::quat rotation = glm::angleAxis(glm::radians((float)mouse->yaw), glm::vec3(0.f, 1.f, 0.f));
rotation *= glm::angleAxis(glm::radians((float)mouse->pitch), glm::vec3(1.f, 0.f, 0.f));
newTransform = glm::rotate(newTransform, glm::radians((float)mouse->pitch), transform->right()); transform->set_rotation_from_quat(rotation);
newTransform = glm::rotate(newTransform, glm::radians((float)mouse->yaw), glm::vec3(0.0, 1.0, 0.0));
newTransform[3] = transform->matrix[3];
transform->matrix = newTransform;
}); });
} }