Commit graph

128 commits

Author SHA1 Message Date
Andrew Meadows
7dfa8a26a3 cleanup EntityItem::shouldBePhysical() and derivations 2019-05-06 17:35:57 -07:00
SamGondelman
6cc95fe8ac CR 2019-03-27 15:46:25 -07:00
SamGondelman
3ff0770441 model emitters! 2019-03-20 21:25:14 -07:00
amer cerkic
fab343a1d4 correcting spacing 2019-03-05 10:52:54 -08:00
amer cerkic
36e9c604e9 fixed based on comment 2019-03-05 10:45:15 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
SamGondelman
544f54e69a fix model scale 2019-02-21 14:10:36 -08:00
SamGondelman
ee1552661c fix textures 2019-01-31 12:04:46 -08:00
SamGondelman
1b5c1d0677 working on primitiveMode and groupCulled 2019-01-08 10:02:03 -08:00
Sam Gateau
6005b934ad
Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001
minor bug fix and optimization in ModelEntity animation
2018-10-19 17:02:48 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3 2018-10-17 13:10:29 -07:00
Andrew Meadows
0c61779331 remove deprecated cruft; stub setAnimationURL() override 2018-10-17 11:45:39 -07:00
Andrew Meadows
148944814b consolidate two bad string checks into one 2018-10-17 11:45:39 -07:00
John Conklin II
eb088772d0
Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls
Fix "Good" collision not honoring mesh groups in OBJ files
2018-10-17 11:12:21 -07:00
sabrina-shanman
c8cccc5ec7 Fix "good" collision not subdividing OBJ meshes by group 2018-10-08 09:24:33 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Thijs Wenker
06491ef12f API function for retrieving multiple entity properties with better performance 2018-09-20 19:34:00 +02:00
SamGondelman
9a2bdda365 make animation properties threadsafe 2018-09-10 11:58:45 -07:00
SamGondelman
283c0c0311 s i m p l i f y 2018-08-23 11:47:56 -07:00
SamGondelman
f9cdfbad7c cleanup 2018-07-12 17:59:57 -07:00
SamGondelman
16ad9cb5d3 xcolor/rgbcolor conversion 2018-07-11 18:06:06 -07:00
SamGondelman
9929529f30 vec3 conversion 2018-07-11 14:18:22 -07:00
Andrew Meadows
748af5a65f worry about multi-threads when updating animation props 2018-04-23 12:08:40 -07:00
Andrew Meadows
8e51d66092 fix bug: animation should reset on start running 2018-04-23 12:08:40 -07:00
Clement
2e8a6e1961 Remove more dead octree code 2018-04-17 18:21:51 -07:00
Anthony J. Thibault
cd4d9255bd Added defaultPoseFlags to avatar protocol
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation.  Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
Dante Ruiz
30bbe6e41b added relayParentJoints property 2017-12-28 15:43:59 -08:00
amantley
29538851b6 Made the changes from the latest code review, except getting rid of the
while loop.
2017-12-12 09:06:43 -08:00
amantley
778d98f56b made some changes to fix coding standard problems in the code, also added the update for the EntityItem base class to the update function 2017-11-28 18:42:03 -08:00
amantley
101e67498a cleaned up the code to remove _currentFrame updating in RenderModelEntityItem also removed the unnessary currently playing frame property 2017-11-28 14:11:56 -08:00
amantley
d607ca0914 initialize the _lastAnimated time when the modelEntityRenderer is instantiated, this fixes the sync between interface and the server 2017-11-28 11:04:48 -08:00
amantley
2e75016021 changes to modelEntity.cpp 2017-11-22 17:53:21 -08:00
amantley
fdf5139a74 everything now works with an atomic start time property. but now I will get rid of this and use current frame instead 2017-11-22 17:52:13 -08:00
amantley
1e5d099b06 changed the currentlyplayingframe property so that it is updated in RenderableModelEntity.cpp now. Remains to remove everything but initializing currentlyPlayingFrame in ModelEntityRender.cpp 2017-11-21 17:36:01 -08:00
amantley
befa0f8ab5 now the update frame is only happening in the assignment client code. added setCurrentlyPlayingFrame to ModelEntityItem.cpp 2017-11-20 09:11:15 -08:00
amantley
013d16cee9 this is the change to add a property for the currentframeplaying 2017-11-17 18:37:54 -08:00
amantley
20fd893b47 Starting to implement the update function to ModelEntityItem_cpp Also put access to the currently playing frame in RenderableModelEntityItem_cpp 2017-11-16 18:38:28 -08:00
amantley
881b22ab15 added update function to modelEntityItem.cpp 2017-11-16 12:41:56 -08:00
amantley
af0304fd6b preliminary changes for the property fixes 2017-11-09 10:04:12 -08:00
Andrew Meadows
23bb8608b1 minor optimizations in updateModelBounds() 2017-10-16 11:52:30 -07:00
Anthony J. Thibault
1389c2e31d Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
2017-10-03 12:15:23 -07:00
Brad Davis
65b49a958f Merge branch 'master' into 21484 2017-08-31 14:59:30 -07:00
Menithal
0e3fc64f63 Fixed Inverse logic and Cleanup 2017-09-01 00:35:56 +03:00
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