Kalle Bladin ec8299da69 Solve merge conflict.

2016-05-12 11:46:59 -04:00

..

chunk.cpp

Solve merge conflict.

2016-05-12 11:46:59 -04:00

chunk.h

Renamed ChunkLodGlobe to ChunkedLogGlobe and made DistanceSwitch not a renderable

2016-05-11 16:10:39 -04:00

chunkedlodglobe.cpp

Enabling 'Freeze camera used for chunk culling' from GUI. Helpful for culling debugging

2016-05-11 18:38:19 -04:00

chunkedlodglobe.h

Enabling 'Freeze camera used for chunk culling' from GUI. Helpful for culling debugging

2016-05-11 18:38:19 -04:00

chunkindex.cpp

replaced getChildIndices with getChild in ChunkIndex

2016-05-10 20:21:27 -04:00

chunkindex.h

replaced getChildIndices with getChild in ChunkIndex

2016-05-10 20:21:27 -04:00

chunknode.cpp

Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing

2016-05-11 18:43:09 -04:00

chunknode.h

Renamed ChunkLodGlobe to ChunkedLogGlobe and made DistanceSwitch not a renderable

2016-05-11 16:10:39 -04:00

clipmapglobe.cpp

Add class horizonculler and fix for explicit opengl types.

2016-05-09 23:19:49 -04:00

clipmapglobe.h

Add class horizonculler and fix for explicit opengl types.

2016-05-09 23:19:49 -04:00

clipmappyramid.cpp

Cull in clipmap globe

2016-05-02 21:32:52 -04:00

clipmappyramid.h

Cull in clipmap globe

2016-05-02 21:32:52 -04:00

globemesh.cpp

Use dictionary to set radii of globe.

2016-04-28 22:07:45 -04:00

globemesh.h

Renamed ChunkLodGlobe to ChunkedLogGlobe and made DistanceSwitch not a renderable

2016-05-11 16:10:39 -04:00

renderableglobe.cpp

Enabling 'Freeze camera used for chunk culling' from GUI. Helpful for culling debugging

2016-05-11 18:38:19 -04:00

renderableglobe.h

Enabling 'Freeze camera used for chunk culling' from GUI. Helpful for culling debugging

2016-05-11 18:38:19 -04:00