Alexander Bock
1a29ad6208
Merge branch 'develop' into plutoViz
2015-02-27 09:01:55 +01:00
Michal Marcinkowski
39e5f2aa28
Improvements to the ImageSequencer class.
...
- Now _properly_ switches instruments at the moment set instrument is activated
2015-02-26 15:50:37 -05:00
Alexander Bock
d4f8bba27f
Fixed crash with changing coordinate systems
...
Adapted startup script to new openspace-data
2015-02-26 18:07:37 +01:00
Alexander Bock
836f7a825b
Making texture in RenderablePlane modular
...
Disable rendering of the Sun by default in favor of the glare texture
2015-02-26 13:10:43 +01:00
Alexander Bock
4a5682b88f
Disable fadeIn on default
2015-02-25 19:13:14 +01:00
Alexander Bock
d249e9422e
Fixed bug where ScriptEngine would complain about double-added libraries
...
Correct application of default keybinding
2015-02-25 17:57:25 +01:00
Alexander Bock
e155e7ec9f
Adding functionality to pause the simulation time
...
Removed retreatTime function and replaced by a call to -advanceTime
2015-02-25 17:50:34 +01:00
Alexander Bock
862c8ffd96
Renamed globalOpacity to globalblackout
...
Start application in blackout and fade in after scenegraph has been loaded
2015-02-25 09:37:55 +01:00
Alexander Bock
2d975234e7
Updated startup scripts
2015-02-25 00:04:45 +01:00
Alexander Bock
8170c7c2c5
Updated keys to reflect new Lua script functions
2015-02-24 21:14:16 +01:00
Alexander Bock
43a3716afd
Intermediate result to change viewpoint from Jupiter projection to Plutoprojection
2015-02-24 17:52:40 +01:00
Alexander Bock
45c148b2c8
Added error checking codes to SpiceManager
...
Changed method to return instrument visibility by reference and used return value for errors
2015-02-23 21:36:37 +01:00
Alexander Bock
b6e0bd1043
Added interaction speed modifiers/inverters
...
Disable cotire
Enable Xcursor and Xinerama libraries on Linux builds
2015-02-23 15:58:05 +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
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
4607c347a1
Merge branch 'feature/stars' into plutoViz
2015-02-20 14:00:19 +01:00
Alexander Bock
ec1344d3b7
One more small step towards working stars
2015-02-20 11:22:38 +01:00
Alexander Bock
5eb5a9a479
Enable the possibility to switch between coordinate systems (with the Sun in the center vs Pluto in the center)
2015-02-19 19:13:55 +01:00
Michal Marcinkowski
971381b150
fov lines, check.
2015-02-18 19:41:56 -05:00
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
a0fc77a893
Enable the ability to run setting scripts that are executed after the scene has been loaded
2015-02-17 20:10:50 +01:00
Michal Marcinkowski
2e1f806056
Added comments to default startup script with recommended dt and times of observations
2015-02-11 18:55:07 -05:00
Alexander Bock
3a18d0c763
More fixed for RenderableStars
...
Added screenshot button for F4
2015-02-09 08:35:06 +01:00
Michal Marcinkowski
238aa09381
Refinements to image sequencing class and other, adaptation to the pluto setup
2015-01-29 13:01:31 -05:00
Michal Marcinkowski
3928ff75fb
testing issues with recentered projection (will fix in 24 h)
2015-01-26 12:44:44 -05:00
Michal Marcinkowski
1d5b051b65
Targeting fixes for pluto viz etc.
2015-01-23 17:54:32 -05:00
Michal Marcinkowski
4c53f763f0
Recentering at Pluto,
...
Todo - add NH with kernels.
2015-01-23 12:10:21 -05:00
Michal Marcinkowski
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
Michal Marcinkowski
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
Michal Marcinkowski
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
Michal Marcinkowski
f37958c24f
beginning to work on sequencing
2015-01-10 16:07:05 -05:00
jonasstrandstedt
6b164f0b36
Added camera offset support
2015-01-06 12:43:16 +01:00
Michal Marcinkowski
70569cba7f
fixes to restore to stage prior purge
2014-12-15 16:24:04 -05:00
Michal Marcinkowski
70d24185de
intermediate commit prior to merge
2014-12-12 11:52:31 -05:00
Michal Marcinkowski
6ef0181148
Merge branch 'develop' into solarsystem2
...
Conflicts:
include/openspace/util/spicemanager.h
2014-12-09 18:04:38 -05:00
Michal Marcinkowski
1a9c726f58
intermediate commit before merge
2014-12-09 17:50:29 -05:00
Alexander Bock
01e71f2fc0
More work on performance measuring in imgui
2014-12-09 15:49:54 +01:00
Michal Marcinkowski
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
Michal Marcinkowski
3e443fdead
intermediary commit.
2014-12-08 14:48:38 -05:00
Alexander Bock
31191106fc
Rebind keys to toggle GUI with F1 key
2014-12-08 20:26:13 +01:00
michal
a5c232eb88
Tidying up.
2014-11-28 14:41:59 -05:00
michal
83ed904f1d
changes to projective texturing, some cleanup.
2014-11-28 13:49:18 -05:00
michal
845469b15d
Merge branch 'develop' into solarsystem2
...
Conflicts:
openspace.cfg
shaders/generated/constants.hglsl
src/engine/openspaceengine.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/spicemanager.cpp
2014-11-26 13:42:36 -05:00
michal
c154141b8b
minor changes, testing
2014-11-26 11:22:11 -05:00
michal
4c8814b237
Projective Texturing
...
Created test class based on renderableplanet & co.
Doing it this way carries some implications that need discussing.
2014-11-24 14:06:50 -05:00
Alexander Bock
6b40cb18fb
Merge branch 'feature/interactionhandler' into develop
...
Conflicts:
include/openspace/engine/openspaceengine.h
include/openspace/interaction/interactionhandler.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
2014-11-18 15:46:26 +01:00
Jonas Strandstedt
31c76f3e3c
Added key binding from Lua possible
...
- Possible to add key bindings from Lua possible. This calls Lua scripts
from key commands.
- Temporary fixed a small bug for volume rendering
2014-11-17 17:02:40 +01:00
michal
d6d7f1ffe7
intermediate commit.
2014-11-12 12:28:16 -05:00
michal
0803b1cacf
Minor changes for targeting.
2014-11-10 13:00:04 -05:00
