diff --git a/examples/GraphicsTest/main.cpp b/examples/GraphicsTest/main.cpp index 476e16e8e..92839c297 100644 --- a/examples/GraphicsTest/main.cpp +++ b/examples/GraphicsTest/main.cpp @@ -95,8 +95,8 @@ int main() Nz::ForwardFramePipeline framePipeline; framePipeline.RegisterViewer(&camera); - framePipeline.RegisterInstancedDrawable(modelInstance, &model); - framePipeline.RegisterInstancedDrawable(modelInstance2, &model); + framePipeline.RegisterInstancedDrawable(modelInstance, &model, 0xFFFFFFFF); + framePipeline.RegisterInstancedDrawable(modelInstance2, &model, 0xFFFFFFFF); Nz::Vector3f viewerPos = Nz::Vector3f::Zero(); diff --git a/examples/PlayMusic/main.cpp b/examples/PlayMusic/main.cpp index 8f7cd77ee..97c1048a7 100644 --- a/examples/PlayMusic/main.cpp +++ b/examples/PlayMusic/main.cpp @@ -14,8 +14,6 @@ int main() { - std::cout << u8"Héhéhé" << std::endl; - return 0; std::filesystem::path resourceDir = "resources"; if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory(".." / resourceDir)) resourceDir = ".." / resourceDir; diff --git a/examples/Std140Debug/main.cpp b/examples/Std140Debug/main.cpp index dcab63b9b..514c8ddaf 100644 --- a/examples/Std140Debug/main.cpp +++ b/examples/Std140Debug/main.cpp @@ -7,7 +7,7 @@ #include const char fragmentSource[] = R"( -#version 310 es +#version 300 es #if GL_FRAGMENT_PRECISION_HIGH precision highp float; @@ -15,7 +15,7 @@ precision highp float; precision mediump float; #endif -layout(binding = 3, std140) uniform LightParameters +layout(std140) uniform LightParameters { mat4 projectionMatrix; mat4 invProjectionMatrix; @@ -34,7 +34,7 @@ void main() )"; const char vertexSource[] = R"( -#version 310 es +#version 300 es void main() { diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp index 08e9fb720..50c33b471 100644 --- a/src/Nazara/Renderer/Renderer.cpp +++ b/src/Nazara/Renderer/Renderer.cpp @@ -18,9 +18,9 @@ #include #ifdef NAZARA_COMPILER_MSVC -#define NazaraRendererPrefix "" +#define NazaraRendererPrefix "./" #else -#define NazaraRendererPrefix "lib" +#define NazaraRendererPrefix "./lib" #endif #ifdef NAZARA_DEBUG