argo
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Fix mob rotation glitching out near 0/360 in degrees 

The problem mainly was that the set_yaw function was not allowing for negitive values.
This commit is contained in:
epCode 2022-11-11 01:39:57 +00:00 committed by cora
parent db63f1c453
commit 762f64a4d1
1 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
mods/ENTITIES/mcl_mobs/physics.lua
View File

@ -249,7 +249,8 @@ function mob_class:update_tag()
self:update_roll() self:update_roll()
end end
local function shortest_term_of_yaw_rotatoin(self, rot_origin, rot_target, nums) local function shortest_term_of_yaw_rotation(self, rot_origin, rot_target, nums)
if not rot_origin or not rot_target then if not rot_origin or not rot_target then
return return
end end
@ -257,18 +258,40 @@ local function shortest_term_of_yaw_rotatoin(self, rot_origin, rot_target, nums)
rot_origin = math.deg(rot_origin) rot_origin = math.deg(rot_origin)
rot_target = math.deg(rot_target) rot_target = math.deg(rot_target)
if math.abs(rot_target - rot_origin) < 180 then if rot_origin < rot_target then
return rot_target - rot_origin if math.abs(rot_origin-rot_target)<180 then
else if nums then
if (rot_target - rot_origin) > 0 then return rot_target-rot_origin
return 360-(rot_target - rot_origin) else
return 1
end
else else
return (rot_target - rot_origin)+360 if nums then
return -(rot_origin-(rot_target-360))
else
return -1
end
end
else
if math.abs(rot_origin-rot_target)<180 then
if nums then
return rot_target-rot_origin
else
return -1
end
else
if nums then
return (rot_target-(rot_origin-360))
else
return 1
end
end end
end end
end end
-- set and return valid yaw -- set and return valid yaw
function mob_class:set_yaw(yaw, delay, dtime) function mob_class:set_yaw(yaw, delay, dtime)
if self.noyaw then return end if self.noyaw then return end
@ -282,20 +305,29 @@ function mob_class:set_yaw(yaw, delay, dtime)
--clamp our yaw to a 360 range --clamp our yaw to a 360 range
if math.deg(self.object:get_yaw()) > 360 then if math.deg(self.object:get_yaw()) > 360 then
self.object:set_yaw(math.rad(1)) self.object:set_yaw(math.rad(0))
elseif math.deg(self.object:get_yaw()) < 0 then elseif math.deg(self.object:get_yaw()) < 0 then
self.object:set_yaw(math.rad(359)) self.object:set_yaw(math.rad(360))
end
if math.deg(yaw) > 360 then
yaw=yaw%360
elseif math.deg(yaw) < 0 then
yaw=((360*5)-yaw)%360
end end
--calculate the shortest way to turn to find our target --calculate the shortest way to turn to find our target
local target_shortest_path = shortest_term_of_yaw_rotatoin(self, self.object:get_yaw(), yaw, true) local target_shortest_path = shortest_term_of_yaw_rotation(self, self.object:get_yaw(), yaw, false)
local target_shortest_path_nums = shortest_term_of_yaw_rotation(self, self.object:get_yaw(), yaw, true)
--turn in the shortest path possible toward our target. if we are attacking, don't dance. --turn in the shortest path possible toward our target. if we are attacking, don't dance.
if (math.abs(target_shortest_path) > 50 and not self._kb_turn) and (self.attack and self.attack:get_pos() or self.following and self.following:get_pos()) then if (math.abs(target_shortest_path) > 50 and not self._kb_turn) and (self.attack and self.attack:get_pos() or self.following and self.following:get_pos()) then
if self.following then if self.following then
target_shortest_path = shortest_term_of_yaw_rotatoin(self, self.object:get_yaw(), minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.following:get_pos())), true) target_shortest_path = shortest_term_of_yaw_rotation(self, self.object:get_yaw(), minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.following:get_pos())), true)
target_shortest_path_nums = shortest_term_of_yaw_rotation(self, self.object:get_yaw(), minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.following:get_pos())), false)
else else
target_shortest_path = shortest_term_of_yaw_rotatoin(self, self.object:get_yaw(), minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.attack:get_pos())), true) target_shortest_path = shortest_term_of_yaw_rotation(self, self.object:get_yaw(), minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.attack:get_pos())), true)
target_shortest_path_nums = shortest_term_of_yaw_rotation(self, self.object:get_yaw(), minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.attack:get_pos())), false)
end end
end end
@ -305,17 +337,10 @@ function mob_class:set_yaw(yaw, delay, dtime)
ddtime = dtime ddtime = dtime
end end
if math.abs(target_shortest_path) > 280*ddtime then if math.abs(target_shortest_path_nums) > 5 then
if target_shortest_path > 0 then self.object:set_yaw(self.object:get_yaw()+(target_shortest_path*(3.6*ddtime)))
self.object:set_yaw(self.object:get_yaw()+3.6*ddtime) if self.acc then
if self.acc then self.acc=vector.rotate_around_axis(self.acc,vector.new(0,1,0), target_shortest_path*(3.6*ddtime))
self.acc=vector.rotate_around_axis(self.acc,vector.new(0,1,0), 3.6*ddtime)
end
else
self.object:set_yaw(self.object:get_yaw()-3.6*ddtime)
if self.acc then
self.acc=vector.rotate_around_axis(self.acc,vector.new(0,1,0), -3.6*ddtime)
end
end end
end end