Skip to content

Commit f138b23

Browse files
authored
Merge pull request #39 from feniksa/master
Tutorials improvment: fix error and warning
2 parents 153ac7b + 8a49990 commit f138b23

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

premake5/linux64/premake5

100644100755
File mode changed.

tutorials/32_gl_interop/main.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include <cassert>
4646
#include <iostream>
4747
#include <thread>
48+
#include <memory>
4849

4950
const unsigned int WINDOW_WIDTH = 640;
5051
const unsigned int WINDOW_HEIGHT = 480;
@@ -84,9 +85,9 @@ class GuiRenderImpl
8485
};
8586

8687

87-
GLuint g_vertex_buffer_id = NULL;
88-
GLuint g_index_buffer_id = NULL;
89-
GLuint g_texture = NULL;
88+
GLuint g_vertex_buffer_id = 0;
89+
GLuint g_index_buffer_id = 0;
90+
GLuint g_texture = 0;
9091
rpr_framebuffer g_frame_buffer = NULL;
9192
rpr_context g_context = NULL;
9293
rpr_material_system g_matsys = NULL;

tutorials/64_mesh_obj_demo/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ const Configuration loadConfigFile(const char* filepath)
401401
std::cout << "Rendermode : " << config.contextSettings.renderMode << '\n';
402402
std::cout << "Recursion : " << config.contextSettings.recursion << '\n';
403403
std::cout << "Batchsize : " << config.contextSettings.batchSize << '\n';
404-
std::cout << "outImageFile : " << config.contextSettings.outImgFile << '\n\n';
404+
std::cout << "outImageFile : " << config.contextSettings.outImgFile << "\n\n";
405405
}
406406

407407
if (!bLight && !bIbl)
@@ -421,7 +421,7 @@ const Configuration loadConfigFile(const char* filepath)
421421
std::cout << "Translation :" << config.cameraSettings.translation << '\n';
422422
std::cout << "Up :" << config.cameraSettings.up << '\n';
423423
std::cout << "Focal Length:" << config.cameraSettings.focalLength << '\n';
424-
std::cout << "Camera Mode :" << config.cameraSettings.cameraMode << '\n\n';
424+
std::cout << "Camera Mode :" << config.cameraSettings.cameraMode << "\n\n";
425425
}
426426

427427
if (!bShape)
@@ -432,7 +432,7 @@ const Configuration loadConfigFile(const char* filepath)
432432
std::cout << "Path :" << settings.path << '\n';
433433
std::cout << "Rotation : " << settings.rotation << '\n';
434434
std::cout << "Translation : " << settings.translation << '\n';
435-
std::cout << "Scale : " << settings.scale << '\n\n';
435+
std::cout << "Scale : " << settings.scale << "\n\n";
436436

437437
settings.translation = RadeonProRender::float3{0.0f, -3.0f, 0.0f};
438438
settings.scale = RadeonProRender::float3{1.0f, 1.0f, 1.0f};
@@ -967,4 +967,4 @@ int main(int argc , char* argv[])
967967
CHECK(rprObjectDelete(context)); context = nullptr; // Always delete the RPR Context in last.
968968

969969
return 0;
970-
}
970+
}

0 commit comments

Comments
 (0)