Michieal
/
MineClone2
mirror of https://git.minetest.land/MineClone2/MineClone2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove cart oscillation when pushed

This commit is contained in:
teknomunk 2024-03-23 09:08:17 +00:00
parent 865aa97c5f
commit 801dcc49a6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mods/ENTITIES/mcl_minecarts/init.lua
View File

@ -146,14 +146,23 @@ local function direction_away_from_players(self, staticdata)
local player_name = obj:get_player_name() local player_name = obj:get_player_name()
if player_name and player_name ~= "" and not ( self._driver and self._driver == player_name ) then if player_name and player_name ~= "" and not ( self._driver and self._driver == player_name ) then
local diff = obj:get_pos() - self.object:get_pos() local diff = obj:get_pos() - self.object:get_pos()
local length = vector.distance(vector.new(0,0,0),diff) local length = vector.distance(vector.new(0,0,0),diff)
local vec = diff / length local vec = diff / length
local force = vector.dot( vec, vector.normalize(staticdata.dir) ) local force = vector.dot( vec, vector.normalize(staticdata.dir) )
if force > 0.5 then -- Check if this would push past the end of the track and don't move it it would
return -length * 4 -- This prevents an oscillation that would otherwise occur
elseif force < -0.5 then local dir = staticdata.dir
return length * 4 if force > 0 then
dir = -dir
end
if mcl_minecarts:is_rail( staticdata.connected_at + dir ) then
if force > 0.5 then
return -length * 4
elseif force < -0.5 then
return length * 4
end
end end
end end
end end
@ -290,7 +299,7 @@ local function do_movement_step(self, dtime)
staticdata.velocity = v_1 staticdata.velocity = v_1
staticdata.distance = x_1 staticdata.distance = x_1
if DEBUG and ( v_0 > 0 or a ~= 0 ) then if DEBUG and (1==0) and ( v_0 > 0 or a ~= 0 ) then
print( "- cart #"..tostring(staticdata.cart_id).. print( "- cart #"..tostring(staticdata.cart_id)..
": a="..tostring(a).. ": a="..tostring(a)..
",v_0="..tostring(v_0).. ",v_0="..tostring(v_0)..