Zach Pomerantz
54b8a9278d
Guard model texs
2016-03-30 14:11:45 -07:00
Andrew Meadows
6eb177091b
overhaul of MotionState cleanup
...
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Seth Alves
c9ed36f9a6
include joint data in script properties
2016-01-04 12:31:45 -08:00
Seth Alves
83f60d6e97
make entity properties for model-entity joint-states
2015-12-23 15:43:50 -08:00
Anthony J. Thibault
3b1ba67a88
ModelEntityItem: Fix for incorrect animations with preTranslations
...
ModelEntities that were playing animations on models with local pivot offsets were not working correctly.
Specifically, the windmill animation in the demo domain.
We now compose a matrix containing all of the FBX's preTranslation, preRotation and postTranformations.
2015-12-16 17:08:22 -08:00
Anthony J. Thibault
617fda7832
ModelEntityItem: fix for incorrect joint mapping
...
This could happen when switching the animation url between fbx files
with different joint mappings. Only the first one would take effect.
This should fix the issue in the demo domain, with the contorted doll model.
2015-12-14 17:07:53 -08:00
Anthony J. Thibault
e9f529bf12
Entities: Removed Start Automatically property from Animation Group
...
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
2015-12-09 17:59:56 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Anthony J. Thibault
dd3f43705c
Fix for Model Entity animations.
...
Because rig->setJoint* methods take parameters in geometry space
the animations preRotation has to be applied manually.
2015-11-23 11:06:11 -08:00
Seth Alves
61269c3ce8
fix up entity constructors so that setProperties isn't called during the constructor
2015-10-23 13:52:50 -07:00
Andrew Meadows
fa17b77d70
move DIRTY_FLAGS out of EntityItem namespace
2015-10-15 09:34:09 -07:00
Atlante45
bcd148cb87
Construct entity properties at definition
2015-10-09 12:23:19 -07:00
Brad Hefta-Gaub
7a85e5b7a7
rename frameIndex to currentFrame
2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub
57cc7adbfe
standardize somethingChanged - CR feedback
2015-10-07 12:27:12 -07:00
Brad Hefta-Gaub
016bf4011d
cleanup
2015-10-06 16:07:36 -07:00
Brad Hefta-Gaub
1319642a59
fix frame jumping behavior on restart
2015-10-06 15:59:35 -07:00
Brad Hefta-Gaub
f30a94064f
make animation start/stop work
2015-10-05 15:50:55 -07:00
Brad Hefta-Gaub
8c8e83dc8e
more debugging on animation.running
2015-10-05 14:17:12 -07:00
Brad Hefta-Gaub
abdd9a6da4
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
2015-10-02 17:28:06 -07:00
Brad Hefta-Gaub
eb9078bda5
cleanup
2015-10-02 17:27:45 -07:00
Brad Hefta-Gaub
68dc303603
remove debug
2015-10-02 17:12:03 -07:00
Brad Hefta-Gaub
f618a2adfa
gak - get streaming working again
2015-10-02 17:06:32 -07:00
Howard Stearns
8153ad7f44
Merge pull request #5967 from AndrewMeadows/collision-group-hack
...
allow physical objects to be set collisionless
2015-10-02 16:08:52 -07:00
Brad Hefta-Gaub
57bf69cc48
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
...
Conflicts:
libraries/entities/src/ModelEntityItem.cpp
libraries/networking/src/udt/PacketHeaders.cpp
2015-10-02 14:19:15 -07:00
Brad Hefta-Gaub
cf2693e712
working fistFrame lastFrame
2015-10-02 08:31:22 -07:00
Brad Hefta-Gaub
815c4c69af
support for legacy properties
2015-10-01 14:52:28 -07:00
Brad Hefta-Gaub
91a27e3adf
get animation to actually run again
2015-10-01 13:29:07 -07:00
Brad Hefta-Gaub
aca25bd76e
connect up AnimationPropertyGroup to AnimationLoop
2015-10-01 11:05:16 -07:00
Andrew Meadows
381c98c4fa
fix for ModelEntityItem::shouldBePhysical()
2015-10-01 08:56:05 -07:00
Brad Hefta-Gaub
7c14f9ab93
Merge branch 'animationGroupSettings' of https://github.com/ZappoMan/hifi into animationGroupSettings
2015-09-30 21:46:28 -07:00
Brad Hefta-Gaub
6aa9ef9910
first cut at migrating animation settings into a property group
2015-09-30 20:51:25 -07:00
Seth Alves
50dd8eba45
Relay joint translations across network. Apply animation's root-joint translation to avatar.
2015-09-26 11:40:39 -07:00
Brad Hefta-Gaub
4e2cb00ec3
first cut at only returning type specific properties in getEntityProperties
2015-09-17 17:33:53 -07:00
Brad Hefta-Gaub
e1cb041576
first cut at adding desiredProperties to getProperties
2015-09-16 15:00:42 -07:00
ZappoMan
942958c4f1
only setJointState() if animation frame actually changed
2015-08-09 16:07:56 -07:00
ZappoMan
cec0f8ed1d
optimize ModelEntityItem::getAnimationFrame()
2015-08-07 13:43:57 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Andrew Meadows
18d0cb5158
cleanup of EntityItem ctors and friends
2015-07-16 17:48:28 -07:00
Atlante45
6c591131ba
Made Animations safe for resource reload
2015-07-10 12:01:51 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
ZappoMan
67df6e3c62
make READ_ENTITY_PROPERTY_TO_PROPERTIES() type safe
2015-05-12 16:24:16 -07:00
ZappoMan
98474376de
consolidate READ_ENTITY_PROPERTY() macros into single typesafe version
2015-05-12 15:59:45 -07:00
ZappoMan
83d212861d
make APPEND_ENTITY_PROPERTY type safe
2015-05-12 11:41:04 -07:00
Andrew Meadows
f0618501dd
fix non-physical kinematic motion
...
also can set objects collisionless again
2015-05-07 11:29:42 -07:00
Atlante45
837a0d3ba8
rename collision model in edit.js
2015-04-23 12:13:52 +02:00
Atlante45
9cec256142
Rename collisionModelURL members/methods
2015-04-22 21:16:09 +02:00
Atlante45
b446644549
Rename CollisionModelURL handle
2015-04-22 21:03:56 +02:00
Andrew Meadows
94c6053d52
fix formatting
2015-04-16 12:15:03 -07:00
Andrew Meadows
aec42cf2dc
enforce ShapeType agreement for ModeEntityItem
2015-04-14 15:39:49 -07:00
