Commit Graph

3261 Commits

Author SHA1 Message Date
Kalle Bladin 6b9358f975 Update path to consider line fade and create proper bounding sphere for renderable model. 2016-08-09 19:59:51 -04:00
Erik Broberg a729e067ec Set scale of bennu and osiris-rex to be more reasonable wrt osiris-rex trail 2016-08-09 17:15:51 -04:00
Erik Broberg 0e610a3807 Fix Bennu positioning bug 2016-08-09 17:12:22 -04:00
Erik Broberg 50ef251838 Solve conflicts in mod files 2016-08-09 13:31:05 -04:00
Erik Broberg b02409eb6d Add osirisrex.mod and bennu.mod 2016-08-09 13:16:17 -04:00
Kalle Bladin a99040d661 Add osiris rex and bennu mod files. 2016-08-09 13:12:58 -04:00
Erik Broberg df1afdad36 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-09 12:25:48 -04:00
Kalle Bladin 08431d3d88 Add the ability to choose point steps in path rendering. 2016-08-09 11:49:43 -04:00
Kalle Bladin fb87842b1b Update path rendering to higher precision. 2016-08-08 22:35:37 -04:00
Erik Broberg a0924588fd Calculate RenderableModelProjection target position in double precision 2016-08-08 20:23:46 -04:00
Erik Broberg 87595b3452 Default sgct config is single 2016-08-08 20:22:24 -04:00
Kalle Bladin d128e09691 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-08 17:20:45 -04:00
Kalle Bladin 7ecc8d397f Use the new way of updating and syncing camera 2016-08-08 17:13:32 -04:00
Erik Broberg b780e694c4 Set openspace time to right before first instrument event 2016-08-08 16:52:07 -04:00
Erik Broberg 19ab82174d Parse basic instrument event times data 2016-08-08 16:44:50 -04:00
Erik Broberg 088bb8bca2 Loading event data incorrectly is a non-silent error 2016-08-08 12:53:57 -04:00
Erik Broberg 22d125c192 Add unimplemneted class InstrumentTimesParser 2016-08-05 13:25:02 -04:00
Erik Broberg e664929bf2 Allow SequenceTypes to have multiple parsers 2016-08-05 13:19:19 -04:00
Kalle Bladin d91dd3dbb7 Implement ability to update camera in two steps. still using old method. 2016-08-04 19:16:36 -04:00
Erik Broberg 596205e640 Fix compilation error from auto merge 2016-08-04 13:16:32 -04:00
Erik Broberg ab9af89a0b Resolve merge conflict 2016-08-03 11:27:16 -04:00
Erik Broberg 95da433397 Re-enable scene switching again after incorrect merge from develop 2016-08-02 20:48:53 -04:00
Erik Broberg d6aa4216cc Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-02 19:25:39 -04:00
Erik Broberg 64668e9feb Merge from feature/globebrowsing 2016-08-02 19:25:23 -04:00
Kalle Bladin 4e0bbe2da0 Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision 2016-08-02 19:14:52 -04:00
Erik Broberg 244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Erik Broberg e832b953c1 Reenable showing height intensities and resolution (after commit 06a5336961) 2016-08-02 18:09:14 -04:00
Alexander Bock 22c2e705f9 Added ESRI AHTSE test datasets (probably incorrectly) 2016-08-02 11:40:55 +02:00
Alexander Bock 06a5336961 Fix debugging with Clang
Removed include of vertex operations in fragment shader
2016-08-02 11:39:57 +02:00
Alexander Bock b72167a270 Add dependency calculation to the buildAllModuleCombination Jenkins script (closing #116) 2016-08-01 14:34:36 +02:00
Alexander Bock 5fb03eeb4a CMake generator fix for when no modules are selected 2016-08-01 14:13:42 +02:00
Alexander Bock c418536827 Add script to build OpenSpace with no modules enabled 2016-08-01 14:06:46 +02:00
Alexander Bock bf4989d396 Changing request URL for the Launcher
Update gitignore file
2016-08-01 13:59:10 +02:00
Alexander Bock 81c18b2b62 Updated URLs in code or comments 2016-08-01 11:05:50 +02:00
Alexander Bock 48b5ae9166 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-08-01 09:39:49 +02:00
Alexander Bock 93b30f5078 Some cleanup of RenderableShadowCylinder 2016-07-31 22:23:20 +02:00
Alexander Bock 3fb6d3aa84 Some cleanup of RenderableFov 2016-07-31 21:43:55 +02:00
Alexander Bock 484ef636c7 PerformanceManager will automatically delete SharedMemory object if it was left previously 2016-07-31 21:24:47 +02:00
Alexander Bock 7e98922bdd Enable rendering of IVecX properties in the GuiPropertyComponent 2016-07-31 21:24:12 +02:00
Alexander Bock 5f1fa3f755 Implement shadowing on RenderableRings 2016-07-31 20:22:29 +02:00
Alexander Bock 052e6007cd Rename static constants in Property class 2016-07-31 19:27:13 +02:00
Alexander Bock 6bd0ef7102 Make OpenSpaceModule a properties::PropertyOwner so that it can own properties
Add properties owned by OpenSpaceModule to the global settings engine (closing #104)
2016-07-31 19:26:55 +02:00
Alexander Bock 393f39de2e Let the module registration script return a lambda that will contain all modules, thus removing the static initialization order problem 2016-07-31 19:25:15 +02:00
Matthew Territo c159e027ee Fix for GUI on multi-node setups.
Reinstated tests for _isMaster and isRegularRendering() with GUI to prevent slave crashes
2016-07-29 14:27:58 -06:00
Matthew Territo 04eec9e2b7 Remove hardcoded set(BOOST_ROOT) 2016-07-29 11:44:10 -06:00
Alexander Bock e39a7983aa Generate keyboard mappings on default 2016-07-29 13:37:38 +02:00
Alexander Bock 405c66d6f8 Enable separate orientation setting for non-equatorial rings 2016-07-29 13:28:44 +02:00
Alexander Bock 9f1abc67a2 Enable setting the texture offset for rings
Enable setting the color-based transparency for rings
2016-07-29 13:23:43 +02:00
Alexander Bock 635ce1713b Add initial implementation of rings for Saturn 2016-07-29 07:54:16 +02:00
Alexander Bock 0c3b2c55d9 Removing more CppCheck warnings 2016-07-28 20:31:53 +02:00