Commit Graph

4357 Commits

Author SHA1 Message Date
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
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
Alexander Bock 994ba32f44 Add the ability for LuaLibrary%s to reference script files that will be executed (closing #328)
Create documentation for Lua scripts
Add Lua script to check if a file exists
2017-06-02 17:36:00 -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
Alexander Bock bb3256d9e4 Add Lua callbacks that will walk a directory tree and return values as a table 2017-06-02 11:50:55 -04:00
Jonathas Costa 3638fbbe6e Added new tone mapping operator. 2017-06-02 10:55:38 -04:00
Klas Eskilson 3b2ca27562 [Cmake] Rename use renamed ghl_copy_files macro 2017-06-02 09:47:51 -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 b3cb3794ef Merge branch 'master' into feature/offset-slider 2017-06-01 18:32:36 +02:00
Kalle Bladin a2342dde74 Add offset property to layer render settings. 2017-06-01 18:30:40 +02:00
Alexander Bock 7f28adc386 Add additional trace information
Prevent crash if console shader is missing
2017-06-01 12:13:19 -04:00
Alexander Bock 3fc310800e Adding paper for submission to the Journal of Open-Source Software 2017-06-01 12:04:55 -04:00
Jonathas Costa 47cb1cb17f Changed Tone Mapping Operator. 2017-06-01 11:49:14 -04:00
Emil Axelsson 5c67189c8d Add possibility to check if OsEng is instantiated 2017-06-01 14:09:06 +02:00
Alexander Bock 997d9844cf Add additional trace information
Prevent crash if console shader is missing
2017-05-31 17:51:58 -04:00
Jonathas Costa e3e1155a0e Enabled G-Buffer for space items. 2017-05-31 17:12:44 -04:00
Alexander Bock 9ea188cb2e Fixing star shaders for Mac 2017-05-31 16:55:19 -04:00
Jonathas Costa c87527e792 Fixed bug in shader. 2017-05-31 16:41:02 -04:00
Emil Axelsson f231ca290e SceneLoader: Fix bug when loading directory with subdirectories 2017-05-31 11:38:33 +02:00
Emil Axelsson ad84202d28 FramebufferRenderer: Fix bug introduced when removing compiler warnings 2017-05-31 11:30:39 +02:00
Emil Axelsson 0af7fb820f Remove extra semicolon 2017-05-31 11:17:38 +02:00
Emil Axelsson 8ee9d09559 Merge branch 'master' of github.com:OpenSpace/OpenSpace 2017-05-31 11:06:38 +02:00
Emil Axelsson c7f6da7b0e SceneLoader: Print error when trying to load a non-existing directory 2017-05-31 11:05:58 +02:00
Jonathas Costa 0cb741e024 Improved code and changed some hdr parameters. 2017-05-30 15:42:25 -04: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