Merge pull request #62 from Williscool13/render-context

Render Context

Author: Williscool13

CMakeLists.txt

@@ -309,6 +309,10 @@ set(TEMP_SOURCES
         src/engine/renderer/assets/render_object/render_object_fwd.h
         src/engine/core/events/event_dispatcher.cpp
         src/engine/core/events/event_dispatcher.h
+        src/engine/renderer/render_context.cpp
+        src/engine/renderer/render_context.h
+        src/engine/renderer/resources/render_target.cpp
+        src/engine/renderer/resources/render_target.h
 )
 
 add_executable(WillEngine main.cpp

assets/models/AlphaBlendModeTest.willmodel

@@ -0,0 +1,12 @@
+{
+    "renderObject": {
+        "id": 6331695,
+        "name": "AlphaBlendModeTest",
+        "sourcePath": "assets\\models\\AlphaBlendModeTest.glb"
+    },
+    "version": {
+        "major": 0,
+        "minor": 1,
+        "patch": 0
+    }
+}

assets/models/mySphere.willmodel

@@ -0,0 +1,12 @@
+{
+    "renderObject": {
+        "id": 3725271840,
+        "name": "mySphere",
+        "sourcePath": "assets\\models\\mySphere.glb"
+    },
+    "version": {
+        "major": 0,
+        "minor": 1,
+        "patch": 0
+    }
+}

assets/models/primitives/primitives.willmodel

@@ -0,0 +1,12 @@
+{
+    "renderObject": {
+        "id": 3129368917,
+        "name": "primitives",
+        "sourcePath": "assets\\models\\primitives\\primitives.gltf"
+    },
+    "version": {
+        "major": 0,
+        "minor": 1,
+        "patch": 0
+    }
+}

assets/settings.willengine

@@ -9,15 +9,15 @@
     },
     "cameraSettings": {
         "position": [
-            -0.12309487164020538,
-            9.832075119018555,
-            -0.149642214179039
+            23.16223907470703,
+            24.40260124206543,
+            -1.7917613983154297
         ],
         "rotation": [
-            -0.4356941878795624,
-            -0.5376664400100708,
-            -0.3827509880065918,
-            0.6120350956916809
+            0.19685576856136322,
+            -0.782544732093811,
+            -0.30430784821510315,
+            -0.5062295794487
         ],
         "fov": 1.3089969158172607,
         "aspectRatio": 1.7777777910232544,
@@ -27,14 +27,14 @@
     "lightSettings": {
         "mainLight": {
             "direction": [
-                0.3107273280620575,
-                -0.9343101978302002,
-                -0.17467966675758362
+                -0.6146882772445679,
+                -0.7376258969306946,
+                -0.2794037461280823
             ],
             "color": [
-                1.0,
-                1.0,
-                1.0
+                0.5773502588272095,
+                0.5773502588272095,
+                0.5773502588272095
             ],
             "intensity": 1.5
         }

shaders/deferredMrt.frag

@@ -27,49 +27,43 @@ layout (location = 3) out vec2 velocityTarget;
 
 layout (set = 1, binding = 0) uniform Addresses
 {
-    MaterialData materialBufferDeviceAddress;
-    ModelData modelBufferDeviceAddress;
+    Instances instances;
+    Models models;
+    PrimitiveData primitives;
+    Materials materials;
+
 } bufferAddresses;
 
 layout (set = 2, binding = 0) uniform sampler samplers[];
 layout (set = 2, binding = 1) uniform texture2D textures[];
 
 void main() {
-    Material m = bufferAddresses.materialBufferDeviceAddress.materials[inMaterialIndex];
+    Material material = bufferAddresses.materials.materialArray[inMaterialIndex];
     vec4 albedo = vec4(1.0f);
 
-    int colorSamplerIndex = m.textureSamplerIndices.x;
-    int colorImageIndex = m.textureImageIndices.x;
+    int colorSamplerIndex = material.textureSamplerIndices.x;
+    int colorImageIndex = material.textureImageIndices.x;
     if (colorSamplerIndex > -1 && colorImageIndex > -1) {
-        vec2 colorUv = inUV * m.colorUvTransform.xy + m.colorUvTransform.zw;
+        vec2 colorUv = inUV * material.colorUvTransform.xy + material.colorUvTransform.zw;
         albedo = texture(sampler2D(textures[nonuniformEXT(colorImageIndex)], samplers[nonuniformEXT(colorSamplerIndex)]), colorUv);
     }
-    //albedo = albedo * inColor * m.colorFactor;
-
-    // Look into custom shaders specifically for these? More draw commands vs branching...
-    // 1 is transparent blend type
-    if (m.alphaProperties.y == 1) {
-        // Draw only if alpha is close enough to 1
-        if (albedo.w <= 1.0 - TRANSPARENT_ALPHA_EPSILON) {
-            discard;
-        }
-    }
+    albedo = albedo * inColor * material.colorFactor;
 
     // 2 is "mask" (cutout) blend type
-    if (m.alphaProperties.y == 2){
-        // 2 is "mask" blend type
-        if (albedo.w < m.alphaProperties.x){
+    if (material.alphaProperties.y == 2){
+        // x is the cutout value (if any)
+        if (albedo.w < material.alphaProperties.x){
             discard;
         }
     }
 
-    int metalSamplerIndex = int(m.textureSamplerIndices.y);
-    int metalImageIndex = int(m.textureImageIndices.y);
+    int metalSamplerIndex = int(material.textureSamplerIndices.y);
+    int metalImageIndex = int(material.textureImageIndices.y);
 
-    float metallic = m.metalRoughFactors.x;
-    float roughness = m.metalRoughFactors.y;
+    float metallic = material.metalRoughFactors.x;
+    float roughness = material.metalRoughFactors.y;
     if (metalSamplerIndex > -1 && metalImageIndex > -1) {
-        vec2 metalRoughUv = inUV * m.metalRoughUvTransform.xy + m.metalRoughUvTransform.zw;
+        vec2 metalRoughUv = inUV * material.metalRoughUvTransform.xy + material.metalRoughUvTransform.zw;
         vec4 metalRoughSample = texture(sampler2D(textures[nonuniformEXT(metalImageIndex)], samplers[nonuniformEXT(metalSamplerIndex)]), metalRoughUv);
         metallic *= metalRoughSample.b;
         roughness *= metalRoughSample.g;

shaders/deferredMrt.vert

@@ -9,9 +9,10 @@
 
 layout (set = 1, binding = 0) uniform Addresses
 {
-    MaterialData materialBufferDeviceAddress;
-    PrimitiveData primitiveBufferDeviceAddress;
-    ModelData modelBufferDeviceAddress;
+    Instances instances;
+    Models models;
+    PrimitiveData primitives;
+    Materials materials;
 } bufferAddresses;
 
 
@@ -30,22 +31,25 @@ layout (location = 6) out vec4 outCurrMvpPosition;
 layout (location = 7) out vec4 outPrevMvpPosition;
 
 void main() {
-    Primitive primitive = bufferAddresses.primitiveBufferDeviceAddress.primitives[gl_InstanceIndex];
-    uint modelIndex = primitive.modelIndex;
-    uint materialIndex = primitive.materialIndex;
-    Model models = bufferAddresses.modelBufferDeviceAddress.models[modelIndex];
+    Instance instances = bufferAddresses.instances.instanceArray[gl_InstanceIndex];
 
-    vec4 viewPos = sceneData.view * models.currentModelMatrix * vec4(position, 1.0);
+    Primitive primitive = bufferAddresses.primitives.primitiveArray[instances.primitiveDataIndex];
+    Model model = bufferAddresses.models.modelArray[instances.modelIndex];
+
+    Material material = bufferAddresses.materials.materialArray[primitive.materialIndex];
+
+
+    vec4 viewPos = sceneData.view * model.currentModelMatrix * vec4(position, 1.0);
 
     outViewPosition = viewPos.xyz;
-    outViewNormal = mat3(sceneData.view) * adjugate(models.currentModelMatrix) * normal;
+    outViewNormal = mat3(sceneData.view) * adjugate(model.currentModelMatrix) * normal;
     outColor = color;
     outUV = uv;
-    outMaterialIndex = materialIndex;
+    outMaterialIndex = primitive.materialIndex;
     outHasTransparent = primitive.bHasTransparent;
 
     vec4 currClipPos = sceneData.proj * viewPos;
-    vec4 prevClipPos = sceneData.prevViewProj * models.previousModelMatrix * vec4(position, 1.0);
+    vec4 prevClipPos = sceneData.prevViewProj * model.previousModelMatrix * vec4(position, 1.0);
     currClipPos.xy += currClipPos.w * sceneData.jitter.xy;
     prevClipPos.xy += prevClipPos.w * sceneData.jitter.zw;
     outCurrMvpPosition = currClipPos;

shaders/environment/environment.frag

@@ -16,12 +16,28 @@ layout (location = 3) out vec2 velocityTarget;// 16 X, 16 Y
 
 layout(set = 1, binding = 0) uniform samplerCube environmentMap;
 
+layout (push_constant) uniform PushConstants {
+    float sunSize;
+    float sunFalloff;
+} push;
+
+
 void main()
 {
     vec3 direction = normalize(uv);
     direction.y = -direction.y;
     vec3 envColor = textureLod(environmentMap, direction, 0).rgb;
 
+    vec3 sunDir = -sceneData.directionalLightData.direction;
+    float sunDot = dot(normalize(uv), sunDir);
+
+    if (sunDot > push.sunSize) {
+        float sunIntensity = smoothstep(push.sunSize, push.sunFalloff, sunDot);
+        vec3 sunColor = sceneData.directionalLightData.color * sceneData.directionalLightData.intensity;
+        envColor = mix(envColor, sunColor * 10.0, sunIntensity);
+    }
+
+
     // 0 = "do not calculate lighting" flag
     albedoTarget = vec4(envColor, 0.0);
 

shaders/include/lights.glsl

@@ -1,3 +1,6 @@
+#ifndef LIGHTS_GLSL
+#define LIGHTS_GLSL
+
 struct DirectionalLight {
     vec3 direction;
     float intensity;
@@ -11,4 +14,6 @@ struct PointLight {
     float radius;
     int shadowMapIndex;
     vec3 pad;
-};
+};
+
+#endif // LIGHTS_GLSL

shaders/include/scene.glsl

@@ -1,3 +1,5 @@
+#include "lights.glsl"
+
 layout (std140, set = 0, binding = 0) uniform SceneData {
     mat4 view;
     mat4 proj;
@@ -24,8 +26,10 @@ layout (std140, set = 0, binding = 0) uniform SceneData {
 
     vec4 jitter;
 
+    DirectionalLight directionalLightData;
+
     vec2 renderTargetSize;
-    // equal to 1 / renderTargetSize
+
     vec2 texelSize;
     vec2 cameraPlanes;
     float deltaTime;