Base of the Module system (#8)
Co-authored-by: Curle <curle@gemwire.uk>
This commit is contained in:
GitHub
parent
6dbb04ea83
commit
71b95e1ccf
13
.idea/.idea.umbra/.idea/.gitignore
vendored
13
.idea/.idea.umbra/.idea/.gitignore
vendored
|
|
@ -1,13 +0,0 @@
|
||||||
# Default ignored files
|
|
||||||
/shelf/
|
|
||||||
/workspace.xml
|
|
||||||
# Rider ignored files
|
|
||||||
/projectSettingsUpdater.xml
|
|
||||||
/modules.xml
|
|
||||||
/.idea.umbra.iml
|
|
||||||
/contentModel.xml
|
|
||||||
# Editor-based HTTP Client requests
|
|
||||||
/httpRequests/
|
|
||||||
# Datasource local storage ignored files
|
|
||||||
/dataSources/
|
|
||||||
/dataSources.local.xml
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="UserContentModel">
|
|
||||||
<attachedFolders />
|
|
||||||
<explicitIncludes />
|
|
||||||
<explicitExcludes />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings">
|
|
||||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,14 +1,15 @@
|
||||||
cmake_minimum_required(VERSION 3.22)
|
cmake_minimum_required(VERSION 3.24)
|
||||||
|
|
||||||
Include(FetchContent)
|
Include(FetchContent)
|
||||||
|
|
||||||
# Fetch SDL for the runtime
|
# Fetch SDL for the runtime
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
SDL2
|
SDL2
|
||||||
URL https://www.libsdl.org/release/SDL2-devel-2.0.22-VC.zip
|
URL https://www.libsdl.org/release/SDL2-devel-2.24.0-VC.zip
|
||||||
)
|
)
|
||||||
FetchContent_MakeAvailable(SDL2)
|
FetchContent_MakeAvailable(SDL2)
|
||||||
set(SDL2_PATH ${sdl2_SOURCE_DIR})
|
set(SDL2_DIR ${sdl2_SOURCE_DIR})
|
||||||
|
list(PREPEND CMAKE_PREFIX_PATH "${sdl2_SOURCE_DIR}/cmake")
|
||||||
|
|
||||||
# Fetch Catch2 for the file format tests
|
# Fetch Catch2 for the file format tests
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
|
|
@ -46,29 +47,34 @@ if(NOT spdlog_POPULATED)
|
||||||
add_subdirectory(${spdlog_SOURCE_DIR} ${spdlog_BINARY_DIR})
|
add_subdirectory(${spdlog_SOURCE_DIR} ${spdlog_BINARY_DIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
FetchContent_Declare(
|
||||||
|
imgui
|
||||||
|
GIT_REPOSITORY https://github.com/ocornut/imgui
|
||||||
|
GIT_TAG 71a0701920dbc83155f718182f01132d1ec2d51e
|
||||||
|
)
|
||||||
|
|
||||||
|
FetchContent_MakeAvailable(imgui)
|
||||||
|
|
||||||
|
FetchContent_Declare(
|
||||||
|
dylib
|
||||||
|
GIT_REPOSITORY "https://github.com/martin-olivier/dylib"
|
||||||
|
GIT_TAG "v2.1.0"
|
||||||
|
)
|
||||||
|
|
||||||
|
FetchContent_MakeAvailable(dylib)
|
||||||
|
|
||||||
# Import some find files
|
# Import some find files
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
|
||||||
|
|
||||||
project(umbra)
|
project(umbra)
|
||||||
|
|
||||||
# Fetch ImGui for the application
|
set(CMAKE_STATIC_LIBRARY_PREFIX "")
|
||||||
add_subdirectory(projs/imgui)
|
set(CMAKE_SHARED_LIBRARY_PREFIX "")
|
||||||
|
|
||||||
# Common utilities
|
|
||||||
add_subdirectory(projs/shadow/shadow-utility)
|
|
||||||
|
|
||||||
# Asset management
|
|
||||||
add_subdirectory(projs/shadow/shadow-file-format)
|
|
||||||
|
|
||||||
# Reflection
|
|
||||||
add_subdirectory(projs/shadow/shadow-reflection)
|
|
||||||
|
|
||||||
# Core engine
|
# Core engine
|
||||||
add_subdirectory(projs/shadow/shadow-engine)
|
add_subdirectory(projs/shadow/shadow-engine)
|
||||||
|
|
||||||
# Renderer
|
|
||||||
add_subdirectory(projs/shadow/shadow-renderer)
|
|
||||||
|
|
||||||
# Runtime executable
|
# Runtime executable
|
||||||
add_subdirectory(projs/shadow/shadow-runtime)
|
add_subdirectory(projs/shadow/shadow-runtime)
|
||||||
|
|
||||||
|
add_subdirectory(projs/test-game)
|
||||||
27
cmake/FindImGui.cmake
Normal file
27
cmake/FindImGui.cmake
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
find_package(SDL2 REQUIRED)
|
||||||
|
find_package(Vulkan REQUIRED)
|
||||||
|
|
||||||
|
FILE(GLOB_RECURSE SOURCES ${imgui_SOURCE_DIR}/*.cpp)
|
||||||
|
FILE(GLOB_RECURSE HEADERS ${imgui_SOURCE_DIR}/*.h)
|
||||||
|
|
||||||
|
FILE(GLOB_RECURSE HEADERS ${imgui_SOURCE_DIR}/backends/imgui_impl_vulkan.h)
|
||||||
|
FILE(GLOB_RECURSE SOURCES ${imgui_SOURCE_DIR}/backends/imgui_impl_vulkan.cpp)
|
||||||
|
|
||||||
|
add_library(imgui OBJECT
|
||||||
|
${imgui_SOURCE_DIR}/imgui.cpp
|
||||||
|
${imgui_SOURCE_DIR}/imgui_demo.cpp
|
||||||
|
${imgui_SOURCE_DIR}/imgui_draw.cpp
|
||||||
|
${imgui_SOURCE_DIR}/imgui_tables.cpp
|
||||||
|
${imgui_SOURCE_DIR}/imgui_widgets.cpp
|
||||||
|
${imgui_SOURCE_DIR}/backends/imgui_impl_sdl.cpp
|
||||||
|
${imgui_SOURCE_DIR}/backends/imgui_impl_vulkan.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
target_include_directories(imgui
|
||||||
|
PUBLIC
|
||||||
|
${SDL2_INCLUDE_DIRS}
|
||||||
|
${imgui_SOURCE_DIR}
|
||||||
|
${imgui_SOURCE_DIR}/backends
|
||||||
|
)
|
||||||
|
target_link_libraries(imgui PRIVATE SDL2::SDL2 Vulkan::Vulkan)
|
||||||
|
|
@ -1,388 +0,0 @@
|
||||||
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
|
||||||
# file Copyright.txt or https://cmake.org/licensing for details.
|
|
||||||
|
|
||||||
# Copyright 2019 Amine Ben Hassouna <amine.benhassouna@gmail.com>
|
|
||||||
# Copyright 2000-2019 Kitware, Inc. and Contributors
|
|
||||||
# All rights reserved.
|
|
||||||
|
|
||||||
# Redistribution and use in source and binary forms, with or without
|
|
||||||
# modification, are permitted provided that the following conditions
|
|
||||||
# are met:
|
|
||||||
|
|
||||||
# * Redistributions of source code must retain the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
# * Redistributions in binary form must reproduce the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer in the
|
|
||||||
# documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
# * Neither the name of Kitware, Inc. nor the names of Contributors
|
|
||||||
# may be used to endorse or promote products derived from this
|
|
||||||
# software without specific prior written permission.
|
|
||||||
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
||||||
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
||||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
||||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
#[=======================================================================[.rst:
|
|
||||||
FindSDL2
|
|
||||||
--------
|
|
||||||
|
|
||||||
Locate SDL2 library
|
|
||||||
|
|
||||||
This module defines the following 'IMPORTED' targets:
|
|
||||||
|
|
||||||
::
|
|
||||||
|
|
||||||
SDL2::Core
|
|
||||||
The SDL2 library, if found.
|
|
||||||
Libraries should link to SDL2::Core
|
|
||||||
|
|
||||||
SDL2::Main
|
|
||||||
The SDL2main library, if found.
|
|
||||||
Applications should link to SDL2::Main instead of SDL2::Core
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
This module will set the following variables in your project:
|
|
||||||
|
|
||||||
::
|
|
||||||
|
|
||||||
SDL2_LIBRARIES, the name of the library to link against
|
|
||||||
SDL2_INCLUDE_DIRS, where to find SDL.h
|
|
||||||
SDL2_FOUND, if false, do not try to link to SDL2
|
|
||||||
SDL2MAIN_FOUND, if false, do not try to link to SDL2main
|
|
||||||
SDL2_VERSION_STRING, human-readable string containing the version of SDL2
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
This module responds to the following cache variables:
|
|
||||||
|
|
||||||
::
|
|
||||||
|
|
||||||
SDL2_PATH
|
|
||||||
Set a custom SDL2 Library path (default: empty)
|
|
||||||
|
|
||||||
SDL2_NO_DEFAULT_PATH
|
|
||||||
Disable search SDL2 Library in default path.
|
|
||||||
If SDL2_PATH (default: ON)
|
|
||||||
Else (default: OFF)
|
|
||||||
|
|
||||||
SDL2_INCLUDE_DIR
|
|
||||||
SDL2 headers path.
|
|
||||||
|
|
||||||
SDL2_LIBRARY
|
|
||||||
SDL2 Library (.dll, .so, .a, etc) path.
|
|
||||||
|
|
||||||
SDL2MAIN_LIBRAY
|
|
||||||
SDL2main Library (.a) path.
|
|
||||||
|
|
||||||
SDL2_BUILDING_LIBRARY
|
|
||||||
This flag is useful only when linking to SDL2_LIBRARIES insead of
|
|
||||||
SDL2::Main. It is required only when building a library that links to
|
|
||||||
SDL2_LIBRARIES, because only applications need main() (No need to also
|
|
||||||
link to SDL2main).
|
|
||||||
If this flag is defined, then no SDL2main will be added to SDL2_LIBRARIES
|
|
||||||
and no SDL2::Main target will be created.
|
|
||||||
|
|
||||||
|
|
||||||
Don't forget to include SDLmain.h and SDLmain.m in your project for the
|
|
||||||
OS X framework based version. (Other versions link to -lSDL2main which
|
|
||||||
this module will try to find on your behalf.) Also for OS X, this
|
|
||||||
module will automatically add the -framework Cocoa on your behalf.
|
|
||||||
|
|
||||||
|
|
||||||
Additional Note: If you see an empty SDL2_LIBRARY in your project
|
|
||||||
configuration, it means CMake did not find your SDL2 library
|
|
||||||
(SDL2.dll, libsdl2.so, SDL2.framework, etc). Set SDL2_LIBRARY to point
|
|
||||||
to your SDL2 library, and configure again. Similarly, if you see an
|
|
||||||
empty SDL2MAIN_LIBRARY, you should set this value as appropriate. These
|
|
||||||
values are used to generate the final SDL2_LIBRARIES variable and the
|
|
||||||
SDL2::Core and SDL2::Main targets, but when these values are unset,
|
|
||||||
SDL2_LIBRARIES, SDL2::Core and SDL2::Main does not get created.
|
|
||||||
|
|
||||||
|
|
||||||
$SDL2DIR is an environment variable that would correspond to the
|
|
||||||
./configure --prefix=$SDL2DIR used in building SDL2. l.e.galup 9-20-02
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Created by Amine Ben Hassouna:
|
|
||||||
Adapt FindSDL.cmake to SDL2 (FindSDL2.cmake).
|
|
||||||
Add cache variables for more flexibility:
|
|
||||||
SDL2_PATH, SDL2_NO_DEFAULT_PATH (for details, see doc above).
|
|
||||||
Mark 'Threads' as a required dependency for non-OSX systems.
|
|
||||||
Modernize the FindSDL2.cmake module by creating specific targets:
|
|
||||||
SDL2::Core and SDL2::Main (for details, see doc above).
|
|
||||||
|
|
||||||
|
|
||||||
Original FindSDL.cmake module:
|
|
||||||
Modified by Eric Wing. Added code to assist with automated building
|
|
||||||
by using environmental variables and providing a more
|
|
||||||
controlled/consistent search behavior. Added new modifications to
|
|
||||||
recognize OS X frameworks and additional Unix paths (FreeBSD, etc).
|
|
||||||
Also corrected the header search path to follow "proper" SDL
|
|
||||||
guidelines. Added a search for SDLmain which is needed by some
|
|
||||||
platforms. Added a search for threads which is needed by some
|
|
||||||
platforms. Added needed compile switches for MinGW.
|
|
||||||
|
|
||||||
On OSX, this will prefer the Framework version (if found) over others.
|
|
||||||
People will have to manually change the cache value of SDL2_LIBRARY to
|
|
||||||
override this selection or set the SDL2_PATH variable or the CMake
|
|
||||||
environment CMAKE_INCLUDE_PATH to modify the search paths.
|
|
||||||
|
|
||||||
Note that the header path has changed from SDL/SDL.h to just SDL.h
|
|
||||||
This needed to change because "proper" SDL convention is #include
|
|
||||||
"SDL.h", not <SDL/SDL.h>. This is done for portability reasons
|
|
||||||
because not all systems place things in SDL/ (see FreeBSD).
|
|
||||||
#]=======================================================================]
|
|
||||||
|
|
||||||
# Define options for searching SDL2 Library in a custom path
|
|
||||||
|
|
||||||
set(SDL2_PATH "" CACHE STRING "Custom SDL2 Library path")
|
|
||||||
|
|
||||||
set(_SDL2_NO_DEFAULT_PATH OFF)
|
|
||||||
if(SDL2_PATH)
|
|
||||||
set(_SDL2_NO_DEFAULT_PATH ON)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(SDL2_NO_DEFAULT_PATH ${_SDL2_NO_DEFAULT_PATH}
|
|
||||||
CACHE BOOL "Disable search SDL2 Library in default path")
|
|
||||||
unset(_SDL2_NO_DEFAULT_PATH)
|
|
||||||
|
|
||||||
set(SDL2_NO_DEFAULT_PATH_CMD)
|
|
||||||
if(SDL2_NO_DEFAULT_PATH)
|
|
||||||
set(SDL2_NO_DEFAULT_PATH_CMD NO_DEFAULT_PATH)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Search for the SDL2 include directory
|
|
||||||
find_path(SDL2_INCLUDE_DIR SDL.h
|
|
||||||
HINTS
|
|
||||||
ENV SDL2DIR
|
|
||||||
${SDL2_NO_DEFAULT_PATH_CMD}
|
|
||||||
PATH_SUFFIXES SDL2
|
|
||||||
# path suffixes to search inside ENV{SDL2DIR}
|
|
||||||
include/SDL2 include
|
|
||||||
PATHS ${SDL2_PATH}
|
|
||||||
DOC "Where the SDL2 headers can be found"
|
|
||||||
)
|
|
||||||
|
|
||||||
set(SDL2_INCLUDE_DIRS "${SDL2_INCLUDE_DIR}")
|
|
||||||
|
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
||||||
set(VC_LIB_PATH_SUFFIX lib/x64)
|
|
||||||
else()
|
|
||||||
set(VC_LIB_PATH_SUFFIX lib/x86)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# SDL-2.0 is the name used by FreeBSD ports...
|
|
||||||
# don't confuse it for the version number.
|
|
||||||
find_library(SDL2_LIBRARY
|
|
||||||
NAMES SDL2 SDL-2.0
|
|
||||||
HINTS
|
|
||||||
ENV SDL2DIR
|
|
||||||
${SDL2_NO_DEFAULT_PATH_CMD}
|
|
||||||
PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
|
|
||||||
PATHS ${SDL2_PATH}
|
|
||||||
DOC "Where the SDL2 Library can be found"
|
|
||||||
)
|
|
||||||
|
|
||||||
set(SDL2_LIBRARIES "${SDL2_LIBRARY}")
|
|
||||||
|
|
||||||
if(NOT SDL2_BUILDING_LIBRARY)
|
|
||||||
if(NOT SDL2_INCLUDE_DIR MATCHES ".framework")
|
|
||||||
# Non-OS X framework versions expect you to also dynamically link to
|
|
||||||
# SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
|
|
||||||
# seem to provide SDL2main for compatibility even though they don't
|
|
||||||
# necessarily need it.
|
|
||||||
|
|
||||||
if(SDL2_PATH)
|
|
||||||
set(SDL2MAIN_LIBRARY_PATHS "${SDL2_PATH}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT SDL2_NO_DEFAULT_PATH)
|
|
||||||
set(SDL2MAIN_LIBRARY_PATHS
|
|
||||||
/sw
|
|
||||||
/opt/local
|
|
||||||
/opt/csw
|
|
||||||
/opt
|
|
||||||
"${SDL2MAIN_LIBRARY_PATHS}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_library(SDL2MAIN_LIBRARY
|
|
||||||
NAMES SDL2main
|
|
||||||
HINTS
|
|
||||||
ENV SDL2DIR
|
|
||||||
${SDL2_NO_DEFAULT_PATH_CMD}
|
|
||||||
PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
|
|
||||||
PATHS ${SDL2MAIN_LIBRARY_PATHS}
|
|
||||||
DOC "Where the SDL2main library can be found"
|
|
||||||
)
|
|
||||||
unset(SDL2MAIN_LIBRARY_PATHS)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# SDL2 may require threads on your system.
|
|
||||||
# The Apple build may not need an explicit flag because one of the
|
|
||||||
# frameworks may already provide it.
|
|
||||||
# But for non-OSX systems, I will use the CMake Threads package.
|
|
||||||
if(NOT APPLE)
|
|
||||||
find_package(Threads QUIET)
|
|
||||||
if(NOT Threads_FOUND)
|
|
||||||
set(SDL2_THREADS_NOT_FOUND "Could NOT find Threads (Threads is required by SDL2).")
|
|
||||||
if(SDL2_FIND_REQUIRED)
|
|
||||||
message(FATAL_ERROR ${SDL2_THREADS_NOT_FOUND})
|
|
||||||
else()
|
|
||||||
if(NOT SDL2_FIND_QUIETLY)
|
|
||||||
message(STATUS ${SDL2_THREADS_NOT_FOUND})
|
|
||||||
endif()
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
unset(SDL2_THREADS_NOT_FOUND)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# MinGW needs an additional link flag, -mwindows
|
|
||||||
# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -mwindows
|
|
||||||
if(MINGW)
|
|
||||||
set(MINGW32_LIBRARY mingw32 "-mwindows" CACHE STRING "link flags for MinGW")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(SDL2_LIBRARY)
|
|
||||||
# For SDL2main
|
|
||||||
if(SDL2MAIN_LIBRARY AND NOT SDL2_BUILDING_LIBRARY)
|
|
||||||
list(FIND SDL2_LIBRARIES "${SDL2MAIN_LIBRARY}" _SDL2_MAIN_INDEX)
|
|
||||||
if(_SDL2_MAIN_INDEX EQUAL -1)
|
|
||||||
set(SDL2_LIBRARIES "${SDL2MAIN_LIBRARY}" ${SDL2_LIBRARIES})
|
|
||||||
endif()
|
|
||||||
unset(_SDL2_MAIN_INDEX)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
|
|
||||||
# CMake doesn't display the -framework Cocoa string in the UI even
|
|
||||||
# though it actually is there if I modify a pre-used variable.
|
|
||||||
# I think it has something to do with the CACHE STRING.
|
|
||||||
# So I use a temporary variable until the end so I can set the
|
|
||||||
# "real" variable in one-shot.
|
|
||||||
if(APPLE)
|
|
||||||
set(SDL2_LIBRARIES ${SDL2_LIBRARIES} -framework Cocoa)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# For threads, as mentioned Apple doesn't need this.
|
|
||||||
# In fact, there seems to be a problem if I used the Threads package
|
|
||||||
# and try using this line, so I'm just skipping it entirely for OS X.
|
|
||||||
if(NOT APPLE)
|
|
||||||
set(SDL2_LIBRARIES ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# For MinGW library
|
|
||||||
if(MINGW)
|
|
||||||
set(SDL2_LIBRARIES ${MINGW32_LIBRARY} ${SDL2_LIBRARIES})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Read SDL2 version
|
|
||||||
if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
|
|
||||||
file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
|
|
||||||
file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
|
|
||||||
file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
|
|
||||||
string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}")
|
|
||||||
string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}")
|
|
||||||
string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}")
|
|
||||||
set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH})
|
|
||||||
unset(SDL2_VERSION_MAJOR_LINE)
|
|
||||||
unset(SDL2_VERSION_MINOR_LINE)
|
|
||||||
unset(SDL2_VERSION_PATCH_LINE)
|
|
||||||
unset(SDL2_VERSION_MAJOR)
|
|
||||||
unset(SDL2_VERSION_MINOR)
|
|
||||||
unset(SDL2_VERSION_PATCH)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
|
||||||
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
|
|
||||||
REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR
|
|
||||||
VERSION_VAR SDL2_VERSION_STRING)
|
|
||||||
|
|
||||||
if(SDL2MAIN_LIBRARY)
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main
|
|
||||||
REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR
|
|
||||||
VERSION_VAR SDL2_VERSION_STRING)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
mark_as_advanced(SDL2_PATH
|
|
||||||
SDL2_NO_DEFAULT_PATH
|
|
||||||
SDL2_LIBRARY
|
|
||||||
SDL2MAIN_LIBRARY
|
|
||||||
SDL2_INCLUDE_DIR
|
|
||||||
SDL2_BUILDING_LIBRARY)
|
|
||||||
|
|
||||||
|
|
||||||
# SDL2:: targets (SDL2::Core and SDL2::Main)
|
|
||||||
if(SDL2_FOUND)
|
|
||||||
|
|
||||||
# SDL2::Core target
|
|
||||||
if(SDL2_LIBRARY AND NOT TARGET SDL2::Core)
|
|
||||||
add_library(SDL2::Core UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(SDL2::Core PROPERTIES
|
|
||||||
IMPORTED_LOCATION "${SDL2_LIBRARY}"
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}")
|
|
||||||
|
|
||||||
if(APPLE)
|
|
||||||
# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
|
|
||||||
# For more details, please see above.
|
|
||||||
set_property(TARGET SDL2::Core APPEND PROPERTY
|
|
||||||
INTERFACE_LINK_OPTIONS -framework Cocoa)
|
|
||||||
else()
|
|
||||||
# For threads, as mentioned Apple doesn't need this.
|
|
||||||
# For more details, please see above.
|
|
||||||
set_property(TARGET SDL2::Core APPEND PROPERTY
|
|
||||||
INTERFACE_LINK_LIBRARIES Threads::Threads)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# SDL2::Main target
|
|
||||||
# Applications should link to SDL2::Main instead of SDL2::Core
|
|
||||||
# For more details, please see above.
|
|
||||||
if(NOT SDL2_BUILDING_LIBRARY AND NOT TARGET SDL2::Main)
|
|
||||||
|
|
||||||
if(SDL2_INCLUDE_DIR MATCHES ".framework" OR NOT SDL2MAIN_LIBRARY)
|
|
||||||
add_library(SDL2::Main INTERFACE IMPORTED)
|
|
||||||
set_property(TARGET SDL2::Main PROPERTY
|
|
||||||
INTERFACE_LINK_LIBRARIES SDL2::Core)
|
|
||||||
elseif(SDL2MAIN_LIBRARY)
|
|
||||||
# MinGW requires that the mingw32 library is specified before the
|
|
||||||
# libSDL2main.a static library when linking.
|
|
||||||
# The SDL2::MainInternal target is used internally to make sure that
|
|
||||||
# CMake respects this condition.
|
|
||||||
add_library(SDL2::MainInternal UNKNOWN IMPORTED)
|
|
||||||
set_property(TARGET SDL2::MainInternal PROPERTY
|
|
||||||
IMPORTED_LOCATION "${SDL2MAIN_LIBRARY}")
|
|
||||||
set_property(TARGET SDL2::MainInternal PROPERTY
|
|
||||||
INTERFACE_LINK_LIBRARIES SDL2::Core)
|
|
||||||
|
|
||||||
add_library(SDL2::Main INTERFACE IMPORTED)
|
|
||||||
|
|
||||||
if(MINGW)
|
|
||||||
# MinGW needs an additional link flag '-mwindows' and link to mingw32
|
|
||||||
set_property(TARGET SDL2::Main PROPERTY
|
|
||||||
INTERFACE_LINK_LIBRARIES "mingw32" "-mwindows")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set_property(TARGET SDL2::Main APPEND PROPERTY
|
|
||||||
INTERFACE_LINK_LIBRARIES SDL2::MainInternal)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
@ -1,14 +1,29 @@
|
||||||
@startuml
|
@startuml
|
||||||
[shadow-engine] <<static lib>> as engine
|
|
||||||
[shadow-light] <<exe>> as editor
|
[shadow-light] <<exe>> as editor
|
||||||
|
|
||||||
|
[shadow-entity] <<static lib>> as shentity
|
||||||
|
[shadow-file-format] <<static lib>> as shff
|
||||||
|
[shadow-reflection] <<static lib>> as shreflection
|
||||||
|
[shadow-renderer] <<static lib>> as shrenderer
|
||||||
|
[shadow-utilty] <<static lib>> as shutitily
|
||||||
|
|
||||||
|
[shadow-engine] <<static/dynamic lib>> as shengine
|
||||||
|
|
||||||
|
shentity --* shengine
|
||||||
|
shff --* shengine
|
||||||
|
shreflection --* shengine
|
||||||
|
shrenderer --* shengine
|
||||||
|
shutitily --* shengine
|
||||||
|
|
||||||
|
|
||||||
[shadow-runner] <<exe>> as runner
|
[shadow-runner] <<exe>> as runner
|
||||||
|
|
||||||
[test-game] <<dll>> as game
|
[test-game] <<dll>> as game
|
||||||
|
|
||||||
engine <-editor
|
shengine <- editor
|
||||||
runner -> engine
|
runner -> shengine
|
||||||
|
|
||||||
game ..> engine
|
game ..> shengine : uses
|
||||||
|
|
||||||
runner --> game : loads
|
runner --> game : loads
|
||||||
editor --> game : loads
|
editor --> game : loads
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
|
||||||
find_package(SDL2 REQUIRED)
|
|
||||||
find_package(Vulkan REQUIRED)
|
|
||||||
|
|
||||||
FILE(GLOB_RECURSE SOURCES *.cpp)
|
|
||||||
FILE(GLOB_RECURSE HEADERS *.h)
|
|
||||||
|
|
||||||
add_library(imgui ${SOURCES})
|
|
||||||
|
|
||||||
target_include_directories(imgui PRIVATE ${SDL2_INCLUDE_DIRS} PUBLIC .)
|
|
||||||
target_link_libraries(imgui PRIVATE SDL2::Main Vulkan::Vulkan)
|
|
||||||
|
|
@ -1,125 +0,0 @@
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// COMPILE-TIME OPTIONS FOR DEAR IMGUI
|
|
||||||
// Runtime options (clipboard callbacks, enabling various features, etc.) can generally be set via the ImGuiIO structure.
|
|
||||||
// You can use ImGui::SetAllocatorFunctions() before calling ImGui::CreateContext() to rewire memory allocation functions.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// A) You may edit imconfig.h (and not overwrite it when updating Dear ImGui, or maintain a patch/rebased branch with your modifications to it)
|
|
||||||
// B) or '#define IMGUI_USER_CONFIG "my_imgui_config.h"' in your project and then add directives in your own file without touching this template.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// You need to make sure that configuration settings are defined consistently _everywhere_ Dear ImGui is used, which include the imgui*.cpp
|
|
||||||
// files but also _any_ of your code that uses Dear ImGui. This is because some compile-time options have an affect on data structures.
|
|
||||||
// Defining those options in imconfig.h will ensure every compilation unit gets to see the same data structure layouts.
|
|
||||||
// Call IMGUI_CHECKVERSION() from your .cpp files to verify that the data structures your files are using are matching the ones imgui.cpp is using.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
//---- Define assertion handler. Defaults to calling assert().
|
|
||||||
// If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement.
|
|
||||||
//#define IM_ASSERT(_EXPR) MyAssert(_EXPR)
|
|
||||||
//#define IM_ASSERT(_EXPR) ((void)(_EXPR)) // Disable asserts
|
|
||||||
|
|
||||||
//---- Define attributes of all API symbols declarations, e.g. for DLL under Windows
|
|
||||||
// Using Dear ImGui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility.
|
|
||||||
// DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions()
|
|
||||||
// for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for more details.
|
|
||||||
//#define IMGUI_API __declspec( dllexport )
|
|
||||||
//#define IMGUI_API __declspec( dllimport )
|
|
||||||
|
|
||||||
//---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names.
|
|
||||||
//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
|
||||||
//#define IMGUI_DISABLE_OBSOLETE_KEYIO // 1.87: disable legacy io.KeyMap[]+io.KeysDown[] in favor io.AddKeyEvent(). This will be folded into IMGUI_DISABLE_OBSOLETE_FUNCTIONS in a few versions.
|
|
||||||
|
|
||||||
//---- Disable all of Dear ImGui or don't implement standard windows/tools.
|
|
||||||
// It is very strongly recommended to NOT disable the demo windows and debug tool during development. They are extremely useful in day to day work. Please read comments in imgui_demo.cpp.
|
|
||||||
//#define IMGUI_DISABLE // Disable everything: all headers and source files will be empty.
|
|
||||||
//#define IMGUI_DISABLE_DEMO_WINDOWS // Disable demo windows: ShowDemoWindow()/ShowStyleEditor() will be empty.
|
|
||||||
//#define IMGUI_DISABLE_DEBUG_TOOLS // Disable metrics/debugger and other debug tools: ShowMetricsWindow(), ShowDebugLogWindow() and ShowStackToolWindow() will be empty (this was called IMGUI_DISABLE_METRICS_WINDOW before 1.88).
|
|
||||||
|
|
||||||
//---- Don't implement some functions to reduce linkage requirements.
|
|
||||||
//#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS // [Win32] Don't implement default clipboard handler. Won't use and link with OpenClipboard/GetClipboardData/CloseClipboard etc. (user32.lib/.a, kernel32.lib/.a)
|
|
||||||
//#define IMGUI_ENABLE_WIN32_DEFAULT_IME_FUNCTIONS // [Win32] [Default with Visual Studio] Implement default IME handler (require imm32.lib/.a, auto-link for Visual Studio, -limm32 on command-line for MinGW)
|
|
||||||
//#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS // [Win32] [Default with non-Visual Studio compilers] Don't implement default IME handler (won't require imm32.lib/.a)
|
|
||||||
//#define IMGUI_DISABLE_WIN32_FUNCTIONS // [Win32] Won't use and link with any Win32 function (clipboard, ime).
|
|
||||||
//#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS // [OSX] Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not the default).
|
|
||||||
//#define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
|
|
||||||
//#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself.
|
|
||||||
//#define IMGUI_DISABLE_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle at all (replace them with dummies)
|
|
||||||
//#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function.
|
|
||||||
//#define IMGUI_DISABLE_DEFAULT_ALLOCATORS // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions().
|
|
||||||
//#define IMGUI_DISABLE_SSE // Disable use of SSE intrinsics even if available
|
|
||||||
|
|
||||||
//---- Include imgui_user.h at the end of imgui.h as a convenience
|
|
||||||
//#define IMGUI_INCLUDE_IMGUI_USER_H
|
|
||||||
|
|
||||||
//---- Pack colors to BGRA8 instead of RGBA8 (to avoid converting from one to another)
|
|
||||||
//#define IMGUI_USE_BGRA_PACKED_COLOR
|
|
||||||
|
|
||||||
//---- Use 32-bit for ImWchar (default is 16-bit) to support unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...)
|
|
||||||
//#define IMGUI_USE_WCHAR32
|
|
||||||
|
|
||||||
//---- Avoid multiple STB libraries implementations, or redefine path/filenames to prioritize another version
|
|
||||||
// By default the embedded implementations are declared static and not available outside of Dear ImGui sources files.
|
|
||||||
//#define IMGUI_STB_TRUETYPE_FILENAME "my_folder/stb_truetype.h"
|
|
||||||
//#define IMGUI_STB_RECT_PACK_FILENAME "my_folder/stb_rect_pack.h"
|
|
||||||
//#define IMGUI_STB_SPRINTF_FILENAME "my_folder/stb_sprintf.h" // only used if enabled
|
|
||||||
//#define IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION
|
|
||||||
//#define IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION
|
|
||||||
|
|
||||||
//---- Use stb_sprintf.h for a faster implementation of vsnprintf instead of the one from libc (unless IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS is defined)
|
|
||||||
// Compatibility checks of arguments and formats done by clang and GCC will be disabled in order to support the extra formats provided by stb_sprintf.h.
|
|
||||||
//#define IMGUI_USE_STB_SPRINTF
|
|
||||||
|
|
||||||
//---- Use FreeType to build and rasterize the font atlas (instead of stb_truetype which is embedded by default in Dear ImGui)
|
|
||||||
// Requires FreeType headers to be available in the include path. Requires program to be compiled with 'misc/freetype/imgui_freetype.cpp' (in this repository) + the FreeType library (not provided).
|
|
||||||
// On Windows you may use vcpkg with 'vcpkg install freetype --triplet=x64-windows' + 'vcpkg integrate install'.
|
|
||||||
//#define IMGUI_ENABLE_FREETYPE
|
|
||||||
|
|
||||||
//---- Use stb_truetype to build and rasterize the font atlas (default)
|
|
||||||
// The only purpose of this define is if you want force compilation of the stb_truetype backend ALONG with the FreeType backend.
|
|
||||||
//#define IMGUI_ENABLE_STB_TRUETYPE
|
|
||||||
|
|
||||||
//---- Define constructor and implicit cast operators to convert back<>forth between your math types and ImVec2/ImVec4.
|
|
||||||
// This will be inlined as part of ImVec2 and ImVec4 class declarations.
|
|
||||||
/*
|
|
||||||
#define IM_VEC2_CLASS_EXTRA \
|
|
||||||
constexpr ImVec2(const MyVec2& f) : x(f.x), y(f.y) {} \
|
|
||||||
operator MyVec2() const { return MyVec2(x,y); }
|
|
||||||
|
|
||||||
#define IM_VEC4_CLASS_EXTRA \
|
|
||||||
constexpr ImVec4(const MyVec4& f) : x(f.x), y(f.y), z(f.z), w(f.w) {} \
|
|
||||||
operator MyVec4() const { return MyVec4(x,y,z,w); }
|
|
||||||
*/
|
|
||||||
|
|
||||||
//---- Use 32-bit vertex indices (default is 16-bit) is one way to allow large meshes with more than 64K vertices.
|
|
||||||
// Your renderer backend will need to support it (most example renderer backends support both 16/32-bit indices).
|
|
||||||
// Another way to allow large meshes while keeping 16-bit indices is to handle ImDrawCmd::VtxOffset in your renderer.
|
|
||||||
// Read about ImGuiBackendFlags_RendererHasVtxOffset for details.
|
|
||||||
//#define ImDrawIdx unsigned int
|
|
||||||
|
|
||||||
//---- Override ImDrawCallback signature (will need to modify renderer backends accordingly)
|
|
||||||
//struct ImDrawList;
|
|
||||||
//struct ImDrawCmd;
|
|
||||||
//typedef void (*MyImDrawCallback)(const ImDrawList* draw_list, const ImDrawCmd* cmd, void* my_renderer_user_data);
|
|
||||||
//#define ImDrawCallback MyImDrawCallback
|
|
||||||
|
|
||||||
//---- Debug Tools: Macro to break in Debugger
|
|
||||||
// (use 'Metrics->Tools->Item Picker' to pick widgets with the mouse and break into them for easy debugging.)
|
|
||||||
//#define IM_DEBUG_BREAK IM_ASSERT(0)
|
|
||||||
//#define IM_DEBUG_BREAK __debugbreak()
|
|
||||||
|
|
||||||
//---- Debug Tools: Have the Item Picker break in the ItemAdd() function instead of ItemHoverable(),
|
|
||||||
// (which comes earlier in the code, will catch a few extra items, allow picking items other than Hovered one.)
|
|
||||||
// This adds a small runtime cost which is why it is not enabled by default.
|
|
||||||
//#define IMGUI_DEBUG_TOOL_ITEM_PICKER_EX
|
|
||||||
|
|
||||||
//---- Debug Tools: Enable slower asserts
|
|
||||||
//#define IMGUI_DEBUG_PARANOID
|
|
||||||
|
|
||||||
//---- Tip: You can add extra functions within the ImGui:: namespace, here or in your own headers files.
|
|
||||||
/*
|
|
||||||
namespace ImGui
|
|
||||||
{
|
|
||||||
void MyFunction(const char* name, const MyMatrix44& v);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
13444
projs/imgui/imgui.cpp
13444
projs/imgui/imgui.cpp
File diff suppressed because it is too large
Load Diff
3065
projs/imgui/imgui.h
3065
projs/imgui/imgui.h
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,564 +0,0 @@
|
||||||
// dear imgui: Platform Backend for SDL2
|
|
||||||
// This needs to be used along with a Renderer (e.g. DirectX11, OpenGL3, Vulkan..)
|
|
||||||
// (Info: SDL2 is a cross-platform general purpose library for handling windows, inputs, graphics context creation, etc.)
|
|
||||||
// (Prefer SDL 2.0.5+ for full feature support.)
|
|
||||||
|
|
||||||
// Implemented features:
|
|
||||||
// [X] Platform: Clipboard support.
|
|
||||||
// [X] Platform: Keyboard support. Since 1.87 we are using the io.AddKeyEvent() function. Pass ImGuiKey values to all key functions e.g. ImGui::IsKeyPressed(ImGuiKey_Space). [Legacy SDL_SCANCODE_* values will also be supported unless IMGUI_DISABLE_OBSOLETE_KEYIO is set]
|
|
||||||
// [X] Platform: Gamepad support. Enabled with 'io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad'.
|
|
||||||
// [X] Platform: Mouse cursor shape and visibility. Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'.
|
|
||||||
// Missing features:
|
|
||||||
// [ ] Platform: SDL2 handling of IME under Windows appears to be broken and it explicitly disable the regular Windows IME. You can restore Windows IME by compiling SDL with SDL_DISABLE_WINDOWS_IME.
|
|
||||||
|
|
||||||
// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
|
|
||||||
// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
|
|
||||||
// If you are new to Dear ImGui, read documentation from the docs/ folder + read the top of imgui.cpp.
|
|
||||||
// Read online: https://github.com/ocornut/imgui/tree/master/docs
|
|
||||||
|
|
||||||
// CHANGELOG
|
|
||||||
// (minor and older changes stripped away, please see git history for details)
|
|
||||||
// 2022-03-22: Inputs: Fix mouse position issues when dragging outside of boundaries. SDL_CaptureMouse() erroneously still gives out LEAVE events when hovering OS decorations.
|
|
||||||
// 2022-03-22: Inputs: Added support for extra mouse buttons (SDL_BUTTON_X1/SDL_BUTTON_X2).
|
|
||||||
// 2022-02-04: Added SDL_Renderer* parameter to ImGui_ImplSDL2_InitForSDLRenderer(), so we can use SDL_GetRendererOutputSize() instead of SDL_GL_GetDrawableSize() when bound to a SDL_Renderer.
|
|
||||||
// 2022-01-26: Inputs: replaced short-lived io.AddKeyModsEvent() (added two weeks ago) with io.AddKeyEvent() using ImGuiKey_ModXXX flags. Sorry for the confusion.
|
|
||||||
// 2021-01-20: Inputs: calling new io.AddKeyAnalogEvent() for gamepad support, instead of writing directly to io.NavInputs[].
|
|
||||||
// 2022-01-17: Inputs: calling new io.AddMousePosEvent(), io.AddMouseButtonEvent(), io.AddMouseWheelEvent() API (1.87+).
|
|
||||||
// 2022-01-17: Inputs: always update key mods next and before key event (not in NewFrame) to fix input queue with very low framerates.
|
|
||||||
// 2022-01-12: Update mouse inputs using SDL_MOUSEMOTION/SDL_WINDOWEVENT_LEAVE + fallback to provide it when focused but not hovered/captured. More standard and will allow us to pass it to future input queue API.
|
|
||||||
// 2022-01-12: Maintain our own copy of MouseButtonsDown mask instead of using ImGui::IsAnyMouseDown() which will be obsoleted.
|
|
||||||
// 2022-01-10: Inputs: calling new io.AddKeyEvent(), io.AddKeyModsEvent() + io.SetKeyEventNativeData() API (1.87+). Support for full ImGuiKey range.
|
|
||||||
// 2021-08-17: Calling io.AddFocusEvent() on SDL_WINDOWEVENT_FOCUS_GAINED/SDL_WINDOWEVENT_FOCUS_LOST.
|
|
||||||
// 2021-07-29: Inputs: MousePos is correctly reported when the host platform window is hovered but not focused (using SDL_GetMouseFocus() + SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, requires SDL 2.0.5+)
|
|
||||||
// 2021-06-29: *BREAKING CHANGE* Removed 'SDL_Window* window' parameter to ImGui_ImplSDL2_NewFrame() which was unnecessary.
|
|
||||||
// 2021-06-29: Reorganized backend to pull data from a single structure to facilitate usage with multiple-contexts (all g_XXXX access changed to bd->XXXX).
|
|
||||||
// 2021-03-22: Rework global mouse pos availability check listing supported platforms explicitly, effectively fixing mouse access on Raspberry Pi. (#2837, #3950)
|
|
||||||
// 2020-05-25: Misc: Report a zero display-size when window is minimized, to be consistent with other backends.
|
|
||||||
// 2020-02-20: Inputs: Fixed mapping for ImGuiKey_KeyPadEnter (using SDL_SCANCODE_KP_ENTER instead of SDL_SCANCODE_RETURN2).
|
|
||||||
// 2019-12-17: Inputs: On Wayland, use SDL_GetMouseState (because there is no global mouse state).
|
|
||||||
// 2019-12-05: Inputs: Added support for ImGuiMouseCursor_NotAllowed mouse cursor.
|
|
||||||
// 2019-07-21: Inputs: Added mapping for ImGuiKey_KeyPadEnter.
|
|
||||||
// 2019-04-23: Inputs: Added support for SDL_GameController (if ImGuiConfigFlags_NavEnableGamepad is set by user application).
|
|
||||||
// 2019-03-12: Misc: Preserve DisplayFramebufferScale when main window is minimized.
|
|
||||||
// 2018-12-21: Inputs: Workaround for Android/iOS which don't seem to handle focus related calls.
|
|
||||||
// 2018-11-30: Misc: Setting up io.BackendPlatformName so it can be displayed in the About Window.
|
|
||||||
// 2018-11-14: Changed the signature of ImGui_ImplSDL2_ProcessEvent() to take a 'const SDL_Event*'.
|
|
||||||
// 2018-08-01: Inputs: Workaround for Emscripten which doesn't seem to handle focus related calls.
|
|
||||||
// 2018-06-29: Inputs: Added support for the ImGuiMouseCursor_Hand cursor.
|
|
||||||
// 2018-06-08: Misc: Extracted imgui_impl_sdl.cpp/.h away from the old combined SDL2+OpenGL/Vulkan examples.
|
|
||||||
// 2018-06-08: Misc: ImGui_ImplSDL2_InitForOpenGL() now takes a SDL_GLContext parameter.
|
|
||||||
// 2018-05-09: Misc: Fixed clipboard paste memory leak (we didn't call SDL_FreeMemory on the data returned by SDL_GetClipboardText).
|
|
||||||
// 2018-03-20: Misc: Setup io.BackendFlags ImGuiBackendFlags_HasMouseCursors flag + honor ImGuiConfigFlags_NoMouseCursorChange flag.
|
|
||||||
// 2018-02-16: Inputs: Added support for mouse cursors, honoring ImGui::GetMouseCursor() value.
|
|
||||||
// 2018-02-06: Misc: Removed call to ImGui::Shutdown() which is not available from 1.60 WIP, user needs to call CreateContext/DestroyContext themselves.
|
|
||||||
// 2018-02-06: Inputs: Added mapping for ImGuiKey_Space.
|
|
||||||
// 2018-02-05: Misc: Using SDL_GetPerformanceCounter() instead of SDL_GetTicks() to be able to handle very high framerate (1000+ FPS).
|
|
||||||
// 2018-02-05: Inputs: Keyboard mapping is using scancodes everywhere instead of a confusing mixture of keycodes and scancodes.
|
|
||||||
// 2018-01-20: Inputs: Added Horizontal Mouse Wheel support.
|
|
||||||
// 2018-01-19: Inputs: When available (SDL 2.0.4+) using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. Otherwise (SDL 2.0.3 and before) testing for SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS.
|
|
||||||
// 2018-01-18: Inputs: Added mapping for ImGuiKey_Insert.
|
|
||||||
// 2017-08-25: Inputs: MousePos set to -FLT_MAX,-FLT_MAX when mouse is unavailable/missing (instead of -1,-1).
|
|
||||||
// 2016-10-15: Misc: Added a void* user_data parameter to Clipboard function handlers.
|
|
||||||
|
|
||||||
#include "imgui.h"
|
|
||||||
#include "imgui_impl_sdl.h"
|
|
||||||
|
|
||||||
// SDL
|
|
||||||
#include <SDL.h>
|
|
||||||
#include <SDL_syswm.h>
|
|
||||||
#if defined(__APPLE__)
|
|
||||||
#include <TargetConditionals.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if SDL_VERSION_ATLEAST(2,0,4) && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) && !(defined(__APPLE__) && TARGET_OS_IOS) && !defined(__amigaos4__)
|
|
||||||
#define SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE 1
|
|
||||||
#else
|
|
||||||
#define SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE 0
|
|
||||||
#endif
|
|
||||||
#define SDL_HAS_MOUSE_FOCUS_CLICKTHROUGH SDL_VERSION_ATLEAST(2,0,5)
|
|
||||||
#define SDL_HAS_VULKAN SDL_VERSION_ATLEAST(2,0,6)
|
|
||||||
|
|
||||||
// SDL Data
|
|
||||||
struct ImGui_ImplSDL2_Data
|
|
||||||
{
|
|
||||||
SDL_Window* Window;
|
|
||||||
SDL_Renderer* Renderer;
|
|
||||||
Uint64 Time;
|
|
||||||
int MouseButtonsDown;
|
|
||||||
SDL_Cursor* MouseCursors[ImGuiMouseCursor_COUNT];
|
|
||||||
int PendingMouseLeaveFrame;
|
|
||||||
char* ClipboardTextData;
|
|
||||||
bool MouseCanUseGlobalState;
|
|
||||||
|
|
||||||
ImGui_ImplSDL2_Data() { memset((void*)this, 0, sizeof(*this)); }
|
|
||||||
};
|
|
||||||
|
|
||||||
// Backend data stored in io.BackendPlatformUserData to allow support for multiple Dear ImGui contexts
|
|
||||||
// It is STRONGLY preferred that you use docking branch with multi-viewports (== single Dear ImGui context + multiple windows) instead of multiple Dear ImGui contexts.
|
|
||||||
// FIXME: multi-context support is not well tested and probably dysfunctional in this backend.
|
|
||||||
// FIXME: some shared resources (mouse cursor shape, gamepad) are mishandled when using multi-context.
|
|
||||||
static ImGui_ImplSDL2_Data* ImGui_ImplSDL2_GetBackendData()
|
|
||||||
{
|
|
||||||
return ImGui::GetCurrentContext() ? (ImGui_ImplSDL2_Data*)ImGui::GetIO().BackendPlatformUserData : NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Functions
|
|
||||||
static const char* ImGui_ImplSDL2_GetClipboardText(void*)
|
|
||||||
{
|
|
||||||
ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData();
|
|
||||||
if (bd->ClipboardTextData)
|
|
||||||
SDL_free(bd->ClipboardTextData);
|
|
||||||
bd->ClipboardTextData = SDL_GetClipboardText();
|
|
||||||
return bd->ClipboardTextData;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ImGui_ImplSDL2_SetClipboardText(void*, const char* text)
|
|
||||||
{
|
|
||||||
SDL_SetClipboardText(text);
|
|
||||||
}
|
|
||||||
|
|
||||||
static ImGuiKey ImGui_ImplSDL2_KeycodeToImGuiKey(int keycode)
|
|
||||||
{
|
|
||||||
switch (keycode)
|
|
||||||
{
|
|
||||||
case SDLK_TAB: return ImGuiKey_Tab;
|
|
||||||
case SDLK_LEFT: return ImGuiKey_LeftArrow;
|
|
||||||
case SDLK_RIGHT: return ImGuiKey_RightArrow;
|
|
||||||
case SDLK_UP: return ImGuiKey_UpArrow;
|
|
||||||
case SDLK_DOWN: return ImGuiKey_DownArrow;
|
|
||||||
case SDLK_PAGEUP: return ImGuiKey_PageUp;
|
|
||||||
case SDLK_PAGEDOWN: return ImGuiKey_PageDown;
|
|
||||||
case SDLK_HOME: return ImGuiKey_Home;
|
|
||||||
case SDLK_END: return ImGuiKey_End;
|
|
||||||
case SDLK_INSERT: return ImGuiKey_Insert;
|
|
||||||
case SDLK_DELETE: return ImGuiKey_Delete;
|
|
||||||
case SDLK_BACKSPACE: return ImGuiKey_Backspace;
|
|
||||||
case SDLK_SPACE: return ImGuiKey_Space;
|
|
||||||
case SDLK_RETURN: return ImGuiKey_Enter;
|
|
||||||
case SDLK_ESCAPE: return ImGuiKey_Escape;
|
|
||||||
case SDLK_QUOTE: return ImGuiKey_Apostrophe;
|
|
||||||
case SDLK_COMMA: return ImGuiKey_Comma;
|
|
||||||
case SDLK_MINUS: return ImGuiKey_Minus;
|
|
||||||
case SDLK_PERIOD: return ImGuiKey_Period;
|
|
||||||
case SDLK_SLASH: return ImGuiKey_Slash;
|
|
||||||
case SDLK_SEMICOLON: return ImGuiKey_Semicolon;
|
|
||||||
case SDLK_EQUALS: return ImGuiKey_Equal;
|
|
||||||
case SDLK_LEFTBRACKET: return ImGuiKey_LeftBracket;
|
|
||||||
case SDLK_BACKSLASH: return ImGuiKey_Backslash;
|
|
||||||
case SDLK_RIGHTBRACKET: return ImGuiKey_RightBracket;
|
|
||||||
case SDLK_BACKQUOTE: return ImGuiKey_GraveAccent;
|
|
||||||
case SDLK_CAPSLOCK: return ImGuiKey_CapsLock;
|
|
||||||
case SDLK_SCROLLLOCK: return ImGuiKey_ScrollLock;
|
|
||||||
case SDLK_NUMLOCKCLEAR: return ImGuiKey_NumLock;
|
|
||||||
case SDLK_PRINTSCREEN: return ImGuiKey_PrintScreen;
|
|
||||||
case SDLK_PAUSE: return ImGuiKey_Pause;
|
|
||||||
case SDLK_KP_0: return ImGuiKey_Keypad0;
|
|
||||||
case SDLK_KP_1: return ImGuiKey_Keypad1;
|
|
||||||
case SDLK_KP_2: return ImGuiKey_Keypad2;
|
|
||||||
case SDLK_KP_3: return ImGuiKey_Keypad3;
|
|
||||||
case SDLK_KP_4: return ImGuiKey_Keypad4;
|
|
||||||
case SDLK_KP_5: return ImGuiKey_Keypad5;
|
|
||||||
case SDLK_KP_6: return ImGuiKey_Keypad6;
|
|
||||||
case SDLK_KP_7: return ImGuiKey_Keypad7;
|
|
||||||
case SDLK_KP_8: return ImGuiKey_Keypad8;
|
|
||||||
case SDLK_KP_9: return ImGuiKey_Keypad9;
|
|
||||||
case SDLK_KP_PERIOD: return ImGuiKey_KeypadDecimal;
|
|
||||||
case SDLK_KP_DIVIDE: return ImGuiKey_KeypadDivide;
|
|
||||||
case SDLK_KP_MULTIPLY: return ImGuiKey_KeypadMultiply;
|
|
||||||
case SDLK_KP_MINUS: return ImGuiKey_KeypadSubtract;
|
|
||||||
case SDLK_KP_PLUS: return ImGuiKey_KeypadAdd;
|
|
||||||
case SDLK_KP_ENTER: return ImGuiKey_KeypadEnter;
|
|
||||||
case SDLK_KP_EQUALS: return ImGuiKey_KeypadEqual;
|
|
||||||
case SDLK_LCTRL: return ImGuiKey_LeftCtrl;
|
|
||||||
case SDLK_LSHIFT: return ImGuiKey_LeftShift;
|
|
||||||
case SDLK_LALT: return ImGuiKey_LeftAlt;
|
|
||||||
case SDLK_LGUI: return ImGuiKey_LeftSuper;
|
|
||||||
case SDLK_RCTRL: return ImGuiKey_RightCtrl;
|
|
||||||
case SDLK_RSHIFT: return ImGuiKey_RightShift;
|
|
||||||
case SDLK_RALT: return ImGuiKey_RightAlt;
|
|
||||||
case SDLK_RGUI: return ImGuiKey_RightSuper;
|
|
||||||
case SDLK_APPLICATION: return ImGuiKey_Menu;
|
|
||||||
case SDLK_0: return ImGuiKey_0;
|
|
||||||
case SDLK_1: return ImGuiKey_1;
|
|
||||||
case SDLK_2: return ImGuiKey_2;
|
|
||||||
case SDLK_3: return ImGuiKey_3;
|
|
||||||
case SDLK_4: return ImGuiKey_4;
|
|
||||||
case SDLK_5: return ImGuiKey_5;
|
|
||||||
case SDLK_6: return ImGuiKey_6;
|
|
||||||
case SDLK_7: return ImGuiKey_7;
|
|
||||||
case SDLK_8: return ImGuiKey_8;
|
|
||||||
case SDLK_9: return ImGuiKey_9;
|
|
||||||
case SDLK_a: return ImGuiKey_A;
|
|
||||||
case SDLK_b: return ImGuiKey_B;
|
|
||||||
case SDLK_c: return ImGuiKey_C;
|
|
||||||
case SDLK_d: return ImGuiKey_D;
|
|
||||||
case SDLK_e: return ImGuiKey_E;
|
|
||||||
case SDLK_f: return ImGuiKey_F;
|
|
||||||
case SDLK_g: return ImGuiKey_G;
|
|
||||||
case SDLK_h: return ImGuiKey_H;
|
|
||||||
case SDLK_i: return ImGuiKey_I;
|
|
||||||
case SDLK_j: return ImGuiKey_J;
|
|
||||||
case SDLK_k: return ImGuiKey_K;
|
|
||||||
case SDLK_l: return ImGuiKey_L;
|
|
||||||
case SDLK_m: return ImGuiKey_M;
|
|
||||||
case SDLK_n: return ImGuiKey_N;
|
|
||||||
case SDLK_o: return ImGuiKey_O;
|
|
||||||
case SDLK_p: return ImGuiKey_P;
|
|
||||||
case SDLK_q: return ImGuiKey_Q;
|
|
||||||
case SDLK_r: return ImGuiKey_R;
|
|
||||||
case SDLK_s: return ImGuiKey_S;
|
|
||||||
case SDLK_t: return ImGuiKey_T;
|
|
||||||
case SDLK_u: return ImGuiKey_U;
|
|
||||||
case SDLK_v: return ImGuiKey_V;
|
|
||||||
case SDLK_w: return ImGuiKey_W;
|
|
||||||
case SDLK_x: return ImGuiKey_X;
|
|
||||||
case SDLK_y: return ImGuiKey_Y;
|
|
||||||
case SDLK_z: return ImGuiKey_Z;
|
|
||||||
case SDLK_F1: return ImGuiKey_F1;
|
|
||||||
case SDLK_F2: return ImGuiKey_F2;
|
|
||||||
case SDLK_F3: return ImGuiKey_F3;
|
|
||||||
case SDLK_F4: return ImGuiKey_F4;
|
|
||||||
case SDLK_F5: return ImGuiKey_F5;
|
|
||||||
case SDLK_F6: return ImGuiKey_F6;
|
|
||||||
case SDLK_F7: return ImGuiKey_F7;
|
|
||||||
case SDLK_F8: return ImGuiKey_F8;
|
|
||||||
case SDLK_F9: return ImGuiKey_F9;
|
|
||||||
case SDLK_F10: return ImGuiKey_F10;
|
|
||||||
case SDLK_F11: return ImGuiKey_F11;
|
|
||||||
case SDLK_F12: return ImGuiKey_F12;
|
|
||||||
}
|
|
||||||
return ImGuiKey_None;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ImGui_ImplSDL2_UpdateKeyModifiers(SDL_Keymod sdl_key_mods)
|
|
||||||
{
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
io.AddKeyEvent(ImGuiKey_ModCtrl, (sdl_key_mods & KMOD_CTRL) != 0);
|
|
||||||
io.AddKeyEvent(ImGuiKey_ModShift, (sdl_key_mods & KMOD_SHIFT) != 0);
|
|
||||||
io.AddKeyEvent(ImGuiKey_ModAlt, (sdl_key_mods & KMOD_ALT) != 0);
|
|
||||||
io.AddKeyEvent(ImGuiKey_ModSuper, (sdl_key_mods & KMOD_GUI) != 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
// You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs.
|
|
||||||
// - When io.WantCaptureMouse is true, do not dispatch mouse input data to your main application, or clear/overwrite your copy of the mouse data.
|
|
||||||
// - When io.WantCaptureKeyboard is true, do not dispatch keyboard input data to your main application, or clear/overwrite your copy of the keyboard data.
|
|
||||||
// Generally you may always pass all inputs to dear imgui, and hide them from your application based on those two flags.
|
|
||||||
// If you have multiple SDL events and some of them are not meant to be used by dear imgui, you may need to filter events based on their windowID field.
|
|
||||||
bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event)
|
|
||||||
{
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData();
|
|
||||||
|
|
||||||
switch (event->type)
|
|
||||||
{
|
|
||||||
case SDL_MOUSEMOTION:
|
|
||||||
{
|
|
||||||
io.AddMousePosEvent((float)event->motion.x, (float)event->motion.y);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
case SDL_MOUSEWHEEL:
|
|
||||||
{
|
|
||||||
float wheel_x = (event->wheel.x > 0) ? 1.0f : (event->wheel.x < 0) ? -1.0f : 0.0f;
|
|
||||||
float wheel_y = (event->wheel.y > 0) ? 1.0f : (event->wheel.y < 0) ? -1.0f : 0.0f;
|
|
||||||
io.AddMouseWheelEvent(wheel_x, wheel_y);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
case SDL_MOUSEBUTTONDOWN:
|
|
||||||
case SDL_MOUSEBUTTONUP:
|
|
||||||
{
|
|
||||||
int mouse_button = -1;
|
|
||||||
if (event->button.button == SDL_BUTTON_LEFT) { mouse_button = 0; }
|
|
||||||
if (event->button.button == SDL_BUTTON_RIGHT) { mouse_button = 1; }
|
|
||||||
if (event->button.button == SDL_BUTTON_MIDDLE) { mouse_button = 2; }
|
|
||||||
if (event->button.button == SDL_BUTTON_X1) { mouse_button = 3; }
|
|
||||||
if (event->button.button == SDL_BUTTON_X2) { mouse_button = 4; }
|
|
||||||
if (mouse_button == -1)
|
|
||||||
break;
|
|
||||||
io.AddMouseButtonEvent(mouse_button, (event->type == SDL_MOUSEBUTTONDOWN));
|
|
||||||
bd->MouseButtonsDown = (event->type == SDL_MOUSEBUTTONDOWN) ? (bd->MouseButtonsDown | (1 << mouse_button)) : (bd->MouseButtonsDown & ~(1 << mouse_button));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
case SDL_TEXTINPUT:
|
|
||||||
{
|
|
||||||
io.AddInputCharactersUTF8(event->text.text);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
case SDL_KEYDOWN:
|
|
||||||
case SDL_KEYUP:
|
|
||||||
{
|
|
||||||
ImGui_ImplSDL2_UpdateKeyModifiers((SDL_Keymod)event->key.keysym.mod);
|
|
||||||
ImGuiKey key = ImGui_ImplSDL2_KeycodeToImGuiKey(event->key.keysym.sym);
|
|
||||||
io.AddKeyEvent(key, (event->type == SDL_KEYDOWN));
|
|
||||||
io.SetKeyEventNativeData(key, event->key.keysym.sym, event->key.keysym.scancode, event->key.keysym.scancode); // To support legacy indexing (<1.87 user code). Legacy backend uses SDLK_*** as indices to IsKeyXXX() functions.
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
case SDL_WINDOWEVENT:
|
|
||||||
{
|
|
||||||
// - When capturing mouse, SDL will send a bunch of conflicting LEAVE/ENTER event on every mouse move, but the final ENTER tends to be right.
|
|
||||||
// - However we won't get a correct LEAVE event for a captured window.
|
|
||||||
// - In some cases, when detaching a window from main viewport SDL may send SDL_WINDOWEVENT_ENTER one frame too late,
|
|
||||||
// causing SDL_WINDOWEVENT_LEAVE on previous frame to interrupt drag operation by clear mouse position. This is why
|
|
||||||
// we delay process the SDL_WINDOWEVENT_LEAVE events by one frame. See issue #5012 for details.
|
|
||||||
Uint8 window_event = event->window.event;
|
|
||||||
if (window_event == SDL_WINDOWEVENT_ENTER)
|
|
||||||
bd->PendingMouseLeaveFrame = 0;
|
|
||||||
if (window_event == SDL_WINDOWEVENT_LEAVE)
|
|
||||||
bd->PendingMouseLeaveFrame = ImGui::GetFrameCount() + 1;
|
|
||||||
if (window_event == SDL_WINDOWEVENT_FOCUS_GAINED)
|
|
||||||
io.AddFocusEvent(true);
|
|
||||||
else if (event->window.event == SDL_WINDOWEVENT_FOCUS_LOST)
|
|
||||||
io.AddFocusEvent(false);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool ImGui_ImplSDL2_Init(SDL_Window* window, SDL_Renderer* renderer)
|
|
||||||
{
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
IM_ASSERT(io.BackendPlatformUserData == NULL && "Already initialized a platform backend!");
|
|
||||||
|
|
||||||
// Check and store if we are on a SDL backend that supports global mouse position
|
|
||||||
// ("wayland" and "rpi" don't support it, but we chose to use a white-list instead of a black-list)
|
|
||||||
bool mouse_can_use_global_state = false;
|
|
||||||
#if SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE
|
|
||||||
const char* sdl_backend = SDL_GetCurrentVideoDriver();
|
|
||||||
const char* global_mouse_whitelist[] = { "windows", "cocoa", "x11", "DIVE", "VMAN" };
|
|
||||||
for (int n = 0; n < IM_ARRAYSIZE(global_mouse_whitelist); n++)
|
|
||||||
if (strncmp(sdl_backend, global_mouse_whitelist[n], strlen(global_mouse_whitelist[n])) == 0)
|
|
||||||
mouse_can_use_global_state = true;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Setup backend capabilities flags
|
|
||||||
ImGui_ImplSDL2_Data* bd = IM_NEW(ImGui_ImplSDL2_Data)();
|
|
||||||
io.BackendPlatformUserData = (void*)bd;
|
|
||||||
io.BackendPlatformName = "imgui_impl_sdl";
|
|
||||||
io.BackendFlags |= ImGuiBackendFlags_HasMouseCursors; // We can honor GetMouseCursor() values (optional)
|
|
||||||
io.BackendFlags |= ImGuiBackendFlags_HasSetMousePos; // We can honor io.WantSetMousePos requests (optional, rarely used)
|
|
||||||
|
|
||||||
bd->Window = window;
|
|
||||||
bd->Renderer = renderer;
|
|
||||||
bd->MouseCanUseGlobalState = mouse_can_use_global_state;
|
|
||||||
|
|
||||||
io.SetClipboardTextFn = ImGui_ImplSDL2_SetClipboardText;
|
|
||||||
io.GetClipboardTextFn = ImGui_ImplSDL2_GetClipboardText;
|
|
||||||
io.ClipboardUserData = NULL;
|
|
||||||
|
|
||||||
// Load mouse cursors
|
|
||||||
bd->MouseCursors[ImGuiMouseCursor_Arrow] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
|
|
||||||
bd->MouseCursors[ImGuiMouseCursor_TextInput] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM);
|
|
||||||
bd->MouseCursors[ImGuiMouseCursor_ResizeAll] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEALL);
|
|
||||||
bd->MouseCursors[ImGuiMouseCursor_ResizeNS] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS);
|
|
||||||
bd->MouseCursors[ImGuiMouseCursor_ResizeEW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE);
|
|
||||||
bd->MouseCursors[ImGuiMouseCursor_ResizeNESW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENESW);
|
|
||||||
bd->MouseCursors[ImGuiMouseCursor_ResizeNWSE] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENWSE);
|
|
||||||
bd->MouseCursors[ImGuiMouseCursor_Hand] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
|
|
||||||
bd->MouseCursors[ImGuiMouseCursor_NotAllowed] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_NO);
|
|
||||||
|
|
||||||
// Set platform dependent data in viewport
|
|
||||||
#ifdef _WIN32
|
|
||||||
SDL_SysWMinfo info;
|
|
||||||
SDL_VERSION(&info.version);
|
|
||||||
if (SDL_GetWindowWMInfo(window, &info))
|
|
||||||
ImGui::GetMainViewport()->PlatformHandleRaw = (void*)info.info.win.window;
|
|
||||||
#else
|
|
||||||
(void)window;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Set SDL hint to receive mouse click events on window focus, otherwise SDL doesn't emit the event.
|
|
||||||
// Without this, when clicking to gain focus, our widgets wouldn't activate even though they showed as hovered.
|
|
||||||
// (This is unfortunately a global SDL setting, so enabling it might have a side-effect on your application.
|
|
||||||
// It is unlikely to make a difference, but if your app absolutely needs to ignore the initial on-focus click:
|
|
||||||
// you can ignore SDL_MOUSEBUTTONDOWN events coming right after a SDL_WINDOWEVENT_FOCUS_GAINED)
|
|
||||||
#if SDL_HAS_MOUSE_FOCUS_CLICKTHROUGH
|
|
||||||
SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window, void* sdl_gl_context)
|
|
||||||
{
|
|
||||||
IM_UNUSED(sdl_gl_context); // Viewport branch will need this.
|
|
||||||
return ImGui_ImplSDL2_Init(window, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window)
|
|
||||||
{
|
|
||||||
#if !SDL_HAS_VULKAN
|
|
||||||
IM_ASSERT(0 && "Unsupported");
|
|
||||||
#endif
|
|
||||||
return ImGui_ImplSDL2_Init(window, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ImGui_ImplSDL2_InitForD3D(SDL_Window* window)
|
|
||||||
{
|
|
||||||
#if !defined(_WIN32)
|
|
||||||
IM_ASSERT(0 && "Unsupported");
|
|
||||||
#endif
|
|
||||||
return ImGui_ImplSDL2_Init(window, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ImGui_ImplSDL2_InitForMetal(SDL_Window* window)
|
|
||||||
{
|
|
||||||
return ImGui_ImplSDL2_Init(window, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ImGui_ImplSDL2_InitForSDLRenderer(SDL_Window* window, SDL_Renderer* renderer)
|
|
||||||
{
|
|
||||||
return ImGui_ImplSDL2_Init(window, renderer);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImGui_ImplSDL2_Shutdown()
|
|
||||||
{
|
|
||||||
ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData();
|
|
||||||
IM_ASSERT(bd != NULL && "No platform backend to shutdown, or already shutdown?");
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
|
|
||||||
if (bd->ClipboardTextData)
|
|
||||||
SDL_free(bd->ClipboardTextData);
|
|
||||||
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++)
|
|
||||||
SDL_FreeCursor(bd->MouseCursors[cursor_n]);
|
|
||||||
|
|
||||||
io.BackendPlatformName = NULL;
|
|
||||||
io.BackendPlatformUserData = NULL;
|
|
||||||
IM_DELETE(bd);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ImGui_ImplSDL2_UpdateMouseData()
|
|
||||||
{
|
|
||||||
ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData();
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
|
|
||||||
// We forward mouse input when hovered or captured (via SDL_MOUSEMOTION) or when focused (below)
|
|
||||||
#if SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE
|
|
||||||
// SDL_CaptureMouse() let the OS know e.g. that our imgui drag outside the SDL window boundaries shouldn't e.g. trigger other operations outside
|
|
||||||
SDL_CaptureMouse(bd->MouseButtonsDown != 0 ? SDL_TRUE : SDL_FALSE);
|
|
||||||
SDL_Window* focused_window = SDL_GetKeyboardFocus();
|
|
||||||
const bool is_app_focused = (bd->Window == focused_window);
|
|
||||||
#else
|
|
||||||
const bool is_app_focused = (SDL_GetWindowFlags(bd->Window) & SDL_WINDOW_INPUT_FOCUS) != 0; // SDL 2.0.3 and non-windowed systems: single-viewport only
|
|
||||||
#endif
|
|
||||||
if (is_app_focused)
|
|
||||||
{
|
|
||||||
// (Optional) Set OS mouse position from Dear ImGui if requested (rarely used, only when ImGuiConfigFlags_NavEnableSetMousePos is enabled by user)
|
|
||||||
if (io.WantSetMousePos)
|
|
||||||
SDL_WarpMouseInWindow(bd->Window, (int)io.MousePos.x, (int)io.MousePos.y);
|
|
||||||
|
|
||||||
// (Optional) Fallback to provide mouse position when focused (SDL_MOUSEMOTION already provides this when hovered or captured)
|
|
||||||
if (bd->MouseCanUseGlobalState && bd->MouseButtonsDown == 0)
|
|
||||||
{
|
|
||||||
int window_x, window_y, mouse_x_global, mouse_y_global;
|
|
||||||
SDL_GetGlobalMouseState(&mouse_x_global, &mouse_y_global);
|
|
||||||
SDL_GetWindowPosition(bd->Window, &window_x, &window_y);
|
|
||||||
io.AddMousePosEvent((float)(mouse_x_global - window_x), (float)(mouse_y_global - window_y));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ImGui_ImplSDL2_UpdateMouseCursor()
|
|
||||||
{
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
if (io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange)
|
|
||||||
return;
|
|
||||||
ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData();
|
|
||||||
|
|
||||||
ImGuiMouseCursor imgui_cursor = ImGui::GetMouseCursor();
|
|
||||||
if (io.MouseDrawCursor || imgui_cursor == ImGuiMouseCursor_None)
|
|
||||||
{
|
|
||||||
// Hide OS mouse cursor if imgui is drawing it or if it wants no cursor
|
|
||||||
SDL_ShowCursor(SDL_FALSE);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Show OS mouse cursor
|
|
||||||
SDL_SetCursor(bd->MouseCursors[imgui_cursor] ? bd->MouseCursors[imgui_cursor] : bd->MouseCursors[ImGuiMouseCursor_Arrow]);
|
|
||||||
SDL_ShowCursor(SDL_TRUE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ImGui_ImplSDL2_UpdateGamepads()
|
|
||||||
{
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
if ((io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// Get gamepad
|
|
||||||
io.BackendFlags &= ~ImGuiBackendFlags_HasGamepad;
|
|
||||||
SDL_GameController* game_controller = SDL_GameControllerOpen(0);
|
|
||||||
if (!game_controller)
|
|
||||||
return;
|
|
||||||
io.BackendFlags |= ImGuiBackendFlags_HasGamepad;
|
|
||||||
|
|
||||||
// Update gamepad inputs
|
|
||||||
#define IM_SATURATE(V) (V < 0.0f ? 0.0f : V > 1.0f ? 1.0f : V)
|
|
||||||
#define MAP_BUTTON(KEY_NO, BUTTON_NO) { io.AddKeyEvent(KEY_NO, SDL_GameControllerGetButton(game_controller, BUTTON_NO) != 0); }
|
|
||||||
#define MAP_ANALOG(KEY_NO, AXIS_NO, V0, V1) { float vn = (float)(SDL_GameControllerGetAxis(game_controller, AXIS_NO) - V0) / (float)(V1 - V0); vn = IM_SATURATE(vn); io.AddKeyAnalogEvent(KEY_NO, vn > 0.1f, vn); }
|
|
||||||
const int thumb_dead_zone = 8000; // SDL_gamecontroller.h suggests using this value.
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadStart, SDL_CONTROLLER_BUTTON_START);
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadBack, SDL_CONTROLLER_BUTTON_BACK);
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadFaceDown, SDL_CONTROLLER_BUTTON_A); // Xbox A, PS Cross
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadFaceRight, SDL_CONTROLLER_BUTTON_B); // Xbox B, PS Circle
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadFaceLeft, SDL_CONTROLLER_BUTTON_X); // Xbox X, PS Square
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadFaceUp, SDL_CONTROLLER_BUTTON_Y); // Xbox Y, PS Triangle
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadDpadLeft, SDL_CONTROLLER_BUTTON_DPAD_LEFT);
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadDpadRight, SDL_CONTROLLER_BUTTON_DPAD_RIGHT);
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadDpadUp, SDL_CONTROLLER_BUTTON_DPAD_UP);
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadDpadDown, SDL_CONTROLLER_BUTTON_DPAD_DOWN);
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadL1, SDL_CONTROLLER_BUTTON_LEFTSHOULDER);
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadR1, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER);
|
|
||||||
MAP_ANALOG(ImGuiKey_GamepadL2, SDL_CONTROLLER_AXIS_TRIGGERLEFT, 0.0f, 32767);
|
|
||||||
MAP_ANALOG(ImGuiKey_GamepadR2, SDL_CONTROLLER_AXIS_TRIGGERRIGHT, 0.0f, 32767);
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadL3, SDL_CONTROLLER_BUTTON_LEFTSTICK);
|
|
||||||
MAP_BUTTON(ImGuiKey_GamepadR3, SDL_CONTROLLER_BUTTON_RIGHTSTICK);
|
|
||||||
MAP_ANALOG(ImGuiKey_GamepadLStickLeft, SDL_CONTROLLER_AXIS_LEFTX, -thumb_dead_zone, -32768);
|
|
||||||
MAP_ANALOG(ImGuiKey_GamepadLStickRight, SDL_CONTROLLER_AXIS_LEFTX, +thumb_dead_zone, +32767);
|
|
||||||
MAP_ANALOG(ImGuiKey_GamepadLStickUp, SDL_CONTROLLER_AXIS_LEFTY, -thumb_dead_zone, -32768);
|
|
||||||
MAP_ANALOG(ImGuiKey_GamepadLStickDown, SDL_CONTROLLER_AXIS_LEFTY, +thumb_dead_zone, +32767);
|
|
||||||
MAP_ANALOG(ImGuiKey_GamepadRStickLeft, SDL_CONTROLLER_AXIS_RIGHTX, -thumb_dead_zone, -32768);
|
|
||||||
MAP_ANALOG(ImGuiKey_GamepadRStickRight, SDL_CONTROLLER_AXIS_RIGHTX, +thumb_dead_zone, +32767);
|
|
||||||
MAP_ANALOG(ImGuiKey_GamepadRStickUp, SDL_CONTROLLER_AXIS_RIGHTY, -thumb_dead_zone, -32768);
|
|
||||||
MAP_ANALOG(ImGuiKey_GamepadRStickDown, SDL_CONTROLLER_AXIS_RIGHTY, +thumb_dead_zone, +32767);
|
|
||||||
#undef MAP_BUTTON
|
|
||||||
#undef MAP_ANALOG
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImGui_ImplSDL2_NewFrame()
|
|
||||||
{
|
|
||||||
ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData();
|
|
||||||
IM_ASSERT(bd != NULL && "Did you call ImGui_ImplSDL2_Init()?");
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
|
|
||||||
// Setup display size (every frame to accommodate for window resizing)
|
|
||||||
int w, h;
|
|
||||||
int display_w, display_h;
|
|
||||||
SDL_GetWindowSize(bd->Window, &w, &h);
|
|
||||||
if (SDL_GetWindowFlags(bd->Window) & SDL_WINDOW_MINIMIZED)
|
|
||||||
w = h = 0;
|
|
||||||
if (bd->Renderer != NULL)
|
|
||||||
SDL_GetRendererOutputSize(bd->Renderer, &display_w, &display_h);
|
|
||||||
else
|
|
||||||
SDL_GL_GetDrawableSize(bd->Window, &display_w, &display_h);
|
|
||||||
io.DisplaySize = ImVec2((float)w, (float)h);
|
|
||||||
if (w > 0 && h > 0)
|
|
||||||
io.DisplayFramebufferScale = ImVec2((float)display_w / w, (float)display_h / h);
|
|
||||||
|
|
||||||
// Setup time step (we don't use SDL_GetTicks() because it is using millisecond resolution)
|
|
||||||
static Uint64 frequency = SDL_GetPerformanceFrequency();
|
|
||||||
Uint64 current_time = SDL_GetPerformanceCounter();
|
|
||||||
io.DeltaTime = bd->Time > 0 ? (float)((double)(current_time - bd->Time) / frequency) : (float)(1.0f / 60.0f);
|
|
||||||
bd->Time = current_time;
|
|
||||||
|
|
||||||
if (bd->PendingMouseLeaveFrame && bd->PendingMouseLeaveFrame >= ImGui::GetFrameCount() && bd->MouseButtonsDown == 0)
|
|
||||||
{
|
|
||||||
io.AddMousePosEvent(-FLT_MAX, -FLT_MAX);
|
|
||||||
bd->PendingMouseLeaveFrame = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui_ImplSDL2_UpdateMouseData();
|
|
||||||
ImGui_ImplSDL2_UpdateMouseCursor();
|
|
||||||
|
|
||||||
// Update game controllers (if enabled and available)
|
|
||||||
ImGui_ImplSDL2_UpdateGamepads();
|
|
||||||
}
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
// dear imgui: Platform Backend for SDL2
|
|
||||||
// This needs to be used along with a Renderer (e.g. DirectX11, OpenGL3, Vulkan..)
|
|
||||||
// (Info: SDL2 is a cross-platform general purpose library for handling windows, inputs, graphics context creation, etc.)
|
|
||||||
|
|
||||||
// Implemented features:
|
|
||||||
// [X] Platform: Clipboard support.
|
|
||||||
// [X] Platform: Keyboard support. Since 1.87 we are using the io.AddKeyEvent() function. Pass ImGuiKey values to all key functions e.g. ImGui::IsKeyPressed(ImGuiKey_Space). [Legacy SDL_SCANCODE_* values will also be supported unless IMGUI_DISABLE_OBSOLETE_KEYIO is set]
|
|
||||||
// [X] Platform: Gamepad support. Enabled with 'io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad'.
|
|
||||||
// [X] Platform: Mouse cursor shape and visibility. Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'.
|
|
||||||
// Missing features:
|
|
||||||
// [ ] Platform: SDL2 handling of IME under Windows appears to be broken and it explicitly disable the regular Windows IME. You can restore Windows IME by compiling SDL with SDL_DISABLE_WINDOWS_IME.
|
|
||||||
|
|
||||||
// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
|
|
||||||
// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
|
|
||||||
// If you are new to Dear ImGui, read documentation from the docs/ folder + read the top of imgui.cpp.
|
|
||||||
// Read online: https://github.com/ocornut/imgui/tree/master/docs
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#include "imgui.h" // IMGUI_IMPL_API
|
|
||||||
|
|
||||||
struct SDL_Window;
|
|
||||||
struct SDL_Renderer;
|
|
||||||
typedef union SDL_Event SDL_Event;
|
|
||||||
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window, void* sdl_gl_context);
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window);
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForD3D(SDL_Window* window);
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForMetal(SDL_Window* window);
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplSDL2_InitForSDLRenderer(SDL_Window* window, SDL_Renderer* renderer);
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplSDL2_Shutdown();
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplSDL2_NewFrame();
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);
|
|
||||||
|
|
||||||
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
|
||||||
static inline void ImGui_ImplSDL2_NewFrame(SDL_Window*) { ImGui_ImplSDL2_NewFrame(); } // 1.84: removed unnecessary parameter
|
|
||||||
#endif
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,155 +0,0 @@
|
||||||
// dear imgui: Renderer Backend for Vulkan
|
|
||||||
// This needs to be used along with a Platform Backend (e.g. GLFW, SDL, Win32, custom..)
|
|
||||||
|
|
||||||
// Implemented features:
|
|
||||||
// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices.
|
|
||||||
// [!] Renderer: User texture binding. Use 'VkDescriptorSet' as ImTextureID. Read the FAQ about ImTextureID! See https://github.com/ocornut/imgui/pull/914 for discussions.
|
|
||||||
|
|
||||||
// Important: on 32-bit systems, user texture binding is only supported if your imconfig file has '#define ImTextureID ImU64'.
|
|
||||||
// See imgui_impl_vulkan.cpp file for details.
|
|
||||||
|
|
||||||
// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
|
|
||||||
// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
|
|
||||||
// If you are new to Dear ImGui, read documentation from the docs/ folder + read the top of imgui.cpp.
|
|
||||||
// Read online: https://github.com/ocornut/imgui/tree/master/docs
|
|
||||||
|
|
||||||
// The aim of imgui_impl_vulkan.h/.cpp is to be usable in your engine without any modification.
|
|
||||||
// IF YOU FEEL YOU NEED TO MAKE ANY CHANGE TO THIS CODE, please share them and your feedback at https://github.com/ocornut/imgui/
|
|
||||||
|
|
||||||
// Important note to the reader who wish to integrate imgui_impl_vulkan.cpp/.h in their own engine/app.
|
|
||||||
// - Common ImGui_ImplVulkan_XXX functions and structures are used to interface with imgui_impl_vulkan.cpp/.h.
|
|
||||||
// You will use those if you want to use this rendering backend in your engine/app.
|
|
||||||
// - Helper ImGui_ImplVulkanH_XXX functions and structures are only used by this example (main.cpp) and by
|
|
||||||
// the backend itself (imgui_impl_vulkan.cpp), but should PROBABLY NOT be used by your own engine/app code.
|
|
||||||
// Read comments in imgui_impl_vulkan.h.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#include "imgui.h" // IMGUI_IMPL_API
|
|
||||||
|
|
||||||
// [Configuration] in order to use a custom Vulkan function loader:
|
|
||||||
// (1) You'll need to disable default Vulkan function prototypes.
|
|
||||||
// We provide a '#define IMGUI_IMPL_VULKAN_NO_PROTOTYPES' convenience configuration flag.
|
|
||||||
// In order to make sure this is visible from the imgui_impl_vulkan.cpp compilation unit:
|
|
||||||
// - Add '#define IMGUI_IMPL_VULKAN_NO_PROTOTYPES' in your imconfig.h file
|
|
||||||
// - Or as a compilation flag in your build system
|
|
||||||
// - Or uncomment here (not recommended because you'd be modifying imgui sources!)
|
|
||||||
// - Do not simply add it in a .cpp file!
|
|
||||||
// (2) Call ImGui_ImplVulkan_LoadFunctions() before ImGui_ImplVulkan_Init() with your custom function.
|
|
||||||
// If you have no idea what this is, leave it alone!
|
|
||||||
//#define IMGUI_IMPL_VULKAN_NO_PROTOTYPES
|
|
||||||
|
|
||||||
// Vulkan includes
|
|
||||||
#if defined(IMGUI_IMPL_VULKAN_NO_PROTOTYPES) && !defined(VK_NO_PROTOTYPES)
|
|
||||||
#define VK_NO_PROTOTYPES
|
|
||||||
#endif
|
|
||||||
#include <vulkan/vulkan.h>
|
|
||||||
|
|
||||||
// Initialization data, for ImGui_ImplVulkan_Init()
|
|
||||||
// [Please zero-clear before use!]
|
|
||||||
struct ImGui_ImplVulkan_InitInfo
|
|
||||||
{
|
|
||||||
VkInstance Instance;
|
|
||||||
VkPhysicalDevice PhysicalDevice;
|
|
||||||
VkDevice Device;
|
|
||||||
uint32_t QueueFamily;
|
|
||||||
VkQueue Queue;
|
|
||||||
VkPipelineCache PipelineCache;
|
|
||||||
VkDescriptorPool DescriptorPool;
|
|
||||||
uint32_t Subpass;
|
|
||||||
uint32_t MinImageCount; // >= 2
|
|
||||||
uint32_t ImageCount; // >= MinImageCount
|
|
||||||
VkSampleCountFlagBits MSAASamples; // >= VK_SAMPLE_COUNT_1_BIT (0 -> default to VK_SAMPLE_COUNT_1_BIT)
|
|
||||||
const VkAllocationCallbacks* Allocator;
|
|
||||||
void (*CheckVkResultFn)(VkResult err);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Called by user code
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplVulkan_Init(ImGui_ImplVulkan_InitInfo* info, VkRenderPass render_pass);
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplVulkan_Shutdown();
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplVulkan_NewFrame();
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplVulkan_RenderDrawData(ImDrawData* draw_data, VkCommandBuffer command_buffer, VkPipeline pipeline = VK_NULL_HANDLE);
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplVulkan_CreateFontsTexture(VkCommandBuffer command_buffer);
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplVulkan_DestroyFontUploadObjects();
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplVulkan_SetMinImageCount(uint32_t min_image_count); // To override MinImageCount after initialization (e.g. if swap chain is recreated)
|
|
||||||
|
|
||||||
// Register a texture (VkDescriptorSet == ImTextureID)
|
|
||||||
// FIXME: This is experimental in the sense that we are unsure how to best design/tackle this problem, please post to https://github.com/ocornut/imgui/pull/914 if you have suggestions.
|
|
||||||
IMGUI_IMPL_API VkDescriptorSet ImGui_ImplVulkan_AddTexture(VkSampler sampler, VkImageView image_view, VkImageLayout image_layout);
|
|
||||||
|
|
||||||
// Optional: load Vulkan functions with a custom function loader
|
|
||||||
// This is only useful with IMGUI_IMPL_VULKAN_NO_PROTOTYPES / VK_NO_PROTOTYPES
|
|
||||||
IMGUI_IMPL_API bool ImGui_ImplVulkan_LoadFunctions(PFN_vkVoidFunction(*loader_func)(const char* function_name, void* user_data), void* user_data = NULL);
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
// Internal / Miscellaneous Vulkan Helpers
|
|
||||||
// (Used by example's main.cpp. Used by multi-viewport features. PROBABLY NOT used by your own engine/app.)
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
// You probably do NOT need to use or care about those functions.
|
|
||||||
// Those functions only exist because:
|
|
||||||
// 1) they facilitate the readability and maintenance of the multiple main.cpp examples files.
|
|
||||||
// 2) the upcoming multi-viewport feature will need them internally.
|
|
||||||
// Generally we avoid exposing any kind of superfluous high-level helpers in the backends,
|
|
||||||
// but it is too much code to duplicate everywhere so we exceptionally expose them.
|
|
||||||
//
|
|
||||||
// Your engine/app will likely _already_ have code to setup all that stuff (swap chain, render pass, frame buffers, etc.).
|
|
||||||
// You may read this code to learn about Vulkan, but it is recommended you use you own custom tailored code to do equivalent work.
|
|
||||||
// (The ImGui_ImplVulkanH_XXX functions do not interact with any of the state used by the regular ImGui_ImplVulkan_XXX functions)
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
|
|
||||||
struct ImGui_ImplVulkanH_Frame;
|
|
||||||
struct ImGui_ImplVulkanH_Window;
|
|
||||||
|
|
||||||
// Helpers
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplVulkanH_CreateOrResizeWindow(VkInstance instance, VkPhysicalDevice physical_device, VkDevice device, ImGui_ImplVulkanH_Window* wnd, uint32_t queue_family, const VkAllocationCallbacks* allocator, int w, int h, uint32_t min_image_count);
|
|
||||||
IMGUI_IMPL_API void ImGui_ImplVulkanH_DestroyWindow(VkInstance instance, VkDevice device, ImGui_ImplVulkanH_Window* wnd, const VkAllocationCallbacks* allocator);
|
|
||||||
IMGUI_IMPL_API VkSurfaceFormatKHR ImGui_ImplVulkanH_SelectSurfaceFormat(VkPhysicalDevice physical_device, VkSurfaceKHR surface, const VkFormat* request_formats, int request_formats_count, VkColorSpaceKHR request_color_space);
|
|
||||||
IMGUI_IMPL_API VkPresentModeKHR ImGui_ImplVulkanH_SelectPresentMode(VkPhysicalDevice physical_device, VkSurfaceKHR surface, const VkPresentModeKHR* request_modes, int request_modes_count);
|
|
||||||
IMGUI_IMPL_API int ImGui_ImplVulkanH_GetMinImageCountFromPresentMode(VkPresentModeKHR present_mode);
|
|
||||||
|
|
||||||
// Helper structure to hold the data needed by one rendering frame
|
|
||||||
// (Used by example's main.cpp. Used by multi-viewport features. Probably NOT used by your own engine/app.)
|
|
||||||
// [Please zero-clear before use!]
|
|
||||||
struct ImGui_ImplVulkanH_Frame
|
|
||||||
{
|
|
||||||
VkCommandPool CommandPool;
|
|
||||||
VkCommandBuffer CommandBuffer;
|
|
||||||
VkFence Fence;
|
|
||||||
VkImage Backbuffer;
|
|
||||||
VkImageView BackbufferView;
|
|
||||||
VkFramebuffer Framebuffer;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct ImGui_ImplVulkanH_FrameSemaphores
|
|
||||||
{
|
|
||||||
VkSemaphore ImageAcquiredSemaphore;
|
|
||||||
VkSemaphore RenderCompleteSemaphore;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Helper structure to hold the data needed by one rendering context into one OS window
|
|
||||||
// (Used by example's main.cpp. Used by multi-viewport features. Probably NOT used by your own engine/app.)
|
|
||||||
struct ImGui_ImplVulkanH_Window
|
|
||||||
{
|
|
||||||
int Width;
|
|
||||||
int Height;
|
|
||||||
VkSwapchainKHR Swapchain;
|
|
||||||
VkSurfaceKHR Surface;
|
|
||||||
VkSurfaceFormatKHR SurfaceFormat;
|
|
||||||
VkPresentModeKHR PresentMode;
|
|
||||||
VkRenderPass RenderPass;
|
|
||||||
VkPipeline Pipeline; // The window pipeline may uses a different VkRenderPass than the one passed in ImGui_ImplVulkan_InitInfo
|
|
||||||
bool ClearEnable;
|
|
||||||
VkClearValue ClearValue;
|
|
||||||
uint32_t FrameIndex; // Current frame being rendered to (0 <= FrameIndex < FrameInFlightCount)
|
|
||||||
uint32_t ImageCount; // Number of simultaneous in-flight frames (returned by vkGetSwapchainImagesKHR, usually derived from min_image_count)
|
|
||||||
uint32_t SemaphoreIndex; // Current set of swapchain wait semaphores we're using (needs to be distinct from per frame data)
|
|
||||||
ImGui_ImplVulkanH_Frame* Frames;
|
|
||||||
ImGui_ImplVulkanH_FrameSemaphores* FrameSemaphores;
|
|
||||||
|
|
||||||
ImGui_ImplVulkanH_Window()
|
|
||||||
{
|
|
||||||
memset((void*)this, 0, sizeof(*this));
|
|
||||||
PresentMode = (VkPresentModeKHR)~0; // Ensure we get an error if user doesn't set this.
|
|
||||||
ClearEnable = true;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,627 +0,0 @@
|
||||||
// [DEAR IMGUI]
|
|
||||||
// This is a slightly modified version of stb_rect_pack.h 1.01.
|
|
||||||
// Grep for [DEAR IMGUI] to find the changes.
|
|
||||||
//
|
|
||||||
// stb_rect_pack.h - v1.01 - public domain - rectangle packing
|
|
||||||
// Sean Barrett 2014
|
|
||||||
//
|
|
||||||
// Useful for e.g. packing rectangular textures into an atlas.
|
|
||||||
// Does not do rotation.
|
|
||||||
//
|
|
||||||
// Before #including,
|
|
||||||
//
|
|
||||||
// #define STB_RECT_PACK_IMPLEMENTATION
|
|
||||||
//
|
|
||||||
// in the file that you want to have the implementation.
|
|
||||||
//
|
|
||||||
// Not necessarily the awesomest packing method, but better than
|
|
||||||
// the totally naive one in stb_truetype (which is primarily what
|
|
||||||
// this is meant to replace).
|
|
||||||
//
|
|
||||||
// Has only had a few tests run, may have issues.
|
|
||||||
//
|
|
||||||
// More docs to come.
|
|
||||||
//
|
|
||||||
// No memory allocations; uses qsort() and assert() from stdlib.
|
|
||||||
// Can override those by defining STBRP_SORT and STBRP_ASSERT.
|
|
||||||
//
|
|
||||||
// This library currently uses the Skyline Bottom-Left algorithm.
|
|
||||||
//
|
|
||||||
// Please note: better rectangle packers are welcome! Please
|
|
||||||
// implement them to the same API, but with a different init
|
|
||||||
// function.
|
|
||||||
//
|
|
||||||
// Credits
|
|
||||||
//
|
|
||||||
// Library
|
|
||||||
// Sean Barrett
|
|
||||||
// Minor features
|
|
||||||
// Martins Mozeiko
|
|
||||||
// github:IntellectualKitty
|
|
||||||
//
|
|
||||||
// Bugfixes / warning fixes
|
|
||||||
// Jeremy Jaussaud
|
|
||||||
// Fabian Giesen
|
|
||||||
//
|
|
||||||
// Version history:
|
|
||||||
//
|
|
||||||
// 1.01 (2021-07-11) always use large rect mode, expose STBRP__MAXVAL in public section
|
|
||||||
// 1.00 (2019-02-25) avoid small space waste; gracefully fail too-wide rectangles
|
|
||||||
// 0.99 (2019-02-07) warning fixes
|
|
||||||
// 0.11 (2017-03-03) return packing success/fail result
|
|
||||||
// 0.10 (2016-10-25) remove cast-away-const to avoid warnings
|
|
||||||
// 0.09 (2016-08-27) fix compiler warnings
|
|
||||||
// 0.08 (2015-09-13) really fix bug with empty rects (w=0 or h=0)
|
|
||||||
// 0.07 (2015-09-13) fix bug with empty rects (w=0 or h=0)
|
|
||||||
// 0.06 (2015-04-15) added STBRP_SORT to allow replacing qsort
|
|
||||||
// 0.05: added STBRP_ASSERT to allow replacing assert
|
|
||||||
// 0.04: fixed minor bug in STBRP_LARGE_RECTS support
|
|
||||||
// 0.01: initial release
|
|
||||||
//
|
|
||||||
// LICENSE
|
|
||||||
//
|
|
||||||
// See end of file for license information.
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// INCLUDE SECTION
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifndef STB_INCLUDE_STB_RECT_PACK_H
|
|
||||||
#define STB_INCLUDE_STB_RECT_PACK_H
|
|
||||||
|
|
||||||
#define STB_RECT_PACK_VERSION 1
|
|
||||||
|
|
||||||
#ifdef STBRP_STATIC
|
|
||||||
#define STBRP_DEF static
|
|
||||||
#else
|
|
||||||
#define STBRP_DEF extern
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef struct stbrp_context stbrp_context;
|
|
||||||
typedef struct stbrp_node stbrp_node;
|
|
||||||
typedef struct stbrp_rect stbrp_rect;
|
|
||||||
|
|
||||||
typedef int stbrp_coord;
|
|
||||||
|
|
||||||
#define STBRP__MAXVAL 0x7fffffff
|
|
||||||
// Mostly for internal use, but this is the maximum supported coordinate value.
|
|
||||||
|
|
||||||
STBRP_DEF int stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects);
|
|
||||||
// Assign packed locations to rectangles. The rectangles are of type
|
|
||||||
// 'stbrp_rect' defined below, stored in the array 'rects', and there
|
|
||||||
// are 'num_rects' many of them.
|
|
||||||
//
|
|
||||||
// Rectangles which are successfully packed have the 'was_packed' flag
|
|
||||||
// set to a non-zero value and 'x' and 'y' store the minimum location
|
|
||||||
// on each axis (i.e. bottom-left in cartesian coordinates, top-left
|
|
||||||
// if you imagine y increasing downwards). Rectangles which do not fit
|
|
||||||
// have the 'was_packed' flag set to 0.
|
|
||||||
//
|
|
||||||
// You should not try to access the 'rects' array from another thread
|
|
||||||
// while this function is running, as the function temporarily reorders
|
|
||||||
// the array while it executes.
|
|
||||||
//
|
|
||||||
// To pack into another rectangle, you need to call stbrp_init_target
|
|
||||||
// again. To continue packing into the same rectangle, you can call
|
|
||||||
// this function again. Calling this multiple times with multiple rect
|
|
||||||
// arrays will probably produce worse packing results than calling it
|
|
||||||
// a single time with the full rectangle array, but the option is
|
|
||||||
// available.
|
|
||||||
//
|
|
||||||
// The function returns 1 if all of the rectangles were successfully
|
|
||||||
// packed and 0 otherwise.
|
|
||||||
|
|
||||||
struct stbrp_rect
|
|
||||||
{
|
|
||||||
// reserved for your use:
|
|
||||||
int id;
|
|
||||||
|
|
||||||
// input:
|
|
||||||
stbrp_coord w, h;
|
|
||||||
|
|
||||||
// output:
|
|
||||||
stbrp_coord x, y;
|
|
||||||
int was_packed; // non-zero if valid packing
|
|
||||||
|
|
||||||
}; // 16 bytes, nominally
|
|
||||||
|
|
||||||
|
|
||||||
STBRP_DEF void stbrp_init_target (stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes);
|
|
||||||
// Initialize a rectangle packer to:
|
|
||||||
// pack a rectangle that is 'width' by 'height' in dimensions
|
|
||||||
// using temporary storage provided by the array 'nodes', which is 'num_nodes' long
|
|
||||||
//
|
|
||||||
// You must call this function every time you start packing into a new target.
|
|
||||||
//
|
|
||||||
// There is no "shutdown" function. The 'nodes' memory must stay valid for
|
|
||||||
// the following stbrp_pack_rects() call (or calls), but can be freed after
|
|
||||||
// the call (or calls) finish.
|
|
||||||
//
|
|
||||||
// Note: to guarantee best results, either:
|
|
||||||
// 1. make sure 'num_nodes' >= 'width'
|
|
||||||
// or 2. call stbrp_allow_out_of_mem() defined below with 'allow_out_of_mem = 1'
|
|
||||||
//
|
|
||||||
// If you don't do either of the above things, widths will be quantized to multiples
|
|
||||||
// of small integers to guarantee the algorithm doesn't run out of temporary storage.
|
|
||||||
//
|
|
||||||
// If you do #2, then the non-quantized algorithm will be used, but the algorithm
|
|
||||||
// may run out of temporary storage and be unable to pack some rectangles.
|
|
||||||
|
|
||||||
STBRP_DEF void stbrp_setup_allow_out_of_mem (stbrp_context *context, int allow_out_of_mem);
|
|
||||||
// Optionally call this function after init but before doing any packing to
|
|
||||||
// change the handling of the out-of-temp-memory scenario, described above.
|
|
||||||
// If you call init again, this will be reset to the default (false).
|
|
||||||
|
|
||||||
|
|
||||||
STBRP_DEF void stbrp_setup_heuristic (stbrp_context *context, int heuristic);
|
|
||||||
// Optionally select which packing heuristic the library should use. Different
|
|
||||||
// heuristics will produce better/worse results for different data sets.
|
|
||||||
// If you call init again, this will be reset to the default.
|
|
||||||
|
|
||||||
enum
|
|
||||||
{
|
|
||||||
STBRP_HEURISTIC_Skyline_default=0,
|
|
||||||
STBRP_HEURISTIC_Skyline_BL_sortHeight = STBRP_HEURISTIC_Skyline_default,
|
|
||||||
STBRP_HEURISTIC_Skyline_BF_sortHeight
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// the details of the following structures don't matter to you, but they must
|
|
||||||
// be visible so you can handle the memory allocations for them
|
|
||||||
|
|
||||||
struct stbrp_node
|
|
||||||
{
|
|
||||||
stbrp_coord x,y;
|
|
||||||
stbrp_node *next;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct stbrp_context
|
|
||||||
{
|
|
||||||
int width;
|
|
||||||
int height;
|
|
||||||
int align;
|
|
||||||
int init_mode;
|
|
||||||
int heuristic;
|
|
||||||
int num_nodes;
|
|
||||||
stbrp_node *active_head;
|
|
||||||
stbrp_node *free_head;
|
|
||||||
stbrp_node extra[2]; // we allocate two extra nodes so optimal user-node-count is 'width' not 'width+2'
|
|
||||||
};
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// IMPLEMENTATION SECTION
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifdef STB_RECT_PACK_IMPLEMENTATION
|
|
||||||
#ifndef STBRP_SORT
|
|
||||||
#include <stdlib.h>
|
|
||||||
#define STBRP_SORT qsort
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef STBRP_ASSERT
|
|
||||||
#include <assert.h>
|
|
||||||
#define STBRP_ASSERT assert
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#define STBRP__NOTUSED(v) (void)(v)
|
|
||||||
#define STBRP__CDECL __cdecl
|
|
||||||
#else
|
|
||||||
#define STBRP__NOTUSED(v) (void)sizeof(v)
|
|
||||||
#define STBRP__CDECL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
enum
|
|
||||||
{
|
|
||||||
STBRP__INIT_skyline = 1
|
|
||||||
};
|
|
||||||
|
|
||||||
STBRP_DEF void stbrp_setup_heuristic(stbrp_context *context, int heuristic)
|
|
||||||
{
|
|
||||||
switch (context->init_mode) {
|
|
||||||
case STBRP__INIT_skyline:
|
|
||||||
STBRP_ASSERT(heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight || heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight);
|
|
||||||
context->heuristic = heuristic;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
STBRP_ASSERT(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_out_of_mem)
|
|
||||||
{
|
|
||||||
if (allow_out_of_mem)
|
|
||||||
// if it's ok to run out of memory, then don't bother aligning them;
|
|
||||||
// this gives better packing, but may fail due to OOM (even though
|
|
||||||
// the rectangles easily fit). @TODO a smarter approach would be to only
|
|
||||||
// quantize once we've hit OOM, then we could get rid of this parameter.
|
|
||||||
context->align = 1;
|
|
||||||
else {
|
|
||||||
// if it's not ok to run out of memory, then quantize the widths
|
|
||||||
// so that num_nodes is always enough nodes.
|
|
||||||
//
|
|
||||||
// I.e. num_nodes * align >= width
|
|
||||||
// align >= width / num_nodes
|
|
||||||
// align = ceil(width/num_nodes)
|
|
||||||
|
|
||||||
context->align = (context->width + context->num_nodes-1) / context->num_nodes;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i=0; i < num_nodes-1; ++i)
|
|
||||||
nodes[i].next = &nodes[i+1];
|
|
||||||
nodes[i].next = NULL;
|
|
||||||
context->init_mode = STBRP__INIT_skyline;
|
|
||||||
context->heuristic = STBRP_HEURISTIC_Skyline_default;
|
|
||||||
context->free_head = &nodes[0];
|
|
||||||
context->active_head = &context->extra[0];
|
|
||||||
context->width = width;
|
|
||||||
context->height = height;
|
|
||||||
context->num_nodes = num_nodes;
|
|
||||||
stbrp_setup_allow_out_of_mem(context, 0);
|
|
||||||
|
|
||||||
// node 0 is the full width, node 1 is the sentinel (lets us not store width explicitly)
|
|
||||||
context->extra[0].x = 0;
|
|
||||||
context->extra[0].y = 0;
|
|
||||||
context->extra[0].next = &context->extra[1];
|
|
||||||
context->extra[1].x = (stbrp_coord) width;
|
|
||||||
context->extra[1].y = (1<<30);
|
|
||||||
context->extra[1].next = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// find minimum y position if it starts at x1
|
|
||||||
static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0, int width, int *pwaste)
|
|
||||||
{
|
|
||||||
stbrp_node *node = first;
|
|
||||||
int x1 = x0 + width;
|
|
||||||
int min_y, visited_width, waste_area;
|
|
||||||
|
|
||||||
STBRP__NOTUSED(c);
|
|
||||||
|
|
||||||
STBRP_ASSERT(first->x <= x0);
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
// skip in case we're past the node
|
|
||||||
while (node->next->x <= x0)
|
|
||||||
++node;
|
|
||||||
#else
|
|
||||||
STBRP_ASSERT(node->next->x > x0); // we ended up handling this in the caller for efficiency
|
|
||||||
#endif
|
|
||||||
|
|
||||||
STBRP_ASSERT(node->x <= x0);
|
|
||||||
|
|
||||||
min_y = 0;
|
|
||||||
waste_area = 0;
|
|
||||||
visited_width = 0;
|
|
||||||
while (node->x < x1) {
|
|
||||||
if (node->y > min_y) {
|
|
||||||
// raise min_y higher.
|
|
||||||
// we've accounted for all waste up to min_y,
|
|
||||||
// but we'll now add more waste for everything we've visted
|
|
||||||
waste_area += visited_width * (node->y - min_y);
|
|
||||||
min_y = node->y;
|
|
||||||
// the first time through, visited_width might be reduced
|
|
||||||
if (node->x < x0)
|
|
||||||
visited_width += node->next->x - x0;
|
|
||||||
else
|
|
||||||
visited_width += node->next->x - node->x;
|
|
||||||
} else {
|
|
||||||
// add waste area
|
|
||||||
int under_width = node->next->x - node->x;
|
|
||||||
if (under_width + visited_width > width)
|
|
||||||
under_width = width - visited_width;
|
|
||||||
waste_area += under_width * (min_y - node->y);
|
|
||||||
visited_width += under_width;
|
|
||||||
}
|
|
||||||
node = node->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
*pwaste = waste_area;
|
|
||||||
return min_y;
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
int x,y;
|
|
||||||
stbrp_node **prev_link;
|
|
||||||
} stbrp__findresult;
|
|
||||||
|
|
||||||
static stbrp__findresult stbrp__skyline_find_best_pos(stbrp_context *c, int width, int height)
|
|
||||||
{
|
|
||||||
int best_waste = (1<<30), best_x, best_y = (1 << 30);
|
|
||||||
stbrp__findresult fr;
|
|
||||||
stbrp_node **prev, *node, *tail, **best = NULL;
|
|
||||||
|
|
||||||
// align to multiple of c->align
|
|
||||||
width = (width + c->align - 1);
|
|
||||||
width -= width % c->align;
|
|
||||||
STBRP_ASSERT(width % c->align == 0);
|
|
||||||
|
|
||||||
// if it can't possibly fit, bail immediately
|
|
||||||
if (width > c->width || height > c->height) {
|
|
||||||
fr.prev_link = NULL;
|
|
||||||
fr.x = fr.y = 0;
|
|
||||||
return fr;
|
|
||||||
}
|
|
||||||
|
|
||||||
node = c->active_head;
|
|
||||||
prev = &c->active_head;
|
|
||||||
while (node->x + width <= c->width) {
|
|
||||||
int y,waste;
|
|
||||||
y = stbrp__skyline_find_min_y(c, node, node->x, width, &waste);
|
|
||||||
if (c->heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight) { // actually just want to test BL
|
|
||||||
// bottom left
|
|
||||||
if (y < best_y) {
|
|
||||||
best_y = y;
|
|
||||||
best = prev;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// best-fit
|
|
||||||
if (y + height <= c->height) {
|
|
||||||
// can only use it if it first vertically
|
|
||||||
if (y < best_y || (y == best_y && waste < best_waste)) {
|
|
||||||
best_y = y;
|
|
||||||
best_waste = waste;
|
|
||||||
best = prev;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
prev = &node->next;
|
|
||||||
node = node->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
best_x = (best == NULL) ? 0 : (*best)->x;
|
|
||||||
|
|
||||||
// if doing best-fit (BF), we also have to try aligning right edge to each node position
|
|
||||||
//
|
|
||||||
// e.g, if fitting
|
|
||||||
//
|
|
||||||
// ____________________
|
|
||||||
// |____________________|
|
|
||||||
//
|
|
||||||
// into
|
|
||||||
//
|
|
||||||
// | |
|
|
||||||
// | ____________|
|
|
||||||
// |____________|
|
|
||||||
//
|
|
||||||
// then right-aligned reduces waste, but bottom-left BL is always chooses left-aligned
|
|
||||||
//
|
|
||||||
// This makes BF take about 2x the time
|
|
||||||
|
|
||||||
if (c->heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight) {
|
|
||||||
tail = c->active_head;
|
|
||||||
node = c->active_head;
|
|
||||||
prev = &c->active_head;
|
|
||||||
// find first node that's admissible
|
|
||||||
while (tail->x < width)
|
|
||||||
tail = tail->next;
|
|
||||||
while (tail) {
|
|
||||||
int xpos = tail->x - width;
|
|
||||||
int y,waste;
|
|
||||||
STBRP_ASSERT(xpos >= 0);
|
|
||||||
// find the left position that matches this
|
|
||||||
while (node->next->x <= xpos) {
|
|
||||||
prev = &node->next;
|
|
||||||
node = node->next;
|
|
||||||
}
|
|
||||||
STBRP_ASSERT(node->next->x > xpos && node->x <= xpos);
|
|
||||||
y = stbrp__skyline_find_min_y(c, node, xpos, width, &waste);
|
|
||||||
if (y + height <= c->height) {
|
|
||||||
if (y <= best_y) {
|
|
||||||
if (y < best_y || waste < best_waste || (waste==best_waste && xpos < best_x)) {
|
|
||||||
best_x = xpos;
|
|
||||||
//STBRP_ASSERT(y <= best_y); [DEAR IMGUI]
|
|
||||||
best_y = y;
|
|
||||||
best_waste = waste;
|
|
||||||
best = prev;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tail = tail->next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fr.prev_link = best;
|
|
||||||
fr.x = best_x;
|
|
||||||
fr.y = best_y;
|
|
||||||
return fr;
|
|
||||||
}
|
|
||||||
|
|
||||||
static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, int width, int height)
|
|
||||||
{
|
|
||||||
// find best position according to heuristic
|
|
||||||
stbrp__findresult res = stbrp__skyline_find_best_pos(context, width, height);
|
|
||||||
stbrp_node *node, *cur;
|
|
||||||
|
|
||||||
// bail if:
|
|
||||||
// 1. it failed
|
|
||||||
// 2. the best node doesn't fit (we don't always check this)
|
|
||||||
// 3. we're out of memory
|
|
||||||
if (res.prev_link == NULL || res.y + height > context->height || context->free_head == NULL) {
|
|
||||||
res.prev_link = NULL;
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
// on success, create new node
|
|
||||||
node = context->free_head;
|
|
||||||
node->x = (stbrp_coord) res.x;
|
|
||||||
node->y = (stbrp_coord) (res.y + height);
|
|
||||||
|
|
||||||
context->free_head = node->next;
|
|
||||||
|
|
||||||
// insert the new node into the right starting point, and
|
|
||||||
// let 'cur' point to the remaining nodes needing to be
|
|
||||||
// stiched back in
|
|
||||||
|
|
||||||
cur = *res.prev_link;
|
|
||||||
if (cur->x < res.x) {
|
|
||||||
// preserve the existing one, so start testing with the next one
|
|
||||||
stbrp_node *next = cur->next;
|
|
||||||
cur->next = node;
|
|
||||||
cur = next;
|
|
||||||
} else {
|
|
||||||
*res.prev_link = node;
|
|
||||||
}
|
|
||||||
|
|
||||||
// from here, traverse cur and free the nodes, until we get to one
|
|
||||||
// that shouldn't be freed
|
|
||||||
while (cur->next && cur->next->x <= res.x + width) {
|
|
||||||
stbrp_node *next = cur->next;
|
|
||||||
// move the current node to the free list
|
|
||||||
cur->next = context->free_head;
|
|
||||||
context->free_head = cur;
|
|
||||||
cur = next;
|
|
||||||
}
|
|
||||||
|
|
||||||
// stitch the list back in
|
|
||||||
node->next = cur;
|
|
||||||
|
|
||||||
if (cur->x < res.x + width)
|
|
||||||
cur->x = (stbrp_coord) (res.x + width);
|
|
||||||
|
|
||||||
#ifdef _DEBUG
|
|
||||||
cur = context->active_head;
|
|
||||||
while (cur->x < context->width) {
|
|
||||||
STBRP_ASSERT(cur->x < cur->next->x);
|
|
||||||
cur = cur->next;
|
|
||||||
}
|
|
||||||
STBRP_ASSERT(cur->next == NULL);
|
|
||||||
|
|
||||||
{
|
|
||||||
int count=0;
|
|
||||||
cur = context->active_head;
|
|
||||||
while (cur) {
|
|
||||||
cur = cur->next;
|
|
||||||
++count;
|
|
||||||
}
|
|
||||||
cur = context->free_head;
|
|
||||||
while (cur) {
|
|
||||||
cur = cur->next;
|
|
||||||
++count;
|
|
||||||
}
|
|
||||||
STBRP_ASSERT(count == context->num_nodes+2);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int STBRP__CDECL rect_height_compare(const void *a, const void *b)
|
|
||||||
{
|
|
||||||
const stbrp_rect *p = (const stbrp_rect *) a;
|
|
||||||
const stbrp_rect *q = (const stbrp_rect *) b;
|
|
||||||
if (p->h > q->h)
|
|
||||||
return -1;
|
|
||||||
if (p->h < q->h)
|
|
||||||
return 1;
|
|
||||||
return (p->w > q->w) ? -1 : (p->w < q->w);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int STBRP__CDECL rect_original_order(const void *a, const void *b)
|
|
||||||
{
|
|
||||||
const stbrp_rect *p = (const stbrp_rect *) a;
|
|
||||||
const stbrp_rect *q = (const stbrp_rect *) b;
|
|
||||||
return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed);
|
|
||||||
}
|
|
||||||
|
|
||||||
STBRP_DEF int stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects)
|
|
||||||
{
|
|
||||||
int i, all_rects_packed = 1;
|
|
||||||
|
|
||||||
// we use the 'was_packed' field internally to allow sorting/unsorting
|
|
||||||
for (i=0; i < num_rects; ++i) {
|
|
||||||
rects[i].was_packed = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
// sort according to heuristic
|
|
||||||
STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_height_compare);
|
|
||||||
|
|
||||||
for (i=0; i < num_rects; ++i) {
|
|
||||||
if (rects[i].w == 0 || rects[i].h == 0) {
|
|
||||||
rects[i].x = rects[i].y = 0; // empty rect needs no space
|
|
||||||
} else {
|
|
||||||
stbrp__findresult fr = stbrp__skyline_pack_rectangle(context, rects[i].w, rects[i].h);
|
|
||||||
if (fr.prev_link) {
|
|
||||||
rects[i].x = (stbrp_coord) fr.x;
|
|
||||||
rects[i].y = (stbrp_coord) fr.y;
|
|
||||||
} else {
|
|
||||||
rects[i].x = rects[i].y = STBRP__MAXVAL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// unsort
|
|
||||||
STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_original_order);
|
|
||||||
|
|
||||||
// set was_packed flags and all_rects_packed status
|
|
||||||
for (i=0; i < num_rects; ++i) {
|
|
||||||
rects[i].was_packed = !(rects[i].x == STBRP__MAXVAL && rects[i].y == STBRP__MAXVAL);
|
|
||||||
if (!rects[i].was_packed)
|
|
||||||
all_rects_packed = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// return the all_rects_packed status
|
|
||||||
return all_rects_packed;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
------------------------------------------------------------------------------
|
|
||||||
This software is available under 2 licenses -- choose whichever you prefer.
|
|
||||||
------------------------------------------------------------------------------
|
|
||||||
ALTERNATIVE A - MIT License
|
|
||||||
Copyright (c) 2017 Sean Barrett
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
||||||
this software and associated documentation files (the "Software"), to deal in
|
|
||||||
the Software without restriction, including without limitation the rights to
|
|
||||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
of the Software, and to permit persons to whom the Software is furnished to do
|
|
||||||
so, subject to the following conditions:
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
------------------------------------------------------------------------------
|
|
||||||
ALTERNATIVE B - Public Domain (www.unlicense.org)
|
|
||||||
This is free and unencumbered software released into the public domain.
|
|
||||||
Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
|
|
||||||
software, either in source code form or as a compiled binary, for any purpose,
|
|
||||||
commercial or non-commercial, and by any means.
|
|
||||||
In jurisdictions that recognize copyright laws, the author or authors of this
|
|
||||||
software dedicate any and all copyright interest in the software to the public
|
|
||||||
domain. We make this dedication for the benefit of the public at large and to
|
|
||||||
the detriment of our heirs and successors. We intend this dedication to be an
|
|
||||||
overt act of relinquishment in perpetuity of all present and future rights to
|
|
||||||
this software under copyright law.
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
||||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
------------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,12 +1,38 @@
|
||||||
find_package(Vulkan REQUIRED)
|
find_package(Vulkan REQUIRED)
|
||||||
find_package(SDL2 REQUIRED)
|
find_package(SDL2 CONFIG REQUIRED)
|
||||||
|
find_package(imgui REQUIRED)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
||||||
|
|
||||||
FILE(GLOB_RECURSE SOURCES src/*.cpp)
|
FILE(GLOB_RECURSE SOURCES
|
||||||
FILE(GLOB_RECURSE HEADERS src/*.h)
|
core/src/*.cpp
|
||||||
|
shadow-renderer/src/*.cpp
|
||||||
|
shadow-reflection/src/*.cpp
|
||||||
|
)
|
||||||
|
FILE(GLOB_RECURSE HEADERS
|
||||||
|
core/inc/*.h
|
||||||
|
shadow-renderer/inc/*.h
|
||||||
|
shadow-reflection/inc/*.h
|
||||||
|
)
|
||||||
|
|
||||||
add_library(shadow-engine ${SOURCES})
|
add_library(shadow-engine SHARED ${SOURCES} $<TARGET_OBJECTS:imgui>)
|
||||||
|
|
||||||
|
target_include_directories(shadow-engine
|
||||||
|
PRIVATE ${SDL2_INCLUDE_DIRS}
|
||||||
|
PUBLIC
|
||||||
|
core/inc
|
||||||
|
shadow-renderer/inc
|
||||||
|
shadow-reflection/inc
|
||||||
|
${glm_SOURCE_DIR}
|
||||||
|
INTERFACE
|
||||||
|
${imgui_SOURCE_DIR}
|
||||||
|
${imgui_SOURCE_DIR}/backends)
|
||||||
|
|
||||||
|
target_link_libraries(shadow-engine
|
||||||
|
PUBLIC Vulkan::Vulkan SDL2::SDL2 spdlog dylib imgui
|
||||||
|
)
|
||||||
|
target_compile_definitions(shadow-engine PRIVATE "EXPORTING_SH_ENGINE")
|
||||||
|
|
||||||
|
target_link_options(shadow-engine PUBLIC -Wl,--export-all-symbols)
|
||||||
|
|
||||||
target_include_directories(shadow-engine PRIVATE ${SDL2_INCLUDE_DIRS} PUBLIC ${HEADERS})
|
|
||||||
target_link_libraries(shadow-engine PRIVATE Vulkan::Vulkan PUBLIC SDL2::Core shadow-reflect shadow-asset spdlog PUBLIC imgui renderer)
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
#ifndef UMBRA_MODULE_H
|
#ifndef UMBRA_MODULE_H
|
||||||
#define UMBRA_MODULE_H
|
#define UMBRA_MODULE_H
|
||||||
|
|
||||||
#include "../../../shadow-reflection/src/SHObject.h"
|
#include "SHObject.h"
|
||||||
|
#include <SDL_events.h>
|
||||||
|
|
||||||
namespace ShadowEngine {
|
namespace ShadowEngine {
|
||||||
|
|
||||||
|
|
@ -30,21 +31,25 @@ namespace ShadowEngine {
|
||||||
/// </summary>
|
/// </summary>
|
||||||
virtual void Update() = 0;
|
virtual void Update() = 0;
|
||||||
|
|
||||||
|
virtual void PreRender() = 0;
|
||||||
|
|
||||||
virtual void Render() = 0;
|
virtual void Render() = 0;
|
||||||
|
|
||||||
virtual void LateRender() = 0;
|
virtual void LateRender() = 0;
|
||||||
|
|
||||||
virtual void AfterFrameEnd() {};
|
virtual void AfterFrameEnd() = 0;
|
||||||
|
|
||||||
|
virtual void Destroy() = 0;
|
||||||
|
|
||||||
|
virtual void Event(SDL_Event* e) = 0;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns the name of the module
|
/// Returns the name of the module
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
virtual std::string GetName() = 0;
|
virtual std::string GetName() {
|
||||||
|
return this->GetType();
|
||||||
|
};
|
||||||
Module();
|
|
||||||
virtual ~Module();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // ShadowEngine
|
} // ShadowEngine
|
||||||
|
|
@ -7,8 +7,9 @@
|
||||||
|
|
||||||
namespace ShadowEngine {
|
namespace ShadowEngine {
|
||||||
|
|
||||||
class ModuleRef{
|
struct ModuleRef{
|
||||||
std::unique_ptr<Module> module;
|
public:
|
||||||
|
std::shared_ptr<Module> module;
|
||||||
std::string domain;
|
std::string domain;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -22,15 +23,15 @@ namespace ShadowEngine {
|
||||||
|
|
||||||
~ModuleManager();
|
~ModuleManager();
|
||||||
|
|
||||||
void PushModule(Module *module);
|
void PushModule(std::shared_ptr<Module> module, std::string domain);
|
||||||
|
|
||||||
Module &GetModule(std::string name);
|
Module &GetModule(std::string name);
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
T *GetModuleByType() {
|
T *GetModuleByType() {
|
||||||
for (auto &module: modules) {
|
for (auto &module: modules) {
|
||||||
if (module->GetTypeId() == T::TypeId())
|
if (module.module->GetTypeId() == T::TypeId())
|
||||||
return dynamic_cast<T *>(module.get());
|
return dynamic_cast<T *>(module.module.get());
|
||||||
}
|
}
|
||||||
//SH_CORE_ERROR("Can't find the module {0}", T::Type());
|
//SH_CORE_ERROR("Can't find the module {0}", T::Type());
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
@ -44,7 +45,13 @@ namespace ShadowEngine {
|
||||||
|
|
||||||
void Render();
|
void Render();
|
||||||
|
|
||||||
|
void PreRender();
|
||||||
|
|
||||||
void AfterFrameEnd();
|
void AfterFrameEnd();
|
||||||
|
|
||||||
|
void Destroy();
|
||||||
|
|
||||||
|
void Event(SDL_Event* evt);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
45
projs/shadow/shadow-engine/core/inc/core/SDL2Module.h
Normal file
45
projs/shadow/shadow-engine/core/inc/core/SDL2Module.h
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
//
|
||||||
|
// Created by dpete on 30/08/2022.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef UMBRA_SDL2MODULE_H
|
||||||
|
#define UMBRA_SDL2MODULE_H
|
||||||
|
|
||||||
|
#include "Module.h"
|
||||||
|
#include "ShadowWindow.h"
|
||||||
|
|
||||||
|
#include <SDL.h>
|
||||||
|
|
||||||
|
namespace ShadowEngine {
|
||||||
|
|
||||||
|
class SDL2Module : public Module {
|
||||||
|
SHObject_Base(SDL2Module)
|
||||||
|
|
||||||
|
public:
|
||||||
|
ShadowEngine::ShadowWindow* _window;
|
||||||
|
|
||||||
|
private:
|
||||||
|
void Init() override;
|
||||||
|
|
||||||
|
void PreInit() override;
|
||||||
|
|
||||||
|
void Update() override;
|
||||||
|
|
||||||
|
void Render() override;
|
||||||
|
|
||||||
|
void LateRender() override;
|
||||||
|
|
||||||
|
std::string GetName() override;
|
||||||
|
|
||||||
|
void AfterFrameEnd() override;
|
||||||
|
|
||||||
|
void PreRender() override;
|
||||||
|
|
||||||
|
void Destroy() override;
|
||||||
|
|
||||||
|
void Event(SDL_Event* e) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif //UMBRA_SDL2MODULE_H
|
||||||
|
|
@ -1,5 +1,10 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "ShadowWindow.h"
|
#include "ShadowWindow.h"
|
||||||
|
#include "ModuleManager.h"
|
||||||
|
#include "exports.h"
|
||||||
|
#include "imgui.h"
|
||||||
|
#include "imgui_impl_sdl.h"
|
||||||
|
#include "imgui_impl_vulkan.h"
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
|
@ -8,7 +13,7 @@ namespace ShadowEngine {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents the application
|
/// Represents the application
|
||||||
/// </summary>
|
/// </summary>
|
||||||
class ShadowApplication
|
class ShadowApplication
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This is the singleton instance
|
/// This is the singleton instance
|
||||||
|
|
@ -23,7 +28,7 @@ namespace ShadowEngine {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The module manager instance
|
/// The module manager instance
|
||||||
/// </summary>
|
/// </summary>
|
||||||
//ShadowEngine::ShadowModuleManager moduleManager;
|
ModuleManager moduleManager;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents the running state.
|
/// Represents the running state.
|
||||||
|
|
@ -35,19 +40,21 @@ namespace ShadowEngine {
|
||||||
|
|
||||||
std::string game = "";
|
std::string game = "";
|
||||||
|
|
||||||
|
void loadGame();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Default constructor
|
/// Default constructor
|
||||||
/// </summary>
|
/// </summary>
|
||||||
ShadowApplication(int argc, char* argv[]);
|
ShadowApplication(int argc, char* argv[]);
|
||||||
virtual ~ShadowApplication();
|
virtual ~ShadowApplication();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Static getter for the singleton instance
|
/// Static getter for the singleton instance
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// Use this for accessing the Application
|
/// Use this for accessing the Application
|
||||||
/// <returns>The current application reference</returns>
|
/// <returns>The current application reference</returns>
|
||||||
static ShadowApplication& Get() { return *instance; };
|
static ShadowApplication& Get();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns the active window used for rendering
|
/// Returns the active window used for rendering
|
||||||
|
|
@ -56,9 +63,11 @@ namespace ShadowEngine {
|
||||||
//ShadowWindow& const GetWindow() const { return window_; };
|
//ShadowWindow& const GetWindow() const { return window_; };
|
||||||
//void SetWindow(ShadowWindow w) { window_ = w; }
|
//void SetWindow(ShadowWindow w) { window_ = w; }
|
||||||
|
|
||||||
//ShadowEngine::ShadowModuleManager& GetModuleManager() { return moduleManager; };
|
ShadowEngine::ModuleManager& GetModuleManager() { return moduleManager; };
|
||||||
|
|
||||||
void Init();
|
void Init();
|
||||||
void Start();
|
void Start();
|
||||||
};
|
|
||||||
|
|
||||||
|
};
|
||||||
}
|
}
|
||||||
25
projs/shadow/shadow-engine/core/inc/core/ShadowWindow.h
Normal file
25
projs/shadow/shadow-engine/core/inc/core/ShadowWindow.h
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <SDL.h>
|
||||||
|
|
||||||
|
namespace ShadowEngine {
|
||||||
|
|
||||||
|
class ShadowWindow {
|
||||||
|
public:
|
||||||
|
|
||||||
|
int Height;
|
||||||
|
int Width;
|
||||||
|
|
||||||
|
SDL_Window *sdlWindowPtr;
|
||||||
|
|
||||||
|
SDL_Surface *sdlSurface = NULL;
|
||||||
|
|
||||||
|
|
||||||
|
//ShadowEngine::Ref<ShadowEngine::Rendering::GraphicsContext> context;
|
||||||
|
|
||||||
|
ShadowWindow(int W, int H);
|
||||||
|
|
||||||
|
~ShadowWindow();
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
41
projs/shadow/shadow-engine/core/inc/debug/DebugModule.h
Normal file
41
projs/shadow/shadow-engine/core/inc/debug/DebugModule.h
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
//
|
||||||
|
// Created by dpete on 31/08/2022.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef UMBRA_DEBUGMODULE_H
|
||||||
|
#define UMBRA_DEBUGMODULE_H
|
||||||
|
|
||||||
|
#include <SDL_events.h>
|
||||||
|
#include "core/Module.h"
|
||||||
|
|
||||||
|
namespace ShadowEngine::Debug {
|
||||||
|
|
||||||
|
class DebugModule : public Module {
|
||||||
|
|
||||||
|
SHObject_Base(DebugModule)
|
||||||
|
|
||||||
|
bool active;
|
||||||
|
|
||||||
|
public:
|
||||||
|
void Render() override;
|
||||||
|
|
||||||
|
void PreInit() override { };
|
||||||
|
|
||||||
|
void Init() override { };
|
||||||
|
|
||||||
|
void Update() override { };
|
||||||
|
|
||||||
|
void LateRender() override { };
|
||||||
|
|
||||||
|
void AfterFrameEnd() override { };
|
||||||
|
|
||||||
|
void PreRender() override { };
|
||||||
|
|
||||||
|
void Destroy() override {};
|
||||||
|
|
||||||
|
void Event(SDL_Event* e) override {};
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif //UMBRA_DEBUGMODULE_H
|
||||||
16
projs/shadow/shadow-engine/core/inc/exports.h
Normal file
16
projs/shadow/shadow-engine/core/inc/exports.h
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
//
|
||||||
|
// Created by dpete on 04/09/2022.
|
||||||
|
//
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if defined(_WIN32)
|
||||||
|
# if defined(EXPORTING_SH_ENGINE)
|
||||||
|
# define SH_EXPORT __declspec(dllexport)
|
||||||
|
# else
|
||||||
|
# define SH_EXPORT __declspec(dllimport)
|
||||||
|
# endif
|
||||||
|
#else // non windows
|
||||||
|
# define SH_EXPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
11
projs/shadow/shadow-engine/core/src/core/Module.cpp
Normal file
11
projs/shadow/shadow-engine/core/src/core/Module.cpp
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
//
|
||||||
|
// Created by dpete on 2022-07-06.
|
||||||
|
//
|
||||||
|
|
||||||
|
#include "core/Module.h"
|
||||||
|
|
||||||
|
namespace ShadowEngine {
|
||||||
|
|
||||||
|
SHObject_Base_Impl(Module)
|
||||||
|
|
||||||
|
} // ShadowEngine
|
||||||
105
projs/shadow/shadow-engine/core/src/core/ModuleManager.cpp
Normal file
105
projs/shadow/shadow-engine/core/src/core/ModuleManager.cpp
Normal file
|
|
@ -0,0 +1,105 @@
|
||||||
|
//
|
||||||
|
// Created by dpete on 2022-07-06.
|
||||||
|
//
|
||||||
|
|
||||||
|
#include "core/ModuleManager.h"
|
||||||
|
|
||||||
|
#include <stdexcept>
|
||||||
|
|
||||||
|
ShadowEngine::ModuleManager* ShadowEngine::ModuleManager::instance = nullptr;
|
||||||
|
|
||||||
|
ShadowEngine::ModuleManager::ModuleManager()
|
||||||
|
{
|
||||||
|
if (instance != nullptr)
|
||||||
|
{
|
||||||
|
//ERROR
|
||||||
|
}
|
||||||
|
instance = this;
|
||||||
|
}
|
||||||
|
|
||||||
|
ShadowEngine::ModuleManager::~ModuleManager()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::ModuleManager::PushModule(std::shared_ptr<Module> module, const std::string domain)
|
||||||
|
{
|
||||||
|
ModuleRef r = {module, domain};
|
||||||
|
modules.emplace_back(r);
|
||||||
|
module->PreInit();
|
||||||
|
}
|
||||||
|
|
||||||
|
ShadowEngine::Module& ShadowEngine::ModuleManager::GetModule(std::string name)
|
||||||
|
{
|
||||||
|
for (auto& module : modules)
|
||||||
|
{
|
||||||
|
if (module.module->GetName() == name)
|
||||||
|
return *module.module;
|
||||||
|
}
|
||||||
|
//SH_ASSERT(false, "Can't find the module");
|
||||||
|
throw std::runtime_error("Can't find the module");
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::ModuleManager::Init()
|
||||||
|
{
|
||||||
|
for (auto& module : modules)
|
||||||
|
{
|
||||||
|
module.module->Init();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::ModuleManager::Destroy()
|
||||||
|
{
|
||||||
|
for (auto& module : modules)
|
||||||
|
{
|
||||||
|
module.module->Destroy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void ShadowEngine::ModuleManager::PreRender()
|
||||||
|
{
|
||||||
|
for (auto& module : modules)
|
||||||
|
{
|
||||||
|
module.module->PreRender();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::ModuleManager::Event(SDL_Event* evt)
|
||||||
|
{
|
||||||
|
for (auto& module : modules)
|
||||||
|
{
|
||||||
|
module.module->Event(evt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::ModuleManager::Update()
|
||||||
|
{
|
||||||
|
for (auto& module : modules)
|
||||||
|
{
|
||||||
|
module.module->Update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::ModuleManager::LateRender()
|
||||||
|
{
|
||||||
|
for (auto& module : modules)
|
||||||
|
{
|
||||||
|
module.module->LateRender();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::ModuleManager::Render()
|
||||||
|
{
|
||||||
|
for (auto& module : modules)
|
||||||
|
{
|
||||||
|
module.module->Render();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::ModuleManager::AfterFrameEnd()
|
||||||
|
{
|
||||||
|
for (auto& module : modules)
|
||||||
|
{
|
||||||
|
module.module->AfterFrameEnd();
|
||||||
|
}
|
||||||
|
}
|
||||||
57
projs/shadow/shadow-engine/core/src/core/SDL2Module.cpp
Normal file
57
projs/shadow/shadow-engine/core/src/core/SDL2Module.cpp
Normal file
|
|
@ -0,0 +1,57 @@
|
||||||
|
//
|
||||||
|
// Created by dpete on 30/08/2022.
|
||||||
|
//
|
||||||
|
|
||||||
|
#include "core/SDL2Module.h"
|
||||||
|
#include "core/ShadowWindow.h"
|
||||||
|
#include "spdlog/spdlog.h"
|
||||||
|
#include "imgui_impl_sdl.h"
|
||||||
|
|
||||||
|
SHObject_Base_Impl(ShadowEngine::SDL2Module)
|
||||||
|
|
||||||
|
void ShadowEngine::SDL2Module::Init() {
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::SDL2Module::PreInit() {
|
||||||
|
// Initialize SDL. SDL_Init will return -1 if it fails.
|
||||||
|
if ( SDL_Init( SDL_INIT_EVERYTHING ) < 0 ) {
|
||||||
|
spdlog::error("Error creating window: " + std::string(SDL_GetError()));
|
||||||
|
//system("pause");
|
||||||
|
// End the program
|
||||||
|
//return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
_window = new ShadowWindow(800,450);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::SDL2Module::Update() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::SDL2Module::Render() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::SDL2Module::LateRender() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string ShadowEngine::SDL2Module::GetName() {
|
||||||
|
return this->GetType();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::SDL2Module::AfterFrameEnd() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::SDL2Module::Event(SDL_Event *e) {
|
||||||
|
ImGui_ImplSDL2_ProcessEvent(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::SDL2Module::Destroy() {
|
||||||
|
SDL_DestroyWindow(_window->sdlWindowPtr);
|
||||||
|
SDL_Quit();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowEngine::SDL2Module::PreRender() {
|
||||||
|
}
|
||||||
121
projs/shadow/shadow-engine/core/src/core/ShadowApplication.cpp
Normal file
121
projs/shadow/shadow-engine/core/src/core/ShadowApplication.cpp
Normal file
|
|
@ -0,0 +1,121 @@
|
||||||
|
#include "core/ShadowApplication.h"
|
||||||
|
|
||||||
|
#include "core/Time.h"
|
||||||
|
#include "core/SDL2Module.h"
|
||||||
|
#include "debug/DebugModule.h"
|
||||||
|
#include "dylib.hpp"
|
||||||
|
|
||||||
|
|
||||||
|
#include <imgui.h>
|
||||||
|
#include <imgui_impl_vulkan.h>
|
||||||
|
#include <imgui_impl_sdl.h>
|
||||||
|
#include <vlkx/vulkan/VulkanManager.h>
|
||||||
|
#include <vlkx/render/Camera.h>
|
||||||
|
#include <vlkx/render/geometry/SingleRenderer.h>
|
||||||
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
|
#define CATCH(x) \
|
||||||
|
try { x } catch (std::exception& e) { spdlog::error(e.what()); exit(0); }
|
||||||
|
|
||||||
|
namespace ShadowEngine {
|
||||||
|
|
||||||
|
dylib* gameLib;
|
||||||
|
|
||||||
|
ShadowApplication* ShadowApplication::instance = nullptr;
|
||||||
|
|
||||||
|
ShadowApplication::ShadowApplication(int argc, char* argv[])
|
||||||
|
{
|
||||||
|
instance = this;
|
||||||
|
|
||||||
|
if(argc > 1)
|
||||||
|
{
|
||||||
|
for (size_t i = 0; i < argc; i++)
|
||||||
|
{
|
||||||
|
std::string param(argv[i]);
|
||||||
|
if(param == "-no-gui")
|
||||||
|
{
|
||||||
|
this->no_gui = true;
|
||||||
|
}
|
||||||
|
if(param == "-game")
|
||||||
|
{
|
||||||
|
this->game = argv[i+1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ShadowApplication::~ShadowApplication()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowApplication::loadGame(){
|
||||||
|
if(game.empty())
|
||||||
|
return;
|
||||||
|
|
||||||
|
void (*gameInti)(ShadowApplication*);
|
||||||
|
|
||||||
|
try {
|
||||||
|
gameLib = new dylib("./", game);
|
||||||
|
|
||||||
|
gameInti = gameLib->get_function<void(ShadowApplication*)>("shadow_main");
|
||||||
|
|
||||||
|
gameInti(this);
|
||||||
|
}
|
||||||
|
catch (std::exception& e) {
|
||||||
|
spdlog::error(e.what());
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowApplication::Init()
|
||||||
|
{
|
||||||
|
spdlog::info("Starting Shadow Engine!");
|
||||||
|
|
||||||
|
loadGame();
|
||||||
|
|
||||||
|
printf("exe side: %p \n", VulkanManager::getInstance());
|
||||||
|
printf("exe next ID: %llu \n", ShadowEngine::SHObject::GenerateId());
|
||||||
|
|
||||||
|
moduleManager.PushModule(std::make_shared<SDL2Module>(),"core");
|
||||||
|
moduleManager.PushModule(std::make_shared<Debug::DebugModule>(), "core");
|
||||||
|
|
||||||
|
moduleManager.Init();
|
||||||
|
|
||||||
|
auto sdl2module = moduleManager.GetModuleByType<SDL2Module>();
|
||||||
|
|
||||||
|
window_ = sdl2module->_window;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShadowApplication::Start()
|
||||||
|
{
|
||||||
|
SDL_Event event;
|
||||||
|
while (running)
|
||||||
|
{
|
||||||
|
while (SDL_PollEvent(&event)) { // poll until all events are handled!
|
||||||
|
moduleManager.Event(&event);
|
||||||
|
if (event.type == SDL_QUIT)
|
||||||
|
running = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
moduleManager.Update();
|
||||||
|
moduleManager.PreRender();
|
||||||
|
|
||||||
|
VulkanManager::getInstance()->startDraw();
|
||||||
|
moduleManager.Render();
|
||||||
|
|
||||||
|
moduleManager.LateRender();
|
||||||
|
VulkanManager::getInstance()->endDraw();
|
||||||
|
|
||||||
|
moduleManager.AfterFrameEnd();
|
||||||
|
}
|
||||||
|
|
||||||
|
moduleManager.Destroy();
|
||||||
|
|
||||||
|
delete gameLib;
|
||||||
|
}
|
||||||
|
|
||||||
|
ShadowApplication& ShadowApplication::Get() { return *instance; };
|
||||||
|
}
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
#include "ShadowWindow.h"
|
#include "core/ShadowWindow.h"
|
||||||
|
#include "spdlog/spdlog.h"
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
ShadowWindow::ShadowWindow(int W, int H) : Height(H), Width(W)
|
ShadowEngine::ShadowWindow::ShadowWindow(int W, int H) : Height(H), Width(W)
|
||||||
{
|
{
|
||||||
// Create our window
|
// Create our window
|
||||||
sdlWindowPtr = SDL_CreateWindow( "Candlefire", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, Width, Height, SDL_WINDOW_SHOWN | SDL_WINDOW_VULKAN );
|
sdlWindowPtr = SDL_CreateWindow( "Candlefire", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, Width, Height, SDL_WINDOW_SHOWN | SDL_WINDOW_VULKAN );
|
||||||
|
|
@ -9,11 +11,11 @@ ShadowWindow::ShadowWindow(int W, int H) : Height(H), Width(W)
|
||||||
// Make sure creating the window succeeded
|
// Make sure creating the window succeeded
|
||||||
if ( !sdlWindowPtr ) {
|
if ( !sdlWindowPtr ) {
|
||||||
//Raise an error in the log
|
//Raise an error in the log
|
||||||
//std::cout << "Error creating window: " << SDL_GetError() << std::endl;
|
spdlog::error("Error creating window: " + std::string(SDL_GetError()));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ShadowWindow::~ShadowWindow()
|
ShadowEngine::ShadowWindow::~ShadowWindow()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#include "Time.h"
|
#include "core/Time.h"
|
||||||
//#include <SDL_hints.h>
|
//#include <SDL_hints.h>
|
||||||
//#include <SDL.h>
|
//#include <SDL.h>
|
||||||
|
|
||||||
37
projs/shadow/shadow-engine/core/src/debug/DebugModule.cpp
Normal file
37
projs/shadow/shadow-engine/core/src/debug/DebugModule.cpp
Normal file
|
|
@ -0,0 +1,37 @@
|
||||||
|
//
|
||||||
|
// Created by dpete on 31/08/2022.
|
||||||
|
//
|
||||||
|
|
||||||
|
#include "debug/DebugModule.h"
|
||||||
|
#include "imgui.h"
|
||||||
|
#include "core/Time.h"
|
||||||
|
#include "core/ModuleManager.h"
|
||||||
|
|
||||||
|
SHObject_Base_Impl(ShadowEngine::Debug::DebugModule)
|
||||||
|
|
||||||
|
void ShadowEngine::Debug::DebugModule::Render() {
|
||||||
|
|
||||||
|
ImGui::Begin("Time", &active, ImGuiWindowFlags_MenuBar);
|
||||||
|
|
||||||
|
ImGui::Text("delta time in ms: %lf", Time::deltaTime_ms);
|
||||||
|
ImGui::Text("delta time in s: %lf", Time::deltaTime);
|
||||||
|
ImGui::Text("LAST time in: %ld", Time::LAST);
|
||||||
|
|
||||||
|
ImGui::End();
|
||||||
|
|
||||||
|
ImGui::Begin("Active Modules", &active, ImGuiWindowFlags_MenuBar);
|
||||||
|
|
||||||
|
ShadowEngine::ModuleManager* m = ShadowEngine::ModuleManager::instance;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ImGui::TextColored(ImVec4(1.0f, 1.0f, 0.4f, 1.0f), "Active Modules:");
|
||||||
|
for (auto& module : m->modules)
|
||||||
|
{
|
||||||
|
ImGui::Text("%s", module.module->GetName().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ImGui::End();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
|
||||||
# Set up Catch2 testing
|
# Set up Catch2 testing
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
|
list(APPEND CMAKE_MODULE_PATH "cmake")
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
||||||
# Set up asset sourceset
|
# Set up asset sourceset
|
||||||
|
|
@ -85,6 +85,6 @@ endfunction()
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
set(_CATCH_DISCOVER_TESTS_SCRIPT
|
set(_CATCH_DISCOVER_TESTS_SCRIPT
|
||||||
${CMAKE_CURRENT_LIST_DIR}/CatchAddTests.cmake
|
CatchAddTests.cmake
|
||||||
CACHE INTERNAL "Catch2 full path to CatchAddTests.cmake helper file"
|
CACHE INTERNAL "Catch2 full path to CatchAddTests.cmake helper file"
|
||||||
)
|
)
|
||||||
|
|
@ -2,6 +2,8 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <typeinfo>
|
#include <typeinfo>
|
||||||
|
|
||||||
|
#include "exports.h"
|
||||||
|
|
||||||
namespace ShadowEngine {
|
namespace ShadowEngine {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -18,16 +20,12 @@ namespace ShadowEngine {
|
||||||
*/
|
*/
|
||||||
class SHObject
|
class SHObject
|
||||||
{
|
{
|
||||||
protected:
|
public:
|
||||||
/**
|
/**
|
||||||
* \brief Generates a new UID for each call
|
* \brief Generates a new UID for each call
|
||||||
* \return the next Unique ID that was just generated
|
* \return the next Unique ID that was just generated
|
||||||
*/
|
*/
|
||||||
static uint64_t GenerateId() noexcept
|
SH_EXPORT static uint64_t GenerateId() noexcept;
|
||||||
{
|
|
||||||
static uint64_t count = 0;
|
|
||||||
return ++count;
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
|
|
@ -51,10 +49,13 @@ namespace ShadowEngine {
|
||||||
*/
|
*/
|
||||||
#define SHObject_Base(type) \
|
#define SHObject_Base(type) \
|
||||||
public: \
|
public: \
|
||||||
static const std::string& Type() { static const std::string t = typeid(type).name(); return t; } \
|
static const std::string& Type(); \
|
||||||
static uint64_t TypeId() { static const uint64_t id = GenerateId(); return id; } \
|
static uint64_t TypeId(); \
|
||||||
const std::string& GetType() const override { return Type(); } \
|
const std::string& GetType() const override { return Type(); } \
|
||||||
const uint64_t GetTypeId() const override { return type::TypeId(); } \
|
const uint64_t GetTypeId() const override { return type::TypeId(); } \
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
#define SHObject_Base_Impl(type) \
|
||||||
|
const std::string& type::Type() { static const std::string t = typeid(type).name(); return t; } \
|
||||||
|
uint64_t type::TypeId() { static const uint64_t id = GenerateId(); return id; }
|
||||||
}
|
}
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
#include "../inc/SHObject.h"
|
||||||
|
|
||||||
|
uint64_t ShadowEngine::SHObject::GenerateId() noexcept {
|
||||||
|
static uint64_t count = 0;
|
||||||
|
return ++count;
|
||||||
|
}
|
||||||
|
|
@ -28,12 +28,22 @@ void RenderPass::createVertexRenderPass(VkFormat format) {
|
||||||
subpass.pColorAttachments = &colorReference;
|
subpass.pColorAttachments = &colorReference;
|
||||||
|
|
||||||
// Prepare the Render Pass for creation
|
// Prepare the Render Pass for creation
|
||||||
|
VkSubpassDependency dependency = {};
|
||||||
|
dependency.srcSubpass = VK_SUBPASS_EXTERNAL;
|
||||||
|
dependency.dstSubpass = 0;
|
||||||
|
dependency.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
|
||||||
|
dependency.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
|
||||||
|
dependency.srcAccessMask = 0;
|
||||||
|
dependency.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
|
||||||
|
|
||||||
std::array<VkAttachmentDescription, 1> attachments = { color };
|
std::array<VkAttachmentDescription, 1> attachments = { color };
|
||||||
VkRenderPassCreateInfo createInfo = {};
|
VkRenderPassCreateInfo createInfo = {};
|
||||||
createInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
|
createInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
|
||||||
createInfo.attachmentCount = static_cast<uint32_t>(attachments.size());
|
createInfo.attachmentCount = static_cast<uint32_t>(attachments.size());
|
||||||
createInfo.pAttachments = attachments.data();
|
createInfo.pAttachments = attachments.data();
|
||||||
createInfo.subpassCount = 1;
|
createInfo.subpassCount = 1;
|
||||||
|
createInfo.dependencyCount = 1;
|
||||||
|
createInfo.pDependencies = &dependency;
|
||||||
createInfo.pSubpasses = &subpass;
|
createInfo.pSubpasses = &subpass;
|
||||||
|
|
||||||
// Create the Render Pass
|
// Create the Render Pass
|
||||||
|
|
@ -57,16 +57,17 @@ std::vector<const char*> ValidationAndExtension::getRequiredExtensions(SDL_Windo
|
||||||
}
|
}
|
||||||
|
|
||||||
static VKAPI_ATTR VkBool32 VKAPI_CALL debugCallback(
|
static VKAPI_ATTR VkBool32 VKAPI_CALL debugCallback(
|
||||||
VkDebugReportFlagsEXT flags,
|
VkDebugReportFlagsEXT flags,
|
||||||
VkDebugReportObjectTypeEXT objExt,
|
VkDebugReportObjectTypeEXT objectType,
|
||||||
size_t obj,
|
uint64_t object,
|
||||||
size_t location,
|
size_t location,
|
||||||
int32_t code,
|
int32_t messageCode,
|
||||||
const char* layer,
|
const char* pLayerPrefix,
|
||||||
const char* message,
|
const char* pMessage,
|
||||||
void* user) {
|
void* pUserData
|
||||||
|
) {
|
||||||
|
|
||||||
std::cerr << "Validation from layer " << layer << ": " << message << std::endl;
|
std::cerr << "Validation from layer " << pLayerPrefix << ": " << pMessage << std::endl;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
//
|
|
||||||
// Created by dpete on 2022-07-06.
|
|
||||||
//
|
|
||||||
|
|
||||||
#include "Module.h"
|
|
||||||
|
|
||||||
namespace ShadowEngine {
|
|
||||||
} // ShadowEngine
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
//
|
|
||||||
// Created by dpete on 2022-07-06.
|
|
||||||
//
|
|
||||||
|
|
||||||
#include "ModuleManager.h"
|
|
||||||
|
|
@ -1,230 +0,0 @@
|
||||||
#include "ShadowApplication.h"
|
|
||||||
|
|
||||||
#include "Time.h"
|
|
||||||
#include "imgui.h"
|
|
||||||
#include "imgui_impl_vulkan.h"
|
|
||||||
#include "imgui_impl_sdl.h"
|
|
||||||
#include <vlkx/vulkan/VulkanManager.h>
|
|
||||||
#include <vlkx/render/Camera.h>
|
|
||||||
#include <vlkx/render/geometry/SingleRenderer.h>
|
|
||||||
#include "spdlog/spdlog.h"
|
|
||||||
|
|
||||||
#define CATCH(x) \
|
|
||||||
try { x } catch (std::exception& e) { spdlog::error(e.what()); exit(0); }
|
|
||||||
|
|
||||||
namespace ShadowEngine {
|
|
||||||
|
|
||||||
// Create the renderer
|
|
||||||
SingleRenderer object;
|
|
||||||
|
|
||||||
|
|
||||||
ShadowApplication* ShadowApplication::instance = nullptr;
|
|
||||||
|
|
||||||
ShadowApplication::ShadowApplication(int argc, char* argv[])
|
|
||||||
{
|
|
||||||
instance = this;
|
|
||||||
|
|
||||||
if(argc > 1)
|
|
||||||
{
|
|
||||||
for (size_t i = 0; i < argc; i++)
|
|
||||||
{
|
|
||||||
std::string param(argv[i]);
|
|
||||||
if(param == "-no-gui")
|
|
||||||
{
|
|
||||||
this->no_gui = true;
|
|
||||||
}
|
|
||||||
if(param == "-game")
|
|
||||||
{
|
|
||||||
this->game = argv[i+1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//game = _setupFunc();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ShadowApplication::~ShadowApplication()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ShadowApplication::Init()
|
|
||||||
{
|
|
||||||
// Initialize SDL. SDL_Init will return -1 if it fails.
|
|
||||||
if ( SDL_Init( SDL_INIT_EVERYTHING ) < 0 ) {
|
|
||||||
//std::cout << "Error initializing SDL: " << SDL_GetError() << std::endl;
|
|
||||||
//system("pause");
|
|
||||||
// End the program
|
|
||||||
//return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
window_ = new ShadowWindow(800,450);
|
|
||||||
|
|
||||||
CATCH(VulkanManager::getInstance()->initVulkan(window_->sdlWindowPtr);)
|
|
||||||
|
|
||||||
IMGUI_CHECKVERSION();
|
|
||||||
ImGui::CreateContext();
|
|
||||||
ImGuiIO& io = ImGui::GetIO(); (void)io;
|
|
||||||
|
|
||||||
// Setup Dear ImGui style
|
|
||||||
ImGui::StyleColorsDark();
|
|
||||||
|
|
||||||
|
|
||||||
VkDescriptorPool imGuiPool;
|
|
||||||
VulkanManager* vk = VulkanManager::getInstance();
|
|
||||||
VkDescriptorPoolSize pool_sizes[] =
|
|
||||||
{
|
|
||||||
{ VK_DESCRIPTOR_TYPE_SAMPLER, 1000 },
|
|
||||||
{ VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1000 },
|
|
||||||
{ VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1000 },
|
|
||||||
{ VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1000 },
|
|
||||||
{ VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1000 },
|
|
||||||
{ VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1000 },
|
|
||||||
{ VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1000 },
|
|
||||||
{ VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1000 },
|
|
||||||
{ VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1000 },
|
|
||||||
{ VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, 1000 },
|
|
||||||
{ VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT, 1000 }
|
|
||||||
};
|
|
||||||
|
|
||||||
VkDescriptorPoolCreateInfo pool_info = {};
|
|
||||||
pool_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
|
|
||||||
pool_info.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT;
|
|
||||||
pool_info.maxSets = 1000 * IM_ARRAYSIZE(pool_sizes);
|
|
||||||
pool_info.poolSizeCount = (uint32_t)IM_ARRAYSIZE(pool_sizes);
|
|
||||||
pool_info.pPoolSizes = pool_sizes;
|
|
||||||
vkCreateDescriptorPool(vk->getDevice()->logical, &pool_info, VK_NULL_HANDLE, &imGuiPool);
|
|
||||||
|
|
||||||
// Setup Platform/Renderer backends
|
|
||||||
ImGui_ImplSDL2_InitForVulkan(window_->sdlWindowPtr);
|
|
||||||
ImGui_ImplVulkan_InitInfo init_info = {};
|
|
||||||
init_info.Instance = vk->getVulkan();
|
|
||||||
init_info.PhysicalDevice = vk->getDevice()->physical;
|
|
||||||
init_info.Device = vk->getDevice()->logical;
|
|
||||||
init_info.QueueFamily = vk->getDevice()->queueData.graphics;
|
|
||||||
init_info.Queue = vk->getDevice()->graphicsQueue;
|
|
||||||
init_info.PipelineCache = VK_NULL_HANDLE;
|
|
||||||
init_info.DescriptorPool = imGuiPool;
|
|
||||||
init_info.Subpass = 0;
|
|
||||||
init_info.MinImageCount = vk->getSwapchain()->images.size();
|
|
||||||
init_info.ImageCount = vk->getSwapchain()->images.size();
|
|
||||||
init_info.MSAASamples = VK_SAMPLE_COUNT_1_BIT;
|
|
||||||
init_info.Allocator = VK_NULL_HANDLE;
|
|
||||||
init_info.CheckVkResultFn = nullptr;
|
|
||||||
ImGui_ImplVulkan_Init(&init_info, vk->getRenderPass()->pass);
|
|
||||||
|
|
||||||
// Load Fonts
|
|
||||||
// - If no fonts are loaded, dear imgui will use the default font. You can also load multiple fonts and use ImGui::PushFont()/PopFont() to select them.
|
|
||||||
// - AddFontFromFileTTF() will return the ImFont* so you can store it if you need to select the font among multiple.
|
|
||||||
// - If the file cannot be loaded, the function will return NULL. Please handle those errors in your application (e.g. use an assertion, or display an error and quit).
|
|
||||||
// - The fonts will be rasterized at a given size (w/ oversampling) and stored into a texture when calling ImFontAtlas::Build()/GetTexDataAsXXXX(), which ImGui_ImplXXXX_NewFrame below will call.
|
|
||||||
// - Read 'docs/FONTS.md' for more instructions and details.
|
|
||||||
// - Remember that in C/C++ if you want to include a backslash \ in a string literal you need to write a double backslash \\ !
|
|
||||||
//io.Fonts->AddFontDefault();
|
|
||||||
//io.Fonts->AddFontFromFileTTF("../../misc/fonts/Roboto-Medium.ttf", 16.0f);
|
|
||||||
//io.Fonts->AddFontFromFileTTF("../../misc/fonts/Cousine-Regular.ttf", 15.0f);
|
|
||||||
//io.Fonts->AddFontFromFileTTF("../../misc/fonts/DroidSans.ttf", 16.0f);
|
|
||||||
//io.Fonts->AddFontFromFileTTF("../../misc/fonts/ProggyTiny.ttf", 10.0f);
|
|
||||||
//ImFont* font = io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, NULL, io.Fonts->GetGlyphRangesJapanese());
|
|
||||||
//IM_ASSERT(font != NULL);
|
|
||||||
|
|
||||||
// Upload Fonts
|
|
||||||
{
|
|
||||||
// Prepare to create a temporary command pool.
|
|
||||||
VkCommandPool pool;
|
|
||||||
VkCommandPoolCreateInfo poolCreateInfo = {};
|
|
||||||
poolCreateInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
|
|
||||||
poolCreateInfo.queueFamilyIndex = vk->getDevice()->queueData.graphics;
|
|
||||||
poolCreateInfo.flags = 0;
|
|
||||||
|
|
||||||
// Create the pool
|
|
||||||
if (vkCreateCommandPool(vk->getDevice()->logical, &poolCreateInfo, nullptr, &pool) != VK_SUCCESS)
|
|
||||||
throw std::runtime_error("Unable to allocate a temporary command pool");
|
|
||||||
|
|
||||||
VkCommandBuffer buffer = VkTools::createTempCommandBuffer(pool, vk->getDevice()->logical);
|
|
||||||
|
|
||||||
ImGui_ImplVulkan_CreateFontsTexture(buffer);
|
|
||||||
|
|
||||||
VkSubmitInfo end_info = {};
|
|
||||||
end_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
|
|
||||||
end_info.commandBufferCount = 1;
|
|
||||||
end_info.pCommandBuffers = &buffer;
|
|
||||||
|
|
||||||
VkTools::executeAndDeleteTempBuffer(buffer, pool, vk->getDevice()->graphicsQueue, vk->getDevice()->logical);
|
|
||||||
|
|
||||||
ImGui_ImplVulkan_DestroyFontUploadObjects();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
moduleManager.PushModule(new Log());
|
|
||||||
moduleManager.PushModule(new EventSystem::ShadowEventManager());
|
|
||||||
moduleManager.PushModule(new SDLPlatform::SDLModule());
|
|
||||||
moduleManager.PushModule(new Rendering::Renderer());
|
|
||||||
|
|
||||||
moduleManager.PushModule(new Assets::AssetManager());
|
|
||||||
|
|
||||||
if(!no_gui)
|
|
||||||
moduleManager.PushModule(new DebugGui::ImGuiModule());
|
|
||||||
|
|
||||||
moduleManager.PushModule(new InputSystem::ShadowActionSystem());
|
|
||||||
//moduleManager.PushModule(new Debug::DebugModule());
|
|
||||||
moduleManager.PushModule(new EntitySystem::EntitySystem());
|
|
||||||
|
|
||||||
|
|
||||||
game->Init();
|
|
||||||
|
|
||||||
moduleManager.Init();
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
void ShadowApplication::Start()
|
|
||||||
{
|
|
||||||
CATCH(object.createSingleRenderer(Geo::MeshType::Cube, glm::vec3(-1, 0, -1), glm::vec3(0.5));)
|
|
||||||
|
|
||||||
// Create the camera
|
|
||||||
Camera camera {};
|
|
||||||
camera.init(45, 1280, 720, 0.1, 10000);
|
|
||||||
camera.setPosition(glm::vec3(0, 0, 4));
|
|
||||||
|
|
||||||
SDL_Event event;
|
|
||||||
while (running)
|
|
||||||
{
|
|
||||||
while (SDL_PollEvent(&event)) { // poll until all events are handled!
|
|
||||||
ImGui_ImplSDL2_ProcessEvent(&event);
|
|
||||||
if (event.type == SDL_QUIT)
|
|
||||||
running = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
object.setRotation(glm::rotate(object.getRotation(), (float) 0.5, glm::vec3(1, 0, 0)));
|
|
||||||
|
|
||||||
VulkanManager::getInstance()->startDraw();
|
|
||||||
ImGui_ImplVulkan_NewFrame();
|
|
||||||
ImGui_ImplSDL2_NewFrame();
|
|
||||||
ImGui::NewFrame();
|
|
||||||
|
|
||||||
/** START OF RENDER AREA */
|
|
||||||
/** PUT CODE HERE TO MAKE IT SHOW ON SCREEN */
|
|
||||||
CATCH(object.updateUniforms(camera);)
|
|
||||||
CATCH(object.draw();)
|
|
||||||
|
|
||||||
bool showDemo = true;
|
|
||||||
if (showDemo)
|
|
||||||
ImGui::ShowDemoWindow(&showDemo);
|
|
||||||
/** END OF RENDER AREA */
|
|
||||||
/** CODE AFTER HERE WILL NOT BE SHOWN ON SCREEN */
|
|
||||||
ImGui::Render();
|
|
||||||
ImGui_ImplVulkan_RenderDrawData(ImGui::GetDrawData(), VulkanManager::getInstance()->getCurrentCommandBuffer());
|
|
||||||
VulkanManager::getInstance()->endDraw();
|
|
||||||
|
|
||||||
|
|
||||||
Time::UpdateTime();
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui_ImplVulkan_Shutdown();
|
|
||||||
ImGui_ImplSDL2_Shutdown();
|
|
||||||
ImGui::DestroyContext();
|
|
||||||
|
|
||||||
SDL_DestroyWindow(window_->sdlWindowPtr);
|
|
||||||
SDL_Quit();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <SDL.h>
|
|
||||||
|
|
||||||
class ShadowWindow
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
int Height;
|
|
||||||
int Width;
|
|
||||||
|
|
||||||
SDL_Window* sdlWindowPtr;
|
|
||||||
|
|
||||||
SDL_Surface* sdlSurface = NULL;
|
|
||||||
|
|
||||||
|
|
||||||
//ShadowEngine::Ref<ShadowEngine::Rendering::GraphicsContext> context;
|
|
||||||
|
|
||||||
ShadowWindow(int W, int H);
|
|
||||||
|
|
||||||
~ShadowWindow();
|
|
||||||
};
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
|
||||||
include_directories(${SDL2_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
FILE(GLOB_RECURSE SOURCES src/*.cpp src/*.h)
|
|
||||||
|
|
||||||
add_library(shadow-reflect ${SOURCES})
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
#include "SHObject.h"
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
|
||||||
find_package(Vulkan REQUIRED)
|
|
||||||
find_package(SDL2 REQUIRED)
|
|
||||||
|
|
||||||
FILE(GLOB_RECURSE SOURCES src/*.cpp inc/*.h)
|
|
||||||
|
|
||||||
add_library(renderer ${SOURCES})
|
|
||||||
|
|
||||||
target_include_directories(renderer PRIVATE ${SDL2_INCLUDE_DIRS} PUBLIC inc ${glm_SOURCE_DIR})
|
|
||||||
target_link_libraries(renderer PRIVATE SDL2::Main Vulkan::Vulkan spdlog::spdlog)
|
|
||||||
|
|
@ -1,9 +1,20 @@
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
find_package(SDL2 REQUIRED)
|
find_package(SDL2 CONFIG REQUIRED)
|
||||||
|
|
||||||
FILE(GLOB_RECURSE SOURCES src/*.cpp src/*.h)
|
FILE(GLOB_RECURSE SOURCES src/*.cpp src/*.h)
|
||||||
|
|
||||||
add_executable(shadow-runtime ${SOURCES})
|
add_executable(shadow-runtime ${SOURCES})
|
||||||
|
|
||||||
target_include_directories(shadow-runtime PRIVATE ${SDL2_INCLUDE_DIRS})
|
target_include_directories(shadow-runtime PRIVATE ${SDL2_INCLUDE_DIRS})
|
||||||
target_link_libraries(shadow-runtime PRIVATE SDL2::Main shadow-engine)
|
target_link_libraries(shadow-runtime PRIVATE SDL2::SDL2main PUBLIC shadow-engine)
|
||||||
|
|
||||||
|
|
||||||
|
add_custom_command(TARGET shadow-runtime POST_BUILD
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:shadow-runtime> $<TARGET_FILE_DIR:shadow-runtime>
|
||||||
|
COMMAND_EXPAND_LISTS
|
||||||
|
)
|
||||||
|
|
||||||
|
add_custom_command(TARGET shadow-runtime
|
||||||
|
POST_BUILD
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/vlkx-resources ${CMAKE_CURRENT_BINARY_DIR}/vlkx-resources
|
||||||
|
)
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#include "../../shadow-engine/src/core/ShadowApplication.h"
|
#include "core/ShadowApplication.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
|
||||||
BIN
projs/shadow/shadow-runtime/vlkx-resources/pkg/01 - Copy.vxp
Normal file
BIN
projs/shadow/shadow-runtime/vlkx-resources/pkg/01 - Copy.vxp
Normal file
Binary file not shown.
BIN
projs/shadow/shadow-runtime/vlkx-resources/pkg/01.vxp
Normal file
BIN
projs/shadow/shadow-runtime/vlkx-resources/pkg/01.vxp
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user