f4fa144606
Use shorter struct name. Previous name caused linker error LNK1179
2016-07-21 16:57:48 -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
f7f8f279de
Move the LuaLibrary definition into its own file
2016-07-18 12:40:29 +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
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
5f2d692230
Fix: last commit did not consider the updated FontRenderer interface
2016-07-13 14:22:36 -04:00
98a142e96d
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-07-13 13:46:02 -04:00
f4f0e53b2c
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-07-13 13:44:11 -04:00
c2488b6d8a
Add ChunkIndexTileProvider to dynamically render chunk indices on tiles
2016-07-13 13:43:12 -04:00
8fcaaf2799
Merge remote-tracking branch 'origin/develop' into feature/globebrowsing
2016-07-13 12:09:02 -04:00
2c005406fd
Fix horizon culling bug
2016-07-13 11:49:57 -04:00
828ec96251
Remove debugoption limitedByAvailableData from GUI
2016-07-12 15:46:41 -04:00
23fcaee67d
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-07-12 15:36:16 -04:00
6a482d4189
Improve dynamic limit of chunk level by available tile data
2016-07-12 15:34:51 -04:00
703ab140c1
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-07-12 15:02:10 -04:00
6e827e4337
Change back scene to use debug globe.
2016-07-12 15:01:54 -04:00
f1d8e42dff
Add TileProviderGroup and use to represent tile provides in same category
2016-07-12 14:59:35 -04:00
916916f82b
Fix bug that caused change in camera direction when switching between interaction mode.
2016-07-12 14:52:00 -04:00
0d1c042b0e
Improve performance of chunk level evaluator by projected area
2016-07-12 13:10:20 -04:00
edf114cda2
Enable resetting tile providers from GUI, i.e. reloading tiles
2016-07-12 11:20:57 -04:00
1d94dfeb1b
Prep presentation
2016-07-11 16:53:02 -04:00
bb344a57af
Increase default tile provider cache size
2016-07-10 19:49:08 -04:00
1e4247b80b
Reduce value rnage of delta time slider in GUI
2016-07-10 18:15:05 -04:00
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
5f0a5c2274
Merge
2016-07-09 17:38:57 -04:00
de3d76a30b
Add PixelRegion methods
2016-07-09 17:37:36 -04:00
36531a42af
Solve merge conflict from previous filter.
2016-07-08 19:26:29 -04:00
7bfdbedcd1
Change ordering of layer categories
2016-07-08 13:45:59 -04:00
6c10e89ec0
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-07-08 13:20:19 -04:00
8ec942d87a
Solve bug by removing unnecessary assert in IODescription cut.
2016-07-08 13:19:41 -04:00
60ca7db7a1
Merge commit 'eb34ad7aedf4450cdd59c1c6fcb5d66ed9e4eab0' into feature/globebrowsing
2016-07-08 13:00:03 -04:00
Erik Broberg