Mercurial > hg > orthanc-stone
comparison Samples/Sdl/BasicScene.cpp @ 1298:8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 16:31:30 +0100 |
parents | 2d8ab34c8c91 |
children |
comparison
equal
deleted
inserted
replaced
1296:86400fa16091 | 1298:8a0a62189f46 |
---|---|
76 p[4] = 0; | 76 p[4] = 0; |
77 p[5] = 0; | 77 p[5] = 0; |
78 | 78 |
79 scene.SetLayer(12, new ColorTextureSceneLayer(i)); | 79 scene.SetLayer(12, new ColorTextureSceneLayer(i)); |
80 | 80 |
81 std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); | 81 std::unique_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); |
82 l->SetOrigin(-3, 2); | 82 l->SetOrigin(-3, 2); |
83 l->SetPixelSpacing(1.5, 1); | 83 l->SetPixelSpacing(1.5, 1); |
84 l->SetAngle(20.0 / 180.0 * M_PI); | 84 l->SetAngle(20.0 / 180.0 * M_PI); |
85 scene.SetLayer(14, l.release()); | 85 scene.SetLayer(14, l.release()); |
86 } | 86 } |
92 uint8_t *p = reinterpret_cast<uint8_t*>(i.GetRow(0)); | 92 uint8_t *p = reinterpret_cast<uint8_t*>(i.GetRow(0)); |
93 p[0] = 255; | 93 p[0] = 255; |
94 p[1] = 0; | 94 p[1] = 0; |
95 p[2] = 0; | 95 p[2] = 0; |
96 | 96 |
97 std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); | 97 std::unique_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); |
98 l->SetOrigin(-2, 1); | 98 l->SetOrigin(-2, 1); |
99 l->SetAngle(20.0 / 180.0 * M_PI); | 99 l->SetAngle(20.0 / 180.0 * M_PI); |
100 scene.SetLayer(13, l.release()); | 100 scene.SetLayer(13, l.release()); |
101 } | 101 } |
102 | 102 |
103 // Some lines | 103 // Some lines |
104 { | 104 { |
105 std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); | 105 std::unique_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); |
106 | 106 |
107 layer->SetThickness(10); | 107 layer->SetThickness(10); |
108 | 108 |
109 PolylineSceneLayer::Chain chain; | 109 PolylineSceneLayer::Chain chain; |
110 chain.push_back(ScenePoint2D(0 - 0.5, 0 - 0.5)); | 110 chain.push_back(ScenePoint2D(0 - 0.5, 0 - 0.5)); |
131 scene.SetLayer(50, layer.release()); | 131 scene.SetLayer(50, layer.release()); |
132 } | 132 } |
133 | 133 |
134 // Some text | 134 // Some text |
135 { | 135 { |
136 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); | 136 std::unique_ptr<TextSceneLayer> layer(new TextSceneLayer); |
137 layer->SetText("Hello"); | 137 layer->SetText("Hello"); |
138 scene.SetLayer(100, layer.release()); | 138 scene.SetLayer(100, layer.release()); |
139 } | 139 } |
140 } | 140 } |
141 | 141 |
197 layer.SetText(buf); | 197 layer.SetText(buf); |
198 layer.SetPosition(p.GetX(), p.GetY()); | 198 layer.SetPosition(p.GetX(), p.GetY()); |
199 } | 199 } |
200 else | 200 else |
201 { | 201 { |
202 std::auto_ptr<TextSceneLayer> | 202 std::unique_ptr<TextSceneLayer> |
203 layer(new TextSceneLayer); | 203 layer(new TextSceneLayer); |
204 layer->SetColor(0, 255, 0); | 204 layer->SetColor(0, 255, 0); |
205 layer->SetText(buf); | 205 layer->SetText(buf); |
206 layer->SetBorder(20); | 206 layer->SetBorder(20); |
207 layer->SetAnchor(BitmapAnchor_BottomCenter); | 207 layer->SetAnchor(BitmapAnchor_BottomCenter); |