From c96f5fb05029c28ded707972877136b5dd875f33 Mon Sep 17 00:00:00 2001 From: Rhys Mainwaring Date: Fri, 3 Sep 2021 20:30:55 +0100 Subject: [PATCH] [macOS] rollback changes to examples - Roll back changes to other examples, keeping only simple_demo_qml. Signed-off-by: Rhys Mainwaring --- .gitignore | 1 - examples/custom_shaders/custom_shaders.cc | 2 +- examples/custom_shaders_uniforms/Main.cc | 2 +- ogre2/src/Ogre2RenderEngine.cc | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dff374e1b..62b9898cc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ build_* # OS generated files .DS_Store *.swp -log diff --git a/examples/custom_shaders/custom_shaders.cc b/examples/custom_shaders/custom_shaders.cc index 1aa2f7848..d9b359feb 100644 --- a/examples/custom_shaders/custom_shaders.cc +++ b/examples/custom_shaders/custom_shaders.cc @@ -48,7 +48,7 @@ const std::string RESOURCE_PATH = int main() { // Initialize ignition::rendering - auto *engine = ignition::rendering::engine("ogre2"); + auto *engine = ignition::rendering::engine("ogre"); if (!engine) { std::cerr << "Failed to load ogre\n"; diff --git a/examples/custom_shaders_uniforms/Main.cc b/examples/custom_shaders_uniforms/Main.cc index 49f9a5d05..2ee5424a6 100644 --- a/examples/custom_shaders_uniforms/Main.cc +++ b/examples/custom_shaders_uniforms/Main.cc @@ -129,7 +129,7 @@ int main(int _argc, char** _argv) common::Console::SetVerbosity(4); std::vector cameras; - std::string engine("ogre2"); + std::string engine("ogre"); try { diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc index e303d7453..37ff10b30 100644 --- a/ogre2/src/Ogre2RenderEngine.cc +++ b/ogre2/src/Ogre2RenderEngine.cc @@ -327,7 +327,7 @@ void Ogre2RenderEngine::CreateLogger() // create actual log this->ogreLogManager = new Ogre::LogManager(); - this->ogreLogManager->createLog(logPath, true, true, false); + this->ogreLogManager->createLog(logPath, true, false, false); } //////////////////////////////////////////////////