sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
Jérôme Leclercq 2021-10-29 16:50:50 +02:00
parent 9e1df33440
commit b2aedd394c
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/GraphicsTest/main.cpp
View File

@ -95,8 +95,8 @@ int main()
Nz::ForwardFramePipeline framePipeline; Nz::ForwardFramePipeline framePipeline;
framePipeline.RegisterViewer(&camera); framePipeline.RegisterViewer(&camera);
framePipeline.RegisterInstancedDrawable(modelInstance, &model); framePipeline.RegisterInstancedDrawable(modelInstance, &model, 0xFFFFFFFF);
framePipeline.RegisterInstancedDrawable(modelInstance2, &model); framePipeline.RegisterInstancedDrawable(modelInstance2, &model, 0xFFFFFFFF);
Nz::Vector3f viewerPos = Nz::Vector3f::Zero(); Nz::Vector3f viewerPos = Nz::Vector3f::Zero();

2
examples/PlayMusic/main.cpp
View File

@ -14,8 +14,6 @@
int main() int main()
{ {
std::cout << u8"Héhéhé" << std::endl;
return 0;
std::filesystem::path resourceDir = "resources"; std::filesystem::path resourceDir = "resources";
if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory(".." / resourceDir)) if (!std::filesystem::is_directory(resourceDir) && std::filesystem::is_directory(".." / resourceDir))
resourceDir = ".." / resourceDir; resourceDir = ".." / resourceDir;

6
examples/Std140Debug/main.cpp
View File

@ -7,7 +7,7 @@
#include <numeric> #include <numeric>
const char fragmentSource[] = R"( const char fragmentSource[] = R"(
#version 310 es #version 300 es
#if GL_FRAGMENT_PRECISION_HIGH #if GL_FRAGMENT_PRECISION_HIGH
precision highp float; precision highp float;
@ -15,7 +15,7 @@ precision highp float;
precision mediump float; precision mediump float;
#endif #endif
layout(binding = 3, std140) uniform LightParameters layout(std140) uniform LightParameters
{ {
mat4 projectionMatrix; mat4 projectionMatrix;
mat4 invProjectionMatrix; mat4 invProjectionMatrix;
@ -34,7 +34,7 @@ void main()
)"; )";
const char vertexSource[] = R"( const char vertexSource[] = R"(
#version 310 es #version 300 es
void main() void main()
{ {

4
src/Nazara/Renderer/Renderer.cpp
View File

@ -18,9 +18,9 @@
#include <Nazara/Renderer/Debug.hpp> #include <Nazara/Renderer/Debug.hpp>
#ifdef NAZARA_COMPILER_MSVC #ifdef NAZARA_COMPILER_MSVC
#define NazaraRendererPrefix "" #define NazaraRendererPrefix "./"
#else #else
#define NazaraRendererPrefix "lib" #define NazaraRendererPrefix "./lib"
#endif #endif
#ifdef NAZARA_DEBUG #ifdef NAZARA_DEBUG