Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -08:00
Seth Alves
5a81dface9
avoid filling log with bogus warning
2017-01-13 12:00:51 -08:00
Seth Alves
e9422cbf1e
fix model scales
2017-01-12 16:38:27 -08:00
Seth Alves
5fa379fea2
fix model scales
2017-01-12 16:12:43 -08:00
Seth Alves
208c4686c4
merge from upstream
2017-01-12 15:44:27 -08:00
samcake
ca53235d54
Merge pull request #9358 from AndrewMeadows/model-cleanup
...
minor cleanup for Model rendering code
2017-01-12 14:30:16 -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
Andrew Meadows
c060fd6a68
restore updateClusterMatrices() in render()
2017-01-11 17:33:30 -08:00
Andrew Meadows
e2130d33d9
speedup cauterizedClusterMatrices math
2017-01-11 15:10:44 -08:00
Andrew Meadows
b3e336de3d
remove cruft: unused function arguments
2017-01-11 15:02:18 -08:00
Andrew Meadows
87bdaae05a
remove scale from ModelMeshPartPayload's transform
2017-01-11 12:38:47 -08:00
Andrew Meadows
bd16824d55
remove cruft: Model::_pupilDilation
2017-01-11 06:57:05 -08:00
Andrew Meadows
1804f33b98
add assert and TODO comment
2017-01-11 06:56:35 -08:00
Andrew Meadows
5d880487a0
cleanup class method declarations
2017-01-11 06:56:07 -08:00
Andrew Meadows
e88f02d7b6
remove cruft
2017-01-11 06:55:13 -08:00
sam
7a01b856f7
Factorization of the modelTransform out of the cluster matrices
2017-01-11 02:33:56 -08:00
Andrew Meadows
44699fc661
modelToWorld rotation not in cluster matrices
2017-01-10 16:21:13 -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
Chris Collins
30d5f70e11
Merge pull request #9278 from jherico/cpu_opt_scene
...
More low level optimizations
2017-01-09 10:10:40 -08:00
Zach Pomerantz
26cfc83e20
Merge branch 'master' into graphics/fetch-cull-sort
2017-01-03 14:04:39 -05:00
Zach Pomerantz
15656a0592
include spatialSelection in RenderFetchCullSortTask::Output
2016-12-30 15:08:16 -05:00
Zach Pomerantz
0e9da87549
FetchSortCull->FetchCullSort
2016-12-29 19:27:37 -05:00
Zach Pomerantz
c75dd236f2
rm unused forward pipelines
2016-12-29 19:11:06 -05:00
Zach Pomerantz
d00ae05e26
add background to forward renderer
2016-12-29 19:09:06 -05:00
Brad Davis
99af7f2819
Reduce unecessary copying in MeshPartPayload::bindMaterial
2016-12-28 12:11:27 -08:00
Brad Davis
e5e9ab42ea
Encapsulate AnimPose members for easier optimizations
2016-12-28 12:11:24 -08:00
Brad Davis
901c020aae
Optimizations, SIMD and const correctness
2016-12-27 15:39:38 -08:00
Zach Pomerantz
ca1a14e5b0
add RenderFetchSortCull task
2016-12-23 15:54:22 -05:00
Zach Pomerantz
8d63067fa5
templatize graphics engine tasks' run method
2016-12-23 14:58:40 -05:00
Zach Pomerantz
dbf4f2d23b
mv shadow task setup to jobs
2016-12-23 14:58:40 -05:00
Andrew Meadows
0b0c3f0be4
cleanup some if-logic
2016-12-21 10:55:59 -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
samcake
c435afb728
Introducing a fix for the overlayered model drawn in front
2016-12-19 13:17:56 -08:00
Brad Davis
ee3c8e6efd
Merge pull request #9225 from jherico/chrome_tracing
...
Additional work on tracing
2016-12-16 17:53:55 -08:00
Ryan Huffman
1d9a32c528
Add FIXME comment to texture setting in Model.cpp
2016-12-16 16:32:53 -08:00
Ryan Huffman
18a166bee8
Fix models not settings textures if not loaded
2016-12-16 15:05:17 -08:00
samcake
1ded581895
Merge pull request #9217 from zzmp/feat/render-forward-bounds
...
Render bounds in Forward Render Task
2016-12-16 14:57:14 -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
Zach Pomerantz
013713f92c
rm unused scene
2016-12-15 15:21:57 -05:00
Zach Pomerantz
9e05403aba
forward render opaque bounds
2016-12-15 14:59:25 -05:00
Zach Pomerantz
bae6ceb2ae
rm extra buffer clears in forward render
2016-12-15 14:57:22 -05:00
Brad Hefta-Gaub
25c6e8021f
Merge pull request #9198 from zzmp/chmod/render-utils
...
Change file permissions of source code to remove execute bits
2016-12-15 10:37:36 -08:00
samcake
7a29dbe7d4
Merge pull request #9207 from zzmp/feat/render-forward-empty
...
Forward render task (empty and only used with RENDER_FORWARD set)
2016-12-15 09:57:18 -08:00
Zach Pomerantz
87a8ad1289
strip forward render task to clear and blit
2016-12-13 20:48:05 -05:00
Zach Pomerantz
bc59be12ef
create flagged forward render task
2016-12-13 19:19:30 -05:00
samcake
0b221abfb2
writting the abs differently
2016-12-13 15:27:50 -08:00
samcake
f509d1fca4
Clening up the fix
2016-12-13 12:48:16 -08:00