Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions src/EditModeController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ THE SOFTWARE.
#include "mainwindow.h"
#include "OgreWidget.h"
#include "SpaceCamera.h"
#include <QTimer>
#include <Ogre.h>
#include <OgreRTShaderSystem.h>
#include <ProceduralSphereGenerator.h>
Expand Down Expand Up @@ -426,6 +427,8 @@ void EditModeController::exitEditMode(bool commitChanges)
if (m_vertexPaintStrokeActive)
endVertexPaintStroke(/*commitUndo=*/commitChanges);
m_vertexPaintEnabled = false;
m_vertexPaintFlushPending = false;
m_vertexPaintFlushScheduled = false;
clearVertexPaintPreview();
emit vertexPaintChanged();
}
Expand Down Expand Up @@ -1258,8 +1261,20 @@ void EditModeController::updateVertexPaintStroke(OgreWidget* widget, const QPoin

if (changed) {
m_vertexPaintStrokeDirty = true;
m_editableMesh->commitVertexColorsToEntity(m_editEntity);
emit meshDataChanged();
m_vertexPaintFlushPending = true;
if (!m_vertexPaintFlushScheduled) {
m_vertexPaintFlushScheduled = true;
QTimer::singleShot(0, this, [this]() {
m_vertexPaintFlushScheduled = false;
if (!m_vertexPaintFlushPending)
return;
if (!m_editModeActive || !m_editableMesh || !m_editEntity)
return;
m_vertexPaintFlushPending = false;
m_editableMesh->commitVertexColorsToEntity(m_editEntity);
emit meshDataChanged();
});
}
}
}

Expand Down Expand Up @@ -1345,6 +1360,13 @@ void EditModeController::endVertexPaintStroke(bool commitUndo)
return;
}

// Ensure the final sample is visible before we snapshot undo state.
if (m_vertexPaintFlushPending && m_editModeActive && m_editableMesh && m_editEntity) {
m_vertexPaintFlushPending = false;
m_editableMesh->commitVertexColorsToEntity(m_editEntity);
emit meshDataChanged();
}

const auto newSubMeshes = m_editableMesh->subMeshes();
auto* cmd = new EditMeshTopologyCommand(
std::move(m_vertexPaintStrokeOriginalSubMeshes),
Expand Down
2 changes: 2 additions & 0 deletions src/EditModeController.h
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,8 @@ private slots:
Ogre::Vector3 m_vertexPaintLastLocal = Ogre::Vector3::ZERO;
bool m_vertexPaintHaveLastLocal = false;
bool m_vertexPaintStrokeDirty = false;
bool m_vertexPaintFlushScheduled = false;
bool m_vertexPaintFlushPending = false;
std::vector<EditableSubMesh> m_vertexPaintStrokeOriginalSubMeshes;

/// Hit-test a screen-space point for knife placement. Priority:
Expand Down
Loading