addRender #2

Rowland · 2025-09-15T01:22:02Z

Rowland commented

2025-09-15 01:22:02 +00:00

No description provided.

Rowland added 80 commits 2025-09-15 01:22:02 +00:00

Merge pull request '添加渲染效果' (#1 ) from addRender into main 4df2336659

Reviewed-on: Hector/EG#1

漫反射和法线贴图修正 0846a60d36

制作粗糙度和金属性贴图 d40cce3ece

太阳方位角及高度角可自由调整 62aa0f6fbd

太阳方位角及高度角自由调整 f985a13555

deletNull 21cd80076e

跨平台路径统一，glb格式模型动画播放 6a7e6e5657

动画播放bug修正，fbx模型自动转换glb格式 ee0fe2741d

跨平台路径标准化，坐标系问题修改，缩放后子节点移动问题修复 3261163ec8

更新 29621d5c18

优化节点更新树 95e0681d7c

选择修改 49387b456a

最新 602f172e32

Merge pull request 'addRender' (#2 ) from addRender into main f55417c57f

Reviewed-on: Hector/EG#2

修复缩放影响子节点移动 ef2c8b777c

修改属性面板 808ed36a97

Merge pull request '修复缩放影响子节点移动' (#3 ) from addRender into main 146069c832

Reviewed-on: Hector/EG#3

移除所有__pycache__和.idea的版本控制文件 075357ec12

Add .gitignore to ignore cache and IDE files bf5a031a45

Merge pull request 'Add .gitignore to ignore cache and IDE files' (#8 ) from addRender into main 5e9a83bf31

Reviewed-on: Hector/EG#8

清理 21a40628dd

Ignore pyc files 6e3f47b7b0

拖动节点面板属性实时更新 0cce93b05a

Merge pull request 'addRender' (#14 ) from addRender into main 8659dea84f

Reviewed-on: Hector/EG#14

修复世界位置更新，节点拖动逻辑改进，所有节点不受父级缩放影响 ad59e573be

Merge remote-tracking branch 'origin/main' into main_ch_eg eb3ce79c17

1.修改属性面板横向显示内容 f1cbd3ffea

2.修改非骨骼动画属性面板

Revert "1.修改属性面板横向显示内容" f41ce004be

This reverts commit f1cbd3ffea.

节点显示隐藏逻辑补全，删除无用非骨骼动画逻辑 f81c4fd4cc

1.改进属性面板显示逻辑 138820ed48

2.坐标轴与节点存在关系改进
3.添加更多种类节点删除逻辑
4.修复模型切换可见性的碰撞体异常显示

1.坐标轴颜色正常但需继续更改sort dc150f793b

2.拖拽结束后模型可见性更新

1.坐标轴深度待更改 e4084c5bf6

2.拖动后节点可见性逻辑改进

Merge pull request 'addRender' (#15 ) from addRender into main 86788ba88d

Reviewed-on: Hector/EG#15

1.层级面板拖拽功能 5665cc90fc

Merge remote-tracking branch 'origin/main_ch_eg' into addRender c08b4e0350

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

合并冲突解决 48c90034df

Ignore pyc files and remove from tracking 960178d31b

Ignore pyc files and stop tracking compiled Python files 1db030309e

Merge remote-tracking branch 'origin/addRender' into main_ch_eg bb76795478

# Conflicts:
#	.gitignore
#	.idea/AugmentWebviewStateStore.xml
#	RenderPipelineFile/config/daytime.yaml
#	ui/property_panel.py

Merge pull request 'addRender' (#18 ) from addRender into main_ch_eg a189d027f0

Reviewed-on: Hector/EG#18

Merge remote-tracking branch 'origin/main_ch_eg' into main_ch_eg 0319b13f4a

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

坐标轴控制旋转，缩放 8e8564048e

1.Cesium tilesets cdf2cd550e

2.3D面板

Merge pull request 'addRender' (#19 ) from addRender into main 167fa4bdd0

Reviewed-on: Hector/EG#19

补充Cesium文件 c66b9003f5

Merge pull request '补充Cesium文件' (#20 ) from addRender into main 54aec1778d

Reviewed-on: Hector/EG#20

3d_image和2d_image afb4a4bb50

根据高度图创建地形

Merge pull request '3d_image和2d_image' (#21 ) from addRender into main 0fefb33f44

Reviewed-on: Hector/EG#21

3d_image和2d_image 78dae899cf

根据高度图创建地形

1.修改整体布局（有BUG未修改完成） 4f680a3da4

Merge branch 'addRender' of http://10.0.0.99:4000/Hector/EG into addRender bbd63d99e5

# Conflicts:
#	core/event_handler.py
#	core/terrain_manager.py
#	main.py
#	ui/interface_manager.py
#	ui/main_window.py
#	ui/property_panel.py

Merge pull request 'addRender' (#22 ) from addRender into main fc846e296d

Reviewed-on: Hector/EG#22

Merge remote-tracking branch 'origin/main' into main_ch_eg 6e4cd17d75

更新daytime配置，添加新的资源文件和终端配置 e94bf83196

Merge remote-tracking branch 'origin/main_ch_eg' into addRender f4b16c36c6

# Conflicts:
#	gui/gui_manager.py
#	main.py
#	scene/scene_manager.py
#	ui/main_window.py
#	ui/property_panel.py

8.28合并 ace5229473

Merge pull request 'addRender' (#25 ) from addRender into main c45bb54927

Reviewed-on: Hector/EG#25

Merge remote-tracking branch 'origin/main' into main_ch_eg c39ebeb345

1.整合菜单栏（2D图片、3D图片、地形） 95395bdb05

8.28合并 d980330d9d

3d视频屏幕和2d视频屏幕 5e68ff5ee6

视频屏幕可播放视频流，修改部分名称过长问题 4ca5068b2c

项目保存时剔除坐标轴模型以及项目不会加载多余天空盒 bc90a4521e

限制材质名称长度防止属性面板各项属性宽度过长 ce43355167

处理模型导入问题。。。 f27b4a0bbf

信息面板GUI完成，http数据连接成功，9.10合并 605f2bbdcd

1.修改Bug（20250910） 26d10f4117

Merge remote-tracking branch 'origin/main_ch_eg' into addRender 9fc8f2f5ca

# Conflicts:
#	RenderPipelineFile/rpcore/pynative/internal_light_manager.py
#	core/terrain_manager.py
#	gui/gui_manager.py
#	scene/scene_manager.py
#	ui/interface_manager.py
#	ui/widgets.py

1.新加启动页打开项目相关逻辑 e02a0762bd

3d信息面板文字信息 4222200ae2

Merge remote-tracking branch 'origin/addRender' into main_ch_eg 5b814a8376

1.新加启动页打开项目相关逻辑（添加启动页开始入口） c87f26a0ec

Merge remote-tracking branch 'origin/addRender' into main_ch_eg 6b4dcd14e6

Merge remote-tracking branch 'origin/main_ch_eg' into addRender fb863f8e2b

添加更多保存节点 ace7804578

1.优化启动页 c05911d7d6

2.加载层级树（未完成）

Merge remote-tracking branch 'origin/addRender' into main_ch_eg 8f6bcc9b5a

# Conflicts:
#	scene/scene_manager.py

1 7fd52d3458

2dGUI场景保存，3D模型，（地形，信息面板除外） fc7f0d55f3

保存 8a2f1f802c

Rowland merged commit c53f1d3ae5 into main

2025-09-15 01:22:41 +00:00

Rowland referenced this issue from a commit

2025-09-15 01:22:42 +00:00

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

Rowland referenced this issue from a commit

2025-09-15 01:22:42 +00:00

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

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

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#2