Commit Graph

4297 Commits

Author SHA1 Message Date
Emil Axelsson 351a246f3a Add support for c closures in lua 2017-07-06 22:30:57 +02:00
Emil Axelsson ee36a97762 Improve asset lua interface. Simplify scene loading. 2017-07-06 16:40:35 +02:00
Emil Axelsson 8c642ab86d Remove include 2017-07-06 09:41:44 +02:00
Emil Axelsson b6d1690fb1 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-07-05 20:21:15 +02:00
Emil Axelsson 2e4b908318 Work on asset loading 2017-07-05 20:17:23 +02:00
Emil Axelsson 80222ba2d5 Make it possible to run OpenSpace without opening a scene 2017-07-03 18:02:37 +02:00
Alexander Bock de84bd0761 Fix OpenGL compile error 2017-07-03 11:58:58 -04:00
Alexander Bock 644e7fbe98 Update Ghoul repository
Make Jenkins less verbose on Windows and Mac
2017-07-03 11:43:21 -04:00
Alexander Bock cfdeea31ae Compile fix in Pixelbuffer 2017-07-03 11:20:31 -04:00
Alexander Bock 467a6c3542 Start migrating from GLEW to glbindings
Fix compile errors from wrong function parameters in OpenGL calls
2017-07-03 01:37:53 -04:00
Alexander Bock a65eba4d93 Merge branch 'master' into feature/cpp17-update 2017-07-01 17:54:43 -04:00
Alexander Bock 24485d8032 Use icon for Launcher 2017-07-01 17:53:23 -04:00
Alexander Bock 90a937e127 Merge branch 'master' into feature/cpp17-update 2017-07-01 15:47:00 -04:00
Alexander Bock 26f8e78b93 Update to using Visual Studio 2017 2017-07-01 15:46:44 -04:00
Alexander Bock 8a781a2028 Compile fix for Windows 10 SDK 2017-07-01 15:26:39 -04:00
Alexander Bock 2921b859cd Merge branch 'master' into feature/cpp17-update 2017-07-01 14:08:39 -04:00
eriksunden 0d05d30396 Feature/packaging (#333)
* Added proper CPACK structure and added generation of openspace.h header to add verisoning information in CMake.

* Packaging(ZIP on Windows, TGZ on UNIX) and installer creation(Windows Only via NSIS) is now working.

* Fixes for packing an archive on OSX.

* Add missing files in packaging
Add install setting to the globebrowsing module to copy required gdal_data
Update Credits

* Updated application icon
2017-07-01 14:04:37 -04:00
Alexander Bock 6401f691b9 Remove GCC warnings
Only use 2 threads for multithreaded compilation on Jenkins in Windows
2017-07-01 14:00:29 -04:00
Emil Axelsson 4318a2b709 Base orbit update on actual previous values instead of time jump concept. Fix OpenGL invalid value bug caused by negative buffer size. (#346) 2017-07-01 13:31:12 -04:00
Matthew Territo 46179922b7 Remove if guard on libtorrent's find_package(Boost). Enable Boost multithreading. (#341) 2017-07-01 12:51:19 -04:00
Alexander Bock e358d9d27c Update to C++17 2017-07-01 12:31:26 -04:00
Alexander Bock bb9cd19bb6 Update SGCT reference 2017-06-21 18:55:52 -04:00
Matthew Territo 1338a2d44f Update NASM path for Mac. 2017-06-21 16:40:27 -06:00
Alexander Bock 84fff83f22 GCC7 compile fix 2017-06-21 15:42:13 -04:00
Alexander Bock e7cf64bcf2 Update SGCT reference 2017-06-21 15:35:36 -04:00
Alexander Bock d61e6db61c Update SGCT reference 2017-06-21 15:24:10 -04:00
Alexander Bock 3536348bd0 Update SGCT repository 2017-06-21 14:30:27 -04:00
Alexander Bock 109d6563b5 Remove tinythread in SGCT and replace with std::thread 2017-06-21 14:14:22 -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
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
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
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
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
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