Mercurial > hg > orthanc-stone

comparison Samples/Sdl/BasicScene.cpp @ 720:f2ee003ba955

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch to make_shared in various places
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 20 May 2019 12:37:30 +0200
parents ef07304d4423
children af0aa0c149fa
comparison
equal deleted inserted replaced
707:d1feb89ea742 720:f2ee003ba955
38 #include <Core/OrthancException.h> 38 #include <Core/OrthancException.h>
39 #include <Core/Images/Image.h> 39 #include <Core/Images/Image.h>
40 #include <Core/Images/ImageProcessing.h> 40 #include <Core/Images/ImageProcessing.h>
41 #include <Core/Images/PngWriter.h> 41 #include <Core/Images/PngWriter.h>
42 42
43 #include <boost/make_shared.hpp>
44 #include <boost/ref.hpp>
45
43 #include <SDL.h> 46 #include <SDL.h>
44 #include <stdio.h> 47 #include <stdio.h>
45 48
46 static const unsigned int FONT_SIZE = 32; 49 static const unsigned int FONT_SIZE = 32;
47 static const int LAYER_POSITION = 150; 50 static const int LAYER_POSITION = 150;
214 e.AddPosition(compositor.GetPixelCenterCoordinates(event.button.x, event.button.y)); 217 e.AddPosition(compositor.GetPixelCenterCoordinates(event.button.x, event.button.y));
215 218
216 switch (event.button.button) 219 switch (event.button.button)
217 { 220 {
218 case SDL_BUTTON_MIDDLE: 221 case SDL_BUTTON_MIDDLE:
219 activeTracker.reset(new PanSceneTracker( 222 activeTracker = boost::make_shared<PanSceneTracker>(controller, e);
220 controller, e));
221 break; 223 break;
222 224
223 case SDL_BUTTON_RIGHT: 225 case SDL_BUTTON_RIGHT:
224 activeTracker.reset(new ZoomSceneTracker( 226 activeTracker = boost::make_shared<ZoomSceneTracker>(controller,
225 controller, e, compositor.GetCanvasHeight())); 227 e, compositor.GetCanvasHeight());
226 break; 228 break;
227 229
228 case SDL_BUTTON_LEFT: 230 case SDL_BUTTON_LEFT:
229 activeTracker.reset(new RotateSceneTracker( 231 activeTracker = boost::make_shared<RotateSceneTracker>(controller, e);
230 controller, e));
231 break; 232 break;
232 233
233 default: 234 default:
234 break; 235 break;
235 } 236 }
372 Orthanc::Logging::EnableInfoLevel(true); 373 Orthanc::Logging::EnableInfoLevel(true);
373 374
374 try 375 try
375 { 376 {
376 MessageBroker broker; 377 MessageBroker broker;
377 ViewportControllerPtr controller( 378 ViewportControllerPtr controller = boost::make_shared<ViewportController>(
378 new ViewportController(broker)); 379 boost::ref(broker));
379 PrepareScene(controller); 380 PrepareScene(controller);
380 Run(controller); 381 Run(controller);
381 } 382 }
382 catch (Orthanc::OrthancException& e) 383 catch (Orthanc::OrthancException& e)
383 { 384 {