mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 18:11:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,340 Commits 83 Branches 48 Tags
7bb83abe086a584e64773c633ecc669d18507830
Commit Graph

4340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Bosson 7bb83abe08 constructor looks more clean 2017-06-21 11:31:04 -06:00
Jonathan Bosson f94d58d738 improvement to tap interpretation by time instead of path size 2017-06-21 11:30:16 -06:00
Jonathan Bosson 7f39ebb49c cleanup and commented all code 2017-06-20 15:06:38 -06:00
Jonathan Bosson ad142580c2 cleanup 2017-06-16 17:57:08 -06:00
Jonathan Bosson b1be00a0eb added transparency, thickness and color control to the markers 2017-06-14 14:09:54 -06:00
Jonathan Bosson c53bcaac05 markers working, alpha and textures are not 2017-06-13 13:54:43 -06:00
Jonathan Bosson 5ef64aa513 gl_position is vec4, cleanup/tests 2017-06-09 17:48:07 -06:00
Jonathan Bosson 23f524d141 cleanup and shader compile fix 2017-06-09 15:43:35 -06:00
Jonathan Bosson d3f574ba23 render TouchMarkers, currently causes crash on runtime 2017-06-09 15:24:36 -06:00
Jonathan Bosson 58c6f17acf fix to duplicate refs 2017-06-07 11:45:55 -06:00
Jonathan Bosson d0492b2516 fix misinterpretation on roll, fixed step size in LMA gradient the projectionmatrix caused, fixed infinite spin bug on LMA failure 2017-06-06 14:17:53 -06:00
Jonathan Bosson de75f783ba using projectionMatrix instead of hardcoded projection, seems to have affected the gradient step size h (much larger now) 2017-06-01 16:56:26 -06:00
Jonathan Bosson 776d688899 improved performance by choosing step size more intelligently in gradient of LMA 2017-05-30 16:55:01 -06:00
Jonathan Bosson 8c5e33be13 refinement on gradient step size and fix to 'freeze' issue 2017-05-25 16:50:32 -06:00
Jonathan Bosson c3e1f54b45 stubb for TouchMarker class to render where the contact points are on the screen 2017-05-24 16:25:16 -06:00
Jonathan Bosson 1eeb01d22d use an iterative method to find a good step size to take in gradient 2017-05-24 16:03:51 -06:00
Jonathan Bosson f8b9310416 first pass on gradient step size that works with 1m - 1e10m 2017-05-23 17:10:04 -06:00
Jonathan Bosson 3386b5906f include scene.h 2017-05-19 14:00:55 -06:00
Jonathan Bosson 0a1cd285a3 merge fix 2017-05-19 13:04:28 -06:00
Jonathan Bosson 4cdd4ed931 Merge fix with master 2017-05-19 12:43:58 -06:00
Jonathan Bosson a230fbeea4 added a reset to default option on properties to the gui 2017-05-19 10:50:06 -06:00
Jonathan Bosson 202b31e7d1 decelerate is now called in a user chosen constant frequency, changed some minor default sensitivities 2017-05-19 10:32:42 -06:00
Jonathan Bosson 612b207d19 mute mouse input when we have touch input (for feedback on linux) 2017-05-18 19:19:26 -06:00
Alexander Bock 4adae3afa1 Merge pull request #309 from OpenSpace/feature/luaconsole 
Feature/luaconsole
 2017-05-18 15:21:25 -04:00
Alexander Bock 36be013578 Merge remote-tracking branch 'origin/master' into feature/luaconsole 2017-05-18 15:09:06 -04:00
Alexander Bock e7a48f150a Remove clang warning 
Make the opening speed DPI scaling-dependent
 2017-05-18 14:59:17 -04:00
Alexander Bock ba19348b58 Speed up console opening (and make it depenent on the current frametime, rather than the average) 
Make the ESC key close the console
Make the Numpad Enter key work the same as regular Enter key
 2017-05-18 14:53:03 -04:00
Kalle Bladin 8f415ff907 Remove unnecessary misstake 2017-05-18 14:04:31 +02:00
Kalle Bladin b46a5be65a Merge branch 'feature/luaconsole' of github.com:OpenSpace/OpenSpace into feature/luaconsole 2017-05-18 13:57:32 +02:00
Kalle Bladin 28bdf4eb32 Fix OSX issues 2017-05-18 13:57:11 +02:00
Emil Axelsson 187b7b6506 Add missing includes 2017-05-18 12:59:29 +02:00
Emil Axelsson abaed50afb Add keybindings 2017-05-18 10:57:41 +02:00
Emil Axelsson 05a541aacb Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/luaconsole 2017-05-18 10:17:37 +02:00
Matthew Territo 0a1101d0e4 Missing Destructors: Issue #307 (#308) 
* Adding empty destructor for Scene.

* RenderEngine Destructor empty/no longer default

* Create empty ~ScreenLog
 2017-05-18 10:13:20 +02:00
Emil Axelsson 4671928754 Merge branch 'master' of github.com:OpenSpace/OpenSpace 
Conflicts:
	modules/base/rendering/multimodelgeometry.cpp
 2017-05-18 09:39:15 +02:00
Emil Axelsson d2d6810451 Change include to cstring 2017-05-18 09:38:21 +02:00
Emil Axelsson c97813c851 Linux compile fix: add missing include 2017-05-18 09:31:25 +02:00
Jonathan Bosson bae7110f30 new ideas on how 3+ fingers should work, needs feedback 2017-05-17 16:55:23 -06:00
Jonathan Bosson b7da01f322 remove debug print 2017-05-17 15:17:17 -06:00
Jonathan Bosson 195dd2e1b5 fix bug that caused slerp time to be too quick 2017-05-17 15:15:55 -06:00
Jonathan Bosson bbccda7d8c onlyPan on by default for easier direct-manipulation with 3+ fingers 2017-05-17 14:49:50 -06:00
Jonathan Bosson d626684d5f dynamic step size in gradient LMA is now based on planet size as well to make for smooth interaction on huge planets 2017-05-17 14:49:27 -06:00
Emil Axelsson d7e46e2824 Formatting 2017-05-17 21:34:14 +02:00
Emil Axelsson 4fcb92385c Fix inconsistent order of members in header file and initialization 2017-05-17 21:28:20 +02:00
Emil Axelsson 1eee40887d Tweak animation and appearance of lua console + Remove some duplicate code 2017-05-17 21:21:51 +02:00
Jonathan Bosson 92274563a4 removed finger scaling on zoom/roll, reintroduced roll interpret with all fingers, rescaled sensitivities to fit new method, fix build issue with ghoul_condition 2017-05-17 13:11:15 -06:00
Jonathan Bosson 7f82454114 small clean of LMA 2017-05-17 13:09:15 -06:00
Jonathan Bosson d8f0f9d6fd Merge branch 'feature/multitouch' of https://github.com/OpenSpace/OpenSpace into feature/multitouch 2017-05-17 11:11:33 -06:00
Jonathan Bosson 22dd7f2fb0 fix to GUI toggle with keyboard+touch inconsistency 2017-05-17 11:10:55 -06:00
Jonathan Bosson 63c02a72ae build fix 2017-05-17 11:00:54 -06:00