Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Menithal
dc5e374485
Merge remote-tracking branch 'upstream/master' into 21484
2017-08-17 22:28:43 +03:00
Menithal
982d4a451f
Updated Protocol to add allowTranslation
...
There still is a bug for the value no actually updating
2017-08-08 23:47:37 +03:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
Stephen Birarda
53e6a77fcc
cleanup EncodeBitstreamParams to use nodeData when possible
2017-03-24 13:41:36 -07:00
Stephen Birarda
b08bfe93f4
change lastViewFrustumSent to lastQuerySent
2017-01-18 14:58:36 -08:00
Seth Alves
6fe35ac0da
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
2016-12-12 16:04:41 -08:00
Seth Alves
51f6b5af78
code review
2016-11-05 10:35:21 -07:00
Seth Alves
339d6a55cf
getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation
2016-11-03 10:06:07 -07:00
Seth Alves
844cc03dcb
fix names of model-entity joint setters
2016-11-02 10:24:01 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
Andrew Meadows
8009d23f70
more STATIC_MESH and dynamic overlap prevention
2016-06-22 15:20:45 -07:00
Brad Hefta-Gaub
91334d6a39
Merge pull request #7664 from ZappoMan/reduceJointProperties
...
only export joint values if they've been explicitly set by scripts
2016-04-14 15:30:04 -07:00
Brad Hefta-Gaub
b48503a82d
only export joint values if they've been explicitly set by scripts
2016-04-13 19:52:50 -07:00
Zach Pomerantz
7a15339631
Use AnimationCache for models
2016-04-13 15:44:47 -07:00
Zach Pomerantz
54b8a9278d
Guard model texs
2016-03-30 14:11:45 -07:00
Brad Hefta-Gaub
4ebb114a8e
also fix joint simulation from 3rd party editors
2016-03-25 11:43:32 -07:00
Anthony Thibault
95f821d61a
Merge pull request #6732 from sethalves/set-model-entity-joints
...
hook up a way for scripts to set model-entity joint state
2016-01-05 17:31:18 -08:00
Andrew Meadows
9ab5ef358a
remove dangling whitespace
2016-01-05 16:44:36 -08:00
Seth Alves
83f60d6e97
make entity properties for model-entity joint-states
2015-12-23 15:43:50 -08:00
Seth Alves
d878dde952
whitespace
2015-12-22 17:57:25 -08:00
Seth Alves
84bcfb7d71
hook up a way for scripts to set model-entity joint state
2015-12-22 17:43:01 -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
Seth Alves
a59af2c1b2
Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready
2015-12-10 09:03:57 -08:00
Seth Alves
d09f70239c
make entity-tree a global. change how network-requests to load model geometry are triggered
2015-12-10 09:03: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
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Stephen Birarda
4573e5c59e
resolve conflicts on merge with upstream/master
2015-11-30 13:32:38 -08:00
Seth Alves
ca75802b9c
unmangle merge
2015-11-26 06:43:28 -08:00
Stephen Birarda
5a7b0dd1ad
put the parsed model URL in ModelEntityItem
2015-11-24 11:46:51 -06: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
Stephen Birarda
4f6da68a1f
add getJointPosition and getJointRotation for entities
2015-10-22 16:25:28 -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
6eeb64b032
CR feedback
2015-10-07 11:23:24 -07:00
Brad Hefta-Gaub
1319642a59
fix frame jumping behavior on restart
2015-10-06 15:59:35 -07:00
Brad Hefta-Gaub
eb9078bda5
cleanup
2015-10-02 17:27:45 -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
91a27e3adf
get animation to actually run again
2015-10-01 13:29:07 -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
6c591131ba
Made Animations safe for resource reload
2015-07-10 12:01:51 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -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
Andrew Meadows
5b81b5b11b
removing SHAPE_TYPE_CONVEX_HULL from entities lib
2015-04-14 14:56:32 -07:00
Seth Alves
6e3be26013
attempting to figure out why physics motion object doesn't get updated when collision model url changes
2015-03-24 15:28:21 -07:00
Seth Alves
96d94e1b09
collision model url
2015-03-07 20:31:04 -08:00
Andrew Meadows
4581802532
explicitly flag virtual functions as such
2015-02-11 13:03:22 -08:00
Andrew Meadows
12543cae75
initial add of ModelEntityItem::_shapeType
2015-02-09 12:43:56 -08:00
Andrew Meadows
450713fdaa
Entitis support new (pending) API for ShapeInfo
2015-02-08 15:08:50 -08:00
Andrew Meadows
9da6b623a3
move shape polymorphism to ModelEntityItem
2015-01-30 16:25:35 -08:00
ZappoMan
31f72107da
remove support for old pre-entity svo files
2015-01-23 09:26:48 -08:00
ZappoMan
49e350fab2
Merge branch 'master' of https://github.com/highfidelity/hifi into animationFrameIndex
2014-12-29 14:01:35 -08:00
Andrew Meadows
b03e6c53e1
fixing derived classes to use new EntityItem API
...
remove 'forceCopy' argument in EntityItem::setProperties()
2014-12-18 11:41:20 -08:00
ZappoMan
663b9c393e
add debugging
2014-12-09 12:43:34 -08:00
Andrew Meadows
675a2dd989
add DIRTY_UPDATEABLE flag for changes that need it
2014-12-08 16:32:25 -08:00
Andrew Meadows
7d96ad5836
cleanup of EntitySimulation API
...
* remove EntityItem::_simulationState (only useful to EntitySimulation)
* move code from SimpleEntitySimuation to EntitySimulation
* EntitySimulation now maintans many QSets of entities
* cleanup and clarify use of EnityTree::updateEntity()
* reduced cost of polling for entity expiries
* changed "UpdateFlags" to "DirtyFlags" and clarified what they're for
2014-12-05 18:08:53 -08:00
Andrew Meadows
af606f01a9
combined SimulationStates Moving and Changing
...
also funnel entity updates by UDP packet through a single list
2014-11-17 17:35:44 -08:00
ZappoMan
8ec12ea954
add full animation settings support
2014-11-13 08:59:06 -08:00
ZappoMan
8a2e3d5045
add animationSettings property to model entities
2014-11-12 17:41:55 -08:00
ZappoMan
245f019836
first cut at migrating entity animation frame calculations to use AnimationLoop
2014-11-12 16:10:35 -08:00
ZappoMan
95c5b417c9
texture support in model entities
2014-10-30 11:04:19 -07:00
ZappoMan
44230a315b
add naturalDimensions and moved sitting points to exclusively be in properties
2014-09-09 17:45:50 -07:00
ZappoMan
b78b8ccbb0
first cut at replacing radius with dimensions
2014-09-09 13:33:05 -07:00
ZappoMan
b244e78af4
working on addressing issues with sibling cells and server clock skew causing some properties to be ignored
2014-09-01 21:48:03 -07:00
ZappoMan
76c77d6994
first cut at properly working lifetime
2014-08-28 13:46:54 -07:00
ZappoMan
2f90df04ee
correct cleanup of Models/geometry and all EntityItems for various cases
2014-08-27 15:45:45 -07:00
ZappoMan
5c2b674a0d
verify delete behavior actually frees memory associated with EntityItems
2014-08-27 12:07:11 -07:00
ZappoMan
4895ee32f7
test and fix issues with exportEntities()
2014-08-26 15:59:49 -07:00
ZappoMan
ef86d86234
split out entity rendering into subclasses, improved rendering of models
2014-08-20 15:49:50 -07:00
ZappoMan
a96aa5f937
clean up subclass properties, properly handle new baseclass props like damping
2014-08-10 14:20:37 -07:00
ZappoMan
2892c37210
implement readEntitySubclassDataFromBuffer() for EntityItem
2014-08-08 17:55:56 -07:00
ZappoMan
90c7989765
implement appendSubclassData() for EntityItem
2014-08-08 17:38:26 -07:00
ZappoMan
f1d2017a9e
getting animation working again
2014-08-07 12:50:02 -07:00
ZappoMan
b7b89dcbec
move glow effect to property of all entities, add tools for editing boxes
2014-08-06 12:29:09 -07:00
ZappoMan
e540bef672
more hacking on rendering of virtual entities
2014-08-06 09:12:14 -07:00
ZappoMan
e9db4fd120
registration of multiple entity types: Model and Box
2014-08-05 12:10:17 -07:00
ZappoMan
273853ef24
more work on virtual entities
2014-08-04 16:18:24 -07:00
