Commit Graph

6919 Commits

Author SHA1 Message Date
GPayne cf7fcd9f03 Deleted UpperLimitInfo from satellites because only smallbody uses it 2020-03-24 17:20:49 -06:00
GPayne 050029f16b Switched back to default scene in preparation for merge with master 2020-03-24 14:21:15 -06:00
GPayne 4f6d9836d8 Corrected plurality of GUI names 2020-03-24 14:17:23 -06:00
Gene Payne 0a2263cbb4 Update data/assets/scene/solarsystem/sssb/sssb_shared.asset
Improved GUI name

Co-Authored-By: Micah Acinapura <micahnyc@gmail.com>
2020-03-24 14:01:15 -06:00
Gene Payne 07c8efc8f6 Update data/assets/scene/solarsystem/sssb/sssb_shared.asset
Eliminated tab

Co-Authored-By: Micah Acinapura <micahnyc@gmail.com>
2020-03-24 14:00:47 -06:00
GPayne 4cfd51a268 Merged with master to prepare for pull request 2020-03-20 17:56:10 -06:00
GPayne b08759ff9d Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-03-20 17:45:22 -06:00
GPayne bdf859cd3c Modified sbdb file read to handle line errors while keeping other data lines 2020-03-20 17:27:39 -06:00
GPayne f2aea512c1 Updated assets with renderable trail params specific to content of each 2020-03-20 13:59:35 -06:00
GPayne ab42e97b2d Deleted 3 asteroid/comet data sets that are invalid for periodic orbits 2020-03-19 09:17:51 -06:00
Gene Payne 1ac7d20708 Updated pha asset with Gui name 2020-03-12 15:03:23 -06:00
GPayne 9017656f9b Fixed typo in asset name 2020-03-12 13:49:12 -06:00
GPayne bfdfd44910 Added GUI name title for sssb objects 2020-03-12 13:40:28 -06:00
liuloppan 4753d562f1 Merge pull request #1109 from OpenSpace/feature/custom-distance-labels
Added a way to customize renderable distance labels unit
2020-03-12 10:29:55 -04:00
liuloppan 12d4252a76 Merge pull request #1090 from OpenSpace/feature/linear-flight-factor
Exposing Linear Flight Factor as Property
2020-03-12 10:29:20 -04:00
Mikael Pettersson c9e35cbee4 Changed back from windows API calls to stl calls for timings
Should be the same under-the-hood but produces more
consistent code
2020-03-12 15:12:29 +01:00
GPayne 865a247ee9 Added new assets for asteroids and comets 2020-03-11 10:57:11 -06:00
GPayne 6583520023 Renamed main asteroid belt asset to be consistent with other data sets 2020-03-11 10:13:26 -06:00
GPayne d347733234 Fixed documentation errors to finish consolidating satellite/sbdb code 2020-03-11 10:09:23 -06:00
Mikael Pettersson fb7036c497 Made imgui handle touch input as the webgui does
Also removed imgui-handling code in touchinteraction
2020-03-11 13:23:46 +01:00
GPayne e7185ebcb6 Asteroid asset name change to be consistent with other data sets 2020-03-10 14:40:45 -06:00
GPayne 88a5dfe6b2 Resolved build errors from combining satellites & SBDB renderables 2020-03-10 14:13:17 -06:00
Mikael Pettersson 0808ebb1b4 Added documentation for the pinchzoomfactor property 2020-03-10 18:34:11 +01:00
Mikael Pettersson 42462ccfab Minor cleanup for code clarity 2020-03-10 18:22:50 +01:00
Mikael Pettersson 7b282ae77c Replaced magic value with a property and added
a quick and dirty aspect ratio to the pinch-zoom handling
2020-03-10 17:58:14 +01:00
Mikael Pettersson fd0a9743a2 Touch: Added a firstInput so that if we ever get more than
max amount of inputs in our Deque, we will still have our
first point stored (for pinching around a start-centroid mainly)
2020-03-10 10:25:31 +01:00
Mikael Pettersson a991a80525 Made pinch input default to continuous zoom
- Added a directTouch bool field to touch step function
- Some logic of how to gather accumulated zoom value
2020-03-10 09:57:07 +01:00
Mikael Pettersson b9210a65fd Changed (and simplified) some internal logic of the touch class 2020-03-10 09:52:30 +01:00
Mikael Pettersson 4e9aae3f78 Read out timestamps from actual touchevent
rather than doing it from the message pumping.

This produces less scattered timestamps as we now get the
timestamp from the touch monitor driver.
2020-03-10 09:09:58 +01:00
GPayne 0c70ee7a2d Combining satellite & sbdb renderables under a common base class 2020-03-09 15:08:51 -06:00
Gene Payne 754a7735f9 Issue/1097 (#1098)
* Added pre-2000 date tests to globebrowsing timequantizer

* Merge with latest master

* Added checks to enforce 0.0 - 360.0 range on angles in JPL Horizons data
2020-03-09 10:43:25 -06:00
stefanseibert c46beadcf9 style change 2020-03-06 10:49:31 +01:00
stefanseibert 38d0f46ca6 Added a way to customize renderable distance labels unit 2020-03-06 10:49:20 +01:00
Alexander Bock 11775e73f5 Merge pull request #1106 from PTrottier/patch-1
(Closes #1105) Fix 404s in compiling instructions
2020-03-06 09:21:09 +01:00
GPayne dbf78b1862 Fix for printing out correct line number if read error occurs 2020-03-04 12:17:06 -07:00
PTrottier bc1af5e210 Fix 404s in compiling instructions
Add the docs in the path.
2020-03-02 19:08:22 -05:00
GPayne b222bb26db Fixed upper limit bug and added new asset details to main asteroid belt 2020-03-02 15:45:52 -07:00
GPayne ce79a7031e Implemented upper limit on objects to render from data file 2020-02-28 16:16:06 -07:00
GPayne 048665e35e Added checks to enforce 0.0 - 360.0 range on angles in JPL Horizons data 2020-02-26 13:34:33 -07:00
GPayne 4afee46980 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-02-21 17:11:41 -07:00
Jonathas Costa d0c9716872 Allowing OS to start even if the ring shader doesn't compile. 2020-02-21 11:36:06 -05:00
Gene Payne daf9b66328 Issue/timequantizertest (#1092)
* Added pre-2000 date tests to globebrowsing timequantizer
* Merge with latest master
2020-02-19 14:22:42 -07:00
GPayne addfa65fa6 Merge with latest master 2020-02-19 09:25:33 -07:00
GPayne 79a3b42d06 Added pre-2000 date tests to globebrowsing timequantizer 2020-02-19 09:13:08 -07:00
Stefan Seibert e94a08f866 Added min and max 2020-02-18 10:59:36 +01:00
Stefan Seibert 6f63da86b4 Exposed linear flight factor as property 2020-02-18 10:59:29 +01:00
Micah 9c34a55e50 Update version number to 0.15.1 releases/v0.15.1 2020-02-14 16:35:06 -05:00
Micah 3b9ca3ef4e upping mercury magnetosphere sync version 2020-02-14 16:25:24 -05:00
Micah 610b8cb7c9 added alpha channel to kaguya layer; enabled new venus layers; upped gui hash 2020-02-14 16:22:22 -05:00
Alexander Bock 5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00