diff --git a/Assets/Cube.003.shmesh.shmeta b/Assets/Cube.003.shmesh.shmeta index 99185bf3..628ecd00 100644 --- a/Assets/Cube.003.shmesh.shmeta +++ b/Assets/Cube.003.shmesh.shmeta @@ -1,3 +1,3 @@ Name: Cube.003 -ID: 77135977 +ID: 71245919 Type: 4 diff --git a/Assets/Cube.012.shmesh.shmeta b/Assets/Cube.012.shmesh.shmeta index b3bf270f..56d2d0f5 100644 --- a/Assets/Cube.012.shmesh.shmeta +++ b/Assets/Cube.012.shmesh.shmeta @@ -1,3 +1,3 @@ Name: Cube.012 -ID: 81876417 +ID: 80365422 Type: 4 diff --git a/Assets/RaccoonBag_Color_Ver4.shtex.shmeta b/Assets/RaccoonBag_Color_Ver4.shtex.shmeta index 70631c1e..d386e9a4 100644 --- a/Assets/RaccoonBag_Color_Ver4.shtex.shmeta +++ b/Assets/RaccoonBag_Color_Ver4.shtex.shmeta @@ -1,3 +1,3 @@ Name: RaccoonBag_Color_Ver4 -ID: 66703095 +ID: 58303057 Type: 3 diff --git a/Assets/RaccoonPreTexturedVer1_Base9.shtex.shmeta b/Assets/RaccoonPreTexturedVer1_Base9.shtex.shmeta index 61be80e0..e1a72340 100644 --- a/Assets/RaccoonPreTexturedVer1_Base9.shtex.shmeta +++ b/Assets/RaccoonPreTexturedVer1_Base9.shtex.shmeta @@ -1,3 +1,3 @@ Name: RaccoonPreTexturedVer1_Base9 -ID: 60820650 +ID: 64651793 Type: 3 diff --git a/Assets/Shaders/Kirsch_CS.shshaderb b/Assets/Shaders/Kirsch_CS.shshaderb index 6219d9a9..4c54946c 100644 Binary files a/Assets/Shaders/Kirsch_CS.shshaderb and b/Assets/Shaders/Kirsch_CS.shshaderb differ diff --git a/Assets/Shaders/Kirsch_CS.shshaderb.shmeta b/Assets/Shaders/Kirsch_CS.shshaderb.shmeta index 05983cd3..af092818 100644 --- a/Assets/Shaders/Kirsch_CS.shshaderb.shmeta +++ b/Assets/Shaders/Kirsch_CS.shshaderb.shmeta @@ -1,3 +1,3 @@ Name: Kirsch_CS -ID: 41371706 +ID: 39301863 Type: 2 diff --git a/Assets/Shaders/PureCopy_CS.shshaderb b/Assets/Shaders/PureCopy_CS.shshaderb index 9f1b0534..30a629f5 100644 Binary files a/Assets/Shaders/PureCopy_CS.shshaderb and b/Assets/Shaders/PureCopy_CS.shshaderb differ diff --git a/Assets/Shaders/PureCopy_CS.shshaderb.shmeta b/Assets/Shaders/PureCopy_CS.shshaderb.shmeta index c90787e5..8c3d446d 100644 --- a/Assets/Shaders/PureCopy_CS.shshaderb.shmeta +++ b/Assets/Shaders/PureCopy_CS.shshaderb.shmeta @@ -1,3 +1,3 @@ Name: PureCopy_CS -ID: 35841916 +ID: 34987209 Type: 2 diff --git a/Assets/Shaders/TestCube_FS.glsl b/Assets/Shaders/TestCube_FS.glsl index c60da6ce..4dc6deca 100644 --- a/Assets/Shaders/TestCube_FS.glsl +++ b/Assets/Shaders/TestCube_FS.glsl @@ -13,38 +13,37 @@ struct MatPropData layout(location = 0) in struct { - vec4 vertPos; // location 0 - vec2 uv; // location = 1 - vec4 normal; // location = 2 + vec4 vertColor; + vec2 uv; } In; // material stuff -layout(location = 3) flat in struct +layout(location = 2) flat in struct { int materialIndex; uint eid; uint lightLayerIndex; } In2; +//layout (set = 0, binding = ) + layout (set = 0, binding = 1) uniform sampler2D textures[]; // for textures (global) -layout (std430, set = 3, binding = 0) buffer MaterialProperties // For materials +layout (set = 3, binding = 0) buffer MaterialProperties // For materials { MatPropData data[]; } MatProp; -layout(location = 0) out vec4 position; +layout(location = 0) out vec4 outColor; layout(location = 1) out uint outEntityID; layout(location = 2) out uint lightLayerIndices; -layout(location = 3) out vec4 normals; -layout(location = 4) out vec4 albedo; void main() { - position = In.vertPos; - normals = In.normal; - albedo = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv) + MatProp.data[In2.materialIndex].color / MatProp.data[In2.materialIndex].alpha; + outColor = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv) + + MatProp.data[In2.materialIndex].color / MatProp.data[In2.materialIndex].alpha; outEntityID = In2.eid; lightLayerIndices = In2.lightLayerIndex; + //outColor = vec4 (1.0f); } \ No newline at end of file diff --git a/Assets/Shaders/TestCube_FS.shshaderb b/Assets/Shaders/TestCube_FS.shshaderb index b0113dc7..45b6a713 100644 Binary files a/Assets/Shaders/TestCube_FS.shshaderb and b/Assets/Shaders/TestCube_FS.shshaderb differ diff --git a/Assets/Shaders/TestCube_FS.shshaderb.shmeta b/Assets/Shaders/TestCube_FS.shshaderb.shmeta index 0e7e4bda..42f270af 100644 --- a/Assets/Shaders/TestCube_FS.shshaderb.shmeta +++ b/Assets/Shaders/TestCube_FS.shshaderb.shmeta @@ -1,3 +1,3 @@ Name: TestCube_FS -ID: 47024851 +ID: 37450402 Type: 2 diff --git a/Assets/Shaders/TestCube_VS.glsl b/Assets/Shaders/TestCube_VS.glsl index 49f107dd..7b58d1cf 100644 --- a/Assets/Shaders/TestCube_VS.glsl +++ b/Assets/Shaders/TestCube_VS.glsl @@ -14,14 +14,13 @@ layout(location = 8) in uvec2 integerData; layout(location = 0) out struct { - vec4 vertPos; // location 0 + vec4 vertColor; // location 0 vec2 uv; // location = 1 - vec4 normal; // location = 2 } Out; // material stuff -layout(location = 3) out struct +layout(location = 2) out struct { int materialIndex; uint eid; @@ -37,14 +36,10 @@ layout(set = 2, binding = 0) uniform CameraData void main() { - + Out.uv = aUV; Out2.materialIndex = gl_InstanceIndex; Out2.eid = integerData[0]; Out2.lightLayerIndex = integerData[1]; - - Out.vertPos = worldTransform * vec4(aVertexPos, 1.0f); - Out.uv = aUV; - Out.normal.rgb = mat3(transpose(inverse(worldTransform))) * aNormal.rgb; - Out.normal.rgb = normalize (Out.normal.rgb); gl_Position = cameraData.vpMat * worldTransform * vec4 (aVertexPos, 1.0f); + Out.vertColor = vec4 (aVertexPos, 1.0f); } \ No newline at end of file diff --git a/Assets/Shaders/TestCube_VS.shshaderb b/Assets/Shaders/TestCube_VS.shshaderb index 03e23af3..e070a9a6 100644 Binary files a/Assets/Shaders/TestCube_VS.shshaderb and b/Assets/Shaders/TestCube_VS.shshaderb differ diff --git a/Assets/Shaders/TestCube_VS.shshaderb.shmeta b/Assets/Shaders/TestCube_VS.shshaderb.shmeta index ad3a1725..b133437b 100644 --- a/Assets/Shaders/TestCube_VS.shshaderb.shmeta +++ b/Assets/Shaders/TestCube_VS.shshaderb.shmeta @@ -1,3 +1,3 @@ Name: TestCube_VS -ID: 40523220 +ID: 41688429 Type: 2 diff --git a/Assets/TD_Checker_Base_Color.shtex.shmeta b/Assets/TD_Checker_Base_Color.shtex.shmeta index c25ba444..8c0d5b77 100644 --- a/Assets/TD_Checker_Base_Color.shtex.shmeta +++ b/Assets/TD_Checker_Base_Color.shtex.shmeta @@ -1,3 +1,3 @@ Name: TD_Checker_Base_Color -ID: 55706287 +ID: 51995224 Type: 3