b44e761eba
Merge branch 'develop' into feature/globebrowsing
2016-07-21 13:29:33 -04:00
e5206cccb4
Fixed predefined macros for Windows.
2016-07-20 15:02:15 -04:00
3fcf23f3cb
Update SGCT reference
2016-07-20 20:14:15 +02:00
a2bc9adecd
Updated Ghoul reference
2016-07-20 17:43:04 +02:00
aedfaeda50
Merge branch 'feature/sgct' into develop
2016-07-20 17:10:41 +02:00
a0fec7f6a0
Update Ghoul reference
2016-07-20 16:36:44 +02:00
8dc2cdbbea
Correctly set SGCT default values
2016-07-20 16:24:00 +02:00
6a56e4c83c
Link GLFW library requirements
...
Update SGCT reference
2016-07-20 14:52:24 +02:00
65ddeba70c
Add SGCT as submodule
...
Fix compile errors in ParallelConnection using __WIN32__ macro instead of WIN32
2016-07-20 14:31:30 +02:00
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
bc137ab377
Updated Spice library. Compile fix for Syncbuffer and Unittestson Linux
2016-07-20 10:41:06 +02:00
bc3fe218b9
Updated Spice reference
2016-07-20 08:55:17 +02:00
f222219a6d
Fix spice positioning bug in lodearth.mod
2016-07-19 13:37:16 -04:00
d6aed778c4
Update globebrowsing.scene. Add level-of-detail data folders for Earth and Mars
2016-07-19 11:39:48 -04:00
eeb20d2cb7
Add Spice as a submodule
2016-07-19 15:03:23 +02:00
b442e21091
Use shorter names for interaction modes
2016-07-18 18:10:33 -04:00
541fbba322
Merge with develop and solve conflicts.
2016-07-18 17:26:30 -04:00
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
6691dab91e
Init default rotation matrix to unit matrix explicitly
2016-07-18 13:50:47 -04:00
a2db1bed99
Include fixes for performance measurements
2016-07-18 16:25:55 +02:00
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
1b7ede6d5c
Add Lua functions to load and unload SpiceKernels
2016-07-18 14:41:27 +02:00
f7f8f279de
Move the LuaLibrary definition into its own file
2016-07-18 12:40:29 +02:00
34054d789a
Add missing lua callback file for OpenSpaceEngine
2016-07-18 12:15:52 +02:00
c4e9c88e91
Only display actually included modules in the CMake log (closing #122 )
2016-07-18 12:02:29 +02:00
d39b9e91e2
Compile fix in InteractionHandler
2016-07-18 00:40:40 +02:00
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
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
50735fde80
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-07-15 19:01:15 -04:00
1d9aab6e63
Remove datasets from debugglobe.mod
2016-07-15 18:57:03 -04:00
7568912a7d
Bounding chunk heights considers multiple heightmaps and handles missing data
2016-07-15 18:56:03 -04:00
e19a68eb1e
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-07-15 17:18:29 -04:00
2ec2c95cd7
Add forgotten updates for last commit
2016-07-15 17:16:48 -04:00
403ecd8209
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-07-15 17:13:05 -04:00
a2cd9bc19d
Add static const CHUNK::DEFAULT_HEIGHT to avoid magic numbers in code
2016-07-15 14:21:29 -04:00
4a9d03c54f
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-07-15 13:57:33 -04:00
d06c470636
Fix bounding heights (used for culling) for chunks with heightmap overlays
2016-07-15 13:48:00 -04:00
ae9560332b
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-07-15 13:04:00 -04:00
c25d1cdc88
Enable GUI toggling of visualization of heightmap resolution and intensities
2016-07-14 17:09:35 -04:00
e13c4c2162
Make desired level from projected area work (i.e. not get zero area) around the poles
2016-07-14 13:28:53 -04:00
a77c7466cb
Factor out tile vertex height calculation to separate shader file
2016-07-14 13:00:25 -04:00
61928e83cd
Make ChunkedLodGlobes able to fully reset their data sets
2016-07-14 01:13:26 -04:00
7e2e2cf2f4
Enable selecting highest resolution tile from a TileProviderGroup
2016-07-14 01:00:21 -04:00
dc32dfe075
Added functionality to print all keybindings to file when a scene is loaded
2016-07-14 00:28:09 -04:00
b9237cb787
Fix immediate crash if a new scene would be loaded through the Lua interface
2016-07-14 00:27:36 -04:00
94a46813fe
Add to_string methods to Key, KeyModifier, and KeyWithModifier
2016-07-14 00:27:03 -04:00
2e0bc756cb
Solve bug with black texture data between grayscale overlays.
2016-07-13 23:33:00 -04:00
938843cda4
Include powerscaling_fs for abuffer rendering. Visualize heightmap overlay resolution
2016-07-13 20:31:59 -04:00
0958babaae
Refactor out common frag shader code between between local and global rendering
2016-07-13 19:49:29 -04:00
f8bcd71bf4
Factor out creation of plain tiles to static method in Tile
2016-07-13 18:26:19 -04:00
Erik Broberg