Minor stuff
This commit is contained in:
parent
e98e46164c
commit
f5dac32020
|
|
@ -45,7 +45,11 @@ namespace Nz
|
|||
template<typename T>
|
||||
void ModuleBase<T>::LogUninit()
|
||||
{
|
||||
NazaraNotice("Uninitializing " + m_moduleName + "...");
|
||||
if (m_moduleName.empty())
|
||||
return;
|
||||
|
||||
NazaraNotice("Uninitialized " + m_moduleName);
|
||||
m_moduleName.clear();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -57,4 +57,3 @@ namespace Nz
|
|||
}
|
||||
|
||||
#include <Nazara/Renderer/DebugOff.hpp>
|
||||
#include "RenderFrame.hpp"
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@ namespace Nz
|
|||
|
||||
Core::~Core()
|
||||
{
|
||||
LogUninit();
|
||||
HardwareInfo::Uninitialize();
|
||||
Log::Uninitialize();
|
||||
PluginManager::Uninitialize();
|
||||
TaskScheduler::Uninitialize();
|
||||
LogUninit();
|
||||
Log::Uninitialize();
|
||||
}
|
||||
|
||||
Core* Core::s_instance = nullptr;
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
[layout(std140)]
|
||||
struct BasicSettings
|
||||
{
|
||||
AlphaThreshold: f32,
|
||||
DiffuseColor: vec4<f32>
|
||||
}
|
||||
|
||||
[layout(std140)]
|
||||
struct InstanceData
|
||||
{
|
||||
worldMatrix: mat4<f32>,
|
||||
invWorldMatrix: mat4<f32>
|
||||
}
|
||||
|
||||
[layout(std140)]
|
||||
struct ViewerData
|
||||
{
|
||||
projectionMatrix: mat4<f32>,
|
||||
invProjectionMatrix: mat4<f32>,
|
||||
viewMatrix: mat4<f32>,
|
||||
invViewMatrix: mat4<f32>,
|
||||
viewProjMatrix: mat4<f32>,
|
||||
invViewProjMatrix: mat4<f32>,
|
||||
renderTargetSize: vec2<f32>,
|
||||
invRenderTargetSize: vec2<f32>,
|
||||
eyePosition: vec3<f32>
|
||||
}
|
||||
|
||||
external
|
||||
{
|
||||
[set(0), binding(0)] viewerData: uniform<ViewerData>,
|
||||
[set(1), binding(0)] instanceData: uniform<InstanceData>,
|
||||
[set(2), binding(0)] settings: uniform<BasicSettings>
|
||||
}
|
||||
|
||||
struct InputData
|
||||
{
|
||||
[location(0)] inPos: vec3<f32>,
|
||||
[location(1)] inTexCoord: vec2<f32>
|
||||
}
|
||||
|
||||
struct OutputData
|
||||
{
|
||||
[location(0)] vertUV: vec2<f32>,
|
||||
[builtin(position)] position: vec4<f32>
|
||||
}
|
||||
|
||||
[entry(vert)]
|
||||
fn main(input: InputData) -> OutputData
|
||||
{
|
||||
let output: OutputData;
|
||||
output.vertUV = input.inTexCoord;
|
||||
output.position = ((viewerData.projectionMatrix * viewerData.viewMatrix) * instanceData.worldMatrix) * (vec4<f32>(input.inPos, 1.000000));
|
||||
return output;
|
||||
}
|
||||
Loading…
Reference in New Issue