Mercurial > hg > orthanc-stone
comparison Samples/Sdl/TrackerSampleApp.cpp @ 1299:c38c89684d83 broker
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 17:21:24 +0100 |
parents | 2d8ab34c8c91 |
children |
comparison
equal
deleted
inserted
replaced
1297:6ab03e429f06 | 1299:c38c89684d83 |
---|---|
94 controller_->GetScene().GetLayer(FIXED_INFOTEXT_LAYER_ZINDEX)); | 94 controller_->GetScene().GetLayer(FIXED_INFOTEXT_LAYER_ZINDEX)); |
95 layerP = &layer; | 95 layerP = &layer; |
96 } | 96 } |
97 else | 97 else |
98 { | 98 { |
99 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); | 99 std::unique_ptr<TextSceneLayer> layer(new TextSceneLayer); |
100 layerP = layer.get(); | 100 layerP = layer.get(); |
101 layer->SetColor(0, 255, 0); | 101 layer->SetColor(0, 255, 0); |
102 layer->SetFontIndex(1); | 102 layer->SetFontIndex(1); |
103 layer->SetBorder(20); | 103 layer->SetBorder(20); |
104 layer->SetAnchor(BitmapAnchor_TopLeft); | 104 layer->SetAnchor(BitmapAnchor_TopLeft); |
129 layer.SetText(buf); | 129 layer.SetText(buf); |
130 layer.SetPosition(p.GetX(), p.GetY()); | 130 layer.SetPosition(p.GetX(), p.GetY()); |
131 } | 131 } |
132 else | 132 else |
133 { | 133 { |
134 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); | 134 std::unique_ptr<TextSceneLayer> layer(new TextSceneLayer); |
135 layer->SetColor(0, 255, 0); | 135 layer->SetColor(0, 255, 0); |
136 layer->SetText(buf); | 136 layer->SetText(buf); |
137 layer->SetBorder(20); | 137 layer->SetBorder(20); |
138 layer->SetAnchor(BitmapAnchor_BottomCenter); | 138 layer->SetAnchor(BitmapAnchor_BottomCenter); |
139 layer->SetPosition(p.GetX(), p.GetY()); | 139 layer->SetPosition(p.GetX(), p.GetY()); |
514 p[4] = 0; | 514 p[4] = 0; |
515 p[5] = 0; | 515 p[5] = 0; |
516 | 516 |
517 controller_->GetScene().SetLayer(TEXTURE_2x2_1_ZINDEX, new ColorTextureSceneLayer(i)); | 517 controller_->GetScene().SetLayer(TEXTURE_2x2_1_ZINDEX, new ColorTextureSceneLayer(i)); |
518 | 518 |
519 std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); | 519 std::unique_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); |
520 l->SetOrigin(-3, 2); | 520 l->SetOrigin(-3, 2); |
521 l->SetPixelSpacing(1.5, 1); | 521 l->SetPixelSpacing(1.5, 1); |
522 l->SetAngle(20.0 / 180.0 * M_PI); | 522 l->SetAngle(20.0 / 180.0 * M_PI); |
523 controller_->GetScene().SetLayer(TEXTURE_2x2_2_ZINDEX, l.release()); | 523 controller_->GetScene().SetLayer(TEXTURE_2x2_2_ZINDEX, l.release()); |
524 } | 524 } |
530 uint8_t* p = reinterpret_cast<uint8_t*>(i.GetRow(0)); | 530 uint8_t* p = reinterpret_cast<uint8_t*>(i.GetRow(0)); |
531 p[0] = 255; | 531 p[0] = 255; |
532 p[1] = 0; | 532 p[1] = 0; |
533 p[2] = 0; | 533 p[2] = 0; |
534 | 534 |
535 std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); | 535 std::unique_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); |
536 l->SetOrigin(-2, 1); | 536 l->SetOrigin(-2, 1); |
537 l->SetAngle(20.0 / 180.0 * M_PI); | 537 l->SetAngle(20.0 / 180.0 * M_PI); |
538 controller_->GetScene().SetLayer(TEXTURE_1x1_ZINDEX, l.release()); | 538 controller_->GetScene().SetLayer(TEXTURE_1x1_ZINDEX, l.release()); |
539 } | 539 } |
540 | 540 |
541 // Some lines | 541 // Some lines |
542 { | 542 { |
543 std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); | 543 std::unique_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); |
544 | 544 |
545 layer->SetThickness(1); | 545 layer->SetThickness(1); |
546 | 546 |
547 PolylineSceneLayer::Chain chain; | 547 PolylineSceneLayer::Chain chain; |
548 chain.push_back(ScenePoint2D(0 - 0.5, 0 - 0.5)); | 548 chain.push_back(ScenePoint2D(0 - 0.5, 0 - 0.5)); |
569 controller_->GetScene().SetLayer(LINESET_1_ZINDEX, layer.release()); | 569 controller_->GetScene().SetLayer(LINESET_1_ZINDEX, layer.release()); |
570 } | 570 } |
571 | 571 |
572 // Some text | 572 // Some text |
573 { | 573 { |
574 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); | 574 std::unique_ptr<TextSceneLayer> layer(new TextSceneLayer); |
575 layer->SetText("Hello"); | 575 layer->SetText("Hello"); |
576 controller_->GetScene().SetLayer(LINESET_2_ZINDEX, layer.release()); | 576 controller_->GetScene().SetLayer(LINESET_2_ZINDEX, layer.release()); |
577 } | 577 } |
578 } | 578 } |
579 | 579 |