Commit graph

2588 commits

Author SHA1 Message Date
Olivier Prat
8af2f75996 Added FadeManager to centralize some common fade effect data and functions 2017-06-06 16:11:12 +02:00
Olivier Prat
e7eca7728f Debug fade management moved out of the inner render loop 2017-06-06 14:57:52 +02:00
Olivier Prat
1936c209a5 Working fade debugging scripts for both opaque and transparents 2017-06-05 17:21:33 +02:00
Olivier Prat
cce99ef8c4 Added translucent shaders 2017-06-05 16:56:57 +02:00
Olivier Prat
74bb3213e4 Added shadow shader variants 2017-06-05 16:44:32 +02:00
Olivier Prat
08fcd6c357 Added new shaders 2017-06-05 16:32:36 +02:00
Olivier Prat
1433ae4b34 Merged from 21274 2017-06-05 11:12:57 +02:00
Sam Cake
d19956f93c Fixing warnings 2017-05-31 22:02:47 -07:00
samcake
c256893575 some clean up: 2017-05-23 18:00:22 -07:00
samcake
e7b808cbc1 Merging with upstream 2017-05-23 12:12:31 -07:00
Thijs Wenker
712aff7ad6 base scale attachment on the natural dimensions 2017-05-23 17:53:08 +02:00
Chris Collins
207c13c3c3 Merge pull request #10528 from AndrewMeadows/payload-gets-weak-pointer
MeshPartPayload keeps weak pointer to Model
2017-05-22 21:54:40 -07:00
Andrew Meadows
f7db877b7f payload keeps weak pointer to Model 2017-05-22 17:29:15 -07:00
Sam Gateau
589bcc19ce Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer 2017-05-19 17:50:19 -07:00
Andrew Meadows
7b879a7964 Model has a Rig rather than a RigPointer 2017-05-19 13:24:16 -07:00
Andrew Meadows
17b6cf29df check for valid resource pointer before use 2017-05-18 15:12:59 -07:00
Sam Gateau
b8a2b38fd5 Displaying the stack of zone components 2017-05-18 12:54:25 -07:00
Andrew Meadows
8d3285f733 verify _rig is valid in Model::deleteGeometry() 2017-05-18 11:11:50 -07:00
Sam Cake
5edcc38eba Polishing the scope shaders 2017-05-18 01:06:59 -07:00
Sam Gateau
966afa1e4a Adding the drawKeyLight shader 2017-05-17 18:26:49 -07:00
Sam Gateau
3e7795ec11 Adding the drawKeyLight shader 2017-05-17 18:23:47 -07:00
Sam Gateau
79f700e8ce Adding the drawKeyLight shader 2017-05-17 18:12:48 -07:00
Sam Gateau
0f250e693d Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-17 09:49:20 -07:00
Brad Hefta-Gaub
36c7821e1e Merge pull request #10455 from ZappoMan/TriangleSetOptimizations
TriangleSet optimizations - ~80% improvement in Ray picking against models
2017-05-16 20:47:50 -07:00
samcake
2cd2c95940 Adding more debugging tool 2017-05-16 16:12:31 -07:00
Ryan Huffman
8eacf0ad4b Remove unnecessary assert in Model.cpp
This clause inside was not longer valid - it is a valid state for
part->_meshIndex < _modelMeshRenderItems.size(). A better check might be
to compare it to the size of _meshStates which we use below, but we use
_meshStates.at(...) which will do the bounds checking, which makes the
assert unnecessary.
2017-05-16 10:56:33 -07:00
Sam Cake
4c3ddfbff9 Adding debuging of the ambient lighting 2017-05-16 01:01:19 -07:00
samcake
db4387e55d Trying to mess with the defautl texture for skybox 2017-05-15 17:31:29 -07:00
samcake
2df6d0df48 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-15 13:40:56 -07:00
ZappoMan
eb3b27849c only keep one copy of Triangles 2017-05-12 17:07:47 -07:00
ZappoMan
a15c5999b5 first cut at octree storage of Triangle Set 2017-05-10 16:58:51 -07:00
samcake
75facdfa88 Testing the new behavior with the BackgroundStage, 2017-05-09 17:31:18 -07:00
samcake
bc41be7ec1 Introucing the BackgroundStage to manage the background / skybox in one place 2017-05-09 17:10:05 -07:00
Sam Gateau
ff3cf7801a Merge branch 'master' into 21274 2017-05-09 11:48:57 -07:00
samcake
c36035d3eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-09 10:46:38 -07:00
samcake
bbb513220b Moving forward 2017-05-08 17:33:24 -07:00
Anthony J. Thibault
e992d6703a WIP: debug render joint constraints. 2017-05-08 15:06:28 -07:00
Thijs Wenker
5aed960c4c Merge pull request #10389 from AndrewMeadows/render-collision-shapes-002
fix render of debug collision shapes
2017-05-08 20:35:59 +02:00
Chris Collins
0351ac1575 Merge pull request #10401 from jherico/fix_benny_hill_animations
Fix sped up animations
2017-05-08 09:11:23 -07:00
Sam Cake
d3724116d9 Using the items to pick the key light! 2017-05-08 00:20:20 -07:00
Brad Davis
b63015eaea Fix sped up animations 2017-05-06 14:34:28 -07:00
samcake
b6c966ef39 Keep iterating on the zones 2017-05-05 18:07:21 -07:00
samcake
bc1e5101ac Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-05 16:13:51 -07:00
Chris Collins
fd836dcd68 Merge pull request #10366 from Atlante45/feat/normal-map-compression
Feat/normal map compression
2017-05-05 10:03:01 -07:00
samcake
64317f5fd0 Adding a light item per zone 2017-05-04 16:47:03 -07:00
Andrew Meadows
f11d6eff92 fix typos: RenderItemsMap not RenderItems 2017-05-04 15:43:44 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Atlante45
f728ae7955 Remove unecessary normalize 2017-05-04 12:38:27 -07:00
Atlante45
ea2b188b64 Recompute Y from X/Z for normal maps 2017-05-04 10:33:34 -07:00
samcake
4514da2a09 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-01 16:49:35 -07:00