comparison Framework/Viewport/SdlViewport.cpp @ 900:f9ae731fdc25 am-dev

Merge
author Alain Mazy <alain@mazy.be>
date Tue, 16 Jul 2019 12:42:31 +0200
parents 0c5201499af8
children 88bf49aebc13
comparison
equal deleted inserted replaced
897:9c2f6d6b9f4a 900:f9ae731fdc25
26 26
27 namespace OrthancStone 27 namespace OrthancStone
28 { 28 {
29 SdlViewport::SdlViewport(const char* title, 29 SdlViewport::SdlViewport(const char* title,
30 unsigned int width, 30 unsigned int width,
31 unsigned int height) : 31 unsigned int height,
32 bool allowDpiScaling) :
32 ViewportBase(title), 33 ViewportBase(title),
33 context_(title, width, height), 34 context_(title, width, height, allowDpiScaling),
34 compositor_(context_, GetScene()) 35 compositor_(context_, GetScene())
35 { 36 {
36 } 37 }
37 38
38 SdlViewport::SdlViewport(const char* title, 39 SdlViewport::SdlViewport(const char* title,
39 unsigned int width, 40 unsigned int width,
40 unsigned int height, 41 unsigned int height,
41 boost::shared_ptr<Scene2D>& scene) : 42 boost::shared_ptr<Scene2D>& scene,
43 bool allowDpiScaling) :
42 ViewportBase(title, scene), 44 ViewportBase(title, scene),
43 context_(title, width, height), 45 context_(title, width, height, allowDpiScaling),
44 compositor_(context_, GetScene()) 46 compositor_(context_, GetScene())
45 { 47 {
46 } 48 }
47 } 49 }