Commit Graph

6894 Commits

Author SHA1 Message Date
Alexander Bock
5a94c486f0 Removing warnings 2020-04-14 22:32:26 +02:00
Alexander Bock
f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Alexander Bock
660533e840 Merge pull request #1123 from OpenSpace/feature/asteroids
Feature/asteroids
2020-04-14 15:01:35 +02:00
Alexander Bock
4f14e8476b Some code cleanup 2020-04-14 15:00:37 +02:00
Alexander Bock
84d3878be3 Ignore uniform warnings for cases when disabling the night layers on Earth (closes #1136) 2020-04-14 13:19:19 +02:00
Alexander Bock
d4218ad2fd Provide a default value of 60 for the export of the screenshot playback (closes #1134) 2020-04-14 11:20:02 +02:00
GPayne
29d68897d6 Added to satellites: group selection feature, segments fix 2020-04-13 16:43:27 -06:00
GPayne
b5114bd4fd Finalized segments algorithm and added object selection 2020-04-13 00:56:12 -06:00
GPayne
ed9a397549 Improved segments algorithm and fix for rendering errors 2020-04-12 22:43:54 -06:00
Alexander Bock
ba9012f5a9 Some cleanup of the code 2020-04-10 18:18:54 +02:00
Alexander Bock
1df557d2eb Small code cleanup 2020-04-10 17:46:59 +02:00
GPayne
a95d01d781 Implemented num orbital trail segments proportional to eccentricity 2020-04-09 13:33:30 -06:00
Alexander Bock
5646786331 Add the C 2019 Y4 asset from Dan Tell 2020-04-06 20:11:19 +02:00
Gene Payne
9884d7e25d Fix tabs vs spaces 2020-03-29 17:25:54 -06:00
GPayne
545a1314a5 Fix for issue #1122 forcing satellite files to download at each startup 2020-03-29 17:23:25 -06:00
Alexander Bock
a598d280c7 Merge pull request #1119 from OpenSpace/feature/imgui-touchhandling
Made imgui handle touch input as the webgui does
2020-03-28 20:45:25 +01:00
Alexander Bock
5e37cb5ac3 Some coding style cleanup 2020-03-28 20:45:14 +01:00
Alexander Bock
b2c7529ddf Amend previous commit 2020-03-28 20:42:19 +01:00
Alexander Bock
66716a36a7 Merge branch 'master' into feature/imgui-touchhandling
# Conflicts:
#	modules/touch/src/touchinteraction.cpp
2020-03-28 20:41:47 +01:00
Alexander Bock
c6d3a181b7 Merge pull request #1115 from OpenSpace/feature/continuous-pinch
Feature/continuous pinch
2020-03-28 20:34:33 +01:00
Alexander Bock
5209de5484 Some coding style fixes 2020-03-28 20:32:53 +01:00
Mikael
1c57f8ad21 Added more explanatory comments of the Touch-implementation 2020-03-25 10:01:56 +01:00
Mikael Pettersson
fa5bbc5a44 Added keymodifiers to touch event handling 2020-03-25 09:52:16 +01:00
Mikael Pettersson
3210dfd315 Made these changes only apply on Win32 builds 2020-03-25 09:52:16 +01:00
Mikael Pettersson
c9b5ffd021 Changed webbrowser to use cef touch events
rather than injected mouse events.
2020-03-25 09:52:16 +01:00
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