Alexander Bock 329986c0c6 Merge branch 'develop' into feature/globebrowsing ...

Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp

2016-09-20 15:52:01 +02:00

..

chunk.cpp

Remove texture cateory HeightMapOverlays

2016-09-14 20:08:33 -04:00

chunk.h

Add forgotten updates for last commit

2016-07-15 17:16:48 -04:00

chunkedlodglobe.cpp

Merge branch 'develop' into feature/globebrowsing

2016-09-20 15:52:01 +02:00

chunkedlodglobe.h

Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation.

2016-08-18 14:21:20 -04:00

chunkindex.cpp

Rename HashKey to ChunkHashKey and define it as uint64_t

2016-06-22 20:25:39 -04:00

chunkindex.h

Solve merge conflicts: develop --> globebrowsing

2016-08-02 18:50:10 -04:00

chunklevelevaluator.cpp

Make desired level from projected area work (i.e. not get zero area) around the poles

2016-07-14 13:28:53 -04:00

chunklevelevaluator.h

Move ChunkLevelEvaluators classes to separate file

2016-06-14 11:19:22 -04:00

chunknode.cpp

Enable finding a ChunkNode in ChunkNode tree based on a Geodetic2 point

2016-06-23 20:16:47 -04:00

chunknode.h

Enable finding a ChunkNode in ChunkNode tree based on a Geodetic2 point

2016-06-23 20:16:47 -04:00

chunkrenderer.cpp

Merge branch 'develop' into feature/globebrowsing

2016-09-20 15:52:01 +02:00

chunkrenderer.h

Compile fix

2016-09-20 14:10:11 +02:00

culling.cpp

Update Ghoul

2016-09-19 22:45:45 +02:00

culling.h

Updated file structure and removed unused class GlobeMesh

2016-06-10 11:53:26 -04:00