Commit Graph

927 Commits

Author SHA1 Message Date
Kalle Bladin a2342dde74 Add offset property to layer render settings. 2017-06-01 18:30:40 +02:00
Jonathas Costa c37cf66a52 Reflectance not working correctly yet. 2017-05-30 15:11:14 -04:00
Jonathas Costa 96e9067eed Changes to allow the correct reflectance inside ATM (code commented right now). 2017-05-30 14:23:06 -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
Jonathas Costa f134eb3531 Changed normals from Eye to Model space in GlobeRendering G-Buffer. Fixed and improved ground irradiance reflection. 2017-05-26 14:32:02 -04:00
Jonathas Costa 11679cc231 Added new debug system for ATM precalculated textures. Cleaned up some of the ATM shaders. 2017-05-24 18:38:47 -04:00
Jonathas Costa 0cd56d776c Merged master into NewAtmosphere. 2017-05-24 16:53:34 -04:00
Jonathas Costa 554cbcf32a Added gBuffer filling from Globebrowsing. Changed Earth Radius for ATM calculations. Removed unsused code. 2017-05-24 16:09:28 -04:00
Emil Axelsson 752081d31b feature/time-refactor (#294)
- Change Time class to become a non-singleton
- Move ownership of the current time to TimeManager(instead of singleton access).
- Store the Time as a Syncable in TimeManager instead of representing all member variables of Time as Syncables.
- Pass a Time object around in the update/render methods, so that renderables don't have to query the OpenSpaceEngine to know if time is paused or if it jumped.
- Introduce Timeline and Keyframe classes
- Make use of Timelineand Keyframeclasses in KeyframeInteractionMode and TimeManager
- Added basic unit tests for Timelineand Keyframe

Future work: Add interpolation schemes for keyframes. Possibly use keyframes+interpolation feature to tween/morph properties, or figure out if this should be a separate mechanism.
2017-05-22 14:01:08 +02:00
Jonathas Costa d632b41710 Merged master into NewAtmosphere. 2017-05-18 12:33:08 -04:00
Jonathas Costa 87843b57a5 Removed dummy texture units. Fixed empty ATM. 2017-05-17 14:11:26 -04:00
Jonathas Costa d7f541ec3b Changed part of the Atmosphere's shaders to work with Globebrowsing (Precision problems to be fixed). 2017-05-15 17:04:00 -04:00
Alexander Bock f4ad2ce4c2 More include file cleanup 2017-05-15 15:27:59 -04:00
Alexander Bock 302fa06067 More code cleanup 2017-05-15 14:39:48 -04:00
Jonathas Costa 587d5c8d75 Initial merging of ATM with Globebrowsing. Still missing code. 2017-05-12 16:46:12 -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
Emil Axelsson 4b38b33e18 Clean up code for planet radius and bounding sphere calculation (#289)
- Remove some power scaled coordaintes.
- Remove spice dependency from sphere geometry.
- Remove dead code.
2017-04-18 09:58:27 +02:00
Alexander Bock 481ee7d821 Add extra gdal header that removes external warnings 2017-04-17 18:40:19 -04:00
Alexander Bock 0db98afe6e - Enable caching of TileProviders at startup time
- Enable path tokens in filename for temporal tile providers
 - Add support for relative paths in temporal tile providers
 - Set the GDAL temp dir to the BASE_PATH
 -
2017-04-17 18:38:36 -04:00
Alexander Bock a0d30b80e5 Add YYYYMMDD_hhmmss time format 2017-04-17 18:36:10 -04:00
Alexander Bock dd32a812e1 Change tabs to spaces 2017-04-17 15:00:15 -04:00
Alexander Bock e350033dbd Fix crash with multiply registered classes 2017-04-15 14:54:49 -04:00
Alexander Bock 42d3de6fce Cherry pick commit by Erik Broberg 2017-04-14 18:07:32 -04:00
Alexander Bock 889545bd45 Compile fixes for PresentationSlideProvider 2017-04-14 18:06:46 -04:00
Erik Broberg d90a51297d Cherry pick commit by Erik Broberg 2017-04-14 17:58:24 -04:00
Kalle Bladin 8a617ee254 Feature/globebrowsing (#281)
* Solve bug related to corrupted texture tiles for certain sizes.

* Regard layer settings when sampling height map.

* Make Tile in to a class instead of a struct.

* Memory aware lru cache. Needs cleanup.

* Clean up and comment.

* Clean up and comment.

* Clean up

* Clean up and comment.

* Fix compilation error on Windows.

* Specify data type explicitly in GDAL xml config files for Utah height maps. Closes #242

* Update the key type for the memory aware lru cache and use a unordered map instead of a map.

* Solve pixel row size bug.

* Solve initialization bug.

* Add cache size as property of the globe browsing module.

* Use memory aware tile cache for text tile provider.

* Log GDAL errors as GHOUL messages

* Add the ability to toggle tile level limiting by available data

* Add ability to toggle GDAL logging

* Add lock guard to memory aware tile cache

* create base class rawtiledatareader that can be extended with different implementations than GDAL.

* Let GdalWrapper take care of global GDAL settings.

* Move iodescription to separate file

* Move some functionality from gdalrawtiledatareader to rawtiledatareader

* Move functionality from gdalrawtiledatareader to rawtiledatareader.

* GDAL is no longer a necessary dependency for the globebrowsing module. However to read tiles, the SimpleRawTileDataReader needs to be implemented. Otherwise GDAL is needed.

* Add ifdef check for GLOBEBROWSING_USE_GDAL

* Implement SimpleRawTileDataReader. Currently can only read pow 2 textures.

* Change ints to unsigned long longs

* Limit number of texture creations per tile provider per frame

* Solve linker error on windows

* Fix Windows build errors

* Fix crash in reading local patches

* Update lodglobe descriptions

* Abstract away overviews in gdal raw tile data reader

* Update Mars and Moon configs.

* Update screenshot script

* Update ghoul version

* Remove use of interaction depth below ellipsoid

* Normalize direction vector

* Use scale for distance swotch

* Go back to use of interaction depth below ellipsoid

* Fix comments on pull request.

* TileProviderByLevel error does not propagate up.

* Comment on mars and moon mod file

* Add model space cut off level as a property

* Update ChunkTile struct

* Minor clean up

* Go back tu constructor for ChunkTile
2017-04-13 10:14:47 +02:00
Alexander Bock 2345b82a78 Support path tokens in TemporalTileProviders (closing #283) 2017-04-07 22:40:30 -04:00
Alexander Bock 78b0d77101 Start removing warnings 2017-04-06 20:07:01 -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 b6ddf2a879 Fix clang compile error regarding std::abs 2017-03-04 20:53:13 -05: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 1689dc4047 Move the PropertyOwner name specification into the constructor and adjust accordingly 2017-03-02 18:25:13 -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 fbea8389c8 - Add check in style guide that prevents ‘using namespace’ in header files
- Remove using namespace ghoul::opengl from Globebrowsing and adjust
2017-03-01 21:02:33 -05:00
Alexander Bock 4e52f27f9e Remove Dictionary include with forward declarations 2017-03-01 19:20:00 -05:00
Alexander Bock 2500b5f72b Add Dictionary constructor to TileIndexTileProvider (closes #248) 2017-02-28 21:22:42 -05:00
Alexander Bock 6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock 283c83e37c Removing code analysis warnings
Start cleaning RenderEngine
2017-02-26 23:45:39 -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 8456087cf5 Add a style check that checks whether the correct GLM header is used
Adapted files to use the correct GLM headers
2017-02-14 13:12:59 -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
Alexander Bock 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock dbb599a5fa Separate base module into base and space 2016-12-13 14:43:44 +01:00
Alexander Bock 8da0684ae2 More cleanup for newhorizons and globebrowsing module 2016-12-07 21:56:59 +01:00
Alexander Bock b3db661277 Fix RenderableFoV for all missions (NewHorizons, Rosetta, OsirisRex)
Make the CacheManager not crash when ShadowCylinder shader is created in the same cache directory as RenderablePlanet
Remove excessive logging from TileDataset
2016-12-07 14:51:31 +01:00
Alexander Bock 8c2f2efcd1 Sort CMakeLists file
Set debugging correctly as globebrowsing dependency
Remove extra files
2016-12-05 13:35:45 +01:00