more cleaning

diff --git a/ya2/dictfile.py b/ya2/dictfile.py
index 5495b3a6b311cab41087a65e7705a5607874cef2..a466655bac8c60df26ce8739ac40972bd46c4eff 100644 (file)
--- a/ya2/dictfile.py
+++ b/ya2/dictfile.py
@@ -6,7 +6,7 @@ from collections.abc import Mapping
 from configparser import ConfigParser
 from json import load, dumps
 from ya2.gameobject import GameObject
-from ya2.lib.builder import LibP3d
+from ya2.lib.p3d.p3d import LibP3d
 
 
 class DctFile(GameObject):

diff --git a/ya2/engine/gui/cursor.py b/ya2/engine/gui/cursor.py
index f3d0ff1cd2a05316de831f8669491a85fbb30b85..9a8680a61075a8036721656eda989c2422a38a84 100644 (file)
--- a/ya2/engine/gui/cursor.py
+++ b/ya2/engine/gui/cursor.py
@@ -1,5 +1,5 @@
 from panda3d.core import GraphicsWindow, WindowProperties
-from ya2.lib.gui import Img
+from ya2.lib.p3d.gui import P3dImg as Img
 from ya2.gameobject import GameObject
 
 

diff --git a/ya2/engine/log.py b/ya2/engine/log.py
index 9aa9b4e322d74ad1939cb667fdda57e603959872..e2c80fd20f30893b58308724d2a43e8b815cfec5 100755 (executable)
--- a/ya2/engine/log.py
+++ b/ya2/engine/log.py
@@ -17,7 +17,7 @@ from sys import version_info
 from panda3d.core import Filename, GraphicsWindow, PandaSystem
 from panda3d.bullet import get_bullet_version
 from ya2.gameobject import Colleague
-from ya2.lib.builder import LibP3d
+from ya2.lib.p3d.p3d import LibP3d
 import sys
 
 

diff --git a/ya2/lib/builder.py b/ya2/lib/builder.py
deleted file mode 100644 (file)
index 48d982e..0000000
--- a/ya2/lib/builder.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from ya2.lib.p3d.p3d import LibP3d
-
-
-# class LibBuilder:
-#     '''This classe builds the implementation of the library abstraction  (for
-#     the Dependency Inversion Principle).'''
-
-#     @staticmethod
-#     def build():
-#         '''This method actually builds the library implementation.
-#         Now it builds Panda3D's implementation layer, but it may be used as a
-#         dispatcher (e.g. for new Panda3D versions).'''
-#         return LibP3d()

diff --git a/ya2/lib/gui.py b/ya2/lib/gui.py
deleted file mode 100644 (file)
index 51f2fd8..0000000
--- a/ya2/lib/gui.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# '''This module binds abstract GUI classes and actual implementation classes
-# (for the Dependency Inversion Principle).'''
-from ya2.lib.p3d.gui import P3dImg  # , P3dBtn, P3dSlider, P3dCheckBtn, \
-#     P3dOptionMenu, P3dEntry, P3dLabel, P3dTxt, P3dFrame, P3dScrolledFrame
-
-
-Img = P3dImg
-# Btn = P3dBtn
-# Slider = P3dSlider
-# CheckBtn = P3dCheckBtn
-# OptionMenu = P3dOptionMenu
-# Entry = P3dEntry
-# Label = P3dLabel
-# Text = P3dTxt
-# Frame = P3dFrame
-# ScrolledFrame = P3dScrolledFrame