Kalle Bladin e98451ce13 Solve merge conflicts.

2016-04-27 16:19:35 -04:00

..

chunklodglobe.cpp

Remove reference to ellipsoid in GeodeticPatch class

2016-04-27 12:58:30 -04:00

chunklodglobe.h

Remove reference to ellipsoid in GeodeticPatch class

2016-04-27 12:58:30 -04:00

chunknode.cpp

Use the minimum radius in the ellipsoid to determine split level in chunknode.

2016-04-27 13:36:38 -04:00

chunknode.h

Use the minimum radius in the ellipsoid to determine split level in chunknode.

2016-04-27 13:36:38 -04:00

clipmapglobe.cpp

Change from using a radius to using ellipsoid

2016-04-25 20:02:37 -04:00

clipmapglobe.h

Change from using a radius to using ellipsoid

2016-04-25 20:02:37 -04:00

clipmappyramid.cpp

Restructure files in folders

2016-04-25 13:58:32 -04:00

clipmappyramid.h

Restructure files in folders

2016-04-25 13:58:32 -04:00

globemesh.cpp

Restructure files in folders

2016-04-25 13:58:32 -04:00

globemesh.h

Restructure files in folders

2016-04-25 13:58:32 -04:00

renderableglobe.cpp

Solve merge conflicts.

2016-04-27 16:19:35 -04:00

renderableglobe.h

Change from using a radius to using ellipsoid

2016-04-25 20:02:37 -04:00