Skip to content

Commit ebaa82b

Browse files
netwarm007netwarm007
committed
refactor done
1 parent 773add9 commit ebaa82b

File tree

93 files changed

+373
-419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+373
-419
lines changed

‎Asset/Shaders/ISPC/integrateBRDF.ispc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
//////////////////////////////
33
// This ISPC kernel is autogenerated by spirv-cross.
4-
// 09/18/18 15:11:20
4+
// 09/19/18 10:04:43
55
//////////////////////////////
66
//
77

‎Asset/Shaders/OpenGL/basic_ps.glsl

+5-24
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
bool lightCastShadow;
11-
int lightShadowMapIndex;
12-
int lightAngleAttenCurveType;
13-
int lightDistAttenCurveType;
14-
vec2 lightSize;
15-
ivec4 lightGUID;
16-
vec4 lightPosition;
17-
vec4 lightColor;
18-
vec4 lightDirection;
19-
vec4 lightDistAttenCurveParams[2];
20-
vec4 lightAngleAttenCurveParams[2];
21-
mat4 lightVP;
22-
vec4 padding[2];
23-
};
24-
25-
struct Light_1
26-
{
27-
int lightType;
28-
float lightIntensity;
29-
uint lightCastShadow;
10+
int lightCastShadow;
3011
int lightShadowMapIndex;
3112
int lightAngleAttenCurveType;
3213
int lightDistAttenCurveType;
@@ -47,13 +28,13 @@ layout(binding = 0, std140) uniform PerFrameConstants
4728
mat4 projectionMatrix;
4829
vec4 camPos;
4930
int numLights;
50-
Light_1 allLights[100];
31+
Light allLights[100];
5132
} _500;
5233

5334
layout(binding = 1, std140) uniform PerBatchConstants
5435
{
5536
mat4 modelMatrix;
56-
} _1038;
37+
} _1035;
5738

5839
struct constants_t
5940
{
@@ -367,7 +348,7 @@ void main()
367348
Light arg;
368349
arg.lightType = _500.allLights[i].lightType;
369350
arg.lightIntensity = _500.allLights[i].lightIntensity;
370-
arg.lightCastShadow = _500.allLights[i].lightCastShadow != 0u;
351+
arg.lightCastShadow = _500.allLights[i].lightCastShadow;
371352
arg.lightShadowMapIndex = _500.allLights[i].lightShadowMapIndex;
372353
arg.lightAngleAttenCurveType = _500.allLights[i].lightAngleAttenCurveType;
373354
arg.lightDistAttenCurveType = _500.allLights[i].lightDistAttenCurveType;
@@ -390,7 +371,7 @@ void main()
390371
Light arg_1;
391372
arg_1.lightType = _500.allLights[i].lightType;
392373
arg_1.lightIntensity = _500.allLights[i].lightIntensity;
393-
arg_1.lightCastShadow = _500.allLights[i].lightCastShadow != 0u;
374+
arg_1.lightCastShadow = _500.allLights[i].lightCastShadow;
394375
arg_1.lightShadowMapIndex = _500.allLights[i].lightShadowMapIndex;
395376
arg_1.lightAngleAttenCurveType = _500.allLights[i].lightAngleAttenCurveType;
396377
arg_1.lightDistAttenCurveType = _500.allLights[i].lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/basic_vs.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/cubemap_ps.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/cubemaparray_ps.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/debug_ps.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/debug_vs.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/depthcubemaparray_ps.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/depthtexturearray_ps.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/integrateBRDF_cs.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ struct Light
1010
{
1111
int lightType;
1212
float lightIntensity;
13-
uint lightCastShadow;
13+
int lightCastShadow;
1414
int lightShadowMapIndex;
1515
int lightAngleAttenCurveType;
1616
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/passthrough_cube_vs.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/passthrough_vs.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/pbr_ps.glsl

+4-23
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
bool lightCastShadow;
11-
int lightShadowMapIndex;
12-
int lightAngleAttenCurveType;
13-
int lightDistAttenCurveType;
14-
vec2 lightSize;
15-
ivec4 lightGUID;
16-
vec4 lightPosition;
17-
vec4 lightColor;
18-
vec4 lightDirection;
19-
vec4 lightDistAttenCurveParams[2];
20-
vec4 lightAngleAttenCurveParams[2];
21-
mat4 lightVP;
22-
vec4 padding[2];
23-
};
24-
25-
struct Light_1
26-
{
27-
int lightType;
28-
float lightIntensity;
29-
uint lightCastShadow;
10+
int lightCastShadow;
3011
int lightShadowMapIndex;
3112
int lightAngleAttenCurveType;
3213
int lightDistAttenCurveType;
@@ -47,13 +28,13 @@ layout(binding = 0, std140) uniform PerFrameConstants
4728
mat4 projectionMatrix;
4829
vec4 camPos;
4930
int numLights;
50-
Light_1 allLights[100];
31+
Light allLights[100];
5132
} _580;
5233

5334
layout(binding = 1, std140) uniform PerBatchConstants
5435
{
5536
mat4 modelMatrix;
56-
} _940;
37+
} _938;
5738

5839
layout(binding = 3) uniform samplerCubeArray cubeShadowMap;
5940
layout(binding = 1) uniform sampler2DArray shadowMap;
@@ -290,7 +271,7 @@ void main()
290271
Light light;
291272
light.lightType = _580.allLights[i].lightType;
292273
light.lightIntensity = _580.allLights[i].lightIntensity;
293-
light.lightCastShadow = _580.allLights[i].lightCastShadow != 0u;
274+
light.lightCastShadow = _580.allLights[i].lightCastShadow;
294275
light.lightShadowMapIndex = _580.allLights[i].lightShadowMapIndex;
295276
light.lightAngleAttenCurveType = _580.allLights[i].lightAngleAttenCurveType;
296277
light.lightDistAttenCurveType = _580.allLights[i].lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/shadowmap_omni_gs.glsl

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct Light
99
{
1010
int lightType;
1111
float lightIntensity;
12-
uint lightCastShadow;
12+
int lightCastShadow;
1313
int lightShadowMapIndex;
1414
int lightAngleAttenCurveType;
1515
int lightDistAttenCurveType;
@@ -43,12 +43,12 @@ layout(binding = 1, std140) uniform PerBatchConstants
4343
mat4 modelMatrix;
4444
} _91;
4545

46-
struct constant_t
46+
struct gs_constant_t
4747
{
4848
float layer_index;
4949
};
5050

51-
uniform constant_t u_pushConstants;
51+
uniform gs_constant_t u_gsPushConstants;
5252

5353
layout(binding = 0) uniform sampler2D diffuseMap;
5454
layout(binding = 1) uniform sampler2DArray shadowMap;
@@ -67,7 +67,7 @@ void main()
6767
{
6868
for (int face = 0; face < 6; face++)
6969
{
70-
gl_Layer = (int(u_pushConstants.layer_index) * 6) + face;
70+
gl_Layer = (int(u_gsPushConstants.layer_index) * 6) + face;
7171
for (int i = 0; i < 3; i++)
7272
{
7373
FragPos = gl_in[i].gl_Position;

‎Asset/Shaders/OpenGL/shadowmap_omni_ps.glsl

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;
@@ -36,13 +36,13 @@ layout(binding = 1, std140) uniform PerBatchConstants
3636
mat4 modelMatrix;
3737
} _50;
3838

39-
struct constants_t
39+
struct ps_constant_t
4040
{
4141
vec3 lightPos;
4242
float far_plane;
4343
};
4444

45-
uniform constants_t u_pushConstants;
45+
uniform ps_constant_t u_lightParams;
4646

4747
layout(binding = 0) uniform sampler2D diffuseMap;
4848
layout(binding = 1) uniform sampler2DArray shadowMap;
@@ -59,8 +59,8 @@ in vec4 FragPos;
5959

6060
void main()
6161
{
62-
float lightDistance = length(FragPos.xyz - u_pushConstants.lightPos);
63-
lightDistance /= u_pushConstants.far_plane;
62+
float lightDistance = length(FragPos.xyz - u_lightParams.lightPos);
63+
lightDistance /= u_lightParams.far_plane;
6464
gl_FragDepth = lightDistance;
6565
}
6666

‎Asset/Shaders/OpenGL/shadowmap_omni_vs.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/shadowmap_ps.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/shadowmap_vs.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/skybox_ps.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/skybox_vs.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGL/texture_ps.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct Light
77
{
88
int lightType;
99
float lightIntensity;
10-
uint lightCastShadow;
10+
int lightCastShadow;
1111
int lightShadowMapIndex;
1212
int lightAngleAttenCurveType;
1313
int lightDistAttenCurveType;

‎Asset/Shaders/OpenGLES/basic_ps.glsl

+5-24
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,7 @@ struct Light
66
{
77
int lightType;
88
highp float lightIntensity;
9-
bool lightCastShadow;
10-
int lightShadowMapIndex;
11-
int lightAngleAttenCurveType;
12-
int lightDistAttenCurveType;
13-
highp vec2 lightSize;
14-
ivec4 lightGUID;
15-
highp vec4 lightPosition;
16-
highp vec4 lightColor;
17-
highp vec4 lightDirection;
18-
highp vec4 lightDistAttenCurveParams[2];
19-
highp vec4 lightAngleAttenCurveParams[2];
20-
highp mat4 lightVP;
21-
highp vec4 padding[2];
22-
};
23-
24-
struct Light_1
25-
{
26-
int lightType;
27-
highp float lightIntensity;
28-
uint lightCastShadow;
9+
int lightCastShadow;
2910
int lightShadowMapIndex;
3011
int lightAngleAttenCurveType;
3112
int lightDistAttenCurveType;
@@ -46,13 +27,13 @@ layout(binding = 0, std140) uniform PerFrameConstants
4627
highp mat4 projectionMatrix;
4728
highp vec4 camPos;
4829
int numLights;
49-
Light_1 allLights[100];
30+
Light allLights[100];
5031
} _500;
5132

5233
layout(binding = 1, std140) uniform PerBatchConstants
5334
{
5435
highp mat4 modelMatrix;
55-
} _1038;
36+
} _1035;
5637

5738
struct constants_t
5839
{
@@ -366,7 +347,7 @@ void main()
366347
Light arg;
367348
arg.lightType = _500.allLights[i].lightType;
368349
arg.lightIntensity = _500.allLights[i].lightIntensity;
369-
arg.lightCastShadow = _500.allLights[i].lightCastShadow != 0u;
350+
arg.lightCastShadow = _500.allLights[i].lightCastShadow;
370351
arg.lightShadowMapIndex = _500.allLights[i].lightShadowMapIndex;
371352
arg.lightAngleAttenCurveType = _500.allLights[i].lightAngleAttenCurveType;
372353
arg.lightDistAttenCurveType = _500.allLights[i].lightDistAttenCurveType;
@@ -389,7 +370,7 @@ void main()
389370
Light arg_1;
390371
arg_1.lightType = _500.allLights[i].lightType;
391372
arg_1.lightIntensity = _500.allLights[i].lightIntensity;
392-
arg_1.lightCastShadow = _500.allLights[i].lightCastShadow != 0u;
373+
arg_1.lightCastShadow = _500.allLights[i].lightCastShadow;
393374
arg_1.lightShadowMapIndex = _500.allLights[i].lightShadowMapIndex;
394375
arg_1.lightAngleAttenCurveType = _500.allLights[i].lightAngleAttenCurveType;
395376
arg_1.lightDistAttenCurveType = _500.allLights[i].lightDistAttenCurveType;

0 commit comments

Comments
 (0)