Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 03:08:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61053 commits 25 branches 0 tags 1.1 GiB
Commit graph

399 commits

Author SHA1 Message Date
Andrew Meadows
cd5826e2ce load model of new entity with unknown dimensions 2016-11-03 09:03:04 -07:00
Seth Alves
844cc03dcb fix names of model-entity joint setters 2016-11-02 10:24:01 -07:00
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
Andrew Meadows
b95cb566cd fix collision mesh for non-trivial registration 2016-08-24 22:26:56 -07:00
Andrew Meadows
e4317adcf1 remove cruft 2016-08-24 22:26:56 -07:00
Andrew Meadows
2f16aca114 remove cruft and fix typo in rebase 2016-08-24 22:26:56 -07:00
Andrew Meadows
83426fd5a8 handle transitions to/from STATIC_MESH 
when rendering collision geometry
 2016-08-24 22:26:56 -07:00
Andrew Meadows
68dd66daec create collision render geometry only when needed 2016-08-24 22:26:56 -07:00
Andrew Meadows
eb65be5478 remove cruft argument from allocateModel() 2016-08-24 22:26:56 -07:00
Andrew Meadows
b0a0293e6e move compoundResource out of Model class 2016-08-24 22:26:56 -07:00
Andrew Meadows
191b7f0f39 variable namechange: Hull --> Mesh 2016-08-24 22:26:56 -07:00
Andrew Meadows
6b0ae654ba cleanup logic around creating RenderItems 2016-08-24 22:26:56 -07:00
Andrew Meadows
726928c14c creae collision Geometry from mesh 2016-08-24 22:25:45 -07:00
Andrew Meadows
499150bbed finish hook alert for new entity collision shape 2016-08-24 22:25:45 -07:00
Andrew Meadows
c3f165d9da BufferView::Iterator doesn't support operator< 2016-08-19 10:15:37 -07:00
Andrew Meadows
2ba35e6398 skip non-existant meshes 2016-08-18 11:48:56 -07:00
Andrew Meadows
cb9a5466d5 workaround bad FBXMesh data rather than assert 2016-08-18 11:09:48 -07:00
Brad Hefta-Gaub
a714f325fe Merge pull request #8333 from SamGondelman/miscFixes 
Miscellaneous cmake and render engine improvements
 2016-08-10 11:06:50 -07:00
SamGondelman
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
Ryan Huffman
d367583426 Clean up priority loading implementation 2016-08-08 08:53:06 -07:00
Ryan Huffman
c594dcdf9f Add priority loading for model entities 2016-08-08 08:52:29 -07:00
SamGondelman
dd51e0e38f merge from master 2016-08-05 17:04:45 -07:00
Brad Hefta-Gaub
83280aa3f2 implement support for updating the render items of models when they finish their fade 2016-08-05 10:11:07 -07:00
Seth Alves
ad4fc8c656 merge from upstream, don't hold up enabling of physics if a collision hull fails to load 2016-08-03 10:42:15 -07:00
Stephen Birarda
5d3e125a06 make failed geomtetry request not hold physics 2016-08-02 16:32:41 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
Andrew Meadows
20eebb90f8 fix build -- remove some accidental changes 2016-07-20 14:08:25 -07:00
Andrew Meadows
3fdfc0db14 fix bug breaking simple-compound shape type 2016-07-20 12:55:13 -07:00
Andrew Meadows
2afd65467a fix bug where model is not yet ready for col shape 2016-07-19 18:01:22 -07:00
Andrew Meadows
25fdea6bac fix for change of API after rebase 2016-07-13 15:13:35 -07:00
Andrew Meadows
72175ae09e fix warnings about implicit casts 2016-07-09 22:55:55 -07:00
Andrew Meadows
207ddcea38 wrap hull about each mesh part 2016-07-09 22:25:28 -07:00
Brad Hefta-Gaub
5f71f77445 Merge pull request #8192 from AndrewMeadows/simple-hull-shapes 
experimental ModelEntityItem collision shape options (no visual debugging)
 2016-07-08 08:55:11 -07:00
Andrew Meadows
e4828b03b1 fix crash when building shape before model loaded 2016-07-07 13:32:30 -07:00
Brad Davis
c7382ea886 Optimize updateModelBounds 2016-07-07 11:11:26 -07:00
Andrew Meadows
3c4f9f8016 refert debug hack 2016-07-06 15:51:17 -07:00
Andrew Meadows
15ff7bc731 final hack tweak 2016-07-06 14:35:57 -07:00
Andrew Meadows
301a9f4434 improved hack logging 2016-07-06 14:31:43 -07:00
Andrew Meadows
11ef245671 temp hack for debugging 2016-07-06 14:28:09 -07:00
Andrew Meadows
5659d57ac3 fix shape generation for SIMPLE_COMPOUND 2016-07-06 13:00:57 -07:00
Andrew Meadows
6cbc566a77 remove debug cruft 2016-07-06 11:53:26 -07:00
Andrew Meadows
33d732c446 construct geometry for new shape types 2016-07-06 10:51:15 -07:00
Andrew Meadows
74781c0786 boxify static meshes with too many vertices 2016-06-28 16:36:10 -07:00
Andrew Meadows
e88b264864 revert compound hull shape generation 2016-06-22 09:30:44 -07:00
Andrew Meadows
937bd0c1be SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH 2016-06-21 13:54:21 -07:00
Andrew Meadows
f22a5613bd fix static mesh for model with per-mesh transforms 2016-06-20 17:29:20 -07:00
Andrew Meadows
5484b6fbb7 more correct extraction from triangle strips 2016-06-20 17:29:20 -07:00
Andrew Meadows
c0c77e9027 optimize/cleanup compound/mesh shape computation 2016-06-20 17:29:20 -07:00
Andrew Meadows
f444b70fdc fix collision shape for scaled models 2016-06-20 17:29:20 -07:00
Andrew Meadows
ab3548cac0 fix crash 2016-06-20 17:29:20 -07:00
Andrew Meadows
d1752211e6 make implicit casts explict 2016-06-20 17:29:20 -07:00
Andrew Meadows
a519b77ae7 add SHAPE_TYPE_MESH and build mesh shapes 2016-06-20 17:29:20 -07:00
Andrew Meadows
d64729372a ShapeInfo name changes 2016-06-20 17:29:20 -07:00
Andrew Meadows
2a3da60ed4 remove some magic numbers 2016-06-03 10:47:54 -07:00
Andrew Meadows
eff59d3fd3 build compound sub meshes shapes with less copying 2016-06-03 10:47:54 -07:00
Andrew Meadows
7858ef84b3 don't copy points onto itself 2016-06-03 10:47:54 -07:00
Andrew Meadows
654468619c swap order of if-else blocks 2016-06-03 10:47:54 -07:00
Andrew Meadows
d591561a88 remove RenderableModelEntityItem::_points 
use ShapeInfo::_points instead
 2016-06-03 10:47:54 -07:00
Seth Alves
76f4a25694 move code that clears old scale and registration to after model is loaded 2016-05-20 11:40:46 -07:00
Seth Alves
ceb6aa582f don't crash when a moving model entity is deleted 2016-05-13 13:32:45 -07:00
Seth Alves
970e7ca17d don't crash when a moving model entity is deleted 2016-05-13 13:32:00 -07:00
Seth Alves
574709824e oops 2016-05-13 09:41:19 -07:00
Seth Alves
79141e3869 dry up some code 2016-05-13 07:06:25 -07:00
Seth Alves
dd2a29aace when a ModelEntityItem moves, also update its meta-render-item 2016-05-12 18:05:28 -07:00
Andrew Meadows
b5ad989811 more optimized uses of EntityItem::getDimensions() 2016-04-27 11:04:22 -07:00
Brad Hefta-Gaub
b597f7001b fix auto resize 2016-04-26 15:13:11 -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
Seth Alves
43f735dd21 avoid loop where bullet moves an entity and then an entity tells bullet that it has moved. 2016-04-09 22:18:43 -07:00
Anthony J. Thibault
8f530ceaf9 Reading animation properties without an entityTree lock is considered harmful 
In RenderableModelEntityItem::update() make a copy of the _animationProperties, which is under the entityTree lock.
In RenderableModelEntityItem::render() read from the copy of _animationProperties when not under the entityTree lock.
 2016-04-07 13:42:40 -07:00
Anthony J. Thibault
6a7a572b53 Model: Toggling Physics > Draw Collision Hulls works again 
Collision renderItems were never getting removed when shouldShowCollisionHull became false.
 2016-04-05 11:06:24 -07:00
Zach Pomerantz
e4cba14333 Avoid recreating model items when adding to scene 2016-03-31 10:46:51 -07:00
Zach Pomerantz
377a20e983 Use default texs for empty json 2016-03-31 10:46:51 -07:00
Zach Pomerantz
984bacdae3 Rearrange model entity render to reduce flicker 2016-03-31 10:46:51 -07:00
Zach Pomerantz
3de5f73a1f Fixup model on tex load 2016-03-31 10:46:51 -07:00
Zach Pomerantz
01db2be6b8 Avoid JSON parsing texs every render cycle 2016-03-30 14:48:57 -07:00
Zach Pomerantz
e4f12c81e0 Get remap textures through getter 2016-03-30 14:11:36 -07:00
Brad Hefta-Gaub
32308c7810 Merge pull request #7501 from zzmp/fix/parse-tex 
Respond to error from free in texture parsing
 2016-03-30 08:53:15 -07:00
Zach Pomerantz
6c7b6cd62e Return parsed tex directly as variant 2016-03-29 14:16:22 -07:00
Zach Pomerantz
848e7703ee Test textures emptiness correctly 2016-03-29 10:50:27 -07:00
Zach Pomerantz
29dedd5524 Update model URL on render thread 2016-03-29 10:42:40 -07:00
Zach Pomerantz
2de94e672b Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-28 14:08:30 -07:00
Brad Hefta-Gaub
4ebb114a8e also fix joint simulation from 3rd party editors 2016-03-25 11:43:32 -07:00
Brad Hefta-Gaub
759fac228c fix the doppelganger 2016-03-25 11:29:14 -07:00
Brad Hefta-Gaub
6c6131c7b3 fix the doppelganger 2016-03-25 11:22:54 -07:00
Brad Hefta-Gaub
984d6ae48f fix model resizing bug 2016-03-25 10:46:14 -07:00
Zach Pomerantz
5d306a74d5 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 10:09:37 -07:00
Zach Pomerantz
413c3b88cf Accept textures as list or json 2016-03-24 19:40:02 -07:00
Zach Pomerantz
3e9e083df5 Update users of NetworkGeometry 2016-03-24 11:35:41 -07:00
Brad Hefta-Gaub
492e71345a Revert "Revert "Fix ModelBlender crash"" 
This reverts commit f274cdcc7f.
 2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f Revert "Fix ModelBlender crash" 2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub
7483b8546b remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it 2016-03-17 17:05:35 -07:00
howard-stearns
ddc658af5f After a modelURL change to an existing model, allow the model to be 
snapped and scaled to the existing entity registration and dimensions.
 2016-03-15 12:20:51 -07:00
Seth Alves
01659cf93b try, try again 2016-03-11 16:21:20 -08:00
Seth Alves
2ad15f7568 try harder to get queryAABoxes to be correct 2016-03-11 14:38:31 -08:00
Seth Alves
f611d8f747 if needed, set querryAACube when dimensions are updated 2016-03-11 12:41:18 -08:00
Seth Alves
40c953e0b9 fix model hulls 2016-03-07 11:40:18 -08:00
Seth Alves
8b8604f9b0 move offset handling for models back to how it was before this PR 2016-03-07 11:32:25 -08:00
Seth Alves
c95d1f68f6 remove debug print 2016-03-06 14:38:03 -08:00
Seth Alves
5c585acd9a offset is included in shape key for models 2016-03-06 14:29:30 -08:00
Seth Alves
dcb720a832 fix polyvox hull when registration changes. 2016-03-06 14:09:45 -08:00
Seth Alves
59804a0f54 cleanups 2016-03-06 12:59:41 -08:00
Seth Alves
5241dc5394 this seems to be working now. more cleanups to come 2016-03-06 12:59:33 -08:00
Seth Alves
8bc2c76a8b change shape-key when registration point changes so shape cache doesn't incorrectly reuse the old shape 2016-03-05 08:01:30 -08:00
Seth Alves
9346171695 if entity registration isn't default, adjust physics shapes to match 2016-03-04 16:47:30 -08:00
samcake
1c53f9bc87 Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly 2016-02-23 10:40:50 -08:00
Zach Pomerantz
0e9d696859 Cache renderable model orig texs as QVariantMap 2016-02-15 11:09:10 -08:00
Zach Pomerantz
0903e14b06 Revert model texs when unset 2016-02-12 15:57:24 -08:00
Seth Alves
6a646f1c24 put isMoving back and change all uses to isMovingRelativeToParent 2016-02-10 19:01:41 -08:00
Atlante45
7e8ea4dc77 Update primitive instance rendering calls 2016-02-01 18:50:01 +01:00
Andrew Meadows
d25f54485c fix crash for emtpy modelUrl in ModelEntityItem 2016-01-22 22:01:30 -08:00
Seth Alves
edea0320e6 try again to make this thread safe 2016-01-19 15:44:22 -08:00
Seth Alves
a515d6debe call into correct thread to getJointNames on entity 2016-01-19 15:16:58 -08:00
Seth Alves
f265656e74 expose getJointNames for entities to js 2016-01-19 12:55:17 -08:00
Seth Alves
4232e400cc add getJointIndex call 2016-01-18 11:15:03 -08:00
David Rowe
a59cbd1aca Merge branch 'master' into 20763 2016-01-14 17:25:44 +13:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
David Rowe
25309e84b3 Fix interpreting textures properties 2016-01-07 17:30:28 +13:00
David Rowe
f64481c510 Warn user if cannot evaluate model's textures property 2016-01-07 16:47:48 +13:00
Seth Alves
942e77166e merge from upstream 2016-01-05 11:11:19 -08:00
Seth Alves
ef8673610f debugging 2016-01-04 14:58:13 -08:00
Seth Alves
6c8eb90ee0 debugging 2016-01-04 14:42:37 -08:00
Seth Alves
7f2e0cd103 expose a way to set translation and rotation of all model joints at once 2016-01-04 14:13:08 -08:00
Seth Alves
d35bbbb9f2 incorporate changes from #6732 2015-12-30 13:15:36 -08:00
Seth Alves
4e312dd8f8 undo temporary hack 2015-12-30 12:45:19 -08:00
Seth Alves
83f60d6e97 make entity properties for model-entity joint-states 2015-12-23 15:43:50 -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
Seth Alves
1d9a81d5d4 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-21 09:14:37 -08:00
Seth Alves
d71cecbc61 Merge pull request #6675 from AndrewMeadows/crash-fix 
fix crash when visiting new domain with gun in hand
 2015-12-20 06:24:44 -08:00
Seth Alves
489d4099a7 add locationChanged to model entities 2015-12-16 15:21:20 -08:00
Andrew Meadows
c14433979b fix crash mode when model late to get collision URL 2015-12-16 15:11:47 -08:00
Seth Alves
c74f8bca49 location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent 2015-12-14 09:13:36 -08:00
Seth Alves
1492fd6090 merge from upstream 2015-12-12 12:37:57 -08:00
Seth Alves
8ec84bdde8 don't simulate model until it has geometry 2015-12-11 17:35:18 -08:00
Seth Alves
6c033d9603 call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model 2015-12-11 11:35:42 -08:00
Seth Alves
3a35df191a remove an off-brand change 2015-12-10 11:19:26 -08:00
Seth Alves
1467a9d2eb handle initial simulation of _model 2015-12-10 11:17:40 -08:00
Seth Alves
2dd40beed5 formatting 2015-12-10 10:42:25 -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
Seth Alves
47df744552 Merge branch 'update-model-during-simulate' of github.com:sethalves/hifi into no-physics-until-ready 2015-12-09 12:40:18 -08:00
Seth Alves
4d60c7bbc0 update model location with SpatiallyNestable's locationChanged call 2015-12-09 10:42:32 -08:00
Seth Alves
f99812a903 adjust method names to fit convention 2015-12-07 14:31:08 -08:00
Seth Alves
96e9580473 change some more parameters back to being pass-by-reference, where it's safe 2015-12-07 05:30:19 -08:00
Seth Alves
a948ae5f19 children of avatar joints might be right, now 2015-12-06 10:48:00 -08:00
Seth Alves
cf39cac7fc attempt to make SpatiallyNestable data access thread-safe 2015-11-29 12:50:33 -08:00
Seth Alves
4ab2bfa854 clean up, minimize diff 2015-11-26 08:35:28 -08:00