From 0cce93b05a5a09024da7f6f7b075491b824f1127 Mon Sep 17 00:00:00 2001 From: Hector <2055590199@qq.com> Date: Mon, 18 Aug 2025 09:33:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=96=E5=8A=A8=E8=8A=82=E7=82=B9=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=B1=9E=E6=80=A7=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/EG.iml | 2 +- .idea/misc.xml | 2 +- RenderPipelineFile/config/daytime.yaml | 2 +- core/selection.py | 117 +++++++++++++++++++++---- ui/property_panel.py | 64 +++++++++++--- 5 files changed, 152 insertions(+), 35 deletions(-) diff --git a/.idea/EG.iml b/.idea/EG.iml index c1574376..8a3456df 100644 --- a/.idea/EG.iml +++ b/.idea/EG.iml @@ -4,7 +4,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 51b9fc17..370e0928 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/RenderPipelineFile/config/daytime.yaml b/RenderPipelineFile/config/daytime.yaml index 140ea957..abf9d58d 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.6666666667]]] + sun_azimuth: [[[0.5000000000,0.4777777778]]] sun_altitude: [[[0.5000000000,1.0000000000]]] extinction: [[[0.4913294798,0.6378830084]]] volumetrics: diff --git a/core/selection.py b/core/selection.py index d1c62a24..6fdc36fb 100644 --- a/core/selection.py +++ b/core/selection.py @@ -105,6 +105,37 @@ class SelectionSystem: if not self.selectionBox or not self.selectionBoxTarget: return + # 检查是否需要重新计算边界框 + if not hasattr(self, '_bounds_cache'): + self._bounds_cache = {} + + node_name = self.selectionBoxTarget.getName() + import time + current_time = time.time() + + # 如果缓存存在且未过期，则使用缓存 + if (node_name in self._bounds_cache and + current_time - self._bounds_cache[node_name]['time'] < 0.1): + minPoint, maxPoint = self._bounds_cache[node_name]['bounds'] + else: + # 计算新的边界框并缓存 + minPoint = Point3() + maxPoint = Point3() + if not self.selectionBoxTarget.calcTightBounds(minPoint, maxPoint, self.world.render): + return + + # 缓存结果 + self._bounds_cache[node_name] = { + 'bounds': (minPoint, maxPoint), + 'time': current_time + } + + # 清理旧缓存 + expired_keys = [k for k, v in self._bounds_cache.items() + if current_time - v['time'] > 1.0] + for key in expired_keys: + del self._bounds_cache[key] + # 清除现有的几何体 self.selectionBox.removeNode() self.selectionBox = self.world.render.attachNewNode("selectionBox") @@ -177,6 +208,15 @@ class SelectionSystem: def updateSelectionBoxTask(self, task): """选择框更新任务""" try: + if not hasattr(self,'_last_selection_box_update'): + self._last_selection_box_update = 0 + + import time + current_time = time.time() + if current_time - self._last_selection_box_update < 0.1: + return task.cont + self._last_selection_box_update = current_time + if not self.selectionBox or not self.selectionBoxTarget: return task.done # 结束任务 @@ -598,6 +638,16 @@ class SelectionSystem: def updateGizmoTask(self, task): """坐标轴更新任务 - 包含固定大小功能""" try: + # 限制更新频率 + if not hasattr(self, '_last_gizmo_update'): + self._last_gizmo_update = 0 + + import time + current_time = time.time() + if current_time - self._last_gizmo_update < 0.05: # 每0.05秒更新一次 + return task.cont + self._last_gizmo_update = current_time + if not self.gizmo or not self.gizmoTarget: return task.done @@ -613,25 +663,27 @@ class SelectionSystem: self.gizmoTarget.setPos(light_pos) else: - # 更新坐标轴位置，始终在目标节点中心 - minPoint = Point3() - maxPoint = Point3() - if self.gizmoTarget.calcTightBounds(minPoint, maxPoint, self.world.render): - # 计算中心点 - center = Point3((minPoint.x + maxPoint.x) * 0.5, - (minPoint.y + maxPoint.y) * 0.5, - (minPoint.z + maxPoint.z) * 0.5) - self.gizmo.setPos(center) - - # 【关键修复】：更新坐标轴朝向以跟踪父节点的变化 - parent_node = self.gizmoTarget.getParent() - if parent_node and parent_node != self.world.render: - # 子节点：坐标轴朝向跟随父节点 - parent_hpr = parent_node.getHpr() - self.gizmo.setHpr(parent_hpr) - else: - # 顶级模型：使用世界坐标系朝向 - self.gizmo.setHpr(0, 0, 0) + # 只在必要时更新位置和朝向 + self._updateGizmoPositionAndOrientation() + # # 更新坐标轴位置，始终在目标节点中心 + # minPoint = Point3() + # maxPoint = Point3() + # if self.gizmoTarget.calcTightBounds(minPoint, maxPoint, self.world.render): + # # 计算中心点 + # center = Point3((minPoint.x + maxPoint.x) * 0.5, + # (minPoint.y + maxPoint.y) * 0.5, + # (minPoint.z + maxPoint.z) * 0.5) + # self.gizmo.setPos(center) + # + # # 【关键修复】：更新坐标轴朝向以跟踪父节点的变化 + # parent_node = self.gizmoTarget.getParent() + # if parent_node and parent_node != self.world.render: + # # 子节点：坐标轴朝向跟随父节点 + # parent_hpr = parent_node.getHpr() + # self.gizmo.setHpr(parent_hpr) + # else: + # # 顶级模型：使用世界坐标系朝向 + # self.gizmo.setHpr(0, 0, 0) # 【新功能】：动态调整坐标轴大小，保持固定的屏幕大小 self._updateGizmoScreenSize() @@ -642,6 +694,33 @@ class SelectionSystem: print(f"坐标轴更新任务出错: {str(e)}") return task.done + def _updateGizmoPositionAndOrientation(self): + """优化的Gizmo位置和朝向更新""" + # 只在必要时重新计算边界框 + if not hasattr(self, '_last_gizmo_bounds_update'): + self._last_gizmo_bounds_update = 0 + + import time + current_time = time.time() + if current_time - self._last_gizmo_bounds_update > 0.2: # 每0.2秒计算一次边界框 + minPoint = Point3() + maxPoint = Point3() + if self.gizmoTarget.calcTightBounds(minPoint, maxPoint, self.world.render): + # 计算中心点 + center = Point3((minPoint.x + maxPoint.x) * 0.5, + (minPoint.y + maxPoint.y) * 0.5, + (minPoint.z + maxPoint.z) * 0.5) + self.gizmo.setPos(center) + self._last_gizmo_bounds_update = current_time + + # 更新朝向 + parent_node = self.gizmoTarget.getParent() + if parent_node and parent_node != self.world.render: + parent_hpr = parent_node.getHpr() + self.gizmo.setHpr(parent_hpr) + else: + self.gizmo.setHpr(0, 0, 0) + def _updateGizmoScreenSize(self): """动态调整坐标轴大小，保持固定的屏幕大小""" try: diff --git a/ui/property_panel.py b/ui/property_panel.py index 6fcfb4aa..1684aa7c 100644 --- a/ui/property_panel.py +++ b/ui/property_panel.py @@ -309,6 +309,50 @@ class PropertyPanelManager: # 材质属性组 self._updateModelMaterialPanel(model) + def refreshModelValues(self,nodePath): + if not nodePath or self._propertyLayout is None: + return + parent = nodePath.getParent() + render = self.world.render + relPos = nodePath.getPos(parent) if parent else nodePath.getPos() + if hasattr(self,'pos_x') and self.pos_x: + self.pos_x.blockSignals(True) + self.pos_x.setValue(relPos.getX()) + self.pos_x.blockSignals(False) + if hasattr(self,'pos_y') and self.pos_y: + self.pos_y.blockSignals(True) + self.pos_y.setValue(relPos.getY()) + self.pos_y.blockSignals(False) + if hasattr(self,'pos_z') and self.pos_z: + self.pos_z.blockSignals(True) + self.pos_z.setValue(relPos.getZ()) + self.pos_z.blockSignals(False) + + worldPos = nodePath.getPos(render) + for axis,attr in zip(('x','y','z'),('world_pos_x','world_pos_y','world_pos_z')): + spin = getattr(self,attr,None) + if spin: + spin.blockSignals(True) + spin.setValue(getattr(worldPos,axis)) + spin.blockSignals(False) + + hpr = nodePath.getHpr() + for idx,(attr,val) in enumerate(zip(('rot_h','rot_p','rot_r'),hpr)): + spin = getattr(self,attr,None) + if spin: + spin.blockSignals(True) + spin.setValue(val) + spin.blockSignals(False) + + scale = nodePath.getScale() + for axis,attr in zip(('x','y','z'),('scale_x','scale_y','scale_z')): + spin = getattr(self,attr,None) + if spin: + spin.blockSignals(True) + spin.setValue(getattr(scale,axis)) + spin.blockSignals(False) + + def updateGUIPropertyPanel(self, gui_element): """更新GUI元素属性面板""" @@ -877,7 +921,7 @@ class PropertyPanelManager: print(f"材质基础颜色: {base_color}") # 基础颜色标题 - color_row = 2 if material_status != "标准PBR材质" else 0 + color_row = 2 if material_status != "标准PBR材质" else 1 material_layout.addWidget(QLabel("基础颜色"), color_row, 0) # R, G, B 标签 @@ -3870,20 +3914,14 @@ class PropertyPanelManager: azimuth, altitude = presets[preset_name] # 更新滑块和数值框 - self.sun_azimuth_slider.blockSignals(True) - self.sun_azimuth_spinbox.blockSignals(True) - self.sun_altitude_slider.blockSignals(True) - self.sun_altitude_spinbox.blockSignals(True) + self.azimuthSpinBox.blockSignals(True) + self.altitudeSpinBox.blockSignals(True) - self.sun_azimuth_slider.setValue(azimuth) - self.sun_azimuth_spinbox.setValue(azimuth) - self.sun_altitude_slider.setValue(altitude) - self.sun_altitude_spinbox.setValue(altitude) + self.azimuthSpinBox.setValue(azimuth) + self.altitudeSpinBox.setValue(altitude) - self.sun_azimuth_slider.blockSignals(False) - self.sun_azimuth_spinbox.blockSignals(False) - self.sun_altitude_slider.blockSignals(False) - self.sun_altitude_spinbox.blockSignals(False) + self.azimuthSpinBox.blockSignals(False) + self.altitudeSpinBox.blockSignals(False) # 应用设置 - 优先使用Day Time Editor azimuth_success = self._updateDayTimeEditorSetting("scattering", "sun_azimuth", azimuth)