Rowland/EG
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70 Commits 11 Branches 0 Tags 3.9 GiB
bc90a4521e
Commit Graph

70 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hector
bc90a4521e 项目保存时剔除坐标轴模型以及项目不会加载多余天空盒 2025-09-05 10:33:38 +08:00
Hector
4ca5068b2c 视频屏幕可播放视频流，修改部分名称过长问题 2025-09-03 17:22:28 +08:00
Hector
5e68ff5ee6 3d视频屏幕和2d视频屏幕 2025-09-02 10:21:46 +08:00
Hector
d980330d9d 8.28合并 2025-09-01 09:06:16 +08:00
陈横
95395bdb05 1.整合菜单栏（2D图片、3D图片、地形） 2025-08-29 16:04:25 +08:00
陈横
c39ebeb345 Merge remote-tracking branch 'origin/main' into main_ch_eg 2025-08-28 17:14:39 +08:00
Hector
c45bb54927 Merge pull request 'addRender' (#25) from addRender into main 
Reviewed-on: Hector/EG#25
 2025-08-28 09:13:31 +00:00
Hector
ace5229473 8.28合并 2025-08-28 17:13:03 +08:00
Hector
f4b16c36c6 Merge remote-tracking branch 'origin/main_ch_eg' into addRender 
# Conflicts:
#	gui/gui_manager.py
#	main.py
#	scene/scene_manager.py
#	ui/main_window.py
#	ui/property_panel.py
 2025-08-28 16:32:26 +08:00
陈横
e94bf83196 更新daytime配置，添加新的资源文件和终端配置 2025-08-28 16:18:13 +08:00
陈横
6e4cd17d75 Merge remote-tracking branch 'origin/main' into main_ch_eg 2025-08-28 15:58:07 +08:00
Hector
fc846e296d Merge pull request 'addRender' (#22) from addRender into main 
Reviewed-on: Hector/EG#22
 2025-08-28 07:52:51 +00:00
Hector
bbd63d99e5 Merge branch 'addRender' of http://10.0.0.99:4000/Hector/EG into addRender 
# Conflicts:
#	core/event_handler.py
#	core/terrain_manager.py
#	main.py
#	ui/interface_manager.py
#	ui/main_window.py
#	ui/property_panel.py
 2025-08-28 15:51:34 +08:00
陈横
4f680a3da4 1.修改整体布局（有BUG未修改完成） 2025-08-28 15:46:38 +08:00
Hector
78dae899cf 3d_image和2d_image 
根据高度图创建地形
 2025-08-28 15:45:32 +08:00
Hector
0fefb33f44 Merge pull request '3d_image和2d_image' (#21) from addRender into main 
Reviewed-on: Hector/EG#21
 2025-08-27 09:18:23 +00:00
Hector
afb4a4bb50 3d_image和2d_image 
根据高度图创建地形
 2025-08-27 17:17:54 +08:00
Hector
54aec1778d Merge pull request '补充Cesium文件' (#20) from addRender into main 
Reviewed-on: Hector/EG#20
 2025-08-25 09:49:41 +00:00
Hector
c66b9003f5 补充Cesium文件 2025-08-25 17:48:13 +08:00
Hector
167fa4bdd0 Merge pull request 'addRender' (#19) from addRender into main 
Reviewed-on: Hector/EG#19
 2025-08-25 09:42:27 +00:00
Hector
cdf2cd550e 1.Cesium tilesets 
2.3D面板
 2025-08-25 17:41:48 +08:00
Hector
8e8564048e 坐标轴控制旋转，缩放 2025-08-22 10:09:33 +08:00
陈横
0319b13f4a Merge remote-tracking branch 'origin/main_ch_eg' into main_ch_eg 
# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
#	ui/property_panel.py
 2025-08-21 11:35:17 +08:00
Hector
a189d027f0 Merge pull request 'addRender' (#18) from addRender into main_ch_eg 
Reviewed-on: Hector/EG#18
 2025-08-21 03:34:01 +00:00
陈横
bb76795478 Merge remote-tracking branch 'origin/addRender' into main_ch_eg 
# Conflicts:
#	.gitignore
#	.idea/AugmentWebviewStateStore.xml
#	RenderPipelineFile/config/daytime.yaml
#	ui/property_panel.py
 2025-08-21 11:31:31 +08:00
陈横
1db030309e Ignore pyc files and stop tracking compiled Python files 2025-08-21 11:28:54 +08:00
陈横
960178d31b Ignore pyc files and remove from tracking 2025-08-21 11:26:47 +08:00
Hector
48c90034df 合并冲突解决 2025-08-21 11:23:47 +08:00
Hector
c08b4e0350 Merge remote-tracking branch 'origin/main_ch_eg' into addRender 
# Conflicts:
#	RenderPipelineFile/config/daytime.yaml
#	ui/property_panel.py
#	ui/widgets.py
 2025-08-21 11:04:52 +08:00
陈横
5665cc90fc 1.层级面板拖拽功能 2025-08-21 10:46:40 +08:00
Hector
86788ba88d Merge pull request 'addRender' (#15) from addRender into main 
Reviewed-on: Hector/EG#15
 2025-08-21 02:45:38 +00:00
Hector
e4084c5bf6 1.坐标轴深度待更改 
2.拖动后节点可见性逻辑改进
 2025-08-21 10:44:59 +08:00
Hector
dc150f793b 1.坐标轴颜色正常但需继续更改sort 
2.拖拽结束后模型可见性更新
 2025-08-20 16:36:19 +08:00
Hector
138820ed48 1.改进属性面板显示逻辑 
2.坐标轴与节点存在关系改进
3.添加更多种类节点删除逻辑
4.修复模型切换可见性的碰撞体异常显示
 2025-08-19 10:23:38 +08:00
Hector
f81c4fd4cc 节点显示隐藏逻辑补全，删除无用非骨骼动画逻辑 2025-08-18 16:52:49 +08:00
陈横
f41ce004be Revert "1.修改属性面板横向显示内容" 
This reverts commit f1cbd3ffea.
 2025-08-18 16:14:40 +08:00
陈横
f1cbd3ffea 1.修改属性面板横向显示内容 
2.修改非骨骼动画属性面板
 2025-08-18 16:10:53 +08:00
陈横
eb3ce79c17 Merge remote-tracking branch 'origin/main' into main_ch_eg 2025-08-18 15:10:57 +08:00
Hector
ad59e573be 修复世界位置更新，节点拖动逻辑改进，所有节点不受父级缩放影响 2025-08-18 11:49:39 +08:00
Hector
8659dea84f Merge pull request 'addRender' (#14) from addRender into main 
Reviewed-on: Hector/EG#14
 2025-08-18 01:35:18 +00:00
Hector
0cce93b05a 拖动节点面板属性实时更新 2025-08-18 09:33:10 +08:00
Hector
6e3f47b7b0 Ignore pyc files 2025-08-15 16:40:43 +08:00
陈横
21a40628dd 清理 2025-08-15 16:26:27 +08:00
Hector
5e9a83bf31 Merge pull request 'Add .gitignore to ignore cache and IDE files' (#8) from addRender into main 
Reviewed-on: Hector/EG#8
 2025-08-15 08:17:48 +00:00
Hector
bf5a031a45 Add .gitignore to ignore cache and IDE files 2025-08-15 16:15:40 +08:00
陈横
075357ec12 移除所有__pycache__和.idea的版本控制文件 2025-08-15 15:57:14 +08:00
Hector
146069c832 Merge pull request '修复缩放影响子节点移动' (#3) from addRender into main 
Reviewed-on: Hector/EG#3
 2025-08-15 07:42:23 +00:00
陈横
808ed36a97 修改属性面板 2025-08-15 15:32:04 +08:00
Hector
ef2c8b777c 修复缩放影响子节点移动 2025-08-15 15:06:23 +08:00
Hector
f55417c57f Merge pull request 'addRender' (#2) from addRender into main 
Reviewed-on: Hector/EG#2
 2025-08-15 02:33:01 +00:00