Commit Graph

430 Commits

Author SHA1 Message Date
Alexander Bock
f1d8879a8b Merge remote-tracking branch 'origin/master' into feature/use-renamed-cmake-copy-macro 2017-06-06 11:52:03 -04:00
Klas Eskilson
684327aced Update Ghoul version 2017-06-05 16:05:59 -04:00
Alexander Bock
994ba32f44 Add the ability for LuaLibrary%s to reference script files that will be executed (closing #328)
Create documentation for Lua scripts
Add Lua script to check if a file exists
2017-06-02 17:36:00 -04:00
Alexander Bock
bb3256d9e4 Add Lua callbacks that will walk a directory tree and return values as a table 2017-06-02 11:50:55 -04:00
Kalle Bladin
f51f293989 Feature/globebrowsing optimization (#310)
* Simplest possible PBO implementation.

* Add PBO class

* TileLoadJob owns raw tile data

* Working on a soluton to cache textures and reuse them

* PBO and cached textures working for one texture type. Color textures.

* Threadpool for tile requests uses LRU cache as queue

* Remove framesUntilRequestFlush

* Clean up

* Clean up

* Use prioritizing concurrent job manager

* Use TileTextureInitData to initialize RawTileDataReader.

* Class TextureContainer owns the textures to use for tiles.

* Using TileTextureInitData to determine if new caches need to be created.

* Remove WriteDataDescription

* Remove TileDataLayout

* Rendering many different layer types again

* TileProviderByLevel gives layergroup id to tile providers

* Comment away use of PBO

* Erase unfinished requests to make room for new ones

* Enable choice of PBO or not.

* Enable resetting of asynctiledataprovider

* Add the ability to use PBO and also load to CPU

* Update ghoul

* Solve culling issue.

* Texture pointer of Tile is now a raw pointer. Currently break single image tile provider and text tile provider.

* Add gpudata

* Move fetching of shader preprocessing data to LayerManager

* No comparisons to determine shader recompilation.

* Show the tile cache size in the GUI

* Clean up and comment.

* Solve bug where float is interpreted as NaN

* Enable ability to blend between layers again

* Fix single image provider

* Fix windows build error

* Fix OSX compile issue.

* Some clean up

* Showing correct texture data size

* Enable use of text tile providers again. No backgroupd image path however.

* Change cache size from GUI

* Clean up

* Solve osx compilation error.

* Update ghoul

* Make it possible to switch between PBO and not during runtime.

* Enable resetting of tile datasets

* change function module in moduleengine to identify module by name

* MemoryAwareTileCache is no longer a singleton

* Update ownership of properties for globe browsing

* Logging info about resetting tile reader.

* Logging info

* Fix requested changes

* Fix some compile warnings.

* Fix compilation warnings

* Add ability to blend values with blend parameter. Also define settings through lua dict.

* Fix some comments on pull request.

* Change formatting

* Change formatting

* Change formatting

* Fix pull request comments.

* Those are details

* Make Mercury great again.

* Make Earth great again.

* Solve conflict

* Test to sometimes use valueblending and sometimes not

* Not always use value blending

* Update ghoul

* Change from auto to explicit type.

* Update test for LRU Cache

* Include algorithm.
2017-05-30 15:37:05 +02:00
Alexander Bock
302d3eb64e Don't use outline fonts for Console
Update Ghoul repository
2017-05-19 16:39:58 -04:00
Alexander Bock
7d5a53fb5e Update SGCT 2017-05-10 09:18:29 -04:00
Alexander Bock
ddc9ef1bc5 Add abstract class to handle Handlebar-based documentation file generation
Apply Documented class to the InteractionHandler
Update Ghoul
2017-05-09 18:06:14 +01:00
Alexander Bock
63d607281a Update SGCT repository
Add property to toggle date rendering independent from rendering statistics
2017-05-09 10:30:35 +01:00
Alexander Bock
c2f9c66372 Update Ghoul
Update SGCT
2017-05-01 11:22:37 -04:00
Alexander Bock
8c6efe58e4 Fix broken Pause button 2017-04-26 10:57:07 -04:00
Alexander Bock
da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -04:00
Alexander Bock
0ff91e896b Fix style guide check
Fix style guide in files
2017-04-24 15:31:32 -04:00
Alexander Bock
28e99edd8e Compile fix with RenderableFieldLines
Update Ghoul repository
2017-04-20 11:56:52 -04:00
Alexander Bock
bf16c76add Feature/opengldebug (#290)
* Add InLIstVerifier

* Initial implementation of OpenGL debug messages

* Moving functionality into Ghoul

* Compile fix

* Update Ghoul repository
Make use of the moved OpenGL debug functions

* Update Ghoul to fix GCC and Clang compiler errors

* Add unit test for IntListVerifier
2017-04-18 14:29:23 -04:00
Alexander Bock
87aa34f83e Update Ghoul repository 2017-04-17 14:45:14 -04:00
Alexander Bock
acde7d2ff5 Update Ghoul repository (close #245) 2017-04-17 14:22:09 -04:00
Alexander Bock
51b420f2c4 Remove warnings
- Unit tests
  - core
  - onscreengui
  - debugging
  - newhorizons
Update Ghoul
2017-04-10 14:33:45 -04:00
Alexander Bock
2345b82a78 Support path tokens in TemporalTileProviders (closing #283) 2017-04-07 22:40:30 -04:00
Alexander Bock
9f3bbe324d Remove warnings 2017-04-06 23:19:23 -04:00
Alexander Bock
f07f246c39 Update submodules 2017-04-06 19:38:56 -04:00
Alexander Bock
a35609c6dd Add new libCurl that supports SSL for new GIBS datasets
Update WMS specification of GIBS datasets
2017-04-03 15:53:56 -04:00
Alexander Bock
05057b963e Update Ghoul to use the new Freetype Git 2017-03-14 12:44:13 -04:00
Alexander Bock
56b67a7461 Update Ghoul repository 2017-03-13 14:47:13 -04:00
Alexander Bock
1087a6b6f9 Always throw an assertion in Unit Tests
Update Ghoul repository
2017-03-13 13:01:27 -04:00
Alexander Bock
e9f4684e91 Update Ghoul respository 2017-03-13 12:16:38 -04:00
Alexander Bock
dc40812df9 Fix warnings in code
Make OpenSpaceTest not flood the console on Jenkins
Fix Vec3 property to signal change correctly
Let RenderablePlanetProject correctly reload base map and height map
Update Ghoul
2017-03-11 11:26:25 -05:00
Alexander Bock
bcf92804b6 Updating Ghoul repository
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -05:00
Emil Axelsson
4307c06d92 Compile fix 2017-03-03 18:19:10 +01:00
Alexander Bock
9d30d3323b Update Ghoul repository
Adapt to changed signature of ghoul_assert macro
2017-03-03 10:55:20 -05:00
Alexander Bock
c12bd7182b Some cleanup of ModuleEngine
Some cleanup of SettingsEngine
Some cleanup of SyncEngine
2017-03-02 17:24:44 -05:00
Alexander Bock
99f265c1ed Update Ghoul repository 2017-03-01 22:38:49 -05:00
Alexander Bock
2f2fa3b031 Update Ghoul repository to have the factory return unique_ptrs
Adjust accordingly
2017-03-01 22:03:48 -05:00
Alexander Bock
3274882ec2 Add checks for inline files in style checker 2017-03-01 21:17:12 -05:00
Alexander Bock
4e52f27f9e Remove Dictionary include with forward declarations 2017-03-01 19:20:00 -05:00
Alexander Bock
6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock
a08e0cea4e Update Ghoul repository to update GLM 2017-02-27 11:10:50 -05:00
Alexander Bock
3cd5bfe138 Update Ghoul repository 2017-02-25 18:41:20 -05:00
Alexander Bock
4f64cbb141 First step of main.cpp cleanup
Updated SGCT repository
2017-02-25 10:59:59 -05:00
eriksunden
87f5654bf8 Feature/openvr (#180)
* Updated SGCT to latest commit, to include OpenVR convenience functions.

* Made OpenSpace application support OpenVR. Check CMake option "OPENSPACE_OPENVR_SUPPORT" to enable this functionality.

* Merged latest SGCT to remove ogl_header dependency in SGCTOpenVR header

* Merged latest SGCT with minor Mac gl/glew include fix for including SGCTOpenVR as it relies on inclusion of gl headers.

* CMake fix in OpenSpace app for resetting variables after unchecking OPENVR_SUPPORT.

* Created separate SGCT config files for Oculus Rift and HTC Vive HMD

* Update Ghoul to enable experimental GLM features

* Update SGCT repository

* Updated to latest SGCT version for latest fixes.
2017-02-24 20:41:40 -05:00
Alexander Bock
2da100c001 Windows compile fix 2017-02-16 18:19:52 +01:00
Alexander Bock
0d03177d43 Feature/globebrowsingcleanup (#230)
* Initial restructuring of the Globebrowsing branch

* Update Ghoul repository
Fix include guards

* More cleanup

* Split texttileprovider subclasses into separate files

* Move TileProviders into namespace

* Convert static class methods into free functions

* Splitting tile subclasses into their own files
Remove `using namespace` from header file

* Split TileDataSet subclass into separate file
Update SGCT reference

* Move shader preprocessing data into internal class

* More Globebrowsing cleanup

* More cleanup
Remove unused Convexhull class
2017-02-15 21:20:05 +01:00
Alexander Bock
efe205c209 - Add initial tracing calls adapting to new Ghoul change of adding a
loglevel of ‘Trace’
- Adapt js and css files to show trace files in log
2017-02-14 18:10:28 -05:00
Alexander Bock
15867d6849 Cleanup of warnings in external libraries 2017-02-13 13:45:27 -05:00
Alexander Bock
70020e3de7 - Add style check for correct use of components and subcomponents in
include guards
- Disallow use of lower case characters in include guards
- Fix wrong components and subcomponents
2017-02-10 14:46:51 -05:00
Alexander Bock
23ea86949f Updated check_style_guide to test for include guards and copyright
notices
 - Fix include guards
 - Fix copyright header indentation
 - Update copyright years
2017-02-09 23:55:39 -05:00
Alexander Bock
6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Matthew Territo
77d0b38282 Update Ghoul with typo fix (#224)
Yey \o/
2017-02-08 23:41:11 -05:00
Alexander Bock
5f98ec2ca9 Update Ghoul repository
Make changes to accommodate the new Lua state class
2017-02-07 17:02:43 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00