mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 11:09:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,336 Commits 99 Branches 46 Tags
304a328cdee0e3791c8791852db80bfd4eec7745
Commit Graph

192 Commits

Author SHA1 Message Date
Alexander Bock
8de6d9db05 Moving global blackout factor into RenderEngine 
Cleanup of Abuffer implementations
 2015-06-05 14:25:35 +02:00
Alexander Bock
77cc5dba49 Moving onscreen gui into its own module 2015-05-26 22:52:12 +02:00
Alexander Bock
ca7dcd4762 Move shaders into their correct modules 
Add path determination to modules that automatically sets correct path resolve tokens
 2015-05-21 15:17:38 +02:00
Alexander Bock
154a949e8b Cleaning up more shaders 2015-05-20 11:28:51 +02:00
Alexander Bock
b8cd01ea4e Removing ghosting from renderablemodel 
Organizing shaders
 2015-05-20 11:18:14 +02:00
Alexander Bock
18752b9d8b Remove individual dirty flags for ProgramObjects and replace with new Ghoul version 
Moved projectiveTexture shader into modules directory
 2015-05-20 10:33:36 +02:00
Anton Arbring
75c268db08 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
Conflicts:
	src/rendering/renderengine.cpp
 2015-05-19 12:00:02 -04:00
Alexander Bock
dc665639d5 Fixed crash with ABufferFixed implementation 2015-05-19 01:05:19 +02:00
Alexander Bock
15908e75a3 Undo sphere changes to make stars look proper again 2015-05-18 18:52:59 +02:00
Alexander Bock
217753bf86 Reverting last changes as they do not work on Windows 2015-05-17 13:59:30 +02:00
Alexander Bock
fe9b3172c6 Committing the depth hack for renderablemodel 
Adding GL_STENCIL_BIT for Mac as it seems to help with an NSOpenGL error
 2015-05-17 12:07:08 +02:00
Alexander Bock
6a9fdef2e0 Fixes for Mac rendering of stars and milkyway 2015-05-14 12:50:17 +02:00
Anton Arbring
30dfc77d81 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
Conflicts:
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablecrawlingline.cpp
	src/rendering/renderableplaneprojection.cpp
 2015-05-13 16:44:03 -04:00
Anton Arbring
a0042ef219 More last minute fixes 
Fixed plane bug (again)
changed rex animation (again)
More key binds
etc
 2015-05-13 16:15:50 -04:00
Alexander Bock
28abe46bcf Fixing various issues that appeared in Mac 
Fixing flat qualifier in shader
Fix default values
Disable postFX shader
 2015-05-13 16:52:25 +02:00
Alexander Bock
41c1293cc4 Merge commit '42ed21b01dc264c632ee6dc72c11d0f62d13df12' into feature/osx 2015-05-13 14:25:08 +02:00
Anton Arbring
481f247a23 Pre presentation mods 
Modified REX animation
Modified printouts in renderengine
More key binds
Fixed renderablePlaneProjection bug
changed dark side of projected planets
 2015-05-12 23:23:29 -04:00
Alexander Bock
c345774a0d Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-05-11 23:30:12 +02:00
Alexander Bock
5027b32f9d Add RenderableCrawlingLine for REX instrument on New Horizons 2015-05-11 23:29:27 +02:00
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