mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-19 03:19:06 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,850 Commits 86 Branches 46 Tags
66716a36a76ca63555cc55df2832405c98e94d2d
Commit Graph

6850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
PTrottier
bc1af5e210 Fix 404s in compiling instructions 
Add the docs in the path.
 2020-03-02 19:08:22 -05: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
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
Micah
166eee8b28 added moon trails to toggle key 2020-02-14 13:09:33 -05:00
Alexander Bock
ef7ff0adeb Add options for AVX, AVX2, AVX512 compilation options 
Compile fix for scene.cpp
 2020-02-13 19:57:17 +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
Alexander Bock
de24e81bda Fix copyright header information 
Remove TimelineView application
 2020-02-12 22:36:11 +01:00
Alexander Bock
3355e85385 All stars to be rendered with a fixed color (closes #910) 2020-02-12 22:02:10 +01:00
Alexander Bock
b09b936293 Add property to disable all mouse input (closes #1022) 2020-02-12 21:19:01 +01:00
Alexander Bock
7abac51223 No longer add .txt extension to all UrlSynchronizations 2020-02-12 21:08:02 +01:00
Alexander Bock
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
Alexander Bock
324f33dbb8 Small cleanups 2020-02-12 10:58:36 +01:00
Alexander Bock
3a80a6f2f7 Merge pull request #1085 from OpenSpace/issue/574 
Issue/574
 2020-02-12 09:37:42 +01:00
Alexander Bock
be8d850ef7 Some cleanup of timequantizer and its test 2020-02-12 09:36:09 +01:00
GPayne
2c11e87374 Updated renderablesmallbody with line width & refresh changes from satellites 2020-02-11 23:45:25 -07:00
GPayne
2650f8c6b6 Merged with master before pull request 2020-02-11 22:52:14 -07:00
Micah
838f543b6b updates to planet texture defaults, from carter 2020-02-12 00:33:01 -05:00
GPayne
2a6db6b1ee Removed unnecessary data fields in SBDB data file support 2020-02-11 22:16:49 -07:00
GPayne
f0d30724d6 Modified SSSB horizons files (including pha) to use http sync 2020-02-11 22:15:47 -07:00
Micah
f78c85882f update start dates for modis earth layers; fix bookmarks asset 2020-02-11 18:54:16 -05:00
Alexander Bock
b37698a705 Make it possible again to remove globe browsing layers (closes #960) 2020-02-12 00:42:59 +01:00