468bb98e46
created postFX functions in main and added a postFX pass to sgct engine to allow for a global fade after executing certain scripts.
...
added global opacity member variable with set/get methods in render engine.
added two VERY simple shaders used in the post FX pass. Note these are not handled in openspace so updating files does not update shader
2015-02-20 11:19:50 +01:00
971381b150
fov lines, check.
2015-02-18 19:41:56 -05:00
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
08d4ca9f6b
Correct alignment for the milkyway texture in the RenderableSphere
...
Visual tweaks for RenderableStars
2015-02-17 20:11:17 +01:00
d96dc3884c
Added properties to change the appearance of stars
2015-02-17 09:31:58 +01:00
98aeeda24d
Added support for variable transparency in RenderableSphere
...
Created own shaders for RenderableSphere
2015-02-16 23:16:06 +01:00
1a2c882eb0
Another parameter fix for RenderableStars
2015-02-16 21:02:50 +01:00
69e0213e79
Added ability to disable shading for RenderablePlanet renderables
2015-02-16 19:23:23 +01:00
92d5d2ee3c
Parameter tuning for RenderableStars
2015-02-16 19:12:05 +01:00
6791fe52f7
Another fix for RenderableStars; to be replaced when the ScaleGraph is in place
2015-02-16 19:04:42 +01:00
3c4aec0082
Modularize RenderablePlane shader
2015-02-15 23:55:13 +01:00
8df0e5dc3f
Some more renderablestar changes
2015-02-14 10:48:16 +01:00
fd4d6562ad
First cleanup of RenderableTrails
2015-02-10 16:19:12 +01:00
338d8fb63b
Cleaning up of stars shader
2015-02-10 16:18:46 +01:00
bb8f7b91ec
Final changes on RenderableStars
2015-02-10 08:55:26 +01:00
a8a688398c
More fixes on RenderableStars
2015-02-09 18:06:01 +01:00
7d6792eba0
Temporary increase in interaction speed until setting is implemented
2015-02-09 17:35:58 +01:00
3a18d0c763
More fixed for RenderableStars
...
Added screenshot button for F4
2015-02-09 08:35:06 +01:00
238aa09381
Refinements to image sequencing class and other, adaptation to the pluto setup
2015-01-29 13:01:31 -05:00
4c53f763f0
Recentering at Pluto,
...
Todo - add NH with kernels.
2015-01-23 12:10:21 -05:00
20de1169b5
First small fix with RenderableStars
2015-01-23 09:53:41 +01:00
44e02465a1
Merge branch 'develop' into solarsystem2
...
Conflicts:
include/openspace/util/powerscaledsphere.h
src/rendering/renderablefov.cpp
src/rendering/renderablesphericalgrid.cpp
src/rendering/renderabletrail.cpp
src/util/powerscaledsphere.cpp
src/util/spicemanager.cpp
2015-01-22 10:31:40 -05:00
a8e5b61272
Image sequencing improvements and optimization of projection.
...
Projection now occurs only at specified timestamps.
Todo:
projection class now dependent on image sequences, will have
to change that once we read specific instrument schedule.
2015-01-21 11:28:38 -05:00
8ebd2e4d71
More code cleanup of RenderableFieldlines
2015-01-21 15:13:16 +01:00
f72d151c6c
Initial changes to RenderableFieldlines
2015-01-21 00:42:33 +01:00
fa0f26c9da
In short, this is new:
...
- ImageSequencer class added, requires planetary data service files (not added to openspace-data, too large)
: Given current time returns path to specific image in dataset for projection.
- Changes to RenderablePlanetProjection class to accomodate sequencing
- Fixed normal computation in reverse-mapping stage
- Rudimental target recognition (will prob. become part of separate class at some point - since both fov & proj classes do similar things)
Next up:
- Redo pluto mockup visualization & begin spreadsheet reader for instrument-switching.
2015-01-16 13:06:52 -05:00
812a9a48be
Normal computation in pre projection pass issue resolved.
2015-01-13 10:59:09 -05:00
f37958c24f
beginning to work on sequencing
2015-01-10 16:07:05 -05:00
4e2edf2b2f
trying to fix orthogonal projection issue.
2015-01-04 12:21:38 -05:00
ca39f5aaf5
begin cleanup, making code more transparent
2014-12-30 17:07:57 -05:00
a6a34cf7dd
projection GPU first results, pre-cleanup commit.
...
TODO:
- fixes so it reads mission specific modfile keywords (ie targets)
- speedup using one more pass (vertex map generated every something-frame)
- sequencing (timestamp check + load of separate images on-the-fly)
- pass in geometric data of target + target-texture switching (later)
2014-12-26 13:42:34 -05:00
ee306cf54c
Added separate shader for write to texture, relies on blend logic.
2014-12-22 10:02:31 -05:00
f032b4e3b0
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
include/openspace/rendering/renderablefov.h
src/CMakeLists.txt
src/rendering/model/renderablemodel.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/factorymanager.cpp
2014-12-15 13:23:30 -05:00
c3bb233d29
Moved shadercode of constellationbounds
2014-12-10 00:27:35 +01:00
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
bd841c488c
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/scenegraph/scenegraph.cpp
src/util/factorymanager.cpp
2014-12-08 21:26:38 -05:00
3e443fdead
intermediary commit.
2014-12-08 14:48:38 -05:00
afa2d4d6a9
More work on GUI elements
...
Create GUI for some Properties
2014-12-06 17:20:59 +01:00
4e4de3f40e
Changing the hardcoded bv-color map to a transfer function based map
2014-12-05 22:58:14 +01:00
50076e4640
Fixing the flickering of the star rendering ( #66 )
2014-12-05 14:13:37 +01:00
2b79b85124
Started bugfix for renderable stars flickering bug
2014-12-05 11:56:43 +01:00
3f35b0a948
More optimizations for RenderableConstellationBounds
2014-12-04 18:37:15 +01:00
1a590f83e0
Initial commit of constallation bounds
2014-12-04 00:18:37 +01:00
5b1b8694dc
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/geometryfieldlines
2014-12-01 16:40:01 +01:00
834612469c
Finalized the billboard rendering. Code cleanup
2014-12-01 16:27:30 +01:00
bd74acedd3
fixing stupid git mistake.
2014-11-28 17:15:13 -05:00
a5c232eb88
Tidying up.
2014-11-28 14:41:59 -05:00
20c96f00e8
More cleanup of RenderableStars, enable rendering of Speed variable
2014-11-28 15:57:14 +01:00
4de8071efe
Force all Renderables to declare an 'isReady' function to circumvent assertion triggers when a crucial element of initialization fails
...
Fix velocity in RenderableStars
2014-11-28 01:41:26 +01:00
82491bf89b
More work on cleaning up / extending RenderableStars
2014-11-27 23:42:32 +01:00
Joakim Kilby