Commit Graph

133 Commits

Author SHA1 Message Date
Emil Axelsson 6b182bdfad Start with Gui for assets 2017-11-15 09:40:37 +01:00
Emil Axelsson 62f58a9749 Start on asset gui 2017-11-14 20:46:03 +01:00
Alexander Bock 3a7f221793 Remove GCC warnings 2017-11-13 16:22:07 -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 758e26789c More coding style conformance 2017-11-11 11:25:49 -05: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
Jonathas Costa 929bd9ae05 Merged. 2017-11-09 15:46:46 -05: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 50fd9309ba Merge branch 'master' into feature/NewAtmosphere
# Conflicts:
#	src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04: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 e80730e9bf Fix a variety of warnings 2017-10-21 10:10:40 -04:00
Alexander Bock 518abc5f87 Merge branch 'master' into feature/NewAtmosphere
# Conflicts:
#	data/scene/default.scene
#	data/scene/digitaluniverse/tully/tully.data
2017-10-20 10:42:18 -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 637e74a9dc Merged master into NewAtmosphere. 2017-10-19 14:23:06 -04:00
Jonathas Costa 55d71af9a4 Fixed double declaration of style variable. 2017-10-18 21:46:20 -04:00
Alexander Bock 2e7da84dbf Some minor ImGUI color changes 2017-10-18 19:30:32 -04:00
Jonathas Costa d36e32e560 Merged master into NewAtmosphere. 2017-10-17 20:14:41 -04:00
Alexander Bock f8754115eb Various cleanup 2017-10-16 17:11:28 -04:00
Alexander Bock a303bf3aa8 Fix for mission visualization
Change default monospaced font
2017-10-16 16:27:32 -04:00
Alexander Bock 7520edab83 Added first version of mission visualization 2017-10-16 10:23:00 -04:00
Alexander Bock cf01749e83 Simplify property tree if a tree node only has a single child and no scenegraph nodes 2017-10-13 19:32:54 -04:00
Alexander Bock bb5f4d4381 Rename GuiGrouping to GuiPath
Add GuiPath to existing scenegraph nodes
Add option to toggle tree representation
Add caption font to UI
2017-10-13 13:08:59 -04:00
Alexander Bock ebd506975c Added initial scenegraph node grouping support 2017-10-13 00:17:28 -04:00
Alexander Bock f1fd2b1960 Add window to show featured scenegraph nodes 2017-10-12 12:13:55 -04:00
Alexander Bock 327779d88f Implemented Space/Time ImGui widget 2017-10-11 15:58:41 -04:00
Alexander Bock d97cfbe829 Change ImGUI look and feel
Add Arimo font to be used in UI
2017-10-11 10:54:19 -04:00
Alexander Bock aa969795cc Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296) 2017-10-10 14:16:55 -04:00
Alexander Bock 16a865337e Fix compile error in GlobeBrowsing module without GDAL (closes #396) 2017-09-30 15:47:11 -06:00
Jonathas Costa 1c6aba6b7b Merge branch 'master' into feature/NewAtmosphere 2017-08-21 13:35:42 -04:00
Alexander Bock 222bbe22ab Feature/gb gui (#390)
Implemented new GUI component to handle WMS servers
* Add Lua scripts to support adding GIBS datasets (closes #222)
* Add Lua function to load WMS servers from a predefined file

* Workaround for Visual Studio 15.3 compile fix in Windows headers

* Initial support for parsing GetCapabilities file and automatically add layers

* Add a Trigger property to remove a layer

* Support default servers

* Add default file

* Move WMS server code from GUI component into GlobeBrowsingModule

* Add Lua scripts for loading and removing WMS servers
Automatically load default servers on startup

* Reset tile provider before removing a layer tolimit the crash risk
Add "From focus" button to switch globebrowsing gui to the same node as the focus

* Remove warnings
Remove compile error with nonexisting GDALOpenEx function
2017-08-19 20:23:08 -04:00
Jonathas Costa 2d0da72a50 Merged master into atm. 2017-08-16 12:00:28 -04:00
Alexander Bock c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00