Commit graph

4088 commits

Author SHA1 Message Date
sam gateau
a4b9ec50e9 one step closer 2018-12-14 17:00:58 -08:00
SamGondelman
5dd00bed1d new improved polylines 2018-12-14 14:15:56 -08:00
Sam Gateau
0b03012e5e introducing the Shadow Stage 2018-12-14 06:55:34 -08:00
Sam Gateau
e07bc208f3 introducing the Shadow Stage 2018-12-14 00:58:07 -08:00
sam gateau
8bfca612e3 Separating the state view dependant from the shadow to be able to have several versions in flight 2018-12-13 17:56:14 -08:00
Sam Gateau
7f193d0e7c WEll it sn not going to be that simple.... 2018-12-13 00:32:59 -08:00
SamGondelman
250baa9c72 add missing properties to text entities 2018-12-11 15:42:24 -08:00
SamGondelman
fd8245e258 Merge remote-tracking branch 'upstream/master' into NOverlays6 2018-12-11 10:46:39 -08:00
Sam Gateau
b09d0b10e9 cleaning light clusters 2018-12-09 22:54:49 -08:00
Sam Gateau
653370e284 Assemble lighting stage works 2018-12-09 11:39:35 -08:00
Sam Gateau
79cad36c58 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-08 19:14:21 -08:00
sam gateau
28d36c81e0 there and back , trying to converge with the new Assemble Lighting Stage task 2018-12-07 16:24:51 -08:00
SamGondelman
8431b3b0c1 correct order of mixes 2018-12-07 10:39:10 -08:00
Sam Gateau
50fcd7f40a trying... 2018-12-06 22:45:44 -08:00
Sam Gateau
b24a2d33bf Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-06 19:51:05 -08:00
sam gateau
e941833676 gathering the lighting stage jobs in their own task away from the renderer specificities 2018-12-06 17:27:13 -08:00
Sam Gondelman
50efb48a58
Update GeometryCache.cpp 2018-12-06 12:26:18 -08:00
Sam Gondelman
c38a6966a9
Merge branch 'master' into NOverlays4 2018-12-06 11:25:43 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals
Case 19798: 3D projected Material Entities and materialRepeat option
2018-12-06 11:13:46 -08:00
sam gateau
a267c3115a drafting more factorisation of render tasks 2018-12-05 17:47:33 -08:00
SamGondelman
9923e76968 cleanup 2018-12-05 17:18:26 -08:00
Sam Gondelman
df6fbefc31
Merge branch 'master' into v3 2018-12-05 16:51:33 -08:00
Adam Smith
653974ca30
Merge pull request #14293 from SamGondelman/branching
Case 19473: Reduce branching in our shaders
2018-12-05 16:42:42 -08:00
sam gateau
8efdec1e51 merging with master 2018-12-04 11:03:46 -08:00
sam gateau
0343983f31 Applying changes done in deferred to forward 2018-12-03 16:58:54 -08:00
Sam Gateau
259a97c43a Exploring varying with names 2018-12-02 23:41:57 -08:00
sam gateau
2c4cd68a00 iterating on a simpler engine graph 2018-11-30 17:43:27 -08:00
SamGondelman
2acb6b6857 v3 procedurals and shader fixes 2018-11-28 17:58:27 -08:00
Sam Gateau
ba4aec2aff Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf 2018-11-28 01:01:18 -08:00
Sam Gondelman
5ee803bf1d
Update parabola.slv 2018-11-27 10:54:56 -08:00
Sam Gondelman
3a4ec2cc27
Update glowLine.slv 2018-11-27 10:53:25 -08:00
sam gateau
f348cc35c4 separting debug in its own task 2018-11-26 15:20:45 -08:00
Sam Gateau
b7b8e8e6bf Trying to group together the debug jobs in a separate task 2018-11-26 00:38:04 -08:00
Sam Gateau
6b1c7bf96e restoring the engine render views and cleaning up the task / config section of the pr 2018-11-20 23:15:09 -08:00
Sam Gateau
dd828c81e0 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-11-20 19:29:01 -08:00
Jeff Clinton
870619b19d
Merge pull request #14412 from amantley/avatarPipelineOffsets
Avatar Pipeline Joint Rotation Offsets Handling
2018-11-19 08:54:29 -08:00
Sam Gateau
837b321004 merging with master 2018-11-17 10:35:05 -08:00
Sam Gondelman
968ffe7ec3
Merge branch 'master' into branching 2018-11-16 10:25:02 -08:00
Sam Gateau
0166d7748a Merging with master around rc76 cut time 2018-11-15 22:52:37 -08:00
amantley
f9829c270d merged new fbx.h 2018-11-15 10:19:04 -08:00
amantley
c8cd65c3bd added getter for the orginal cluster bind matrix values in AnimSkeleton 2018-11-15 09:58:10 -08:00
Sam Gondelman
a5fe4709a9
Update Fade.slh 2018-11-14 17:50:21 -08:00
amantley
80ebde1036 started cleanup of pr 2018-11-14 17:27:45 -08:00
Sam Gondelman
a206d9e25a
Merge branch 'master' into branching 2018-11-14 17:08:08 -08:00
amantley
8256c652fc added the hook to put the copy of the mutated bind poses into tthe skeleton 2018-11-14 17:02:25 -08:00
Olivier Prat
85a3938cbe Switch to app for ambient occlusion debug script 2018-11-14 11:55:11 +01:00
Olivier Prat
45e0f65972 Merge branch 'ao' of http://github.com/Zvork/hifi into ao 2018-11-14 09:48:24 +01:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
John Conklin II
512b847684
Merge pull request #14339 from hyperlogic/bug-fix/anim-debug-draw-crash
AnimDebugDraw: Prevent multi-threaded access to shared map collection.
2018-11-12 10:47:01 -08:00
John Conklin II
9d404a6cf3
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
2018-11-12 10:45:52 -08:00
Brad Hefta-Gaub
22dd958582
Merge pull request #14297 from jherico/feature/vcpkg
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
2018-11-12 09:52:02 -08:00
SamGondelman
1d1510e18e Merge remote-tracking branch 'upstream/master' into police 2018-11-09 13:32:41 -08:00
SamGondelman
b3abd97707 projected materials and repeat property 2018-11-09 10:47:07 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Olivier Prat
be7806644a Removed ternary operators with mix (try to limit branching) 2018-11-08 17:29:00 +01:00
Olivier Prat
d64127aa9c Android shader compilation fix 2018-11-08 13:48:19 +01:00
Olivier Prat
829e5ff44f Same android problem fix, but elsewhere 2018-11-08 13:37:22 +01:00
Olivier Prat
09b26db650 Shader fix for android... <sigh> 2018-11-08 13:19:42 +01:00
Olivier Prat
40b7b42f5b Bis 2018-11-08 12:29:01 +01:00
Olivier Prat
cd89ce5388 Another stupid android shader compilation error fix 2018-11-08 12:07:17 +01:00
Olivier Prat
de2f1c52cc Another android shader compilation fix 2018-11-08 11:44:47 +01:00
Olivier Prat
05ac2fccb6 Still android fixes 2018-11-08 11:24:46 +01:00
Olivier Prat
851cfff960 Again, android shader compilatio fix 2018-11-08 11:06:28 +01:00
Olivier Prat
c79c403a52 More android shader compilation fixes 2018-11-08 10:47:24 +01:00
Olivier Prat
7e93d91bfa Fixed android shader compilation 2018-11-08 09:29:02 +01:00
Olivier Prat
9d5dcec0a0 Merge from master 2018-11-08 09:14:42 +01:00
Sam Gateau
d15c8a8854
Merge pull request #14313 from SamGondelman/macFix
Case 19686: Possibly fix mac debug deferred issue
2018-11-07 10:33:41 -08:00
Anthony Thibault
dc43d1bf8f AnimDebugDraw: Prevent multi-threaded access to shared map collection.
It was possible for the render thread to iterate over a map while the main thread mutates the same map.
This could have led to memory corruption and crashes.

To fix this we make a copy of the collection and pass the copy to the lambda that executes on the render thread.
2018-11-02 17:53:07 -07:00
Sam Gateau
fa0c58fa0e Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend 2018-11-02 00:08:47 -07:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
Sam Gondelman
e534e09801 Update LightClusterGrid_shared.slh 2018-11-01 15:35:48 -07:00
SamGondelman
c4c4d2c98d possibly fix mac issues 2018-10-31 13:28:07 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
Cristian Luis Duarte
bc7e49482a Add Android for the condition of _meshBlendshapeBuffer usage 2018-10-30 19:44:39 -03:00
SamGondelman
dc9405775f more branching removal 2018-10-29 16:42:46 -07:00
SamGondelman
7dff015585 maybe? 2018-10-25 14:40:58 -07:00
SamGondelman
e8c5324e39 start removing branching 2018-10-25 11:59:04 -07:00
Olivier Prat
aa64e51281 Fixed shaders for GLSL 4.1 2018-10-24 11:04:32 +02:00
Olivier Prat
69ace03919 Merged with master 2018-10-24 08:27:39 +02:00
SamGondelman
0efbdc1ab5 merge with master 2018-10-23 14:33:57 -07:00
SamGondelman
d254db02dc small cleanup 2018-10-23 11:27:17 -07:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
SamGondelman
09ea32dcc0 fix fading and highlighting issues 2018-10-22 14:12:43 -07:00
SamGondelman
5652fa0b1e merge with master 2018-10-22 10:18:52 -07:00
Olivier Prat
5f3a299fd9 Merge with master 2018-10-22 14:02:24 +02:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings
Fix new Mac warnings
2018-10-20 13:40:53 -07:00
Sam Gateau
388b31acf7
Merge pull request #14169 from SamGondelman/highlight
Fix highlight not working after HMD switch
2018-10-19 11:58:25 -07:00
John Conklin II
9c841db9fb
Merge pull request #14184 from SamGondelman/blendshape
Move blendshape buffers to render thread
2018-10-19 11:55:44 -07:00
SamGondelman
47c6825aea CR 2018-10-18 11:08:53 -07:00
SamGondelman
de4dff5202 fix highlight weirdness 2018-10-17 16:18:55 -07:00
SamGondelman
cce0981d6c Merge remote-tracking branch 'upstream/master' into police 2018-10-17 11:40:01 -07:00
John Conklin II
72c9f697ab
Merge pull request #14119 from SamGondelman/varying
Move stage frames to Varyings
2018-10-17 11:16:28 -07:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox
Rebake default skybox for all platforms
2018-10-17 09:50:00 -07:00
Sam Gondelman
121fc7205c Delete Default-Sky-9-cubemap.texmeta 2018-10-14 22:36:22 -07:00
Sam Gondelman
39c828fad8
please 2018-10-10 19:07:49 -07:00
Sam Gondelman
2421f9388c
FIX BUILD ERRORS? 2018-10-10 17:09:35 -07:00
Sam Gondelman
6ed38ea333
fix build errors 2018-10-10 16:16:56 -07:00
Sam Gondelman
296bd65c9b
fix build errors 2018-10-10 16:05:14 -07:00
SamGondelman
327c2f4e3d move blendshape buffers to render thread 2018-10-10 15:32:53 -07:00