diff --git a/scwx-qt/res/textures/images/crosshairs-24.png b/scwx-qt/res/textures/images/crosshairs-24.png new file mode 100644 index 00000000..f2a7ae2d Binary files /dev/null and b/scwx-qt/res/textures/images/crosshairs-24.png differ diff --git a/scwx-qt/scwx-qt.qrc b/scwx-qt/scwx-qt.qrc index 0caeac1a..3e7e55dd 100644 --- a/scwx-qt/scwx-qt.qrc +++ b/scwx-qt/scwx-qt.qrc @@ -59,6 +59,6 @@ res/palettes/wct/ZDR.pal res/textures/lines/default-1x7.png res/textures/lines/test-pattern.png - res/textures/images/crosshairs-32.png + res/textures/images/crosshairs-24.png diff --git a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp index 3f7377b4..89c6248b 100644 --- a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp @@ -41,7 +41,7 @@ public: activeBoxInner_ {std::make_shared(context)}, icons_ {std::make_shared(context)}, locationIconName_ { - types::GetTextureName(types::ImageTexture::Crosshairs32)} + types::GetTextureName(types::ImageTexture::Crosshairs24)} { } ~OverlayLayerImpl() = default; @@ -101,6 +101,8 @@ void OverlayLayer::Initialize() p->locationIcon_ = p->icons_->AddIcon(); gl::draw::GeoIcons::SetIconTexture( p->locationIcon_, p->locationIconName_, 0); + gl::draw::GeoIcons::SetIconAngle(p->locationIcon_, + units::angle::degrees {45.0}); gl::draw::GeoIcons::SetIconLocation( p->locationIcon_, coordinate.latitude(), coordinate.longitude()); p->icons_->FinishIcons(); diff --git a/scwx-qt/source/scwx/qt/types/texture_types.cpp b/scwx-qt/source/scwx/qt/types/texture_types.cpp index 348ae781..5f2123ad 100644 --- a/scwx-qt/source/scwx/qt/types/texture_types.cpp +++ b/scwx-qt/source/scwx/qt/types/texture_types.cpp @@ -16,8 +16,8 @@ struct TextureInfo }; static const std::unordered_map imageTextureInfo_ { - {ImageTexture::Crosshairs32, - {"images/crosshairs-32", ":/res/textures/images/crosshairs-32.png"}}}; + {ImageTexture::Crosshairs24, + {"images/crosshairs-24", ":/res/textures/images/crosshairs-24.png"}}}; static const std::unordered_map lineTextureInfo_ { {LineTexture::Default1x7, diff --git a/scwx-qt/source/scwx/qt/types/texture_types.hpp b/scwx-qt/source/scwx/qt/types/texture_types.hpp index 7e1999b4..c40f7141 100644 --- a/scwx-qt/source/scwx/qt/types/texture_types.hpp +++ b/scwx-qt/source/scwx/qt/types/texture_types.hpp @@ -13,11 +13,12 @@ namespace types enum class ImageTexture { + Crosshairs24, Crosshairs32 }; typedef scwx::util::Iterator + ImageTexture::Crosshairs24, + ImageTexture::Crosshairs24> ImageTextureIterator; enum class LineTexture