1
0
forked from Rowland/EG
Commit Graph

100 Commits

Author SHA1 Message Date
cd21f8eb0a 修复打包失败 2025-10-20 09:27:53 +08:00
9e8ff3ec25 属性面板物体名称修复 2025-10-16 11:44:17 +08:00
b5dbd96462 修改导入逻辑,避免出现模型与播放动画模型大小不一致问题 2025-10-15 10:51:00 +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
f455d5134d 修复打包不能保存视频流的问题 2025-10-10 15:32:46 +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
c252a8cba7 脚本打包加载 2025-09-29 09:16:37 +08:00
fa8353c86b vr高帧率版本修复 2025-09-28 10:54:19 +08:00
1c356ed6dc vr高帧率版本修复 2025-09-28 10:41:44 +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
7c797d74d5 剪切复制粘贴,撤销重做(仅使用拖拽时) 2025-09-24 09:18:27 +08:00
ddeb40ea54 撤销重做(仅使用拖拽时) 2025-09-23 16:39:55 +08:00
ec21df8f54 剪切复制粘贴 2025-09-23 09:27:49 +08:00
b5545b4b60 聚焦功能完善 2025-09-22 10:56:05 +08:00
e9039ab832 1.虚拟维修简单流程 2025-09-22 10:04:20 +08:00
fc2550ce03 脚本保存和移除 2025-09-18 17:44:32 +08:00
7a621a3a51 聚焦功能 2025-09-18 10:55:06 +08:00
bd9fa08cb6 Merge remote-tracking branch 'refs/remotes/origin/main_ch_eg' into addRender 2025-09-18 10:52:28 +08:00
bd7a18a917 1.优化碰撞面板保存修改参数 2025-09-18 10:51:50 +08:00
97fea27d02 Merge remote-tracking branch 'refs/remotes/origin/main_ch_eg' into addRender 2025-09-18 10:27:43 +08:00
a1380f9a46 1.优化碰撞面板保存修改参数 2025-09-18 09:49:59 +08:00
e62ae89289 Merge remote-tracking branch 'origin/main_ch_eg' into addRender
# Conflicts:
#	ui/property_panel.py
2025-09-17 17:56:31 +08:00
3a8439851b 聚焦功能 2025-09-17 17:48:20 +08:00
2a76703b89 聚焦功能 2025-09-17 17:48:06 +08:00
f9bd83c876 1.优化碰撞面板 2025-09-17 17:34:23 +08:00
1c660c781a Merge remote-tracking branch 'refs/remotes/origin/main_ch_eg' into addRender
# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
#	scene/scene_manager.py
#	ui/main_window.py
2025-09-17 15:57:32 +08:00
d3c6665163 聚焦功能 2025-09-17 15:42:42 +08:00
39a52b3953 1.增加碰撞面板 2025-09-17 15:41:55 +08:00
9a997c4036 1.优化 2025-09-17 11:11:46 +08:00
ef639ab0b1 vr添加调试信息 2025-09-16 16:30:36 +08:00
a8082bd656 保存系统持续完善 2025-09-16 16:09:54 +08:00
0ec780792e Merge remote-tracking branch 'origin/main_ch_eg' into addRender
# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
#	scene/scene_manager.py
#	ui/main_window.py
2025-09-15 16:56:28 +08:00
dff3726bbf Merge remote-tracking branch 'origin/addRender' into main_ch_eg
# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
#	scene/scene_manager.py
#	ui/main_window.py
2025-09-15 16:45:37 +08:00
63801cfb0a 1.修改保存层级数 2025-09-15 16:32:23 +08:00
9f1879cf95 保存脚本... 2025-09-15 16:31:35 +08:00
6c9c4339f2 vr画面添加 2025-09-15 14:38:18 +08:00
af0a999191 vr第一次提交 2025-09-15 10:03:47 +08:00
8a2f1f802c 保存 2025-09-15 09:17:05 +08:00
fc7f0d55f3 2dGUI场景保存,3D模型,(地形,信息面板除外) 2025-09-15 09:14:16 +08:00
8f6bcc9b5a Merge remote-tracking branch 'origin/addRender' into main_ch_eg
# Conflicts:
#	scene/scene_manager.py
2025-09-11 17:11:51 +08:00
c05911d7d6 1.优化启动页
2.加载层级树(未完成)
2025-09-11 17:07:08 +08:00
ace7804578 添加更多保存节点 2025-09-11 17:03:20 +08:00