blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 03:30:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove GlContext from MapContext, layers receive MapContext from Initialize/Render

Browse source
This commit is contained in:
Dan Paulat 2025-05-08 23:15:46 -05:00
parent 2d4ad2737e
commit 44a864f50f
25 changed files with 446 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

27
scwx-qt/source/scwx/qt/map/draw_layer.hpp
View file

@ -6,21 +6,23 @@
namespace scwx::qt::map
{
class DrawLayerImpl;
class DrawLayer : public GenericLayer
{
Q_DISABLE_COPY_MOVE(DrawLayer)
public:
explicit DrawLayer(const std::shared_ptr<MapContext>& context,
const std::string& imGuiContextName);
explicit DrawLayer(std::shared_ptr<gl::GlContext> glContext,
const std::string& imGuiContextName);
virtual ~DrawLayer();
virtual void Initialize() override;
virtual void Render(const QMapLibre::CustomLayerRenderParameters&) override;
virtual void Deinitialize() override;
void Initialize(const std::shared_ptr<MapContext>& mapContext) override;
void Render(const std::shared_ptr<MapContext>& mapContext,
const QMapLibre::CustomLayerRenderParameters&) override;
void Deinitialize() override;
virtual bool
RunMousePicking(const QMapLibre::CustomLayerRenderParameters& params,
bool
RunMousePicking(const std::shared_ptr<MapContext>& mapContext,
const QMapLibre::CustomLayerRenderParameters& params,
const QPointF& mouseLocalPos,
const QPointF& mouseGlobalPos,
const glm::vec2& mouseCoords,
@ -29,15 +31,16 @@ public:
protected:
void AddDrawItem(const std::shared_ptr<gl::draw::DrawItem>& drawItem);
void ImGuiFrameStart();
void ImGuiFrameStart(const std::shared_ptr<MapContext>& mapContext);
void ImGuiFrameEnd();
void ImGuiInitialize();
void ImGuiInitialize(const std::shared_ptr<MapContext>& mapContext);
void
RenderWithoutImGui(const QMapLibre::CustomLayerRenderParameters& params);
void ImGuiSelectContext();
private:
std::unique_ptr<DrawLayerImpl> p;
class Impl;
std::unique_ptr<Impl> p;
};
} // namespace scwx::qt::map