Commit Graph

579 Commits

Author SHA1 Message Date
Jonathas Costa c28b782ab5 Improved HDR and initial implementation of the Ozone Layer (still needs some work). 2017-06-05 17:02:01 -04:00
Jonathas Costa 83f0f9dd13 Move configuration back to NYU machine. 2017-06-04 11:46:05 -04:00
Jonathas Costa d4dcedc663 Fixed bug in fisheye rendering. 2017-06-04 11:44:24 -04:00
Jonathas Costa 8b1dc6ede0 Loading image settings from file. 2017-06-03 09:32:06 -04:00
Jonathas Costa fcb72e87d6 Fine tunning atm for Mars. 2017-06-02 21:21:44 -04:00
Jonathas Costa 0965ec95ba Merged Master into ATM. 2017-06-02 19:02:29 -04:00
Jonathas Costa 1dbb65059c Added missing data for Mars and stars rendering inside atm is based on observer height. 2017-06-02 17:37:25 -04:00
Jonathas Costa 87c74629b2 Fixed bug in local patch normal transformation. 2017-06-02 15:58:40 -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
Jonathas Costa cfdff58ea6 Added Gamma Correction Control. 2017-06-01 13:39:35 -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 f33a31b214 Improve blending. Enabled stars with ATM. 2017-05-29 00:58:19 -04:00
Jonathas Costa 1986e6992f Enabled milkway and stars. 2017-05-29 00:37:33 -04: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 741eb0c895 Added Aerial Perspective effect. Needs tweaking. 2017-05-25 16:50:59 -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
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 08fa7a9e7e Changing texture units use in ATM. 2017-05-17 10:08:49 -04:00
Jonathas Costa c2e4a94825 Small improvements. 2017-05-16 16:22:55 -04:00
Alexander Bock 38e2521743 Some more work on new LuaConsole
Add Inconsolata font
2017-05-16 14:47:44 -04:00
Jonathas Costa 46864ac744 Initial rendering of Mars with ATM (Lots of fixes still needed). 2017-05-16 14:41:01 -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
Jonathas Costa 8d95bf05ce Fixed Mars wrong radius. Added debug messages. 2017-05-12 17:53: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 0b1c6706dd Remove unused RenderablePath
Add documentations to base module classes
Change RenderableSphere to not use power scaled coordinates
2017-05-12 11:28:10 -04:00
Alexander Bock d597750398 Some more refactoring of the documentation feature 2017-05-11 13:56:06 -04:00
Alexander Bock 1d024dfff3 Use correct variable for Sun transformation 2017-05-10 15:39:42 -04:00
Alexander Bock fa7cee729c Add documentation to Keybinding doc file 2017-05-09 11:17:32 +01:00
Jonathas Costa 8d6fcf6635 Merged master into NewAtmopshere branch. 2017-05-01 11:33:54 -04:00
Emil Axelsson 28c82341bf Fix malformed mod files 2017-04-25 18:24:30 +02:00
Jonathas Costa dfba5e42a4 Removed intersect code from inside inscattering radiance. Fixed Mars ATM. Preparing to final G-Buffer. 2017-04-23 23:16:42 -04:00
Jonathas Costa 8615860686 Added Deferred Support for Atmosphere. 2017-04-19 13:45:06 -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 26e4354c40 Add cache to Moon textures 2017-04-17 18:36:50 -04:00
Alexander Bock d5307faf31 Clean earth.mod
Add Sea Ice concentration
2017-04-17 18:35:37 -04:00
Gene Payne 0a50043753 Merge pull request #285 from OpenSpace/feature/grouping
Feature/grouping
2017-04-13 13:31:07 -06:00
Alexander Bock 76aed0578c Feature/virtualproperty (#286)
* Add virtual property owner to OpenSpaceEngine

* Ability to add and remove virtual properties

* Do not try to render empty PropertyOwner name
Compile fix for iswaComponent
Add example in default.scene

* Delete virtual properties also in the OpenSpaceEngine dtor

* Make RenderablePlanet not crash if the nighttextures are not present

* - Add VirtualPropertyManager to manage ownership of virtual properties
- Only execute regex when it was necessary
-
2017-04-13 14:38:28 -04:00
Gene Payne 4a312c70b8 Merge branch 'master' into feature/grouping 2017-04-13 11:23:15 -06:00
GPayne bef3f2b652 Added tags to solar system planets for grouping functionality, and added scale property to some planets 2017-04-13 11:02:54 -06: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 644ba0a3e2 Added a temporal version of the VIIRS_SNPP_DayNightBand_ENCC (closing (#193) 2017-04-08 00:19:48 -04:00
Alexander Bock c3dd7a7c7b Merge branch 'develop' of http://github.com/OpenSpace/OpenSpace into develop 2017-04-04 13:22:09 -04:00
Alexander Bock 5364e2c835 Fix non-temporal VIIRS file
Enable caching on default for all Earth-based datasets
2017-04-04 08:54:41 -04:00
Emil Axelsson a44978b90e Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-04-04 14:26:17 +02: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
Jonathas Costa 9001eb0f96 Merged develop branch into NewAtmosphere branch. 2017-03-30 15:59:20 -04:00
Jonathas Costa 79726f70c8 Rewrite atmosphere all shaders. Add documentation and improve code. Fixed bugs. 2017-03-30 12:21:33 -04:00