Commit Graph

4386 Commits

Author SHA1 Message Date
Jonathas Costa a37b0388bb Merged master into atmosphere's branch. 2017-06-21 14:46:10 -04:00
Alexander Bock 681f9240e8 Update Ghoul repository 2017-06-21 11:41:13 -04:00
Alexander Bock 396ecbe5d5 Support new TemporalTileProvider time format 2017-06-21 08:52:12 -04:00
Jonathas Costa 5f4fa714e7 Remove debug code. 2017-06-20 14:35:59 -04:00
Jonathas Costa 6af9162ec2 Added a background exposure control for atm scenes. 2017-06-20 14:29:29 -04:00
Jonathas Costa 5ad00f6b45 Added fine controls for Mie Scattering as requested by Carter and John. 2017-06-16 16:15:36 -04:00
Jonathas Costa 2b99d1a2c2 Fixed bug introduced with new rendering method for G-Buffer. 2017-06-16 14:04:21 -04:00
Jonathas Costa 589e85cf58 Fixed CMakelists in ATM module. 2017-06-15 14:08:02 -04:00
Jonathas Costa 77015e4dd7 Added option to change rendering mode for ATM (temporarilly for tests). Fixed CMakelists in ATM module. 2017-06-15 14:03:02 -04:00
Jonathas Costa 93699ee362 Working on improving performance for ATM. 2017-06-14 17:55:06 -04:00
Jonathas Costa 5742e09335 Removed unused files and started cleanup of atm module for future merging with master. 2017-06-14 15:45:42 -04:00
Jonathas Costa 14155f6322 Fixed Fisheye rendering for RenderablePlanet atm. 2017-06-14 15:13:53 -04:00
Alexander Bock 9e4e681d1e More cleanup 2017-06-09 19:29:20 -04:00
Alexander Bock 0b289a4b77 Some cleanup 2017-06-09 18:49:20 -04:00
Jonathas Costa 59b7cf9648 Fixed position in G-Buffer from renderableplanet_vs. 2017-06-09 18:46:45 -04:00
Jonathas Costa 8c0494bd96 Disabled Ozone by default. 2017-06-09 18:28:57 -04:00
Jonathas Costa 70f798c2ef Fixed ATM in RenderablePlanet. No jittering anymore. Still needs reflectivity and clouds. 2017-06-09 18:26:19 -04:00
Alexander Bock f99d482526 Update Ghoul repository 2017-06-09 17:53:18 -04:00
Alexander Bock 4184740ce8 Code cleanup 2017-06-09 16:09:58 -04:00
Alexander Bock 03bec736ce Prevent a hard crash in case the scene file contains a syntax error 2017-06-09 15:36:49 -04:00
Alexander Bock 90c7eef724 Remove explicit coordinate transformation from RenderableConstellationBounds (closes #300) 2017-06-09 13:59:09 -04:00
Alexander Bock dd95757460 Ooops 2017-06-09 11:46:36 -04:00
Alexander Bock ec8fc7855f Add OpenGL Debug supression for Intel card GL_LINE_WIDTH warnings 2017-06-09 11:43:43 -04:00
Alexander Bock e1d13a95f0 Make Globebrowsing a default module (closes #324) 2017-06-09 11:33:07 -04:00
Alexander Bock 7775435eab Do not sort properties and propertyowners automatically (closes #269) 2017-06-09 11:26:38 -04:00
Jonathas Costa f487107eaa Added missing semicolon to vertex shader. 2017-06-08 13:21:04 -04:00
Jonathas Costa f967e8dd90 Changed atm scene back to Earth. 2017-06-08 13:11:09 -04:00
Alexander Bock f1b4d6ddc7 Update Moon WMS files to allow unsafe SSL 2017-06-08 12:46:31 -04:00
Alexander Bock 1169625783 Update GDAL version to 2.2.0 2017-06-08 12:30:16 -04:00
Jonathas Costa 3df6dbb036 Merge branch 'master' into feature/NewAtmosphere 2017-06-08 12:13:32 -04:00
Alexander Bock 9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -04:00
Alexander Bock 1e0240b47a Update Ghoul repository 2017-06-07 17:14:12 -04:00
Jonathas Costa a24d75e691 Merge branch 'feature/NewAtmosphere' of github.com:OpenSpace/OpenSpace into feature/NewAtmosphere 2017-06-07 15:16:51 -04:00
Jonathas Costa 784ae962d4 Ozone Layer (still needs work). 2017-06-07 15:14:49 -04:00
Alexander Bock ea44e7a26b Fix billboard rendering for satellite trails
Add necessary scene graph node for satellites into lodglobes/earth
Update base files of satellite TLEs
2017-06-07 12:42:21 -04:00
Kalle Bladin 5575f17b46 Feature/gdalcrashfix (#331)
Saving GDAL dataset values upon initialization of dataset to avoid calling GDAL functions afterwards since it can be done concurrently. Not done for the data reading since some (not all) GDAL dataset drivers support concurrent reading. The WMS driver does not support concurrent reading, which is why we only use one worker thread per AsyncTileDataReader. Perhaps something for the future if GDAL will ensure thread saefty.

Protecting GdalRawTileDataReader with mutex lock when initializing.

Make sure read only functions in RawTileDataReader are const.

Protecting ConcurrentJobManager with mutex lock when pushing and popping to finished jobs.
2017-06-07 16:30:41 +02:00
Michael Novén bb05ef46a1 Update json library to latest version (#322) 2017-06-06 13:44:27 -04:00
Gene Payne be1b211dfb Feature/satellites (#325)
* Initial commit of satellites test branch

* Modified code to work with batch TLE files from online links specified in .mod file. Does not yet auto-download the files.

* Added debug function to mod file for testing static points in orbit

* Fixed time offset bug that was corrupting satellite positions

* Minor changes for debug output and camera position.

* Changed to circle billboard for rendering satellite position

* Added satellite group name to each renderable title, and keyboard shortcuts for toggling visibility

* Added support for using ghoul luasocket lib to download latest satellite TLE files from celestrak.com

* Adding reference to updated Ghoul submodule containing luasocket changes

* Updating reference to latest Ghoul submodule in feature/satellites

* Updated reference to new ghoul version

* Updated reference to new ghoul submodule version for satellites

* Updated reference to new ghoul submodule version for satellits

* Updated versions of TLE files

* Added new Lua-accessible downloader available for scene loading

* Improved error handling for TLE files

* Updated submodule reference for ext/ghoul prior to luasocket addition

* Update SGCT reference
2017-06-06 13:42:38 -04:00
Alexander Bock 624fdd555f Merge pull request #327 from OpenSpace/feature/use-renamed-cmake-copy-macro
[Cmake] use renamed ghl_copy_files macro
2017-06-06 12:18:27 -04:00
Alexander Bock 5096e3ffad Update SGCT 2017-06-06 12:08:27 -04:00
Alexander Bock f1d8879a8b Merge remote-tracking branch 'origin/master' into feature/use-renamed-cmake-copy-macro 2017-06-06 11:52:03 -04:00
Alexander Bock c77fdf23ae Add predefined SGCT config for Spout sharing 2017-06-06 09:25:06 -04:00
Alexander Bock 6a380e9e53 Update the default atmosphere values for Mars
Fix spelling error
2017-06-06 09:20:19 -04:00
Jonathas Costa c28b782ab5 Improved HDR and initial implementation of the Ozone Layer (still needs some work). 2017-06-05 17:02:01 -04:00
Klas Eskilson 684327aced Update Ghoul version 2017-06-05 16:05:59 -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
Alexander Bock 013e448c36 Adding a Gui window to show the registered file paths (closes #329) 2017-06-03 14:29:33 -04:00
Alexander Bock ea8442d996 Enable networked specifications for ScreenSpaceImages 2017-06-03 13:38:02 -04:00
Jonathas Costa 8b1dc6ede0 Loading image settings from file. 2017-06-03 09:32:06 -04:00