SDL Updates

2022-09-15 09:26:43 +08:00 · 2022-09-15 09:26:43 +08:00 · bd69c6043a
parent 5e4eabc582
commit bd69c6043a
6 changed files with 37 additions and 95 deletions
--- a/Dependencies.bat
+++ b/Dependencies.bat
@ -8,16 +8,15 @@ echo "A - All"
 echo "B - VMA"
 echo "C - msdf"
 echo "D - assimp"
-echo "E - ktx"
-echo "F - spdlog"
-echo "G - reactphysics3d"
-echo "H - imgui"
-echo "I - imguizmo"
-echo "J - imnodes"
-echo "K - tracy"
-echo "L - RTTR"
-echo "M - yamlcpp"
-echo "O - SDL"
+echo "E - spdlog"
+echo "F - reactphysics3d"
+echo "G - imgui"
+echo "H - imguizmo"
+echo "I - imnodes"
+echo "J - tracy"
+echo "K - RTTR"
+echo "L - yamlcpp"
+echo "N - SDL"
 echo ---------------------------------------------------
 echo. 

@ -28,16 +27,15 @@ if %_e%==1 goto VMA
 if %_e%==2 goto VMA
 if %_e%==3 goto MSDF
 if %_e%==4 goto assimp
-if %_e%==5 goto ktx
-if %_e%==6 goto spdlog
-if %_e%==7 goto reactphysics3d
-if %_e%==8 goto imgui
-if %_e%==9 goto imguizmo
-if %_e%==10 goto imnodes
-if %_e%==11 goto tracy
-if %_e%==12 goto RTTR
-if %_e%==13 goto yamlcpp
-if %_e%==15 goto SDL
+if %_e%==5 goto spdlog
+if %_e%==6 goto reactphysics3d
+if %_e%==7 goto imgui
+if %_e%==8 goto imguizmo
+if %_e%==9 goto imnodes
+if %_e%==10 goto tracy
+if %_e%==11 goto RTTR
+if %_e%==12 goto yamlcpp
+if %_e%==14 goto SDL

 :VMA
 echo -----------------------VMA----------------------------
@ -57,59 +55,59 @@ rmdir "Dependencies/assimp" /S /Q
 git clone https://github.com/SHADE-DP/assimp.git "Dependencies/assimp"
 if %_e%==4 (goto :done) else (goto :ktx)

-:ktx
-rmdir "Dependencies/ktx" /S /Q
-echo -----------------------ktx----------------------------
-git clone https://github.com/SHADE-DP/ktx.git "Dependencies/ktx"
-if %_e%==5 (goto :done) else (goto :spdlog)
+@REM :ktx
+@REM rmdir "Dependencies/ktx" /S /Q
+@REM echo -----------------------ktx----------------------------
+@REM git clone https://github.com/SHADE-DP/ktx.git "Dependencies/ktx"
+@REM if %_e%==5 (goto :done) else (goto :spdlog)

 :spdlog
 echo -----------------------spdlog----------------------------
 rmdir "Dependencies/spdlog" /S /Q
 git clone https://github.com/SHADE-DP/spdlog.git "Dependencies/spdlog"
-if %_e%==6 (goto :done) else (goto :reactphysics3d)
+if %_e%==5 (goto :done) else (goto :reactphysics3d)

 :reactphysics3d
 echo -----------------------reactphysics3d----------------------------
 rmdir "Dependencies/reactphysics3d" /S /Q
 git clone https://github.com/SHADE-DP/reactphysics3d.git "Dependencies/reactphysics3d"
-if %_e%==7 (goto :done) else (goto :imgui)
+if %_e%==6 (goto :done) else (goto :imgui)

 :imgui
 echo -----------------------imgui----------------------------
 rmdir "Dependencies/imgui" /S /Q
 git clone https://github.com/SHADE-DP/imgui.git "Dependencies/imgui"
-if %_e%==8 (goto :done) else (goto :imguizmo)
+if %_e%==7 (goto :done) else (goto :imguizmo)

 :imguizmo
 echo -----------------------imguizmo----------------------------
 rmdir "Dependencies/imguizmo" /S /Q
 git clone https://github.com/SHADE-DP/ImGuizmo.git "Dependencies/imguizmo"
-if %_e%==9 (goto :done) else (goto :imnodes)
+if %_e%==8 (goto :done) else (goto :imnodes)

 :imnodes
 echo -----------------------imnodes----------------------------
 rmdir "Dependencies/imnodes" /S /Q
 git clone https://github.com/SHADE-DP/imnodes.git "Dependencies/imnodes"
-if %_e%==10 (goto :done) else (goto :tracy)
+if %_e%==9 (goto :done) else (goto :tracy)

 :tracy
 echo -----------------------tracy----------------------------
 rmdir "Dependencies/tracy" /S /Q
 git clone https://github.com/SHADE-DP/tracy.git "Dependencies/tracy"
-if %_e%==11 (goto :done) else (goto :RTTR)
+if %_e%==10 (goto :done) else (goto :RTTR)

 :RTTR
 echo -----------------------RTTR----------------------------
 rmdir "Dependencies/RTTR" /S /Q
 git clone https://github.com/SHADE-DP/RTTR.git "Dependencies/RTTR"
-if %_e%==12 (goto :done) else (goto :yamlcpp)
+if %_e%==11 (goto :done) else (goto :yamlcpp)

 :yamlcpp
 echo -----------------------yamlcpp----------------------------
 rmdir "Dependencies/yamlcpp" /S /Q
 git clone https://github.com/SHADE-DP/yaml-cpp.git "Dependencies/yamlcpp"
-if %_e%==13 (goto :done) else (goto :SDL)
+if %_e%==12 (goto :done) else (goto :SDL)

 :SDL
 echo -----------------------SDL----------------------------
--- a/Dependencies.lua
+++ b/Dependencies.lua
@ -10,7 +10,6 @@ IncludeDir["tracy"] = "%{wks.location}/Dependencies/tracy"
 IncludeDir["VMA"] = "%{wks.location}/Dependencies/VMA"
 IncludeDir["yamlcpp"] = "%{wks.location}/Dependencies/yamlcpp/include"
 IncludeDir["RTTR"] = "%{wks.location}/Dependencies/RTTR"
-IncludeDir["ktx"] = "%{wks.location}/Dependencies/ktx"
 IncludeDir["reactphysics3d"] = "%{wks.location}/Dependencies/reactphysics3d"
 IncludeDir["SDL"] = "%{wks.location}/Dependencies/SDL"
 IncludeDir["VULKAN"] = "$(VULKAN_SDK)"
--- a/SHADE_Application/src/Application/SBApplication.cpp
+++ b/SHADE_Application/src/Application/SBApplication.cpp
@ -11,6 +11,7 @@
 #include <chrono>
 #include <ratio>
 #include <ctime>
+#include <SDL.h>

 namespace Sandbox
 {
@ -24,9 +25,9 @@ namespace Sandbox
  )
  {
    //SHLOG_TITLE("Initialising SBApplication")
-    SHADE::SHSDLWindow::InitPlatform();
+    SDL_Init(SDL_INIT_VIDEO);
    window.Create(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
-    sdlWindow.CreateSDLWindow(window.GetHWND());
+    SDL_CreateWindowFrom(window.GetHWND());

 		#ifdef SHEDITOR
 		#else
@ -48,6 +49,7 @@ namespace Sandbox

  void SBApplication::Exit(void)
  {
+    SDL_DestroyWindow(sdlWindow);
 		#ifdef SHEDITOR
 		#else
 		#endif
--- a/SHADE_Application/src/Application/SBApplication.h
+++ b/SHADE_Application/src/Application/SBApplication.h
@ -1,6 +1,6 @@
 #ifndef SB_APPLICATION_H
 #define SB_APPLICATION_H
-#include <Graphics/Windowing/SDL/SHSDLWindow.h>
+#include <SDL_video.h>
 #include "Graphics/Windowing/SHWindow.h"
 //using namespace SHADE;

@ -10,7 +10,7 @@ namespace Sandbox
  {
  private:
    SHADE::SHWindow window;
-    SHADE::SHSDLWindow sdlWindow;
+    SDL_Window* sdlWindow;
    //SHAppConfig config;
  public:
    SBApplication() = default;
--- a/SHADE_Engine/src/Graphics/Windowing/SDL/SHSDLWindow.cpp
+++ b/SHADE_Engine/src/Graphics/Windowing/SDL/SHSDLWindow.cpp
@ -1,36 +0,0 @@
-#include "SHpch.h"
-
-#include "SHSDLWindow.h"
-
-#include "Tools/SHLogger.h"
-
-namespace SHADE
-{
-  SHSDLWindow::~SHSDLWindow()
-  {
-    SDL_DestroyWindow(sdlWindow);
-  }
-
-  void SHSDLWindow::InitPlatform(void) noexcept
-  {
-    SDL_Init(SDL_INIT_EVERYTHING);
-  }
-
-  void SHSDLWindow::CreateSDLWindow(const char* title, int x, int y, int width, int height) noexcept
-  {
-    sdlWindow = SDL_CreateWindow(title, x, y, width, height, 0);
-    if (sdlWindow == nullptr)
-    {
-      SHLOG_ERROR("Failed to create window")
-    }
-  }
-
-  void SHSDLWindow::CreateSDLWindow(HWND hwnd) noexcept
-  {
-    sdlWindow = SDL_CreateWindowFrom(hwnd);
-    if (sdlWindow == nullptr)
-    {
-      SHLOG_ERROR("Failed to create window from existing native Win32 Window")
-    }
-  }
-}
--- a/SHADE_Engine/src/Graphics/Windowing/SDL/SHSDLWindow.h
+++ b/SHADE_Engine/src/Graphics/Windowing/SDL/SHSDLWindow.h
@ -1,21 +0,0 @@
-#pragma once
-#include <Windows.h>
-#define SDL_HINT_VIDEO_FOREIGN_WINDOW_VULKAN 0
-#include <SDL.h>
-
-namespace SHADE
-{
-  class SHSDLWindow
-  {
-  public:
-    SHSDLWindow() = default;
-    ~SHSDLWindow();
-
-    static void InitPlatform(void) noexcept;
-    void CreateSDLWindow(const char* title, int x, int y, int width, int height) noexcept;
-    void CreateSDLWindow(HWND hwnd) noexcept;
-
-  private:
-    SDL_Window* sdlWindow = nullptr;
-  };
-}