Jonathan Bosson
0320bbd381
Merge branch 'develop' into feature/multitouch
2017-04-11 11:25:59 -06:00
Jonathan Bosson
60849e266b
small cleanup
2017-04-10 21:03:55 -06:00
Alexander Bock
2345b82a78
Support path tokens in TemporalTileProviders (closing #283 )
2017-04-07 22:40:30 -04:00
Alexander Bock
175b253a3c
Fix warning in RenderableKameleonVolume
2017-04-07 22:40:11 -04:00
Jonathan Bosson
d749d864a1
attempted to make zooming velocities smoother
2017-04-07 16:30:40 -06:00
Jonathan Bosson
2f6fede0ed
build fix
2017-04-07 11:30:54 -06:00
Jonathan Bosson
1c1570e854
defined a function to go from modelview to screen space view, comments on step-by-step method for the direct-touch solution
2017-04-07 11:12:02 -06:00
Alexander Bock
9f3bbe324d
Remove warnings
2017-04-06 23:19:23 -04:00
Alexander Bock
78b0d77101
Start removing warnings
2017-04-06 20:07:01 -04:00
Alexander Bock
d7e1a21551
Define compile options as private for supressing warnings
2017-04-06 19:38:10 -04:00
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
Emil Axelsson
a44978b90e
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
2017-04-04 14:26:17 +02:00
Emil Axelsson
a108ee1f8a
Fix requests from code review
2017-04-04 14:25:39 +02:00
Alexander Bock
a35609c6dd
Add new libCurl that supports SSL for new GIBS datasets
...
Update WMS specification of GIBS datasets
2017-04-03 15:53:56 -04: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
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
Emil Axelsson
b06864eefe
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
2017-03-16 16:35:29 +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
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
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
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