Commit Graph

3428 Commits

Author SHA1 Message Date
Alexander Bock
01f0a864dc Yet more cleanup of Asset-related files 2020-05-06 20:33:27 +02:00
Alexander Bock
fa56e9ecf4 Some more cleanup of the assets 2020-05-06 16:21:47 +02:00
Alexander Bock
875404246f Add meta information to Asset class 2020-05-05 00:00:48 +02:00
Alexander Bock
b4eb168c76 Turning shared_ptr into pointers (part 1) 2020-05-04 23:21:18 +02:00
GPayne
fe0cce1e24 Fix for leap year that can affect asteroids only 2020-04-20 11:23:50 -06:00
GPayne
fbd5d3490a Leap year time fix for satellite tracking 2020-04-19 23:47:30 -06:00
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
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
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
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 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
4cfd51a268 Merged with master to prepare for pull request 2020-03-20 17:56:10 -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
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
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
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
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
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
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
GPayne
dbf78b1862 Fix for printing out correct line number if read error occurs 2020-03-04 12:17:06 -07: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
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
Alexander Bock
5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00
Alexander Bock
43851899c7 Cleanup of more copyright headers
Add debug groups and object names to the OpenGL objects in the framebuffer renderer
2020-02-13 14:59:13 +01:00
Micah Acinapura
eaa1b5025f cmake macos fixes 2020-02-12 23:38:21 -05:00