[更新Qt版本及OpenGL着色器文件]: 更新Qt版本至6.7.2，并修改OpenGL着色器文件的路径和扩展名

- 更新了`action.yml`文件中的Qt版本默认值由`6.7.0`至`6.7.2`
- 调整了`cmake/qt.cmake`文件，将Qt的路径从`6.7.0`变更为`6.7.2`，适用于不同操作系统
- 删除并重新创建了OpenGL着色器文件，将`.frag`和`.vert`文件扩展名更改为`.glsl`，并更新了`openglview.cc`中的引用
- 更新了`shader.qrc`文件，以包含新的着色器文件路径
- 移除了旧的着色器文件`texture.frag`和`texture.vert`，并添加了新的着色器文件`texture_frag.glsl`和`texture_vert.glsl`
- 更新了`vcpkg.json`文件，将内置基线从`dee924de74e81388140a53c32a919ecec57d20ab`变更为`fe1cde61e971d53c9687cf9a46308f8f55da19fa`

.github/actions/install-dependencies/action.yml

@@ -18,7 +18,7 @@ inputs:
   qt_ver:
     description: 'qt version'
     required: false
-    default: '6.7.0'
+    default: '6.7.2'
     type: string
 
 runs:

cmake/qt.cmake

@@ -1,7 +1,7 @@
 if(CMAKE_HOST_WIN32)
-  list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.7.0\\msvc2019_64")
+  list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.7.2\\msvc2019_64")
 elseif(CMAKE_HOST_APPLE)
 
 elseif(CMAKE_HOST_LINUX)
-  list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.7.0/gcc_64")
+  list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.7.2/gcc_64")
 endif()

src/gpugraphics/openglview.cc

@@ -87,8 +87,7 @@ void OpenglView::resetToOriginalSize()
     d_ptr->transform.scale(factor_w, factor_h, 1.0);
     emit emitScaleFactor();
 
-    QMetaObject::invokeMethod(
-        this, [this] { update(); }, Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, [this] { update(); }, Qt::QueuedConnection);
 }
 
 void OpenglView::fitToScreen()
@@ -105,24 +104,21 @@ void OpenglView::fitToScreen()
     d_ptr->transform.scale(factor / factor_w, factor / factor_h, 1.0);
     emit emitScaleFactor();
 
-    QMetaObject::invokeMethod(
-        this, [this] { update(); }, Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, [this] { update(); }, Qt::QueuedConnection);
 }
 
 void OpenglView::rotateNinetieth()
 {
     d_ptr->transform.rotate(90, 0, 0, 1);
 
-    QMetaObject::invokeMethod(
-        this, [this] { update(); }, Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, [this] { update(); }, Qt::QueuedConnection);
 }
 
 void OpenglView::anti_rotateNinetieth()
 {
     d_ptr->transform.rotate(-90, 0, 0, 1);
 
-    QMetaObject::invokeMethod(
-        this, [this] { update(); }, Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, [this] { update(); }, Qt::QueuedConnection);
 }
 
 void OpenglView::initializeGL()
@@ -136,8 +132,9 @@ void OpenglView::initializeGL()
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
     d_ptr->programPtr.reset(new OpenGLShaderProgram(this));
-    d_ptr->programPtr->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shader/texture.vert");
-    d_ptr->programPtr->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shader/texture.frag");
+    d_ptr->programPtr->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shader/texture_vert.glsl");
+    d_ptr->programPtr->addShaderFromSourceFile(QOpenGLShader::Fragment,
+                                               ":/shader/texture_frag.glsl");
     d_ptr->programPtr->link();
     d_ptr->programPtr->bind();
 
@@ -161,8 +158,7 @@ void OpenglView::resizeGL(int w, int h)
     }
     d_ptr->windowSize = QSize(w, h);
 
-    QMetaObject::invokeMethod(
-        this, [this] { update(); }, Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, [this] { update(); }, Qt::QueuedConnection);
 }
 
 void OpenglView::paintGL()
@@ -195,8 +191,7 @@ void OpenglView::wheelEvent(QWheelEvent *event)
     d_ptr->transform.scale(factor, factor, 1.0);
     emit emitScaleFactor();
 
-    QMetaObject::invokeMethod(
-        this, [this] { update(); }, Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, [this] { update(); }, Qt::QueuedConnection);
 }
 
 void OpenglView::mouseDoubleClickEvent(QMouseEvent *event)

src/gpugraphics/shader.qrc

@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file>shader/texture.frag</file>
-        <file>shader/texture.vert</file>
+        <file>shader/texture_frag.glsl</file>
+        <file>shader/texture_vert.glsl</file>
     </qresource>
 </RCC>

src/gpugraphics/shader/texture_frag.glsl

@@ -0,0 +1,14 @@
+#version 330
+#ifdef GL_ARB_shading_language_420pack
+#extension GL_ARB_shading_language_420pack : require
+#endif
+
+uniform sampler2D tex;
+
+layout(location = 0) out vec4 FragColor;
+in vec2 TexCord;
+
+void main()
+{
+    FragColor = texture(tex, TexCord);
+}

src/gpugraphics/shader/texture_vert.glsl

@@ -0,0 +1,16 @@
+#version 330
+#ifdef GL_ARB_shading_language_420pack
+#extension GL_ARB_shading_language_420pack : require
+#endif
+
+uniform mat4 transform;
+
+out vec2 TexCord;
+layout(location = 0) in vec3 aPos;
+layout(location = 1) in vec2 aTexCord;
+
+void main()
+{
+    TexCord = vec2(aTexCord.x, 1.0 - aTexCord.y);
+    gl_Position = transform * vec4(aPos, 1.0);
+}

vcpkg.json

@@ -8,5 +8,5 @@
     "crashpad",
     "giflib"
   ],
-  "builtin-baseline": "dee924de74e81388140a53c32a919ecec57d20ab"
-}
+  "builtin-baseline": "fe1cde61e971d53c9687cf9a46308f8f55da19fa"
+}