2147 Commits

Author	SHA1	Message	Date
Jonathas Costa	bb805c1baf	Merged.	2017-11-25 21:10:59 -05:00
Alexander Bock	026f51735b	Show distance from current focus object ... Add conversions for time and space to show distance and delta time in manageable units Remove warnings Add deinitializeGL call to Renderengine	2017-11-25 18:30:13 -05:00
Alexander Bock	182694422e	Per default set the length of Uranus to a shorter value to allow for earlier time jumps with exceeding the spice kernel range ... Set correct min/max values for static rotations Enable rendering of matrix properties in ImGUI	2017-11-24 15:31:19 -05:00
Alexander Bock	55afc617f3	Let performance measurement consume mouse events	2017-11-24 12:13:39 -05:00
Emil Axelsson	13aebb78b2	Do not assume that string propeties are file paths. Fix proper escaping in lua script generation. (#422)	2017-11-24 11:01:19 -05:00
Alexander Bock	0c18263de7	Issue/417 (#421) ... Added support for multiple windows in ImGui	2017-11-24 11:00:53 -05:00
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	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
Jonathas Costa	41dae755f5	Merged master.	2017-11-15 17:47:21 -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	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	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	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	bc95d13c31	Updated ImGui external	2017-11-10 09:58:53 -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
Jonathas Costa	e26e5c7f15	Merge branch 'master' of https://github.com/OpenSpace/OpenSpace	2017-11-09 14:02:25 -05:00
Jonathas Costa	ac15a14602	Merged.	2017-11-09 14:02:01 -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	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	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	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
Alexander Bock	80f5706049	Remove warnings on Clang	2017-11-07 09:19:45 -06:00
Alexander Bock	b886925616	Move OpenGL in globebrowsing from constructors into initialization functions ... Place entire scene loading into separate thread	2017-11-03 16:25:06 -04:00
Alexander Bock	78e3320cde	Separate Renderable::initialize into initialize and initializeGL functions ... Handle initialize in a separate thread and display rudimentary loading screen	2017-11-02 14:27:35 -04:00
Alexander Bock	ca69408366	Enable minimum picking distance in NDC	2017-11-02 12:05:09 -04:00
Jonathas Costa	5b11eff966	Merge branch 'master' of https://github.com/OpenSpace/OpenSpace	2017-10-29 11:51:26 -04:00
Alexander Bock	1c2622248c	Remove unused shaders	2017-10-24 03:35:41 -07:00
Alexander Bock	10bcd9a3d3	Add display for current time and ability to return to today to the space/time component	2017-10-24 02:53:51 -07:00
Alexander Bock	97445f4f9f	Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts	2017-10-23 14:43:25 -07:00
Oskar Carlbaum	afd91fc4af	Move all kameleon dependency to separate files named 'kameleonfieldlinehelper'	2017-10-22 14:55:59 +02:00
Alexander Bock	c204a1e9f0	Make RenderableConstellationBounds not crash if the file is missing	2017-10-21 10:27:14 -04:00
Alexander Bock	e80730e9bf	Fix a variety of warnings	2017-10-21 10:10:40 -04:00
Alexander Bock	008896bdd7	Only add color layers and height layers through info files if they exist	2017-10-20 17:01:44 -04:00
Alexander Bock	4dacba868b	Fix featured property display ... Set correct blend mode for Themis on Mars	2017-10-19 22:52:25 -04:00
Alexander Bock	78aa164ccf	Reset moon.mod	2017-10-19 15:14:04 -04:00
Jonathas Costa	ccb76b91da	Fixed transformation matrix in DU.	2017-10-19 14:18:04 -04:00
Jonathas Costa	55d71af9a4	Fixed double declaration of style variable.	2017-10-18 21:46:20 -04:00