Commit Graph

272 Commits

Author SHA1 Message Date
a081ce8138 合并新界面以及VR 2025-10-21 16:16:28 +08:00
e90a55d7cf Merge remote-tracking branch 'origin/VR' into addRender 2025-10-21 16:15:31 +08:00
a0ef6d216a Merge remote-tracking branch 'origin/VR' into addRender
# Conflicts:
#	ui/main_window.py
2025-10-21 16:14:35 +08:00
14c5ffdd2f 合并新界面 2025-10-21 16:10:59 +08:00
77426bfe9b Merge pull request 'VR' (#8) from VR into main
Reviewed-on: #8
2025-10-21 08:09:33 +00:00
e20d2a2191 vr拆分s3 2025-10-20 17:01:45 +08:00
6783f92970 合并新界面 2025-10-20 11:58:33 +08:00
e38876f6d8 Merge remote-tracking branch 'origin/main_ch_eg' into addRender
# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
#	ui/interface_manager.py
#	ui/main_window.py
#	ui/property_panel.py
2025-10-20 10:29:23 +08:00
23d94a67d5 修复打包失败 2025-10-20 09:31:05 +08:00
34ce05121a ui更新 2025-10-20 09:30:27 +08:00
cd21f8eb0a 修复打包失败 2025-10-20 09:27:53 +08:00
a4e5d834db 1.UI更新 2025-10-19 23:05:56 +08:00
9e8ff3ec25 属性面板物体名称修复 2025-10-16 11:44:17 +08:00
b386818f76 1.UI更新 2025-10-16 00:54:47 +08:00
64c7a30bc2 1.UI更新 2025-10-15 15:29:01 +08:00
54fca09914 1.Icons更新 2025-10-15 11:50:03 +08:00
ae4fbb8b70 1.UI风格修改 2025-10-15 11:48:58 +08:00
b5dbd96462 修改导入逻辑,避免出现模型与播放动画模型大小不一致问题 2025-10-15 10:51:00 +08:00
32b6ac2885 vr拆分s2 2025-10-14 16:06:39 +08:00
aaff2283b4 vr拆分s1 2025-10-14 15:34:20 +08:00
66d3c8825c VR文件结构优化 2025-10-11 16:41:59 +08:00
3ea4d5ff64 手柄传送修复 2025-10-11 14:38:59 +08:00
ea8e340c33 高级渲染添加 2025-10-11 10:08:28 +08:00
367cde9e54 添加拆配交互 2025-10-11 10:02:40 +08:00
0d898b498a Merge remote-tracking branch 'refs/remotes/origin/main_ch_eg' into addRender
# Conflicts:
#	scene/scene_manager.py
#	ui/main_window.py
2025-10-11 09:26:47 +08:00
bda62d0bae 2d_image加载大小不一致修复 2025-10-11 09:16:04 +08:00
c7a4ce7963 馃帹 UI璁捐浼樺寲: 鏍规嵁Figma璁捐鍚屾鏁翠綋甯冨眬鍜岃壊璋?
- 缁熶竴娣辫壊涓婚閰嶈壊鏂规 (#19191b鑳屾櫙, #3067c0钃濊壊楂樹寒)
- 浼樺寲瀛椾綋灞傜骇绯荤粺 (16/14/12/10px)
- 鏇存柊鎵€鏈夊仠闈犵獥鍙f牱寮?(灞傜骇/灞炴€?鑴氭湰/璧勬簮/鎺у埗鍙?
- 浼樺寲QGroupBox鏍峰紡 (閫忔槑鑳屾櫙, 80%閫忔槑搴︽爣棰?
- 缁熶竴鍒楄〃鍜屾爲褰㈡帶浠舵牱寮?- 浼樺寲鏍囩椤垫牱寮?(钃濊壊閫変腑, 鐏拌壊鏈€変腑)
- 绉婚櫎涓嶅繀瑕佺殑杈规, 瀹炵幇鏃犵紳鏁村悎
- 璋冩暣杈撳叆妗嗗拰鎸夐挳鐨勪氦浜掓晥鏋?
鏉ユ簮: Figma棰戦亾 6glyi82d
鐘舵€? 鉁?璁捐鍚屾瀹屾垚
2025-10-10 16:38:25 +08:00
83fcb3ced4 高级渲染添加 2025-10-10 16:10:55 +08:00
f455d5134d 修复打包不能保存视频流的问题 2025-10-10 15:32:46 +08:00
a8e27a56e9 高级渲染添加 2025-10-10 11:00:30 +08:00
f4d21a62f9 打包后场景聚焦功能,动画播放 2025-10-09 09:24:12 +08:00
19befad290 Merge pull request 'addRender' (#7) from addRender into main
Reviewed-on: #7
2025-09-29 03:26:02 +00:00
79b2547446 调整打包后相机 2025-09-29 11:25:19 +08:00
9633a32c3b Merge remote-tracking branch 'refs/remotes/origin/main' into addRender
# Conflicts:
#	RenderPipelineFile/samples/06-Car/main.py
#	main.py
#	ui/main_window.py
2025-09-29 11:24:45 +08:00
e1d0c1f40a Merge pull request 'VR' (#4) from VR into main
Reviewed-on: #4
2025-09-29 02:54:34 +00:00
a16c4bba13 手柄互动功能添加 2025-09-29 10:52:39 +08:00
c252a8cba7 脚本打包加载 2025-09-29 09:16:37 +08:00
d69cff3466 1.虚拟维修增加退出Bt(但是有Bug) 2025-09-28 18:14:54 +08:00
e5d2e485b9 手柄显示修复 2025-09-28 16:08:22 +08:00
fa8353c86b vr高帧率版本修复 2025-09-28 10:54:19 +08:00
1c356ed6dc vr高帧率版本修复 2025-09-28 10:41:44 +08:00
9c4116319b 实现打包功能 2025-09-26 17:50:04 +08:00
c9abf0b698 实现打包功能 2025-09-26 17:32:36 +08:00
bb6eee2250 添加调试信息 2025-09-26 14:53:27 +08:00
64df3107fe 1.虚拟维修基本流程 2025-09-26 09:24:07 +08:00
d32993b903 1.合并版本 2025-09-25 17:51:46 +08:00
75a9df709f Merge remote-tracking branch 'refs/remotes/origin/addRender' into main_ch_eg
# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
2025-09-25 17:09:23 +08:00
a66c097048 修改保存逻辑,添加打包功能 2025-09-25 16:59:06 +08:00
a76277b2fc 1.虚拟维修考核简单流程 2025-09-25 14:22:34 +08:00
432502e933 补完调试信息 2025-09-24 15:00:36 +08:00