improved func_rotate

1 files changed, 11 insertions, 2 deletions

diff --git a/src/render/draw.cc b/src/render/draw.cc
index afff831..e094a44 100644
--- a/src/render/draw.cc
+++ b/src/render/draw.cc
@@ -582,8 +582,17 @@ void draw_model_fragments(core::Entity *entity)
 		if (group->type() == model::FragmentGroup::Rotate) {
 			gl::push();
 			gl::translate(group->location());
-			float angle = math::degrees360f(core::application()->time() * 90.0f);
-			gl::rotate(angle, math::Vector3f::Xaxis());
+
+			float rotation_angle = math::degrees360f(core::application()->time() * group->speed());
+
+			if (group->angle() == model::ANGLEUP) {
+				gl::rotate(rotation_angle, math::Vector3f::Zaxis());
+			} else if (group->angle() == model::ANGLEDOWN) {
+				gl::rotate(-rotation_angle, math::Vector3f::Zaxis());
+			} else {
+				gl::rotate(rotation_angle, math::Vector3f::Xaxis());
+			}
+
 			gl::translate(group->location()* -1.0f);
 		}