Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Before building, make sure your setup is correct :
- Install [Python](https://www.python.org/ftp/python/3.12.4/python-3.12.4-amd64.exe)
- Install [CMake](https://cmake.org/download/) 3.20 or later.
- Install [DOTNET SDK 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) as a VS Build Tool component (if using a standalone implementation, you might need to create a symlink between your custom installation location and the expected location: `C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Sdks\Microsoft.NET.Sdk\Sdk`)
- Install [LLVM](https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/LLVM-18.1.8-win64.exe)
- Install [LLVM](https://github.com/llvm/llvm-project/releases/download/llvmorg-20.1.7/LLVM-20.1.7-win64.exe)


### Setup macOS machine
Expand Down Expand Up @@ -59,7 +59,7 @@ Before building, make sure your setup is correct :
- Install ClangFormat through Homebrew:
```bash
brew update
brew install clang-format@18
brew install llvm@20
```

## Building the engine & launcher
Expand Down
15 changes: 10 additions & 5 deletions ZEngine/ZEngine/Logging/Logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ namespace ZEngine::Logging
auto handlers_view = handlers.view();
for (const auto& handler : handlers_view)
{
handler.second(LogMessage{
handler.second(
LogMessage{
.Color = {0.0f, 1.0f, 0.0f, 1.0f},
.Message = msg
});
Expand All @@ -89,7 +90,8 @@ namespace ZEngine::Logging
auto handlers_view = handlers.view();
for (const auto& handler : handlers_view)
{
handler.second(LogMessage{
handler.second(
LogMessage{
.Color = {0.5f, 0.5f, 0.5f, 1.0f},
.Message = msg
});
Expand All @@ -112,7 +114,8 @@ namespace ZEngine::Logging
auto handlers_view = handlers.view();
for (const auto& handler : handlers_view)
{
handler.second(LogMessage{
handler.second(
LogMessage{
.Color = {1.0f, 0.5f, 0.0f, 1.0f},
.Message = msg
});
Expand All @@ -135,7 +138,8 @@ namespace ZEngine::Logging
auto handlers_view = handlers.view();
for (const auto& handler : handlers_view)
{
handler.second(LogMessage{
handler.second(
LogMessage{
.Color = {1.0f, 0.0f, 0.0f, 1.0f},
.Message = msg
});
Expand All @@ -158,7 +162,8 @@ namespace ZEngine::Logging
auto handlers_view = handlers.view();
for (const auto& handler : handlers_view)
{
handler.second(LogMessage{
handler.second(
LogMessage{
.Color = {1.0f, 0.0f, 1.0f, 1.0f},
.Message = msg
});
Expand Down
2 changes: 1 addition & 1 deletion ZEngine/ZEngine/ZEngineDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
if (!(condition)) \
{ \
ZENGINE_CORE_CRITICAL(message) \
assert(condition&& message); \
assert(condition && message); \
ZENGINE_DEBUG_BREAK() \
} \
}
Expand Down
4 changes: 2 additions & 2 deletions repoConfiguration.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"Url": "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
},
"LLVM": {
"Version": "18.1.8",
"MaximumVersion": "18.2.1"
"Version": "20.1.7",
"MaximumVersion": "20.2.0"
}
}
}