From 30459c81cb40a023de3c52433278cb849f928b9b Mon Sep 17 00:00:00 2001 From: Hector <145347438+hudomn@users.noreply.github.com> Date: Mon, 27 Oct 2025 14:45:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=BC=95=E7=94=A8=E5=BA=93?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMeta3D/Meta3DWorld.py | 6 +++--- QMeta3D/QMeta3DWidget.py | 6 +++--- QMeta3D/QMeta3D_Buttons_Translation.py | 2 +- QMeta3D/QMeta3D_Keys_Translation.py | 2 +- QMeta3D/QMeta3D_Modifiers_Translation.py | 2 +- core/world.py | 4 ++-- demo/test_gizmo_drag.py | 4 ++-- demo/test_gui_complete.py | 4 ++-- demo/test_qt_debug.py | 4 ++-- demo/test_qt_fix.py | 4 ++-- demo/test_qt_gui_fix.py | 4 ++-- demo/test_qt_only.py | 4 ++-- demo/test_qt_vs_showbase.py | 4 ++-- demo/test_size_fix.py | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/QMeta3D/Meta3DWorld.py b/QMeta3D/Meta3DWorld.py index 4661e52c..f490791d 100644 --- a/QMeta3D/Meta3DWorld.py +++ b/QMeta3D/Meta3DWorld.py @@ -39,16 +39,16 @@ from direct.showbase.ShowBase import ShowBase import platform # Local imports -from QPanda3D.QMouseWatcherNode import QMouseWatcherNode +from QMeta3D.QMouseWatcherNode import QMouseWatcherNode from RenderPipelineFile.rpcore.render_target import RenderTarget -__all__ = ["Panda3DWorld"] +__all__ = ["Meta3DWorld"] _global_world_instance=None import builtins -class Panda3DWorld(ShowBase): +class Meta3DWorld(ShowBase): """ Panda3DWorld : A class to handle all panda3D world manipulation """ diff --git a/QMeta3D/QMeta3DWidget.py b/QMeta3D/QMeta3DWidget.py index bf4c6aec..5829775c 100644 --- a/QMeta3D/QMeta3DWidget.py +++ b/QMeta3D/QMeta3DWidget.py @@ -18,9 +18,9 @@ from direct.task.TaskManagerGlobal import taskMgr from panda3d.core import Texture, WindowProperties, CallbackGraphicsWindow from panda3d.core import loadPrcFileData -from QPanda3D.QPanda3D_Buttons_Translation import QPanda3D_Button_translation -from QPanda3D.QPanda3D_Keys_Translation import QPanda3D_Key_translation -from QPanda3D.QPanda3D_Modifiers_Translation import QPanda3D_Modifier_translation +from QMeta3D.QMeta3D_Buttons_Translation import QMeta3D_Button_translation +from QMeta3D.QMeta3D_Keys_Translation import QMeta3D_Key_translation +from QMeta3D.QMeta3D_Modifiers_Translation import QMeta3D_Modifier_translation __all__ = ["QPanda3DWidget"] diff --git a/QMeta3D/QMeta3D_Buttons_Translation.py b/QMeta3D/QMeta3D_Buttons_Translation.py index 35a15311..e0ae0328 100644 --- a/QMeta3D/QMeta3D_Buttons_Translation.py +++ b/QMeta3D/QMeta3D_Buttons_Translation.py @@ -13,7 +13,7 @@ from PyQt5.QtWidgets import * import sys __all__ = ["QMeta3D_Keys_Translation.py"] -QPanda3D_Button_translation ={ +QMeta3D_Button_translation ={ Qt.NoButton:'', Qt.AllButtons:'unknown', Qt.LeftButton:'mouse1', diff --git a/QMeta3D/QMeta3D_Keys_Translation.py b/QMeta3D/QMeta3D_Keys_Translation.py index 60331afd..b8a7dcc5 100644 --- a/QMeta3D/QMeta3D_Keys_Translation.py +++ b/QMeta3D/QMeta3D_Keys_Translation.py @@ -13,7 +13,7 @@ from PyQt5.QtWidgets import * import sys __all__ = ["QMeta3D_Keys_Translation.py"] -QPanda3D_Key_translation ={ +QMeta3D_Key_translation ={ Qt.Key_0:'0', Qt.Key_1:'1', Qt.Key_2:'2', diff --git a/QMeta3D/QMeta3D_Modifiers_Translation.py b/QMeta3D/QMeta3D_Modifiers_Translation.py index 6b4ad4b9..40866ecf 100644 --- a/QMeta3D/QMeta3D_Modifiers_Translation.py +++ b/QMeta3D/QMeta3D_Modifiers_Translation.py @@ -13,7 +13,7 @@ from PyQt5.QtWidgets import * import sys __all__ = ["QMeta3D_Modifiers_Translation.py"] -QPanda3D_Modifier_translation ={ +QMeta3D_Modifier_translation ={ Qt.NoModifier:None, Qt.ShiftModifier:'shift', Qt.ControlModifier:'control', diff --git a/core/world.py b/core/world.py index 4eab375e..72ad100e 100644 --- a/core/world.py +++ b/core/world.py @@ -6,13 +6,13 @@ from direct.actor.Actor import Actor warnings.filterwarnings("ignore", category=DeprecationWarning) -from QMeta3D.Meta3DWorld import Panda3DWorld +from QMeta3D.Meta3DWorld import Meta3DWorld from panda3d.core import (CardMaker, Vec4, Vec3, AmbientLight, DirectionalLight, Point3, WindowProperties,Material,LColor) from direct.showbase.ShowBaseGlobal import globalClock from scene.scene_manager import SceneManager -class CoreWorld(Panda3DWorld): +class CoreWorld(Meta3DWorld): """核心世界功能类 - 负责基础的3D世界设置和核心功能""" def __init__(self): diff --git a/demo/test_gizmo_drag.py b/demo/test_gizmo_drag.py index c70d101c..eedd6a3f 100644 --- a/demo/test_gizmo_drag.py +++ b/demo/test_gizmo_drag.py @@ -12,11 +12,11 @@ import sys from PyQt5.QtWidgets import QApplication, QMainWindow, QVBoxLayout, QWidget, QLabel, QPushButton, QHBoxLayout from PyQt5.QtCore import Qt from QMeta3D.QMeta3DWidget import QPanda3DWidget -from QMeta3D.Meta3DWorld import Panda3DWorld +from QMeta3D.Meta3DWorld import Meta3DWorld from panda3d.core import * from direct.task import Task -class GizmoDragTestWorld(Panda3DWorld): +class GizmoDragTestWorld(Meta3DWorld): def __init__(self): super().__init__() diff --git a/demo/test_gui_complete.py b/demo/test_gui_complete.py index 155d2c6b..72544d52 100644 --- a/demo/test_gui_complete.py +++ b/demo/test_gui_complete.py @@ -17,14 +17,14 @@ from PyQt5.QtWidgets import (QApplication, QMainWindow, QMenuBar, QMenu, QAction from PyQt5.QtCore import Qt, QDir, QUrl from PyQt5.QtGui import QDrag, QPainter, QPixmap from QMeta3D.QMeta3DWidget import QPanda3DWidget -from QMeta3D.Meta3DWorld import Panda3DWorld +from QMeta3D.Meta3DWorld import Meta3DWorld from direct.gui.DirectGui import * from direct.gui.OnscreenText import OnscreenText from panda3d.core import * import os # 简化的世界类,专门用于GUI测试 -class GUITestWorld(Panda3DWorld): +class GUITestWorld(Meta3DWorld): def __init__(self): super().__init__() diff --git a/demo/test_qt_debug.py b/demo/test_qt_debug.py index 3884ccfc..4033f26f 100644 --- a/demo/test_qt_debug.py +++ b/demo/test_qt_debug.py @@ -13,13 +13,13 @@ import sys from PyQt5.QtWidgets import QApplication, QMainWindow, QVBoxLayout, QWidget, QLabel from PyQt5.QtCore import Qt from QMeta3D.QMeta3DWidget import QPanda3DWidget -from QMeta3D.Meta3DWorld import Panda3DWorld +from QMeta3D.Meta3DWorld import Meta3DWorld from direct.gui.DirectGui import * from direct.gui.OnscreenText import OnscreenText from panda3d.core import * import os -class DebugGUIWorld(Panda3DWorld): +class DebugGUIWorld(Meta3DWorld): def __init__(self): super().__init__() diff --git a/demo/test_qt_fix.py b/demo/test_qt_fix.py index e9c4a28c..8b919983 100644 --- a/demo/test_qt_fix.py +++ b/demo/test_qt_fix.py @@ -13,13 +13,13 @@ import sys from PyQt5.QtWidgets import QApplication, QMainWindow from PyQt5.QtCore import Qt from QMeta3D.QMeta3DWidget import QPanda3DWidget -from QMeta3D.Meta3DWorld import Panda3DWorld +from QMeta3D.Meta3DWorld import Meta3DWorld from direct.gui.DirectGui import * from direct.gui.OnscreenText import OnscreenText from panda3d.core import * import os -class QtGUITestWorld(Panda3DWorld): +class QtGUITestWorld(Meta3DWorld): def __init__(self): super().__init__() diff --git a/demo/test_qt_gui_fix.py b/demo/test_qt_gui_fix.py index 470dfd24..4ecaa00c 100644 --- a/demo/test_qt_gui_fix.py +++ b/demo/test_qt_gui_fix.py @@ -14,12 +14,12 @@ from PyQt5.QtWidgets import QApplication, QMainWindow, QVBoxLayout, QWidget, QLa from PyQt5.QtCore import Qt from PyQt5.QtGui import QMouseEvent from QMeta3D.QMeta3DWidget import QPanda3DWidget -from QMeta3D.Meta3DWorld import Panda3DWorld +from QMeta3D.Meta3DWorld import Meta3DWorld from direct.gui.DirectGui import * from direct.gui.OnscreenText import OnscreenText from panda3d.core import * -class QtGUIFixWorld(Panda3DWorld): +class QtGUIFixWorld(Meta3DWorld): def __init__(self): super().__init__() diff --git a/demo/test_qt_only.py b/demo/test_qt_only.py index e97b70f3..8086c1f6 100644 --- a/demo/test_qt_only.py +++ b/demo/test_qt_only.py @@ -12,12 +12,12 @@ import sys from PyQt5.QtWidgets import QApplication, QMainWindow, QVBoxLayout, QWidget, QLabel from PyQt5.QtCore import Qt from QMeta3D.QMeta3DWidget import QPanda3DWidget -from QMeta3D.Meta3DWorld import Panda3DWorld +from QMeta3D.Meta3DWorld import Meta3DWorld from direct.gui.DirectGui import * from direct.gui.OnscreenText import OnscreenText from panda3d.core import * -class QtOnlyWorld(Panda3DWorld): +class QtOnlyWorld(Meta3DWorld): def __init__(self): super().__init__() diff --git a/demo/test_qt_vs_showbase.py b/demo/test_qt_vs_showbase.py index f4d212f5..1e154daa 100644 --- a/demo/test_qt_vs_showbase.py +++ b/demo/test_qt_vs_showbase.py @@ -13,13 +13,13 @@ import sys from PyQt5.QtWidgets import QApplication, QMainWindow, QVBoxLayout, QWidget, QLabel, QPushButton from PyQt5.QtCore import Qt from QMeta3D.QMeta3DWidget import QPanda3DWidget -from QMeta3D.Meta3DWorld import Panda3DWorld +from QMeta3D.Meta3DWorld import Meta3DWorld from direct.showbase.ShowBase import ShowBase from direct.gui.DirectGui import * from direct.gui.OnscreenText import OnscreenText from panda3d.core import * -class QtTestWorld(Panda3DWorld): +class QtTestWorld(Meta3DWorld): """Qt集成环境测试""" def __init__(self): super().__init__() diff --git a/demo/test_size_fix.py b/demo/test_size_fix.py index 1746ea21..098ba1e6 100644 --- a/demo/test_size_fix.py +++ b/demo/test_size_fix.py @@ -12,11 +12,11 @@ import sys from PyQt5.QtWidgets import QApplication, QMainWindow, QVBoxLayout, QWidget, QLabel from PyQt5.QtCore import Qt from QMeta3D.QMeta3DWidget import QPanda3DWidget -from QMeta3D.Meta3DWorld import Panda3DWorld +from QMeta3D.Meta3DWorld import Meta3DWorld from panda3d.core import * from direct.task import Task -class SizeTestWorld(Panda3DWorld): +class SizeTestWorld(Meta3DWorld): def __init__(self): super().__init__()