forked from qt-creator/qt-creator
QmlPuppet: Fix runtime warnings in 3D editor
Fixes: QDS-4491 Change-Id: I462e165ef59111f70c928b7d652ade99c5b3c0d0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
@@ -67,18 +67,18 @@ DirectionalDraggable {
|
|||||||
handleRoot.currentMousePos = screenPos;
|
handleRoot.currentMousePos = screenPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
onPressed: {
|
onPressed: (mouseArea, screenPos)=> {
|
||||||
_startScale = autoScaler.relativeScale * baseScale;
|
_startScale = autoScaler.relativeScale * baseScale;
|
||||||
_startValue = propValue;
|
_startValue = propValue;
|
||||||
updateValue(0, screenPos);
|
updateValue(0, screenPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
onDragged: {
|
onDragged: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> {
|
||||||
updateValue(relativeDistance, screenPos);
|
updateValue(relativeDistance, screenPos);
|
||||||
handleRoot.valueChange();
|
handleRoot.valueChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
onReleased: {
|
onReleased: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> {
|
||||||
updateValue(relativeDistance, screenPos);
|
updateValue(relativeDistance, screenPos);
|
||||||
handleRoot.valueCommit();
|
handleRoot.valueCommit();
|
||||||
}
|
}
|
||||||
|
@@ -47,14 +47,14 @@ DirectionalDraggable {
|
|||||||
_generalHelper.restartMultiSelection();
|
_generalHelper.restartMultiSelection();
|
||||||
}
|
}
|
||||||
|
|
||||||
onDragged: {
|
onDragged: (mouseArea, sceneRelativeDistance)=> {
|
||||||
targetNode.position = localPos(sceneRelativeDistance);
|
targetNode.position = localPos(sceneRelativeDistance);
|
||||||
if (targetNode == multiSelectionNode)
|
if (targetNode == multiSelectionNode)
|
||||||
_generalHelper.moveMultiSelection(false);
|
_generalHelper.moveMultiSelection(false);
|
||||||
positionMove();
|
positionMove();
|
||||||
}
|
}
|
||||||
|
|
||||||
onReleased: {
|
onReleased: (mouseArea, sceneRelativeDistance)=> {
|
||||||
targetNode.position = localPos(sceneRelativeDistance);
|
targetNode.position = localPos(sceneRelativeDistance);
|
||||||
if (targetNode == multiSelectionNode)
|
if (targetNode == multiSelectionNode)
|
||||||
_generalHelper.moveMultiSelection(true);
|
_generalHelper.moveMultiSelection(true);
|
||||||
|
@@ -113,11 +113,11 @@ View3D {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onPositionChanged: {
|
onPositionChanged: (mouse)=> {
|
||||||
pick(mouse);
|
pick(mouse);
|
||||||
}
|
}
|
||||||
|
|
||||||
onPressed: {
|
onPressed: (mouse)=> {
|
||||||
pick(mouse);
|
pick(mouse);
|
||||||
if (pickObj) {
|
if (pickObj) {
|
||||||
axisHelperView.editCameraCtrl.focusObject(axisHelperView.selectedNode,
|
axisHelperView.editCameraCtrl.focusObject(axisHelperView.selectedNode,
|
||||||
|
@@ -106,9 +106,15 @@ Model {
|
|||||||
dragHelper: rootModel.dragHelper
|
dragHelper: rootModel.dragHelper
|
||||||
priority: 5
|
priority: 5
|
||||||
|
|
||||||
onPressed: rootModel.handlePressed(mouseAreaYZ, planePos, screenPos)
|
onPressed: (planePos, screenPos)=> {
|
||||||
onDragged: rootModel.handleDragged(mouseAreaYZ, planePos, screenPos)
|
rootModel.handlePressed(mouseAreaYZ, planePos, screenPos);
|
||||||
onReleased: rootModel.handleReleased(mouseAreaYZ, planePos, screenPos)
|
}
|
||||||
|
onDragged: (planePos, screenPos)=> {
|
||||||
|
rootModel.handleDragged(mouseAreaYZ, planePos, screenPos);
|
||||||
|
}
|
||||||
|
onReleased: (planePos, screenPos)=> {
|
||||||
|
rootModel.handleReleased(mouseAreaYZ, planePos, screenPos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea3D {
|
MouseArea3D {
|
||||||
@@ -124,9 +130,15 @@ Model {
|
|||||||
dragHelper: rootModel.dragHelper
|
dragHelper: rootModel.dragHelper
|
||||||
priority: 5
|
priority: 5
|
||||||
|
|
||||||
onPressed: rootModel.handlePressed(mouseAreaXZ, planePos, screenPos)
|
onPressed: (planePos, screenPos)=> {
|
||||||
onDragged: rootModel.handleDragged(mouseAreaXZ, planePos, screenPos)
|
rootModel.handlePressed(mouseAreaXZ, planePos, screenPos);
|
||||||
onReleased: rootModel.handleReleased(mouseAreaXZ, planePos, screenPos)
|
}
|
||||||
|
onDragged: (planePos, screenPos)=> {
|
||||||
|
rootModel.handleDragged(mouseAreaXZ, planePos, screenPos);
|
||||||
|
}
|
||||||
|
onReleased: (planePos, screenPos)=> {
|
||||||
|
rootModel.handleReleased(mouseAreaXZ, planePos, screenPos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -132,7 +132,7 @@ Item {
|
|||||||
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
|
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
|
||||||
hoverEnabled: false
|
hoverEnabled: false
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onPositionChanged: {
|
onPositionChanged: (mouse)=> {
|
||||||
if (cameraCtrl.camera && mouse.modifiers === Qt.AltModifier && cameraCtrl._dragging) {
|
if (cameraCtrl.camera && mouse.modifiers === Qt.AltModifier && cameraCtrl._dragging) {
|
||||||
var currentPoint = Qt.vector3d(mouse.x, mouse.y, 0);
|
var currentPoint = Qt.vector3d(mouse.x, mouse.y, 0);
|
||||||
if (cameraCtrl._button == Qt.LeftButton) {
|
if (cameraCtrl._button == Qt.LeftButton) {
|
||||||
@@ -150,7 +150,7 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
onPressed: {
|
onPressed: (mouse)=> {
|
||||||
if (cameraCtrl.camera && mouse.modifiers === Qt.AltModifier) {
|
if (cameraCtrl.camera && mouse.modifiers === Qt.AltModifier) {
|
||||||
cameraCtrl._dragging = true;
|
cameraCtrl._dragging = true;
|
||||||
cameraCtrl._startRotation = cameraCtrl.camera.eulerRotation;
|
cameraCtrl._startRotation = cameraCtrl.camera.eulerRotation;
|
||||||
@@ -173,7 +173,7 @@ Item {
|
|||||||
onReleased: handleRelease()
|
onReleased: handleRelease()
|
||||||
onCanceled: handleRelease()
|
onCanceled: handleRelease()
|
||||||
|
|
||||||
onWheel: {
|
onWheel: (wheel)=> {
|
||||||
if (cameraCtrl.camera) {
|
if (cameraCtrl.camera) {
|
||||||
// Empirically determined divisor for nice zoom
|
// Empirically determined divisor for nice zoom
|
||||||
cameraCtrl.zoomRelative(wheel.angleDelta.y / -40);
|
cameraCtrl.zoomRelative(wheel.angleDelta.y / -40);
|
||||||
|
@@ -604,8 +604,12 @@ Item {
|
|||||||
view3D: overlayView
|
view3D: overlayView
|
||||||
dragHelper: gizmoDragHelper
|
dragHelper: gizmoDragHelper
|
||||||
|
|
||||||
onPropertyValueCommit: viewRoot.commitObjectProperty([targetNode], [propName])
|
onPropertyValueCommit: (propName)=> {
|
||||||
onPropertyValueChange: viewRoot.changeObjectProperty([targetNode], [propName])
|
viewRoot.commitObjectProperty([targetNode], [propName]);
|
||||||
|
}
|
||||||
|
onPropertyValueChange: (propName)=> {
|
||||||
|
viewRoot.changeObjectProperty([targetNode], [propName]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
AutoScaleHelper {
|
AutoScaleHelper {
|
||||||
@@ -682,7 +686,7 @@ Item {
|
|||||||
property point pressPoint
|
property point pressPoint
|
||||||
property bool initialMoveBlock: false
|
property bool initialMoveBlock: false
|
||||||
|
|
||||||
onPressed: {
|
onPressed: (mouse)=> {
|
||||||
if (viewRoot.editView) {
|
if (viewRoot.editView) {
|
||||||
var pickResult = viewRoot.editView.pick(mouse.x, mouse.y);
|
var pickResult = viewRoot.editView.pick(mouse.x, mouse.y);
|
||||||
handleObjectClicked(_generalHelper.resolvePick(pickResult.objectHit),
|
handleObjectClicked(_generalHelper.resolvePick(pickResult.objectHit),
|
||||||
@@ -703,7 +707,7 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
onPositionChanged: {
|
onPositionChanged: (mouse)=> {
|
||||||
if (freeDraggerArea) {
|
if (freeDraggerArea) {
|
||||||
if (initialMoveBlock && Math.abs(pressPoint.x - mouse.x) + Math.abs(pressPoint.y - mouse.y) > 10) {
|
if (initialMoveBlock && Math.abs(pressPoint.x - mouse.x) + Math.abs(pressPoint.y - mouse.y) > 10) {
|
||||||
// Don't force press event at actual press, as that puts the gizmo
|
// Don't force press event at actual press, as that puts the gizmo
|
||||||
@@ -728,8 +732,12 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onReleased: handleRelease(mouse)
|
onReleased: (mouse)=> {
|
||||||
onCanceled: handleRelease(mouse)
|
handleRelease(mouse);
|
||||||
|
}
|
||||||
|
onCanceled: (mouse)=> {
|
||||||
|
handleRelease(mouse);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DropArea {
|
DropArea {
|
||||||
|
@@ -98,7 +98,7 @@ DirectionalDraggable {
|
|||||||
handleRoot.currentMousePos = screenPos;
|
handleRoot.currentMousePos = screenPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
onPressed: {
|
onPressed: (mouseArea, screenPos)=> {
|
||||||
_startScale = autoScaler.relativeScale * baseScale * dragScale;
|
_startScale = autoScaler.relativeScale * baseScale * dragScale;
|
||||||
_startFadeScale = fadeScale;
|
_startFadeScale = fadeScale;
|
||||||
_l = targetNode.linearFade;
|
_l = targetNode.linearFade;
|
||||||
@@ -116,12 +116,12 @@ DirectionalDraggable {
|
|||||||
updateFade(0, screenPos);
|
updateFade(0, screenPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
onDragged: {
|
onDragged: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> {
|
||||||
updateFade(relativeDistance, screenPos);
|
updateFade(relativeDistance, screenPos);
|
||||||
handleRoot.valueChange(_currentProp);
|
handleRoot.valueChange(_currentProp);
|
||||||
}
|
}
|
||||||
|
|
||||||
onReleased: {
|
onReleased: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> {
|
||||||
updateFade(relativeDistance, screenPos);
|
updateFade(relativeDistance, screenPos);
|
||||||
handleRoot.valueCommit(_currentProp);
|
handleRoot.valueCommit(_currentProp);
|
||||||
}
|
}
|
||||||
|
@@ -81,7 +81,7 @@ Item {
|
|||||||
MouseArea {
|
MouseArea {
|
||||||
id: iconMouseArea
|
id: iconMouseArea
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onPressed: {
|
onPressed: (mouse)=> {
|
||||||
// Ignore singleselection mouse presses when we have single object selected
|
// Ignore singleselection mouse presses when we have single object selected
|
||||||
// so that the icon gizmo doesn't hijack mouse clicks meant for other gizmos
|
// so that the icon gizmo doesn't hijack mouse clicks meant for other gizmos
|
||||||
if (iconGizmo.selected && !(mouse.modifiers & Qt.ControlModifier)
|
if (iconGizmo.selected && !(mouse.modifiers & Qt.ControlModifier)
|
||||||
@@ -90,8 +90,10 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onClicked: iconGizmo.clicked(iconGizmo.targetNode,
|
onClicked: (mouse)=> {
|
||||||
mouse.modifiers & Qt.ControlModifier)
|
iconGizmo.clicked(iconGizmo.targetNode,
|
||||||
|
mouse.modifiers & Qt.ControlModifier);
|
||||||
|
}
|
||||||
hoverEnabled: iconGizmo.highlightOnHover && !iconGizmo.selected
|
hoverEnabled: iconGizmo.highlightOnHover && !iconGizmo.selected
|
||||||
acceptedButtons: Qt.LeftButton
|
acceptedButtons: Qt.LeftButton
|
||||||
|
|
||||||
|
@@ -109,8 +109,12 @@ Node {
|
|||||||
lightGizmo.currentMousePos = currentMousePos;
|
lightGizmo.currentMousePos = currentMousePos;
|
||||||
lightGizmo.currentLabel = currentLabel;
|
lightGizmo.currentLabel = currentLabel;
|
||||||
}
|
}
|
||||||
onValueChange: lightGizmo.propertyValueChange(propName)
|
onValueChange: (propName)=> {
|
||||||
onValueCommit: lightGizmo.propertyValueCommit(propName)
|
lightGizmo.propertyValueChange(propName);
|
||||||
|
}
|
||||||
|
onValueCommit: (propName)=> {
|
||||||
|
lightGizmo.propertyValueCommit(propName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -223,8 +227,12 @@ Node {
|
|||||||
lightGizmo.currentMousePos = currentMousePos;
|
lightGizmo.currentMousePos = currentMousePos;
|
||||||
lightGizmo.currentLabel = currentLabel;
|
lightGizmo.currentLabel = currentLabel;
|
||||||
}
|
}
|
||||||
onValueChange: lightGizmo.propertyValueChange(propName)
|
onValueChange: (propName)=> {
|
||||||
onValueCommit: lightGizmo.propertyValueCommit(propName)
|
lightGizmo.propertyValueChange(propName);
|
||||||
|
}
|
||||||
|
onValueCommit: (propName)=> {
|
||||||
|
lightGizmo.propertyValueCommit(propName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Node {
|
Node {
|
||||||
@@ -322,17 +330,17 @@ Node {
|
|||||||
targetNode.brightness = currentValue;
|
targetNode.brightness = currentValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
onPressed: {
|
onPressed: (mouseArea, screenPos)=> {
|
||||||
_startBrightness = targetNode.brightness;
|
_startBrightness = targetNode.brightness;
|
||||||
updateBrightness(0, screenPos);
|
updateBrightness(0, screenPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
onDragged: {
|
onDragged: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> {
|
||||||
updateBrightness(relativeDistance, screenPos);
|
updateBrightness(relativeDistance, screenPos);
|
||||||
lightGizmo.propertyValueChange("brightness");
|
lightGizmo.propertyValueChange("brightness");
|
||||||
}
|
}
|
||||||
|
|
||||||
onReleased: {
|
onReleased: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> {
|
||||||
updateBrightness(relativeDistance, screenPos);
|
updateBrightness(relativeDistance, screenPos);
|
||||||
lightGizmo.propertyValueCommit("brightness");
|
lightGizmo.propertyValueCommit("brightness");
|
||||||
}
|
}
|
||||||
|
@@ -105,9 +105,15 @@ Model {
|
|||||||
active: rootModel.active
|
active: rootModel.active
|
||||||
dragHelper: rootModel.dragHelper
|
dragHelper: rootModel.dragHelper
|
||||||
|
|
||||||
onPressed: rootModel.handlePressed(mouseArea, planePos)
|
onPressed: (planePos)=> {
|
||||||
onDragged: rootModel.handleDragged(mouseArea, planePos)
|
rootModel.handlePressed(mouseArea, planePos);
|
||||||
onReleased: rootModel.handleReleased(mouseArea, planePos)
|
}
|
||||||
|
onDragged: (planePos)=> {
|
||||||
|
rootModel.handleDragged(mouseArea, planePos);
|
||||||
|
}
|
||||||
|
onReleased: (planePos)=> {
|
||||||
|
rootModel.handleReleased(mouseArea, planePos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -48,14 +48,14 @@ PlanarDraggable {
|
|||||||
_generalHelper.restartMultiSelection();
|
_generalHelper.restartMultiSelection();
|
||||||
}
|
}
|
||||||
|
|
||||||
onDragged: {
|
onDragged: (mouseArea, sceneRelativeDistance)=> {
|
||||||
targetNode.position = localPos(sceneRelativeDistance);
|
targetNode.position = localPos(sceneRelativeDistance);
|
||||||
if (targetNode == multiSelectionNode)
|
if (targetNode == multiSelectionNode)
|
||||||
_generalHelper.moveMultiSelection(false);
|
_generalHelper.moveMultiSelection(false);
|
||||||
positionMove();
|
positionMove();
|
||||||
}
|
}
|
||||||
|
|
||||||
onReleased: {
|
onReleased: (mouseArea, sceneRelativeDistance)=> {
|
||||||
targetNode.position = localPos(sceneRelativeDistance);
|
targetNode.position = localPos(sceneRelativeDistance);
|
||||||
if (targetNode == multiSelectionNode)
|
if (targetNode == multiSelectionNode)
|
||||||
_generalHelper.moveMultiSelection(true);
|
_generalHelper.moveMultiSelection(true);
|
||||||
|
@@ -46,7 +46,7 @@ PlanarDraggable {
|
|||||||
_startScale = targetNode.scale;
|
_startScale = targetNode.scale;
|
||||||
}
|
}
|
||||||
|
|
||||||
onDragged: {
|
onDragged: (mouseArea, sceneRelativeDistance, relativeDistance)=> {
|
||||||
targetNode.scale = mouseArea.getNewScale(_startScale, relativeDistance.times(scale.x),
|
targetNode.scale = mouseArea.getNewScale(_startScale, relativeDistance.times(scale.x),
|
||||||
axisX, axisY);
|
axisX, axisY);
|
||||||
if (targetNode == multiSelectionNode)
|
if (targetNode == multiSelectionNode)
|
||||||
@@ -54,7 +54,7 @@ PlanarDraggable {
|
|||||||
scaleChange();
|
scaleChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
onReleased: {
|
onReleased: (mouseArea, sceneRelativeDistance, relativeDistance)=> {
|
||||||
targetNode.scale = mouseArea.getNewScale(_startScale, relativeDistance.times(scale.x),
|
targetNode.scale = mouseArea.getNewScale(_startScale, relativeDistance.times(scale.x),
|
||||||
axisX, axisY);
|
axisX, axisY);
|
||||||
if (targetNode == multiSelectionNode)
|
if (targetNode == multiSelectionNode)
|
||||||
|
@@ -279,9 +279,15 @@ Node {
|
|||||||
active: rotateGizmo.visible && !rotateGizmo.blocked
|
active: rotateGizmo.visible && !rotateGizmo.blocked
|
||||||
dragHelper: rotateGizmo.dragHelper
|
dragHelper: rotateGizmo.dragHelper
|
||||||
|
|
||||||
onPressed: freeRotator.handlePressed(screenPos)
|
onPressed: (planePos, screenPos)=> {
|
||||||
onDragged: freeRotator.handleDragged(screenPos)
|
freeRotator.handlePressed(screenPos);
|
||||||
onReleased: freeRotator.handleReleased(screenPos)
|
}
|
||||||
|
onDragged: (planePos, screenPos)=> {
|
||||||
|
freeRotator.handleDragged(screenPos);
|
||||||
|
}
|
||||||
|
onReleased: (planePos, screenPos)=> {
|
||||||
|
freeRotator.handleReleased(screenPos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -151,8 +151,14 @@ Model {
|
|||||||
minAngle: 0.05
|
minAngle: 0.05
|
||||||
dragHelper: rotateRing.dragHelper
|
dragHelper: rotateRing.dragHelper
|
||||||
|
|
||||||
onPressed: rotateRing.handlePressed(screenPos, angle)
|
onPressed: (planePos, screenPos, angle)=> {
|
||||||
onDragged: rotateRing.handleDragged(screenPos)
|
rotateRing.handlePressed(screenPos, angle);
|
||||||
onReleased: rotateRing.handleReleased(screenPos)
|
}
|
||||||
|
onDragged: (planePos, screenPos)=> {
|
||||||
|
rotateRing.handleDragged(screenPos);
|
||||||
|
}
|
||||||
|
onReleased: (planePos, screenPos)=> {
|
||||||
|
rotateRing.handleReleased(screenPos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -208,7 +208,7 @@ Node {
|
|||||||
scaler * _startScale.z);
|
scaler * _startScale.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
onPressed: {
|
onPressed: (planePos, screenPos)=> {
|
||||||
if (!scaleGizmo.targetNode)
|
if (!scaleGizmo.targetNode)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -221,7 +221,7 @@ Node {
|
|||||||
scaleGizmo.targetNode.scale.z);
|
scaleGizmo.targetNode.scale.z);
|
||||||
_startScreenPos = screenPos;
|
_startScreenPos = screenPos;
|
||||||
}
|
}
|
||||||
onDragged: {
|
onDragged: (planePos, screenPos)=> {
|
||||||
if (!scaleGizmo.targetNode)
|
if (!scaleGizmo.targetNode)
|
||||||
return;
|
return;
|
||||||
scaleGizmo.targetNode.scale = localScale(screenPos);
|
scaleGizmo.targetNode.scale = localScale(screenPos);
|
||||||
@@ -229,7 +229,7 @@ Node {
|
|||||||
_generalHelper.scaleMultiSelection(false);
|
_generalHelper.scaleMultiSelection(false);
|
||||||
scaleGizmo.scaleChange();
|
scaleGizmo.scaleChange();
|
||||||
}
|
}
|
||||||
onReleased: {
|
onReleased: (planePos, screenPos)=> {
|
||||||
if (!scaleGizmo.targetNode)
|
if (!scaleGizmo.targetNode)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@@ -55,7 +55,7 @@ DirectionalDraggable {
|
|||||||
_startScale = targetNode.scale;
|
_startScale = targetNode.scale;
|
||||||
}
|
}
|
||||||
|
|
||||||
onDragged: {
|
onDragged: (mouseArea, sceneRelativeDistance, relativeDistance)=> {
|
||||||
targetNode.scale = mouseArea.getNewScale(_startScale, Qt.vector2d(relativeDistance, 0),
|
targetNode.scale = mouseArea.getNewScale(_startScale, Qt.vector2d(relativeDistance, 0),
|
||||||
axis, Qt.vector3d(0, 0, 0));
|
axis, Qt.vector3d(0, 0, 0));
|
||||||
if (targetNode == multiSelectionNode)
|
if (targetNode == multiSelectionNode)
|
||||||
@@ -63,7 +63,7 @@ DirectionalDraggable {
|
|||||||
scaleChange();
|
scaleChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
onReleased: {
|
onReleased: (mouseArea, sceneRelativeDistance, relativeDistance)=> {
|
||||||
targetNode.scale = mouseArea.getNewScale(_startScale, Qt.vector2d(relativeDistance, 0),
|
targetNode.scale = mouseArea.getNewScale(_startScale, Qt.vector2d(relativeDistance, 0),
|
||||||
axis, Qt.vector3d(0, 0, 0));
|
axis, Qt.vector3d(0, 0, 0));
|
||||||
if (targetNode == multiSelectionNode)
|
if (targetNode == multiSelectionNode)
|
||||||
|
@@ -65,17 +65,17 @@ DirectionalDraggable {
|
|||||||
handleRoot.currentMousePos = screenPos;
|
handleRoot.currentMousePos = screenPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
onPressed: {
|
onPressed: (mouseArea, screenPos)=> {
|
||||||
_startAngle = propValue;
|
_startAngle = propValue;
|
||||||
updateAngle(0, screenPos);
|
updateAngle(0, screenPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
onDragged: {
|
onDragged: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> {
|
||||||
updateAngle(relativeDistance, screenPos);
|
updateAngle(relativeDistance, screenPos);
|
||||||
handleRoot.valueChange();
|
handleRoot.valueChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
onReleased: {
|
onReleased: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> {
|
||||||
updateAngle(relativeDistance, screenPos);
|
updateAngle(relativeDistance, screenPos);
|
||||||
handleRoot.valueCommit();
|
handleRoot.valueCommit();
|
||||||
}
|
}
|
||||||
|
@@ -148,6 +148,7 @@ QSSGRenderGraphObject *CameraGeometry::updateSpatialNode(QSSGRenderGraphObject *
|
|||||||
m_camera->mapToViewport({}, m_viewPortRect.width(), m_viewPortRect.height());
|
m_camera->mapToViewport({}, m_viewPortRect.width(), m_viewPortRect.height());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setStride(12); // Silence a warning
|
||||||
node = QQuick3DGeometry::updateSpatialNode(node);
|
node = QQuick3DGeometry::updateSpatialNode(node);
|
||||||
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
|
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
|
||||||
|
|
||||||
|
@@ -105,6 +105,7 @@ void GridGeometry::setIsCenterLine(bool enabled)
|
|||||||
|
|
||||||
QSSGRenderGraphObject *GridGeometry::updateSpatialNode(QSSGRenderGraphObject *node)
|
QSSGRenderGraphObject *GridGeometry::updateSpatialNode(QSSGRenderGraphObject *node)
|
||||||
{
|
{
|
||||||
|
setStride(12); // Silence a warning
|
||||||
node = QQuick3DGeometry::updateSpatialNode(node);
|
node = QQuick3DGeometry::updateSpatialNode(node);
|
||||||
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
|
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
|
||||||
geometry->clear();
|
geometry->clear();
|
||||||
|
@@ -79,6 +79,7 @@ QSSGRenderGraphObject *LightGeometry::updateSpatialNode(QSSGRenderGraphObject *n
|
|||||||
if (m_lightType == LightType::Invalid)
|
if (m_lightType == LightType::Invalid)
|
||||||
return node;
|
return node;
|
||||||
|
|
||||||
|
setStride(12); // Silence a warning
|
||||||
node = QQuick3DGeometry::updateSpatialNode(node);
|
node = QQuick3DGeometry::updateSpatialNode(node);
|
||||||
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
|
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
|
||||||
|
|
||||||
|
@@ -84,6 +84,7 @@ void LineGeometry::setEndPos(const QVector3D &pos)
|
|||||||
|
|
||||||
QSSGRenderGraphObject *LineGeometry::updateSpatialNode(QSSGRenderGraphObject *node)
|
QSSGRenderGraphObject *LineGeometry::updateSpatialNode(QSSGRenderGraphObject *node)
|
||||||
{
|
{
|
||||||
|
setStride(12); // Silence a warning
|
||||||
node = QQuick3DGeometry::updateSpatialNode(node);
|
node = QQuick3DGeometry::updateSpatialNode(node);
|
||||||
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
|
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
|
||||||
geometry->clear();
|
geometry->clear();
|
||||||
|
@@ -154,6 +154,7 @@ QSSGRenderGraphObject *SelectionBoxGeometry::updateSpatialNode(QSSGRenderGraphOb
|
|||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setStride(12); // Silence a warning
|
||||||
node = QQuick3DGeometry::updateSpatialNode(node);
|
node = QQuick3DGeometry::updateSpatialNode(node);
|
||||||
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
|
QSSGRenderGeometry *geometry = static_cast<QSSGRenderGeometry *>(node);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user