ShibaGit/khaotic-engine-Reborn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Minor Update - Logger transformer en Singleton

Browse Source
This commit is contained in:
CatChow0
2024-04-12 17:59:44 +02:00
parent 3bc9eee3cc
commit 25f05fe217
52 changed files with 535 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
enginecustom/transparentshaderclass.cpp
View File

@@ -24,7 +24,7 @@ TransparentShaderClass::~TransparentShaderClass()
bool TransparentShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
{
logger.Log("Initializing TransparentShaderClass", __FILE__, __LINE__);
Logger::Get().Log("Initializing TransparentShaderClass", __FILE__, __LINE__);
bool result;
wchar_t vsFilename[128];
@@ -35,7 +35,7 @@ bool TransparentShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
error = wcscpy_s(vsFilename, 128, L"transparent.vs");
if (error != 0)
{
logger.Log("Failed to copy vertex shader filename", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to copy vertex shader filename", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
@@ -43,7 +43,7 @@ bool TransparentShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
error = wcscpy_s(psFilename, 128, L"transparent.ps");
if (error != 0)
{
logger.Log("Failed to copy pixel shader filename", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to copy pixel shader filename", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
@@ -51,11 +51,11 @@ bool TransparentShaderClass::Initialize(ID3D11Device* device, HWND hwnd)
result = InitializeShader(device, hwnd, vsFilename, psFilename);
if (!result)
{
logger.Log("Failed to initialize shader", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to initialize shader", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
logger.Log("TransparentShaderClass initialized", __FILE__, __LINE__);
Logger::Get().Log("TransparentShaderClass initialized", __FILE__, __LINE__);
return true;
}
@@ -79,7 +79,7 @@ bool TransparentShaderClass::Render(ID3D11DeviceContext* deviceContext, int inde
result = SetShaderParameters(deviceContext, worldMatrix, viewMatrix, projectionMatrix, texture, blend);
if (!result)
{
logger.Log("Failed to set shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to set shader parameters", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
@@ -92,7 +92,7 @@ bool TransparentShaderClass::Render(ID3D11DeviceContext* deviceContext, int inde
bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR* vsFilename, WCHAR* psFilename)
{
logger.Log("Initializing transparent shader", __FILE__, __LINE__);
Logger::Get().Log("Initializing transparent shader", __FILE__, __LINE__);
HRESULT result;
ID3D10Blob* errorMessage;
@@ -123,7 +123,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
// If there was nothing in the error message then it simply could not find the shader file itself.
else
{
logger.Log("Failed to compile vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to compile vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
}
return false;
@@ -142,7 +142,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
// If there was nothing in the error message then it simply could not find the file itself.
else
{
logger.Log("Failed to compile pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to compile pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
}
return false;
@@ -152,7 +152,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
result = device->CreateVertexShader(vertexShaderBuffer->GetBufferPointer(), vertexShaderBuffer->GetBufferSize(), NULL, &m_vertexShader);
if (FAILED(result))
{
logger.Log("Failed to create vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to create vertex shader", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
@@ -160,7 +160,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
result = device->CreatePixelShader(pixelShaderBuffer->GetBufferPointer(), pixelShaderBuffer->GetBufferSize(), NULL, &m_pixelShader);
if (FAILED(result))
{
logger.Log("Failed to create pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to create pixel shader", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
@@ -189,7 +189,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
vertexShaderBuffer->GetBufferSize(), &m_layout);
if (FAILED(result))
{
logger.Log("Failed to create input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to create input layout", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
@@ -212,7 +212,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
result = device->CreateBuffer(&matrixBufferDesc, NULL, &m_matrixBuffer);
if (FAILED(result))
{
logger.Log("Failed to create matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to create matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
@@ -235,7 +235,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
result = device->CreateSamplerState(&samplerDesc, &m_sampleState);
if (FAILED(result))
{
logger.Log("Failed to create sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to create sampler state", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
@@ -251,11 +251,11 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
result = device->CreateBuffer(&transparentBufferDesc, NULL, &m_transparentBuffer);
if (FAILED(result))
{
logger.Log("Failed to create transparent buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to create transparent buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
logger.Log("Transparent shader initialized", __FILE__, __LINE__);
Logger::Get().Log("Transparent shader initialized", __FILE__, __LINE__);
return true;
}
@@ -263,7 +263,7 @@ bool TransparentShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, W
void TransparentShaderClass::ShutdownShader()
{
logger.Log("Shutting down transparent shader", __FILE__, __LINE__);
Logger::Get().Log("Shutting down transparent shader", __FILE__, __LINE__);
// Release the transparent constant buffer.
if (m_transparentBuffer)
@@ -307,7 +307,7 @@ void TransparentShaderClass::ShutdownShader()
m_vertexShader = 0;
}
logger.Log("Transparent shader shut down", __FILE__, __LINE__);
Logger::Get().Log("Transparent shader shut down", __FILE__, __LINE__);
return;
}
@@ -367,7 +367,7 @@ bool TransparentShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceCont
result = deviceContext->Map(m_matrixBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
if (FAILED(result))
{
logger.Log("Failed to map matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to map matrix buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}
@@ -395,7 +395,7 @@ bool TransparentShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceCont
result = deviceContext->Map(m_transparentBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
if (FAILED(result))
{
logger.Log("Failed to map transparent buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
Logger::Get().Log("Failed to map transparent buffer", __FILE__, __LINE__, Logger::LogLevel::Error);
return false;
}