Andrew Meadows
87350ad2d0
ragdoll simulation now in model-relative frame
...
(same rotation as world-frame, but translated to MyAvatar origin)
2014-08-07 11:45:06 -07:00
Atlante45
fb670275c2
Don't recompute unchaged transform
2014-07-28 16:42:16 -07:00
Andrew Meadows
2aaa628a67
send visible joint state when colliding as ragdoll
2014-07-24 08:42:34 -07:00
Andrzej Kapolka
02bf76240a
Multiply local light colors by material diffuse reflectance.
2014-07-22 18:30:28 -07:00
Andrzej Kapolka
4f87524821
Switched back to using uniforms for light parameters, as using the fixed
...
function state killed my frame rate. Also cleaned up some of the location
tracking.
2014-07-22 18:03:13 -07:00
Andrzej Kapolka
be028c2b01
Fixes for local lights.
2014-07-22 14:13:51 -07:00
Andrew Meadows
b8fb5e0298
namechange FromBindFrame ==> InBindFrame
2014-07-14 15:33:05 -07:00
Andrew Meadows
00544aa975
add JointState::_positionInParentFrame
2014-07-14 15:18:34 -07:00
Andrew Meadows
b012c0a008
update visible transforms right before render
2014-07-10 16:19:27 -07:00
Andrew Meadows
8fa7bf4fa0
rename: ParentFrame --> ConstrainedFrame
2014-07-09 16:43:46 -07:00
TonyPeng
ef4b95c6e0
Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays.
2014-07-09 13:27:42 -07:00
TonyPeng
56eadcb0dc
Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays.
2014-07-09 12:05:34 -07:00
TonyPeng
94e81da557
Added local lights to avatar. Added haze to voxel.
2014-07-08 09:44:28 -07:00
ZappoMan
8755e2d42e
CR feedback
2014-07-03 13:38:52 -07:00
Andrew Meadows
55dd2a4835
re-enable gravity effect on arm IK
2014-07-03 09:10:23 -07:00
Andrew Meadows
356a29c2fb
add AngularConstraint::softClamp() for hands
2014-07-03 08:40:34 -07:00
Andrew Meadows
9f5f79b2e3
merge andrew/ragdoll into andrew/bispinor
...
improved IK merged into AngularConstraint work
Conflicts:
interface/src/renderer/JointState.cpp
interface/src/renderer/JointState.h
2014-07-02 11:37:17 -07:00
Andrew Meadows
b018c1c4a5
Add copy ctor for JointState
...
create AngularConstraint for joints that need them (but not used yet)
2014-07-02 11:22:07 -07:00
Andrew Meadows
49d54dd6f0
Add Model::inverseKinematics() for stable hand IK
...
(removed constraint enforcement which was causing problems,
will add that back later)
2014-07-02 09:33:51 -07:00
Andrew Meadows
c12c869cdf
add "visible" transforms to JointState
...
also stubbery for using them in Model and SkeletonModel
2014-06-25 18:06:56 -07:00
Andrew Meadows
1b24a111fe
JointState::_rotationInParentFrame is now private
2014-06-25 09:56:18 -07:00
Andrew Meadows
9a2197a23c
draw skeleton shapes at at correct positions
2014-06-23 10:55:34 -07:00
Andrew Meadows
fbafcb6fd8
Fix distance constraint lengths
2014-06-19 11:46:09 -07:00
Andrew Meadows
a8c2003fe6
namechange SimulationEngine --> PhysicsSimulation
2014-06-19 08:34:12 -07:00
Andrew Meadows
d4b5550cda
Skeleton now creates VerletShape
2014-06-18 17:22:39 -07:00
Andrew Meadows
9e839f0980
Shape::getCenter() -> Shape::getTranslation()
2014-06-18 08:55:48 -07:00
Andrew Meadows
ecbf5043d7
code out of Model into base and derived classes
...
PhysicalEntity (base class) gets some shape management stuff
SkeletonModel (derived class) gets some boundary shape and
joint-shape stuff
2014-06-17 16:22:18 -07:00
Andrew Meadows
118717d96a
Shapes moved from Model into PhysicalEntity
2014-06-16 14:51:58 -07:00
Andrew Meadows
92159a7ed5
Shape::get/setCenter() instead of get/setPosition()
2014-06-16 08:43:27 -07:00
Andrew Meadows
7530f8ec1e
add way to enable Model for collisions
2014-06-15 17:57:42 -07:00
Andrew Meadows
718b98f70a
Only build shapes for models that need them
2014-06-12 18:15:44 -07:00
Andrew Meadows
5be470bcbc
add PhysicalEntity class
...
Model and RagDoll derive from PhysicalEntity
Shape gets back pointer to its Entity (shape sharing not possible)
CollisionInfo gets backpointers the shapes involved
2014-06-12 13:13:00 -07:00
Andrew Meadows
e0ebc61b25
merge upstream/master into andrew/ragdoll
2014-06-10 15:26:16 -07:00
Andrew Meadows
3c51ce76fc
Add simulationID to Model Shape and CollisionInfo
2014-06-10 15:24:17 -07:00
Andrew Meadows
e8b6338de9
Fix IK for hydra hands.
2014-06-09 15:40:29 -07:00
Andrew Meadows
8e536ebd9a
Use NULL Shape* for non-colliding joints in Models
2014-06-09 09:35:27 -07:00
Andrew Meadows
0addf3bae4
cleaup: remove some unused collision code
...
remove CollisionInfo::_type
remove unused Avatar collision response stuff
comment out some code that works but will probably be replaced
2014-06-06 14:36:05 -07:00
Andrew Meadows
1b2cd2e144
adding RagDoll scaffold
2014-06-05 11:07:35 -07:00
Andrew Meadows
7807388b08
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/renderer/Model.cpp
2014-06-04 14:28:23 -07:00
Andrew Meadows
e1cb88471f
add a comment
2014-06-04 14:19:45 -07:00
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
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
