diff --git a/RenderPipelineFile/config/daytime.yaml b/RenderPipelineFile/config/daytime.yaml index 0a5dfddc..e67993cc 100644 --- a/RenderPipelineFile/config/daytime.yaml +++ b/RenderPipelineFile/config/daytime.yaml @@ -17,7 +17,7 @@ control_points: scattering: sun_intensity: [[[0.0000000000,0.0000000000],[0.0041666667,0.0000000000],[0.0083333333,0.0000000000],[0.0125000000,0.0000000000],[0.0166666667,0.0000000000],[0.0208333333,0.0000000000],[0.0250000000,0.0000000000],[0.0291666667,0.0000000000],[0.0333333333,0.0000000000],[0.0375000000,0.0000000000],[0.0416666667,0.0000000000],[0.0458333333,0.0000000000],[0.0500000000,0.0000000000],[0.0541666667,0.0000000000],[0.0583333333,0.0000000000],[0.0625000000,0.0000000000],[0.0666666667,0.0000000000],[0.0708333333,0.0000000000],[0.0750000000,0.0000000000],[0.0791666667,0.0000000000],[0.0833333333,0.0000000000],[0.0875000000,0.0000000000],[0.0916666667,0.0000000000],[0.0958333333,0.0000000000],[0.1000000000,0.0000000000],[0.1041666667,0.0000000000],[0.1083333333,0.0000000000],[0.1125000000,0.0000000000],[0.1166666667,0.0000000000],[0.1208333333,0.0000000000],[0.1250000000,0.0000000000],[0.1291666667,0.0000000000],[0.1333333333,0.0000000000],[0.1375000000,0.0000000000],[0.1416666667,0.0000000000],[0.1458333333,0.0000000000],[0.1500000000,0.0000000000],[0.1541666667,0.0000000000],[0.1583333333,0.0000028805],[0.1625000000,0.0003577724],[0.1666666667,0.0013331400],[0.1708333333,0.0029671803],[0.1750000000,0.0052963381],[0.1791666667,0.0083550556],[0.1833333333,0.0121755589],[0.1875000000,0.0167876159],[0.1916666667,0.0222183530],[0.1958333333,0.0284919947],[0.2000000000,0.0356297193],[0.2041666667,0.0436494349],[0.2083333333,0.0525656099],[0.2125000000,0.0623891610],[0.2166666667,0.0731272461],[0.2208333333,0.0847831708],[0.2250000000,0.0973563167],[0.2291666667,0.1108419698],[0.2333333333,0.1252313631],[0.2375000000,0.1405115250],[0.2416666667,0.1566653434],[0.2458333333,0.1736715009],[0.2500000000,0.1915046014],[0.2541666667,0.2101350464],[0.2583333333,0.2295292930],[0.2625000000,0.2496498145],[0.2666666667,0.2704552670],[0.2708333333,0.2919006662],[0.2750000000,0.3139375192],[0.2791666667,0.3365139497],[0.2833333333,0.3595750662],[0.2875000000,0.3830630359],[0.2916666667,0.4069173972],[0.2958333333,0.4310753462],[0.3000000000,0.4554720417],[0.3041666667,0.4800408236],[0.3083333333,0.5047136020],[0.3125000000,0.5294212108],[0.3166666667,0.5540936424],[0.3208333333,0.5786605298],[0.3250000000,0.6030514553],[0.3291666667,0.6271963182],[0.3333333333,0.6510256858],[0.3375000000,0.6744711982],[0.3416666667,0.6974659988],[0.3458333333,0.7199450163],[0.3500000000,0.7418453485],[0.3541666667,0.7631067095],[0.3583333333,0.7836717291],[0.3625000000,0.8034862953],[0.3666666667,0.8224999302],[0.3708333333,0.8406661079],[0.3750000000,0.8579425235],[0.3791666667,0.8742914270],[0.3833333333,0.8896799131],[0.3875000000,0.9040801386],[0.3916666667,0.9174695289],[0.3958333333,0.9298310650],[0.4000000000,0.9411533765],[0.4041666667,0.9514309312],[0.4083333333,0.9606641691],[0.4125000000,0.9688595571],[0.4166666667,0.9760296330],[0.4208333333,0.9821930708],[0.4250000000,0.9873746114],[0.4291666667,0.9916050060],[0.4333333333,0.9949209310],[0.4375000000,0.9973647924],[0.4416666667,0.9989845508],[0.4458333333,0.9998334497],[0.4500000000,0.9999696949],[0.4541666667,0.9994560801],[0.4583333333,0.9983595429],[0.4625000000,0.9967506613],[0.4666666667,0.9947030614],[0.4708333333,0.9922927758],[0.4750000000,0.9895975125],[0.4791666667,0.9866958610],[0.4833333333,0.9836664262],[0.4875000000,0.9805868867],[0.4916666667,0.9775330316],[0.4958333333,0.9745777179],[0.5000000000,0.9717898417],[0.5041666667,0.9692332877],[0.5083333333,0.9669658924],[0.5125000000,0.9650384806],[0.5089595376,0.9690650222],[0.5208333333,0.9623666659],[0.5250000000,0.9616814371],[0.5291666667,0.9614534423],[0.5333333333,0.9616877089],[0.5375000000,0.9623790807],[0.5416666667,0.9635123329],[0.5458333333,0.9650624244],[0.5500000000,0.9669949804],[0.5541666667,0.9692669864],[0.5583333333,0.9718275065],[0.5625000000,0.9746185969],[0.5666666667,0.9775762863],[0.5708333333,0.9806315864],[0.5750000000,0.9837115661],[0.5791666667,0.9867403433],[0.5833333333,0.9896401655],[0.5875000000,0.9923323562],[0.5916666667,0.9947382579],[0.5958333333,0.9967800977],[0.6000000000,0.9983817820],[0.6041666667,0.9994696263],[0.6083333333,0.9999730028],[0.6125000000,0.9998249266],[0.6166666667,0.9989625601],[0.6208333333,0.9973276624],[0.6250000000,0.9948669567],[0.6291666667,0.9915324664],[0.6333333333,0.9872817545],[0.6375000000,0.9820781426],[0.6416666667,0.9758908775],[0.6458333333,0.9686952146],[0.6500000000,0.9604725211],[0.6541666667,0.9512102537],[0.6583333333,0.9409019858],[0.6625000000,0.9295473441],[0.6666666667,0.9171518878],[0.6708333333,0.9037270619],[0.6750000000,0.8892899902],[0.6791666667,0.8738633008],[0.6833333333,0.8574749656],[0.6875000000,0.8401579787],[0.6916666667,0.8219502453],[0.6958333333,0.8028941798],[0.7000000000,0.7830364456],[0.7041666667,0.7624277344],[0.7083333333,0.7411222520],[0.7125000000,0.7191776044],[0.7166666667,0.6966542563],[0.7208333333,0.6736152714],[0.7250000000,0.6501259629],[0.7291666667,0.6262533880],[0.7333333333,0.6020661121],[0.7375000000,0.5776338043],[0.7416666667,0.5530267796],[0.7458333333,0.5283156992],[0.7500000000,0.5035711751],[0.7541666667,0.4788634341],[0.7583333333,0.4542618347],[0.7625000000,0.4298347613],[0.7666666667,0.4056490351],[0.7708333333,0.3817697830],[0.7750000000,0.3582600107],[0.7791666667,0.3351803495],[0.7833333333,0.3125888445],[0.7875000000,0.2905406366],[0.7916666667,0.2690876955],[0.7958333333,0.2482787388],[0.8000000000,0.2281588906],[0.8041666667,0.2087696425],[0.8083333333,0.1901486315],[0.8125000000,0.1723295359],[0.8166666667,0.1553419918],[0.8208333333,0.1392115328],[0.8250000000,0.1239595144],[0.8291666667,0.1096030703],[0.8333333333,0.0961551918],[0.8375000000,0.0836246599],[0.8416666667,0.0720161369],[0.8458333333,0.0613302273],[0.8500000000,0.0515635598],[0.8541666667,0.0427088803],[0.8583333333,0.0347551990],[0.8625000000,0.0276878920],[0.8666666667,0.0214889271],[0.8708333333,0.0161369711],[0.8750000000,0.0116076130],[0.8791666667,0.0078735477],[0.8833333333,0.0049047927],[0.8875000000,0.0026688977],[0.8916666667,0.0011311782],[0.8958333333,0.0002549473],[0.9000000000,0.0000000000],[0.9041666667,0.0000000000],[0.9083333333,0.0000000000],[0.9125000000,0.0000000000],[0.9166666667,0.0000000000],[0.9208333333,0.0000000000],[0.9250000000,0.0000000000],[0.9291666667,0.0000000000],[0.9333333333,0.0000000000],[0.9375000000,0.0000000000],[0.9416666667,0.0000000000],[0.9458333333,0.0000000000],[0.9500000000,0.0000000000],[0.9541666667,0.0000000000],[0.9583333333,0.0000000000],[0.9625000000,0.0000000000],[0.9666666667,0.0000000000],[0.9708333333,0.0000000000],[0.9750000000,0.0000000000],[0.9791666667,0.0000000000],[0.9833333333,0.0000000000],[0.9875000000,0.0000000000],[0.9916666667,0.0000000000],[0.9958333333,0.0000000000]]] sun_color: [[[0.5010435645,0.5818710306],[0.0433100000,0.8999700000],[0.8635787716,0.9130000000],[0.1785000000,0.8973600000],[0.8099800000,0.8651100000],[0.2360800000,0.7712700000],[0.6583432177,0.8485126184],[0.1266806142,0.9648102053],[0.9558541267,0.9090909091],[0.5568400771,0.7353760446]],[[0.5001318426,0.5160300000],[0.0572700000,0.6541600000],[0.2395000000,0.5976800000],[0.8104600000,0.6009000000],[0.6967400000,0.5483900000]],[[0.0862400000,0.4257800000],[0.4955600000,0.4033000000],[0.8234200000,0.4340200000]]] - sun_azimuth: [[[0.5000000000,0.1888888889]]] + sun_azimuth: [[[0.5000000000,0.4416666667]]] sun_altitude: [[[0.5000000000,1.0000000000]]] extinction: [[[0.4913294798,0.6378830084]]] volumetrics: diff --git a/core/selection.py b/core/selection.py index 4c55c3e4..5d28830b 100644 --- a/core/selection.py +++ b/core/selection.py @@ -217,6 +217,9 @@ class SelectionSystem: return task.cont self._last_selection_box_update = current_time + #检查目标节点是否已被删除 + self.checkAndClearIfTargetDeleted() + if not self.selectionBox or not self.selectionBoxTarget: return task.done # 结束任务 @@ -648,6 +651,9 @@ class SelectionSystem: return task.cont self._last_gizmo_update = current_time + #检查目标节点是否已被删除 + self.checkAndClearIfTargetDeleted() + if not self.gizmo or not self.gizmoTarget: return task.done @@ -1507,3 +1513,10 @@ class SelectionSystem: def hasSelection(self): """检查是否有选中的节点""" return self.selectedNode is not None + + def checkAndClearIfTargetDeleted(self): + if self.gizmoTarget and self.gizmoTarget.isEmpty(): + self.clearGizmo() + + if self.selectionBoxTarget and self.selectionBoxTarget.isEmpty(): + self.clearSelectionBox() diff --git a/scene/scene_manager.py b/scene/scene_manager.py index a19eabee..75671fe2 100644 --- a/scene/scene_manager.py +++ b/scene/scene_manager.py @@ -630,7 +630,8 @@ class SceneManager: cNode.addSolid(cSphere) # 将碰撞节点附加到模型上 - #cNodePath = model.attachNewNode(cNode) + cNodePath = model.attachNewNode(cNode) + #cNodePath.hide() # cNodePath.show() # 取消注释可以显示碰撞体，用于调试 # ==================== 场景树管理 ==================== diff --git a/ui/interface_manager.py b/ui/interface_manager.py index d49cf9b3..2fc489db 100644 --- a/ui/interface_manager.py +++ b/ui/interface_manager.py @@ -1,5 +1,6 @@ from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QMenu from PyQt5.QtCore import Qt +from PyQt5.sip import delete from panda3d.core import GeomNode, ModelRoot @@ -22,13 +23,15 @@ class InterfaceManager: # 更新场景树 self.world.scene_manager.updateSceneTree() - #self.syncVisibilityDownward() def onTreeItemClicked(self, item, column): """处理树形控件项目点击事件""" if not item: + self.world.selection.updateSelection(None) return + self.world.property_panel.updatePropertyPanel(item) + # 获取节点对象 nodePath = item.data(0, Qt.UserRole) if nodePath: @@ -37,7 +40,7 @@ class InterfaceManager: self.world.selection.updateSelection(nodePath) # 更新属性面板 - self.world.property_panel.updatePropertyPanel(item) + #self.world.property_panel.updatePropertyPanel(item) print(f"树形控件点击: {item.text(0)}") else: @@ -78,6 +81,9 @@ class InterfaceManager: if self.isModelOrChild(item): deleteAction = menu.addAction("删除") deleteAction.triggered.connect(lambda: self.deleteNode(nodePath, item)) + else: + deleteAction = menu.addAction("删除") + deleteAction.triggered.connect(lambda: self.deleteNode(nodePath, item)) # 显示菜单 menu.exec_(self.treeWidget.viewport().mapToGlobal(position)) @@ -95,12 +101,33 @@ class InterfaceManager: try: # 从场景中移除 self.world.property_panel.removeActorForModel(nodePath) + + if hasattr(nodePath,'getPythonTag'): + light_object = nodePath.getPythonTag('rp_light_object') + if light_object and hasattr(self.world,'render_pipeline'): + self.world.render_pipeline.remove_light(light_object) + + if hasattr(self.world,'selection'): + if self.world.selection.selectedNode == nodePath: + self.world.selection.clearSelectionBox() + self.world.selection.clearGizmo() + self.world.selection.selectedNode = None + self.world.selection.selectedObject = None + + if nodePath in self.world.Spotlight: + self.world.Spotlight.remove(nodePath) + if nodePath in self.world.Pointlight: + self.world.Pointlight.remove(nodePath) + nodePath.removeNode() + if hasattr(self.world,'selection'): + self.world.selection.checkAndClearIfTargetDeleted() + # 如果是模型根节点，从模型列表中移除 - if item.parent().text(0) == "模型": - if nodePath in self.world.models: - self.world.models.remove(nodePath) + #if item.parent().text(0) == "模型": + if nodePath in self.world.models: + self.world.models.remove(nodePath) # 从树形控件中移除 parentItem = item.parent() diff --git a/ui/property_panel.py b/ui/property_panel.py index 52f87291..8b6382a7 100644 --- a/ui/property_panel.py +++ b/ui/property_panel.py @@ -143,10 +143,15 @@ class PropertyPanelManager: eff = parent_eff and user node.setPythonTag("effective_visible", eff) - if eff: - node.show() - else: + #特殊处理：检查是否为碰撞体节点 + + if node.getName().startswith("modelCollision_"): node.hide() + else: + if eff: + node.show() + else: + node.hide() for child in node.getChildren(): q.append((child, eff)) @@ -157,6 +162,11 @@ class PropertyPanelManager: # 用我们自己维护的可见性接口，而不是直接 show/hide visible = (state == Qt.Checked) self._setUserVisible(model, visible) + + collision_nodes = model.findAllMatches("**/modelCollision_*") + for collision_node in collision_nodes: + collision_node.hide() + except Exception as e: print(f"切换模型可见性失败: {str(e)}")