samcake
8858f9dc82
IUse the light stage finally for the scattering prototype
2016-06-14 09:54:51 -07:00
samcake
414c43c012
Current state
2016-06-13 19:10:50 -07:00
samcake
f69c72f984
Fixing the VaryingPair problem
2016-06-13 10:44:31 -07:00
samcake
6a5dff06c4
Pushing a shitty state where the pairs of Varyings don;t get copied correctly
2016-06-13 09:46:24 -07:00
samcake
c325cc50dd
Adding the depth aware blur
2016-06-11 18:54:22 -07:00
samcake
28886f6ec3
Many improvments
2016-06-10 17:18:12 -07:00
samcake
e69022285e
A lot more stuff to try to see the skin scattering
2016-06-08 18:58:50 -07:00
samcake
75a5f6bd89
Intoducing the bluring as a separate Job reusable and the first version of curvature
2016-06-07 18:13:40 -07:00
Seth Alves
2a5efd3b82
Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta
2016-05-16 10:53:39 -07:00
Brad Davis
9509e32928
PR feedback
2016-05-14 08:28:51 -07:00
Seth Alves
970e7ca17d
don't crash when a moving model entity is deleted
2016-05-13 13:32:00 -07:00
samcake
e40a795a27
Trying to clean up for pr
2016-05-10 19:25:22 -07:00
samcake
303cade547
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-10 09:56:05 -07:00
samcake
8bad58749c
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-06 09:51:37 -07:00
Andrew Meadows
d1591e03b9
fix typo
2016-05-05 18:28:27 -07:00
Andrew Meadows
71b2d647e8
add locks and explicitly copy ViewFrustums
2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660
getViewFrustum() provides const pointer
2016-05-05 18:28:27 -07:00
samcake
e306a24a1b
INtroducing the unlit mode for fragments
2016-05-05 17:08:52 -07:00
Brad Hefta-Gaub
1e30ba43ea
Merge pull request #7781 from zzmp/log/pipeline-flood
...
Avoid missing pipeline log flood
2016-05-05 00:15:10 -07:00
Brad Hefta-Gaub
bbf358f81d
Merge pull request #7796 from samcake/blue
...
Improve Translucent shapes global lighting with support for the ambient map reflection
2016-05-03 11:14:06 -07:00
Zach Pomerantz
0bc89d6b18
Avoid missing pipeline log flood
2016-05-03 09:39:31 -07:00
samcake
88f816fab4
Adding reflection of the ambient map for translucent
2016-04-28 18:18:18 -07:00
Zach Pomerantz
2f20e58301
Avoid crashing on missed pipelines
2016-04-27 19:54:52 -07:00
samcake
4202e60ac3
trying to add the skymap on translucents
2016-04-26 18:20:15 -07:00
samcake
5cb346330b
Merging with master
2016-04-25 18:48:58 -07:00
samcake
fd3efa37e3
Cleanup the shaders to avoid any uniform in genral, fixed a bug woith the emissive params applied twice for model_lightmap.slf
2016-04-22 10:56:21 -07:00
samcake
5a67411d75
Removing separate uniforms for the texcoord transforms and lightmap params, shader still failing
2016-04-21 18:35:37 -07:00
samcake
28521aa66a
REmoving uneeded changes
2016-04-19 11:01:41 -07:00
samcake
265f6f1275
Updating & Merging with master
2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
5d550197bd
Merge pull request #7697 from samcake/orange
...
Introduce a simple state sort for drawing opaque items
2016-04-19 08:41:49 -07:00
samcake
9087de22bd
Fixing the extra spaces
2016-04-18 16:10:11 -07:00
samcake
ca720efce6
Exposing the timing of the jobs by default
2016-04-18 14:53:06 -07:00
samcake
0ae54b9abc
Typo
2016-04-18 11:45:48 -07:00
samcake
d746fba142
Cleaning up the stats.qml
2016-04-18 11:18:28 -07:00
samcake
88c58cc276
Adding the simple state sort to draw opaque deferred
2016-04-18 10:51:31 -07:00
samcake
0531f90675
Adding state sorting for free
2016-04-18 00:22:05 -07:00
samcake
ff1df0d45e
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-12 15:29:58 -07:00
samcake
ab9f41f5eb
Trying something a bit more radical for timing
2016-04-12 15:29:31 -07:00
samcake
710c4a1b8f
TRying to merge and expose counters for in flights transfers
2016-04-05 12:18:30 -07:00
samcake
9d1f91fa19
First pass at using compressed format when uploading textures
2016-03-31 19:27:35 -07:00
Anthony Thibault
26b9469df5
Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fix
...
Model: fix for crash when displaying collision mesh
2016-03-30 16:48:07 -07:00
samcake
6213e0859d
Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned
2016-03-30 15:07:45 -07:00
Anthony J. Thibault
103257493c
Model: fix for crash when displaying collision mesh.
...
This was due to a default constructed PayloadPointer being sent to the scene via resetItem.
The fix is to A) not do that anymore, B) make resetItem more robust and not crash if this happens.
2016-03-30 14:24:28 -07:00
samcake
be27eaff24
Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights
2016-03-29 17:51:24 -07:00
samcake
aa085f6955
Putting members of the ENgineStats class NOT public so they can keep their name proudly
2016-03-28 11:52:31 -07:00
samcake
5a3896b1de
FIxing warnigns
2016-03-27 09:35:13 -07:00
samcake
7361304084
Cleaning up for review
2016-03-25 18:38:52 -07:00
samcake
c23640249e
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-03-25 15:29:01 -07:00
samcake
9b58d50fd4
BUilding a more complete set of tools to monitor performances
2016-03-25 15:28:06 -07:00