Commit Graph

5769 Commits

Author SHA1 Message Date
Jonathan Grangien
8bbb294eff Change MAS MHD assets 2018-07-17 11:17:27 -04:00
farbrorberg
b01d4f6073 Old enlil-fieldlines working 2018-07-17 11:17:27 -04:00
Jonathan Grangien
06f595dd5c Clean up mas asset 2018-07-17 11:17:27 -04:00
Jonathan Grangien
538ab0b9ca Add shortcut to toggle mas renderable 2018-07-17 11:17:27 -04:00
Jonathan Grangien
0c589ad035 Add visible colors with log-ed positions to transferfunction 2018-07-17 11:17:27 -04:00
Jonathan Grangien
b338551df4 Check in data dictionary file edited with suitable values 2018-07-17 11:17:27 -04:00
Jonathan Grangien
65c68d5b5f Render a rectangle from mas data
First mappingkey value in transferfunction gets applied to a small
rectangle inside sun
2018-07-17 11:17:27 -04:00
Jonathan Grangien
e23508cdce Fix merge 2018-07-17 11:17:27 -04:00
Emil Axelsson
87e870b1a8 Example generation of time varying volume 2018-07-17 11:12:24 -04:00
jon-grangien
d2b00ea76b Try with different volume rendering values for the data 2018-07-17 11:12:24 -04:00
Emil Axelsson
3237c37a6a Work on volume generation and rendering 2018-07-17 11:12:24 -04:00
Jonathan Grangien
e815adc493 Add some commented out lines to mas asset 2018-07-17 10:59:08 -04:00
Jonathan Grangien
dc79249e44 volume raycaster: Add back simple lower/upper value 0 to 1 remapping 2018-07-17 10:59:08 -04:00
Emil Axelsson
61404b408e Change domain bounds into a non-optional parameter 2018-07-17 10:37:19 -04:00
Emil Axelsson
9c23bdc472 Create volume generation task 2018-07-17 10:36:48 -04:00
jon-grangien
a750dee5f4 Change usage of transferfunctionhandler to core package transferfunction 2018-07-17 10:32:17 -04:00
Jonathan Grangien
70dd0b271a Debug transfer function handler usage of classes 2018-07-17 10:23:02 -04:00
Jonathan Grangien
3ae6cdbd6a Fix namespace indentation in a couple of files 2018-07-17 10:19:56 -04:00
Jonathan Grangien
8b864a32a9 Change time keybindings in assets 2018-07-17 10:14:17 -04:00
Jonathan Grangien
9805d4b4b4 Rename files and folders 2018-07-17 10:13:27 -04:00
Matthias Berg
f9a56a85c2 Add mas-transferfunction file 2018-07-17 10:13:27 -04:00
Matthias Berg
287ce3adde Better adapt to MAS 2018-07-17 10:13:27 -04:00
Matthias Berg
71dc87b9e2 Test MAS model rendering with existing functionality 2018-07-17 10:13:27 -04:00
Jonathan Grangien
f51120013c Put stb_image includes first in image reader order for linux 2018-07-17 10:02:06 -04:00
Jonathan Grangien
ef877db08c Move stb_image reader first in reader order
Seems better to let it handle the common file types instead of FreeImage
on linux
2018-07-17 09:59:30 -04:00
Alexander Bock
2751ee327c Update Ghoul repository to show milliseconds in log timestamps
Add log information to the SceneGraphnode to show initialization and OpenGL initialization of nodes
2018-07-16 17:44:50 -04:00
Alexander Bock
001935a139 Add missing files in multiresvolume 2018-07-16 17:28:52 -04:00
Alexander Bock
1e97bae229 OpenGL logging
Print warning if OpenGL logging is disabled but loglevel is too low
Fix format of printed functions

Closes 656
2018-07-13 16:22:24 -04:00
Alexander Bock
d0f3e5507a Code cleanup
Remove warnings from multiresvolume module
2018-07-13 16:02:42 -04:00
Emil Axelsson
c2cc2bab17 Feature/state machine (#673)
* Implement simple state machine example in Lua
* Use defaults for trail widths
2018-07-13 10:29:45 -04:00
Emil Axelsson
13edfb64b4 Fix shader path 2018-07-13 11:28:16 +02:00
Emil Axelsson
902e3e6dac Feature/time interpolation (#669)
* Initial implementation
* Better approximation of target time
* Correctly use double precision for time passing
* Cleanup
* Adding proportional adjustment of delta time at end of interpolation
* Keyframe based time interpolation
* Add property for time interpolation duration. Move time interpolation methods to TimeManager.
* Fix bugs with time gui
* Make several clicks on delta time buttons work as expected
* Clean up
* Improve time interpolation for parallel connection
* Improve time API. Fix time interpolation bugs.
* Fix mac compile issue
* Add hour button
* Add missing + sign
* Remove newer images from projection buffer when going back in time
* Add comment about clearing projection buffer
* Fix bug with jumping time in parallel connection
* Rename integrateFromTime to previousFrameTime
* Compile fix for iswa module
* Address code review comments
* Code cleanup
* Fix bug causig unsmooth behaviour when pausing while interpolating in time
2018-07-13 11:07:35 +02:00
Emil Axelsson
6007f1d70d Feature/model lighting (#670)
* Fix NH texture and add lighting options
* Add missing comma
* Light sources: work in progress.
* Add light sources
* Remove unused values
* Add types to documentation
* Add light sources to various missions
* Code cleanup based on review
2018-07-13 09:01:43 +02:00
Emil Axelsson
8a6dd14330 Fix issue #660 and provide percentage for http syncs (#671)
Fix issue #660 and provide percentage for http syncs
2018-07-13 08:51:18 +02:00
Alexander Bock
12c87969a7 Add BoolProperty to SpaceModule to control SpiceManager exception handling (closes #661)
Add debugging indices to SceneGraphNodes
Rename ImGui indices debugging definition
2018-07-12 17:48:34 -04:00
Emil Axelsson
d20bb6d634 Set maximum iterations for geodetic surface projection 2018-07-12 14:25:33 +02:00
Emil Axelsson
1b3df16c28 Feature/time frame (#642)
* First implementation of time frames
* Add TimeFrameUnion. Only show solar system 1850-2150.
* Consider dependencies when determining whether time frame is active
* Code review fixes.
2018-07-11 10:42:06 +02:00
Matthew Territo
c2b1a3fd42 Pop Message from queue after use to fix reference lifespan releases/v0.12.0 2018-07-07 23:31:17 +02:00
Gene Payne
0783b1ddaa Merge pull request #613 from OpenSpace/touch-user-study
Touch user study code
2018-07-05 15:35:23 -06:00
GPayne
db28b3e2a9 Merged master into touch-user-study branch 2018-07-05 15:33:46 -06:00
GPayne
f84f5f5cc5 Deleted unecessary casting operation as part of PR review 2018-07-05 14:34:35 -06:00
Alexander Bock
8dce177d33 Remove more warnings on Jenkins 2018-07-05 14:40:54 -04:00
Jonathas Costa
e8735d4544 Merge branch 'issue/637' 2018-07-05 14:14:54 -04:00
Jonathas Costa
3ffca283a5 Removed unsused code. 2018-07-05 14:14:13 -04:00
Alexander Bock
ef61dc8c16 Rename DashboardGlobeLocation to DashboardItemGlobeLocation
Remove JSON from iswa module and use openspace one instead
Remove warnings
General code cleanup
2018-07-05 12:00:32 -04:00
Jonathas Costa
47a657d7f3 Enabled Void's labels by default and changed Local Dwarfs' labels size. 2018-07-05 10:34:31 -04:00
Alexander Bock
d86b78f2f5 Address PR comments 2018-07-05 09:47:35 -04:00
Emil Axelsson
1916190228 Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-07-04 22:19:06 +02:00
Emil Axelsson
a144a3ef36 Prevent leaking lua variables to global scope 2018-07-04 22:14:37 +02:00
Emil Axelsson
8b91c67010 Feature/slide deck (#636)
* Implement basic slide deck helper and example
2018-07-04 13:22:06 -04:00