Commit Graph

4848 Commits

Author SHA1 Message Date
Emil Axelsson
99e097b441 Volume rendeirng fixes: Premultiply alpha in transfer function.Update transfer function on propery change. More reasonable opacity multiplier range. 2017-11-22 19:04:19 +01:00
Alexander Bock
aa490a97c6 Adding MOLA HRSC dataset 2017-11-20 11:42:20 -05:00
Alexander Bock
f597b119ed Set more reasonable follow focus node rotation distance value for OrbitalNavigator 2017-11-17 13:58:31 -05:00
Alexander Bock
719130b6b7 Jenkinswarnings (#419)
* Remove more warnings

* Removing more warnings

* More warning fixes

* More warnings

* More warnings

* Update ghoul
2017-11-16 21:19:28 -05:00
Alexander Bock
669078201a Add check for usage of ghoul_assert instead of plain old assert
Update Ghoul
2017-11-16 16:12:54 -05:00
Alexander Bock
0ff9c93512 Enable the disabling of Tooltips in ImGUI 2017-11-16 09:06:17 -05:00
Alexander Bock
3a7f221793 Remove GCC warnings 2017-11-13 16:22:07 -05:00
Alexander Bock
3f6e5e6ace Merge pull request #415 from OpenSpace/feature/loadingscreen-refactor
Feature/loadingscreen refactor
2017-11-12 13:24:48 -06:00
Alexander Bock
fb5057ba36 Jenkins compile fix 2017-11-12 12:37:55 -05:00
Alexander Bock
b6d841c677 Correctly use group identifier name in property rendering
Fix indexing in Dropbox of OptionProperty
Finishing touches on FixedRotation (closes #137)
2017-11-12 12:33:10 -05:00
Alexander Bock
5080cc13b3 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-12 11:17:48 -05:00
Alexander Bock
bbd019e8dd Jenkins build hotfix 2017-11-12 10:52:26 -05:00
Alexander Bock
907ea891cf Address PR comment 2017-11-12 10:50:24 -05:00
Alexander Bock
f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
2017-11-12 10:50:11 -05:00
Alexander Bock
76b26c0128 Change to different libTorrent version 2017-11-11 16:06:02 -05:00
Alexander Bock
6911a0cade Revert libtorrent back to an RC version 2017-11-11 15:41:57 -05:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Alexander Bock
f29b15a37f Add a rotation method that follows a fixed scene graph node
Add missing file for ImGui
2017-11-10 17:15:00 -05:00
Alexander Bock
28e1298be6 Only include touchbar file if on Apple 2017-11-10 13:38:47 -05:00
Alexander Bock
f183b9536f Implement GUI button and featured elements on touchbar 2017-11-10 13:19:46 -05:00
Alexander Bock
bc95d13c31 Updated ImGui external 2017-11-10 09:58:53 -05:00
Alexander Bock
953d1581ae Update libTorrent repository 2017-11-10 09:47:37 -05:00
Alexander Bock
7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06:00
Alexander Bock
afa1d6d33e Add strict test for whitespace at end of line
More work on coding style
2017-11-09 23:47:51 -05:00
Alexander Bock
7b12a241ed Remove BOMs
Fix coding style and script
2017-11-09 19:10:32 -05:00
Alexander Bock
aa20c677dd Move onscreen rendering into SGCT's render2D function (closes #181)
Same fix makes GUI windows work again (closes #412)
2017-11-09 18:12:13 -05:00
Alexander Bock
51a71d5ce2 Compile fix to adjust to runTime method not existing anymore 2017-11-09 14:58:43 -05:00
Alexander Bock
5fe98b85ff Merge pull request #403 from OpenSpace/feature/fieldlineSequence
Feature/fieldlinesSequence
2017-11-09 12:23:13 -06:00
Alexander Bock
0015cbb6f6 Finalize the loadingscreen before initializing GL part of the scene
Correctly use screen aspect ratio to render the loading screen box
2017-11-09 12:47:28 -05:00
Alexander Bock
5f391de33c Fix crash when adding layers through globebrowsing interface due to missing initialization
Fix crash that would happen if the resetting of the tile layer would throw an exception
2017-11-09 12:01:35 -05:00
Alexander Bock
d1735af1ed Fix compile error in iswa module 2017-11-09 11:41:27 -05:00
Alexander Bock
88cf7926ae Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp
2017-11-09 10:51:56 -05:00
Alexander Bock
dc85ee6cd7 Highlight nodes if they have an error 2017-11-09 10:51:07 -05:00
Alexander Bock
4381356af2 Update ghoul 2017-11-09 10:35:57 -05:00
Alexander Bock
ca7053d8f2 Fix bug with layer support for height maps 2017-11-09 10:20:33 -05:00
Alexander Bock
8866a13ff6 More coding style fixes 2017-11-08 21:36:06 -06:00
Alexander Bock
ad3df78e1a Add strict coding style check for line length 2017-11-08 19:26:28 -06:00
Alexander Bock
cb445e3137 Update Ghoul 2017-11-08 19:17:27 -06:00
Alexander Bock
acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
2017-11-08 19:10:59 -06:00
Alexander Bock
44806687bf Fix bug with applying colormap in RenderableBillboardsCloud 2017-11-08 12:21:15 -06:00
Alexander Bock
b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Emil Axelsson
d94408224c Compile fix for Windows 2017-11-07 18:04:35 +01:00
Alexander Bock
80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -06:00
Emil Axelsson
3d9481a4fc Make screen log thread safe 2017-11-07 00:14:50 +01:00
Alexander Bock
e63b7ea396 Fix warnings in loading screen 2017-11-06 16:04:32 -06:00
Alexander Bock
1990a50757 Remove dependency on glm swizzle 2017-11-06 15:36:19 -06:00
Alexander Bock
bc4e0e4af0 Refactor item overlap and add standoff distance 2017-11-06 11:02:58 -06:00
Alexander Bock
dc9831b6a6 Add progress bar to the loading screen
Add configuration options to customize the loading screen
2017-11-05 14:49:46 -05:00
Emil Axelsson
81e81d04e4 Force Cmake flags for Libtorrent 2017-11-05 20:04:01 +01:00
Alexander Bock
3afd2bf514 OSX compile fix 2017-11-04 20:54:55 -04:00