Commit Graph

4202 Commits

Author SHA1 Message Date
Jonathas Costa
1bf64f6056 Fixed old bug in calculation of atmosphere. 2017-05-05 09:16:44 -04:00
Jonathas Costa
8d6fcf6635 Merged master into NewAtmopshere branch. 2017-05-01 11:33:54 -04:00
Jonathas Costa
5d25f02878 Removed unsused code, started ellipsoid rendering for globebrowsing. Added deferred framebuffer. 2017-04-28 11:10:59 -04:00
Jonathas Costa
60af5506d2 Added temporary missing files. 2017-04-28 11:08:54 -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
Emil Axelsson
b141ad650b Merge branch 'master' of github.com:OpenSpace/OpenSpace 2017-04-25 20:25:50 +02:00
Emil Axelsson
28c82341bf Fix malformed mod files 2017-04-25 18:24:30 +02:00
Emil Axelsson
755d984667 Fix malformed sgct config 2017-04-25 15:16:54 +02:00
Alexander Bock
0ff91e896b Fix style guide check
Fix style guide in files
2017-04-24 15:31:32 -04:00
Alexander Bock
d6a4106c93 Feature/spout (#291)
* Add initial Spout implementation

* Some cleanup
2017-04-24 14:45:23 -04: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
3713ae3f8c Added missing files. Fixed wrong camera. Activated sunRadiance transmittance again. Improved performance. 2017-04-20 21:13:15 -04:00
Alexander Bock
4511d09b10 - Correctly detect isRegularRendering flag
- Render GUI in the PostDraw function in order render it not on the cubefaces

Closes #259
2017-04-20 18:00:31 -04:00
Alexander Bock
99a128b945 Only update ScreenspaceImage texture when it is dirty 2017-04-20 11:57:02 -04:00
Alexander Bock
28e99edd8e Compile fix with RenderableFieldLines
Update Ghoul repository
2017-04-20 11:56:52 -04:00
Jonathas Costa
33edda35f8 Increased pre-calculated texture sizes for atmosphere and disabled sunRadiance attenuation temporarily. 2017-04-19 15:58:06 -04:00
Jonathas Costa
8615860686 Added Deferred Support for Atmosphere. 2017-04-19 13:45:06 -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
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
Jonathas Costa
454e530ad6 Added deferred rendering support files. Fixed Volume rendering in framebufferrender. 2017-04-18 00:04:29 -04: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
26e4354c40 Add cache to Moon textures 2017-04-17 18:36:50 -04:00
Alexander Bock
78c109012a Fix shader compiler error with screenspace renderable 2017-04-17 18:36:29 -04:00
Alexander Bock
a0d30b80e5 Add YYYYMMDD_hhmmss time format 2017-04-17 18:36:10 -04:00
Alexander Bock
d5307faf31 Clean earth.mod
Add Sea Ice concentration
2017-04-17 18:35:37 -04:00
Alexander Bock
dd32a812e1 Change tabs to spaces 2017-04-17 15:00:15 -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
79aad3e245 Only link against Dbghelp library in Visual Studio 2017-04-17 13:53:45 -04:00
Alexander Bock
e12bb3ac70 Create MiniDump file on Windows in the case of a crash 2017-04-17 13:39:11 -04:00
Alexander Bock
c53bbf14be Add property and configuration option to disable the scene tag on a master node (closing #247) 2017-04-17 10:55:37 -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
Jonathas Costa
9e69a9b42e Fixed bug in the ground height ATM intersection and Sun color. 2017-04-13 21:20:02 -04:00
Jonathas Costa
e3d25fc831 Added HDR user selection. Fixed bugs in atm shaders. Changed calculation to double for better precision. Removed unused code. 2017-04-13 17:57:05 -04:00
Emil Axelsson
5589de995b Feature/domecasting (#288)
* Improve dome casting feature. Add basic GUI for domecasting.

* Reenable remote scripting from Lua console. Add more settings and debug information for domecasting.

* Do not try to reconnect to parallel connection forever

* Fix interpolation bug for dome casting with globe browsing interaction mode

* Show parallel connection properties in correct GUI

* Fix bug for dome casting with globe browsing interaction mode. Add property for time tolerance.

* Update header file

* Clean up dome casting code

* Remove obsolete lua functions from ParallelConnection.
2017-04-13 23:16:00 +02:00
Alexander Bock
a2af627835 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-04-13 16:15:26 -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
af4dfe3690 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-04-13 14:38:57 -04: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
7a7fef239c Made changes according to pull request feedback 2017-04-13 11:12:26 -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
Alexander Bock
665c9035a5 Make RenderablePlanet not crash if the nighttextures are not present 2017-04-13 11:52:29 -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
53e2aedd81 Compile fix 2017-04-12 16:00:49 -04:00