mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 20:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,749 Commits 93 Branches 46 Tags
1f08bb413c9ad3bd07673d5af7f82ca4fb8bb83e
Commit Graph

230 Commits

Author SHA1 Message Date
Kalle Bladin
1f08bb413c Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-17 10:52:58 -04:00
Kalle Bladin
101795aa00 Group layer categories in gui. 2016-06-17 10:52:44 -04:00
Alexander Bock
86dce766ad Correctly align Earth trail relative to SSB instead of Earth barycenter 2016-06-17 15:23:46 +02:00
Kalle Bladin
627b8e635b Activated texture layers can be set from mod file. 2016-06-14 14:00:21 -04:00
Kalle Bladin
0b7ce79e80 Collapse layer category rendering code in to for loop. 2016-06-14 00:20:37 -04:00
Kalle Bladin
164e133ce9 Update tileprovidermanager to loop through texture categories. 2016-06-13 22:17:15 -04:00
Kalle Bladin
b5f1a09b8c Cache uniform IDs upon recompiling of shader programs. Renaming of uniforms in shader code. 2016-06-13 18:57:18 -04:00
Jonathas Costa
b2c895dab0 Merged branch Atmosphere. 2016-06-09 11:45:56 -04:00
Jonathas Costa
649aa879f2 New textures for earth with atmosphere. 2016-06-09 09:18:08 -04:00
Kalle Bladin
92c468426b Add night texture dataset 2016-06-08 22:48:53 -04:00
Kalle Bladin
3980aeff57 Add the layer types water mask, nighttexture, and overlay as well as the option to toggle atmosphere. 2016-06-08 21:30:19 -04:00
Kalle Bladin
562e249dc9 Merge branch 'develop' into feature/globebrowsing 2016-06-08 12:32:31 -04:00
Emil Axelsson
8771a238d3 improve galaxy rendering 2016-06-08 15:00:03 +02:00
Kalle Bladin
ec22683568 Use spice ephemeris for renderable globe. Still not considering rotation in rendering. 2016-06-07 22:47:05 -04:00
Kalle Bladin
d36c33cbb6 Update other modules to work with the new interaction mode and camera class. 2016-06-07 19:51:37 -04:00
Kalle Bladin
bc21643f06 Add the ability to change the interaction mode dynamically and via lua script. 2016-06-07 17:25:00 -04:00
Kalle Bladin
012bcaefaf Solve merge conflicts. 2016-06-07 12:54:52 -04:00
Jonathas Costa
388bb15461 Initial implementation of Atmosphere Effects. Use framebuffer to render it. 2016-06-07 10:35:18 -04:00
Jonathas Costa
de6446282f Fixed small bug in shadows. 2016-06-06 18:23:06 -04:00
Kalle Bladin
7ec7bbecea Remove OpenStreetMap dataset from debugglobe 2016-06-06 17:43:34 -04:00
Jonathas Costa
700f411784 Merged develop branch into PlanetShadows. 2016-06-06 17:19:11 -04:00
Erik Broberg
113c37203b Add some temporal wms configs 2016-06-06 12:28:02 -04:00
Erik Broberg
babad53a63 Add temporal GDAL dataset 2016-06-05 20:26:14 -04:00
Alexander Bock
a0e5fe34fe Use more fine-grained texture specification for Pluto and Charon 2016-06-06 00:49:09 +02:00
Erik Broberg
5156071361 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-05 18:43:01 -04:00
Alexander Bock
3d82173ff0 Don't set alpha value to 1.0 for all projection images 2016-06-04 20:33:17 +02:00
Alexander Bock
6362318399 Make textured milkyway show again 2016-06-04 20:17:28 +02:00
Alexander Bock
50e0c1a43b Reset Earth as camera focus 2016-06-04 20:03:16 +02:00
Alexander Bock
c6dc426211 Merge remote-tracking branch 'origin/feature/galaxy' into develop 
Conflicts:
	data/scene/default.scene
	shaders/PowerScaling/powerScalingMath.hglsl
 2016-06-04 19:54:34 +02:00
Alexander Bock
36f5f7bb04 Only load cdf list if ISWA module is loaded 2016-06-04 19:39:22 +02:00
Alexander Bock
4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop 
Conflicts:
	data/scene/default.scene
 2016-06-04 19:06:54 +02:00
Kalle Bladin
cc31082eff Add more layers to debugglobe. 2016-06-03 14:39:02 -04:00
Sebastian Piwell
8e8d949107 Summer school release 2016-06-03 13:42:50 -04:00
Alexander Bock
104cbcfd39 Update Pluto textures to remove superfluous textures 2016-06-03 16:02:51 +02:00
Emil Axelsson
1901166640 improved galaxy rendering 2016-06-03 11:16:57 +02:00
Sebastian Piwell
41299f17f7 Improved multiple transfer functions 2016-06-02 16:56:25 -04:00
Erik Broberg
678e91816b Setup a simple working demo with TemporalTileProvider as a TileProvider 2016-06-02 14:00:11 -04:00
Kalle Bladin
c241448007 Enable blending between ties of different levels to avoid some of the poping artifacts. 2016-06-01 20:47:07 -04:00
Michael Nilsson
cb601042a6 solve merge conflict 2016-06-01 14:03:39 -04:00
Alexander Bock
a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop 
Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua
 2016-06-01 19:46:23 +02:00
Sebastian Piwell
876c86ca75 Merge fix 2016-06-01 12:09:58 -04:00
Sebastian Piwell
d33121d07c New dataprocessor classes works with IswaGroup 2016-06-01 11:50:26 -04:00
Kalle Bladin
0202828c73 Layers can be turned on and off during runtime and shaders will be recompiled accordingly. 2016-05-31 19:26:42 -04:00
Sebastian Piwell
1f8df7a166 Refactor dataprocessor 2016-05-31 16:52:46 -04:00
Alexander Bock
2742340112 Extract batsrus volume file into a variable for ease of change 2016-05-31 19:17:18 +02:00
Alexander Bock
8bfdf8db0d Add more interesting times to rosetta scene files 2016-05-31 18:35:13 +02:00
Alexander Bock
469358a8d6 Enable easy toggling of high v low resolution Pluto+Charon textures 2016-05-31 18:34:49 +02:00
Alexander Bock
592c2d41b5 First fix for reenabling Jupiter projections 2016-05-31 18:25:57 +02:00
Alexander Bock
fde537681f Some work on fixing 67P projections for all available times 2016-05-30 15:26:47 +02:00
Alexander Bock
884324c467 Cleanup of default.scene and keybindings 2016-05-30 13:36:55 +02:00