Merge "Refactor to replace FloatPoint by vec2" into main