Fix mob head roll issue

[Crafter.git] / mods / mob / oldcode.txt

diff --git a/mods/mob/oldcode.txt b/mods/mob/oldcode.txt
index b4777f3b32ddfd8667b24a359c17e6732e5abc6c..37b2426de8fbaa044bca9a0803b59b4468c4b9c2 100644 (file)
--- a/mods/mob/oldcode.txt
+++ b/mods/mob/oldcode.txt
@@ -12,52 +12,15 @@ local radians_to_degrees = function(radians)
        return(radians*180.0/math.pi)
 end
 
-local dir_to_degrees = function(dir)
-       return({
-               x = radians_to_degrees(dir.x),
-               y = radians_to_degrees(dir.y),
-               z = radians_to_degrees(dir.z)
-       })
-end
-
---[[
-local test_function(dir) { --q
-    --EulerAngles angles;
-
-    -- roll (x-axis rotation)
-    local sinr_cosp = 2 * (dir.w * dir.x + dir.y * dir.z)
-    local cosr_cosp = 1 - 2 * (dir.x * dir.x + dir.y * dir.y)
-    angles.roll = atan2(sinr_cosp, cosr_cosp)
-
-    -- pitch (y-axis rotation)
-    local sinp = 2 * (dir.w * dir.y - dir.z * dir.x)
-    if (abs(sinp) >= 1)
-        angles.pitch = std::copysign(M_PI / 2, sinp); -- use 90 degrees if out of range
-    else
-        angles.pitch = std::asin(sinp);
-
-    -- yaw (z-axis rotation)
-    double siny_cosp = 2 * (q.w * q.z + q.x * q.y);
-    double cosy_cosp = 1 - 2 * (q.y * q.y + q.z * q.z);
-    angles.yaw = std::atan2(siny_cosp, cosy_cosp);
-
-    return angles;
-}
-
-]]--
 --a movement test to move the head
 mob.move_head = function(self)
        if self.child then
-               --we're multiplying this to set the x and z where the head is
                local pos = self.object:get_pos()
                local body_yaw = self.object:get_yaw() - (math.pi/2)
                local dir = vector.multiply(minetest.yaw_to_dir(body_yaw),0.72)
                local real_dir = minetest.yaw_to_dir(body_yaw)
                local body_yaw = degree_round(degrees(minetest.dir_to_yaw(dir)))
                
-               
-               
-               
                pos = vector.add(pos,dir)
                pos.y = pos.y + 0.36
                
@@ -68,25 +31,17 @@ mob.move_head = function(self)
                                local pos2 = object:get_pos()
                                pos2.y = pos2.y + 1.625
                                
-                               local head_yaw  = degree_round(degrees(minetest.dir_to_yaw(vector.direction(pos,pos2))))
-                               
-                               --print("body yaw: ",math.abs(body_yaw),"head yaw:",math.abs(head_yaw))
-                               
-                               
+                               local head_yaw  = degree_round(degrees(minetest.dir_to_yaw(vector.direction(pos,pos2))))                        
                                
                                local new_yaw = (head_yaw-body_yaw)
 
-
-
-
-                               local pitch = 0
-                               local roll = 0
-                               
+                               local pitch = 0 
+                               local roll = 0  
                                if math.abs(new_yaw) <= 90 or math.abs(new_yaw) >= 270 then
                                        --do other calculations on pitch and roll
                                        
                                        local triangle = vector.new(vector.distance(pos,pos2),0,pos2.y-pos.y)
-
+                                       
                                        local tri_yaw = minetest.dir_to_yaw(triangle)+(math.pi/2)
                                        
                                        pitch = radians_to_degrees(tri_yaw)
@@ -106,48 +61,28 @@ mob.move_head = function(self)
                                        pitch_adjustment = 1-(math.abs(pitch_adjustment)/90)
                                        pitch = pitch-- * pitch_adjustment
                                        
-                                       --print(pitch_adjustment)
                                        
-                                       ------
+                                       --------------------------------
                                        
-                                       roll = radians_to_degrees(tri_yaw)
+                                       local roll_adjustment = 1-pitch_adjustment
                                        
-                                       local roll_adjustment = 0
                                        
-                                       if new_yaw >= 270 then
-                                               roll_adjustment = new_yaw - 180
-                                       elseif new_yaw <= -270 then
-                                               roll_adjustment = new_yaw + 180
-                                       else
-                                               roll_adjustment = new_yaw
+                                       local side_adjuster = 1
+                                       if new_yaw < 1 then
+                                               side_adjuster = -1
                                        end
                                        
-                                       local secondary_roll_adjustment = 0
-                                       
-                                       if new_yaw > 0 then
-                                               secondary_roll_adjustment = 1
-                                       else
-                                               secondary_roll_adjustment = -1
-                                       end
-                                       
-                                       --print(roll_adjustment)
-                                       
-                                       roll_adjustment = math.abs(roll_adjustment)/90
-                                       roll = roll * roll_adjustment * secondary_roll_adjustment
+                                       roll = (radians_to_degrees(tri_yaw)*side_adjuster)*roll_adjustment
                                        
                                        print(roll)
                                        
+                                       
+                               
                                else
                                        new_yaw = 0
                                end
-                               
-                               
-                               
                                --                                                                      roll        newyaw      pitch
-                               self.child:set_attach(self.object, "", vector.new(2.4,1.2,0), vector.new(180+roll,     new_yaw,    180+pitch))
-
-                               
-                               
+                               self.child:set_attach(self.object, "", vector.new(2.4,1.2,0), vector.new(180+roll,    new_yaw,    180+pitch))                           
                                --self.head_rotation = vector.new(180,new_yaw,180)
                        end
                end