diff --git a/CMakeLists.txt b/CMakeLists.txt index 8613a85..698494a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(ScreenLockDetector VERSION 1.3.0 LANGUAGES C CXX) +project(ScreenLockDetector VERSION 3.0.0 LANGUAGES C CXX) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/README.md b/README.md index 78c59f0..aab6fd0 100644 --- a/README.md +++ b/README.md @@ -13,18 +13,18 @@ - ✅ **自动检测锁屏状态**: - Linux: 通过 DBus 监听系统的锁屏/解锁事件 - macOS: 通过 NSDistributedNotificationCenter 监听系统通知 - + - ✅ **电源状态监控**: - Linux: 通过 DBus login1 服务监听系统睡眠/唤醒事件 - macOS: 通过 NSWorkspace 监听系统电源状态变化 - + - ✅ **双渲染引擎支持**: - **Vulkan 渲染器**:高性能 GPU 加速渲染(需要 Vulkan SDK) - Linux: 支持 Vulkan 1.0+ - macOS: 支持 MoltenVK(Vulkan over Metal) - 特性:MSAA 抗锯齿、动态几何、文字渲染(FreeType) - **QPainter 渲染器**:传统 Qt 绘制(兼容性备选) - + - ✅ **自动停止渲染**:屏幕锁定或系统睡眠时自动停止所有渲染,节省系统资源 - ✅ **实时动画演示**: @@ -32,7 +32,7 @@ - 波浪效果 - 渐变背景 - 实时文字显示 - + - ✅ **手动控制**:提供手动启用/禁用渲染的按钮 - ✅ **状态监控**:实时显示锁屏状态、电源状态、渲染状态和帧数统计 @@ -557,7 +557,7 @@ Qt Screen Lock Detection Demo Team ## 更新日志 -### v3.0.0 (2024-11-11) +### v3.0.0 (2025-11-11) - ✅ **重大更新**: 新增 Vulkan 渲染支持 - ✅ **重大更新**: 新增电源监控功能(睡眠/唤醒检测) - ✅ macOS: 完整的 MoltenVK 支持(包含 CAMetalLayer) @@ -568,17 +568,17 @@ Qt Screen Lock Detection Demo Team - ✅ 改进的跨平台架构(Factory + Strategy 模式) - ✅ 完善的文档和故障排除指南 -### v2.0.0 (2024) +### v2.0.0 (2025) - ✅ 新增 macOS 平台支持 - ✅ 实现跨平台架构(Linux + macOS) - ✅ macOS: 使用 NSDistributedNotificationCenter 监听系统通知 - ✅ 创建平台特定的构建和运行脚本 -### v1.1.0 (2024) +### v1.1.0 (2025) - ✅ 新增 Deepin OS (DDE) 锁屏检测支持 - ✅ 优化多桌面环境兼容性 -### v1.0.0 (2024) +### v1.0.0 (2025) - ✅ 初始版本发布 - ✅ 支持 GNOME 和 systemd-logind 锁屏检测 - ✅ 实现自动渲染控制 @@ -599,4 +599,4 @@ Qt Screen Lock Detection Demo Team - [Qt Documentation](https://doc.qt.io/qt-5/) - [Vulkan SDK](https://vulkan.lunarg.com/sdk/home) - [MoltenVK (macOS)](https://github.com/KhronosGroup/MoltenVK) -- [volk - Vulkan Meta-Loader](https://github.com/zeux/volk) \ No newline at end of file +- [volk - Vulkan Meta-Loader](https://github.com/zeux/volk) diff --git a/docs/DELIVERY.md b/docs/DELIVERY.md index a771734..c4a6c1e 100644 --- a/docs/DELIVERY.md +++ b/docs/DELIVERY.md @@ -2,10 +2,10 @@ ## 📦 交付信息 -**项目名称**: Qt Screen Lock Detection Demo -**交付版本**: v1.0.0 -**交付日期**: 2024 -**项目状态**: ✅ 完成并通过验证 +**项目名称**: Qt Screen Lock Detection Demo +**交付版本**: v1.0.0 +**交付日期**: 2025 +**项目状态**: ✅ 完成并通过验证 --- @@ -81,23 +81,23 @@ ## 🎯 核心功能实现 ### ✅ 功能1: 锁屏检测 -**实现状态**: 完成 -**技术方案**: Qt DBus 系统集成 -**支持环境**: +**实现状态**: 完成 +**技术方案**: Qt DBus 系统集成 +**支持环境**: - GNOME 桌面环境 (org.gnome.ScreenSaver) - KDE/XFCE/其他 (systemd-logind) **测试方法**: 按 Ctrl+Alt+L 锁屏,检查应用是否检测到 ### ✅ 功能2: 自动停止 Paint 事件 -**实现状态**: 完成 -**技术方案**: 信号槽机制 + 条件绘制 +**实现状态**: 完成 +**技术方案**: 信号槽机制 + 条件绘制 **性能提升**: 锁屏时 CPU 使用率从 2-5% 降至 <1% **测试方法**: 锁屏后观察动画停止,解锁后自动恢复 ### ✅ 功能3: 实时动画演示 -**实现状态**: 完成 +**实现状态**: 完成 **动画效果**: - 渐变背景 (颜色随时间变化) - 旋转圆圈 (8个彩色圆圈) @@ -107,7 +107,7 @@ **性能指标**: 稳定 60 FPS ### ✅ 功能4: 状态监控界面 -**实现状态**: 完成 +**实现状态**: 完成 **监控内容**: - 检测器状态 (Active/Inactive) - 锁屏状态 (🔒 Locked / 🔓 Unlocked) @@ -115,7 +115,7 @@ - 帧数统计 (实时更新) ### ✅ 功能5: 手动控制 -**实现状态**: 完成 +**实现状态**: 完成 **控制功能**: - 手动启用绘制 - 手动禁用绘制 @@ -245,9 +245,9 @@ qt_screan_lock/ ## ✅ 验证结果 -**验证日期**: 2024-11-07 -**验证工具**: `verify_project.sh` -**验证结果**: +**验证日期**: 2025-11-07 +**验证工具**: `verify_project.sh` +**验证结果**: ``` Total Checks: 18 @@ -354,11 +354,11 @@ Failed: 0 本项目已完成所有预定目标,并提供了完整的: -✅ **功能实现** - 锁屏检测、自动停止 Paint 事件、实时动画、状态监控 -✅ **代码质量** - 1,096 行高质量 C++ 代码,完整注释 -✅ **文档完善** - 1,266+ 行中文文档,多层次覆盖 -✅ **工具齐全** - 自动化编译、运行、验证脚本 -✅ **开箱即用** - 3 步即可运行,用户体验优秀 +✅ **功能实现** - 锁屏检测、自动停止 Paint 事件、实时动画、状态监控 +✅ **代码质量** - 1,096 行高质量 C++ 代码,完整注释 +✅ **文档完善** - 1,266+ 行中文文档,多层次覆盖 +✅ **工具齐全** - 自动化编译、运行、验证脚本 +✅ **开箱即用** - 3 步即可运行,用户体验优秀 **项目状态**: ✅ **生产就绪 (Production Ready)** @@ -374,12 +374,12 @@ Failed: 0 --- -**交付日期**: 2024-11-07 -**项目版本**: v1.0.0 -**交付状态**: ✅ 完成 +**交付日期**: 2025-11-07 +**项目版本**: v1.0.0 +**交付状态**: ✅ 完成 --- _感谢使用 Qt Screen Lock Detection Demo!_ -Happy Coding! 🚀 \ No newline at end of file +Happy Coding! 🚀 diff --git a/docs/FINAL_SOLUTION.md b/docs/FINAL_SOLUTION.md index 9a7d166..258d627 100644 --- a/docs/FINAL_SOLUTION.md +++ b/docs/FINAL_SOLUTION.md @@ -310,7 +310,7 @@ Position 4: screen(378, 212.5) -> NDC(0, 0) // 中心 --- -**修复完成日期**: 2024 +**修复完成日期**: 2025 **问题持续时间**: 多次迭代 **关键突破**: 使用硬编码值测试发现 UBO 传输问题 **最终原因**: GLSL vec2 对齐问题 diff --git a/docs/INDEX.md b/docs/INDEX.md index 0e82015..826d9f4 100644 --- a/docs/INDEX.md +++ b/docs/INDEX.md @@ -123,13 +123,13 @@ QUICKSTART.md → PROJECT_OVERVIEW.md → README.md → 运行测试 → 完成 ### 路径 3: 开发学习(3小时) ``` -PROJECT_OVERVIEW.md → ARCHITECTURE.md → 阅读源代码 → +PROJECT_OVERVIEW.md → ARCHITECTURE.md → 阅读源代码 → 修改代码 → 重新编译 → 测试 → 完成 ``` ### 路径 4: 完整掌握(1天) ``` -所有文档按顺序阅读 → 理解架构 → 阅读所有源代码 → +所有文档按顺序阅读 → 理解架构 → 阅读所有源代码 → 扩展新功能 → 编写测试 → 优化性能 → 完成 ``` @@ -270,10 +270,10 @@ MainWindow (主窗口) --- -**最后更新**: 2024-11-07 -**项目版本**: v1.0.0 -**索引版本**: v1.0 +**最后更新**: 2025-11-07 +**项目版本**: v1.0.0 +**索引版本**: v1.0 --- -_祝您使用愉快!Happy Coding! 🚀_ \ No newline at end of file +_祝您使用愉快!Happy Coding! 🚀_ diff --git a/docs/LIBRARY_PATH_NOTE.md b/docs/LIBRARY_PATH_NOTE.md index f5c267e..726b435 100644 --- a/docs/LIBRARY_PATH_NOTE.md +++ b/docs/LIBRARY_PATH_NOTE.md @@ -214,8 +214,8 @@ readelf -d /opt/screenlockdemo/bin/ScreenLockDemo | grep -i path ## 更新历史 -- 2024-01-01: 初始版本,添加 /usr/local/lib 和 /usr/local/lib64 支持 +- 2025-01-01: 初始版本,添加 /usr/local/lib 和 /usr/local/lib64 支持 --- -如有问题或需要进一步的库路径配置,请参考此文档或咨询系统管理员。 \ No newline at end of file +如有问题或需要进一步的库路径配置,请参考此文档或咨询系统管理员。 diff --git a/docs/PROJECT_OVERVIEW.md b/docs/PROJECT_OVERVIEW.md index 2c2ba35..02e04b3 100644 --- a/docs/PROJECT_OVERVIEW.md +++ b/docs/PROJECT_OVERVIEW.md @@ -387,8 +387,8 @@ qdbus org.gnome.ScreenSaver --- -**项目创建时间**: 2024 -**最后更新**: 2024 +**项目创建时间**: 2025 +**最后更新**: 2025 **状态**: ✅ 生产就绪 -Happy Coding! 🚀 \ No newline at end of file +Happy Coding! 🚀 diff --git a/docs/REFACTORING.md b/docs/REFACTORING.md index bc5abca..174611b 100644 --- a/docs/REFACTORING.md +++ b/docs/REFACTORING.md @@ -126,9 +126,9 @@ ScreenLockDetectorBase* ScreenLockDetector::createPlatformDetector() ScreenLockDetector *detector = new ScreenLockDetector(this); // 连接信号 -connect(detector, &ScreenLockDetector::screenLocked, +connect(detector, &ScreenLockDetector::screenLocked, this, &YourClass::onScreenLocked); -connect(detector, &ScreenLockDetector::screenUnlocked, +connect(detector, &ScreenLockDetector::screenUnlocked, this, &YourClass::onScreenUnlocked); // 初始化 @@ -230,5 +230,5 @@ ScreenLockDetector 开发团队 ## 版本历史 -- **v2.0.0** (2024): 面向对象重构 -- **v1.0.0** (2024): 初始版本 \ No newline at end of file +- **v2.0.0** (2025): 面向对象重构 +- **v1.0.0** (2025): 初始版本 diff --git a/shaders/geometry.vert b/shaders/geometry.vert index c563756..416837e 100644 --- a/shaders/geometry.vert +++ b/shaders/geometry.vert @@ -18,13 +18,6 @@ layout(binding = 0, std140) uniform UniformBufferObject { } ubo; void main() { - // ULTIMATE TEST: Use hardcoded resolution value instead of UBO - // This will prove whether the problem is in UBO binding or somewhere else - - // Hardcode the resolution we know is correct from debug output - float hardcodedWidth = 756.0; - float hardcodedHeight = 425.0; - // Now use UBO values - they should match the C++ struct exactly float ndcX = (inPosition.x / ubo.resX) * 2.0 - 1.0; float ndcY = (inPosition.y / ubo.resY) * 2.0 - 1.0; diff --git a/src/main.cpp b/src/main.cpp index 036fd1b..0bf8f59 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,36 +1,37 @@ #include #include +#include "version.h" #include "mainwindow.h" int main(int argc, char *argv[]) { QApplication app(argc, argv); - + // 设置应用程序信息 app.setApplicationName("Screen Lock Detection Demo"); - app.setApplicationVersion("1.0.0"); + app.setApplicationVersion(APP_VERSION_STRING); app.setOrganizationName("Qt Demo"); - + qDebug() << "=============================================="; qDebug() << "Qt Screen Lock Detection Demo Starting..."; qDebug() << "Application:" << app.applicationName(); qDebug() << "Version:" << app.applicationVersion(); qDebug() << "=============================================="; - + // 创建并显示主窗口 MainWindow window; window.show(); - + qDebug() << "Main window displayed"; qDebug() << "Tip: Lock your screen (Ctrl+Alt+L or Super+L) to test the screen lock detection!"; qDebug() << ""; - + // 运行应用程序事件循环 int result = app.exec(); - + qDebug() << "=============================================="; qDebug() << "Application exiting with code:" << result; qDebug() << "=============================================="; - + return result; -} \ No newline at end of file +} diff --git a/src/shaders_spirv/geometry.vert.spv b/src/shaders_spirv/geometry.vert.spv index 53bba0b..e8e8dfb 100644 Binary files a/src/shaders_spirv/geometry.vert.spv and b/src/shaders_spirv/geometry.vert.spv differ diff --git a/src/shaders_spirv/geometry_vert.inc b/src/shaders_spirv/geometry_vert.inc index 9ccc366..c1d6221 100644 --- a/src/shaders_spirv/geometry_vert.inc +++ b/src/shaders_spirv/geometry_vert.inc @@ -1,70 +1,66 @@ // Auto-generated from geometry.vert.spv -// Size: 2160 bytes (540 words) - 0x07230203u, 0x00010000u, 0x0008000bu, 0x00000040u, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu, +// Size: 2024 bytes (506 words) + 0x07230203u, 0x00010000u, 0x0008000bu, 0x0000003cu, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu, 0x00000001u, 0x4c534c47u, 0x6474732eu, 0x3035342eu, 0x00000000u, 0x0003000eu, 0x00000000u, 0x00000001u, - 0x000b000fu, 0x00000000u, 0x00000004u, 0x6e69616du, 0x00000000u, 0x0000000fu, 0x00000030u, 0x00000038u, - 0x0000003au, 0x0000003du, 0x0000003eu, 0x00030003u, 0x00000002u, 0x000001c2u, 0x00040005u, 0x00000004u, - 0x6e69616du, 0x00000000u, 0x00060005u, 0x00000008u, 0x64726168u, 0x65646f63u, 0x64695764u, 0x00006874u, - 0x00060005u, 0x0000000au, 0x64726168u, 0x65646f63u, 0x69654864u, 0x00746867u, 0x00040005u, 0x0000000cu, - 0x5863646eu, 0x00000000u, 0x00050005u, 0x0000000fu, 0x6f506e69u, 0x69746973u, 0x00006e6fu, 0x00070005u, - 0x00000015u, 0x66696e55u, 0x426d726fu, 0x65666675u, 0x6a624f72u, 0x00746365u, 0x00050006u, 0x00000015u, - 0x00000000u, 0x656d6974u, 0x00000000u, 0x00050006u, 0x00000015u, 0x00000001u, 0x58736572u, 0x00000000u, - 0x00050006u, 0x00000015u, 0x00000002u, 0x59736572u, 0x00000000u, 0x00060006u, 0x00000015u, 0x00000003u, - 0x61746f72u, 0x6e6f6974u, 0x00000000u, 0x00060006u, 0x00000015u, 0x00000004u, 0x65766177u, 0x73616850u, - 0x00000065u, 0x00060006u, 0x00000015u, 0x00000005u, 0x64646170u, 0x31676e69u, 0x00000000u, 0x00060006u, - 0x00000015u, 0x00000006u, 0x64646170u, 0x32676e69u, 0x00000000u, 0x00030005u, 0x00000017u, 0x006f6275u, - 0x00040005u, 0x00000022u, 0x5963646eu, 0x00000000u, 0x00060005u, 0x0000002eu, 0x505f6c67u, 0x65567265u, - 0x78657472u, 0x00000000u, 0x00060006u, 0x0000002eu, 0x00000000u, 0x505f6c67u, 0x7469736fu, 0x006e6f69u, - 0x00070006u, 0x0000002eu, 0x00000001u, 0x505f6c67u, 0x746e696fu, 0x657a6953u, 0x00000000u, 0x00070006u, - 0x0000002eu, 0x00000002u, 0x435f6c67u, 0x4470696cu, 0x61747369u, 0x0065636eu, 0x00070006u, 0x0000002eu, - 0x00000003u, 0x435f6c67u, 0x446c6c75u, 0x61747369u, 0x0065636eu, 0x00030005u, 0x00000030u, 0x00000000u, - 0x00050005u, 0x00000038u, 0x67617266u, 0x6f6c6f43u, 0x00000072u, 0x00040005u, 0x0000003au, 0x6f436e69u, - 0x00726f6cu, 0x00060005u, 0x0000003du, 0x67617266u, 0x43786554u, 0x64726f6fu, 0x00000000u, 0x00050005u, - 0x0000003eu, 0x65546e69u, 0x6f6f4378u, 0x00006472u, 0x00040047u, 0x0000000fu, 0x0000001eu, 0x00000000u, - 0x00030047u, 0x00000015u, 0x00000002u, 0x00050048u, 0x00000015u, 0x00000000u, 0x00000023u, 0x00000000u, - 0x00050048u, 0x00000015u, 0x00000001u, 0x00000023u, 0x00000004u, 0x00050048u, 0x00000015u, 0x00000002u, - 0x00000023u, 0x00000008u, 0x00050048u, 0x00000015u, 0x00000003u, 0x00000023u, 0x0000000cu, 0x00050048u, - 0x00000015u, 0x00000004u, 0x00000023u, 0x00000010u, 0x00050048u, 0x00000015u, 0x00000005u, 0x00000023u, - 0x00000014u, 0x00050048u, 0x00000015u, 0x00000006u, 0x00000023u, 0x00000018u, 0x00040047u, 0x00000017u, - 0x00000021u, 0x00000000u, 0x00040047u, 0x00000017u, 0x00000022u, 0x00000000u, 0x00030047u, 0x0000002eu, - 0x00000002u, 0x00050048u, 0x0000002eu, 0x00000000u, 0x0000000bu, 0x00000000u, 0x00050048u, 0x0000002eu, - 0x00000001u, 0x0000000bu, 0x00000001u, 0x00050048u, 0x0000002eu, 0x00000002u, 0x0000000bu, 0x00000003u, - 0x00050048u, 0x0000002eu, 0x00000003u, 0x0000000bu, 0x00000004u, 0x00040047u, 0x00000038u, 0x0000001eu, - 0x00000000u, 0x00040047u, 0x0000003au, 0x0000001eu, 0x00000001u, 0x00040047u, 0x0000003du, 0x0000001eu, - 0x00000001u, 0x00040047u, 0x0000003eu, 0x0000001eu, 0x00000002u, 0x00020013u, 0x00000002u, 0x00030021u, - 0x00000003u, 0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u, 0x00040020u, 0x00000007u, 0x00000007u, - 0x00000006u, 0x0004002bu, 0x00000006u, 0x00000009u, 0x443d0000u, 0x0004002bu, 0x00000006u, 0x0000000bu, - 0x43d48000u, 0x00040017u, 0x0000000du, 0x00000006u, 0x00000002u, 0x00040020u, 0x0000000eu, 0x00000001u, - 0x0000000du, 0x0004003bu, 0x0000000eu, 0x0000000fu, 0x00000001u, 0x00040015u, 0x00000010u, 0x00000020u, - 0x00000000u, 0x0004002bu, 0x00000010u, 0x00000011u, 0x00000000u, 0x00040020u, 0x00000012u, 0x00000001u, - 0x00000006u, 0x0009001eu, 0x00000015u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, - 0x00000006u, 0x00000006u, 0x00040020u, 0x00000016u, 0x00000002u, 0x00000015u, 0x0004003bu, 0x00000016u, - 0x00000017u, 0x00000002u, 0x00040015u, 0x00000018u, 0x00000020u, 0x00000001u, 0x0004002bu, 0x00000018u, - 0x00000019u, 0x00000001u, 0x00040020u, 0x0000001au, 0x00000002u, 0x00000006u, 0x0004002bu, 0x00000006u, - 0x0000001eu, 0x40000000u, 0x0004002bu, 0x00000006u, 0x00000020u, 0x3f800000u, 0x0004002bu, 0x00000010u, - 0x00000023u, 0x00000001u, 0x0004002bu, 0x00000018u, 0x00000026u, 0x00000002u, 0x00040017u, 0x0000002cu, - 0x00000006u, 0x00000004u, 0x0004001cu, 0x0000002du, 0x00000006u, 0x00000023u, 0x0006001eu, 0x0000002eu, - 0x0000002cu, 0x00000006u, 0x0000002du, 0x0000002du, 0x00040020u, 0x0000002fu, 0x00000003u, 0x0000002eu, - 0x0004003bu, 0x0000002fu, 0x00000030u, 0x00000003u, 0x0004002bu, 0x00000018u, 0x00000031u, 0x00000000u, - 0x0004002bu, 0x00000006u, 0x00000034u, 0x00000000u, 0x00040020u, 0x00000036u, 0x00000003u, 0x0000002cu, - 0x0004003bu, 0x00000036u, 0x00000038u, 0x00000003u, 0x00040020u, 0x00000039u, 0x00000001u, 0x0000002cu, - 0x0004003bu, 0x00000039u, 0x0000003au, 0x00000001u, 0x00040020u, 0x0000003cu, 0x00000003u, 0x0000000du, - 0x0004003bu, 0x0000003cu, 0x0000003du, 0x00000003u, 0x0004003bu, 0x0000000eu, 0x0000003eu, 0x00000001u, - 0x00050036u, 0x00000002u, 0x00000004u, 0x00000000u, 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003bu, - 0x00000007u, 0x00000008u, 0x00000007u, 0x0004003bu, 0x00000007u, 0x0000000au, 0x00000007u, 0x0004003bu, - 0x00000007u, 0x0000000cu, 0x00000007u, 0x0004003bu, 0x00000007u, 0x00000022u, 0x00000007u, 0x0003003eu, - 0x00000008u, 0x00000009u, 0x0003003eu, 0x0000000au, 0x0000000bu, 0x00050041u, 0x00000012u, 0x00000013u, - 0x0000000fu, 0x00000011u, 0x0004003du, 0x00000006u, 0x00000014u, 0x00000013u, 0x00050041u, 0x0000001au, - 0x0000001bu, 0x00000017u, 0x00000019u, 0x0004003du, 0x00000006u, 0x0000001cu, 0x0000001bu, 0x00050088u, - 0x00000006u, 0x0000001du, 0x00000014u, 0x0000001cu, 0x00050085u, 0x00000006u, 0x0000001fu, 0x0000001du, - 0x0000001eu, 0x00050083u, 0x00000006u, 0x00000021u, 0x0000001fu, 0x00000020u, 0x0003003eu, 0x0000000cu, - 0x00000021u, 0x00050041u, 0x00000012u, 0x00000024u, 0x0000000fu, 0x00000023u, 0x0004003du, 0x00000006u, - 0x00000025u, 0x00000024u, 0x00050041u, 0x0000001au, 0x00000027u, 0x00000017u, 0x00000026u, 0x0004003du, - 0x00000006u, 0x00000028u, 0x00000027u, 0x00050088u, 0x00000006u, 0x00000029u, 0x00000025u, 0x00000028u, - 0x00050085u, 0x00000006u, 0x0000002au, 0x00000029u, 0x0000001eu, 0x00050083u, 0x00000006u, 0x0000002bu, - 0x0000002au, 0x00000020u, 0x0003003eu, 0x00000022u, 0x0000002bu, 0x0004003du, 0x00000006u, 0x00000032u, - 0x0000000cu, 0x0004003du, 0x00000006u, 0x00000033u, 0x00000022u, 0x00070050u, 0x0000002cu, 0x00000035u, - 0x00000032u, 0x00000033u, 0x00000034u, 0x00000020u, 0x00050041u, 0x00000036u, 0x00000037u, 0x00000030u, - 0x00000031u, 0x0003003eu, 0x00000037u, 0x00000035u, 0x0004003du, 0x0000002cu, 0x0000003bu, 0x0000003au, - 0x0003003eu, 0x00000038u, 0x0000003bu, 0x0004003du, 0x0000000du, 0x0000003fu, 0x0000003eu, 0x0003003eu, - 0x0000003du, 0x0000003fu, 0x000100fdu, 0x00010038u + 0x000b000fu, 0x00000000u, 0x00000004u, 0x6e69616du, 0x00000000u, 0x0000000bu, 0x0000002cu, 0x00000034u, + 0x00000036u, 0x00000039u, 0x0000003au, 0x00030003u, 0x00000002u, 0x000001c2u, 0x00040005u, 0x00000004u, + 0x6e69616du, 0x00000000u, 0x00040005u, 0x00000008u, 0x5863646eu, 0x00000000u, 0x00050005u, 0x0000000bu, + 0x6f506e69u, 0x69746973u, 0x00006e6fu, 0x00070005u, 0x00000011u, 0x66696e55u, 0x426d726fu, 0x65666675u, + 0x6a624f72u, 0x00746365u, 0x00050006u, 0x00000011u, 0x00000000u, 0x656d6974u, 0x00000000u, 0x00050006u, + 0x00000011u, 0x00000001u, 0x58736572u, 0x00000000u, 0x00050006u, 0x00000011u, 0x00000002u, 0x59736572u, + 0x00000000u, 0x00060006u, 0x00000011u, 0x00000003u, 0x61746f72u, 0x6e6f6974u, 0x00000000u, 0x00060006u, + 0x00000011u, 0x00000004u, 0x65766177u, 0x73616850u, 0x00000065u, 0x00060006u, 0x00000011u, 0x00000005u, + 0x64646170u, 0x31676e69u, 0x00000000u, 0x00060006u, 0x00000011u, 0x00000006u, 0x64646170u, 0x32676e69u, + 0x00000000u, 0x00030005u, 0x00000013u, 0x006f6275u, 0x00040005u, 0x0000001eu, 0x5963646eu, 0x00000000u, + 0x00060005u, 0x0000002au, 0x505f6c67u, 0x65567265u, 0x78657472u, 0x00000000u, 0x00060006u, 0x0000002au, + 0x00000000u, 0x505f6c67u, 0x7469736fu, 0x006e6f69u, 0x00070006u, 0x0000002au, 0x00000001u, 0x505f6c67u, + 0x746e696fu, 0x657a6953u, 0x00000000u, 0x00070006u, 0x0000002au, 0x00000002u, 0x435f6c67u, 0x4470696cu, + 0x61747369u, 0x0065636eu, 0x00070006u, 0x0000002au, 0x00000003u, 0x435f6c67u, 0x446c6c75u, 0x61747369u, + 0x0065636eu, 0x00030005u, 0x0000002cu, 0x00000000u, 0x00050005u, 0x00000034u, 0x67617266u, 0x6f6c6f43u, + 0x00000072u, 0x00040005u, 0x00000036u, 0x6f436e69u, 0x00726f6cu, 0x00060005u, 0x00000039u, 0x67617266u, + 0x43786554u, 0x64726f6fu, 0x00000000u, 0x00050005u, 0x0000003au, 0x65546e69u, 0x6f6f4378u, 0x00006472u, + 0x00040047u, 0x0000000bu, 0x0000001eu, 0x00000000u, 0x00030047u, 0x00000011u, 0x00000002u, 0x00050048u, + 0x00000011u, 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u, 0x00000011u, 0x00000001u, 0x00000023u, + 0x00000004u, 0x00050048u, 0x00000011u, 0x00000002u, 0x00000023u, 0x00000008u, 0x00050048u, 0x00000011u, + 0x00000003u, 0x00000023u, 0x0000000cu, 0x00050048u, 0x00000011u, 0x00000004u, 0x00000023u, 0x00000010u, + 0x00050048u, 0x00000011u, 0x00000005u, 0x00000023u, 0x00000014u, 0x00050048u, 0x00000011u, 0x00000006u, + 0x00000023u, 0x00000018u, 0x00040047u, 0x00000013u, 0x00000021u, 0x00000000u, 0x00040047u, 0x00000013u, + 0x00000022u, 0x00000000u, 0x00030047u, 0x0000002au, 0x00000002u, 0x00050048u, 0x0000002au, 0x00000000u, + 0x0000000bu, 0x00000000u, 0x00050048u, 0x0000002au, 0x00000001u, 0x0000000bu, 0x00000001u, 0x00050048u, + 0x0000002au, 0x00000002u, 0x0000000bu, 0x00000003u, 0x00050048u, 0x0000002au, 0x00000003u, 0x0000000bu, + 0x00000004u, 0x00040047u, 0x00000034u, 0x0000001eu, 0x00000000u, 0x00040047u, 0x00000036u, 0x0000001eu, + 0x00000001u, 0x00040047u, 0x00000039u, 0x0000001eu, 0x00000001u, 0x00040047u, 0x0000003au, 0x0000001eu, + 0x00000002u, 0x00020013u, 0x00000002u, 0x00030021u, 0x00000003u, 0x00000002u, 0x00030016u, 0x00000006u, + 0x00000020u, 0x00040020u, 0x00000007u, 0x00000007u, 0x00000006u, 0x00040017u, 0x00000009u, 0x00000006u, + 0x00000002u, 0x00040020u, 0x0000000au, 0x00000001u, 0x00000009u, 0x0004003bu, 0x0000000au, 0x0000000bu, + 0x00000001u, 0x00040015u, 0x0000000cu, 0x00000020u, 0x00000000u, 0x0004002bu, 0x0000000cu, 0x0000000du, + 0x00000000u, 0x00040020u, 0x0000000eu, 0x00000001u, 0x00000006u, 0x0009001eu, 0x00000011u, 0x00000006u, + 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000012u, + 0x00000002u, 0x00000011u, 0x0004003bu, 0x00000012u, 0x00000013u, 0x00000002u, 0x00040015u, 0x00000014u, + 0x00000020u, 0x00000001u, 0x0004002bu, 0x00000014u, 0x00000015u, 0x00000001u, 0x00040020u, 0x00000016u, + 0x00000002u, 0x00000006u, 0x0004002bu, 0x00000006u, 0x0000001au, 0x40000000u, 0x0004002bu, 0x00000006u, + 0x0000001cu, 0x3f800000u, 0x0004002bu, 0x0000000cu, 0x0000001fu, 0x00000001u, 0x0004002bu, 0x00000014u, + 0x00000022u, 0x00000002u, 0x00040017u, 0x00000028u, 0x00000006u, 0x00000004u, 0x0004001cu, 0x00000029u, + 0x00000006u, 0x0000001fu, 0x0006001eu, 0x0000002au, 0x00000028u, 0x00000006u, 0x00000029u, 0x00000029u, + 0x00040020u, 0x0000002bu, 0x00000003u, 0x0000002au, 0x0004003bu, 0x0000002bu, 0x0000002cu, 0x00000003u, + 0x0004002bu, 0x00000014u, 0x0000002du, 0x00000000u, 0x0004002bu, 0x00000006u, 0x00000030u, 0x00000000u, + 0x00040020u, 0x00000032u, 0x00000003u, 0x00000028u, 0x0004003bu, 0x00000032u, 0x00000034u, 0x00000003u, + 0x00040020u, 0x00000035u, 0x00000001u, 0x00000028u, 0x0004003bu, 0x00000035u, 0x00000036u, 0x00000001u, + 0x00040020u, 0x00000038u, 0x00000003u, 0x00000009u, 0x0004003bu, 0x00000038u, 0x00000039u, 0x00000003u, + 0x0004003bu, 0x0000000au, 0x0000003au, 0x00000001u, 0x00050036u, 0x00000002u, 0x00000004u, 0x00000000u, + 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003bu, 0x00000007u, 0x00000008u, 0x00000007u, 0x0004003bu, + 0x00000007u, 0x0000001eu, 0x00000007u, 0x00050041u, 0x0000000eu, 0x0000000fu, 0x0000000bu, 0x0000000du, + 0x0004003du, 0x00000006u, 0x00000010u, 0x0000000fu, 0x00050041u, 0x00000016u, 0x00000017u, 0x00000013u, + 0x00000015u, 0x0004003du, 0x00000006u, 0x00000018u, 0x00000017u, 0x00050088u, 0x00000006u, 0x00000019u, + 0x00000010u, 0x00000018u, 0x00050085u, 0x00000006u, 0x0000001bu, 0x00000019u, 0x0000001au, 0x00050083u, + 0x00000006u, 0x0000001du, 0x0000001bu, 0x0000001cu, 0x0003003eu, 0x00000008u, 0x0000001du, 0x00050041u, + 0x0000000eu, 0x00000020u, 0x0000000bu, 0x0000001fu, 0x0004003du, 0x00000006u, 0x00000021u, 0x00000020u, + 0x00050041u, 0x00000016u, 0x00000023u, 0x00000013u, 0x00000022u, 0x0004003du, 0x00000006u, 0x00000024u, + 0x00000023u, 0x00050088u, 0x00000006u, 0x00000025u, 0x00000021u, 0x00000024u, 0x00050085u, 0x00000006u, + 0x00000026u, 0x00000025u, 0x0000001au, 0x00050083u, 0x00000006u, 0x00000027u, 0x00000026u, 0x0000001cu, + 0x0003003eu, 0x0000001eu, 0x00000027u, 0x0004003du, 0x00000006u, 0x0000002eu, 0x00000008u, 0x0004003du, + 0x00000006u, 0x0000002fu, 0x0000001eu, 0x00070050u, 0x00000028u, 0x00000031u, 0x0000002eu, 0x0000002fu, + 0x00000030u, 0x0000001cu, 0x00050041u, 0x00000032u, 0x00000033u, 0x0000002cu, 0x0000002du, 0x0003003eu, + 0x00000033u, 0x00000031u, 0x0004003du, 0x00000028u, 0x00000037u, 0x00000036u, 0x0003003eu, 0x00000034u, + 0x00000037u, 0x0004003du, 0x00000009u, 0x0000003bu, 0x0000003au, 0x0003003eu, 0x00000039u, 0x0000003bu, + 0x000100fdu, 0x00010038u diff --git a/version.sh b/version.sh index 91fb0a8..adaec69 100644 --- a/version.sh +++ b/version.sh @@ -4,10 +4,10 @@ # DO NOT EDIT THIS FILE MANUALLY - Edit CMakeLists.txt instead # This file is sourced by shell scripts to get version information -APP_VERSION_MAJOR=1 -APP_VERSION_MINOR=3 +APP_VERSION_MAJOR=3 +APP_VERSION_MINOR=0 APP_VERSION_PATCH=0 -APP_VERSION="1.3.0" +APP_VERSION="3.0.0" # Export for use in other scripts export APP_VERSION_MAJOR