-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[更新Qt版本和OpenGL着色器代码]:对Qt版本和OpenGL着色器代码进行了更新和改进
- 更新`action.yml`文件中Qt的默认版本号从`6.7.0`到`6.7.2` - 调整`cmake/qt.cmake`文件,将Windows和Linux系统下Qt的路径更新为对应新版本`6.7.2` - 优化`openglview.cc`文件,简化了`QMetaObject::invokeMethod`的调用方式 - 更新OpenGL着色器文件`texture.frag`和`texture.vert`,添加GL_ARB_shading_language_420pack扩展支持 - 更新`vcpkg.json`文件,将内置基线从`dee924de74e81388140a53c32a919ecec57d20ab`更改为`fe1cde61e971d53c9687cf9a46308f8f55da19fa`
- Loading branch information
Showing
6 changed files
with
26 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,16 @@ | ||
#version 330 core | ||
#version 330 | ||
#ifdef GL_ARB_shading_language_420pack | ||
#extension GL_ARB_shading_language_420pack : require | ||
#endif | ||
|
||
uniform mat4 transform; | ||
|
||
in vec3 aPos; | ||
in vec2 aTexCord; | ||
|
||
out vec2 TexCord; // 纹理坐标 | ||
out vec2 TexCord; | ||
layout(location = 0) in vec3 aPos; | ||
layout(location = 1) in vec2 aTexCord; | ||
|
||
void main() | ||
{ | ||
gl_Position = transform * vec4(aPos, 1.0); | ||
TexCord = vec2(aTexCord.x, 1.0 - aTexCord.y); | ||
gl_Position = transform * vec4(aPos, 1.0); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters