diff --git a/src/quick3d/qdemonimage.cpp b/src/quick3d/qdemonimage.cpp index e7c90d718a8ad6aa99545b0490e0653609b45f1e..83ef4aa73391ba165df4fdb69ed7e2ca5a339f79 100644 --- a/src/quick3d/qdemonimage.cpp +++ b/src/quick3d/qdemonimage.cpp @@ -17,52 +17,52 @@ QUrl QDemonImage::source() const float QDemonImage::scaleU() const { - return m_scaleu; + return m_scaleU; } float QDemonImage::scaleV() const { - return m_scalev; + return m_scaleV; } QDemonImage::MappingMode QDemonImage::mappingMode() const { - return m_mappingmode; + return m_mappingMode; } QDemonImage::TilingMode QDemonImage::horizontalTiling() const { - return m_tilingmodehorz; + return m_tilingModeHorizontal; } QDemonImage::TilingMode QDemonImage::verticalTiling() const { - return m_tilingmodevert; + return m_tilingModeVertical; } float QDemonImage::rotationUV() const { - return m_rotationuv; + return m_rotationUV; } float QDemonImage::positionU() const { - return m_positionu; + return m_positionU; } float QDemonImage::positionV() const { - return m_positionv; + return m_positionV; } float QDemonImage::pivotU() const { - return m_pivotu; + return m_pivotU; } float QDemonImage::pivotV() const { - return m_pivotv; + return m_pivotV; } QDemonObject::Type QDemonImage::type() const @@ -80,103 +80,103 @@ void QDemonImage::setSource(const QUrl &source) update(); } -void QDemonImage::setScaleU(float scaleu) +void QDemonImage::setScaleU(float scaleU) { - if (qFuzzyCompare(m_scaleu, scaleu)) + if (qFuzzyCompare(m_scaleU, scaleU)) return; - m_scaleu = scaleu; - emit scaleUChanged(m_scaleu); + m_scaleU = scaleU; + emit scaleUChanged(m_scaleU); update(); } -void QDemonImage::setScaleV(float scalev) +void QDemonImage::setScaleV(float scaleV) { - if (qFuzzyCompare(m_scalev, scalev)) + if (qFuzzyCompare(m_scaleV, scaleV)) return; - m_scalev = scalev; - emit scaleVChanged(m_scalev); + m_scaleV = scaleV; + emit scaleVChanged(m_scaleV); update(); } -void QDemonImage::setMappingMode(QDemonImage::MappingMode mappingmode) +void QDemonImage::setMappingMode(QDemonImage::MappingMode mappingMode) { - if (m_mappingmode == mappingmode) + if (m_mappingMode == mappingMode) return; - m_mappingmode = mappingmode; - emit mappingModeChanged(m_mappingmode); + m_mappingMode = mappingMode; + emit mappingModeChanged(m_mappingMode); update(); } -void QDemonImage::setHorizontalTiling(QDemonImage::TilingMode tilingmodehorz) +void QDemonImage::setHorizontalTiling(QDemonImage::TilingMode tilingModeHorizontal) { - if (m_tilingmodehorz == tilingmodehorz) + if (m_tilingModeHorizontal == tilingModeHorizontal) return; - m_tilingmodehorz = tilingmodehorz; - emit horizontalTilingChanged(m_tilingmodehorz); + m_tilingModeHorizontal = tilingModeHorizontal; + emit horizontalTilingChanged(m_tilingModeHorizontal); update(); } -void QDemonImage::setVerticalTiling(QDemonImage::TilingMode tilingmodevert) +void QDemonImage::setVerticalTiling(QDemonImage::TilingMode tilingModeVertical) { - if (m_tilingmodevert == tilingmodevert) + if (m_tilingModeVertical == tilingModeVertical) return; - m_tilingmodevert = tilingmodevert; - emit verticalTilingChanged(m_tilingmodevert); + m_tilingModeVertical = tilingModeVertical; + emit verticalTilingChanged(m_tilingModeVertical); update(); } -void QDemonImage::setRotationUV(float rotationuv) +void QDemonImage::setRotationUV(float rotationUV) { - if (qFuzzyCompare(m_rotationuv, rotationuv)) + if (qFuzzyCompare(m_rotationUV, rotationUV)) return; - m_rotationuv = rotationuv; - emit rotationUVChanged(m_rotationuv); + m_rotationUV = rotationUV; + emit rotationUVChanged(m_rotationUV); update(); } -void QDemonImage::setPositionU(float positionu) +void QDemonImage::setPositionU(float positionU) { - if (qFuzzyCompare(m_positionu, positionu)) + if (qFuzzyCompare(m_positionU, positionU)) return; - m_positionu = positionu; - emit positionUChanged(m_positionu); + m_positionU = positionU; + emit positionUChanged(m_positionU); update(); } -void QDemonImage::setPositionV(float positionv) +void QDemonImage::setPositionV(float positionV) { - if (qFuzzyCompare(m_positionv, positionv)) + if (qFuzzyCompare(m_positionV, positionV)) return; - m_positionv = positionv; - emit positionVChanged(m_positionv); + m_positionV = positionV; + emit positionVChanged(m_positionV); update(); } -void QDemonImage::setPivotU(float pivotu) +void QDemonImage::setPivotU(float pivotU) { - if (qFuzzyCompare(m_pivotu, pivotu)) + if (qFuzzyCompare(m_pivotU, pivotU)) return; - m_pivotu = pivotu; - emit pivotUChanged(m_pivotu); + m_pivotU = pivotU; + emit pivotUChanged(m_pivotU); update(); } -void QDemonImage::setPivotV(float pivotv) +void QDemonImage::setPivotV(float pivotV) { - if (qFuzzyCompare(m_pivotv, pivotv)) + if (qFuzzyCompare(m_pivotV, pivotV)) return; - m_pivotv = pivotv; - emit pivotVChanged(m_pivotv); + m_pivotV = pivotV; + emit pivotVChanged(m_pivotV); update(); } @@ -188,13 +188,13 @@ QDemonRenderGraphObject *QDemonImage::updateSpatialNode(QDemonRenderGraphObject auto imageNode = static_cast<QDemonRenderImage *>(node); imageNode->m_imagePath = QQmlFile::urlToLocalFileOrQrc(m_source); - imageNode->m_scale = QVector2D(m_scaleu, m_scalev); - imageNode->m_pivot = QVector2D(m_pivotu, m_pivotv); - imageNode->m_rotation = m_rotationuv; - imageNode->m_position = QVector2D(m_positionu, m_positionv); - imageNode->m_mappingMode = QDemonRenderImage::MappingModes(m_mappingmode); - imageNode->m_horizontalTilingMode = QDemonRenderTextureCoordOp(m_tilingmodehorz); - imageNode->m_verticalTilingMode = QDemonRenderTextureCoordOp(m_tilingmodevert); + imageNode->m_scale = QVector2D(m_scaleU, m_scaleV); + imageNode->m_pivot = QVector2D(m_pivotU, m_pivotV); + imageNode->m_rotation = m_rotationUV; + imageNode->m_position = QVector2D(m_positionU, m_positionV); + imageNode->m_mappingMode = QDemonRenderImage::MappingModes(m_mappingMode); + imageNode->m_horizontalTilingMode = QDemonRenderTextureCoordOp(m_tilingModeHorizontal); + imageNode->m_verticalTilingMode = QDemonRenderTextureCoordOp(m_tilingModeVertical); // ### Make this more conditional imageNode->m_flags.setFlag(QDemonRenderImage::Flag::Dirty); imageNode->m_flags.setFlag(QDemonRenderImage::Flag::TransformDirty); diff --git a/src/quick3d/qdemonimage.h b/src/quick3d/qdemonimage.h index 70c03bfa9889d7a24fbc06a8c66c980d88abdfdc..88f8789638edc04024a313af19337fc93ed5c0a4 100644 --- a/src/quick3d/qdemonimage.h +++ b/src/quick3d/qdemonimage.h @@ -60,16 +60,16 @@ public: public Q_SLOTS: void setSource(const QUrl &source); - void setScaleU(float scaleu); - void setScaleV(float scalev); - void setMappingMode(MappingMode mappingmode); - void setHorizontalTiling(TilingMode tilingmodehorz); - void setVerticalTiling(TilingMode tilingmodevert); - void setRotationUV(float rotationuv); - void setPositionU(float positionu); - void setPositionV(float positionv); - void setPivotU(float pivotu); - void setPivotV(float pivotv); + void setScaleU(float scaleU); + void setScaleV(float scaleV); + void setMappingMode(MappingMode mappingMode); + void setHorizontalTiling(TilingMode tilingModeHorizontal); + void setVerticalTiling(TilingMode tilingModeVertical); + void setRotationUV(float rotationUV); + void setPositionU(float positionU); + void setPositionV(float positionV); + void setPivotU(float pivotU); + void setPivotV(float pivotV); Q_SIGNALS: void sourceChanged(const QUrl &source); @@ -89,16 +89,16 @@ protected: private: QUrl m_source; - float m_scaleu = 1.0f; - float m_scalev = 1.0f; - MappingMode m_mappingmode = Normal; - TilingMode m_tilingmodehorz = ClampToEdge; - TilingMode m_tilingmodevert = ClampToEdge; - float m_rotationuv = 0; - float m_positionu = 0; - float m_positionv = 0; - float m_pivotu = 0; - float m_pivotv = 0; + float m_scaleU = 1.0f; + float m_scaleV = 1.0f; + MappingMode m_mappingMode = Normal; + TilingMode m_tilingModeHorizontal = ClampToEdge; + TilingMode m_tilingModeVertical = ClampToEdge; + float m_rotationUV = 0; + float m_positionU = 0; + float m_positionV = 0; + float m_pivotU = 0; + float m_pivotV = 0; }; QT_END_NAMESPACE