Commit Graph

223 Commits

Author SHA1 Message Date
Anton Arbring
d6eaa0a81c Added renderablePath with timestamps
Considered for using with 15 minute and hour timestamps
Added Shaders for the path
Included reparenting of the paths in renderengine
Modified start time for presentation
Changed model exaggeration to 1000 times original size
2015-05-11 14:41:27 -04:00
Alexander Bock
9c16f088c1 Fixing errors that occured in OS X
Fixing a default success argument
Fixed \r line ending handling
Removed discarding a fragment in planetprojection
2015-05-08 19:26:29 +02:00
Alexander Bock
d508998b45 Merge branch 'develop' into feature/osx
Conflicts:
	ext/ghoul
2015-05-08 16:28:35 +02:00
Michal Marcinkowski
0a1c0164ef Fixes to trails, fov and adding some keybindings 2015-05-04 20:15:34 -04:00
Alexander Bock
fc756d6f49 Fixed so that the onscreen GUI is shown in OSX 2015-04-29 18:03:14 +02:00
Alexander Bock
11b0e98ec6 More changes to enable rendering on OS X 2015-04-28 19:32:21 +02:00
Alexander Bock
b403513d63 Updated Spice version
More changes to make the application run
2015-04-28 15:07:58 +02:00
Alexander Bock
e24d518bd1 Remove const-ness from shader definitions 2015-04-28 14:25:27 +02:00
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
bc591b2bdb Made night texture only be loaded if one exists, added new shader for planets with a night texture.
Also added plane & image plane shader programs to the general shader declaration in scene.cpp
2015-04-22 15:41:55 -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
Anton Arbring
57800d12c7 added the possibility to load a city light/night texture for planets 2015-04-17 21:57:36 -04:00
Anton Arbring
7c7919a575 Merge branch 'testing' into develop 2015-04-09 17:56:28 -04:00
Anton Arbring
914b3896ad SPICE error handling, position/rotation estimation etc...
- When loading SPICE kernels, coverage for each body is stored.
- If the body does not have spk coverage a position is estimated.
- Added "pulsating" transparency levels for renderableModels with
  estimated position.
- Spice manager clean up, left a few unused methods but removed a lot of
  dead code.
- To support multiple missins being loaded, some errors are simply
  ignored in spicemanager, for better or worse.
- Added start time and stop time as dictionary keys for renderables.
- Made RenderableTrails only show the time between gaps.
- Added but out commented vesta coordinate system swich in renderengine.

NOTE: Renderables using spiceEphemeris will give errors if body keyword
is omitted in modfile (When checking SPK coverage in position update).
2015-04-09 17:35:30 -04:00
Alexander Bock
6a6114ab84 Fix single side-by-side stereo configuration file
Add __CONTEXT__ lines to last shader files
2015-04-07 00:08:53 +02:00
Michal Marcinkowski
cae39f2788 updates to the imagesequencing & renderableplanet projection classes mainly 2015-03-24 12:31:03 -04:00
Anton Arbring
b79e6df763 Planets shape creation & fixed texture longitude
Instead of spheres, the planets are now created as triaxial ellipsoids
according to the corresponding radii values in the SPICE kernels (if such
values are available). Apart from being more scientifically accurate, the
planets are shaped as the intersection functions in SPICE expects.

The textures will now also be aligned in longitude as in reality (w.r.t.
UTC) when using a texture map ranging from -180 in the left end to +180 on the
right, with 0 longitude in the middle (such as Greenwich in Earth texture)
2015-03-20 19:59:26 -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
Michal Marcinkowski
85e13f7738 Added:
New obj mod file with separate obj-loads
Imagesequencer - active instrument slightly improved
Printout of active instrument
Ortho-square dissapears when not needed
2015-02-24 00:03:00 -05: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
1fda1d38db Merge branch 'plutoViz' into feature/stars 2015-02-20 16:56:15 +01:00
Joakim Kilby
cf74d346da Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz 2015-02-20 16:55:03 +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
Joakim Kilby
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
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
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
69e0213e79 Added ability to disable shading for RenderablePlanet renderables 2015-02-16 19:23:23 +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
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
4c53f763f0 Recentering at Pluto,
Todo - add NH with kernels.
2015-01-23 12:10:21 -05:00