Anton Arbring
d3bf8eb7f7
Merge branch 'timeadjustments' into NewHorizonsMerge
...
Conflicts:
CMakeLists.txt
include/openspace/rendering/model/modelgeometry.h
include/openspace/rendering/model/wavefrontgeometry.h
include/openspace/rendering/planets/renderableplanetprojection.h
include/openspace/util/imagesequencer.h
scripts/default_startup.lua
src/abuffer/abuffer.cpp
src/rendering/model/renderablemodel.cpp
src/rendering/model/wavefrontgeometry.cpp
src/rendering/planets/renderableplanet.cpp
src/rendering/planets/renderableplanetprojection.cpp
src/rendering/renderablefov.cpp
src/rendering/renderabletrail.cpp
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/spiceephemeris.cpp
src/util/imagesequencer.cpp
2015-04-23 22:51:55 -04:00
Michal Marcinkowski
8becbbde41
Imagesequencer update:
...
- label/image data works
- fixed issues with instrument firing
- read handled in more uniform way
- adding ALICE scanner
- distance fading in renderabletrail (WIP)
- essential fixes to renderableFOV
- and additional changes to other classes reliant on imagesequenser.
2015-04-22 21:53:28 -04:00
Anton Arbring
6cc21b3be7
Added image plane projection + shaders and dynamic ephemeris.
...
The plane projection is now hard coded to target until it can be
returned from imagesequencer. The dynamic ephemeris is not used for
this at the moment but will come in handy later on.
2015-04-17 22:09:35 -04:00
Alexander Bock
3155073f05
More changes to allow JupiterProjection and PlutoProjection in the same scene
...
Add a switch that allows Renderables to react to big changes in time (via openspace.time.setTime)
Allow the setting of the minimum pixel size of stars
2015-02-24 19:16:15 +01:00
Alexander Bock
aa7e82eb7f
Change default blending function
...
Remove the rendering of our star
2015-02-24 14:27:45 +01:00
Alexander Bock
34ff3c6018
More changes to RenderableStars using the AMNH test target
...
Removed superfluous properties of RenderableStars
Removed specialized settings file
2015-02-22 23:51:26 +01:00
Alexander Bock
c29555b530
Set new default values for star rendering
2015-02-20 22:16:44 +01:00
Alexander Bock
5046b7447e
Removed logging if a script is executed
...
More tweaking for RenderableStars
2015-02-20 21:37:48 +01:00
Alexander Bock
3c72ef8c1c
Updated star rendering once more
...
Added keys to fade rendering to black and restore
2015-02-20 21:02:12 +01:00
Alexander Bock
2d7ceed902
More work on stars
2015-02-20 16:53:50 +01:00
Alexander Bock
bd69db9e6d
More work on fixing of RenderableStars
2015-02-20 13:56:46 +01:00
Alexander Bock
ec1344d3b7
One more small step towards working stars
2015-02-20 11:22:38 +01:00
Alexander Bock
08d4ca9f6b
Correct alignment for the milkyway texture in the RenderableSphere
...
Visual tweaks for RenderableStars
2015-02-17 20:11:17 +01:00
Alexander Bock
d96dc3884c
Added properties to change the appearance of stars
2015-02-17 09:31:58 +01:00
Alexander Bock
98aeeda24d
Added support for variable transparency in RenderableSphere
...
Created own shaders for RenderableSphere
2015-02-16 23:16:06 +01:00
Alexander Bock
1a2c882eb0
Another parameter fix for RenderableStars
2015-02-16 21:02:50 +01:00
Alexander Bock
92d5d2ee3c
Parameter tuning for RenderableStars
2015-02-16 19:12:05 +01:00
Alexander Bock
6791fe52f7
Another fix for RenderableStars; to be replaced when the ScaleGraph is in place
2015-02-16 19:04:42 +01:00
Alexander Bock
3c4aec0082
Modularize RenderablePlane shader
2015-02-15 23:55:13 +01:00
Alexander Bock
8df0e5dc3f
Some more renderablestar changes
2015-02-14 10:48:16 +01:00
Alexander Bock
fd4d6562ad
First cleanup of RenderableTrails
2015-02-10 16:19:12 +01:00
Alexander Bock
338d8fb63b
Cleaning up of stars shader
2015-02-10 16:18:46 +01:00
Alexander Bock
bb8f7b91ec
Final changes on RenderableStars
2015-02-10 08:55:26 +01:00
Alexander Bock
a8a688398c
More fixes on RenderableStars
2015-02-09 18:06:01 +01:00
Alexander Bock
7d6792eba0
Temporary increase in interaction speed until setting is implemented
2015-02-09 17:35:58 +01:00
Alexander Bock
3a18d0c763
More fixed for RenderableStars
...
Added screenshot button for F4
2015-02-09 08:35:06 +01:00
Alexander Bock
20de1169b5
First small fix with RenderableStars
2015-01-23 09:53:41 +01:00
Alexander Bock
8ebd2e4d71
More code cleanup of RenderableFieldlines
2015-01-21 15:13:16 +01:00
Alexander Bock
f72d151c6c
Initial changes to RenderableFieldlines
2015-01-21 00:42:33 +01:00
Alexander Bock
c3bb233d29
Moved shadercode of constellationbounds
2014-12-10 00:27:35 +01:00
Alexander Bock
6d4ac1fe49
Add a new include path to the base shader folder
...
Move the RenderableStars shaders into a separate folder
2014-12-10 00:22:41 +01:00
