samcake
d878fac62c
REverse changes
2017-11-06 11:25:02 -08:00
Sam Gateau
45e5d91b9d
Change the sub renderItemIDs list of the Model entity in its meta through a transaction instead of going through the pointer to the model
2017-11-04 20:49:55 -07:00
Andrew Meadows
2b06df1c33
call Model::scaleToFit() before update render items
2017-11-02 12:52:46 -07:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
Andrew Meadows
29efe53f74
repair debug rendering of collision shapes
2017-10-24 13:23:46 -07:00
Bradley Austin Davis
4f5851f420
Reducing needless render updates
2017-10-23 15:31:25 -07:00
Brad Hefta-Gaub
87294b8e67
Merge pull request #11638 from ZappoMan/fixWireframe
...
fix the rendering of wireframe for model entities with bad model URLs
2017-10-20 14:29:01 -07:00
ZappoMan
ef0ff96a44
fix the rendering of wireframe for model entities with bad model URLs
2017-10-20 11:46:28 -07:00
Andrew Meadows
c79bf3bc04
cleanup WANT_DETAILED_PROFILING
2017-10-19 14:31:50 -07:00
Andrew Meadows
339edc67c8
ifdef out more per-frame-per-entity profiling
2017-10-16 17:27:53 -07:00
Andrew Meadows
102a1cb36b
ifdef out detailed profiling
2017-10-16 16:02:11 -07:00
Andrew Meadows
fb1c075a12
fix animating entities
2017-10-16 15:55:25 -07:00
Andrew Meadows
23bb8608b1
minor optimizations in updateModelBounds()
2017-10-16 11:52:30 -07:00
Andrew Meadows
e109101acc
update profiling timers
2017-10-16 11:52:30 -07:00
Anthony J. Thibault
0a943fbe7b
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
...
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.
The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
2017-10-11 17:32:34 -07:00
SamGondelman
ee02fa9a91
model asks for renderUpdate if animating
...
(cherry picked from commit 873ae9b9d6
2017-10-09 13:55:48 -07:00
SamGondelman
a6b7578c3c
start fixing asynch issue, fixes model loading!
2017-10-05 12:30:00 -07:00
SamGondelman
3a6e84e681
trying to fix model issue
2017-10-04 17:26:12 -07:00
SamGondelman
215193ad90
try to improve performance
...
(cherry picked from commit a5f5f9fc5d
2017-10-04 13:50:35 -07:00
Andrew Meadows
67481287ff
comment out asserts that fail to compile in Debug
2017-09-26 09:29:43 -07:00
SamGondelman
86198606e0
add _modelJustLoaded and updateTransforForSkinnedMesh on creation
2017-09-22 17:12:44 -07:00
SamGondelman
9f12d3a365
fix missing models
2017-09-21 17:57:25 -07:00
Brad Davis
688ee68cf9
Ensure thread-safety for model pointer access
2017-09-14 12:29:23 -07:00
Menithal
40d339a831
21484: Updated code to go with PR feedback
2017-09-11 20:36:29 +03:00
Menithal
856452405e
Made Code abit more concise for better compilation
2017-09-05 08:46:37 +03:00
Menithal
119a2703f7
Removed Debug Joints that wasnt used anylonger
2017-09-04 22:20:00 +03:00
Menithal
03e076046b
Added Joint Name check for translations
...
This way if there is a mismatch in the skeleton, the translations are
applied to the models correctly
2017-09-04 22:16:02 +03:00
Menithal
5506520226
Fixed missing semi colon
2017-09-01 08:20:54 +03: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
Menithal
ea79748ed3
Some adjustments
2017-08-29 23:59:36 +03:00
Zach Fox
0cdef28cfd
Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-28 14:55:18 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Zach Fox
2a75d97006
First steps
2017-08-22 12:56:16 -07:00
Menithal
dc5e374485
Merge remote-tracking branch 'upstream/master' into 21484
2017-08-17 22:28:43 +03:00
Sam Gateau
79f3be1efe
Merge pull request #11021 from Zvork/fade2
...
Fade dissolve effect JUST AVATARS
2017-08-10 13:48:30 -07: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
Menithal
34d9e9b371
Preliminary Research Complete
...
Found the part that needs updating with the AnimationProperty
2017-08-08 00:03:24 +03:00
David Kelly
4b7779f0f5
add flag to outline render flags, fix pal.js/edit.js interaction
2017-08-03 07:57:21 -07:00
Olivier Prat
e85bb6fd08
Fixed compilation warnings on Mac
2017-07-31 19:19:00 +02:00
Olivier Prat
5f1d45d4de
Revert "Added check on EntityItem::getEntitiesShouldFadeFunction and reactivated fade on model, voxels and polylines"
...
This reverts commit 8a2fd01e81
2017-07-31 18:06:51 +02:00
Olivier Prat
8a2fd01e81
Added check on EntityItem::getEntitiesShouldFadeFunction and reactivated fade on model, voxels and polylines
2017-07-31 15:31:37 +02:00
Olivier Prat
1336582c6b
Removed fade transition on model entities.
2017-07-31 15:06:24 +02:00
Olivier Prat
490aad2a06
Merged from master
2017-07-31 12:00:35 +02:00
Zach Fox
9147bc21d0
Getting there.
2017-07-26 11:41:27 -07:00
Zach Fox
9020607ccf
First pass
2017-07-25 17:54:46 -07:00
Seth Alves
72e5fecb4e
do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex
2017-07-20 16:34:34 -07:00
Seth Alves
a8698c2fbc
EntityScriptingInterface::getMeshes support for Model entities
2017-07-19 08:59:09 -07:00
Olivier Prat
b125fba2e1
Removed untested avatar bubble fade code. Made changes as requested by Andrew
2017-07-13 23:04:55 +02:00
Olivier Prat
93218da473
Fixed compilation errors on Mac and Linux
2017-07-13 17:51:16 +02:00
Olivier Prat
7552cca316
First alpha version of bubble collision fade events. Missing a lot of information.
2017-07-11 19:26:15 +02:00
Olivier Prat
aba8be595e
Separated fade categories from transition event types
2017-07-11 11:37:24 +02:00
Olivier Prat
cc4e168369
Working fade again
2017-07-10 16:45:13 +02:00
Olivier Prat
66d09a4c3c
Some objects fade and fixed crash due to invalid meta item id
2017-07-10 16:02:12 +02:00
Olivier Prat
267531cc1a
First working fade
2017-07-10 15:27:09 +02:00
Sam Gateau
ca7e782566
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-29 10:54:27 +02:00
Brad Davis
28d727153b
PR feedback
2017-06-27 19:22:07 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
howard-stearns
3d4f9be05b
fix teleport vs stuck-in-floor work
2017-06-12 17:01:13 -07:00
Howard Stearns
3d62900daf
When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works.
2017-06-03 16:49:16 -07:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -07:00
Seth Alves
b99959c73d
munge collision-hull at last minute rather than store munged url as a property
2017-04-11 07:00:22 -07:00
Seth Alves
8a3a52cbcf
make getCollisionGeometryResource a separate call from getGeometryResource rather than passing a bool
2017-04-10 13:54:24 -07:00
Seth Alves
6bd841857f
added a comment
2017-04-10 13:50:36 -07:00
Seth Alves
717436e0fd
use QUrl rather than just munging the url with a string-append
2017-04-10 10:54:30 -07:00
Seth Alves
554b23357c
add combineParts flag to getGeometryResource. append ?collsion-hull to urls that are used as compound collision hulls
2017-04-10 10:14:36 -07:00
Brad Hefta-Gaub
0d4649ded8
Merge pull request #10079 from jherico/entity_thread_safety
...
Thread safety for property getter/setters on entities
2017-04-07 19:01:07 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
Brad Davis
d89104f69c
Use getters instead of direct member access
2017-04-04 10:50:55 -07:00
Seth Alves
c21b8b4eac
raise max mesh count for static collision entities from 500 to 1000
2017-03-26 08:48:08 -07:00
Seth Alves
0d2e0eb9c3
Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx
...
Avoid deadlock on 10k mesh fbx
2017-03-24 12:34:37 -08:00
Seth Alves
aaa78d108b
if a model has too many meshes, give up.
2017-03-24 11:17:24 -07:00
Atlante45
4f8d9b190b
Show green box when model entity has bad url
2017-03-23 17:56:33 -07:00
ZappoMan
2a663cbcb1
cleanup
2017-03-05 19:28:15 -08:00
ZappoMan
87bcced409
cleanup use of triangleSet for picking
2017-03-05 19:23:55 -08:00
Seth Alves
645aad7bb0
Merge pull request #9557 from hyperlogic/tablet-ui
...
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -08:00
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Seth Alves
39d195fce2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-31 05:02:07 -08:00
Atlante45
c65e884151
Don't set joint "set" flags for animation values
2017-01-30 16:04:54 -08:00
Anthony J. Thibault
0962a15a06
Fix for one-frame lag in the tablet stylus.
2017-01-30 15:39:55 -08:00
Seth Alves
eb25e1c12d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-19 09:41:49 -08:00
samcake
69f9053e61
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-17 10:55:10 -08:00
samcake
83d1c3ad01
Adding support for the meta rendering
2017-01-16 17:47:58 -08:00
Seth Alves
f0248275ec
Merge branch 'load-models-in-keyhole' of github.com:sethalves/hifi into tablet-ui
2017-01-16 06:47:15 -08:00
Seth Alves
050a7e87d2
load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled.
2017-01-15 17:04:51 -08:00
Anthony J. Thibault
26a5b5ed91
Fix for rendering of tablet ModelEntity in desktop mode.
...
The Model pendingChanges.updateItem() lambda now directly calls into StaticallyNestable. This is late enough
in the update loop to have the most up-to-date camera transform used for rendering.
2017-01-11 18:37:57 -08:00
Brad Davis
1dd2747ef9
Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.
2017-01-10 10:44:04 -08:00
Brad Davis
e5e9ab42ea
Encapsulate AnimPose members for easier optimizations
2016-12-28 12:11:24 -08:00
Brad Hefta-Gaub
c65471e880
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Chris Collins
61c60fca2d
Merge pull request #8968 from ctrlaltdavid/21089
...
Clara.io marketplace improvements
2016-12-19 18:21:45 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506
adding profile stats relating to avatar CPU costs
2016-12-16 13:41:31 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
David Rowe
aefa116207
Add extra logging for Clara.io asset resizing
2016-12-13 17:55:22 +13:00
Seth Alves
689fdfb35f
implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame
2016-11-04 11:44:42 -07:00
Seth Alves
e41fa94958
implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame
2016-11-04 11:42:31 -07:00
Seth Alves
727fe4bc21
Merge branch 'master' of github.com:highfidelity/hifi into fix-setLocalJointRotation-name
2016-11-04 10:04:56 -07:00
Seth Alves
339d6a55cf
getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation
2016-11-03 10:06:07 -07:00
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
