Skip to content
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

Jump to bottom

[3D] Fix Y-Z inversion in point3dsymbolwidget #51855

Merged
merged 2 commits into from
Feb 20, 2023
Merged

[3D] Fix Y-Z inversion in point3dsymbolwidget #51855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f07f43
point3dsymbolwidget: Allow negative values for spinBillboardHeight
ptitjano Jul 31, 2022
0218ece
point3dsymbolwidget: Fix Y-Z inversion
ptitjano Aug 2, 2022
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
27 changes: 17 additions & 10 deletions src/app/3d/qgspoint3dsymbolwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "qgssymbollayerutils.h"
#include "qgsphongmaterialsettings.h"
#include "qgsmarkersymbol.h"
#include "qgs3dutils.h"

QgsPoint3DSymbolWidget::QgsPoint3DSymbolWidget( QWidget *parent )
: Qgs3DSymbolWidget( parent )
Expand Down Expand Up @@ -155,11 +156,13 @@ void QgsPoint3DSymbolWidget::setSymbol( const QgsAbstract3DSymbol *symbol, QgsVe
// decompose the transform matrix
// assuming the last row has values [0 0 0 1]
// see https://math.stackexchange.com/questions/237369/given-this-transformation-matrix-how-do-i-decompose-it-into-translation-rotati
// A point on the 2D plane (x', y') is transformed to (x, -z) in the 3D world.
// The formula from stackexchange need to be changed to take into account the 3D representation.
QMatrix4x4 m = pointSymbol->transform();
float *md = m.data(); // returns data in column-major order
const float sx = QVector3D( md[0], md[1], md[2] ).length();
const float sy = QVector3D( md[4], md[5], md[6] ).length();
const float sz = QVector3D( md[8], md[9], md[10] ).length();
const float sz = QVector3D( md[4], md[5], md[6] ).length();
const float sy = QVector3D( md[8], md[9], md[10] ).length();
float rd[9] =
{
md[0] / sx, md[4] / sy, md[8] / sz,
Expand All @@ -168,17 +171,18 @@ void QgsPoint3DSymbolWidget::setSymbol( const QgsAbstract3DSymbol *symbol, QgsVe
};
const QMatrix3x3 rot3x3( rd ); // takes data in row-major order
const QVector3D rot = QQuaternion::fromRotationMatrix( rot3x3 ).toEulerAngles();
const QgsVector3D translationMapCoords( md[12], -md[14], md[13] );

spinBillboardHeight->setValue( md[13] );
spinTX->setValue( md[12] );
spinTY->setValue( md[13] );
spinTZ->setValue( md[14] );
spinTX->setValue( translationMapCoords.x() );
spinTY->setValue( translationMapCoords.y() );
spinTZ->setValue( translationMapCoords.z() );
spinSX->setValue( sx );
spinSY->setValue( sy );
spinSZ->setValue( sz );
spinRX->setValue( QgsLayoutUtils::normalizedAngle( rot.x() ) );
spinRY->setValue( QgsLayoutUtils::normalizedAngle( rot.y() ) );
spinRZ->setValue( QgsLayoutUtils::normalizedAngle( rot.z() ) );
spinRY->setValue( QgsLayoutUtils::normalizedAngle( 360.0 - rot.z() ) );
spinRZ->setValue( QgsLayoutUtils::normalizedAngle( rot.y() ) );
}

QgsAbstract3DSymbol *QgsPoint3DSymbolWidget::symbol()
Expand Down Expand Up @@ -218,9 +222,12 @@ QgsAbstract3DSymbol *QgsPoint3DSymbolWidget::symbol()
break;
}

const QQuaternion rot( QQuaternion::fromEulerAngles( spinRX->value(), spinRY->value(), spinRZ->value() ) );
const QVector3D sca( spinSX->value(), spinSY->value(), spinSZ->value() );
const QVector3D tra( spinTX->value(), spinTY->value(), spinTZ->value() );
// A point on the 2D plane (x', y') is transformed to (x, -z) in the 3D world.
// The rotation, scale and translation values need to be converted in the 3D world.
const QgsVector3D translationWorldCoords( spinTX->value(), spinTZ->value(), -spinTY->value() );
const QQuaternion rot( QQuaternion::fromEulerAngles( static_cast<float>( spinRX->value() ), static_cast<float>( spinRZ->value() ), static_cast<float>( 360.0 - spinRY->value() ) ) );
const QVector3D sca( static_cast<float>( spinSX->value() ), static_cast<float>( spinSZ->value() ), static_cast<float>( spinSY->value() ) );
const QVector3D tra( static_cast<float>( translationWorldCoords.x() ), static_cast<float>( translationWorldCoords.y() ), static_cast<float>( translationWorldCoords.z() ) );

QMatrix4x4 tr;
tr.translate( tra );
Expand Down
3 changes: 3 additions & 0 deletions src/ui/3d/point3dsymbolwidget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,9 @@
<property name="maximum">
<double>99999.000000000000000</double>
</property>
<property name="minimum">
<double>-99999.000000000000000</double>
</property>
</widget>
</item>
<item row="4" column="0">
Expand Down