comparison Samples/Sdl/BasicScene.cpp @ 610:0c4c0693b97c

OrthancStone::StoneInitialize()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 30 Apr 2019 09:17:45 +0200
parents f4b37a991dac
children e3f21a265be5
comparison
equal deleted inserted replaced
609:6729c3fad77e 610:0c4c0693b97c
20 20
21 21
22 // From Stone 22 // From Stone
23 #include "../../Applications/Sdl/SdlOpenGLWindow.h" 23 #include "../../Applications/Sdl/SdlOpenGLWindow.h"
24 #include "../../Framework/Scene2D/CairoCompositor.h" 24 #include "../../Framework/Scene2D/CairoCompositor.h"
25 #include "../../Framework/Scene2D/ColorTextureSceneLayer.h"
25 #include "../../Framework/Scene2D/OpenGLCompositor.h" 26 #include "../../Framework/Scene2D/OpenGLCompositor.h"
26 #include "../../Framework/Scene2D/Scene2D.h"
27 #include "../../Framework/Scene2D/PanSceneTracker.h" 27 #include "../../Framework/Scene2D/PanSceneTracker.h"
28 #include "../../Framework/Scene2D/RotateSceneTracker.h" 28 #include "../../Framework/Scene2D/RotateSceneTracker.h"
29 #include "../../Framework/Scene2D/Scene2D.h"
29 #include "../../Framework/Scene2D/ZoomSceneTracker.h" 30 #include "../../Framework/Scene2D/ZoomSceneTracker.h"
30 #include "../../Framework/Scene2D/ColorTextureSceneLayer.h" 31 #include "../../Framework/StoneInitialization.h"
31 32
32 // From Orthanc framework 33 // From Orthanc framework
33 #include <Core/Logging.h> 34 #include <Core/Logging.h>
34 #include <Core/OrthancException.h> 35 #include <Core/OrthancException.h>
35 #include <Core/Images/Image.h> 36 #include <Core/Images/Image.h>
355 * Windows. Otherwise, one gets the linking error "undefined reference 356 * Windows. Otherwise, one gets the linking error "undefined reference
356 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows 357 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows
357 **/ 358 **/
358 int main(int argc, char* argv[]) 359 int main(int argc, char* argv[])
359 { 360 {
360 Orthanc::Logging::Initialize(); 361 OrthancStone::StoneInitialize();
361 OrthancStone::SdlWindow::GlobalInitialize();
362 362
363 try 363 try
364 { 364 {
365 OrthancStone::Scene2D scene; 365 OrthancStone::Scene2D scene;
366 PrepareScene(scene); 366 PrepareScene(scene);
369 catch (Orthanc::OrthancException& e) 369 catch (Orthanc::OrthancException& e)
370 { 370 {
371 LOG(ERROR) << "EXCEPTION: " << e.What(); 371 LOG(ERROR) << "EXCEPTION: " << e.What();
372 } 372 }
373 373
374 OrthancStone::SdlWindow::GlobalFinalize(); 374 OrthancStone::StoneFinalize();
375 Orthanc::Logging::Finalize();
376 375
377 return 0; 376 return 0;
378 } 377 }