Mercurial > hg > orthanc-stone
comparison Samples/WebAssembly/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 |
---|---|
60 p[4] = 0; | 60 p[4] = 0; |
61 p[5] = 0; | 61 p[5] = 0; |
62 | 62 |
63 scene.SetLayer(12, new ColorTextureSceneLayer(i)); | 63 scene.SetLayer(12, new ColorTextureSceneLayer(i)); |
64 | 64 |
65 std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); | 65 std::unique_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); |
66 l->SetOrigin(-3, 2); | 66 l->SetOrigin(-3, 2); |
67 l->SetPixelSpacing(1.5, 1); | 67 l->SetPixelSpacing(1.5, 1); |
68 l->SetAngle(20.0 / 180.0 * M_PI); | 68 l->SetAngle(20.0 / 180.0 * M_PI); |
69 scene.SetLayer(14, l.release()); | 69 scene.SetLayer(14, l.release()); |
70 } | 70 } |
77 uint8_t *p = reinterpret_cast<uint8_t*>(i.GetRow(0)); | 77 uint8_t *p = reinterpret_cast<uint8_t*>(i.GetRow(0)); |
78 p[0] = 255; | 78 p[0] = 255; |
79 p[1] = 0; | 79 p[1] = 0; |
80 p[2] = 0; | 80 p[2] = 0; |
81 | 81 |
82 std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); | 82 std::unique_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); |
83 l->SetOrigin(-2, 1); | 83 l->SetOrigin(-2, 1); |
84 l->SetAngle(20.0 / 180.0 * M_PI); | 84 l->SetAngle(20.0 / 180.0 * M_PI); |
85 scene.SetLayer(13, l.release()); | 85 scene.SetLayer(13, l.release()); |
86 } | 86 } |
87 | 87 |
88 // Some lines | 88 // Some lines |
89 if (1) | 89 if (1) |
90 { | 90 { |
91 std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); | 91 std::unique_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); |
92 | 92 |
93 layer->SetThickness(1); | 93 layer->SetThickness(1); |
94 | 94 |
95 PolylineSceneLayer::Chain chain; | 95 PolylineSceneLayer::Chain chain; |
96 chain.push_back(ScenePoint2D(0 - 0.5, 0 - 0.5)); | 96 chain.push_back(ScenePoint2D(0 - 0.5, 0 - 0.5)); |
118 } | 118 } |
119 | 119 |
120 // Some text | 120 // Some text |
121 if (1) | 121 if (1) |
122 { | 122 { |
123 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); | 123 std::unique_ptr<TextSceneLayer> layer(new TextSceneLayer); |
124 layer->SetText("Hello"); | 124 layer->SetText("Hello"); |
125 scene.SetLayer(100, layer.release()); | 125 scene.SetLayer(100, layer.release()); |
126 } | 126 } |
127 } | 127 } |
128 | 128 |
129 | 129 |
130 std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport1_; | 130 std::unique_ptr<OrthancStone::WebAssemblyViewport> viewport1_; |
131 std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport2_; | 131 std::unique_ptr<OrthancStone::WebAssemblyViewport> viewport2_; |
132 std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport3_; | 132 std::unique_ptr<OrthancStone::WebAssemblyViewport> viewport3_; |
133 boost::shared_ptr<OrthancStone::ViewportController> controller1_; | 133 boost::shared_ptr<OrthancStone::ViewportController> controller1_; |
134 boost::shared_ptr<OrthancStone::ViewportController> controller2_; | 134 boost::shared_ptr<OrthancStone::ViewportController> controller2_; |
135 boost::shared_ptr<OrthancStone::ViewportController> controller3_; | 135 boost::shared_ptr<OrthancStone::ViewportController> controller3_; |
136 OrthancStone::MessageBroker broker_; | 136 OrthancStone::MessageBroker broker_; |
137 | 137 |