Brad Hefta-Gaub
d99dcf5450
Merge pull request #7487 from hyperlogic/tony/animated-culling
...
Improved render bounding boxes for animated models
2016-03-30 09:27:43 -07:00
Zach Pomerantz
29dedd5524
Update model URL on render thread
2016-03-29 10:42:40 -07:00
Anthony J. Thibault
24ca5b3d60
Update after merge changes to NetworkGeometry.
...
Also cleaned up API for ModelMeshPartPayload::updateTransformForSkinnedMesh() to pass a QVector const ref, instead of a raw pointer and a size.
2016-03-28 20:29:02 -07:00
Anthony J. Thibault
940f3e636d
Merge branch 'master' into tony/animated-culling
2016-03-28 19:58:38 -07:00
Anthony J. Thibault
115fd607a0
Address performance issues introduced with this PR.
...
* Prevent clusterMatrices from being invalidated and re-computed in each updateItem lambda.
We do this by not setting _model->_needsUpdateClusterMatrices = true;
* Prevent redundant work if Model::enqueueLocationChange is called multiple times per frame.
We do this by introducing a preRenderLambdas map in the Application class.
Instead of adding work directly to the scene PendingChanges queue Model::enqueueLocationChange
adds a lambda to the Application preRenderLambdas map. The Application ensures that only one lambda will
be invoked for each model per frame.
2016-03-28 19:47:30 -07:00
Anthony J. Thibault
f5a86666a1
Model: fix for collision mesh rendering
2016-03-28 09:56:15 -07:00
Zach Pomerantz
d6640ac520
Update Model::_hasTransparentTextures
2016-03-27 16:38:45 -07:00
Anthony J. Thibault
49a4d104a6
Minimize diff with master
2016-03-26 13:27:05 -07:00
Anthony J. Thibault
bf433487fa
Dynamic bound update for skinned mesh
...
* Use all cluster matrices to compute bound for skinned mesh.
This is far less expensive then doing per-vertex work, but it's not free, for avatars especially.
* Remove skinnedMeshBound, compute it instead.
* Compute clusterMatrices in render update, because we need them to update bounds.
2016-03-26 12:22:02 -07:00
Anthony J. Thibault
b4e70d9101
WIP: checkpoint
...
* bug fix in AABox::operator+=
* added AABox::emiggen
* Avatar now has a default bound for it's skinned mesh.
* WIP: AABox tests; NEED MORE
* Model: split collision and model mesh render items.
Because ModelMeshRenderItems need special handling to update bounds for animated joints.
* Model: dynamically update the bound for rigidly bound animated meshes
* Rig: added access to geometryToRigTransform
* RenderableModelEntityItem: try to update bounds for skinned mesh to be the entity dimentions (this doesn't seem to be working)
* Geometry.cpp: removed unused bounds parameter in evalPartBounds
* ModelMeshPartPayload: bounds updating
* non-animated: use existing _localBound
* rigid bound mesh: use _localBound transformed by clusterMatrix joint transform
* fully skinned mesh: use _skinnedMeshBound provided by the application.
2016-03-25 21:29:20 -07:00
Zach Pomerantz
3402635f99
Lock geometry on blender
2016-03-24 18:50:43 -07:00
Zach Pomerantz
3e9e083df5
Update users of NetworkGeometry
2016-03-24 11:35:41 -07:00
samcake
1e46b0803c
fixing repported issues during review
2016-03-23 15:59:57 -07:00
samcake
7d99183474
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-23 15:47:00 -07:00
Brad Hefta-Gaub
9f0084dbb1
make Blender keep a shared pointer to the model it's blending
2016-03-22 16:01:31 -07:00
samcake
67abdab8b2
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-22 10:13:50 -07:00
Brad Hefta-Gaub
513138ca98
one more crack at fixing the blender
2016-03-21 18:28:26 -07:00
samcake
695e558851
Trying to clena up the problem?
2016-03-21 16:36:47 -07:00
Chris Collins
6324d0e3be
Merge pull request #7393 from ZappoMan/protectMeshBoxes
...
Fix for crash in recalculateMeshBoxes()
2016-03-21 15:46:28 -07:00
Brad Hefta-Gaub
d28db7bec6
fix typo
2016-03-21 14:47:53 -07:00
samcake
ec7165983d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-21 13:30:28 -07:00
samcake
d189dc4af2
Problem not fixed yet, need to merge with upstream
2016-03-21 13:30:08 -07:00
Brad Hefta-Gaub
2389295217
actually properly remove pending blendshapes
2016-03-21 13:04:37 -07:00
samcake
227ddb12a6
Trying to clen up the way the opacity final value comes to the fragment shader
2016-03-21 12:14:59 -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
Andrew Meadows
cd802a6549
Merge pull request #7406 from hyperlogic/tony/transparent-texture-fix
...
Model: fix for avatars with late loaded transparent textures.
2016-03-21 09:19:33 -07:00
Anthony Thibault
b06f027f2e
Model: fix for avatars with late loaded transparent textures.
2016-03-20 18:20:03 -07:00
samcake
225b330d41
Trying to better load aand detect the case for transparent textures oor opacity mask
2016-03-18 12:47:33 -07:00
Brad Hefta-Gaub
925d5d36ac
clean up the recalculateMeshBoxes() calls in findRayIntersectionAgainstSubMeshes()
2016-03-18 12:20:45 -07:00
Brad Hefta-Gaub
eb8a6527c6
change ModelBlender to use a set<WeakPointers> to safely handle model lifetime
2016-03-17 19:44:42 -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
Andrew Meadows
7acc56bf00
Merge pull request #7359 from zzmp/feat/bg-gpu-timer
...
Add a DrawBackgroundDeferred gpu timer
2016-03-16 07:58:53 -07:00
samcake
d58ac269ee
Fixing a bug when albedo map transaprent but not quite loaded yet
2016-03-15 17:01:26 -07:00
samcake
f30e8e9e0c
Merge pull request #7281 from zzmp/fix/png-opacity
...
Fix materials to honor png texture opacity
2016-03-15 16:08:36 -07:00
samcake
f3daa9e1c5
Fixing the lighting issue in stereo
2016-03-15 14:35:43 -07:00
Zach Pomerantz
5ab21588f2
Add gpu timer to background
2016-03-14 17:53:39 -07:00
David Rowe
f7c6725f63
Improve text3d rendering
2016-03-12 23:24:52 +13:00
Zach Pomerantz
a89a76dc4b
Require model fixup if tex is transparent
2016-03-11 14:33:19 -08:00
Zach Pomerantz
ee1fb698a4
Add texture transparency to material key
2016-03-11 14:27:35 -08:00
Anthony J. Thibault
0ce004c8a7
Removed passive-aggressive comment, (it was a late night)
2016-03-11 13:36:48 -08:00
Anthony J. Thibault
ab19d3e5a2
Moved animation after physics, hand poses are in world frame.
...
There are still some debug hacks enabled so I can test in the vive room.
2016-03-10 20:44:35 -08:00
Brad Davis
aad2aaa764
Fix link problem with shaders that use transparency and normal maps
2016-03-09 20:01:18 -08:00
Zach Pomerantz
d1324b2e7a
Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree
2016-03-08 10:22:25 -08:00
samcake
193b98f24f
Gamma correct the text color
2016-03-05 10:59:03 -08:00
samcake
d3b84311c5
FIxing the color
2016-03-05 10:36:45 -08:00
samcake
2d3f0b12f5
Simple fix to the text bug
2016-03-05 10:18:50 -08:00
samcake
e3d11560eb
With a shader compiling
2016-03-04 19:08:48 -08:00
samcake
3278b76eef
Starting investigating the text rendering bug
2016-03-04 18:24:36 -08:00
samcake
aed2ad72d1
Using another formula for the specularDistribution giving much better results
2016-03-01 17:09:57 -08:00
