diff --git a/data/Source/System/Terrain/Ocean/Shaders/Displacement.xdi b/data/Source/System/Terrain/Ocean/Shaders/Displacement.xdi index a33f455eff..fe2bd682e2 100644 --- a/data/Source/System/Terrain/Ocean/Shaders/Displacement.xdi +++ b/data/Source/System/Terrain/Ocean/Shaders/Displacement.xdi @@ -95,7 +95,7 @@ 1289 319 - 0, 2, 0, 0 + 0, 0.5, 0, 0 {30BAC33D-653F-644C-A353-A862E8CBC398} diff --git a/data/Source/System/Terrain/Ocean/Shaders/Ocean.xdi b/data/Source/System/Terrain/Ocean/Shaders/Ocean.xdi index b24cb583c1..b3a89f4183 100644 --- a/data/Source/System/Terrain/Ocean/Shaders/Ocean.xdi +++ b/data/Source/System/Terrain/Ocean/Shaders/Ocean.xdi @@ -5,8 +5,8 @@ {2864DA67-F2FE-3941-946B-10A420BECFE6} - 1738 - 999 + 1450 + 801 World_Projection Matrix @@ -121,8 +121,8 @@ {8DD3F147-650E-D340-BFCE-06BBB28FC70F} - 1556 - 901 + 1268 + 703 xyz1 @@ -130,24 +130,24 @@ {A8A56301-205F-394B-9E23-0918ADC0AE12} - 1718 - 895 + 1430 + 697 {A9C09335-98CC-D848-ADE8-3C2A17238DE6} - 1956 - 945 + 1668 + 747 {08E83B13-597B-3643-97D7-C3ACF2ED31F4} - 2226 - 975 + 1938 + 777 Undefined @@ -156,8 +156,8 @@ {A0F26B53-3964-584F-905E-75CDA320B52E} - 1536 - 945 + 1248 + 747 World_View Matrix @@ -167,8 +167,8 @@ {5F6DE751-DC9F-BA4D-8A3F-B4CBE65A783D} - 1974 - 877 + 1686 + 679 L_ViewPosition @@ -176,8 +176,8 @@ {CFCBD799-9122-2E40-8B43-E07978BC0B6C} - 1724 - 843 + 1436 + 645 L_WorldPosition @@ -185,8 +185,8 @@ {DC3CEE50-9A81-AC49-98C1-68FFC40D67BA} - 1210 - 669 + 922 + 471 World_View Matrix @@ -196,16 +196,16 @@ {C064C355-A337-E245-BFE2-95A5A0ABB6C8} - 1414 - 607 + 1126 + 409 {08289710-D26A-9341-AE80-2BF95AD22BE8} - 1698 - 599 + 1410 + 401 L_ViewNormal @@ -213,8 +213,8 @@ {27233818-FC79-524A-8A87-6D75EDA9A16B} - 1700 - 741 + 1412 + 543 L_SurfaceElevation @@ -222,8 +222,8 @@ {03811780-9518-6E4F-A6CB-B6668F5FA61E} - 1542 - 771 + 1254 + 573 y @@ -298,8 +298,8 @@ {C1439711-F197-B847-819D-44565E902E93} - -258 - 1614 + -796 + 1531 {4F91544C-FDC4-2042-8CAA-E721B4DB04C1} @@ -315,8 +315,8 @@ {4B4FB66B-F6AD-4F49-9FCB-BDB61C236915} - -416 - 1675 + -954 + 1592 L_ViewPosition @@ -324,8 +324,8 @@ {46A921E9-6342-844F-8BA5-4172B82D79F9} - -235 - 1702 + -773 + 1619 z @@ -333,16 +333,16 @@ {07DE2DE4-40CA-804F-841E-0B8F98A26A7C} - -86 - 1630 + -624 + 1547 {1BC58BB7-4E28-F346-967D-CFD5E4F68760} - 403 - 1662 + -135 + 1579 L_DepthFactor @@ -350,8 +350,8 @@ {289F7E9C-D57D-714E-846B-46152985B1C7} - 1021 - 2258 + 1414 + 2636 L_DepthFactor @@ -359,16 +359,16 @@ {F92109EA-963D-284D-B7C5-C1346F6D5FE7} - 142 - 1668 + -396 + 1585 {8B045CB9-1179-DD49-8570-04A259D64FE4} - -57 - 1761 + -595 + 1678 0 @@ -376,8 +376,8 @@ {F2F64AEA-AF10-DD4F-BECA-CB693C8C4EDA} - 710 - 2171 + 1454 + 1287 Ocean_ShallowTint Vector @@ -387,8 +387,8 @@ {11033B75-D663-EF4C-931D-3E9930075BEC} - 742 - 2210 + 1269 + 1489 Ocean_Opacity Scalar @@ -398,8 +398,8 @@ {1A8032F5-2B64-454F-B755-BD8DFCC369AA} - 728 - 2137 + 1472 + 1333 Ocean_DeepColor Vector @@ -409,16 +409,16 @@ {6BE37F57-0E42-F44B-BE1E-CE90F228C6E1} - 1244 - 2196 + 1637 + 2574 {855A12DD-8079-8D40-82B2-DE224DF31807} - 1547 - 2216 + 1940 + 2594 0 1 @@ -427,8 +427,8 @@ {CD038D56-C3EB-F64B-A6B1-32F2669AA064} - 1024 - 2201 + 1417 + 2579 0.3 @@ -436,8 +436,8 @@ {15E0EE37-59AF-1C44-B25B-FC2C2A15C26D} - 1242 - 825 + 954 + 627 @@ -461,8 +461,8 @@ {C02030AF-E63C-2644-A895-36D45005B5E6} - 1064 - 2076 + 859 + 2054 L_Foam @@ -560,8 +560,8 @@ {80CB4932-CB55-D543-9529-468B41C8509B} - -246 - 2048 + -159 + 2017 L_WorldPosition @@ -569,16 +569,16 @@ {D71887B3-1A90-6045-8CC1-2E092E82D636} - -37 - 2061 + 50 + 2030 {C670FB0B-35A7-1541-9837-84AFAC29A7E3} - 293 - 2065 + 380 + 2034 xz @@ -586,16 +586,16 @@ {412B88ED-E058-4248-9C47-7F134DFE2371} - 52 - 2063 + 139 + 2032 {72E1CD43-2EE1-F54D-AA96-0F8FB1ECCE2D} - -120 - 2110 + -33 + 2079 0.025 @@ -603,8 +603,8 @@ {2AE0A49E-87BC-B24E-8FCC-34F02B6271D1} - 3069 - 1999 + 3322 + 2085 World_DeferredColor @@ -650,8 +650,8 @@ {E7699DB6-936F-9942-8A80-59AD6B0ACB4A} - 1410 - 2390 + 1532 + 2236 World_VisualCopyMap Texture2D @@ -661,8 +661,8 @@ {87833C0B-3553-4C4D-8BA3-C79F874B2040} - 1752 - 2445 + 1826 + 2257 FtLinear FtLinear @@ -679,24 +679,24 @@ {377DC967-0611-A44B-8673-0320C467DD01} - 1257 - 2595 + 1407 + 2365 {AD226821-988C-B748-92C2-AD10DCB46686} - 1493 - 2521 + 1561 + 2316 {76FF4631-FC41-EF42-8D3F-85CCCDF9D067} - 1299 - 2502 + 1367 + 2311 @@ -712,7 +712,7 @@ 1008 - 1526 + 1624 {9E812171-5BC3-4EEC-B689-B677968BA08A} @@ -754,7 +754,7 @@ 776 - 1496 + 1594 0 @@ -763,7 +763,7 @@ 766 - 1584 + 1682 L_ViewNormal @@ -772,18 +772,10 @@ 766 - 1628 + 1726 L_ViewPosition - - {219A9F3F-2BF7-E243-A69C-8271A2CA49C5} - - - 1773 - 1948 - - {A1FBCEA5-D52F-BF44-9EE4-2091791DD32F} @@ -887,10 +879,10 @@ {9013FB94-3577-2740-A659-F983C2B73528} - 1688 - 3761 + 1669 + 3698 - 0.4 + 0.2 {B4DD4835-2D73-E349-8B1D-99087E387E9F} @@ -905,19 +897,11 @@ {0DF19BC2-826F-F14F-A825-FEAD2E262FAA} - -52 - 3454 + 83 + 3535 L_ViewPosition - - {A1C122AA-8D4F-A742-99E7-6A9149181C6C} - - - 115 - 3489 - - {C7BB693B-7EF5-584F-BAF4-B5651A666736} @@ -930,34 +914,17 @@ {27F9D765-F4BF-084B-B687-B0B2A3A93966} - 1225 - 1839 + 1340 + 1758 L_ProbeReflection - - {4FC0CF97-B278-5242-B6E3-2CF346DE3EA1} - - - 1668 - 1617 - - - - {BD970DD8-6E7D-104D-92A6-0716A9BD91CD} - - - 1390 - 1702 - - 0.1 - {179941D9-3E1F-5742-9430-766A9ADF3C0A} - 1472 - 1858 + 1579 + 1693 @@ -973,8 +940,8 @@ {091B8378-5E1B-C84C-BF93-6DC3DAF1525B} - 986 - 779 + 698 + 581 L_BaseWorldPosition @@ -982,8 +949,8 @@ {77D36B83-54EC-1F4B-A41E-AE844813DDB8} - 270 - 834 + -18 + 636 L_BaseWorldPosition @@ -991,8 +958,8 @@ {A64C7126-7488-6847-BFC0-A429B4287616} - 544 - 726 + 256 + 528 {EEE56C64-16DD-4548-8BF8-48666DBBCB57} @@ -1047,8 +1014,8 @@ {B98A0CA0-E868-5F45-BB27-0E7AE5933066} - 270 - 674 + -18 + 476 Ocean_WaveTexture0 Texture2D @@ -1058,8 +1025,8 @@ {BE1AC6AA-865E-894D-9532-43B25850FA44} - 312 - 754 + 24 + 556 1 @@ -1067,8 +1034,8 @@ {48883B80-B73D-A74A-9D23-D547F65DDF05} - 270 - 794 + -18 + 596 Ocean_WaveTexture1 Texture2D @@ -1079,16 +1046,16 @@ 772 - 1538 + 1636 - 0.1 + 0.2 {A1E20EC6-F0DC-B446-B119-A44D9207F866} - 270 - 714 + -18 + 516 Ocean_WaveTexture2 Texture2D @@ -1098,8 +1065,8 @@ {F821EF57-F0C4-724A-B7D8-887A02F3260D} - 906 - 688 + 618 + 490 L_Foam @@ -1107,8 +1074,8 @@ {3AD3C24B-55BA-B348-AC87-05BFAC3A9993} - 2788 - 2067 + 2979 + 2179 {AFD5FE57-FE20-134A-9C0F-5E25CAB9B3F2} @@ -1135,8 +1102,8 @@ {9E5ECDF6-5770-0D48-AD2A-E63522339F57} - 2774 - 2213 + 2730 + 2265 L_ViewPosition @@ -1310,58 +1277,376 @@ 4848 + + {0861F54D-F875-8E4F-8EC9-78DF29A4FBAE} + + + 2469 + 1673 + + + + {2392BDB6-7FA5-5F42-9FB8-2DDDEE167E06} + + + 1253 + 1527 + + Ocean_DeepColor + Vector + Once + + + {FB6A3AC8-4A75-2240-8292-A340C4DFA6BF} + + + + + 1027 + 1570 + + + + {FD80DC93-A203-A44A-9B3E-D1ED552B99D9} + + + + + -558 + 1469 + + + + {F75796C7-8120-FD4B-BB6B-BC3A9C5CAF3E} + + + + + 1646 + 2170 + + + + {9335AB50-63E0-EF4F-BFCB-2DDFFAE06A95} + + + 1072 + 1957 + + + + {E1F9C6F4-AA5B-9C44-BC07-9F9A1B3CEA00} + + + 2014 + 1052 + + Scatter + + + 1 + 1 + 1 + + + {1513C77F-E3E4-FA44-B196-35713004CFD3} + + + + {23884C5F-C5F7-D740-8B40-5341707D99BC} + ViewNormal + + + {CBDE6E1E-A483-4046-B62E-5346B9FF6660} + ViewLightDirection + + + {CA8375B2-168C-0045-ABCF-DA4550D675E7} + HeightDisplacement + + + {632BD6A0-E960-DC48-9A1F-AE642F41F9EB} + ViewDirection + + + {930C2917-F7C9-8C44-B249-27A70B16C9F6} + Irradiance + + + {FF2E57B8-213A-EC4E-B121-DB4F3B40DE20} + ScatterColor + + + {116EE63B-0949-0347-B9C5-D9834FC44784} + BubbleColor + + + {90C5E751-255B-124C-8D6E-CD25D2B57F04} + SpecularCoeff + + + + + {D7D2B884-8C20-B341-A7B6-C827641FAABF} + Output + Vector + + + + + + {4FF35D5D-9106-EE40-9190-D76355D2F79F} + + + 1480 + 1054 + + L_ViewPosition + - {9CA88B3C-AF9C-BF48-8588-F1E74F32D951} + {EF1373CD-97CC-864A-BA3D-0D2760A081A6} - 1213 - 1301 + 1480 + 1008 - L_Irradiance + L_ViewNormal - - {0861F54D-F875-8E4F-8EC9-78DF29A4FBAE} + + {0007AFF3-5BCD-DC4B-B85E-12295A37349A} + + + -1875 + 727 + + World_LightSBuffer + + + Type + DtFloat4 + + + RangeRadius + DtFloat4 + + + Position + DtFloat4 + + + Direction + DtFloat4 + + + Color + DtFloat4 + + + ViewToLight0 + DtFloat4 + + + ViewToLight1 + DtFloat4 + + + ViewToLight2 + DtFloat4 + + + ViewToLight3 + DtFloat4 + + + AtlasTransform + DtFloat4 + + + + + {16233F5C-A5F8-084B-AE01-34B851DD1ACC} + + + -1541 + 721 + + + Type + RangeRadius + Position + Direction + Color + ViewToLight0 + ViewToLight1 + ViewToLight2 + ViewToLight3 + AtlasTransform + + + + {4C309ADE-CC06-8C4C-BA90-7114EDB9DE35} - 2180 - 1997 + -1191 + 791 + w + + + {CB310016-5DDE-894E-A928-8F7B99045A06} + + + -1012 + 800 + + L_LightRadiusFallOff + + + {8D3DD5DC-ED81-3345-A4CB-334902AF65EB} + + + -1191 + 746 + + z + + + {1994350D-77E0-EE48-9561-05519A866F6E} + + + -1012 + 745 + + L_LightRadius + + + {B1047BD9-4164-E040-B325-928955C77154} + + + -1191 + 701 + + y + + + {91A8C0A6-BE26-EE4A-AF5A-D4B9B1E87D60} + + + -1191 + 656 + + x + + + {E57692C4-62A0-4E47-9795-00C5C5EF326C} + + + -1198 + 855 + + L_LightPosition + + + {D54190E8-2584-8644-B86B-0836B5C8452D} + + + -1198 + 905 + + L_LightDirection + + + {3E8A415D-A281-3F4D-9662-2ECCFBB139D8} + + + -1012 + 690 + + L_LightRange + + + {76C8FBE9-BE36-364B-90E6-6767A74F65CD} + + + -1012 + 635 + + L_LightType + + + {685D7790-3067-6847-A9D7-D3C30C10E753} + + + -1198 + 955 + + L_LightColor - {33FACE94-A6FE-B648-BC8F-1762F09A9EDC} + {A5F2A514-0151-2949-BCBC-3FD5F64C2803} - 1213 - 1360 + -1782 + 769 - 0.1 + 0 - - {97ECBD46-49F8-8A41-9C77-66B672CE7794} + + {FF9CB8F2-CB26-5B44-9A95-A92DF313D83E} - 1502 - 1298 + 1464 + 1100 + L_LightDirection - - {2392BDB6-7FA5-5F42-9FB8-2DDDEE167E06} + + {C92B179E-8E7E-8742-9842-E7E665952051} - 729 - 2253 + 1464 + 1192 - Ocean_DeepColor - Vector - Once + L_ViewDirection - - {C7EA967A-0406-0D45-B9A8-49A567C9626C} + + {42181944-1082-EA4E-A4EF-FF95C6F5D188} - 1234 - 1991 + 1480 + 1146 + L_DepthFactor + + + {C8EF8E9D-8C2A-EC4A-A80F-58EFC3BB43EA} + + + 1496 + 1238 + + L_Irradiance @@ -1927,171 +2212,141 @@ - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {71A0310C-3928-44C3-8D4F-7D9AFF9EAE70} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {24E97134-2FDB-4E95-B7D6-EF81F3E17837} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {7331EB56-B549-F54D-8AB5-4634E4C1EFAD} - + {15053FB1-8C13-4C18-8958-193FEDDCFB11} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {98BF7CC4-A80C-43DA-B7FD-21BA4C039E28} - + {D74E3627-9E70-4BAD-A6CE-2087D41D6ED7} - + {345BDBFA-3326-40BF-B9DE-8ECA78A3EEF4} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {0AAE2EAE-B01B-425A-A8C3-539576B45ECC} - + {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} - + {989F14A3-559A-6547-86AC-547520992458} - {84BF3C26-64A7-4032-B775-1D369052B243} + {8591EE56-8A3E-41CF-8E98-8F8DB26AABDC} - - {98BF7CC4-A80C-43DA-B7FD-21BA4C039E28} + + {11585EBC-914D-4E6D-A10D-D01694FF9840} - - {D74E3627-9E70-4BAD-A6CE-2087D41D6ED7} + + {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - - {FE413452-19EB-4DC9-B724-2984FA17CC20} + + {11585EBC-914D-4E6D-A10D-D01694FF9840} - - {8591EE56-8A3E-41CF-8E98-8F8DB26AABDC} + + {84BF3C26-64A7-4032-B775-1D369052B243} - - {11585EBC-914D-4E6D-A10D-D01694FF9840} + + {3DE04294-4DEA-4A13-A460-2274647357EA} - + {84BF3C26-64A7-4032-B775-1D369052B243} - {69997292-C813-490C-910C-620B9AD3A2BB} + {17CACE84-6798-2B44-A575-4A44864947B5} - - {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - - - {11585EBC-914D-4E6D-A10D-D01694FF9840} - - - - - - {84BF3C26-64A7-4032-B775-1D369052B243} - - - - {3DE04294-4DEA-4A13-A460-2274647357EA} - - - - - - {84BF3C26-64A7-4032-B775-1D369052B243} - - - - {17CACE84-6798-2B44-A575-4A44864947B5} - - - - - {1E6639B6-8B58-4694-99E7-C058E3583522} - + {F0CBF543-3ABA-D346-B737-070FE06DBEC9} - + {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} - + {117C529D-0199-F54F-AEB8-278D85EAB176} @@ -2117,7 +2372,7 @@ - + {335AF6FD-1E3E-A545-B933-1479607B86CF} @@ -2127,17 +2382,17 @@ - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {A62A00A9-83D9-5546-9E26-6D5A40821D7E} - + {507BE00F-8299-7B42-AB67-10C2D5B5AC67} @@ -2147,7 +2402,7 @@ - + {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} @@ -2157,54 +2412,34 @@ - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {37007839-EF02-2147-9676-C1C38A214D0F} - + {5B7C7641-8FAF-364C-8CB3-A875601E73EE} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {3ABDCC1D-F1BC-134E-A3EE-5E8786652058} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - - - - {4F10C0E3-F820-457F-AB7D-CFDF2AA3C69A} - - - - {D2D716D6-C4A1-471F-894A-D718515F6281} - - - - - - {9E839249-E9B9-4736-8BDD-A95A1C892B42} - - - - {3DE04294-4DEA-4A13-A460-2274647357EA} - - @@ -2217,282 +2452,482 @@ - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {6D9C5BED-2B3B-3546-B807-CD618017F552} - - {E84967EC-2203-42D7-B34C-0EFBF0E9DF16} - - - - {69997292-C813-490C-910C-620B9AD3A2BB} - - - - - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {71A0310C-3928-44C3-8D4F-7D9AFF9EAE70} - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {71A0310C-3928-44C3-8D4F-7D9AFF9EAE70} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {345BDBFA-3326-40BF-B9DE-8ECA78A3EEF4} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {345BDBFA-3326-40BF-B9DE-8ECA78A3EEF4} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {DE98332B-0513-442C-B08C-234969B7C79F} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {A30C6A23-2170-447A-A127-17A60A09574F} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {4B2822D0-4D9A-4BBB-9956-A996493EE672} - + {92AA3735-BB4C-4541-81DA-AC500930B2E6} - + {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - + {A1DDB166-9422-45A3-AE93-6702275DAD1C} - + {08532144-809B-4726-A819-F8E3F9CF7515} - + {A1DDB166-9422-45A3-AE93-6702275DAD1C} - + {08532144-809B-4726-A819-F8E3F9CF7515} - + {92AA3735-BB4C-4541-81DA-AC500930B2E6} - + {9D9FA2FC-9298-4A6F-88A9-A055F8A91F52} - + {93DEEDC9-D4C7-47F8-8D6A-A79DABD6BA6A} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {DE98332B-0513-442C-B08C-234969B7C79F} - + {9D9FA2FC-9298-4A6F-88A9-A055F8A91F52} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - - {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} + + {0D78442F-AA88-4B95-A497-E86A86E07FB8} - + + {EC9AE568-7089-4B8D-9874-73DE5599266E} + + + + + + {84BF3C26-64A7-4032-B775-1D369052B243} + + + + {D2D716D6-C4A1-471F-894A-D718515F6281} + + + + + + {9E839249-E9B9-4736-8BDD-A95A1C892B42} + + + {9F45B2C3-B513-4646-B0C1-663748FD169C} + + {84BF3C26-64A7-4032-B775-1D369052B243} + + + + {FE413452-19EB-4DC9-B724-2984FA17CC20} + + + + + + {84BF3C26-64A7-4032-B775-1D369052B243} + + - {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} + {5A25771B-894F-4D92-8D1E-FBF8449850E8} + + + + + + {AF6C971B-D67A-42EE-A12B-97D36927C89F} - + {7ACEE4C2-A92D-4E50-BFAE-C1D744BEE5E0} - - {0D78442F-AA88-4B95-A497-E86A86E07FB8} + + {84BF3C26-64A7-4032-B775-1D369052B243} - - {EC9AE568-7089-4B8D-9874-73DE5599266E} + + {23884C5F-C5F7-D740-8B40-5341707D99BC} + + + + + + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} + + + + {11585EBC-914D-4E6D-A10D-D01694FF9840} + + + + + + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} + + + + {11585EBC-914D-4E6D-A10D-D01694FF9840} + + + + + + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} + + + + {11585EBC-914D-4E6D-A10D-D01694FF9840} + + + + + + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} + + + + {11585EBC-914D-4E6D-A10D-D01694FF9840} + + + + + + {0FF6511C-0293-41A8-860E-81978BD01F7F} + + + + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} + + + + + + {0FF6511C-0293-41A8-850E-81978BD01F7F} + + + + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} + + + + + + {0FF6511C-0293-41A8-860E-81978BD01F7F} + + + + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} + + + + + + {0FF6511C-0293-41A8-860E-81978BD01F7F} + + + + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} + + + + + + {0FF6511C-0293-41A8-870E-81978BD01F7F} + + + + {11585EBC-914D-4E6D-A10D-D01694FF9840} + + + + + + {0FF6511C-0293-41A8-880E-81978BD01F7F} + + + + {11585EBC-914D-4E6D-A10D-D01694FF9840} + + + + + + {0FF6511C-0293-41A8-890E-81978BD01F7F} + + + + {11585EBC-914D-4E6D-A10D-D01694FF9840} + + + + + + {ACC77B35-91B5-4405-ABC8-D0DA24D68178} + + + + {0FF6511C-0293-41A8-830E-81978BD01F7F} + + + + + + {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} + + + + {0FF6511C-0293-41A8-840E-81978BD01F7F} - + {84BF3C26-64A7-4032-B775-1D369052B243} - - {69997292-C813-490C-910C-620B9AD3A2BB} + + {CBDE6E1E-A483-4046-B62E-5346B9FF6660} + + {84BF3C26-64A7-4032-B775-1D369052B243} + + - {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} + {632BD6A0-E960-DC48-9A1F-AE642F41F9EB} + + + + + + {84BF3C26-64A7-4032-B775-1D369052B243} - - {D2D716D6-C4A1-471F-894A-D718515F6281} + + {CA8375B2-168C-0045-ABCF-DA4550D675E7} - - {25E94043-C1B8-794D-8327-6864707AAFAB} + + {84BF3C26-64A7-4032-B775-1D369052B243} - - {7174FE5A-D079-4452-AFEF-9FC2BCC2900F} + + {930C2917-F7C9-8C44-B249-27A70B16C9F6} - - {9E839249-E9B9-4736-8BDD-A95A1C892B42} + + {D7D2B884-8C20-B341-A7B6-C827641FAABF} - - {D2D716D6-C4A1-471F-894A-D718515F6281} + + {3DE04294-4DEA-4A13-A460-2274647357EA} - - {9E839249-E9B9-4736-8BDD-A95A1C892B42} + + {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - {3DE04294-4DEA-4A13-A460-2274647357EA} + {8760B263-C70C-46BA-9E97-A3D6B08941E9} - - {AF6C971B-D67A-42EE-A12B-97D36927C89F} + + {0D78442F-AA88-4B95-A497-E86A86E07FB8} - - {69997292-C813-490C-910C-620B9AD3A2BB} + + {7ACEE4C2-A92D-4E50-BFAE-C1D744BEE5E0} - - {84BF3C26-64A7-4032-B775-1D369052B243} + + {1E6639B6-8B58-4694-99E7-C058E3583522} - - {D2D716D6-C4A1-471F-894A-D718515F6281} + + {116EE63B-0949-0347-B9C5-D9834FC44784} - - {9E839249-E9B9-4736-8BDD-A95A1C892B42} + + {1E6639B6-8B58-4694-99E7-C058E3583522} - - {9F45B2C3-B513-4646-B0C1-663748FD169C} + + {FF2E57B8-213A-EC4E-B121-DB4F3B40DE20} + + + + + + {25E94043-C1B8-794D-8327-6864707AAFAB} + + + + {7174FE5A-D079-4452-AFEF-9FC2BCC2900F} + + + + + + {4F10C0E3-F820-457F-AB7D-CFDF2AA3C69A} + + + + {69997292-C813-490C-910C-620B9AD3A2BB} + + + + + + {4F10C0E3-F820-457F-AB7D-CFDF2AA3C69A} + + + + {90C5E751-255B-124C-8D6E-CD25D2B57F04} @@ -2513,12 +2948,12 @@ Reflection - -512 + -152 3256 - 3012 - 717 + 2534 + 670 @@ -2529,8 +2964,36 @@ -353 - 200 - 200 + 1894 + 459 + + + + Sample irradiance grid + + + + + -529 + 4501 + + + 2668 + 724 + + + + Vertex displacement + + + -96 + 272 + + + 2242 + 632 diff --git a/data/Source/System/Terrain/Ocean/Shaders/Wave/OceanLight.xdi b/data/Source/System/Terrain/Ocean/Shaders/Wave/OceanLight.xdi new file mode 100644 index 0000000000..2e1020ba48 --- /dev/null +++ b/data/Source/System/Terrain/Ocean/Shaders/Wave/OceanLight.xdi @@ -0,0 +1,35 @@ + + + + + + diff --git a/data/Source/System/Terrain/Ocean/Shaders/Wave/OceanLight.xdm b/data/Source/System/Terrain/Ocean/Shaders/Wave/OceanLight.xdm new file mode 100644 index 0000000000..281a2cf58b --- /dev/null +++ b/data/Source/System/Terrain/Ocean/Shaders/Wave/OceanLight.xdm @@ -0,0 +1,6 @@ + + + {1513C77F-E3E4-FA44-B196-35713004CFD3} + traktor.render.ShaderModule + +