Skip to content

Commit 912a0fd

Browse files
committed
add relative path
1 parent fd396ea commit 912a0fd

35 files changed

+25103
-18
lines changed

.vsconfig

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.Net.Component.4.6.2.TargetingPack",
5+
"Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64",
6+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
7+
"Microsoft.VisualStudio.Component.Windows10SDK",
8+
"Microsoft.VisualStudio.Workload.CoreEditor",
9+
"Microsoft.VisualStudio.Workload.ManagedDesktop",
10+
"Microsoft.VisualStudio.Workload.NativeDesktop",
11+
"Microsoft.VisualStudio.Workload.NativeGame"
12+
]
13+
}
File renamed without changes.

Content/OceanWater/OceanWater.ush renamed to AwesomeShaders/OceanWater.ush

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#define LENGTH 256
2020
#define BUTTERFLY_COUNT 8
21+
//#define THREADGROUP_SIZE 256
2122

2223
void GetButterflyValues(uint passIndex,uint x, out uint2 indices, out float2 weights)
2324
{
@@ -27,6 +28,7 @@ void GetButterflyValues(uint passIndex,uint x, out uint2 indices, out float2 wei
2728
int sectionStartOffset=x&~(sectionWidth-1);
2829
int halfSectionOffset=x&(halfSectionWidth-1);
2930
int sectionOffset=x&(sectionWidth-1);
31+
float PI = 3.14;
3032

3133
sincos(2.0* PI*sectionOffset/(float)sectionWidth,weights.y,weights.x);
3234
weights.y=-weights.y;
@@ -40,7 +42,7 @@ void GetButterflyValues(uint passIndex,uint x, out uint2 indices, out float2 wei
4042
}
4143
}
4244
/////////////////
43-
groupshared float3 pingPongArray[4][256];
45+
groupshared float3 pingPongArray[4][THREADGROUP_SIZE];
4446

4547
void ButterflyPass(int passIndex, uint x,uint t0, uint t1, out float3 resultR, out float3 resultI)
4648
{

0 commit comments

Comments
 (0)