BigC
/
ArchitectureColoredPainting
4
2
Fork 0
Code Issues 6 Pull Requests Projects Releases 5 Wiki Activity

场景渲染增加纹理列表

main
wuyize 2023-04-08 21:07:10 +08:00
parent 4be720a677
commit 9cc5466abc
8 changed files with 113 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ArchitectureColoredPainting/RendererWidget.ui
View File

@ -85,23 +85,63 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0">
<property name="spacing">
<number>0</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QListWidget" name="textureListWidget">
<widget class="QTabWidget" name="tabWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<sizepolicy hsizetype="Maximum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>0</width>
<width>260</width>
<height>16777215</height>
</size>
</property>
<property name="tabPosition">
<enum>QTabWidget::West</enum>
</property>
<widget class="QWidget" name="textureTab">
<attribute name="title">
<string>纹理</string>
</attribute>
<layout class="QVBoxLayout" name="vboxLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4"/>
</item>
<item>
<widget class="QListWidget" name="textureListWidget">
<property name="styleSheet">
<string notr="true">QListWidget{
border: 0
}</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>

5
ArchitectureColoredPainting/src/Renderer/Model.cpp
View File

@ -112,6 +112,11 @@ void Renderer::Model::unloadModel()
maxPos = glm::vec3(std::numeric_limits<float>::min());
}
const std::unordered_map<std::string, std::tuple<std::string, glm::vec2, glm::vec2>>& Renderer::Model::getPaintingMap()
{
return paintingMap;
}
void Model::processNode(aiNode* node, const aiScene* scene, aiMatrix4x4 mat4)
{
// 处理节点所有的网格（如果有的话）

14
ArchitectureColoredPainting/src/Renderer/Model.h
View File

@ -10,18 +10,20 @@ namespace Renderer
class Model
{
public:
std::vector<QVector3D> AABB;
Model(QOpenGLContext* context, QOpenGLShaderProgram* shaderProgram, QOpenGLShaderProgram* paintingProgram, QOpenGLShaderProgram* shadowProgram, VirtualTextureManager* vtManager);
void draw();
void drawShadow();
void loadModel(QString path);
void unloadModel();
Model(QOpenGLContext* context, QOpenGLShaderProgram* shaderProgram, QOpenGLShaderProgram* paintingProgram, QOpenGLShaderProgram* shadowProgram, VirtualTextureManager* vtManager);
const std::unordered_map<std::string, std::tuple<std::string, glm::vec2, glm::vec2>>& getPaintingMap();
std::vector<QVector3D> AABB;
private:
QOpenGLContext* context = nullptr;
QOpenGLFunctions_4_5_Core* glFunc = nullptr;
QOpenGLShaderProgram* shaderProgram = nullptr;
QOpenGLShaderProgram* paintingProgram = nullptr;
QOpenGLShaderProgram* paintingProgram = nullptr;
QOpenGLShaderProgram* shadowProgram = nullptr;
VirtualTextureManager* vtManager = nullptr;
@ -29,11 +31,11 @@ namespace Renderer
* @brief key BaseColor路径 \n
* value json路径, 纹理坐标
*/
std::unordered_map<std::string, std::tuple<std::string, glm::vec2, glm::vec2>> paintingMap;
std::unordered_map<std::string, std::tuple<std::string, glm::vec2, glm::vec2>> paintingMap;
std::unordered_map<std::string, std::pair<GLuint, float>> paintingLoaded;
std::unordered_map<std::string, QOpenGLTexture> texturesLoaded;
std::vector<std::unique_ptr<Drawable>> meshes;
QDir directory; /// 模型所在路径
QString name; /// 模型文件名

5
ArchitectureColoredPainting/src/Renderer/RendererGLWidget.cpp
View File

@ -73,6 +73,11 @@ void RendererGLWidget::stopTimer()
timerId = -1;
}
const std::unordered_map<std::string, std::tuple<std::string, glm::vec2, glm::vec2>>& Renderer::RendererGLWidget::getPaintingMap()
{
return model->getPaintingMap();
}
void RendererGLWidget::setModel(QString path)
{
makeCurrent();

2
ArchitectureColoredPainting/src/Renderer/RendererGLWidget.h
View File

@ -25,6 +25,8 @@ namespace Renderer
void startTimer();
void stopTimer();
const std::unordered_map<std::string, std::tuple<std::string, glm::vec2, glm::vec2>>& getPaintingMap();
public slots:
void setModel(QString path);
void setMainLightPitch(float pitch);

62
ArchitectureColoredPainting/src/Renderer/RendererWidget.cpp
View File

@ -10,33 +10,67 @@ Renderer::RendererWidget::RendererWidget(QWidget* parent)
auto openAction = new QAction(QStringLiteral("´ò¿ª"), ui.openButton);
auto saveAction = new QAction(QStringLiteral("±£´æ"), ui.openButton);
auto refreshAction = new QAction(QStringLiteral("ÖØмÓÔØ"), ui.openButton);
auto testAction = new QAction(QStringLiteral("²âÊÔ"), ui.openButton);
auto test2Action = new QAction(QStringLiteral("²âÊÔ2"), ui.openButton);
ui.openButton->addMenuAction(openAction);
ui.openButton->addMenuAction(saveAction);
ui.openButton->addMenuAction(refreshAction);
//ui.openButton->addMenuAction(testAction);
//ui.openButton->addMenuAction(test2Action);
static QString modelFileName;
QObject::connect(openAction, &QAction::triggered, [&] {
QString fileName = QFileDialog::getOpenFileName(this, QStringLiteral("´ò¿ªÄ£ÐÍ"), QString(), QStringLiteral("glTF 2.0 (*.gltf)"));
qDebug() << fileName;
if (fileName != QString())
{
modelFileName = fileName;
ui.openGLWidget->setModel(fileName);
QStringList list;
for (auto& i : ui.openGLWidget->getPaintingMap())
{
auto& [paintingPath, leftBottom, rightTop] = i.second;
list.append(QString::fromStdString(paintingPath));
}
ui.textureListWidget->clear();
ui.textureListWidget->addItems(list);
}
});
QObject::connect(refreshAction, &QAction::triggered, [&] {
if (modelFileName != QString())
ui.openGLWidget->setModel(modelFileName);
});
QObject::connect(testAction, &QAction::triggered, [&] {
ui.openGLWidget->setModel("Models/Sponza/Sponza.gltf");
});
QObject::connect(test2Action, &QAction::triggered, [&] {
ui.openGLWidget->setModel("E:\\3D Objects\\Gate\\Gate.gltf");
});
QObject::connect(ui.tabWidget, &QTabWidget::tabBarClicked, [&] {
static bool hide = false;
static int maxWidth = ui.tabWidget->maximumWidth();
hide = !hide;
ui.tabWidget->setStyleSheet(hide
? "QTabBar::tab {background-color:rgba(0,0,0,0);} QTabBar::tab:hover{background-color: rgb(213, 213, 213);}"
: "QTabBar::tab:hover{background-color: rgb(213, 213, 213);}");
ui.tabWidget->setFixedWidth(hide ? ui.tabWidget->tabBar()->width() : maxWidth);
});
QObject::connect(ui.textureListWidget, &QListWidget::itemDoubleClicked, [&](QListWidgetItem* item) {
QString paintingPath = QFileInfo(modelFileName).dir().filePath(item->text());
qDebug() << paintingPath;
});
QObject::connect(ui.horizontalSlider, &QSlider::valueChanged,
ui.openGLWidget, &Renderer::RendererGLWidget::setMainLightPitch);
QObject::connect(ui.horizontalSlider_2, &QSlider::valueChanged,
ui.openGLWidget, &Renderer::RendererGLWidget::setMainLightYaw);
QObject::connect(ui.exposureSlider, &QSlider::valueChanged, [&](int value) {
ui.openGLWidget->setExposure(value / 100.f);
});
QObject::connect(openAction, &QAction::triggered, [&] {
QString fileName = QFileDialog::getOpenFileName(this, QStringLiteral("´ò¿ªÄ£ÐÍ"), QString(), QStringLiteral("glTF 2.0 (*.gltf)"));
qDebug() << fileName;
if (fileName != QString())
ui.openGLWidget->setModel(fileName);
});
QObject::connect(testAction, &QAction::triggered, [&] {
ui.openGLWidget->setModel("Models/Sponza/Sponza.gltf");
});
QObject::connect(test2Action, &QAction::triggered, [&] {
ui.openGLWidget->setModel("E:\\3D Objects\\Gate\\Gate.gltf");
});
});
ui.horizontalSlider->setValue(105);
ui.horizontalSlider_2->setValue(80);
ui.exposureSlider->setValue(60);

1
ArchitectureColoredPainting/src/Renderer/RendererWidget.h
View File

@ -13,6 +13,7 @@ namespace Renderer
~RendererWidget();
public slots:
void currentTabChanged(int index);
private:
Ui::RendererWidgetClass ui;

2
ArchitectureColoredPainting/src/Renderer/VirtualTextureManager.cpp
View File

@ -85,7 +85,7 @@ Renderer::VirtualTextureManager::VirtualTextureManager(GladGLContext* glMain)
//qDebug() << duration;
pageLoadDuration += duration;
}
std::this_thread::yield();
//std::this_thread::yield();
}
});