Commit Graph

2954 Commits

Author SHA1 Message Date
Matthew Territo fdb90f74ac Added scene selector in the SettingsEngine, in the GUI under Global Properties.
Has placeholder functionality for what's coming in the next commit.
2016-07-27 16:45:43 -06:00
Alexander Bock 035f5ba989 Remove extra whitespace is autumn.tf 2016-07-27 20:49:51 +02:00
Alexander Bock 07e8a059d1 Correctly output CMake messages about dependency only when they are needed 2016-07-27 20:46:56 +02:00
Matthew Territo f53c4b6193 OptionProperty: ability to get the string description by passing a value
string getDescriptionByValue(int)
2016-07-27 09:25:28 -06:00
Alexander Bock 98e7b62834 Update Ghoul repository 2016-07-27 14:42:17 +02:00
Alexander Bock 444f7b6e25 Enable additional warnings
Update Ghoul reference
Fix relative path in test_gdalwms
2016-07-27 14:38:37 +02:00
Alexander Bock f4f4e7de9e More Jenkins compile fixes 2016-07-27 11:01:58 +02:00
Alexander Bock 60ce1872bd Include correct directory for GDAL on non-Win32 systems 2016-07-27 09:25:17 +02:00
Alexander Bock 53b1ff9dea Small change triggering Jenkins update 2016-07-26 20:18:55 +02:00
Alexander Bock 22da60528a Small change triggering Jenkins update 2016-07-26 20:00:15 +02:00
Alexander Bock 5d7aaa1ec6 Small change triggering Jenkins update 2016-07-26 19:58:23 +02:00
Alexander Bock e197486375 Small change triggering Jenkins update 2016-07-26 19:53:02 +02:00
Alexander Bock c977a0920f Small change triggering Jenkins update 2016-07-26 19:49:43 +02:00
Alexander Bock 4e61595fc1 Update Ghoul repository 2016-07-26 19:47:34 +02:00
Alexander Bock 67e8608581 Use the include paths to search for gdal_priv.h 2016-07-26 17:00:29 +02:00
Alexander Bock 0062276d45 Fix case for TileProviderManager 2016-07-26 16:05:03 +02:00
Matthew Territo 62bba40259 Update Ghoul 2016-07-24 00:49:09 -06:00
Matthew Territo 2abd1951fa Add display option to OptionProperty
For displaying as Radio or Dropdown
2016-07-22 19:07:32 -06:00
Matthew Territo 8f40020fcb Add ability to append multiple Options to an OptionProperty
via addOptions(vector<int>, vector<string>)
2016-07-22 12:39:09 -06:00
Jonathas Costa e5206cccb4 Fixed predefined macros for Windows. 2016-07-20 15:02:15 -04:00
Alexander Bock 3fcf23f3cb Update SGCT reference 2016-07-20 20:14:15 +02:00
Alexander Bock a2bc9adecd Updated Ghoul reference 2016-07-20 17:43:04 +02:00
Alexander Bock aedfaeda50 Merge branch 'feature/sgct' into develop 2016-07-20 17:10:41 +02:00
Alexander Bock a0fec7f6a0 Update Ghoul reference 2016-07-20 16:36:44 +02:00
Alexander Bock 8dc2cdbbea Correctly set SGCT default values 2016-07-20 16:24:00 +02:00
Alexander Bock 6a56e4c83c Link GLFW library requirements
Update SGCT reference
2016-07-20 14:52:24 +02:00
Alexander Bock 65ddeba70c Add SGCT as submodule
Fix compile errors in ParallelConnection using __WIN32__ macro instead of WIN32
2016-07-20 14:31:30 +02:00
Alexander Bock 2b01b300b5 Update Spice reference
Update CMake requirement from 3.0 to 3.4 due to usage of WINDOWS_EXPORT_ALL_SYMBOLS in Spice CMake
2016-07-20 11:10:52 +02:00
Alexander Bock bc137ab377 Updated Spice library. Compile fix for Syncbuffer and Unittestson Linux 2016-07-20 10:41:06 +02:00
Alexander Bock bc3fe218b9 Updated Spice reference 2016-07-20 08:55:17 +02:00
Alexander Bock eeb20d2cb7 Add Spice as a submodule 2016-07-19 15:03:23 +02:00
Alexander Bock a244defdbc Add additional Lua functions that make use of regular expressions to match against fully qualified property identifiers
- Making the GUI use the new function setPropertyValueSingle to not incur the overhead of compiling the regex
 - The default setPropertyValue Lua function uses a wildcard, which replaces a * with the correct regex (.*) for ease of use
 - The setPropertyValueRegex Lua function allows a full regular expression to be used

Closing #108
2016-07-18 20:12:24 +02:00
Alexander Bock a2db1bed99 Include fixes for performance measurements 2016-07-18 16:25:55 +02:00
Alexander Bock 9df88a6a79 Remove static SPICE kernel loading from the cfg file and move it into the preInitialization step of a scene (closing #117) 2016-07-18 14:54:36 +02:00
Alexander Bock 1b7ede6d5c Add Lua functions to load and unload SpiceKernels 2016-07-18 14:41:27 +02:00
Alexander Bock f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Alexander Bock 34054d789a Add missing lua callback file for OpenSpaceEngine 2016-07-18 12:15:52 +02:00
Alexander Bock c4e9c88e91 Only display actually included modules in the CMake log (closing #122) 2016-07-18 12:02:29 +02:00
Alexander Bock d39b9e91e2 Compile fix in InteractionHandler 2016-07-18 00:40:40 +02:00
Alexander Bock 6d8a16f19e Rendering ImGui, ScreenLog, and Information as a post-processing step to make it work in fisheye rendering (closing #119)
Disable SGCT ESC terminate handling and implement a method that optionally waits before closing the application (closing #120)
 - ESC key is now bound to a call to "openspace.toggleShutdown()" that will initiate a shutdown in 3 seconds unless ESC is pressed again
 - The countdown timer is set in the openspace.cfg
2016-07-17 02:33:45 +02:00
Alexander Bock 5c95c34752 Move the Gui rendering into a postdraw call so that it works for non-standard rendering techniques (like fisheye)
Closing #119
2016-07-16 16:47:00 +02:00
Alexander Bock dc32dfe075 Added functionality to print all keybindings to file when a scene is loaded 2016-07-14 00:28:09 -04:00
Alexander Bock b9237cb787 Fix immediate crash if a new scene would be loaded through the Lua interface 2016-07-14 00:27:36 -04:00
Alexander Bock 94a46813fe Add to_string methods to Key, KeyModifier, and KeyWithModifier 2016-07-14 00:27:03 -04:00
Alexander Bock cf55af3cea Minor cleanups 2016-07-12 08:26:04 -04:00
Alexander Bock 0228ca241b Add Juno scene and scenegraphnodes
Enable ability to apply a rotation matrix to the rotation vector to accomodate for model misalignments
2016-07-10 09:40:30 +02:00
Alexander Bock f19138f513 Fix OpenSpaceTest compilation and test success 2016-07-08 13:55:59 +02:00
Alexander Bock c6d6b63dc8 Merge branch 'develop' into feature/test 2016-07-08 11:03:07 +02:00
Alexander Bock f8e65ad044 Updated Rosetta model 2016-07-08 11:02:22 +02:00
Alexander Bock 3e20c6edd3 Correctly load and pop scripts 2016-07-08 10:49:18 +02:00