ouczbs/idk_me
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update project

Browse Source
This commit is contained in:
ouczbs 2024-05-07 22:05:07 +08:00
parent 6edf52aae5
commit 074876173c
16 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -9,3 +9,8 @@ vsxmake*/
engine/logs/zengine.log
tools/
src/engine/UnitTests/
src/engine/wrapper/
src/engine/scripts/
x64/
src/engine/idk/phys/PhysicsSystemNoMT.cpp

2
src/3rdparty/xmake.lua vendored
View File

@ -1,5 +1,5 @@
--includes("*/xmake.lua")
add_requires("gtest")
add_requires("vulkansdk","imgui")
add_requires("vulkansdk","spirv-tools")
add_requires("glfw")
add_requires("assimp","freetype","glad","glslang","spirv-cross","stb")

2
src/engine/asset_compiler/asset_compiler.vcxproj
View File

@ -190,7 +190,7 @@ if %errorlevel% NEQ 0 exit /b %errorlevel%</Command>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>assimp-vc142-mt.lib;coreD.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>assimp-vc142-mt.lib;coreD.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions> /ignore:4099 %(AdditionalOptions)</AdditionalOptions>
</Link>
<CustomBuildStep>

2
src/engine/editor/IDE.h
View File

@ -21,7 +21,7 @@ Accessible through Core::GetSystem<IDE>() [#include <IDE.h>]
#include <editor/commands/CommandController.h>
#include <editor/Registry.h>
#include <editor/ObjectSelection.h>
#include "windows/IGE_IWindow.h"
#undef FindWindow
namespace idk

1
src/engine/editor/windows/IGE_GfxDebugWindow.cpp
View File

@ -18,6 +18,7 @@
#include <vkn/VulkanWin32GraphicsSystem.h>
#include <vkn/time_log.h>
#include <res/ResourceUtils.inl>
//#pragma optimize("",off)
namespace idk

2
src/engine/game/game.vcxproj
View File

@ -152,7 +152,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);coreD.lib;win32D.lib;vulkanD.lib;idk_openglD.lib;editorD.lib</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);coreD.lib;win32D.lib;vulkanD.lib;idk_openglD.lib;editorD.lib;glslangd.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4006 /ignore:4075 /ignore:4099 %(AdditionalOptions)</AdditionalOptions>

2
src/engine/idk/IDK.vcxproj
View File

@ -819,7 +819,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4201; 4505</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)dep\include\;%VULKAN_SDK%\Include\</AdditionalIncludeDirectories>

2
src/engine/idk/network/MessageStream.h
View File

@ -5,7 +5,7 @@ namespace idk
{
namespace detail
{
;;inline consteval int bits_required(int32_t min, int32_t max)
inline consteval int bits_required(int32_t min, int32_t max)
{
uint32_t val = max - min;
int ret = 0;

2
src/engine/idk/res/ResourceHandle.inl
View File

@ -2,10 +2,10 @@
#include <type_traits>
#include <res/Resource.h>
#include <res/ResourceUtils.inl>
#include <res/ResourceManager.inl>
#include <math/comparable.inl>
#include <res/Guid.inl>
namespace idk
{
template<typename Res>

7
src/engine/idk/res/ResourceUtils.inl
View File

@ -38,4 +38,11 @@ namespace idk
template<typename T> struct ResourceFinder<T, false> : Baseresource_finder<T, 0> {};
template<typename T> struct ResourceFinder<T, true> : RawResourceFinder<T> {};
}
template<typename Res>
struct BaseResource
{
using type = typename detail::ResourceFinder<Res>::type;
static constexpr auto value = detail::ResourceFinder<Res>::value;
};
}

2
src/engine/launcher/launcher.vcxproj
View File

@ -205,7 +205,7 @@ if %errorlevel% NEQ 0 exit /b %errorlevel%</Command>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;SPIRV-Toolsd.lib;OGLCompilerd.lib;SPIRVd.lib;OSDependentd.lib;glslangd.lib;shaderc_utild.lib;shadercd.lib;vulkan-1.lib;win32D.lib;dspirv-cross-reflect.lib;dspirv-cross-glsl.lib;dspirv-cross-cpp.lib;dspirv-cross-core.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions> /ignore:4099 %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>

2
src/engine/opengl/idk_opengl.vcxproj
View File

@ -220,7 +220,7 @@
<PreprocessorDefinitions>_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>$(SolutionDir)projects\idk\;$(SolutionDir)projects\;$(SolutionDir)dep\include\;$(SolutionDir)projects\win32\</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)projects\idk\;$(SolutionDir)projects\;$(SolutionDir)dep\include\;$(SolutionDir)projects\win32\;$(SolutionDir)projects\editorstatic\</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
<EnablePREfast>false</EnablePREfast>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>

1
src/engine/opengl/system/OpenGLGraphicsSystem.cpp
View File

@ -1,6 +1,7 @@
#include "pch.h"
#include <glad/glad.h>
#include <glad/glad_wgl.h>
#include <core/Core.h>
#include <res/EasyFactory.h>
#include <res/ResourceManager.inl>

11
src/engine/vkn/utils/utils.inl
View File

@ -71,11 +71,6 @@ namespace idk::vkn::meta
{
static constexpr T value= front;
};
template<size_t N, typename T, T ...Args>
struct Count<N,T,Args...>
{
//static_assert(false, "Count out of bounds!");
};
@ -316,7 +311,11 @@ namespace idk::vkn::meta
template<size_t N, typename ...Args, template<typename...> typename tuple>
struct Cull<N, tuple<Args...>>
{
using seq_t = std::make_index_sequence<std::min(N, sizeof...(Args))>;
consteval static size_t MinSize() {
constexpr size_t M = sizeof...(Args);
return M > N ? N : M;
}
using seq_t = std::make_index_sequence<MinSize()>;
using type = typename detail::shuffle<seq_t, tuple<Args...>>::type;
};

4
src/engine/win32/WindowsApplication.cpp
View File

@ -317,8 +317,8 @@ namespace idk::win
void Windows::SetTitle(string_view new_title)
{
//std::wstring wide_str{ new_title.begin(), new_title.end() };
SetWindowText(hWnd, new_title.data());
std::wstring wide_str{ new_title.begin(), new_title.end() };
SetWindowText(hWnd, wide_str.data());
}
string Windows::GetExecutableDir()
{

2
src/xmake.lua
View File

@ -25,7 +25,7 @@ target("asset_compiler")
target("editor")
set_kind("binary")
add_deps("idk","vkn","editorstatic")
add_packages("vulkansdk","imgui")
add_packages("vulkansdk")
add_syslinks("Shell32")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])
add_defines([[TEST_BIN_DIR=R"($(OutDir))"]])