@DMGregory after a collision I run it through the trajectory mapping function again using the new position, angle and velocity. What should the new velocity and angle be calculated from? The angle and position of collision and the remaining velocity we just covered, or from the new end position and an adjusted angle after the collision plus the starting velocity?