Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-01 22:38:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

Remove friend, make getEditMode public to allow editmode testing.

Browse source
This commit is contained in:
unelsson 2021-08-22 19:14:51 +03:00
parent d62ddc002e
commit cb42b5287d
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/opencs/view/render/worldspacewidget.cpp
View file

@ -452,6 +452,11 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
return hit; return hit;
} }
CSVRender::EditMode *CSVRender::WorldspaceWidget::getEditMode()
{
return dynamic_cast<CSVRender::EditMode *> (mEditMode->getCurrent());
}
void CSVRender::WorldspaceWidget::abortDrag() void CSVRender::WorldspaceWidget::abortDrag()
{ {
if (mDragging) if (mDragging)
@ -697,11 +702,6 @@ void CSVRender::WorldspaceWidget::handleInteractionPress (const WorldspaceHitRes
editMode.primaryOpenPressed (hit); editMode.primaryOpenPressed (hit);
} }
CSVRender::EditMode *CSVRender::WorldspaceWidget::getEditMode()
{
return dynamic_cast<CSVRender::EditMode *> (mEditMode->getCurrent());
}
void CSVRender::WorldspaceWidget::primaryOpen(bool activate) void CSVRender::WorldspaceWidget::primaryOpen(bool activate)
{ {
handleInteraction(InteractionType_PrimaryOpen, activate); handleInteraction(InteractionType_PrimaryOpen, activate);

6
apps/opencs/view/render/worldspacewidget.hpp
View file

@ -49,8 +49,6 @@ namespace CSVRender
{ {
Q_OBJECT Q_OBJECT
friend class DrawTerrainSelectionCommand;
CSVWidget::SceneToolToggle2 *mSceneElements; CSVWidget::SceneToolToggle2 *mSceneElements;
CSVWidget::SceneToolRun *mRun; CSVWidget::SceneToolRun *mRun;
CSMDoc::Document& mDocument; CSMDoc::Document& mDocument;
@ -191,6 +189,8 @@ namespace CSVRender
/// Erase all overrides and restore the visual representation to its true state. /// Erase all overrides and restore the visual representation to its true state.
virtual void reset (unsigned int elementMask) = 0; virtual void reset (unsigned int elementMask) = 0;
EditMode *getEditMode();
protected: protected:
/// Visual elements in a scene /// Visual elements in a scene
@ -217,8 +217,6 @@ namespace CSVRender
void settingChanged (const CSMPrefs::Setting *setting) override; void settingChanged (const CSMPrefs::Setting *setting) override;
EditMode *getEditMode();
bool getSpeedMode(); bool getSpeedMode();
private: private: