Commit graph

583 commits

Author SHA1 Message Date
samcake
3ecaaa5a85 After HIfi visit, Fix skinning from javascript
- Understood the skinning mechanism from an absolute transform in model
space that need to use a call to
//JointState::setRotationFromBindFrame(rotation, priority);

- This is not available from the javascript MyAvatar interface yet

- now require LeapMOtion SDK2.0.3 to support arms
2014-07-08 23:57:37 -07:00
samcake
4302accafd Improve the LeapMotion support
- fixed a bug on indexing the bones of the hand in the update of the
LEapmotion

- Still struggling with the correct joint assignment in the javascript,
visiting HIFI later today
2014-07-08 11:37:11 -07:00
samcake
d56ab21192 Clean file formating
- Clean the classes declaration and body for
DeviceTracker
MotionTracker
ControllerScriptingInterface / InputController
Leapmotion

- final bug remaining in the LeapOfFaith..js
THe orientation assigned to the skeleton joints doesn't work even though
all looks good.
2014-07-07 09:24:23 -07:00
samcake
abacefa723 Merge remote-tracking branch 'upstream/master' into 19734
Conflicts:
	interface/CMakeLists.txt
	interface/src/avatar/SkeletonModel.cpp
2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13 Merge branch 'master' of https://github.com/highfidelity/hifi into 19734 2014-07-05 18:10:59 -07:00
ZappoMan
59e8a98412 added example script 2014-07-03 12:05:18 -07:00
samcake
35977fbb0f After HIFI visit
Trying to improve the orientation coming from the leap

Shwo and tell to team of the current LeapMotion integration
2014-07-01 17:35:06 -07:00
samcake
a8b875d32e Merge remote-tracking branch 'origin/LeapMotion' into 19734 2014-07-01 03:20:26 -07:00
samcake
3ce455aba4 Support for LeapMotion and worklist 19734
-  Introduce the DeviceTracker class  to abstract all the possible
devices
- Introduce the MotionTracker ( a DeviceTracker ) that contains a
transform tree of joints
- Add Leapmotion class as a MotionTracker and the support for the
Leapmotion sdk in external
- Add InputController as the abstraction of a MotionTracker/Joint for
Javascript
2014-07-01 03:15:26 -07:00
Leonardo Murillo
21b839a8b5 Updating concertCamera script 2014-06-27 11:08:24 -07:00
Atlante45
5bea267cd2 make sitting points semi transparent 2014-06-27 10:54:57 -07:00
Atlante45
4281168fe9 Hide seat once you are seated 2014-06-27 10:03:50 -07:00
Atlante45
aad666be62 more sitting work 2014-06-27 09:48:27 -07:00
Atlante45
0b0cbdf340 Merge branch 'master' of https://github.com/highfidelity/hifi into sit_on_a_model 2014-06-26 11:35:29 -07:00
Philip Rosedale
64c89df5c1 Added another concert view 2014-06-26 10:52:37 -07:00
Philip Rosedale
c72e41dcd2 added Oculus angular velocity, moved sit icon up 2014-06-25 22:27:54 -07:00
Philip Rosedale
9af2b2b4dc removed commented code 2014-06-25 15:24:21 -07:00
Philip Rosedale
58d460da09 option to turn on/off string hair 2014-06-25 15:14:17 -07:00
Atlante45
cce6132a07 Add sitting points to the model properties display 2014-06-25 11:50:30 -07:00
Philip Rosedale
40dee3b39e Added JS calls for left/right estimated palm position on skeleton model, improved toy ball to use them 2014-06-25 05:24:22 -07:00
Philip Rosedale
88c01266ab more hair tweaks, don’t render in 1P, improved toy ball 2014-06-25 03:29:08 -07:00
Philip Rosedale
60c33c18c3 Expose mode shift period to JS, remove default value 2014-06-24 20:32:41 -07:00
Philip Rosedale
81e7f8e0a5 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-24 16:21:35 -07:00
Philip Rosedale
5bb2c3c62f Added in-world test tone JS file 2014-06-24 16:14:40 -07:00
Philip Rosedale
556578b8dc first pass - hair as vertlet strands 2014-06-24 09:30:11 -07:00
Atlante45
4561a6e326 Fixed voxel being deleted even though voxel tool is not selected 2014-06-19 18:10:06 -07:00
Atlante45
266dc6be3e fixed tooltip not disapearing when deleting model 2014-06-19 18:09:17 -07:00
Atlante45
4a4efb0bfa Don't glow models if you can't grab it 2014-06-19 11:11:08 -07:00
Atlante45
676141024a Added angular size limit to hydras too. 2014-06-19 10:46:06 -07:00
Atlante45
641b9e8253 Set minimum angular size too model selection 2014-06-19 10:43:25 -07:00
Atlante45
900024eefe More intuitive rotation UI 2014-06-18 14:22:46 -07:00
ZappoMan
ed32ca721a fix bug 2014-06-18 12:19:01 -07:00
Clément Brisset
7597191081 Merge pull request #3042 from ZappoMan/editModelFeatures
add support for changing the model URL of a model
2014-06-18 11:52:01 -07:00
ZappoMan
26075d9d26 add support for changing the model URL of a model 2014-06-18 11:29:56 -07:00
Atlante45
97dd695213 if model takes too much angular size, don't select it 2014-06-17 18:32:45 -07:00
Brad Hefta-Gaub
a51d2deec6 Merge pull request #3039 from Atlante45/snapping_model_rotation
Added snapped/smoothed rotation for models + tooltip
2014-06-17 17:42:25 -07:00
Atlante45
4467ee266d Added snapped/smoothed rotation for models + tooltip 2014-06-17 17:19:16 -07:00
Stojce Slavkovski
8b5e3486a3 Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-17 23:22:03 +02:00
Atlante45
f367e1840d Added a detached mode by default in inpect.js 2014-06-17 10:37:35 -07:00
Atlante45
b3b3a72946 Disable editModels.js mouse events when ALT is pressed. (no conflict with inspect.js) 2014-06-16 10:55:34 -07:00
Atlante45
d5aa12db7d Added models support to inspect.js 2014-06-16 10:55:05 -07:00
Stojce Slavkovski
f1e008853c Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-15 12:36:14 +02:00
Stojce Slavkovski
1959768513 Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-13 00:45:06 +02:00
barnold1953
db94ae7449 Invert hydra move view and thrust controllers to match consoles 2014-06-12 10:27:54 -07:00
Dev5
41b9c3b704 Removed empty update function 2014-06-11 09:06:00 -07:00
Dev5
faa5b1d2f2 Added simple tree placement script that has a UI similar to edit voxels. It grows big trees, dont grow near something important. 2014-06-10 17:18:32 -07:00
Stojce Slavkovski
e25817cd88 switch to amazon image resources 2014-06-10 00:08:10 +02:00
Stojce Slavkovski
2cde2f5303 use worklist for assets 2014-06-08 16:03:43 +02:00
Stojce Slavkovski
83b096ca1d myBalance
- balance formatting
	- symbol layout changes
2014-06-08 15:56:37 +02:00
Stojce Slavkovski
8de2bdfb99 expose account details via AccountScriptingInterface 2014-06-07 23:17:49 +02:00