Commit Graph

2974 Commits

Author SHA1 Message Date
Alexander Bock
7e98922bdd Enable rendering of IVecX properties in the GuiPropertyComponent 2016-07-31 21:24:12 +02:00
Alexander Bock
5f1fa3f755 Implement shadowing on RenderableRings 2016-07-31 20:22:29 +02:00
Alexander Bock
052e6007cd Rename static constants in Property class 2016-07-31 19:27:13 +02:00
Alexander Bock
6bd0ef7102 Make OpenSpaceModule a properties::PropertyOwner so that it can own properties
Add properties owned by OpenSpaceModule to the global settings engine (closing #104)
2016-07-31 19:26:55 +02:00
Alexander Bock
393f39de2e Let the module registration script return a lambda that will contain all modules, thus removing the static initialization order problem 2016-07-31 19:25:15 +02:00
Alexander Bock
e39a7983aa Generate keyboard mappings on default 2016-07-29 13:37:38 +02:00
Alexander Bock
405c66d6f8 Enable separate orientation setting for non-equatorial rings 2016-07-29 13:28:44 +02:00
Alexander Bock
9f1abc67a2 Enable setting the texture offset for rings
Enable setting the color-based transparency for rings
2016-07-29 13:23:43 +02:00
Alexander Bock
635ce1713b Add initial implementation of rings for Saturn 2016-07-29 07:54:16 +02:00
Alexander Bock
0c3b2c55d9 Removing more CppCheck warnings 2016-07-28 20:31:53 +02:00
Alexander Bock
4068ec747b Remove CppCheck warnings 2016-07-28 18:04:08 +02:00
Alexander Bock
8f325f5cd6 Update CppCheck suppressions file 2016-07-28 15:46:08 +02:00
Alexander Bock
e13ef7fdc2 Update Ghoul reference 2016-07-28 15:43:39 +02:00
Alexander Bock
f83f0cd2f4 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-07-28 15:42:57 +02:00
Alexander Bock
d8c6b3ddc8 Removing extra space in autumn.tf 2016-07-28 15:42:53 +02:00
Matthew Territo
1943e069a0 FIXED: Extended temporary fade functionality
Fade in on initialization, toggleFade Lua binding to "w", prevent trying to fade out/in if already at min/max

Flipped a variable between compiles and apparently lost track of which was the correct one :-/
2016-07-27 19:32:06 -06:00
Matthew Territo
9a435ac74d Extended temporary fade functionality
Fade in on initialization, toggleFade Lua binding to "w", prevent trying to fade out/in if already at min/max
2016-07-27 19:25:49 -06:00
Matthew Territo
94625e541b FIXED: Slightly rearrange/cleanup OpenspaceEngine::initialize
Simplify scene file config/commandline logic, group scene and renderEngine work

(Stashed changes took over real changes)
2016-07-27 17:02:24 -06:00
Matthew Territo
10e00b0d3c Slightly rearrange/cleanup OpenspaceEngine::initialize
Simplify scene file config/commandline logic, group scene and renderEngine work
2016-07-27 16:58:04 -06:00
Matthew Territo
10f9742213 Activate scene change dropdown in Global Properties/SettingsEngine
Included some cleanup how the Scene::update function works with the InteractionHandler
2016-07-27 16:49:01 -06:00
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