Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Move smooth rotation to separate function

csm-enabled
cora 2022-11-11 00:22:17 +01:00
parent 5e177c61f6
commit 80490b4c11
2 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
mods/ENTITIES/mcl_mobs/api.lua
View File

@ -431,58 +431,11 @@ function mob_class:on_step(dtime)
--Mob following code. --Mob following code.
self:follow_flop() self:follow_flop()
--set animation speed relitive to velocity --set animation speed relitive to velocity
self:set_animation_speed() self:set_animation_speed()
self:check_smooth_rotation()
-- smooth rotation by ThomasMonroe314
if self._turn_to then
self:set_yaw( self._turn_to, .1)
end
if self.delay and self.delay > 0 then
local yaw = self.object:get_yaw() or 0
if self.delay == 1 then
yaw = self.target_yaw
else
local dif = math.abs(yaw - self.target_yaw)
if yaw > self.target_yaw then
if dif > math.pi then
dif = 2 * math.pi - dif -- need to add
yaw = yaw + dif / self.delay
else
yaw = yaw - dif / self.delay -- need to subtract
end
elseif yaw < self.target_yaw then
if dif >math.pi then
dif = 2 * math.pi - dif
yaw = yaw - dif / self.delay -- need to subtract
else
yaw = yaw + dif / self.delay -- need to add
end
end
if yaw > (math.pi * 2) then yaw = yaw - (math.pi * 2) end
if yaw < 0 then yaw = yaw + (math.pi * 2) end
end
self.delay = self.delay - 1
if self.shaking then
yaw = yaw + (math.random() * 2 - 1) * 5 * dtime
end
self.object:set_yaw(yaw)
self:update_roll()
end
-- end rotation
self:check_head_swivel() self:check_head_swivel()
-- run custom function (defined in mob lua file) -- run custom function (defined in mob lua file)
if self.do_custom then if self.do_custom then

48
mods/ENTITIES/mcl_mobs/movement.lua
View File

@ -1348,3 +1348,51 @@ function mob_class:do_states(dtime)
end end
end end
end end
function mob_class:check_smooth_rotation()
-- smooth rotation by ThomasMonroe314
if self._turn_to then
self:set_yaw( self._turn_to, .1)
end
if self.delay and self.delay > 0 then
local yaw = self.object:get_yaw() or 0
if self.delay == 1 then
yaw = self.target_yaw
else
local dif = math.abs(yaw - self.target_yaw)
if yaw > self.target_yaw then
if dif > math.pi then
dif = 2 * math.pi - dif -- need to add
yaw = yaw + dif / self.delay
else
yaw = yaw - dif / self.delay -- need to subtract
end
elseif yaw < self.target_yaw then
if dif >math.pi then
dif = 2 * math.pi - dif
yaw = yaw - dif / self.delay -- need to subtract
else
yaw = yaw + dif / self.delay -- need to add
end
end
if yaw > (math.pi * 2) then yaw = yaw - (math.pi * 2) end
if yaw < 0 then yaw = yaw + (math.pi * 2) end
end
self.delay = self.delay - 1
if self.shaking then
yaw = yaw + (math.random() * 2 - 1) * 5 * dtime
end
self.object:set_yaw(yaw)
self:update_roll()
end
-- end rotation
end