Moved out entity system to use EnTT instead of Wire (#37)

Author: ChunkTreasure1

.gitattributes

@@ -11,8 +11,6 @@
 *.vtchr filter=lfs diff=lfs merge=lfs -text
 *.cached filter=lfs diff=lfs merge=lfs -text
 *.vtsk filter=lfs diff=lfs merge=lfs -text
-*.hlsl filter=lfs diff=lfs merge=lfs -text
-*.hlslh filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
 *.ico filter=lfs diff=lfs merge=lfs -text
 *.dmp filter=lfs diff=lfs merge=lfs -text

Engine/Engine/Shaders/Source/HLSL/2D/Billboard_gs.hlsl

@@ -1,3 +1,47 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1de5d2a8282c2825fbb510538a20fad1677e2baf5e7b614ef0ad5dd8747a95aa
-size 1201
+#include "Vertex.hlsli"
+#include "Buffers.hlsli"
+#include "Particle.hlsli"
+
+struct Output
+{
+    float4 position : SV_Position;
+    float4 color : COLOR;
+    float2 texCoords : UV;
+    uint textureIndex : TEXTUREINDEX;
+    uint id : ID;
+};
+
+[maxvertexcount(4)]
+void main(point DefaultBillboardVertex input[1], inout TriangleStream<Output> output)
+{
+    const float2 offsets[4] =
+    {
+        { -100.f, 100.f },
+        { 100.f, 100.f },
+        { -100.f, -100.f },
+        { 100.f, -100.f }
+    };
+
+    const float2 uvs[4] =
+    {
+        { 0.f, 0.f },
+        { 1.f, 0.f },
+        { 0.f, 1.f },
+        { 1.f, 1.f }
+    };
+    
+    const DefaultBillboardVertex inputData = input[0];
+    for (uint i = 0; i < 4; i++)
+    {
+        Output result;
+        result.position = mul(u_cameraData.view, inputData.position);
+        result.position.xy += offsets[i] * inputData.scale.xy;
+        result.position = mul(u_cameraData.projection, result.position);
+        result.color = inputData.color;
+        result.texCoords = uvs[i];
+        result.textureIndex = inputData.textureIndex;
+        result.id = inputData.id;
+
+        output.Append(result);
+    }
+}

Engine/Engine/Shaders/Source/HLSL/2D/Billboard_ps.hlsl

@@ -1,3 +1,36 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db5e16072fabd691bd727664b50bd16666c48291f40c614247b2edcca8994b77
-size 734
+#include "SamplerStates.hlsli"
+#include "Bindless.hlsli"
+
+struct Input
+{
+    float4 position : SV_Position;
+    float4 color : COLOR;
+    float2 texCoords : UV;
+    uint textureIndex : TEXTUREINDEX;
+    uint id : ID;
+};
+
+struct Output
+{
+    float4 color : SV_Target0;
+    uint id : SV_Target1;
+};
+
+Output main(in Input input)
+{
+    float4 result = 0.f;
+    
+    if (input.textureIndex == 0)
+    {
+        result = input.color;
+    }
+    else
+    {
+        result = u_texture2DTable[NonUniformResourceIndex(input.textureIndex)].Sample(u_linearSampler, input.texCoords) * input.color;
+    }
+    
+    Output output = (Output) 0;
+    output.color = result;
+    output.id = input.id;
+    return output;
+}

Engine/Engine/Shaders/Source/HLSL/2D/Billboard_vs.hlsl

@@ -1,3 +1,13 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2fb06f3c3918caa917229312543f8a40126c9a421478381fc1c588fb6f463fad
-size 331
+#include "Vertex.hlsli"
+
+DefaultBillboardVertex main(DefaultBillboardVertex input)
+{
+    DefaultBillboardVertex output;
+    output.position = input.position;
+    output.color = input.color;
+    output.scale = input.scale;
+    output.textureIndex = input.textureIndex;
+    output.id = input.id;
+    
+    return output;
+}

Engine/Engine/Shaders/Source/HLSL/2D/Line_ps.hlsl

@@ -1,3 +1,10 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3dc2bfff0508ab894c4fbfd9c3f02c54a71b97e91c58934ba329967f6fc3b99
-size 153
+struct Input
+{
+    float4 position : SV_POSITION;
+    float4 color : COLOR;
+};
+
+float4 main(Input input) : SV_TARGET
+{
+    return input.color;
+}

Engine/Engine/Shaders/Source/HLSL/2D/Line_vs.hlsl

@@ -1,3 +1,23 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5854f5817831d8c5d0253741d77a1bc6acebdc1276219ad00a9bb9f68cedc01
-size 421
+#include <Common.hlsli>
+#include <Buffers.hlsli>
+
+struct Input
+{
+    float4 position : POSITION;
+    float4 color : COLOR;
+};
+
+struct Output
+{
+    float4 position : SV_POSITION;
+    float4 color : COLOR;
+};
+
+Output main(Input input)
+{
+    Output output;
+    output.position = mul(u_cameraData.projection, mul(u_cameraData.view, input.position));
+    output.color = input.color;
+
+    return output;
+}

Engine/Engine/Shaders/Source/HLSL/2D/Particle_gs.hlsl

@@ -1,3 +1,57 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86d2b5599dbe4b42e52c5821fa9a5460e4d54e71868863f089de9a0049e85e6c
-size 1677
+#include "Vertex.hlsli"
+#include "Buffers.hlsli"
+#include "Particle.hlsli"
+
+struct PushConstants
+{
+    uint particleOffset;
+};
+[[vk::push_constant]] PushConstants u_pushConstants;
+
+[maxvertexcount(4)]
+void main(point DefaultParticleVertex input[1], inout TriangleStream<ParticleData> output)
+{
+    
+    const float2 offsets[4] =
+    {
+        { -100.f, 100.f },
+        { 100.f, 100.f },
+        { -100.f, -100.f },
+        { 100.f, -100.f }
+    };
+
+    const float2 uvs[4] =
+    {
+        { 0.f, 0.f },
+        { 1.f, 0.f },
+        { 0.f, 1.f },
+        { 1.f, 1.f }
+    };
+    
+    const ParticleRenderingInfo particleInfo = u_particleInfo[u_pushConstants.particleOffset + input[0].instanceId];
+    float rand = particleInfo.randomValue;
+    float scaleRand = float(1.6) - float(rand);
+
+    float2 newScale = particleInfo.scale.xy*scaleRand;
+    
+    for (uint i = 0; i < 4; i++)
+    {
+        ParticleData result;
+        result.position = mul(u_cameraData.view, float4(particleInfo.position, 1.f));
+        result.position.xy += offsets[i] * newScale;
+        result.position = mul(u_cameraData.projection, result.position);
+        
+        result.worldPosition = particleInfo.position;
+        result.color = particleInfo.color;
+        result.texCoords = uvs[i];
+        
+        result.albedoIndex = particleInfo.albedoIndex;
+        result.materialIndex = particleInfo.materialIndex;
+        result.normalIndex = particleInfo.normalIndex;
+        
+        result.randomValue = particleInfo.randomValue;
+        result.timeSinceSpawn = particleInfo.timeSinceSpawn;
+        
+        output.Append(result);
+    }
+}

Engine/Engine/Shaders/Source/HLSL/2D/Particle_ps.hlsl

@@ -1,3 +1,41 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32303ab3b032e31483ef0d9381fd777a48ea7f37654dd724275e258927a75d4b
-size 1220
+#include "SamplerStates.hlsli"
+#include "Particle.hlsli"
+
+#include "PBR.hlsli"
+
+float4 main(in ParticleData input) : SV_Target
+{
+    //float4 albedo = input.SampleAlbedo(u_anisotropicSampler, input.texCoords) * input.color;
+    //albedo.a = step(0.5f, albedo.a);
+    
+    //if (albedo.a < 0.05f)
+    //{
+    //    discard;
+    //}
+    
+    //const float3 normal = float3(0.f, 1.f, 0.f);
+    //const float4 rotatedNormal = mul(u_cameraData.inverseView, float4(normal, 0.f));
+    
+    //const float4 materialData = input.SampleMaterial(u_linearSampler, input.texCoords);
+   
+    //PBRData pbrData;
+    //pbrData.albedo = albedo;
+    //pbrData.normal = rotatedNormal.xyz;
+    //pbrData.metallic = materialData.r;
+    //pbrData.roughness = materialData.g;
+    //pbrData.emissive = 0.f;
+    //pbrData.worldPosition = input.worldPosition;
+    //pbrData.tileId = input.position.xy / 16;
+    
+    //const float3 pbrLighting = CalculatePBR(pbrData);
+    
+    //return float4(pbrLighting, albedo.a);
+    
+    const float4 texColor = input.SampleAlbedo(u_anisotropicSampler, input.texCoords);
+    if (texColor.a < 0.05f)
+    {
+        discard;
+    }
+    
+    return texColor * input.color;
+}

Engine/Engine/Shaders/Source/HLSL/2D/Particle_vs.hlsl

@@ -1,3 +1,14 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c839fe1b15634313dfe089f73ade6368abf833229e432f04890ecc70237a4df3
-size 237
+#include "Vertex.hlsli"
+
+struct Input
+{
+    uint instanceId : SV_InstanceID;
+};
+
+DefaultParticleVertex main(Input input)
+{
+    DefaultParticleVertex output;
+    output.instanceId = input.instanceId;
+    
+    return output;
+}

Engine/Engine/Shaders/Source/HLSL/2D/Quad_ps.hlsl

@@ -1,3 +1,32 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ce1cc87788f8d34e7e9aa2225c32121303af4e2963eb4d6e62c83642fa21d4a
-size 725
+#include "Vertex.hlsli"
+#include "SamplerStates.hlsli"
+#include "Bindless.hlsli"
+#include "Material.hlsli"
+
+struct Input
+{
+    float4 position : SV_Position;
+    STAGE_VARIABLE(float4, color, COLOR, 0);
+    STAGE_VARIABLE(float2, texCoords, TEXCOORDS, 1);
+};
+
+struct PushConstants
+{
+    float4x4 viewProjectionTransform;
+    float4 color;
+    float2 vertexOffset;
+    uint textureIndex;
+};
+
+[[vk::push_constant]] PushConstants u_pushConstants;
+
+float4 main(Input input) : SV_Target
+{
+    const float4 texColor = SampleTexture(u_pushConstants.textureIndex, u_linearSamplerClamp, input.texCoords) * input.color;
+    if (texColor.a < 0.05f)
+    {
+        discard;
+    }
+    
+    return texColor;
+}

Engine/Engine/Shaders/Source/HLSL/2D/Quad_vs.hlsl

@@ -1,3 +1,30 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c06b193f2a14499665d4901a18b7df8422aff71395d3b42084edf017b61b9afe
-size 719
+#include "Vertex.hlsli"
+
+struct PushConstants
+{
+    float4x4 viewProjectionTransform;
+    float4 color;
+    float2 vertexOffset;
+    uint textureIndex;
+};
+[[vk::push_constant]] PushConstants u_pushConstants;
+
+struct Output
+{
+    float4 position : SV_Position;
+    STAGE_VARIABLE(float4, color, COLOR, 0);
+    STAGE_VARIABLE(float2, texCoords, TEXCOORDS, 1);
+};
+
+Output main(DefaultQuadVertex input)
+{
+    float4 tempPos = input.position;
+    tempPos.xy += u_pushConstants.vertexOffset;
+    
+    Output output;
+    output.position = mul(u_pushConstants.viewProjectionTransform, tempPos);
+    output.texCoords = input.texCoords;
+    output.color = u_pushConstants.color;
+
+    return output;
+}