fixed setTriangleCoords
fixed merge conflicts