Commit graph

13486 commits

Author SHA1 Message Date
Andrew Meadows
f19b562e88 add JointState::setRotation(rotModelFrame) 2014-06-04 14:17:39 -07:00
Andrew Meadows
212ac13802 setRotation -> setJointRotationFromBindFrame 2014-06-04 14:10:28 -07:00
Andrew Meadows
323fa70cf3 remove last of "InModelFrame" qualifiers 2014-06-04 14:03:29 -07:00
Andrew Meadows
ccfd620c84 setJointPositionInModelFrame -> setJointPosition 2014-06-04 13:56:37 -07:00
Andrew Meadows
3af4b1b333 getJointPositionInModelFrame -> getJointPosition 2014-06-04 13:51:43 -07:00
Andrew Meadows
971268d4f2 setRotationInModelFrame -> setRotation 2014-06-04 13:46:08 -07:00
Andrew Meadows
b3cabb8156 applyRotationDeltaInModelFrame -> applyRotationDelta 2014-06-04 13:43:15 -07:00
Andrew Meadows
d8f5e10947 getPositionInModelFrame -> getPosition 2014-06-04 13:36:54 -07:00
Andrew Meadows
4a3fbfcdee getRotationInModelFrame -> getRotation 2014-06-04 13:34:58 -07:00
Andrew Meadows
4ae58153e0 computeTransformInModelFrame -> computeTransform 2014-06-04 13:31:31 -07:00
Andrew Meadows
d32e14ca04 renames of JointState data members 2014-06-04 13:27:28 -07:00
Andrew Meadows
b1b7f6bdc4 remove last world-frame transfoms from JointState 2014-06-04 12:03:01 -07:00
Andrew Meadows
d46a90d763 remove JointState::_combinedRotation
instead use JointState::_rotationInModelFrame
2014-06-04 11:56:20 -07:00
Andrew Meadows
19f0f453a5 remove JointState::setRotation()
instead use JointState::setRotationInModelFrame()
2014-06-04 11:52:07 -07:00
Andrew Meadows
5d8e3d447a remove JointState::getRota/PositionInWorldFrame()
instead: use getRotat/PositionInModelFrame() and do math
2014-06-04 11:36:00 -07:00
Andrew Meadows
729c01ddbf remove more getHybridTransform() calls 2014-06-04 11:25:38 -07:00
Andrew Meadows
30d936c15b getJointPosition -> getJointPositionInWorldFrame 2014-06-04 10:52:10 -07:00
Andrew Meadows
14e782e439 remove some JointState::getHybridTransform() calls 2014-06-04 10:42:04 -07:00
Andrew Meadows
d3f51fe38e FinalOrientation -> FinalOrientationInWorldFrame 2014-06-04 10:41:17 -07:00
Andrew Meadows
a1afcfd42c remove JointState::applyRotationDelta()
(use JointState::applyRotationDeltaInModelFrame()) instead)
2014-06-03 15:57:16 -07:00
Andrew Meadows
7f46e9d514 remove JointState::getJointRotation()
(use getRotationModelFrame() instead)
2014-06-03 15:42:38 -07:00
Andrew Meadows
e7f32c211b remove world-frame hand/palm set methods 2014-06-03 14:48:57 -07:00
Andrew Meadows
05af993262 Add more model-frame methods 2014-06-03 14:24:04 -07:00
Andrew Meadows
03bf1fe69d Add joint manipulations in model-frame 2014-06-03 14:04:09 -07:00
Andrew Meadows
f99489c157 rolling back previous change for IK instability 2014-06-03 10:40:30 -07:00
Andrew Meadows
d7be5faa9d unravel rotation code by giving proper names
The goal is: eliminate dependency on JointState::_combinedRotation
(which is joint-to-world) and store joint-to-model transforms instead
2014-06-02 14:43:25 -07:00
Andrew Meadows
9b3773fa3b remove 'fromBind' argument to getJointRotation() 2014-06-02 14:20:13 -07:00
Andrew Meadows
a62a270004 merge andrew/inertia into andrew/ragdoll
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/renderer/Model.h
2014-06-02 11:56:27 -07:00
Andrew Meadows
9e60b758df Made JointState transforms private.
Also changed some function names to be more descriptive.
Using "Hybrid" to describe frame with world-rotation + model-local-origin.
2014-06-02 11:34:59 -07:00
Andrew Meadows
8e7daed2b3 Merge upsrtream/master into andrew/inertia
Conflicts:
	interface/src/renderer/Model.cpp
2014-06-02 11:32:23 -07:00
AndrewMeadows
c3646d2421 Merge pull request #2969 from ZappoMan/silencewarnings
silence some unused variable warnings and move some debug code to only execute in debug mode
2014-06-02 11:04:18 -07:00
AndrewMeadows
a9a7580e8b Merge pull request #2971 from ZappoMan/editModelsInDefaultScripts
Edit models in default scripts
2014-06-02 11:04:03 -07:00
AndrewMeadows
8146520c35 Merge pull request #2967 from ZappoMan/editModelsInDefaultScripts
Added Edit Models to default scripts
2014-06-02 10:51:22 -07:00
ZappoMan
758df4f58b silence some unused variable warnings and move some debug code to only execute in debug mode 2014-06-02 10:43:50 -07:00
ZappoMan
cad5e12aad make editVoxels.js and editModels.js play nice together with the delete menu item 2014-05-31 14:05:05 -07:00
ZappoMan
8b51cd0d8a fix bug in Menu::removeAction() where we weren't removing the action key from the hash, memory leak, and other problems 2014-05-31 14:04:33 -07:00
ZappoMan
f92facea76 changed Models/Delete and Voxels/Delete to both use same menu item name of 'Delete' so that either option will correctly delete either. 2014-05-31 13:30:45 -07:00
ZappoMan
30a5048840 add editModels to defaultScripts 2014-05-31 13:24:23 -07:00
ZappoMan
22a8f88195 add support for Menu.menuExists() and menu.menuItemExists() 2014-05-31 13:24:07 -07:00
Brad Hefta-Gaub
a257af76dc Merge pull request #2966 from Atlante45/grab_attachements
First pass at grabbing attachment
2014-05-30 19:46:03 -07:00
Brad Hefta-Gaub
3038b193d1 Merge pull request #2965 from Atlante45/list_current_js_api
List current js api
2014-05-30 19:45:36 -07:00
Atlante45
4ffd51d9c4 First pass at grabbing attachment 2014-05-30 18:40:50 -07:00
Atlante45
2e5b45cfa1 print dressing 2014-05-30 17:48:35 -07:00
Atlante45
a661ea3179 Made API listing alphabetical, more clean and faster to print out. 2014-05-30 17:40:04 -07:00
Atlante45
2514906bd7 Fixed minor issue in currentAPI.js 2014-05-30 17:25:42 -07:00
Atlante45
e217ed7f75 Merge branch 'master' of https://github.com/highfidelity/hifi into list_current_js_api 2014-05-30 17:18:45 -07:00
Atlante45
9ca80cf4b3 Added script that lists the current JS API 2014-05-30 17:18:26 -07:00
Clément Brisset
a2ac7f7832 Merge pull request #2960 from ey6es/master
If the skeleton doesn't have eye joints (as with the Fuse models), make ...
2014-05-30 15:55:24 -07:00
Andrzej Kapolka
70afda6f86 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-30 15:19:34 -07:00
Andrzej Kapolka
6acd60fd55 Merge pull request #2964 from ZappoMan/modelPickingBugs
fix ray picking at distances
2014-05-30 15:19:07 -07:00