Merge pull request #50 from Williscool13/gameplay-expansion

Gameplay Expansion

Author: Williscool13

CMakeLists.txt

@@ -9,15 +9,15 @@
     },
     "cameraSettings": {
         "position": [
-            -7.438582420349121,
-            34.399600982666016,
-            47.61833953857422
+            2.7129502296447754,
+            69.97366333007813,
+            7.650825500488281
         ],
         "rotation": [
-            0.025229064747691154,
-            -0.12272556871175766,
-            0.0031201005913317204,
-            0.9921150803565979
+            -0.015324143692851067,
+            0.3289414346218109,
+            0.005338272545486689,
+            0.944210946559906
         ],
         "fov": 1.3089969158172607,
         "aspectRatio": 1.7777777910232544,
@@ -27,9 +27,9 @@
     "lightSettings": {
         "mainLight": {
             "direction": [
-                -0.6859943270683289,
-                -0.5144957900047302,
-                -0.5144957900047302
+                -0.17871452867984772,
+                -0.8167253732681274,
+                -0.5486536026000977
             ],
             "color": [
                 1.0,

assets/maps/sampleScene.willmap

@@ -9,7 +9,7 @@
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include <stb/stb_image_write.h>
 
-#include "src/core/engine.h"
+#include "engine/core/engine.h"
 
 int main(int argc, char* argv[])
 {

assets/settings.willengine

@@ -70,7 +70,6 @@ void main() {
 
     vec2 uv = (vec2(screenPos) + 0.5) * sceneData.texelSize;
 
-    // todo: optimize with textureGather?
     vec4 depths = textureGatherOffset(depthImage, vec2(screenPos) * sceneData.texelSize, ivec2(1,1), 0);
     float rDepth0 = depths.w;
     float rDepth1 = depths.z;

main.cpp

@@ -73,3 +73,23 @@ void will_engine::Camera::setCameraTransform(const glm::vec3 position, const glm
     transform.setRotation(rotation);
     updateViewMatrix();
 }
+
+glm::vec3 will_engine::Camera::screenToWorldDirection(const glm::vec2& screenPos) const
+{
+    const glm::vec4 ndcPos(
+        screenPos.x * 2.0f - 1.0f,
+        (1.0f - screenPos.y) * 2.0f - 1.0f,
+        -1.0f,
+        1.0f
+    );
+
+    glm::mat4 invProj = glm::inverse(cachedProjMatrix);
+    glm::vec4 viewPos = invProj * ndcPos;
+
+    viewPos.w = 0.0f;
+
+    const glm::mat4 invView = glm::inverse(cachedViewMatrix);
+    const glm::vec4 worldDir = invView * viewPos;
+
+    return glm::normalize(glm::vec3(worldDir));
+}

shaders/ambient_occlusion/ground_truth/gtao_depth_prefilter.comp

@@ -5,8 +5,8 @@
 #define CAMERA_H
 
 #include "camera_types.h"
-#include "src/core/transform.h"
-#include "src/renderer/renderer_constants.h"
+#include "engine/core/transform.h"
+#include "engine/renderer/renderer_constants.h"
 
 namespace will_engine
 {
@@ -65,6 +65,8 @@ class Camera
 
     void setCameraTransform(glm::vec3 position, glm::quat rotation);
 
+    glm::vec3 screenToWorldDirection(const glm::vec2& screenPos) const;
+
 protected:
     /**
      * Updates the projection matrix. FOV is in degrees and converted to radians in this function

src/core/input.h

@@ -4,46 +4,46 @@
 
 #include "free_camera.h"
 
-#include "src/core/input.h"
-#include "src/core/time.h"
+#include "engine/core/input.h"
+#include "engine/core/time.h"
 
 will_engine::FreeCamera::FreeCamera(const float fov, const float aspect, const float nearPlane, const float farPlane) : Camera(fov, aspect, nearPlane, farPlane)
 {}
 
 void will_engine::FreeCamera::update(const float deltaTime)
 {
-    const Input& input = Input::Get();
+    const input::Input& input = input::Input::get();
     if (!input.isInFocus()) {
         return;
     }
 
     glm::vec3 velocity{0.f};
     float verticalVelocity{0.f};
 
-    if (input.isKeyDown(SDLK_D)) {
+    if (input.isKeyDown(input::Key::D)) {
         velocity.x += 1.0f;
     }
-    if (input.isKeyDown(SDLK_A)) {
+    if (input.isKeyDown(input::Key::A)) {
         velocity.x -= 1.0f;
     }
-    if (input.isKeyDown(SDLK_LCTRL)) {
+    if (input.isKeyDown(input::Key::LCTRL)) {
         verticalVelocity -= 1.0f;
     }
-    if (input.isKeyDown(SDLK_SPACE)) {
+    if (input.isKeyDown(input::Key::SPACE)) {
         verticalVelocity += 1.0f;
     }
     // I guess vulkan is negative Z forward?!
-    if (input.isKeyDown(SDLK_W)) {
+    if (input.isKeyDown(input::Key::W)) {
         velocity.z -= 1.0f;
     }
-    if (input.isKeyDown(SDLK_S)) {
+    if (input.isKeyDown(input::Key::S)) {
         velocity.z += 1.0f;
     }
 
-    if (input.isKeyPressed(SDLK_PERIOD)) {
+    if (input.isKeyPressed(input::Key::PERIOD)) {
         speed += 1;
     }
-    if (input.isKeyPressed(SDLK_COMMA)) {
+    if (input.isKeyPressed(input::Key::COMMA)) {
         speed -= 1;
     }
     speed = glm::clamp(speed, -2.0f, 3.0f);