Commit Graph

189 Commits

Author SHA1 Message Date
Jonathas Costa ae9da60356 Improve Earth's night side. 2017-11-30 12:38:50 -05:00
Jonathas Costa a925d0646a Added lunar eclipses back. 2017-10-19 11:41:36 -04:00
Jonathas Costa d4cf4a5f22 Important comments for development. 2017-08-16 15:27:05 -04:00
Jonathas Costa 2d0da72a50 Merged master into atm. 2017-08-16 12:00:28 -04:00
Kalle Bladin 948507f20e Fix previous error appearing when accurate normals were used without height layers. 2017-08-16 14:35:56 +02:00
Jonathas Costa 758ee8bd6d Pull request changes. 2017-08-15 18:15:56 -04:00
Kalle Bladin 293cc3e063 Make use of accurate normals for globe atmosphere rendering 2017-08-10 10:49:14 +02:00
Kalle Bladin 1265de0d50 Only use padding for height layers 2017-08-08 14:02:56 +02:00
Kalle Bladin 902af5b321 Solve conflict 2017-08-07 10:24:30 +02:00
Alexander Bock cedd8adf0d Remove const qualifier from shaders as it causes shaders to not compile on Mac 2017-08-03 12:05:58 -04:00
Jonathas Costa 9812abb487 Added an option to have the sun following the camera when using an ATM. Removed unused code. Added missing comments. 2017-07-25 15:55:52 -04:00
Jonathas Costa eb87fa4390 Fixed accurate normals in globebrowsing after problematic merging. 2017-07-24 13:39:32 -04:00
Jonathas Costa 20003d5b32 Merged master into NewAtmosphere. 2017-07-21 15:02:24 -04:00
Alexander Bock 77b15724b5 More shader cleanup
Remove dedicated logs folder
Change openspaceengine to create logs folder automatically
2017-07-19 15:44:30 -04:00
Alexander Bock 88265a469d Cleanup of shader code 2017-07-19 01:27:01 -04:00
Alexander Bock e7b08e1e25 Cleanup copyright information in shaders 2017-07-18 16:24:57 -04:00
Jonathas Costa b0c65d416b Merged master into NewAtmosphere. 2017-07-17 16:22:33 -04:00
Kalle Bladin 4ecb98f06f Feature/globe shading (#363)
* Perform Oren Nayar diffuse shading on globes.

* Remove unused propertyowner

* Enable accurate normals for globes

* Use property for accurate normals.

* Correctly calculate height when scale is changed.

* Auto update line endings to LF in main.cpp and openspaceengine.cpp

* Clean up and comment

* Convert shader indentation to spaces (Wooooops..).

* Line endings

* Line endings and small fixes

* Line endings

* Clean up
2017-07-14 16:33:03 +02:00
Kalle Bladin 4f903ac030 Feature/globebrowsing (#334)
Layer support for globe browsing:

Add layers using the function openspace.globebrowsing.addLayer
Delete layers using openspace.globebrowsing.deleteLayer
Layer type does not necessarily have to be of tile type. For example solidcolor does not use tiles
Blend modes for layers are Normal, Add, Subtract, Multiply, Color
Layer adjustments to affect layers. The current only active one is chroma key to cut out a color from the layer. Transfer functions or clipping masks are examples of layer adjustments for the future.
Support for adding layer specifications for quickly accessing GIBS layers:
openspace.globebrowsing.createGibsGdalXml
openspace.globebrowsing.createTemporalGibsGdalXml
The arguments for these functions are currently strings. Would it be better to use a lua dictionary?
No data values for height layers are correctly regarded (can be seen on Earth. No longer bumps on the poles)
Other minor things:

Worked a bit on point globe to render globes at large distances. Currently not in use and doesn't have anything to do with the other things.
Concurrent job manager takes a thread pool as argument and not a pointer to one. This is because the concurrent job manager needs to have ownership of the thread pool for correct deinitialization. Will cause breaking change for users of concurrent job manager if merged in to master.


* Add ability to add layers programatically.

* Clean up

* Fix order of deletion in concurrent job manager and clean up

* Can create by level tile provider with empty dictionary.

* Add script to add GIBS datasets.

* Start working with layer adjustment

* Update mod files

* More work on point globe

* Add script to create temporal GIBS datasets.

* Update temporal tile provider to be able to take gdal descriptions without file path.

* Add adjustment property to layers.

* Rename adjustment layer

* Add adjustment code to all layer groups

* Remove caching of gdal datasets due to cluttering of folders

* Document layer support

* Update Mars mod

* Make Mercury great again.

* Cleanup and add blend mode Color

* Enable setting of layeradjustment and blend mode from mod files.

* No more use for grayscale color overlays. Use grayscale layer with color blend mode instead.

* Clean up mod files

* Clean up

* Clean up

* No need for grayscale layers. Reading grayscale in to rgb instead for color layers.

* Remove unused layer groups

* Correctly read to grayscale layers

* Update globe mod files

* Rename ColorOverlays to Overlays.

* Clean up

* Clean up

* Solve compilation error
2017-07-10 20:34:39 +02:00
Jonathas Costa 2b99d1a2c2 Fixed bug introduced with new rendering method for G-Buffer. 2017-06-16 14:04:21 -04:00
Jonathas Costa 0965ec95ba Merged Master into ATM. 2017-06-02 19:02:29 -04:00
Jonathas Costa 87c74629b2 Fixed bug in local patch normal transformation. 2017-06-02 15:58:40 -04:00
Jonathas Costa 5685b2183d Changed G-Buffer. 2017-06-02 12:29:09 -04:00
Jonathas Costa 7a4d2f8cb9 Fixed water reflectance and added gamma control to ATM (Still need the add the option to turn off the atm in globebrowsing). 2017-06-01 15:17:37 -04:00
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 554cbcf32a Added gBuffer filling from Globebrowsing. Changed Earth Radius for ATM calculations. Removed unsused code. 2017-05-24 16:09:28 -04:00
Jonathas Costa 587d5c8d75 Initial merging of ATM with Globebrowsing. Still missing code. 2017-05-12 16:46:12 -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 6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock 777e6c628f Change tabs to spaces 2016-12-03 01:21:54 +01:00
kalbl 0df09d23ad Add possibility to switch geographic position 2016-11-29 13:29:02 +01:00
Alexander Bock 328f57fb20 Fix error with pow being undefined when newValue becomes negative
Add wms.itn.liu.se as main server for CTX and Mola for Mars
2016-11-24 21:07:19 +01:00
Erik Broberg 9f7e1e05b2 Merge in feature/globebrowsing 2016-10-26 19:16:37 +02:00
Erik Broberg 6104b1fb58 Change ColorTextures to ColorLayers etc 2016-10-26 18:49:51 +02:00
Erik Broberg 9f65907579 Refactor chunk rendering related class names and file structure 2016-10-26 18:15:31 +02:00
kalbl d2539b7ac5 Solve bug that caused chunk splitting to not match up with layer blending. 2016-10-25 19:39:29 +02:00
Erik Broberg a050a58981 Solve merge conflicts 2016-10-25 19:05:37 +02:00
Erik Broberg d03093d1e9 Layers have LayerRenderingSetting which syncs to GPU automatically 2016-10-24 20:17:05 +02:00
Erik Broberg 0bdb22cc3a Refactor: CPU to GPU mapping of all Layer data 2016-10-24 12:22:23 +02:00
Erik Broberg bfbd331cdf Intermediate commit: Pre gpu layer refactorization 2016-10-21 15:19:59 +02:00
Erik Broberg 1df163a3b9 Intermediate commit: Mapping ChunkTilePiles between CPU and GPU. Height not working 2016-10-21 13:49:44 +02:00
Erik Broberg fd6dd16417 Intermediate commit: pre shader refactorization 2016-10-20 18:54:44 +02:00
Erik Broberg 2af1731583 Simple mapping of structs on CPU to GPU. See gpuChunkTilePile 2016-10-20 10:17:40 +02:00
Emil Axelsson b87539f678 Fix const-correctness in shaders and add texture init data 2016-10-20 09:39:49 +02:00
kalbl 8e972ff7d6 Account for tile pixel start offset and size difference when calculating height on globe. 2016-10-18 17:21:05 +02:00
Erik Broberg 612980974e GSLS TextureLayerSettings supports signed data 2016-10-17 15:33:16 +02:00