merlin/qphys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change mag to length

Browse Source
This commit is contained in:
Quinn
2021-12-28 15:40:08 -08:00
parent 2949f0caec
commit 491d94d647
4 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.lua
+2 -2
View File
@@ -49,7 +49,7 @@ function handle_collisions()
rewind = 0.1 * steps
s_xpoint = source.pos - source.vel * rewind
t_xpoint = target.pos - target.vel * rewind
until rewind > 1 or (s_xpoint - t_xpoint):mag() >= source.rad + target.rad
until rewind > 1 or (s_xpoint - t_xpoint):length() >= source.rad + target.rad
local s_newvel = collision_vel(s_xpoint, source.vel, t_xpoint, target.vel, source:mass(), target:mass())
local t_newvel = collision_vel(t_xpoint, target.vel, s_xpoint, source.vel, target:mass(), source:mass())
source.pos = s_xpoint + source.vel * rewind
@@ -65,5 +65,5 @@ function collision_vel(x1,v1,x2,v2,m1,m2)
m2 = m2 or 1
local x_diff = x1 - x2
local v_diff = v1 - v2
return v1 - x_diff * (2 * m2 / (m1 + m2)) * v_diff:dot(x_diff) / x_diff:mag()^2
return v1 - x_diff * (2 * m2 / (m1 + m2)) * v_diff:dot(x_diff) / x_diff:length()^2
end