comparison Samples/Sdl/BasicScene.cpp @ 882:31319fe867b9 am-dev

Merge
author Alain Mazy <alain@mazy.be>
date Tue, 09 Jul 2019 11:46:43 +0200
parents e3c56d4f863f 80829436ce0c
children 56e4e9281076
comparison
equal deleted inserted replaced
881:a8cd3755db21 882:31319fe867b9
223 activeTracker = boost::make_shared<PanSceneTracker>(controller, e); 223 activeTracker = boost::make_shared<PanSceneTracker>(controller, e);
224 break; 224 break;
225 225
226 case SDL_BUTTON_RIGHT: 226 case SDL_BUTTON_RIGHT:
227 activeTracker = boost::make_shared<ZoomSceneTracker>(controller, 227 activeTracker = boost::make_shared<ZoomSceneTracker>(controller,
228 e, compositor.GetCanvasHeight()); 228 e, compositor.GetHeight());
229 break; 229 break;
230 230
231 case SDL_BUTTON_LEFT: 231 case SDL_BUTTON_LEFT:
232 activeTracker = boost::make_shared<RotateSceneTracker>(controller, e); 232 activeTracker = boost::make_shared<RotateSceneTracker>(controller, e);
233 break; 233 break;
240 event.key.repeat == 0 /* Ignore key bounce */) 240 event.key.repeat == 0 /* Ignore key bounce */)
241 { 241 {
242 switch (event.key.keysym.sym) 242 switch (event.key.keysym.sym)
243 { 243 {
244 case SDLK_s: 244 case SDLK_s:
245 controller->FitContent(compositor.GetCanvasWidth(), 245 controller->FitContent(compositor.GetWidth(),
246 compositor.GetCanvasHeight()); 246 compositor.GetHeight());
247 break; 247 break;
248 248
249 case SDLK_c: 249 case SDLK_c:
250 TakeScreenshot("screenshot.png", scene, 250 TakeScreenshot("screenshot.png", scene,
251 compositor.GetCanvasWidth(), 251 compositor.GetWidth(),
252 compositor.GetCanvasHeight()); 252 compositor.GetHeight());
253 break; 253 break;
254 254
255 default: 255 default:
256 break; 256 break;
257 } 257 }