addRender #10

Merged

Hector merged 28 commits from addRender into main 2025-10-21 08:17:35 +00:00

Conversation 0 Commits 28 Files Changed 341 +13682 -5292

Hector commented 2025-10-21 08:17:19 +00:00

Collaborator

Copy Link

No description provided.

Hector added 28 commits 2025-10-21 08:17:19 +00:00

1.虚拟维修简单流程 e9039ab832

1.虚拟维修考核简单流程 a76277b2fc

Merge remote-tracking branch 'refs/remotes/origin/addRender' into main_ch_eg ... 75a9df709f

# Conflicts:
#	RenderPipelineFile/config/daytime.yaml

1.合并版本 d32993b903

1.虚拟维修基本流程 64df3107fe

1.虚拟维修增加退出Bt（但是有Bug） d69cff3466

打包后场景聚焦功能，动画播放 f4d21a62f9

修复打包不能保存视频流的问题 f455d5134d

馃帹 UI璁捐浼樺寲: 鏍规嵁Figma璁捐鍚屾鏁翠綋甯冨眬鍜岃壊璋? ... c7a4ce7963

- 缁熶竴娣辫壊涓婚閰嶈壊鏂规 (#19191b鑳屾櫙, #3067c0钃濊壊楂樹寒)
- 浼樺寲瀛椾綋灞傜骇绯荤粺 (16/14/12/10px)
- 鏇存柊鎵€鏈夊仠闈犵獥鍙ｆ牱寮?(灞傜骇/灞炴€?鑴氭湰/璧勬簮/鎺у埗鍙?
- 浼樺寲QGroupBox鏍峰紡 (閫忔槑鑳屾櫙, 80%閫忔槑搴︽爣棰?
- 缁熶竴鍒楄〃鍜屾爲褰㈡帶浠舵牱寮?- 浼樺寲鏍囩椤垫牱寮?(钃濊壊閫変腑, 鐏拌壊鏈€変腑)
- 绉婚櫎涓嶅繀瑕佺殑杈规, 瀹炵幇鏃犵紳鏁村悎
- 璋冩暣杈撳叆妗嗗拰鎸夐挳鐨勪氦浜掓晥鏋?
鏉ユ簮: Figma棰戦亾 6glyi82d
鐘舵€? 鉁?璁捐鍚屾瀹屾垚

2d_image加载大小不一致修复 bda62d0bae

Merge remote-tracking branch 'refs/remotes/origin/main_ch_eg' into addRender ... 0d898b498a

# Conflicts:
#	scene/scene_manager.py
#	ui/main_window.py

添加拆配交互 367cde9e54

修改导入逻辑，避免出现模型与播放动画模型大小不一致问题 b5dbd96462

1.UI风格修改 ae4fbb8b70

1.Icons更新 54fca09914

1.UI更新 64c7a30bc2

1.UI更新 b386818f76

属性面板物体名称修复 9e8ff3ec25

1.UI更新 a4e5d834db

修复打包失败 cd21f8eb0a

ui更新 34ce05121a

修复打包失败 23d94a67d5

Merge remote-tracking branch 'origin/main_ch_eg' into addRender ... e38876f6d8

# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
#	ui/interface_manager.py
#	ui/main_window.py
#	ui/property_panel.py

合并新界面 6783f92970

合并新界面 14c5ffdd2f

Merge remote-tracking branch 'origin/VR' into addRender ... a0ef6d216a

# Conflicts:
#	ui/main_window.py

Merge remote-tracking branch 'origin/VR' into addRender e90a55d7cf

合并新界面以及VR a081ce8138

Hector merged commit a5e780d744 into main 2025-10-21 08:17:35 +00:00

Hector referenced this issue from a commit 2025-10-21 08:17:37 +00:00

Merge pull request 'addRender' (#10) from addRender into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Rowland/EG#10

No description provided.