Skip to content

Commit

Permalink
Added camera
Browse files Browse the repository at this point in the history
  • Loading branch information
@emeiri
emeiri committed Dec 19, 2024
1 parent 41b3b81 commit 2df4c4a
Show file tree
Hide file tree
Showing 4 changed files with 170 additions and 36 deletions.
192 changes: 157 additions & 35 deletions Vulkan/Tutorial17/tutorial17.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,74 @@
#include "ogldev_vulkan_shader.h"
#include "ogldev_vulkan_graphics_pipeline.h"
#include "ogldev_vulkan_simple_mesh.h"
#include "ogldev_vulkan_glfw.h"
#include "ogldev_glm_camera.h"

#define WINDOW_WIDTH 1280
#define WINDOW_HEIGHT 720


void GLFW_KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods)

bool GLFWCameraHandler(CameraMovement& Movement, int Key, int Action, int Mods)
{
if ((key == GLFW_KEY_ESCAPE) && (action == GLFW_PRESS)) {
glfwSetWindowShouldClose(window, GLFW_TRUE);
bool Press = Action != GLFW_RELEASE;

bool Handled = true;

switch (Key) {

case GLFW_KEY_W:
Movement.Forward = Press;
break;

case GLFW_KEY_S:
Movement.Backward = Press;
break;

case GLFW_KEY_A:
Movement.StrafeLeft = Press;
break;

case GLFW_KEY_D:
Movement.StrafeRight = Press;
break;

case GLFW_KEY_PAGE_UP:
Movement.Up = Press;
break;

case GLFW_KEY_PAGE_DOWN:
Movement.Down = Press;
break;

case GLFW_KEY_KP_ADD:
Movement.Plus = Press;
break;

case GLFW_KEY_KP_SUBTRACT:
Movement.Minus = Press;
break;

default:
Handled = false;
}

if (Mods & GLFW_MOD_SHIFT) {
Movement.FastSpeed = Press;
}

return Handled;
}


class VulkanApp
class VulkanApp : public OgldevVK::GLFWCallbacks
{
public:

VulkanApp()
VulkanApp(int WindowWidth, int WindowHeight)
{
m_windowWidth = WindowWidth;
m_windowHeight = WindowHeight;
}

~VulkanApp()
Expand All @@ -71,10 +120,11 @@ class VulkanApp
}
}

void Init(const char* pAppName, GLFWwindow* pWindow)
void Init(const char* pAppName)
{
m_pWindow = pWindow;
m_vkCore.Init(pAppName, pWindow);
m_pWindow = OgldevVK::glfw_vulkan_init(WINDOW_WIDTH, WINDOW_HEIGHT, pAppName);

m_vkCore.Init(pAppName, m_pWindow);
m_device = m_vkCore.GetDevice();
m_numImages = m_vkCore.GetNumImages();
m_pQueue = m_vkCore.GetQueue();
Expand All @@ -86,8 +136,12 @@ class VulkanApp
CreatePipeline();
CreateCommandBuffers();
RecordCommandBuffers();
DefaultCreateCameraPers();
// The object is ready to receive callbacks
OgldevVK::glfw_vulkan_set_callbacks(m_pWindow, this);
}


void RenderScene()
{
u32 ImageIndex = m_pQueue->AcquireNextImage();
Expand All @@ -98,9 +152,96 @@ class VulkanApp

m_pQueue->Present(ImageIndex);
}


void Key(GLFWwindow* pWindow, int Key, int Scancode, int Action, int Mods)
{
bool Handled = true;

switch (Key) {
case GLFW_KEY_ESCAPE:
case GLFW_KEY_Q:
glfwDestroyWindow(m_pWindow);
glfwTerminate();
exit(0);

default:
Handled = false;
}

if (!Handled) {
Handled = GLFWCameraHandler(m_pGameCamera->m_movement, Key, Action, Mods);
}
}


void MouseMove(GLFWwindow* pWindow, double x, double y)
{
m_pGameCamera->m_mouseState.m_pos.x = (float)x / (float)m_windowWidth;
m_pGameCamera->m_mouseState.m_pos.y = (float)y / (float)m_windowHeight;
}


void MouseButton(GLFWwindow* pWindow, int Button, int Action, int Mods)
{
if (Button == GLFW_MOUSE_BUTTON_LEFT) {
m_pGameCamera->m_mouseState.m_buttonPressed = (Action == GLFW_PRESS);
}
}


void Execute()
{
float CurTime = (float)glfwGetTime();

while (!glfwWindowShouldClose(m_pWindow)) {
float Time = (float)glfwGetTime();
float dt = Time - CurTime;
m_pGameCamera->Update(dt);
RenderScene();
CurTime = Time;
glfwPollEvents();
}

glfwTerminate();
}


private:

void DefaultCreateCameraPers()
{
float FOV = 45.0f;
float zNear = 1.0f;
float zFar = 1000.0f;

DefaultCreateCameraPers(FOV, zNear, zFar);
}


void DefaultCreateCameraPers(float FOV, float zNear, float zFar)
{
if ((m_windowWidth == 0) || (m_windowHeight == 0)) {
printf("Invalid window dims: width %d height %d\n", m_windowWidth, m_windowHeight);
exit(1);
}

if (m_pGameCamera) {
printf("Camera already initialized\n");
exit(1);
}

PersProjInfo persProjInfo = { FOV, (float)m_windowWidth, (float)m_windowHeight,
zNear, zFar };

glm::vec3 Pos(0.0f, 0.0f, 0.0f);
glm::vec3 Target(0.0f, 0.0f, 1.0f);
glm::vec3 Up(0.0, 1.0f, 0.0f);

m_pGameCamera = new GLMCameraFirstPerson(Pos, Target, Up, persProjInfo);
}


void CreateCommandBuffers()
{
m_cmdBufs.resize(m_numImages);
Expand Down Expand Up @@ -214,6 +355,8 @@ class VulkanApp
glm::mat4 Rotate = glm::mat4(1.0);
Rotate = glm::rotate(Rotate, glm::radians(foo), glm::normalize(glm::vec3(0.0f, 0.0f, 1.0f)));
foo += 0.001f;

Rotate = m_pGameCamera->GetVPMatrix();
m_uniformBuffers[ImageIndex].Update(m_device, &Rotate, sizeof(Rotate));
}

Expand All @@ -230,42 +373,21 @@ class VulkanApp
OgldevVK::GraphicsPipeline* m_pPipeline = NULL;
OgldevVK::SimpleMesh m_mesh;
std::vector<OgldevVK::BufferAndMemory> m_uniformBuffers;
GLMCameraFirstPerson* m_pGameCamera = NULL;
int m_windowWidth = 0;
int m_windowHeight = 0;
};


#define APP_NAME "Tutorial 17"

int main(int argc, char* argv[])
{
if (!glfwInit()) {
return 1;
}

if (!glfwVulkanSupported()) {
return 1;
}
VulkanApp App(WINDOW_WIDTH, WINDOW_HEIGHT);

glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
glfwWindowHint(GLFW_RESIZABLE, GL_FALSE);

GLFWwindow* pWindow = glfwCreateWindow(WINDOW_WIDTH, WINDOW_HEIGHT, APP_NAME, NULL, NULL);

if (!pWindow) {
glfwTerminate();
exit(EXIT_FAILURE);
}

glfwSetKeyCallback(pWindow, GLFW_KeyCallback);

VulkanApp App;
App.Init(APP_NAME, pWindow);

while (!glfwWindowShouldClose(pWindow)) {
App.RenderScene();
glfwPollEvents();
}
App.Init(APP_NAME);

glfwTerminate();
App.Execute();

return 0;
}
2 changes: 1 addition & 1 deletion Windows/ogldev_vs_2022/Vulkan/Tutorial17/Tutorial17.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>OGLDEV_VULKAN;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_USE_MATH_DEFINES;OGLDEV_VULKAN;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(VULKAN_SDK)\Include;$(SolutionDir)\..\..\Vulkan\VulkanCore\Include;$(SolutionDir)\..\..\Include;$(SolutionDir)\..\..\Include\assimp5</AdditionalIncludeDirectories>
<LanguageStandard>stdcpp20</LanguageStandard>
Expand Down
3 changes: 3 additions & 0 deletions Windows/ogldev_vs_2022/Vulkan/VulkanCore/VulkanCore.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\Common\math_3d.cpp" />
<ClCompile Include="..\..\..\..\Common\ogldev_glm_camera.cpp" />
<ClCompile Include="..\..\..\..\Common\ogldev_util.cpp" />
<ClCompile Include="..\..\..\..\Vulkan\VulkanCore\Source\core.cpp" />
<ClCompile Include="..\..\..\..\Vulkan\VulkanCore\Source\device.cpp" />
<ClCompile Include="..\..\..\..\Vulkan\VulkanCore\Source\glfw_vulkan.cpp" />
<ClCompile Include="..\..\..\..\Vulkan\VulkanCore\Source\graphics_pipeline.cpp" />
<ClCompile Include="..\..\..\..\Vulkan\VulkanCore\Source\queue.cpp" />
<ClCompile Include="..\..\..\..\Vulkan\VulkanCore\Source\shader.cpp" />
Expand All @@ -32,6 +34,7 @@
<ItemGroup>
<ClInclude Include="..\..\..\..\Vulkan\VulkanCore\Include\ogldev_vulkan_core.h" />
<ClInclude Include="..\..\..\..\Vulkan\VulkanCore\Include\ogldev_vulkan_device.h" />
<ClInclude Include="..\..\..\..\Vulkan\VulkanCore\Include\ogldev_vulkan_glfw.h" />
<ClInclude Include="..\..\..\..\Vulkan\VulkanCore\Include\ogldev_vulkan_graphics_pipeline.h" />
<ClInclude Include="..\..\..\..\Vulkan\VulkanCore\Include\ogldev_vulkan_queue.h" />
<ClInclude Include="..\..\..\..\Vulkan\VulkanCore\Include\ogldev_vulkan_shader.h" />
Expand Down
9 changes: 9 additions & 0 deletions Windows/ogldev_vs_2022/Vulkan/VulkanCore/VulkanCore.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
<ClCompile Include="..\..\..\..\Vulkan\VulkanCore\Source\graphics_pipeline.cpp">
<Filter>Source Files\Vulkan</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Vulkan\VulkanCore\Source\glfw_vulkan.cpp">
<Filter>Source Files\Vulkan</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Common\ogldev_glm_camera.cpp">
<Filter>Source Files\CommonOgldev</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\Vulkan\VulkanCore\Include\ogldev_vulkan_core.h">
Expand All @@ -74,5 +80,8 @@
<ClInclude Include="..\..\..\..\Vulkan\VulkanCore\Include\ogldev_vulkan_simple_mesh.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\Vulkan\VulkanCore\Include\ogldev_vulkan_glfw.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

0 comments on commit 2df4c4a

Please sign in to comment.