Commit Graph

4115 Commits

Author SHA1 Message Date
Jonathan Bosson 31e175232a the point on the surface of a body can now be described in spherical coordinates 2017-04-06 15:16:25 -06:00
Jonathan Bosson cbc8a2cb7e touch is more snappy, nice 2017-04-06 14:06:40 -06:00
Jonathan Bosson 4416707931 find traced rays intersection point on boundingsphere for direct touch interaction 2017-04-04 13:36:35 -06:00
Jonathan Bosson c6b8917d4b rotation correction when selecting new node 2017-03-31 16:27:06 -06:00
Jonathan Bosson 7b23c17b10 TuioEar can now detect a tap, implemented picking feature. If a selectable node is tapped at that is set as the new focusNode and the camera does a panning to that direction. If not will the camera zoom in towards the focusNode 2017-03-31 14:39:05 -06:00
Jonathan Bosson a5873c3002 tracing now works correctly with panning, there's an issue when OpenSpace aspect Ratio is not the same as the touch interface aspect ratio 2017-03-30 16:28:51 -06:00
Jonathan Bosson 55157ab429 Cleanup of TouchInteraction, selected can now only have one node per id 2017-03-30 13:05:10 -06:00
Jonathan Bosson 15450d9a9c all contact points are now traced into the scene to find a selection (distance calc still iffy with the rotation quat) 2017-03-29 15:16:05 -06:00
Jonathan Bosson 31f0960c42 improvements to the interpret function so the interaction is more intuitive (now using an immobile finger as the centroid on roll) 2017-03-29 12:38:49 -06:00
Jonathan Bosson 0ea349a70c convert cursor coordinates to ray direction in world space and calculate the distance from planets to the ray to get picking 2017-03-28 14:15:23 -06:00
Jonathan Bosson bc46190711 invert panning interaction after feedback 2017-03-17 14:43:09 -06:00
Jonathan Bosson 8c9027c6e5 allow for multiple interaction modes (mostly roll and zoom) 2017-03-17 12:11:08 -06:00
Jonathan Bosson 6a6b01096d cleanup of unneeded variables and working version of angle interpretation on roll 2017-03-17 11:29:49 -06:00
Jonathan Bosson 5fc52a3936 trying to use c.getAngles(centroid) for roll feature, not done yet 2017-03-16 17:02:16 -06:00
Jonathan Bosson 6a696bfc5c Cleanup on constructor of TouchInteraction 2017-03-16 15:31:24 -06:00
Jonathan Bosson 6e56862412 Fix on camera issues with it not following rotation/position of focus node. configSensitivites() only done during globebrowsing now 2017-03-16 15:28:46 -06:00
Jonathan Bosson fbd1dd0369 merge conflict in touchinteraction 2017-03-16 13:42:50 -06:00
Jonathan Bosson 2e3cd2e599 Touch interaction works decently on globebrowsing and newhorizon scenes. Pause globebrowsing to freeze focus nodes orbit 2017-03-16 13:40:29 -06:00
Jonathan Bosson 7989c7bbd9 allow globebrowsing.scene to render mercury 2017-03-16 13:39:42 -06:00
Emil Axelsson dd7bb15c30 Clean up touch interaction init list 2017-03-15 17:29:11 +01:00
Emil Axelsson a05834cab5 Merge branch 'feature/multitouch' of github.com:OpenSpace/OpenSpace into feature/multitouch 2017-03-15 17:26:21 +01:00
Emil Axelsson 0db8581630 Fix crash in initialization of touch interaction 2017-03-15 17:25:50 +01:00
Jonathan Bosson 6f03e5fe80 Bugfix to losing focus node on fast zooming 2017-03-15 10:22:00 -06:00
Jonathan Bosson b66d1f32c4 merge with develop 2017-03-14 16:39:15 -06:00
Jonathan Bosson 868ac5c6a6 first pass on roll (only uses three finger and x-pos atm), Friction and sensitivities are now part of struct ScaleFactor, sensitivities of zoom and globalRot scales with distance to focus node 2017-03-14 16:27:01 -06:00
Jonathan Bosson 1fa5220e3c minor changes during meeting 2017-03-14 12:44:43 -06:00
Alexander Bock a945c2f9b0 Update GDAL test to use new https format
Disable GDAL test until new Windows GDAL binary is included
2017-03-14 13:48:26 -04:00
Alexander Bock 5e2bf6e820 Let the ReferencingVerifier fail gracefully if a referencing identifier is not found 2017-03-14 13:47:55 -04:00
Alexander Bock 05057b963e Update Ghoul to use the new Freetype Git 2017-03-14 12:44:13 -04:00
Alexander Bock c6fbf6902a OSX compile fix 2017-03-14 11:16:43 -04:00
Jonathan Bosson bb050d5056 small modifications to sensitivity and panning 2017-03-13 23:09:17 -06:00
Alexander Bock 56b67a7461 Update Ghoul repository 2017-03-13 14:47:13 -04:00
Alexander Bock 56d4f891e4 Always throw an assertion in Unit Tests
Update Ghoul repository
2017-03-13 13:01:51 -04:00
Alexander Bock 1087a6b6f9 Always throw an assertion in Unit Tests
Update Ghoul repository
2017-03-13 13:01:27 -04:00
Alexander Bock e9f4684e91 Update Ghoul respository 2017-03-13 12:16:38 -04:00
Alexander Bock b74bff45cb Allow an Image SequenceParser to not return target times (used for the HongKang parser not returning any if Lorri is ignored 2017-03-13 11:23:42 -04:00
Alexander Bock 0d157ac165 Let FloatProperty and derived properties render at higher resolution in Onscreen GUI 2017-03-13 11:17:52 -04:00
Alexander Bock d61bb20992 Some more work on RenderableFov
Make registerting path tokens through Lua scripts work
2017-03-13 09:52:06 -04:00
Alexander Bock ea4d9c8e44 Cleanup of RenderableCrawlingLine
Cleanup of RenderableFOV
Add function to SpiceManager that does not return the light travel time
2017-03-12 16:05:14 -04:00
Alexander Bock dc40812df9 Fix warnings in code
Make OpenSpaceTest not flood the console on Jenkins
Fix Vec3 property to signal change correctly
Let RenderablePlanetProject correctly reload base map and height map
Update Ghoul
2017-03-11 11:26:25 -05:00
Jonathan Bosson 88db722006 ugly minHeightFromSurface check on focus node (only earth) 2017-03-10 16:18:15 -07:00
Jonathan Bosson 6b0b2070ef panning kinda works 2017-03-10 15:48:44 -07:00
Jonathan Bosson b1e507ce2b small cleanup and bugfix on gotNewInput() 2017-03-10 14:23:06 -07:00
Jonathan Bosson 7339b7c006 global rotation is now also based on velocity and friction. the input only adds to the specific velocity its interaction corresponds to 2017-03-10 13:45:52 -07:00
Alexander Bock 6e9d8103ac Do not enable KameleonVolume and ToyVolume on default to limit dependencies 2017-03-10 09:32:57 -05:00
Alexander Bock bcf92804b6 Updating Ghoul repository
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -05:00
Alexander Bock dbceb169f7 Only last-chance catch exceptions if we are running not in developer mode 2017-03-10 09:27:40 -05:00
Jonathan Bosson fc2a9b03d2 zooming now uses velocity to move the camera, rotation works with one touch input although currently with a direct new position 2017-03-09 14:43:18 -07:00
Jonathan Bosson cc269d6aff build fix on touchinteraction header file 2017-03-08 21:09:06 -07:00
Jonathan Bosson 9532e998b0 cleanup with using namespace in header files, start of new interaction class for touch input 2017-03-08 20:43:17 -07:00