Skip to content

feat(morph): A5b — read-only morph rows in the dope sheet #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fernandotonon merged 1 commit into from
May 17, 2026
+113 −1
Merged

feat(morph): A5b — read-only morph rows in the dope sheet #580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
114 changes: 113 additions & 1 deletion qml/AnimationDopeSheet.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ Rectangle {
// Cached row data refreshed from the controller.
property var rows: AnimationControlController.allBoneRows()

// Slice A5b: morph-target rows for the selected entity, sourced from
// AnimationControlController.allMorphRows() (a Q_INVOKABLE on the
// same singleton that supplies `allBoneRows()` — kept on
// AnimationControlController on purpose so this file doesn't
// need a second `import` and doesn't trigger a different QML
// singleton chain during MainWindow construction). Each row is
// `{ name, keyTimes }`. Renders below the bone rows as a fixed
// read-only band — full selection / move / copy interaction for
// morph tracks is a future slice.
property var morphRows: AnimationControlController.allMorphRows()

// Per-bone expansion state for per-channel rows. Keys are bone names,
// values are bool. Reset when a new clip is selected (different bones).
property var expandedBones: ({})
Expand Down Expand Up @@ -145,6 +156,7 @@ Rectangle {
// signal, and dropping selection there breaks bulk drag mid-gesture.
function onSelectionChanged() {
root.rows = AnimationControlController.allBoneRows()
root.morphRows = AnimationControlController.allMorphRows()
root.clearSelection()
root.expandedBones = {}
}
Expand Down Expand Up @@ -256,7 +268,9 @@ Rectangle {
id: rowsView
anchors.left: parent.left; anchors.right: parent.right
anchors.top: header.visible ? header.bottom : parent.top
anchors.bottom: parent.bottom
// Leave room for the morph band at the bottom when it's visible
// — otherwise the bone list would draw over it.
anchors.bottom: morphBand.visible ? morphBand.top : parent.bottom
clip: true
model: root.rows
spacing: 1
Expand Down Expand Up @@ -693,4 +707,102 @@ Rectangle {
event.accepted = true
}
}

// ── Morph-target rows (slice A5b) ────────────────────────────────────────
// Fixed-height read-only band anchored to the bottom. One row per
// morph target with diamond markers at each keyframe time, sharing
// the bone-track timeline (same `pxPerSec`, `viewStart`). When the
// entity has no morphs the band collapses to height=0 so bone-only
// assets look exactly the same as before.
//
// Keep this strictly read-only: no MouseAreas on the diamonds, no
// selection toggling, no drag — full interaction lives in a future
// slice. The point here is to make morph-weight animation visible
// alongside skeletal animation, which is the load-bearing piece of
// #518's "dope sheet integration" acceptance criterion.
Rectangle {
id: morphBand
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
visible: morphRowsRep.count > 0
height: visible
? (morphHeader.height + morphRowsRep.count * (root.rowHeight + 1) + 4)
: 0
Comment on lines +729 to +731
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot May 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Constrain morph band height to available viewport

The morph band height is computed as morphRowsRep.count * (rowHeight + 1) with no upper bound or internal scrolling, so entities with many morph targets can make this rectangle taller than the whole dope sheet. In that case rowsView is anchored to morphBand.top, which can move above the list’s top anchor and collapse/hide bone tracks, making the dope sheet unusable for common high-count blendshape rigs.

Useful? React with 👍 / 👎.

color: AnimationControlController.panelColor
border.color: AnimationControlController.borderColor
border.width: 1

Rectangle {
id: morphHeader
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
height: 16
color: Qt.darker(AnimationControlController.panelColor, 1.15)
Text {
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left; anchors.leftMargin: 6
text: "Morph Targets (" + morphRowsRep.count + ")"
color: AnimationControlController.textColor
font.pixelSize: 10
font.bold: true
}
}

Column {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: morphHeader.bottom
anchors.topMargin: 2
spacing: 1

Repeater {
id: morphRowsRep
model: root.morphRows

Item {
width: parent.width
height: root.rowHeight

Rectangle {
width: root.leftStripWidth; height: root.rowHeight
color: AnimationControlController.panelColor
border.color: AnimationControlController.borderColor
border.width: 1
Text {
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left; anchors.leftMargin: 8
text: modelData.name
color: AnimationControlController.textColor
font.pixelSize: 10
elide: Text.ElideRight
width: root.leftStripWidth - 12
}
}

// Right side: diamond per keyframe time. Sharing the
// bone-row timeline math so they line up vertically.
Item {
anchors.left: parent.left; anchors.leftMargin: root.leftStripWidth
anchors.right: parent.right
height: root.rowHeight
Comment on lines +786 to +789
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot May 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Clip morph key lane before painting off-screen diamonds

This morph timeline container does not set clip: true, but each diamond’s x is driven by (keyTime - viewStart) * pxPerSec. When the user pans/zooms so keys are off-screen, negative/overflow x values will still paint outside the lane (into the name strip or neighboring rows), unlike the bone track strips that are explicitly clipped.

Useful? React with 👍 / 👎.

Repeater {
model: modelData.keyTimes
Rectangle {
property real keyTime: modelData
x: (keyTime - root.viewStart) * root.pxPerSec - width / 2
anchors.verticalCenter: parent.verticalCenter
width: 10; height: 10
rotation: 45
color: "#88ccff" // visually distinct from bone keys (yellow)
border.color: AnimationControlController.borderColor
border.width: 1
}
}
}
}
}
}
}
}
Loading