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
|
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
|
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 |
|
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 |
|
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 |
|
Atlante45
|
17e3bd6110
|
CR comments
|
2014-05-29 18:24:21 -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 |
|
Andrew Meadows
|
6efa851104
|
minor cleanup + use 'fraction' instead of 'percent'
|
2014-05-29 15:44:27 -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 |
|
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 |
|
Andrew Meadows
|
a898fcbf75
|
move details of getJointRotation() into JointState
also: remove unused getLeft/RightHandRotation() methods
|
2014-05-29 11:43:25 -07:00 |
|
Atlante45
|
37613f086b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
Conflicts:
interface/src/renderer/Model.cpp
|
2014-05-29 10:28:09 -07:00 |
|
Andrew Meadows
|
4cf5628783
|
move applyRotationDelta() from Model to JointState
|
2014-05-29 10:00:55 -07:00 |
|
Andrew Meadows
|
29e093e2e0
|
fix float literals to agree with coding standard
|
2014-05-29 09:20:01 -07:00 |
|
Andrew Meadows
|
86d6fd45de
|
safe copy of JointState data
|
2014-05-29 08:19:43 -07:00 |
|
Andrew Meadows
|
ec25982a58
|
add JointState::updateWorldTransform()
|
2014-05-28 17:51:17 -07:00 |
|
Andrew Meadows
|
b15b0fd96c
|
cleaner initialization of JointState
|
2014-05-28 17:31:07 -07:00 |
|
Andrew Meadows
|
9f2a4ae626
|
Make JointState a proper class
JointState gets a pointer to its corresponding FBXJoint
|
2014-05-28 16:49:39 -07:00 |
|
Atlante45
|
8cd101ac57
|
Added getJointCombinedRotation to Models
|
2014-05-28 15:57:38 -07:00 |
|
Andrzej Kapolka
|
c3f6cab199
|
Working on cascading shadow maps.
|
2014-05-28 15:20:09 -07:00 |
|
Andrew Meadows
|
e74da5f2a0
|
merge upstream/master into andrew/inertia
|
2014-05-28 14:55:08 -07:00 |
|
Andrew Meadows
|
13f11e1056
|
Remove "fromBind" arg in Model::setJointRotation
It was always set 'true'.
|
2014-05-28 14:53:32 -07:00 |
|
Andrzej Kapolka
|
4cbc550820
|
Fix arguments to applyRotationDelta.
|
2014-05-28 12:03:57 -07:00 |
|
Andrew Meadows
|
ae3b792a35
|
move face/head code from Model into SkeletonModel
|
2014-05-27 15:28:41 -07:00 |
|
Andrew Meadows
|
6efa417742
|
move hand/arm stuff from Model to SkeletonModel
|
2014-05-27 15:06:50 -07:00 |
|
Andrew Meadows
|
afc7660d74
|
merge upstream/master into andrew/inertia
|
2014-05-27 14:57:44 -07:00 |
|
Andrew Meadows
|
07544c7b43
|
removal of unused getNeckRotation()
|
2014-05-27 12:52:44 -07:00 |
|
Andrzej Kapolka
|
edaa251e5f
|
Provide option to disable avatar shadowing.
|
2014-05-27 11:43:34 -07:00 |
|
Andrzej Kapolka
|
70ab33b65b
|
Some tricks to avoid shadow artifacts: render back faces to shadow buffer,
use polygon offset.
|
2014-05-27 10:54:18 -07:00 |
|
Clément Brisset
|
6bb933996f
|
Merge pull request #2920 from ZappoMan/aacube
Add RayPick support for models
|
2014-05-24 17:03:59 -07:00 |
|
ZappoMan
|
9d9600aad5
|
fix max dimension
|
2014-05-23 22:08:31 -07:00 |
|
Andrzej Kapolka
|
ac2137c3b6
|
Fixed a couple copy and paste errors.
|
2014-05-23 16:56:10 -07:00 |
|