Joakim Kilby
|
3d04af03a3
|
Merge branch 'develop' into plutoViz
Conflicts:
include/openspace/rendering/planets/simplespheregeometry.h
include/openspace/util/powerscaledsphere.h
openspace.cfg
shaders/pscstandard_fs.glsl
src/engine/openspaceengine.cpp
src/rendering/planets/renderableplanet.cpp
src/rendering/renderablefov.cpp
src/rendering/renderabletrail.cpp
src/rendering/renderengine.cpp
src/scenegraph/scenegraph.cpp
|
2015-02-18 15:52:35 +01:00 |
|
Alexander Bock
|
a6ebddb8eb
|
Updated copyright header in all files
|
2015-02-17 14:20:03 +01:00 |
|
Alexander Bock
|
bb5f6e1bca
|
Renamed member variable of SimpleSphereGeometry from _planet to _sphere
|
2015-02-16 22:13:03 +01:00 |
|
Michal Marcinkowski
|
f37958c24f
|
beginning to work on sequencing
|
2015-01-10 16:07:05 -05:00 |
|
Jonas Strandstedt
|
da4fa44c03
|
Continued work on memory leaks and proper isReady usage
|
2014-12-11 16:48:49 +01:00 |
|
Alexander Bock
|
d09a1e0b54
|
Misc work
More cleanup of RenderablePlanet
Added const modifier to pss method
Added faster travel method for interactionhandler
|
2014-05-05 18:04:53 +02:00 |
|
Alexander Bock
|
a86d544812
|
Created classes for PlanetGeometry
Added SimpleSphereGeometry
Created infrastructure for added other geometries
|
2014-05-05 17:28:46 +02:00 |
|