Kalle Bladin ec8299da69 Solve merge conflict.

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

..

culling.cpp

Solve merge conflict.

2016-05-11 11:02:03 -04:00

culling.h

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

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

patchrenderer.cpp

Using scaling and offset for heightmap based on dataset.

2016-05-12 11:06:49 -04:00

patchrenderer.h

Chunked lod patches can be rendered in camera space.

2016-05-11 15:47:29 -04:00