Commit Graph

2345 Commits

Author SHA1 Message Date
Alexander Bock
2152c3ee88 Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere
# Conflicts:
#	modules/imgui/src/renderproperties.cpp
2017-12-11 09:12:13 -05:00
Jonathas Costa
52da2297be Changed names in DU following Carter's asking. Fixed bug in min plane size clipping procedure. 2017-12-08 16:11:58 -05:00
Jonathas Costa
b031245a19 Changed behaviou of max billboard sizes. 2017-12-08 13:03:36 -05:00
Alexander Bock
66b3117064 Add a delay to the display of tooltips (closes #426) 2017-12-08 11:37:56 -05:00
Alexander Bock
0af3233f53 Move Space/Time component into simple menu version
Move regular menu to F3
Move easy menu to F2
Remove extra text
2017-12-07 17:06:55 -05:00
Jonathas Costa
5eb11cfc49 Merged master into NewAtmosphere. 2017-12-07 11:31:51 -05:00
Jonathas Costa
820bde4a13 Merged. 2017-12-07 11:01:35 -05:00
Jonathas Costa
eb35b8420a Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere 2017-12-07 10:16:29 -05:00
Alexander Bock
a406aaf039 Merge branch 'feature/guisorting'
# Conflicts:
#	modules/imgui/include/guipropertycomponent.h
#	modules/imgui/src/guipropertycomponent.cpp
2017-12-07 01:15:52 -05:00
Alexander Bock
20bdb7b2b4 Use the 4K milkyway texture on default for better performance
Make featured properties and space/time widget easy to disable
Add setting for setting the bounds of the delta time slider
Add exponent to all numerical properties and use where appropriate
Add properties to Guicomponents that collapse the title bar
Add new F2 key to only display the main property window
2017-12-07 01:05:03 -05:00
Alexander Bock
11b054b007 Move selection of Tree layout into GuiPropertyComponent property 2017-12-06 18:40:54 -05:00
Alexander Bock
be98c3d784 Add TemplateProperty<std::vector<std::string>> as StringListProperty
Add default gui sorting to all scenes
2017-12-06 17:04:10 -05:00
Jonathas Costa
56854012a5 Fixed bug in local normals. 2017-12-06 12:40:33 -05:00
Jonathas Costa
743ffb51bd Merged. 2017-12-05 11:08:12 -05:00
Jonathas Costa
f698a3de09 Merged master into NewAtmosphere. 2017-12-04 12:19:40 -05:00
Jonathas Costa
f2b6149787 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-12-04 11:16:13 -05:00
Jonathas Costa
24d3c5e8d2 Improved fade-io/out controls in GUI. Changed default behavior for unknown textures in renderable planes cloud. 2017-12-04 11:15:39 -05:00
Jonathas Costa
a797c2b6db Merged master into NewAtmosphere 2017-12-01 17:13:04 -05:00
Jonathas Costa
bc61200724 Added missing include. 2017-12-01 15:49:52 -05:00
Jonathas Costa
8243d09188 Fixed bug in RenderablePlanesCloud and added better fade-in gui values. 2017-12-01 15:12:20 -05:00
Jonathas Costa
c543d0d4bf Added fade-in/out effect for min/max billboard size. 2017-11-30 14:46:04 -05:00
Jonathas Costa
676db460cb Commented testing line. 2017-11-30 12:43:23 -05:00
Jonathas Costa
ae9da60356 Improve Earth's night side. 2017-11-30 12:38:50 -05:00
Jonathas Costa
5825a94e56 Improved mesh precision. 2017-11-30 12:38:30 -05:00
Alexander Bock
38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Alexander Bock
8e0fde947d Cleanup ScreenSpaceFramebuffer (fix orientation issue)
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
Jonathas Costa
6363fc0bb2 Added missing include and merged master into NewAtmosphere. 2017-11-25 22:39:18 -05:00
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
Jonathas Costa
27fd0ce09e Added minsize controls for billboards. 2017-11-23 20:40:44 -05:00
Jonathas Costa
10a60e73ad Improved performance of RenderablePlanesCloud adding min size control. 2017-11-23 20:03:42 -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
Jonathas Costa
cd1c695944 Improved RendedrablePlanesCloud rendering times. 2017-11-22 11:55:37 -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
Jonathas Costa
0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00
Jonathas Costa
41dae755f5 Merged master. 2017-11-15 17:47:21 -05:00
Jonathas Costa
67033c4583 Tentative fix for billbords alingment problems. 2017-11-15 17:35:00 -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
Jonathas Costa
88803ab3c5 Fixed bug in renderablestars and added support for Sun as a simple star. 2017-11-10 18:07:25 -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