wasm: fix exporting

huxingyi · huxingyi · commit 2356a66a665d · 2023-08-26T12:46:57.000+10:00
diff --git a/application/SimpleHTTPServer_SharedArrayBuffer.py b/application/SimpleHTTPServer_SharedArrayBuffer.py
diff --git a/application/sources/document_window.cc b/application/sources/document_window.cc
@@ -62,13 +62,23 @@ void outputMessage(QtMsgType type, const QMessageLogContext& context, const QStr
         g_logBrowser->outputMessage(type, msg, context.file, context.line);
 }
 
-void ensureFileExtension(QString* filename, const QString extension)
+void DocumentWindow::ensureFileExtension(QString* filename, const QString& extension)
 {
     if (!filename->endsWith(extension)) {
         filename->append(extension);
     }
 }
 
+QString DocumentWindow::exportedFilename(const QString& filename, const QString& extension)
+{
+    QString finalName = filename;
+    if (!finalName.endsWith(extension))
+        finalName += extension;
+    if (finalName == extension)
+        finalName = "Untitled" + finalName;
+    return finalName;
+}
+
 const std::map<DocumentWindow*, dust3d::Uuid>& DocumentWindow::documentWindows()
 {
     return g_documentWindows;
@@ -331,9 +341,12 @@ DocumentWindow::DocumentWindow()
     connect(m_exportAsGlbAction, &QAction::triggered, this, &DocumentWindow::exportGlbResult, Qt::QueuedConnection);
     m_fileMenu->addAction(m_exportAsGlbAction);
 
+#if defined(Q_OS_WASM)
+#else
     m_exportAsFbxAction = new QAction(tr("Export as FBX..."), this);
     connect(m_exportAsFbxAction, &QAction::triggered, this, &DocumentWindow::exportFbxResult, Qt::QueuedConnection);
     m_fileMenu->addAction(m_exportAsFbxAction);
+#endif
 
     m_fileMenu->addSeparator();
 
@@ -875,7 +888,7 @@ void DocumentWindow::save()
             &snapshot,
             (!m_document->turnaround.isNull() && m_document->turnaroundPngByteArray.size() > 0) ? &m_document->turnaroundPngByteArray : nullptr)) {
         setCurrentFilename(m_currentFilename);
-        QFileDialog::saveFileContent(fileContent);
+        QFileDialog::saveFileContent(fileContent, exportedFilename(m_currentFilename, ".ds3"));
     }
 #else
     saveTo(m_currentFilename);
@@ -1074,13 +1087,25 @@ void DocumentWindow::open()
 
 void DocumentWindow::exportObjResult()
 {
+#if defined(Q_OS_WASM)
+    QByteArray fileData;
+    QTextStream stream(&fileData);
+    ModelMesh* resultMesh = m_document->takeResultMesh();
+    if (nullptr != resultMesh) {
+        resultMesh->exportAsObj(&stream);
+        delete resultMesh;
+    }
+    stream.flush();
+    QFileDialog::saveFileContent(fileData, exportedFilename(m_currentFilename, ".obj"));
+#else
     QString filename = QFileDialog::getSaveFileName(this, QString(), QString(),
         tr("Wavefront (*.obj)"));
     if (filename.isEmpty()) {
         return;
     }
     ensureFileExtension(&filename, ".obj");
     exportObjToFilename(filename);
+#endif
 }
 
 void DocumentWindow::exportObjToFilename(const QString& filename)
@@ -1126,13 +1151,31 @@ void DocumentWindow::exportFbxToFilename(const QString& filename)
 
 void DocumentWindow::exportGlbResult()
 {
+#if defined(Q_OS_WASM)
+    if (!m_document->isExportReady())
+        return;
+    QByteArray fileData;
+    dust3d::Object skeletonResult = m_document->currentUvMappedObject();
+    QImage* textureMetalnessRoughnessAmbientOcclusionImage = UvMapGenerator::combineMetalnessRoughnessAmbientOcclusionImages(m_document->textureMetalnessImage,
+        m_document->textureRoughnessImage,
+        m_document->textureAmbientOcclusionImage);
+    GlbFileWriter glbFileWriter(skeletonResult, m_currentFilename + ".glb",
+        m_document->textureImage, m_document->textureNormalImage, textureMetalnessRoughnessAmbientOcclusionImage);
+    {
+        QDataStream stream(&fileData, QIODeviceBase::Append);
+        glbFileWriter.save(stream);
+    }
+    delete textureMetalnessRoughnessAmbientOcclusionImage;
+    QFileDialog::saveFileContent(fileData, exportedFilename(m_currentFilename, ".glb"));
+#else
     QString filename = QFileDialog::getSaveFileName(this, QString(), QString(),
         tr("glTF Binary Format (*.glb)"));
     if (filename.isEmpty()) {
         return;
     }
     ensureFileExtension(&filename, ".glb");
     exportGlbToFilename(filename);
+#endif
 }
 
 void DocumentWindow::exportGlbToFilename(const QString& filename)
diff --git a/application/sources/document_window.h b/application/sources/document_window.h
@@ -178,6 +178,10 @@ public slots:
     SpinnableToolbarIcon* m_inprogressIndicator = nullptr;
 
     std::map<QKeySequence, QShortcut*> m_shortcutMap;
+
+private:
+    static void ensureFileExtension(QString* filename, const QString& extension);
+    static QString exportedFilename(const QString& filename, const QString& extension);
 };
 
 #endif
diff --git a/application/sources/glb_file.cc b/application/sources/glb_file.cc
@@ -278,13 +278,8 @@ GlbFileWriter::GlbFileWriter(dust3d::Object& object,
     alignJson();
 }
 
-bool GlbFileWriter::save()
+bool GlbFileWriter::save(QDataStream& output)
 {
-    QFile file(m_filename);
-    if (!file.open(QIODevice::WriteOnly)) {
-        return false;
-    }
-    QDataStream output(&file);
     output.setFloatingPointPrecision(QDataStream::SinglePrecision);
     output.setByteOrder(QDataStream::LittleEndian);
 
@@ -332,3 +327,13 @@ bool GlbFileWriter::save()
 
     return true;
 }
+
+bool GlbFileWriter::save()
+{
+    QFile file(m_filename);
+    if (!file.open(QIODevice::WriteOnly)) {
+        return false;
+    }
+    QDataStream output(&file);
+    return save(output);
+}
diff --git a/application/sources/glb_file.h b/application/sources/glb_file.h
@@ -21,6 +21,7 @@ class GlbFileWriter : public QObject {
         QImage* normalImage = nullptr,
         QImage* ormImage = nullptr);
     bool save();
+    bool save(QDataStream& output);
 
 private:
     QString m_filename;
diff --git a/application/sources/main.cc b/application/sources/main.cc
@@ -16,7 +16,7 @@ int main(int argc, char* argv[])
     QSurfaceFormat format;
     format.setDepthBufferSize(24);
     format.setAlphaBufferSize(8);
-    format.setSamples(4);
+    format.setSamples(8);
     QSurfaceFormat::setDefaultFormat(format);
 
     //QSurfaceFormat format = QSurfaceFormat::defaultFormat();
diff --git a/application/sources/model_offscreen_render.cc b/application/sources/model_offscreen_render.cc
@@ -101,7 +101,6 @@ QImage ModelOffscreenRender::toImage(const QSize& size)
     format.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
     format.setSamples(4);
     format.setTextureTarget(GL_TEXTURE_2D);
-    //format.setInternalTextureFormat(GL_RGBA32F_ARB);
     m_renderFbo = new QOpenGLFramebufferObject(size, format);
     m_renderFbo->bind();
 
