66716a36a7
Merge branch 'master' into feature/imgui-touchhandling
...
# Conflicts:
# modules/touch/src/touchinteraction.cpp
2020-03-28 20:41:47 +01:00
c6d3a181b7
Merge pull request #1115 from OpenSpace/feature/continuous-pinch
...
Feature/continuous pinch
2020-03-28 20:34:33 +01:00
5209de5484
Some coding style fixes
2020-03-28 20:32:53 +01:00
fa5bbc5a44
Added keymodifiers to touch event handling
2020-03-25 09:52:16 +01:00
3210dfd315
Made these changes only apply on Win32 builds
2020-03-25 09:52:16 +01:00
c9b5ffd021
Changed webbrowser to use cef touch events
...
rather than injected mouse events.
2020-03-25 09:52:16 +01:00
cf7fcd9f03
Deleted UpperLimitInfo from satellites because only smallbody uses it
2020-03-24 17:20:49 -06:00
4cfd51a268
Merged with master to prepare for pull request
2020-03-20 17:56:10 -06:00
bdf859cd3c
Modified sbdb file read to handle line errors while keeping other data lines
2020-03-20 17:27:39 -06:00
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
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
d347733234
Fixed documentation errors to finish consolidating satellite/sbdb code
2020-03-11 10:09:23 -06:00
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
88a5dfe6b2
Resolved build errors from combining satellites & SBDB renderables
2020-03-10 14:13:17 -06:00
0808ebb1b4
Added documentation for the pinchzoomfactor property
2020-03-10 18:34:11 +01:00
42462ccfab
Minor cleanup for code clarity
2020-03-10 18:22:50 +01:00
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
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
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
0c70ee7a2d
Combining satellite & sbdb renderables under a common base class
2020-03-09 15:08:51 -06:00
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
c46beadcf9
style change
2020-03-06 10:49:31 +01:00
38d0f46ca6
Added a way to customize renderable distance labels unit
2020-03-06 10:49:20 +01:00
dbf78b1862
Fix for printing out correct line number if read error occurs
2020-03-04 12:17:06 -07:00
b222bb26db
Fixed upper limit bug and added new asset details to main asteroid belt
2020-03-02 15:45:52 -07:00
ce79a7031e
Implemented upper limit on objects to render from data file
2020-02-28 16:16:06 -07:00
048665e35e
Added checks to enforce 0.0 - 360.0 range on angles in JPL Horizons data
2020-02-26 13:34:33 -07:00
d0c9716872
Allowing OS to start even if the ring shader doesn't compile.
2020-02-21 11:36:06 -05:00
daf9b66328
Issue/timequantizertest ( #1092 )
...
* Added pre-2000 date tests to globebrowsing timequantizer
* Merge with latest master
2020-02-19 14:22:42 -07:00
5e29145395
Coding style cleanup
2020-02-14 19:37:06 +01:00
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
eaa1b5025f
cmake macos fixes
2020-02-12 23:38:21 -05:00
de24e81bda
Fix copyright header information
...
Remove TimelineView application
2020-02-12 22:36:11 +01:00
3355e85385
All stars to be rendered with a fixed color ( closes #910 )
2020-02-12 22:02:10 +01:00
7abac51223
No longer add .txt extension to all UrlSynchronizations
2020-02-12 21:08:02 +01:00
cf7b1f7505
Merge pull request #1086 from OpenSpace/feature/sssb
...
feature/sssb for Small SolarSystem Bodies (asteroids/comets/etc.)
2020-02-12 11:00:35 +01:00
324f33dbb8
Small cleanups
2020-02-12 10:58:36 +01:00
3a80a6f2f7
Merge pull request #1085 from OpenSpace/issue/574
...
Issue/574
2020-02-12 09:37:42 +01:00
be8d850ef7
Some cleanup of timequantizer and its test
2020-02-12 09:36:09 +01:00
2c11e87374
Updated renderablesmallbody with line width & refresh changes from satellites
2020-02-11 23:45:25 -07:00
2650f8c6b6
Merged with master before pull request
2020-02-11 22:52:14 -07:00
2a6db6b1ee
Removed unnecessary data fields in SBDB data file support
2020-02-11 22:16:49 -07:00
b37698a705
Make it possible again to remove globe browsing layers ( closes #960 )
2020-02-12 00:42:59 +01:00
81fda6c8db
Update Ghoul repository
...
Adapt to changes in Ghoul
2020-02-12 00:01:24 +01:00
eb83d49cf3
Merged with master
2020-02-11 13:59:51 -07:00
9d34a8d39e
Added final tests for checking start time
2020-02-11 07:20:29 -07:00
016baa7ce7
Added checks on resolution & start time restrictions, and tests for them
2020-02-10 22:07:39 -07:00
c8799dcc80
Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0
2020-02-11 00:21:42 +01:00
9cb1169d58
Merge pull request #1063 from OpenSpace/bug/macosbuild
...
macos compile and build (still needs ring shader const fix)
2020-02-10 23:39:39 +01:00
faccb3d948
conditional uniform set for macos
2020-02-10 16:55:21 -05:00
Alexander Bock