From 1e814ba55329ac4e13282052ed5fea8934c22ee7 Mon Sep 17 00:00:00 2001 From: cecilkorik Date: Sun, 4 Feb 2024 01:35:00 -0500 Subject: [PATCH] make empty window open --- engine/__init__.py | 6 +++--- engine/config.py | 6 +++--- engine/data.py | 5 ++--- pyglet_demo.py | 6 +++++- requirements.txt | 3 +++ 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/engine/__init__.py b/engine/__init__.py index c316a1b..3ccbe29 100644 --- a/engine/__init__.py +++ b/engine/__init__.py @@ -1,3 +1,3 @@ -import data -import config -import screen \ No newline at end of file +from . import data +from . import config +from . import screen \ No newline at end of file diff --git a/engine/config.py b/engine/config.py index 42c288d..cf771f1 100644 --- a/engine/config.py +++ b/engine/config.py @@ -2,7 +2,7 @@ import json from collections import UserDict import os import sys -import data +from . import data class SettingsLoader(UserDict): def __init__(self: object, file: str) -> None: @@ -11,9 +11,9 @@ class SettingsLoader(UserDict): def load_settings_file(self: object, file: str) -> None: ext = os.path.splitext(file)[1] - with data.open('conf', file) as fd: + with data.data_open('conf', file) as fd: if ext == '.json': - self.data.extend(json.load(fd)) + self.data.update(json.load(fd)) else: raise ValueError("Cannot open this type of settings file") diff --git a/engine/data.py b/engine/data.py index dc5d226..8994fd3 100644 --- a/engine/data.py +++ b/engine/data.py @@ -10,8 +10,7 @@ def program_path() -> str: return g_pp -def open(vault: str, path: str) -> object: +def data_open(vault: str, path: str) -> object: fp = os.path.join(program_path(), vault, path) - with open(fp, 'r') as fd: - return fd.read() + return open(fp, 'r') diff --git a/pyglet_demo.py b/pyglet_demo.py index e1cfec7..5868610 100644 --- a/pyglet_demo.py +++ b/pyglet_demo.py @@ -1,3 +1,7 @@ import pyglet +import engine -pyglet.window \ No newline at end of file +engine.screen.init_window() + + +pyglet.app.run() \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index e69de29..e9fce16 100644 --- a/requirements.txt +++ b/requirements.txt @@ -0,0 +1,3 @@ +patch==1.16 +pyglet==2.0.10 +unoconv==0.9.0