Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 09:56:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51434 commits 74 branches 59 tags 1.2 GiB
Commit graph

2421 commits

Author SHA1 Message Date
samcake
9281b28d43 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-01 13:39:12 -07:00
samcake
9a604d0ede Bringing Beckmann specular to the lighting 2016-06-30 19:03:24 -07:00
Brad Davis
b7926b8582 Don't render wire geometry with lighting effects 2016-06-30 16:11:05 -07:00
samcake
ab21a5a5d5 FIxing the bad brdf and adding better debug tool and better Pipeline architecture 2016-06-29 18:59:06 -07:00
Seth Alves
5f9c7b6ea5 trying to take joint information into account when raypicking against models 2016-06-29 17:02:49 -07:00
Seth Alves
d53c7ae5d8 experimenting 2016-06-29 12:39:04 -07:00
samcake
7f5e22d0eb Post tuesday review, clean up 2016-06-28 17:20:24 -07:00
samcake
d128af48db Fix the curvature issue in stereo by evaluating in the mono clip space, not stereo. INtegrate the scattering in simple ambient without IBL 2016-06-28 13:47:55 -07:00
samcake
197d49fc03 introducing the depth aware blur 2016-06-27 17:04:37 -07:00
samcake
9bc8441c73 Friday night build, working on getting the LUT generated on the GPU 2016-06-24 17:50:43 -07:00
samcake
a619a142ed Friday night build, working on getting the LUT generated on the GPU 2016-06-24 17:48:40 -07:00
samcake
ec68eba3cb Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-24 09:37:52 -07:00
samcake
e95a31f760 CLeaning up and debugging the splotch 2016-06-24 09:18:04 -07:00
samcake
884b9211c6 Curvature is looking correct now without artefact, moving on to the lighting 2016-06-23 17:13:48 -07:00
samcake
3ec14fd746 MErging and still trying to understand the curvature isssue 2016-06-22 18:06:55 -07:00
samcake
bd28498833 trying to fix the curvature artefact 2016-06-21 18:25:02 -07:00
samcake
0c882832bf Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now) 2016-06-20 17:58:35 -07:00
Andrew Meadows
5d5dc2837b fix comment 2016-06-20 17:29:20 -07:00
samcake
37a6d29406 Finally clean the lighting pass for global and local lights, split it into global and locals and make it work with the stereo single drawcall 2016-06-17 17:19:49 -07:00
samcake
904efc8076 SPlitting appart the DeferredLIghting Effect 2016-06-17 09:31:32 -07:00
samcake
350f06465d Introducing the deferredFRameTransform to DeferredLighting Effect and simplifying the rendering! 2016-06-16 18:28:08 -07:00
samcake
40a4e72f73 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-15 15:14:19 -07:00
samcake
e31a3b4d08 After trying stop trying to expose a generic [] operator on Varying and Containers 2016-06-15 15:13:51 -07:00
samcake
42eaaf742d Protoype done 2016-06-14 18:29:06 -07:00
samcake
8858f9dc82 IUse the light stage finally for the scattering prototype 2016-06-14 09:54:51 -07:00
Brad Davis
196ab401e5 Merge pull request #8046 from SamGondelman/proceduralRaymarch 
Exposed orientation and eye position to procedural entity shaders
 2016-06-14 09:48:07 -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
SamGondelman
8a682450a9 still trying to fix cmake errors 2016-06-10 17:01:22 -07:00
samcake
6831710efb Adding the deawSCattering pass 2016-06-09 19:13:28 -07:00
samcake
75a2864845 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-09 14:36:28 -07:00
samcake
0b873365ed save current state 2016-06-09 14:35:44 -07:00
samcake
7bd686167e Adding the generation of the Scattering on GPU 2016-06-09 09:33:03 -07:00
samcake
e69022285e A lot more stuff to try to see the skin scattering 2016-06-08 18:58:50 -07:00
Brad Hefta-Gaub
262e0262fc Merge pull request #7889 from samcake/color 
add support for ambient occlusion texture and lightmap texture for fbx exported from Blender
 2016-06-08 17:38:45 -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
samcake
8d90570f72 Correcting the Z sign 2016-06-06 09:29:50 -07:00
samcake
0ea1e7c6b5 Adding acleaner way to do all the deferred frame transform manipulation 2016-06-03 19:29:48 -07:00
Andrew Meadows
c73757f740 use many colors for collision hull rendering 2016-06-03 10:47:54 -07:00
samcake
079f6af2cc Fixing the gamma correction for the debug view of occlusion 2016-06-02 16:14:46 -07:00
samcake
2489df8229 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 15:16:41 -07:00
samcake
25eb569433 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 10:38:40 -07:00
samcake
1dca62f752 Introducing a new technique for normal packing and fixing a bug on the normal buffer format 2016-06-01 17:51:53 -07:00
samcake
3fe9b67e45 FIxing the reflection jittering by moving the normal into world space 2016-05-27 19:24:56 -07:00
Andrew Meadows
1132b4666a Merge pull request #7975 from jherico/shared_shapes 
Moving shape definition to a shared location
 2016-05-27 07:28:11 -07:00
Brad Davis
2c02c963d4 Moving shape definition to a shared location 2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision 
Improved Avatar Mixer Rotation Precision
 2016-05-25 17:14:12 -07:00
samcake
b76cda3c89 Merge pull request #7945 from Geenz/20901 
20901: Add Range Based Light Attenuation
 2016-05-25 16:39:01 -07:00
Brad Hefta-Gaub
b8b39b962d Merge pull request #7868 from jherico/entity_shape 
Add a generic shape primitive
 2016-05-24 08:40:58 -07:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Geenz
bd6f6d2eef Typo. 
Not quite sure how this got here.
 2016-05-23 09:53:22 -04:00
Brad Davis
2c703e963c More shapes 2016-05-22 19:48:59 -07:00
Geenz
ff3fca3dc3 Remove no longer necessary light vector parameter. 2016-05-22 21:50:48 -04:00
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Geenz
a80f47e550 Merge remote-tracking branch 'highfidelity/master' into 20901 2016-05-20 21:12:42 -04:00
Brad Hefta-Gaub
95f7ea5609 Merge pull request #7922 from samcake/red 
improve performance of Light volume pass
 2016-05-20 09:33:55 -07:00
Geenz
6ecbdc6b9a Modify evalLightAttenuation to "fade" edges of lights. 
This provides a more attractive light falloff around the bounds of a
light - removing harsh edges.

This also adds a new parameter to evalLightAttenuation - the
unnormalized light vector.
 2016-05-19 20:03:05 -04:00
samcake
2d7118dacc clening up the code 2016-05-19 10:21:00 -07:00
Zach Pomerantz
e1971f5ed3 Fix shadow bounds checking 2016-05-18 18:58:28 -07:00
samcake
185f069441 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-05-18 13:16:14 -07:00
samcake
89f18aee3b Simplifying the deferredbuffer clear and enableing z test for lighting pass 2016-05-18 13:14:42 -07:00
samcake
8ec280535b FIx bad roughness value read from the deferred buffer 2016-05-17 11:13:34 -07:00
samcake
d06c6e2a59 Fix forgotten vertex shader case 2016-05-16 17:54:42 -07:00
Anthony J. Thibault
55b0060df9 Convert JointData from relative frame to absolute. 2016-05-16 17:48:52 -07:00
samcake
a12e56f880 Fix forgotten vertex shader case 2016-05-16 17:43:54 -07:00
samcake
c1fa096e78 adding texcoord 1 on all the material/model and go fetch occlusion map with this uv instead of texcoor0. this allow for separate transforms just for occlusoin map 2016-05-16 15:42:48 -07:00
Brad Hefta-Gaub
1f800294c6 Merge pull request #7880 from jherico/gpu_smart_buffers 
Support partial CPU->GPU buffer transfers
 2016-05-14 17:44:26 -07:00
Brad Davis
1e136ed71f Fix procedural rendering on primitives 2016-05-14 10:59:59 -07:00
Brad Davis
9509e32928 PR feedback 2016-05-14 08:28:51 -07:00
Brad Hefta-Gaub
e754b9e19c Merge pull request #7871 from samcake/hdr 
Defaulting the color formats used in the rendering pipeline to sRGB
 2016-05-13 17:35:48 -07:00
Brad Davis
85272a87ba Merge pull request #7859 from samcake/lemon 
Introduce the "Unlit" shading model support and apply it to Web Enitities
 2016-05-12 15:09:50 -07:00
samcake
d5a9d39edf Defaulting the color formats used in the rendering pipeline to sRGB 2016-05-11 18:01:19 -07:00
samcake
1ec9ef560e Fixing the srgb color format conversion for web entities 2016-05-11 10:46:54 -07:00
samcake
e40a795a27 Trying to clean up for pr 2016-05-10 19:25:22 -07:00
Anthony J. Thibault
80a349c65b Merge branch 'master' into tony/improved-avatar-debug-draw 2016-05-10 14:50:13 -07:00
samcake
303cade547 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-10 09:56:05 -07:00
samcake
00f2e34aa9 Changing emissive to unlit 2016-05-09 17:18:07 -07:00
samcake
615f4028c4 fixing the web enitites lighting, still need to solve the sRGB for it, starting to introduce the unlit feature to the overlays 2016-05-09 17:17:16 -07:00
Anthony J. Thibault
641e152699 Eye tracking bug fix and debug rendering improvement 
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
 2016-05-08 16:20:32 -07:00
samcake
a8347cac6e Getting the unlit to work from the pipeline, and found the isLinear for texture bug! 2016-05-06 18:36:55 -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
samcake
f1b236f3be adding the DeferredBUfferRead.slh 2016-05-04 18:51:35 -07:00
samcake
2d573963bb Introducing the unlit material 2016-05-04 18:50:52 -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
Geenz
85e0620261 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-04-30 15:40:28 -04:00
samcake
257c8c94c3 clean up the lighting function and put the global specular lighting in a separate function 2016-04-29 10:58:55 -07:00
samcake
88f816fab4 Adding reflection of the ambient map for translucent 2016-04-28 18:18:18 -07:00
samcake
4202e60ac3 trying to add the skymap on translucents 2016-04-26 18:20:15 -07:00
Geenz
bf31fc728a And another. 2016-04-26 18:54:02 -04:00
Geenz
ef7098b39a Missed a few. 2016-04-26 17:12:04 -04:00
samcake
5cb346330b Merging with master 2016-04-25 18:48:58 -07:00
Chris Collins
9bd9de5710 Merge pull request #7636 from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
samcake
43caca901f Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-04-22 10:57:14 -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
Ryan Huffman
f90e1aaa23 Remove #line from starsGrid.slf 
Fails to compile with certain drivers.
 2016-04-20 15:04:10 -07:00
Brad Davis
882267e08f Merge pull request #7709 from samcake/blue 
Introduce Shader Compilation versions
 2016-04-19 11:14:22 -07:00
samcake
21b0341e50 REmoving extra cruff 2016-04-19 10:51:44 -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
Brad Hefta-Gaub
c41b320d40 Merge pull request #7706 from zzmp/fix/text3d-font 
Fix text3d to allow transparent text
 2016-04-19 07:50:36 -07:00
samcake
85fd1dcb5b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-04-18 18:25:16 -07:00
samcake
cadb53b703 Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more 2016-04-18 18:24:27 -07:00
Zach Pomerantz
2d9dcc8595 Fix text3d to allow transparent text 2016-04-18 16:02:45 -07:00
samcake
ca720efce6 Exposing the timing of the jobs by default 2016-04-18 14:53:06 -07:00
samcake
3887dfdf34 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-18 11:52:45 -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
298300e42f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-15 14:16:02 -07:00
Zach Pomerantz
2e4e1dd590 Fix leaking Font 2016-04-14 17:00:23 -07:00
samcake
7653fa2c37 Fixing the resize of framebuffer to avoid reassigning the render buffer every frame 2016-04-13 10:56:29 -07:00
samcake
e9a0365454 Removing an include not needed 2016-04-13 00:16:04 -07:00
samcake
ab9f41f5eb Trying something a bit more radical for timing 2016-04-12 15:29:31 -07:00
samcake
042a419669 Adding counters, not sure they are really useful or that this is the best way to do this... 2016-04-12 02:44:10 -07:00
samcake
816a35099a Adding tcpu timer on some jobs 2016-04-11 18:34:52 -07:00
samcake
90fd9d77a5 Merging with Master 2016-04-11 18:34:14 -07:00
samcake
8964c2427d adding support for the 2 versions of the shaders nad solving the mapping of uniforms that arise with it 2016-04-08 18:47:21 -07:00
samcake
2f8d30e7ce Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-08 09:34:55 -07:00
howard-stearns
5284af6b51 Update text3d shader post pbr. 2016-04-06 12:15:19 -07:00
samcake
d3a87f8db2 need to merge, commiting at a broken state 2016-04-04 18:25:23 -07:00
Anthony Thibault
865a77ae20 Model: fixed two crash issues when changing avatars 
* When the GeometryReader has the last ref to the GeometryResource ptr
  It needs to hold on to the reference until invokeMethod is completed.
  Otherwise, invokeMethod will call a method on a deleted object, leading
  to memory corruption or crashes.

* When the Model URL is changed, the clusterMatrices are invalided and the
  RenderItemsSets are cleared.  However, there still might be renderItems in
  the scene pending changes list that might refer to those RenderItems and their
  clusterMatrices.  We need to guard against this access to prevent reading from
  memory that was previously freed.

Both of these issues were uncovered using the [avatar-thrasher](https://gist.github.com/hyperlogic/d82a61d141df43d576428501a82c5ee6) test script.
 2016-04-02 21:48:22 -07:00
Anthony J. Thibault
5e81cccc6c Merge branch 'master' into tony/culling-fixes 2016-04-01 09:29:46 -07:00
Anthony J. Thibault
d670853941 AnimDebugDraw: enable bound now that culling works. :) 2016-03-31 16:10:04 -07:00
Anthony J. Thibault
bc967f0ab0 Model: update renderItems when items are added to the scene. 
* Renamed enqueueLocationChange to updateRenderItems
* Call updateRenderItems when models are added to the scene.

This will fix entity render bounds being incorrect when they are first added to the scene,
then later being correct after a position update.

* Renamed getMeshPartBound to getRenderableMeshBound.
* Avatar now uses getRenderableMeshBound() to do boundingRadius vs frustum check.
* Model::getRenderableMeshBound now returns a more accurate bound, because it is the same one used for rendering.

This will fix avatar freezing, when they are in the corner of your frustum.
This was due to matrices not being updated because the avatar had to a small bounding sphere.
 2016-03-31 14:59:27 -07:00
Anthony J. Thibault
635f58629a MeshPartPayload: remove dead code 2016-03-31 14:58:25 -07:00
samcake
1b54a29491 small improvments adn exploring the jittering bug for reflections 2016-03-31 11:34:27 -07:00
Zach Pomerantz
e4cba14333 Avoid recreating model items when adding to scene 2016-03-31 10:46:51 -07:00
Zach Pomerantz
3de5f73a1f Fixup model on tex load 2016-03-31 10:46:51 -07:00
samcake
a07ae70ea0 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-31 10:04:51 -07:00
samcake
10ddecd536 Debuggingh the reflection jittering 2016-03-31 01:51:26 -07:00
Brad Hefta-Gaub
a7f93aa75c Merge pull request #7519 from zzmp/fix/avatar-crash 
Fix crash from updating/resetting avatar
 2016-03-30 21:31:17 -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
Seth Alves
d9909fb7da Merge pull request #7518 from hyperlogic/tony/model-hand-grab-fix 
Model: Fix for equipped models not updating their matrices
 2016-03-30 16:10:21 -07:00
samcake
c13e24438c Merge pull request #7512 from zzmp/fix/light-buf-fmt 
Correctly represent lighting framebuffer
 2016-03-30 16:10:10 -07:00
samcake
6033ad81db Adding time counter 2016-03-30 16:09:33 -07:00
Zach Pomerantz
6e0d6ee45b Guard updateClusterMatrices from unloaded geo 2016-03-30 16:04:00 -07:00
Zach Pomerantz
00db095306 Guard against reset model geo on scene update 2016-03-30 15:49:45 -07:00
Anthony J. Thibault
f6344c34e7 Model: Fix for equipped models not updating their matrices 2016-03-30 15:19:35 -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
Zach Pomerantz
1234514e8f Correctly represent light fbo fmt 2016-03-30 11:22:44 -07:00
samcake
0ee1f039e9 Telling like it is... 2016-03-30 11:15:10 -07:00
samcake
11b6952eff Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-30 09:49:17 -07:00
samcake
b492c4b52c DUmb fix to the flickering issue by overshooting the inside volume of the light and avoid the failing region 2016-03-30 09:32:40 -07:00
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
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
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
samcake
16ac69315f Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture 2016-03-01 16:38:02 -08:00
Zach Pomerantz
5c64115b26 Use keyLight in DLE instead of _skyboxTexture 2016-03-01 14:44:34 -08:00
samcake
9fb318570b Ajusting the pure Ambient SH lighting pass and more review issues 2016-03-01 12:24:44 -08:00
samcake
89920370db A bunch of typo fixes after review 2016-03-01 10:53:08 -08:00
samcake
630c61e61d Reflection is working correctly with the PBR property, ship t 2016-02-29 18:54:43 -08:00
samcake
cfcde5032c Post merge with Zach work for environment map 2016-02-26 16:32:29 -08:00
Zach Pomerantz
32807012e8 Rm redundant texture reset in overlay draw 2016-02-26 16:26:16 -08:00
samcake
99ba011996 Post merge with Zach work for environment map 2016-02-26 16:04:50 -08:00
Zach Pomerantz
30fbd99d11 Factor out SortTask to fix shadows 2016-02-26 16:04:15 -08:00
Zach Pomerantz
2cd6706a6a Update fetch to use nonspatialSet 2016-02-26 14:46:42 -08:00
Zach Pomerantz
6c3dd027a7 Use spatial tree for shadow fetch 2016-02-26 14:46:41 -08:00
Zach Pomerantz
1fbcaea4b4 Fix evalSkyboxGlobalColor 2016-02-26 14:20:21 -08:00
Zach Pomerantz
fdffd8b6e0 Track skybox mipmap levels in DeferredTransform 2016-02-26 13:51:55 -08:00
Zach Pomerantz
712cf911b1 Differentiate global sun and skyStage sun 2016-02-26 11:06:02 -08:00
samcake
3ee6f9d6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 23:48:53 -08:00
Andrew Meadows
f964df6c97 final names for ViewFrustum intersection tests 2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853 use shapeInFrustum() names again 
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
 2016-02-25 18:09:35 -08:00
Brad Hefta-Gaub
202a456e1a Merge pull request #7126 from AndrewMeadows/cleanup 
cleanup ViewFrustum method names
 2016-02-25 16:12:25 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00
samcake
96fb9c4466 cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures 2016-02-25 14:13:35 -08:00
Zach Pomerantz
32ce7c6eab Rename light surfaceRadius->falloffRadius 2016-02-25 10:02:33 -08:00
Andrew Meadows
9c927ea36b ViewFrustum method renames and whitespace cleanup 
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
 2016-02-25 09:11:28 -08:00
Brad Hefta-Gaub
91f6b7e80d Merge pull request #7186 from zzmp/feat/scene-ambient-tex 
Wire up zone ambientURL
 2016-02-25 09:05:25 -08:00
samcake
287bfeddda Fixing the way the Obscurance is used with the ssao map 2016-02-24 18:31:08 -08:00
samcake
ae6e625894 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-24 17:30:40 -08:00
samcake
a0d7ce145e Adding support for emissive and occlusion maps, on to pr land 2016-02-24 17:30:29 -08:00
Zach Pomerantz
c2ed5e5474 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-24 16:24:09 -08:00
Zach Pomerantz
20bfdba14b Avoid light prop copies when setting globalLight 2016-02-24 16:20:59 -08:00
Zach Pomerantz
1817b8ef2f Use only skyboxTexture in DeferredLightingEffect 2016-02-24 16:07:28 -08:00
Zach Pomerantz
95d98e3ed7 Wire up zone ambientURL 2016-02-24 16:07:04 -08:00
Zach Pomerantz
124c84c8b9 Fix fxaa shader to use texture 2016-02-24 13:36:08 -08:00
Brad Hefta-Gaub
3df5d0abad Merge pull request #7161 from zzmp/fix/overlay-model-scale 
Use proper getter for model overlay scaling
 2016-02-24 09:31:47 -08:00
Chris Collins
7f679af186 Merge pull request #7176 from zzmp/menu/graphics 
Update graphics menus
 2016-02-24 08:18:58 -08:00
samcake
2f5800a4cc IMproving the shading model and the loading, added the roughness, needt to clean up 2016-02-23 18:31:38 -08:00
Zach Pomerantz
ea8edb3744 Remove antialiasing from menus, default to on 2016-02-23 16:24:44 -08:00
Zach Pomerantz
7804ee22d4 Consolidate stats for opaque/transparent/other 2016-02-23 12:14:00 -08:00
Zach Pomerantz
7c9022fb3e Fix model overlay scaling 2016-02-23 10:40:47 -08:00
samcake
9d0803e6b8 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-23 09:33:54 -08:00
samcake
9cb8bd0808 Adding one more feature for NULL_VAR in scribe function parameters and unifying the MAterialTexture shader code 2016-02-23 02:41:26 -08:00
samcake
00782b0e76 GOing home, this is in the middle of adding the Roughness texture and potentially cleaning up the different compinations of shaders regarding the material textures 2016-02-22 18:19:36 -08:00
Zach Pomerantz
77ad4039bc Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-22 15:11:12 -08:00
Zach Pomerantz
8ac84b3fc2 Render point/spot lights with surface radii 2016-02-22 15:07:08 -08:00
Ryan Huffman
e6ccf501fa Merge pull request #7135 from zzmp/fix/grid 
Update renderGrid to use a shader, and fix grid edit tools
 2016-02-22 12:58:23 -08:00
samcake
377ee5a486 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-22 09:23:14 -08:00
samcake
c7f43386e5 Compressing the g-buffer better 2016-02-22 09:23:16 -08:00
samcake
39a7852979 MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders 2016-02-19 18:43:07 -08:00
Zach Pomerantz
fd6aa9a78b Add layering to renderGrid, draw edit grid not layered 2016-02-19 13:57:32 -08:00
Zach Pomerantz
791d295578 Move paint shader functions to Paint.slh 2016-02-19 11:48:44 -08:00
Zach Pomerantz
9daefbdb94 Fix grid antialiasing 2016-02-19 11:39:11 -08:00
Seth Alves
fea60499d4 rename poorly named variable 2016-02-19 11:32:59 -08:00
Zach Pomerantz
07a5c7bd16 Update grid shader for major/minor lines 2016-02-19 11:22:01 -08:00
Seth Alves
ee5a82f9b8 call simulate from setScaleInternal rather than just initJointTransforms so the scale change is visible 2016-02-19 10:05:22 -08:00
samcake
e103fd364e USing metallic and not gloss map 2016-02-19 09:24:22 -08:00
samcake
903824809c trying to have better support for the materials 2016-02-18 18:33:32 -08:00
Zach Pomerantz
2d1c676a8b Add qHash for Vec2FloatPair 2016-02-18 16:17:24 -08:00
Zach Pomerantz
2bfbf1b5fd Reimplement renderGrid to use frag shader 2016-02-18 11:30:03 -08:00
samcake
b88501784c Making progress toward the PBR material 2016-02-17 18:47:52 -08:00
Zach Pomerantz
7ccb7e1c79 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-17 13:57:42 -08:00
Zach Pomerantz
bab29a0d3e Compare fragLightVec square to LightCutoffSquareRadius 2016-02-17 12:49:41 -08:00
Brad Hefta-Gaub
d5c349abec Merge pull request #7114 from samcake/hdr 
Adding Ambient lighting to transparent surfaces
 2016-02-17 09:08:38 -08:00
samcake
b03f639e2c Renaming and rearranging the material fields to support PBR fbx materials 2016-02-16 17:20:23 -08:00
samcake
71863a1550 Fixing the material names 2016-02-16 09:33:24 -08:00
samcake
0ad7bacf02 Changing diffuse to albedo and breaking everything... 2016-02-15 21:50:10 -08:00
samcake
29bacd23df Fixing the rendering of the avatar skeleton 2016-02-15 18:56:46 -08:00
samcake
a740f4a6de Removing unecessary code 2016-02-15 17:41:20 -08:00
samcake
b9d14b74ee Adding the GLobalKeyLighting to transparents, the ambient lighting 2016-02-15 17:27:28 -08:00
samcake
0639b2ace0 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-02-15 13:27:55 -08:00
samcake
545f276fdf Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-15 09:29:00 -08:00
samcake
e6d15c3d56 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-02-12 18:22:30 -08:00
samcake
4559e75f90 Trying to solve the ambient issue 2016-02-12 18:22:01 -08:00
Brad Hefta-Gaub
e003fe5f4b Merge pull request #7081 from zzmp/fix/mini-mirror-ao 
Disable AO in mini mirror
 2016-02-12 17:37:45 -08:00
samcake
9bfeb4a1d5 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 11:31:47 -08:00
samcake
c248732bc7 Getting the array initialization right ? 2016-02-12 10:27:08 -08:00
samcake
40c283cba2 Fixing some warnings 2016-02-12 10:21:28 -08:00
samcake
40455af7fc LEss warning 2016-02-12 10:16:20 -08:00
Zach Pomerantz
d516e9da78 Only run AO in DEFAULT_RENDER_MODE 2016-02-12 09:01:54 -08:00
samcake
b94c2c9b7f Introducing a cleaner filtering pipeline, normally it s good to go 2016-02-11 18:40:36 -08:00
Zach Pomerantz
d0f3ad75b8 Nest Persistent in Config to compile on nix 2016-02-11 10:27:32 -08:00
Zach Pomerantz
a7778daed2 Change graphics dialog to persisted dropdowns 2016-02-11 10:15:13 -08:00
samcake
31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 10:05:58 -08:00
samcake
355b8ee40d THursday morning the frustum culling seems broken in one particular angle 2016-02-11 10:05:39 -08:00
Zach Pomerantz
3bace3cdbb Rework the qml for brevity 2016-02-11 08:48:01 -08:00
Zach Pomerantz
86412c1890 Fix default debug buffer size 2016-02-11 08:47:59 -08:00
Zach Pomerantz
399861087d Reimplement lighting model 2016-02-10 20:02:44 -08:00
samcake
b1b08bf2f7 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-09 09:24:55 -08:00
Zach Pomerantz
a7bafed61b Change ShapeKey::CULL to NO_CULL_FACE 2016-02-08 13:44:42 -08:00
Zach Pomerantz
9e5df79279 Add tone-mapping to overlay emissive shader 2016-02-08 13:31:12 -08:00
Zach Pomerantz
1d2acbe47e Bring GeometryCache render*Instance up to standard 2016-02-08 13:28:14 -08:00
samcake
76d8135fdc Trying to introduce the Filtering step after the full scene culling 2016-02-05 18:21:21 -08:00
samcake
e5f3805d0e Fixing the item insert in cell criteria for subcell and adding debgging tool 2016-02-05 16:49:43 -08:00
Zach Pomerantz
d9132f3973 Clean up geometry instanced calls 2016-02-05 11:22:45 -08:00
Zach Pomerantz
b0a9c299ed Add tone mapping to overlay shaders 2016-02-05 11:18:42 -08:00
Zach Pomerantz
a1ed29e6f8 Rename setupTransparent->setupBatch 2016-02-05 10:53:01 -08:00
Zach Pomerantz
aa50d1e98e Add factor and shading to overlay/translucent light shaders 2016-02-05 10:27:07 -08:00
Zach Pomerantz
a4cea0a307 Conform model/overlay shaders 2016-02-04 16:21:56 -08:00
Zach Pomerantz
44d297e7e2 Differentiate named calls by pipeline 2016-02-04 15:32:47 -08:00
Zach Pomerantz
f0797d8ea0 Move instanced pipeline setup to lambda from batch 2016-02-04 15:32:28 -08:00
Zach Pomerantz
cb06d4a9e4 Fix -Wunused-variable for geometry solid stream formats 2016-02-04 10:13:35 -08:00
Zach Pomerantz
9e7e6be549 Fix -Wunused-variable for MeshPart ShapeKeys 2016-02-04 10:06:07 -08:00
Zach Pomerantz
0c31c072a3 Fix -Wreorder for DrawOverlay3D ctor 2016-02-04 10:03:35 -08:00
samcake
513561ba2d Using an angle for the LOD test 2016-02-04 09:31:21 -08:00
Zach Pomerantz
65ddb944d2 Add defaults/light/shaders to plumber 2016-02-03 19:18:56 -08:00
Zach Pomerantz
666213b7a8 Add CULL, DEPTH_BIAS to ShapeKey 2016-02-03 19:18:56 -08:00
Zach Pomerantz
8d0f82fa6a Split DrawOverlay3D to Transparent/Opaque 2016-02-03 19:18:56 -08:00
Zach Pomerantz
399fe95dc9 Update overlay/emissive shaders 2016-02-03 19:18:56 -08:00
Zach Pomerantz
9af7dc9c3e Add layering to text renderer 2016-02-03 19:18:56 -08:00
Zach Pomerantz
a790b09892 Supply normals to GeometryCache draw calls 2016-02-03 19:18:56 -08:00
Zach Pomerantz
d14ce8a9fe Pass an explicit pipeline to render.*Instance calls 2016-02-03 19:18:56 -08:00
samcake
0478450205 Refining the culling test and defining the 2 new jobs FetchSPatialTree and CullSpatialSelection 2016-02-03 18:38:57 -08:00
samcake
edbcef20d4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-03 09:44:05 -08:00
samcake
cb59cccc0c Adding 2 lists per brick now, the subcelItems and the regular items, trying to use it, probably buggy 2016-02-02 18:10:56 -08:00
samcake
940ef40b69 Merge pull request #6999 from zzmp/refactor/render-init-file 
Migrate stencil and overlay jobs to use plumbers
 2016-02-02 17:45:17 -08:00
Zach Pomerantz
aa10af2851 Revert "Move DrawStencil to use ShapePlumber" 
This reverts commit 671f27e5bc.
 2016-02-02 17:10:21 -08:00
samcake
7cb0108457 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-01 15:17:58 -08:00
samcake
1b52d700a0 Merge pull request #6871 from Atlante45/feat/draw-call-info 
Unify normal and named draw paths
 2016-02-01 14:19:15 -08:00
Zach Pomerantz
5d49eacf83 Move pipeline init to separate file 2016-02-01 11:12:11 -08:00
Zach Pomerantz
df894d364a Move DrawOverlay3D to use ShapePlumber 2016-02-01 10:30:14 -08:00
Zach Pomerantz
671f27e5bc Move DrawStencil to use ShapePlumber 2016-02-01 10:30:08 -08:00
Atlante45
a5603140de Fix for mac 2016-02-01 18:50:01 +01:00
Atlante45
38a223b270 Split declareStandardTransform 2016-02-01 18:50:01 +01:00
Atlante45
7e8ea4dc77 Update primitive instance rendering calls 2016-02-01 18:50:01 +01:00
Atlante45
ccb183e518 Unify Named/Normal calls 2016-02-01 18:50:01 +01:00
howard-stearns
9601b65269 Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-29 11:40:13 -08:00
samcake
9c5670fc0f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-28 15:31:56 -08:00
samcake
5863e340af Cleaner... 2016-01-28 12:46:18 -08:00
samcake
ef451d40df Cleaner... 2016-01-28 12:39:52 -08:00
samcake
62d5a45829 Cleaner init 2016-01-28 12:20:09 -08:00
samcake
bf3a09cd00 Fixing the default value for the TOneMapping curve and cleaning the code into the ToneMappingEffect file 2016-01-28 12:14:20 -08:00
samcake
0c50903030 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-28 11:19:37 -08:00
samcake
54b9c1ac0d Merge pull request #6962 from zzmp/feat/task-io 
Reduce code duplication for render::Job::Model
 2016-01-28 09:31:26 -08:00
samcake
20e1270e92 Merging with upstream and still debugging the cell navigation math 2016-01-27 18:59:18 -08:00
samcake
f4e0352f61 Merge pull request #6930 from zzmp/feat/bubble-render-settings 
Bubble up render settings from CPP to JS/QML
 2016-01-27 14:20:51 -08:00
howard-stearns
fa40e347ee Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-27 13:35:02 -08:00
samcake
6d2d7c565a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-27 10:03:34 -08:00
Zach Pomerantz
49c1285837 Add suffix Mode to DebugMode enum to avoid collision 2016-01-26 19:11:59 -08:00
samcake
1b1ffa494b Making the octree more useful and cleaning up the interaction with the Scene 2016-01-26 18:46:57 -08:00
Zach Pomerantz
4354eae129 Fix type, gaussion->gaussian 2016-01-26 18:09:18 -08:00
Zach Pomerantz
61f337b490 Hold Varying constant over task ctor 2016-01-26 17:43:41 -08:00
Zach Pomerantz
5009e8702e Cleanup new render settings 2016-01-26 15:58:50 -08:00
Zach Pomerantz
2d0d542765 Fix friend class typedef confusion in gcc 2016-01-26 12:44:56 -08:00
Zach Pomerantz
2da2bc60db Tie shadow frustum to boom offset 2016-01-26 12:26:16 -08:00
howard-stearns
2e7f1cbb3f Align avatar animation with LOD visibility. 2016-01-26 11:59:18 -08:00
samcake
b96bbab22f Drafting the Octree and a debugging job 2016-01-25 18:14:05 -08:00
Zach Pomerantz
59ac93485e Propogate configuration changes through tasks 2016-01-25 15:18:13 -08:00
Zach Pomerantz
e73902899b Explicitly emit dirty for AO/Debug 2016-01-25 15:18:12 -08:00
Zach Pomerantz
46c937325e Make Job MEMBER enabled explicit 2016-01-25 15:18:11 -08:00
Zach Pomerantz
14d907206e Clean out job enable logic from Job 2016-01-25 15:17:44 -08:00
Zach Pomerantz
56cc4dc223 Add Job::Config to RenderShadowTask 2016-01-25 12:14:58 -08:00
Zach Pomerantz
f3265db298 Gut RenderContext 2016-01-25 12:14:58 -08:00
Zach Pomerantz
e8b8f4d535 Add Job::Config to HitEffect 2016-01-25 12:14:58 -08:00
Zach Pomerantz
772aedde91 Add Job::Config to AmbientOcclusion 2016-01-25 12:14:58 -08:00
Zach Pomerantz
ba61c1f865 Fix draw calls to use members 2016-01-25 12:14:58 -08:00
Zach Pomerantz
ccbec54f2d Add Job::Config to DebugDeferredBuffer 2016-01-25 12:14:58 -08:00
Zach Pomerantz
f1b7807db7 Add Job::Config to Draw 2016-01-25 12:14:58 -08:00
Zach Pomerantz
9064438bf0 Replace RenderScriptingInterface with dynamic Task::Config 2016-01-25 12:13:55 -08:00
Zach Pomerantz
adc9d2ea07 Add Job::Config to FetchItems 2016-01-25 12:13:55 -08:00
Zach Pomerantz
5698be5435 It works 2016-01-25 12:13:55 -08:00
Zach Pomerantz
75cddec647 Add alwaysEnabled render::Job::Config 2016-01-25 12:13:55 -08:00
Zach Pomerantz
b70108bb9a Working demo 2016-01-25 12:13:55 -08:00
Zach Pomerantz
2e1fbf66ad Refine Configuration for render::Job 
wip

wip

wip

wip
 2016-01-25 12:13:55 -08:00
Zach Pomerantz
581003ec83 Use QObject-derived Configuration for render::Job 2016-01-25 12:13:55 -08:00
Zach Pomerantz
8b68d5922c Make Engine a Task 2016-01-25 12:13:55 -08:00
samcake
483d20d7a3 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-22 18:31:30 -08:00
samcake
9f87089c05 Fixing the Anitialising breaking the transparent rendering 2016-01-22 18:25:26 -08:00
Zach Pomerantz
b62fc50557 Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-22 10:32:54 -08:00
Zach Pomerantz
dee8e0ba9d Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-22 10:03:06 -08:00
samcake
24d1f113f8 Fixing the warning maybe 2016-01-22 09:44:32 -08:00
samcake
6bcd7f10ad Try the constant gaussian values which are more stable on mac... 2016-01-21 23:54:51 -08:00
samcake
b7f14789af Refining the ao effect on the blur side 2016-01-21 19:02:32 -08:00
Brad Hefta-Gaub
e1c369dc10 Merge pull request #6766 from samcake/hdr 
Ambient Occlusion
 2016-01-21 18:10:52 -08:00
samcake
b5aa5fcb46 more clean up 2016-01-21 17:36:53 -08:00
samcake
8eddd52731 Fixing coding guidelines 2016-01-21 16:54:37 -08:00
samcake
402809fe2f FIxing coding standards 2016-01-21 16:44:35 -08:00
samcake
9c344c6498 FIxing the bordering enble default value 2016-01-21 16:38:21 -08:00
samcake
16573357d8 FIxing the AO results at the border of the frame by guarding the fetch out of the frame 2016-01-21 15:50:38 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
samcake
8d1ab01018 exposing one more parameter 2016-01-20 18:32:44 -08:00
samcake
4e5869b247 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 16:30:24 -08:00
Zach Pomerantz
0c798c06a9 Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-20 14:51:42 -08:00
samcake
07c630bcda And cleaning again hopping to have the pr build 2016-01-20 11:44:01 -08:00
samcake
35ea04ae7c fixing the bug that kept AO when ao is off... 2016-01-20 11:13:50 -08:00
samcake
379c882834 Debugging the darkness and pointing out bugs 2016-01-20 02:03:09 -08:00
samcake
c5c51f2af2 Make sure the resolution level for ao is correct 2016-01-19 18:57:03 -08:00
Zach Pomerantz
3445b7fd2c Fix orientation aligned with Y 2016-01-19 18:39:34 -08:00
samcake
584d50b594 Experimenting with AO on the lightmaped surface 2016-01-19 17:56:07 -08:00
Zach Pomerantz
c794ae8da2 Avoid shadow attenuation outside of mapped area 2016-01-19 15:48:20 -08:00
Zach Pomerantz
27967f6064 Use 4-sample PCF for shadowMap sampling 2016-01-19 15:48:20 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -08:00
Zach Pomerantz
387a14b6b1 Fix shadowMap vertical keylight edge case 2016-01-19 12:01:40 -08:00
Zach Pomerantz
398f83be3f Change shadow debug buffer to reuse shadowMap tex 2016-01-19 12:01:18 -08:00
Zach Pomerantz
568ae2e7bc Move ShoudRenderFunctor to render::CullFunctor 2016-01-19 11:24:11 -08:00
Zach Pomerantz
7a5562abce Do not cauterize bones in SHADOW_RENDER_MODE 2016-01-18 20:51:28 -08:00
Zach Pomerantz
3c80002dfe Fix keylight frustum culling by calc internal state before use 2016-01-18 20:10:52 -08:00
Zach Pomerantz
1b36d56b7a Add shadowmap as a debug feature 2016-01-18 17:12:42 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
samcake
29945bba92 Merge pull request #6837 from zzmp/feat/render-shadow 
Add RenderShadowTask
 2016-01-18 15:45:51 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
Brad Hefta-Gaub
d10e1cc39d CR feedback, dead code cleanup 2016-01-18 12:09:21 -08:00
Zach Pomerantz
6434d98365 Separate directional shaders with(out) shadowmaps 2016-01-18 11:11:28 -08:00
samcake
bc579f2605 Clening up the gpu::Timer behavior, now need a way to show it 2016-01-18 09:53:41 -08:00
samcake
39f1649cdf refining the settings for the blur pass and splitting the uniforms in 2 buffers, one per frame with transform info and one for the parameters which are rarely changing 2016-01-16 22:16:07 -08:00
samcake
483c28dc2d Adding gpu timer feature to actually the GPU cost of rendering 2016-01-15 19:00:18 -08:00
Zach Pomerantz
7f3e102b5e Rename renderLights to renderItems 2016-01-15 17:55:07 -08:00
Zach Pomerantz
7fd20bb036 Set shadow pipelines manually to avoid duplication 2016-01-15 17:55:07 -08:00
Zach Pomerantz
625eee2b9c Clean RenderShadowTask ctor 2016-01-15 17:55:07 -08:00
Zach Pomerantz
f3a5be9ec0 Decrease shadowMap res to 1024 2016-01-15 17:55:07 -08:00
Zach Pomerantz
562c909ad8 Update shadow shaders 2016-01-15 17:55:07 -08:00
Zach Pomerantz
b2c9cf7452 Fit shadowmap to viewFrustum better 2016-01-15 17:55:07 -08:00
Zach Pomerantz
2b27e48bf9 Update shadow shaders 2016-01-15 17:55:07 -08:00
Zach Pomerantz
bc379e920b Update shadow programs 2016-01-15 17:55:07 -08:00
Zach Pomerantz
fad38c0bfb Add uniform buffer to LightStage 2016-01-15 17:55:07 -08:00
Zach Pomerantz
5c1c1e3a3b Change LightStage setFrustum signature to near/farDepth 2016-01-15 12:57:31 -08:00
Zach Pomerantz
d6e5e2de81 Fix orientation of shadow frustum 2016-01-15 12:43:45 -08:00
samcake
2494623bc7 Cleaning the code for review 2016-01-15 10:55:43 -08:00
Zach Pomerantz
986af50b71 Remove unneccessary const 2016-01-15 10:50:42 -08:00
Zach Pomerantz
b423bc38ba Remove magic numbers 2016-01-15 10:46:01 -08:00
Zach Pomerantz
e914f02445 Use near/far in LightStage setFrustum 2016-01-15 10:28:52 -08:00
Zach Pomerantz
710fb5df53 Fix shadowed orientation in LightStage 2016-01-15 10:18:29 -08:00
samcake
ae18bb8ef7 FIxed the stereo rendering 2016-01-14 19:23:29 -08:00
samcake
577666da6e Merging upstream master 2016-01-14 15:10:54 -08:00
Zach Pomerantz
ec496f1907 Return copy of Light from LightStage 2016-01-14 14:06:32 -08:00
Zach Pomerantz
c704a8d8c5 Add RenderShadowTask 2016-01-14 13:53:11 -08:00
Zach Pomerantz
7744b89ba5 Prepare shadowMap pipeline to debug in color 2016-01-14 12:56:28 -08:00
Zach Pomerantz
b9b407fea0 Remove static shadowMap 2016-01-14 12:49:43 -08:00
Zach Pomerantz
0776ae7e72 Add LightStage for rendering lights 2016-01-14 12:49:42 -08:00
Zach Pomerantz
82f7ea515d Clean up task construction 2016-01-14 12:49:42 -08:00
samcake
0285d48de3 Exposing many more controls of the AO in order to adjust the effect 2016-01-13 18:57:47 -08:00
Zach Pomerantz
1436b4f6b1 Guard against unspecified deferredDebugMode 2016-01-13 18:17:40 -08:00
Zach Pomerantz
5c9c34377e Move GL context sync to render Engine (from Task) 2016-01-13 17:53:15 -08:00
Zach Pomerantz
70cc7d87e4 Expose global light through DeferredLighting singleton 2016-01-13 17:52:02 -08:00
Atlante45
741c22c0ac Move SimpleProgramKey to cpp 2016-01-13 11:47:43 -08:00
Atlante45
1789878be1 Remove dead code 2016-01-13 11:47:43 -08:00
Atlante45
c30569cd55 Naming coding standard 2016-01-13 11:47:43 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Atlante45
12f9091dc1 Fix doInBatch lambdas 2016-01-13 11:47:43 -08:00
samcake
89d2d102f6 exposing the ditheringEnable field 2016-01-12 18:51:30 -08:00
samcake
31bea5034c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 10:02:15 -08:00
Zach Pomerantz
016a14d3d5 Init the shapePlumber 2016-01-11 20:19:54 -08:00
samcake
f5854641f9 Trying to improve the ao 2016-01-11 18:33:39 -08:00
Zach Pomerantz
db91b12203 Refine addPipeline signature to be more explicit 2016-01-11 17:31:19 -08:00
Zach Pomerantz
801dde7950 Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-11 16:38:04 -08:00
Zach Pomerantz
4ff2b85e1a Replace ShapePipelineLib abstract with ShapePlumber instanced class 2016-01-11 16:00:08 -08:00
samcake
38e9d2281d Merging with master 2016-01-11 15:49:16 -08:00
Zach Pomerantz
c1e8fe88e4 Fix shader typo (ambien->ambient) 2016-01-08 20:14:31 -08:00
Zach Pomerantz
ea8bdd5728 Change pipeline initialization to depend on class, not global pipelineLib state 2016-01-08 20:14:08 -08:00
Zach Pomerantz
bf68f2f2fa Templatize item culling 2016-01-08 20:11:52 -08:00
Zach Pomerantz
56aba41299 Rename ShapeRender to DeferredPipelineLib 2016-01-08 14:02:49 -08:00