From e8880ab14d455175b9463df485b180f0c4364d27 Mon Sep 17 00:00:00 2001 From: Anders Pistol Date: Sun, 10 Mar 2024 22:15:07 +0100 Subject: [PATCH] Traktor: Specular coefficient support in Terrain shader. --- .../Terrain/Shaders/Templates/Terrain.xdi | 348 +++++++++++------- 1 file changed, 217 insertions(+), 131 deletions(-) diff --git a/data/Source/System/Terrain/Terrain/Shaders/Templates/Terrain.xdi b/data/Source/System/Terrain/Terrain/Shaders/Templates/Terrain.xdi index 76453f3ba5..da003f5ff0 100644 --- a/data/Source/System/Terrain/Terrain/Shaders/Templates/Terrain.xdi +++ b/data/Source/System/Terrain/Terrain/Shaders/Templates/Terrain.xdi @@ -428,8 +428,8 @@ Generated texture from surface cache. {31430D09-7ADB-554F-8DD8-CB0CD84B8194} - 2390 - 292 + 2455 + 284 L_ViewPosition @@ -437,8 +437,8 @@ Generated texture from surface cache. {010F4795-3CF2-0A48-A9E8-E5EF67131EE2} - 2406 - 250 + 2471 + 243 L_ViewNormal @@ -479,8 +479,8 @@ Generated texture from surface cache. {B547F714-60D5-2342-8C0E-90D80676B9D8} - 1263 - -1164 + 1355 + -1170 L_SurfaceAlbedo @@ -574,8 +574,8 @@ Generated texture from surface cache. {732D0940-5786-D74C-A231-6968FE7A5A01} - 1263 - -1118 + 1355 + -1122 L_SurfaceNormal @@ -698,8 +698,8 @@ Generated texture from surface cache. {C72A149C-D8E5-0344-9A87-676FCD57F888} - 1263 - -1072 + 1355 + -1074 L_SurfaceRoughness @@ -716,26 +716,17 @@ Generated texture from surface cache. {55159F6D-B7AC-694B-AE48-EDDEB427B7EF} - 2358 - 126 + 2423 + 120 L_SurfaceRoughness - - {CCE8848A-8742-D24D-B399-FC0D3C95B008} - - - 2400 - 168 - - 0.25 - {FF129A59-01E5-AC44-9BAD-9FDC58095309} - 2416 - 44 + 2481 + 40 0 @@ -914,8 +905,8 @@ $Output = vec4(mix(t, b, f), 0.0f); {AC111C0C-7361-B945-9086-55316955BDF2} - 2446 - 84 + 2511 + 79 L_Cut @@ -1217,6 +1208,7 @@ $Output = gl_DrawID; Color Normal Roughness + Specular @@ -1334,8 +1326,8 @@ $Output = gl_DrawID; {72FAE0C4-091C-450D-BA1F-031A7CB948C0} - 2374 - 208 + 2439 + 202 L_ViewDetailNormal @@ -1375,6 +1367,50 @@ $Output = gl_DrawID; -593 + + {FCFFF5B2-BA84-42A5-8373-4E7945C0F560} + + + 1355 + -1026 + + L_SurfaceSpecular + + + {BDB8CC9B-15E1-4390-A3F3-B7545DBCBC2D} + + + 1052 + -1028 + + + + {AF3BD9BA-0433-46DD-AF03-CD8CEFFCA69A} + + + 866 + -960 + + 0.25 + + + {D04FF15E-4843-416A-854A-154CF11430AE} + + + 1222 + -1002 + + x + + + {FEFFC8C1-C395-443A-9019-E41ECEAA71FB} + + + 2439 + 161 + + L_SurfaceSpecular + @@ -1889,17 +1925,17 @@ $Output = gl_DrawID; - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {32EB5230-1F0D-40B8-93F6-9C8E5469454E} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -1909,41 +1945,41 @@ $Output = gl_DrawID; - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {6D5C5EFE-A35C-4748-B81E-B8EBACE433BC} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {AF6C971B-D67A-42EE-A12B-97D36927C89F} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {51E30CE0-3C94-4668-AC3A-2CE903530D64} @@ -1953,7 +1989,7 @@ $Output = gl_DrawID; {84BF3C26-64A7-4032-B775-1D369052B243} - + {52A043E1-22B9-C742-A1A6-8341D043284F} @@ -1969,57 +2005,57 @@ $Output = gl_DrawID; - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {32EB5230-1F0D-40B8-93F6-9C8E5469454E} - + {AF6C971B-D67A-42EE-A12B-97D36927C89F} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {6D5C5EFE-A35C-4748-B81E-B8EBACE433BC} - + {ACC77B35-91B5-4405-ABC8-D0DA24D68178} - + {3B445686-9AD9-4A7E-8C09-C92EDB98EFEF} - + {ACC77B35-91B5-4405-ABC8-D0DA24D68178} - + {3B445686-9AD9-4A7E-8C09-C92EDB98EFEF} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -2029,7 +2065,7 @@ $Output = gl_DrawID; - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -2039,7 +2075,7 @@ $Output = gl_DrawID; - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -2049,7 +2085,7 @@ $Output = gl_DrawID; - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -2059,67 +2095,67 @@ $Output = gl_DrawID; - + {DD079887-A171-407B-AD10-E0CE5B164BC1} - + {93DEEDC9-D4C7-47F8-8D6A-A79DABD6BA6A} - + {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {DD079887-A171-407B-AD10-E0CE5B164BC1} - + {93DEEDC9-D4C7-47F8-8D6A-A79DABD6BA6A} - + {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {F390BEB8-B32D-504B-BA67-EE3062ABDDC7} - + {4FD10E49-F598-45AB-9E40-5ABA13905D14} - + {F390BEB8-B32D-504B-BA67-EE3062ABDDC7} - + {4FD10E49-F598-45AB-9E40-5ABA13905D14} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -2129,7 +2165,7 @@ $Output = gl_DrawID; - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -2143,13 +2179,13 @@ $Output = gl_DrawID; {D9A0E443-C5DA-B742-9179-9B9EEC290E1B} - + {93DEEDC9-D4C7-47F8-8D6A-A79DABD6BA6A} - + {8FFB3BDB-A00E-4406-994C-0D52FAF04871} @@ -2169,7 +2205,7 @@ $Output = gl_DrawID; - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -2179,7 +2215,7 @@ $Output = gl_DrawID; - + {8591EE56-8A3E-41CF-8E98-8F8DB26AABDC} @@ -2243,158 +2279,148 @@ $Output = gl_DrawID; {29BA4386-B838-4550-93DF-F53D8B812C88} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} - + {92AA3735-BB4C-4541-81DA-AC500930B2E6} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {A1DDB166-9422-45A3-AE93-6702275DAD1C} - + {9D9FA2FC-9298-4A6F-88A9-A055F8A91F52} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {EEB495BD-DE7F-4DE8-983A-7E9B220B927F} - + {5E3C7A16-8233-0946-9F8E-656A2F545AD8} - + {10231020-AD85-D648-98B2-E9B028704052} - + {D596E4E4-1A78-4D80-BC6B-6DEEF934EDEC} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {EEB495BD-DE7F-4DE8-943A-7E9B220B927F} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {EEB495BD-DE7F-4DE8-953A-7E9B220B927F} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {EEB495BD-DE7F-4DE8-963A-7E9B220B927F} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {EEB495BD-DE7F-4DE8-973A-7E9B220B927F} - + {D596E4E4-1A78-4D80-BD6B-6DEEF934EDEC} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {D596E4E4-1A78-4D80-BE6B-6DEEF934EDEC} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {D596E4E4-1A78-4D80-BF6B-6DEEF934EDEC} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - - - - {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} - - - - {53E30D04-04A2-3043-83E2-E637DD7494DF} - - {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} - - {1D7FFB3D-01E1-BF42-9E16-D5247E953065} + + {53E30D04-04A2-3043-83E2-E637DD7494DF} @@ -2403,7 +2429,7 @@ $Output = gl_DrawID; {9D9FA2FC-9298-4A6F-88A9-A055F8A91F52} - + {950F8770-82FA-124D-8656-D9F1F489C10E} @@ -2413,7 +2439,7 @@ $Output = gl_DrawID; {84BF3C26-64A7-4032-B775-1D369052B243} - + {33FE3E39-0A9A-3B46-BC14-39E943720774} @@ -2423,17 +2449,17 @@ $Output = gl_DrawID; {84BF3C26-64A7-4032-B775-1D369052B243} - + {10CC7B54-4F11-1645-967D-E3693051A121} - + {9D13C425-2DBE-B241-AE2D-C174C8D77790} - + {AAF55877-5DC7-E249-B955-565B5D3EEFBA} @@ -2443,17 +2469,17 @@ $Output = gl_DrawID; {84BF3C26-64A7-4032-B775-1D369052B243} - + {98A97471-F8FE-4946-9379-DD12C5FD39D7} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {894A4A4A-6102-7B47-BDCC-A6E89E6B6DA8} @@ -2463,37 +2489,37 @@ $Output = gl_DrawID; {84BF3C26-64A7-4032-B775-1D369052B243} - + {FE413452-19EB-4DC9-B724-2984FA17CC20} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {65D9215E-45E9-BA48-8F10-4BCC7C576CC6} - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {71A0310C-3928-44C3-8D4F-7D9AFF9EAE70} - + {8591EE56-8A3E-41CF-8E98-8F8DB26AABDC} - + {345BDBFA-3326-40BF-B9DE-8ECA78A3EEF4} @@ -2503,23 +2529,23 @@ $Output = gl_DrawID; {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {FE413452-19EB-4DC9-B724-2984FA17CC20} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {4F792F72-F9F9-A945-8CAE-8F4EEEE77624} @@ -2527,6 +2553,66 @@ $Output = gl_DrawID; {92AA3735-BB4C-4541-81DA-AC500930B2E6} + + + + {D596E4E4-1A78-4D80-C06B-6DEEF934EDEC} + + + + {197CC347-3580-4502-8AA1-976E476EA843} + + + + + + {D596E4E4-1A78-4D80-C06B-6DEEF934EDEC} + + + + {3F36532A-8A98-4EE7-85ED-2DA35230BC3C} + + + + + + {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} + + + + {5539AA7E-F780-482E-82B8-1E817340D7C0} + + + + + + {DBDA59DC-83A0-4619-BB51-792A017346DF} + + + + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} + + + + + + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} + + + + {11585EBC-914D-4E6D-A10D-D01694FF9840} + + + + + + {84BF3C26-64A7-4032-B775-1D369052B243} + + + + {1D7FFB3D-01E1-BF42-9E16-D5247E953065} + + @@ -2561,8 +2647,8 @@ $Output = gl_DrawID; -1371 - 1753 - 515 + 1812 + 608