wasm: update environment texture loading method

huxingyi · huxingyi · commit 1489c8dffc19 · 2023-08-26T12:46:57.000+10:00
diff --git a/application/SimpleHTTPServer_SharedArrayBuffer.py b/application/SimpleHTTPServer_SharedArrayBuffer.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+from http.server import HTTPServer, SimpleHTTPRequestHandler, test
+import sys
+
+class SimpleHTTPServer_SharedArrayBuffer (SimpleHTTPRequestHandler):
+    def end_headers (self):
+        self.send_header('Cross-Origin-Opener-Policy', 'same-origin')
+        self.send_header('Cross-Origin-Embedder-Policy', 'require-corp')
+        SimpleHTTPRequestHandler.end_headers(self)
+
+if __name__ == '__main__':
+    test(SimpleHTTPServer_SharedArrayBuffer, HTTPServer, port=int(sys.argv[1]) if len(sys.argv) > 1 else 8000)
diff --git a/application/application.pro b/application/application.pro
@@ -88,6 +88,9 @@ macx {
     QMAKE_BUNDLE_DATA += RESOURCE_FILES
 }
 
+QMAKE_LFLAGS += -sFULL_ES3=1
+QMAKE_LFLAGS += -sASYNCIFY -Os
+
 RESOURCES += resources.qrc
 
 INCLUDEPATH += ../
diff --git a/application/shaders/model.frag b/application/shaders/model.frag
@@ -1,4 +1,3 @@
-#version 100
 precision highp float;
 precision highp int;
 uniform sampler2D environmentIrradianceMapId[6];
diff --git a/application/shaders/model.vert b/application/shaders/model.vert
@@ -1,4 +1,3 @@
-#version 100
 attribute vec4 vertex;
 attribute vec3 normal;
 attribute vec3 color;
diff --git a/application/shaders/monochrome.frag b/application/shaders/monochrome.frag
@@ -1,4 +1,3 @@
-#version 100
 precision highp float;
 precision highp int;
 varying vec3 pointPosition;
diff --git a/application/shaders/monochrome.vert b/application/shaders/monochrome.vert
@@ -1,4 +1,3 @@
-#version 100
 attribute vec4 vertex;
 attribute vec3 color;
 attribute float alpha;
diff --git a/application/sources/dds_file.cc b/application/sources/dds_file.cc
@@ -488,13 +488,8 @@ std::unique_ptr<std::vector<std::unique_ptr<QOpenGLTexture>>> DdsFileReader::cre
         for (quint32 face = 0; face < faces; ++face) {
             for (quint32 level = 0; level < mipMapCount; ++level) {
                 if (0 == layer && 0 == level) {
-                    QOpenGLTexture* texture = new QOpenGLTexture(QOpenGLTexture::Target2D);
-                    texture->setMinificationFilter(QOpenGLTexture::NearestMipMapNearest);
-                    texture->setMagnificationFilter(QOpenGLTexture::Nearest);
-                    texture->setFormat(QOpenGLTexture::RGBA16F);
-                    texture->setSize(width, height, depth);
-                    texture->allocateStorage(QOpenGLTexture::RGBA, QOpenGLTexture::Float16);
-                    texture->setData(QOpenGLTexture::RGBA, QOpenGLTexture::Float16, data.constData() + dataOffset);
+                    QImage image((uchar *)(data.constData() + dataOffset), width, height, QImage::Format_RGBA16FPx4);
+                    QOpenGLTexture* texture = new QOpenGLTexture(image);
                     textures->at(face).reset(texture);
                 }
                 dataOffset += calculateOneFaceSizeAtLevel(level);
diff --git a/application/sources/document_window.cc b/application/sources/document_window.cc
@@ -1168,6 +1168,8 @@ void DocumentWindow::checkExportWaitingList()
 
 void DocumentWindow::generateComponentPreviewImages()
 {
+    return;
+    
     if (nullptr != m_componentPreviewImagesGenerator) {
         m_isComponentPreviewImagesObsolete = true;
         return;
diff --git a/application/sources/main.cc b/application/sources/main.cc
@@ -13,6 +13,11 @@ int main(int argc, char* argv[])
 {
     QApplication app(argc, argv);
 
+    QSurfaceFormat format;
+    format.setDepthBufferSize(24);
+    format.setSamples(4);
+    QSurfaceFormat::setDefaultFormat(format);
+
     //QSurfaceFormat format = QSurfaceFormat::defaultFormat();
     //format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
     //format.setVersion(3, 3);

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ macx {`
`88`	`88`	`QMAKE_BUNDLE_DATA += RESOURCE_FILES`
`89`	`89`	`}`
`90`	`90`
	`91`	`+QMAKE_LFLAGS += -sFULL_ES3=1`
	`92`	`+QMAKE_LFLAGS += -sASYNCIFY -Os`
	`93`	`+`
`91`	`94`	`RESOURCES += resources.qrc`
`92`	`95`
`93`	`96`	`INCLUDEPATH += ../`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#version 100`
`2`	`1`	`precision highp float;`
`3`	`2`	`precision highp int;`
`4`	`3`	`uniform sampler2D environmentIrradianceMapId[6];`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#version 100`
`2`	`1`	`attribute vec4 vertex;`
`3`	`2`	`attribute vec3 normal;`
`4`	`3`	`attribute vec3 color;`
Original file line number	Diff line number	Diff line change
`@@ -1168,6 +1168,8 @@ void DocumentWindow::checkExportWaitingList()`
`1168`	`1168`
`1169`	`1169`	`void DocumentWindow::generateComponentPreviewImages()`
`1170`	`1170`	`{`
	`1171`	`+ return;`
	`1172`	`+`
`1171`	`1173`	`if (nullptr != m_componentPreviewImagesGenerator) {`
`1172`	`1174`	`m_isComponentPreviewImagesObsolete = true;`
`1173`	`1175`	`return;`