From 425bd2873ff181b91ed45e9a1221867aee9932a5 Mon Sep 17 00:00:00 2001 From: fredrikr79 Date: Wed, 1 Oct 2025 08:52:33 +0200 Subject: [PATCH] task 4 --- gloom-rs/src/main.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gloom-rs/src/main.rs b/gloom-rs/src/main.rs index 24adb73..60871b8 100644 --- a/gloom-rs/src/main.rs +++ b/gloom-rs/src/main.rs @@ -401,12 +401,12 @@ fn main() { let rotor_speed = 60.0f32; - // let iter_heli_heading = toolbox::simple_heading_animation(elapsed); - // heli_root_node.position.x = iter_heli_heading.x; - // heli_root_node.position.z = iter_heli_heading.z; - // heli_root_node.rotation.z = iter_heli_heading.roll; - // heli_root_node.rotation.y = iter_heli_heading.yaw; - // heli_root_node.rotation.x = iter_heli_heading.pitch; + let iter_heli_heading = toolbox::simple_heading_animation(elapsed); + heli_root_node.position.x = iter_heli_heading.x; + heli_root_node.position.z = iter_heli_heading.z; + heli_root_node.rotation.z = iter_heli_heading.roll; + heli_root_node.rotation.y = iter_heli_heading.yaw; + heli_root_node.rotation.x = iter_heli_heading.pitch; heli_main_rotor_node.rotation.y = elapsed * rotor_speed; heli_tail_rotor_node.rotation.x = elapsed * rotor_speed; @@ -424,9 +424,9 @@ fn main() { // translate to pivot, rotate, translate back model_matrix = glm::translate(&model_matrix, &node.reference_point); - model_matrix = glm::rotate_x(&model_matrix, node.rotation.x); - model_matrix = glm::rotate_y(&model_matrix, node.rotation.y); model_matrix = glm::rotate_z(&model_matrix, node.rotation.z); + model_matrix = glm::rotate_y(&model_matrix, node.rotation.y); + model_matrix = glm::rotate_x(&model_matrix, node.rotation.x); model_matrix = glm::translate(&model_matrix, &-node.reference_point); // combine with parent