Now using interpolation strings

This commit is contained in:
Simon Lübeß
2020-12-01 19:29:14 +01:00
parent 6e2c801265
commit e7464118d6
8 changed files with 22 additions and 15 deletions
@@ -86,7 +86,7 @@ namespace GlitchyEngine.Renderer
var result = _context.nativeDevice.CreateBuffer(ref nativeDescription, &srData, &nativeBuffer);
if(result.Failed)
{
Log.EngineLogger.Error("Failed to create buffer. Message({}):{}", (int)result, result);
Log.EngineLogger.Error($"Failed to create buffer. Message({(int)result}):{result}");
return .Err;
}
@@ -120,7 +120,7 @@ namespace GlitchyEngine.Renderer
Log.EngineLogger.Error("Can't set the data of an immutable resource.");
return .Err;
default:
Log.EngineLogger.Error("Unknown resource usage: engine={}, native={}", _description.Usage, nativeDescription.Usage);
Log.EngineLogger.Error($"Unknown resource usage: engine={_description.Usage}, native={nativeDescription.Usage}");
return .Err;
}
@@ -88,7 +88,7 @@ namespace GlitchyEngine.Renderer
}
#endif
Log.EngineLogger.Trace("D3D11 Device and Context created (Feature level: {})", deviceLevel);
Log.EngineLogger.Trace($"D3D11 Device and Context created (Feature level: {deviceLevel})");
}
@@ -56,7 +56,7 @@ namespace GlitchyEngine.Renderer
var result = context.nativeDevice.CreateRasterizerState(ref nativeDescription, &nativeRasterizerState);
if(result.Failed)
{
Log.EngineLogger.Error("Failed to create rasterizer state. Message({}): {}", (int)result, result);
Log.EngineLogger.Error($"Failed to create rasterizer state. Message({(int)result}): {result}");
}
}
}
@@ -89,7 +89,7 @@ namespace GlitchyEngine.Renderer
*/
public void UpdateSwapchain()
{
Log.EngineLogger.Trace("Updating swap chain ({}, {})", _width, _height);
Log.EngineLogger.Trace($"Updating swap chain ({_width}, {_height})");
uint32 backBufferCount = 2;
Format backBufferFormat = .R8G8B8A8_UNorm;
@@ -100,7 +100,10 @@ namespace GlitchyEngine.Renderer
nativeBackBufferTarget.Release();
var resizeResult = nativeSwapChain.ResizeBuffers(backBufferCount, _width, _height, backBufferFormat, .None);
Debug.Assert(resizeResult.Succeeded, scope $"Failed to resize swap chain. Message({(int32)resizeResult}):{resizeResult}");
if(resizeResult.Failed)
{
Log.EngineLogger.Error($"Failed to resize swap chain. Message({(int)resizeResult}):{resizeResult}");
}
}
else
{
@@ -123,7 +126,10 @@ namespace GlitchyEngine.Renderer
fsSwapChainDesc.Windowed = true;
var createResult = factory.CreateSwapChainForHwnd((.)_context.nativeDevice, _context.nativeWindowHandle, ref swDesc, &fsSwapChainDesc, null, &nativeSwapChain);
Debug.Assert(createResult.Succeeded, scope $"Failed to create swap chain. Message({(int32)createResult}):{createResult}");
if(createResult.Failed)
{
Log.EngineLogger.Error($"Failed to create swap chain. Message({(int)createResult}):{createResult}");
}
factory.Release();
}
@@ -171,7 +171,7 @@ namespace GlitchyEngine
if(DirectX.Windows.Winuser.GetKeyboardState((uint8*)&CurrentState.KeyStates) == 0)
{
DirectX.Common.HResult errorCode = (.)GetLastError();
Log.EngineLogger.Error("Failed to get keyboard state. Message({}){}:", (int32)errorCode, errorCode);
Log.EngineLogger.Error($"Failed to get keyboard state. Message({(int32)errorCode}){errorCode}:");
}
// Get the current mouse position
@@ -181,13 +181,13 @@ namespace GlitchyEngine
if (ScreenToClient(windowHandle, ref CurrentState.CursorPosition) == 0)
{
DirectX.Common.HResult errorCode = (.)GetLastError();
Log.EngineLogger.Error("Failed to convert coordinates from screen to client space. Message({}){}:", (int32)errorCode, errorCode);
Log.EngineLogger.Error($"Failed to convert coordinates from screen to client space. Message({(int32)errorCode}){errorCode}:");
}
}
else
{
DirectX.Common.HResult errorCode = (.)GetLastError();
Log.EngineLogger.Error("Failed to get mouse position. Message({}){}:", (int32)errorCode, errorCode);
Log.EngineLogger.Error($"Failed to get mouse position. Message({(int32)errorCode}){errorCode}:");
}
// Calculate cursor movement
@@ -169,7 +169,7 @@ namespace GlitchyEngine
private void Init(WindowDescription desc)
{
Log.EngineLogger.Trace("Creating window \"{}\" ({}, {})...", desc.Title, desc.Width, desc.Height);
Log.EngineLogger.Trace($"Creating window \"{desc.Title}\" ({desc.Width}, {desc.Height})...");
_instanceHandle = (.)GetModuleHandleW(null);
@@ -189,7 +189,8 @@ namespace GlitchyEngine
if (RegisterClassExW(ref _windowClass) == 0)
{
Log.EngineLogger.Error("Failed to register window class.", (HResult)GetLastError());
uint32 lastError = GetLastError();
Log.EngineLogger.Error($"Failed to register window class. Message({(int)lastError}): {(HResult)lastError}");
Runtime.FatalError("Failed to register window class");
}
@@ -204,7 +205,7 @@ namespace GlitchyEngine
LoadWindowRectangle();
Log.EngineLogger.Trace("Created window \"{}\" ({}, {})", Title, Width, Height);
Log.EngineLogger.Trace($"Created window \"{Title}\" ({Width}, {Height})");
}
private bool _isResizingOrMoving;
+1 -1
View File
@@ -19,7 +19,7 @@ namespace GlitchyEngine
initWatch.Stop();
Log.EngineLogger.Info("Application initialized ({}ms).", initWatch.ElapsedMilliseconds);
Log.EngineLogger.Info($"Application initialized ({initWatch.ElapsedMilliseconds}ms).");
Log.EngineLogger.Info("Running App...");
app.Run();
+1 -1
View File
@@ -21,7 +21,7 @@ namespace Sandbox
public override void OnEvent(Event event)
{
Log.ClientLogger.Trace("{}", event);
Log.ClientLogger.Trace($"{event}");
EventDispatcher dispatcher = scope EventDispatcher(event);