switch to pointxyz in cpp files