Skip to content
This repository was archived by the owner on Jan 14, 2023. It is now read-only.

[qt6] fix misc. changes and incompatibilities #23

Open
monsieurgustav wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[qt6] fix misc. changes and incompatibilities #23

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
d2ec51a
[qt6] fix misc. changes and incompatibilities
monsieurgustav May 31, 2022
80611d0
[qt6] Add src/depthMapEntity for all builds
cbentejac Sep 9, 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
11 changes: 2 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) # needed for automoc

find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)


Expand All @@ -51,12 +52,4 @@ add_definitions(-DQT_NO_DEBUG_OUTPUT)
add_definitions(-DQTOIIO_USE_FORMATS_BLACKLIST)

add_subdirectory(src/imageIOHandler)

# TODO: Make it works for Qt6
# Add to Qt5 only for the moment since 3dcore
# is not part of the distribution anymore.
# Source: https://www.kdab.com/qt-3d-changes-in-qt-6/
if(Qt5_FOUND)
add_subdirectory(src/depthMapEntity)
endif()
# add_subdirectory(src/depthMapEntity)
add_subdirectory(src/depthMapEntity)
53 changes: 27 additions & 26 deletions src/depthMapEntity/DepthMapEntity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
#include <Qt3DRender/QRenderPass>
#include <Qt3DRender/QShaderProgram>

#include <Qt3DRender/QAttribute>
#include <Qt3DRender/QBuffer>
#include <Qt3DCore/QAttribute>
#include <Qt3DCore/QBuffer>
#include <Qt3DCore/QTransform>
#include <Qt3DCore/QGeometry>

#include <QDebug>

Expand Down Expand Up @@ -338,7 +339,7 @@ void DepthMapEntity::loadDepthMap()
point3d p = CArr + (iCamArr * point2d((double)x, (double)y)).normalize() * depthValue;
Vec3f position(p.x, -p.y, -p.z);

indexPerPixel[y * inSpec.width + x] = positions.size();
indexPerPixel[y * inSpec.width + x] = (int)positions.size();
positions.push_back(position);

if(validSimMap)
Expand All @@ -361,7 +362,7 @@ void DepthMapEntity::loadDepthMap()
qDebug() << "[DepthMapEntity] Valid Depth Values: " << positions.size();

// create geometry
QGeometry* customGeometry = new QGeometry;
auto* customGeometry = new Qt3DCore::QGeometry;

// vertices buffer
std::vector<int> trianglesIndexes;
Expand Down Expand Up @@ -411,33 +412,33 @@ void DepthMapEntity::loadDepthMap()
normals[i+t] = normal;
}

QBuffer* vertexBuffer = new QBuffer(QBuffer::VertexBuffer);
Qt3DCore::QBuffer* vertexBuffer = new Qt3DCore::QBuffer;
QByteArray trianglesData((const char*)&triangles[0], triangles.size() * sizeof(Vec3f));
vertexBuffer->setData(trianglesData);

QBuffer* normalBuffer = new QBuffer(QBuffer::VertexBuffer);
Qt3DCore::QBuffer* normalBuffer = new Qt3DCore::QBuffer;
QByteArray normalsData((const char*)&normals[0], normals.size() * sizeof(Vec3f));
normalBuffer->setData(normalsData);

QAttribute* positionAttribute = new QAttribute(this);
positionAttribute->setName(QAttribute::defaultPositionAttributeName());
positionAttribute->setAttributeType(QAttribute::VertexAttribute);
Qt3DCore::QAttribute* positionAttribute = new Qt3DCore::QAttribute(this);
positionAttribute->setName(Qt3DCore::QAttribute::defaultPositionAttributeName());
positionAttribute->setAttributeType(Qt3DCore::QAttribute::VertexAttribute);
positionAttribute->setBuffer(vertexBuffer);
positionAttribute->setDataType(QAttribute::Float);
positionAttribute->setDataSize(3);
positionAttribute->setVertexBaseType(Qt3DCore::QAttribute::Float);
positionAttribute->setVertexSize(3);
positionAttribute->setByteOffset(0);
positionAttribute->setByteStride(sizeof(Vec3f));
positionAttribute->setCount(triangles.size());
positionAttribute->setCount((uint)triangles.size());

QAttribute* normalAttribute = new QAttribute(this);
normalAttribute->setName(QAttribute::defaultNormalAttributeName());
normalAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
Qt3DCore::QAttribute* normalAttribute = new Qt3DCore::QAttribute(this);
normalAttribute->setName(Qt3DCore::QAttribute::defaultNormalAttributeName());
normalAttribute->setAttributeType(Qt3DCore::QAttribute::VertexAttribute);
normalAttribute->setBuffer(normalBuffer);
normalAttribute->setDataType(QAttribute::Float);
normalAttribute->setDataSize(3);
normalAttribute->setVertexBaseType(Qt3DCore::QAttribute::Float);
normalAttribute->setVertexSize(3);
normalAttribute->setByteOffset(0);
normalAttribute->setByteStride(sizeof(Vec3f));
normalAttribute->setCount(normals.size());
normalAttribute->setCount((uint)normals.size());

customGeometry->addAttribute(positionAttribute);
customGeometry->addAttribute(normalAttribute);
Expand All @@ -452,20 +453,20 @@ void DepthMapEntity::loadDepthMap()
}

// read color data
QBuffer* colorDataBuffer = new QBuffer(QBuffer::VertexBuffer);
Qt3DCore::QBuffer* colorDataBuffer = new Qt3DCore::QBuffer;
QByteArray colorData((const char*)colorsFlat[0].m, colorsFlat.size() * 3 * sizeof(float));
colorDataBuffer->setData(colorData);

QAttribute* colorAttribute = new QAttribute;
qDebug() << "Qt3DRender::QAttribute::defaultColorAttributeName(): " << Qt3DRender::QAttribute::defaultColorAttributeName();
colorAttribute->setName(Qt3DRender::QAttribute::defaultColorAttributeName());
colorAttribute->setAttributeType(QAttribute::VertexAttribute);
Qt3DCore::QAttribute* colorAttribute = new Qt3DCore::QAttribute;
qDebug() << "Qt3DRender::QAttribute::defaultColorAttributeName(): " << Qt3DCore::QAttribute::defaultColorAttributeName();
colorAttribute->setName(Qt3DCore::QAttribute::defaultColorAttributeName());
colorAttribute->setAttributeType(Qt3DCore::QAttribute::VertexAttribute);
colorAttribute->setBuffer(colorDataBuffer);
colorAttribute->setDataType(QAttribute::Float);
colorAttribute->setDataSize(3);
colorAttribute->setVertexBaseType(Qt3DCore::QAttribute::Float);
colorAttribute->setVertexSize(3);
colorAttribute->setByteOffset(0);
colorAttribute->setByteStride(3 * sizeof(float));
colorAttribute->setCount(colorsFlat.size());
colorAttribute->setCount((uint)colorsFlat.size());
customGeometry->addAttribute(colorAttribute);

// create the geometry renderer
Expand Down