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 |
|
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
|
22a8f88195
|
add support for Menu.menuExists() and menu.menuItemExists()
|
2014-05-31 13:24:07 -07:00 |
|
Andrzej Kapolka
|
70afda6f86
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-05-30 15:19:34 -07:00 |
|
Stephen Birarda
|
d48a5dd305
|
don't force OAuthWebViewHandler to stay on top
|
2014-05-30 14:54:25 -07:00 |
|
Andrzej Kapolka
|
164192fb50
|
If the skeleton doesn't have eye joints (as with the Fuse models), make up
some positions based on the head and neck joints.
|
2014-05-30 11:03:46 -07:00 |
|
Andrew Meadows
|
4eb4334ed8
|
replace Model::setJointRotation() with JointState::setRotation()
|
2014-05-30 09:57:32 -07:00 |
|
Andrew Meadows
|
557d7d428b
|
minor rename and formatting
|
2014-05-30 08:28:15 -07:00 |
|
Andrew Meadows
|
e21dbd8726
|
rename updateWorldTransforms to computeTransforms
|
2014-05-30 08:20:11 -07:00 |
|
Andrzej Kapolka
|
b93b009cd8
|
Merge pull request #2953 from PhilipRosedale/master
Fixes having large yaw movements get head and body out of alignment with oculus
|
2014-05-29 19:00:37 -07:00 |
|
AndrewMeadows
|
5b74829318
|
Merge pull request #2955 from ey6es/cascade
Basic cascaded shadow maps for increased shadow draw distance.
|
2014-05-29 18:57:44 -07:00 |
|
Andrzej Kapolka
|
f42199b3e1
|
Merge pull request #2952 from Atlante45/click_drag_attach
Click drag attach!
|
2014-05-29 18:55:33 -07:00 |
|
AndrewMeadows
|
eed2cd28ef
|
Merge pull request #2956 from ZappoMan/perfstats
Fix Ray Intersection bug that was causing low FPS... also added more performance debugging
|
2014-05-29 18:48:38 -07:00 |
|
Atlante45
|
17e3bd6110
|
CR comments
|
2014-05-29 18:24:21 -07:00 |
|
Andrzej Kapolka
|
1eace78e47
|
Hide distances; they no longer need to be publicly visible.
|
2014-05-29 17:46:25 -07:00 |
|
ZappoMan
|
ac22cebde1
|
more performance stats debugging
|
2014-05-29 17:41:40 -07:00 |
|
Andrzej Kapolka
|
34091128d8
|
Distance tweak.
|
2014-05-29 17:22:59 -07:00 |
|
Andrzej Kapolka
|
67921c474e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cascade
|
2014-05-29 17:09:09 -07:00 |
|
Andrzej Kapolka
|
12beef7fec
|
Apply the new shadow distances to the models, too.
|
2014-05-29 17:08:36 -07:00 |
|
Philip Rosedale
|
d17eeaf35b
|
remove old oculus yaw offset, expand limit on head yaw
|
2014-05-29 16:50:13 -07:00 |
|
Andrzej Kapolka
|
0b4484a153
|
Trying a different way of determining the cascade threshold distances.
|
2014-05-29 16:49:51 -07:00 |
|
Andrew Meadows
|
6efa851104
|
minor cleanup + use 'fraction' instead of 'percent'
|
2014-05-29 15:44:27 -07:00 |
|
Atlante45
|
73f7390eaa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
|
2014-05-29 15:37:22 -07:00 |
|
Clément Brisset
|
6864fc3b99
|
Merge pull request #2951 from ZappoMan/perfstats
add improved detailed rendering and FPS debugging stats
|
2014-05-29 15:37:07 -07:00 |
|
ZappoMan
|
7e3ef34e6c
|
CR feedback
|
2014-05-29 15:34:20 -07:00 |
|
Andrzej Kapolka
|
391902f79b
|
Cascaded shadow maps for models.
|
2014-05-29 15:30:40 -07:00 |
|
Atlante45
|
0eb56000ef
|
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
|
2014-05-29 15:02:21 -07:00 |
|
Clément Brisset
|
21d1a18bd5
|
Merge pull request #2949 from AndrewMeadows/inertia
safe copy of JointState data
|
2014-05-29 14:44:05 -07:00 |
|
Brad Hefta-Gaub
|
2c8da2bda7
|
Merge pull request #2950 from wangyix/flighttime_fix_pull
Fix for unreasonable flight times
|
2014-05-29 14:43:15 -07:00 |
|
Atlante45
|
9c38beb4bc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
|
2014-05-29 14:34:18 -07:00 |
|
Atlante45
|
b91fd19f39
|
snapped attachment to center and scale them to fit
|
2014-05-29 14:30:28 -07:00 |
|
Andrew Meadows
|
603333f634
|
add JointState::restoreRotation()
|
2014-05-29 14:11:17 -07:00 |
|
Andrew Meadows
|
2e99d316ac
|
remove JointState::_translation
(use corresponding data in FBXJoint instead)
|
2014-05-29 12:52:05 -07:00 |
|
Andrzej Kapolka
|
09231f01f3
|
Retain "simple" shadows, supply cascaded as option.
|
2014-05-29 12:48:41 -07:00 |
|
ZappoMan
|
e6966c2155
|
add improved detailed rendering and FPS debugging stats
|
2014-05-29 12:12:23 -07:00 |
|