From 5ab87f1420afb5ba912622beed8b743746ab9361 Mon Sep 17 00:00:00 2001 From: ajh123 Date: Sun, 6 Feb 2022 11:45:12 +0000 Subject: [PATCH 01/13] Loading screen and mneu screnn --- community/controller.py | 4 +- community/gamemain.py | 262 +++++++++++++++++++ community/joystick.py | 2 +- community/keyboard_mouse.py | 12 +- community/logs/1644066580.3803027.logs | 1 + community/logs/1644066589.0340598.logs | 1 + community/logs/1644066833.5560026.logs | 1 + community/logs/1644066890.710436.logs | 1 + community/logs/1644066931.5696146.logs | 1 + community/logs/1644066945.2327247.logs | 1 + community/logs/1644067129.643187.logs | 1 + community/logs/1644067182.604235.logs | 1 + community/logs/1644067210.7173743.logs | 14 + community/logs/1644067266.2068014.logs | 28 ++ community/logs/1644067540.0752838.logs | 27 ++ community/logs/1644067726.920262.logs | 14 + community/logs/1644067819.0633264.logs | 14 + community/logs/1644067869.1284564.logs | 14 + community/logs/1644067975.1481597.logs | 15 ++ community/logs/1644068084.750459.logs | 14 + community/logs/1644068149.975369.logs | 15 ++ community/logs/1644068401.027944.logs | 1 + community/logs/1644068427.934449.logs | 1 + community/logs/1644068454.265929.logs | 1 + community/logs/1644068479.860526.logs | 15 ++ community/logs/1644068575.6942272.logs | 15 ++ community/logs/1644068698.4923203.logs | 1 + community/logs/1644068721.742721.logs | 1 + community/logs/1644068782.8335724.logs | 1 + community/logs/1644068824.845367.logs | 1 + community/logs/1644068913.0820727.logs | 15 ++ community/logs/1644069054.834381.logs | 15 ++ community/logs/1644069120.6182787.logs | 13 + community/logs/1644142309.063243.logs | 28 ++ community/logs/1644142387.5476556.logs | 13 + community/logs/1644142455.9745388.logs | 15 ++ community/logs/1644142541.0553358.logs | 15 ++ community/logs/1644142611.3890436.logs | 15 ++ community/logs/1644142729.1588702.logs | 15 ++ community/logs/1644143192.0706403.logs | 14 + community/logs/1644143335.1786792.logs | 15 ++ community/logs/1644144292.3653753.logs | 15 ++ community/logs/1644144600.3790636.logs | 15 ++ community/logs/1644146066.2632725.logs | 15 ++ community/logs/1644146476.8109665.logs | 1 + community/logs/1644146531.0163143.logs | 1 + community/logs/1644146595.609154.logs | 15 ++ community/logs/1644146852.9559436.logs | 1 + community/logs/1644146870.9589648.logs | 1 + community/logs/1644147046.652437.logs | 1 + community/logs/1644147444.1665943.logs | 1 + community/logs/1644147481.8290534.logs | 1 + community/logs/1644147586.6211443.logs | 1 + community/logs/1644147600.3879564.logs | 1 + community/logs/1644147636.7340612.logs | 15 ++ community/main.py | 346 +++++++------------------ community/scene.py | 59 +++++ community/textures/button.png | Bin 0 -> 3324 bytes 58 files changed, 876 insertions(+), 266 deletions(-) create mode 100644 community/gamemain.py create mode 100644 community/logs/1644066580.3803027.logs create mode 100644 community/logs/1644066589.0340598.logs create mode 100644 community/logs/1644066833.5560026.logs create mode 100644 community/logs/1644066890.710436.logs create mode 100644 community/logs/1644066931.5696146.logs create mode 100644 community/logs/1644066945.2327247.logs create mode 100644 community/logs/1644067129.643187.logs create mode 100644 community/logs/1644067182.604235.logs create mode 100644 community/logs/1644067210.7173743.logs create mode 100644 community/logs/1644067266.2068014.logs create mode 100644 community/logs/1644067540.0752838.logs create mode 100644 community/logs/1644067726.920262.logs create mode 100644 community/logs/1644067819.0633264.logs create mode 100644 community/logs/1644067869.1284564.logs create mode 100644 community/logs/1644067975.1481597.logs create mode 100644 community/logs/1644068084.750459.logs create mode 100644 community/logs/1644068149.975369.logs create mode 100644 community/logs/1644068401.027944.logs create mode 100644 community/logs/1644068427.934449.logs create mode 100644 community/logs/1644068454.265929.logs create mode 100644 community/logs/1644068479.860526.logs create mode 100644 community/logs/1644068575.6942272.logs create mode 100644 community/logs/1644068698.4923203.logs create mode 100644 community/logs/1644068721.742721.logs create mode 100644 community/logs/1644068782.8335724.logs create mode 100644 community/logs/1644068824.845367.logs create mode 100644 community/logs/1644068913.0820727.logs create mode 100644 community/logs/1644069054.834381.logs create mode 100644 community/logs/1644069120.6182787.logs create mode 100644 community/logs/1644142309.063243.logs create mode 100644 community/logs/1644142387.5476556.logs create mode 100644 community/logs/1644142455.9745388.logs create mode 100644 community/logs/1644142541.0553358.logs create mode 100644 community/logs/1644142611.3890436.logs create mode 100644 community/logs/1644142729.1588702.logs create mode 100644 community/logs/1644143192.0706403.logs create mode 100644 community/logs/1644143335.1786792.logs create mode 100644 community/logs/1644144292.3653753.logs create mode 100644 community/logs/1644144600.3790636.logs create mode 100644 community/logs/1644146066.2632725.logs create mode 100644 community/logs/1644146476.8109665.logs create mode 100644 community/logs/1644146531.0163143.logs create mode 100644 community/logs/1644146595.609154.logs create mode 100644 community/logs/1644146852.9559436.logs create mode 100644 community/logs/1644146870.9589648.logs create mode 100644 community/logs/1644147046.652437.logs create mode 100644 community/logs/1644147444.1665943.logs create mode 100644 community/logs/1644147481.8290534.logs create mode 100644 community/logs/1644147586.6211443.logs create mode 100644 community/logs/1644147600.3879564.logs create mode 100644 community/logs/1644147636.7340612.logs create mode 100644 community/scene.py create mode 100644 community/textures/button.png diff --git a/community/controller.py b/community/controller.py index 7972e38c..917537fc 100644 --- a/community/controller.py +++ b/community/controller.py @@ -57,8 +57,8 @@ def misc(self, mode): elif mode == self.MiscMode.SAVE: self.game.world.save.save() elif mode == self.MiscMode.ESCAPE: - self.game.mouse_captured = False - self.game.set_exclusive_mouse(False) + self.game.window.mouse_captured = False + self.game.window.set_exclusive_mouse(False) elif mode == self.MiscMode.SPEED_TIME: self.game.world.speed_daytime() elif mode == self.MiscMode.FULLSCREEN: diff --git a/community/gamemain.py b/community/gamemain.py new file mode 100644 index 00000000..1756d5bc --- /dev/null +++ b/community/gamemain.py @@ -0,0 +1,262 @@ +import platform +import ctypes +import logging +import random +import time +import os + +import pyglet +from scene import Scene + +pyglet.options["shadow_window"] = False +pyglet.options["debug_gl"] = False +pyglet.options["search_local_libs"] = True +pyglet.options["audio"] = ("openal", "pulse", "directsound", "xaudio2", "silent") + +import pyglet.gl as gl +import shader +import player +import texture_manager + +import world + +import options +import time + +import joystick +import keyboard_mouse +from collections import deque + +class GameMain(Scene): + def __init__(self, window): + super(GameMain, self).__init__(window, texture=None, color='#000000') + + self.config = gl.Config(double_buffer = True, + major_version = 3, minor_version = 3, + depth_size = 16, sample_buffers=bool(options.ANTIALIASING), samples=options.ANTIALIASING) + + # Options + self.options = window.options + + if self.options.INDIRECT_RENDERING and not gl.gl_info.have_version(4, 2): + raise RuntimeError("""Indirect Rendering is not supported on your hardware + This feature is only supported on OpenGL 4.2+, but your driver doesnt seem to support it, + Please disable "INDIRECT_RENDERING" in options.py""") + + # F3 Debug Screen + + self.show_f3 = False + self.f3 = pyglet.text.Label("", x = 10, y = self.height - 10, + font_size = 16, + color = (255, 255, 255, 255), + width = self.width // 3, + multiline = True + ) + self.system_info = f"""Python: {platform.python_implementation()} {platform.python_version()} +System: {platform.machine()} {platform.system()} {platform.release()} {platform.version()} +CPU: {platform.processor()} +Display: {gl.gl_info.get_renderer()} +{gl.gl_info.get_version()}""" + + logging.info(f"System Info: {self.system_info}") + # create shader + + logging.info("Compiling Shaders") + if not self.options.COLORED_LIGHTING: + self.shader = shader.Shader("shaders/alpha_lighting/vert.glsl", "shaders/alpha_lighting/frag.glsl") + else: + self.shader = shader.Shader("shaders/colored_lighting/vert.glsl", "shaders/colored_lighting/frag.glsl") + self.shader_sampler_location = self.shader.find_uniform(b"u_TextureArraySampler") + self.shader.use() + + # create textures + logging.info("Creating Texture Array") + self.texture_manager = texture_manager.TextureManager(16, 16, 256) + + # create world + + self.world = world.World(self.shader, None, self.texture_manager, self.options) + + # player stuff + + logging.info("Setting up player & camera") + self.player = player.Player(self.world, self.shader, self.width, self.height) + self.world.player = self.player + + # pyglet stuff + pyglet.clock.schedule(self.player.update_interpolation) + pyglet.clock.schedule_interval(self.update, 1 / 600) + self.window.mouse_captured = False + + # misc stuff + + self.holding = 50 + + # bind textures + + gl.glActiveTexture(gl.GL_TEXTURE0) + gl.glBindTexture(gl.GL_TEXTURE_2D_ARRAY, self.world.texture_manager.texture_array) + gl.glUniform1i(self.shader_sampler_location, 0) + + # enable cool stuff + + gl.glEnable(gl.GL_DEPTH_TEST) + gl.glEnable(gl.GL_CULL_FACE) + gl.glBlendFunc(gl.GL_SRC_ALPHA, gl.GL_ONE_MINUS_SRC_ALPHA) + + if self.options.ANTIALIASING: + gl.glEnable(gl.GL_MULTISAMPLE) + gl.glEnable(gl.GL_SAMPLE_ALPHA_TO_COVERAGE) + gl.glSampleCoverage(0.5, gl.GL_TRUE) + + # controls stuff + self.controls = [0, 0, 0] + + # joystick stuff + self.joystick_controller = joystick.Joystick_controller(self) + + # mouse and keyboard stuff + self.keyboard_mouse = keyboard_mouse.Keyboard_Mouse(self) + + # music stuff + logging.info("Loading audio") + try: + self.music = [pyglet.media.load(os.path.join("audio/music", file)) for file in os.listdir("audio/music") if os.path.isfile(os.path.join("audio/music", file))] + except: + self.music = [] + + self.media_player = pyglet.media.Player() + self.media_player.volume = 0.5 + + if len(self.music) > 0: + self.media_player.queue(random.choice(self.music)) + self.media_player.play() + self.media_player.standby = False + else: + self.media_player.standby = True + + self.media_player.next_time = 0 + + # GPU command syncs + self.fences = deque() + + def toggle_fullscreen(self): + self.set_fullscreen(not self.fullscreen) + + def on_close(self): + logging.info("Deleting media player") + self.media_player.delete() + for fence in self.fences: + gl.glDeleteSync(fence) + + pyglet.app.exit() + + def update_f3(self, delta_time): + """Update the F3 debug screen content""" + + player_chunk_pos = world.get_chunk_position(self.player.position) + player_local_pos = world.get_local_position(self.player.position) + chunk_count = len(self.world.chunks) + visible_chunk_count = len(self.world.visible_chunks) + quad_count = sum(chunk.mesh_quad_count for chunk in self.world.chunks.values()) + visible_quad_count = sum(chunk.mesh_quad_count for chunk in self.world.visible_chunks) + self.f3.text = \ +f""" +{round(pyglet.clock.get_fps())} FPS ({self.world.chunk_update_counter} Chunk Updates) {"inf" if not self.options.VSYNC else "vsync"}{"ao" if self.options.SMOOTH_LIGHTING else ""} +C: {visible_chunk_count} / {chunk_count} pC: {self.world.pending_chunk_update_count} pU: {len(self.world.chunk_building_queue)} aB: {chunk_count} +Client Singleplayer @{round(delta_time * 1000)} ms tick {round(1 / delta_time)} TPS + +XYZ: ( X: {round(self.player.position[0], 3)} / Y: {round(self.player.position[1], 3)} / Z: {round(self.player.position[2], 3)} ) +Block: {self.player.rounded_position[0]} {self.player.rounded_position[1]} {self.player.rounded_position[2]} +Chunk: {player_local_pos[0]} {player_local_pos[1]} {player_local_pos[2]} in {player_chunk_pos[0]} {player_chunk_pos[1]} {player_chunk_pos[2]} +Light: {max(self.world.get_light(self.player.rounded_position), self.world.get_skylight(self.player.rounded_position))} ({self.world.get_skylight(self.player.rounded_position)} sky, {self.world.get_light(self.player.rounded_position)} block) + +{self.system_info} + +Renderer: {"OpenGL 3.3 VAOs" if not self.options.INDIRECT_RENDERING else "OpenGL 4.0 VAOs Indirect"} {"Conditional" if self.options.ADVANCED_OPENGL else ""} +Buffers: {chunk_count} +Vertex Data: {round(quad_count * 28 * ctypes.sizeof(gl.GLfloat) / 1048576, 3)} MiB ({quad_count} Quads) +Visible Quads: {visible_quad_count} +Buffer Uploading: Direct (glBufferSubData) +""" + + def update(self, delta_time): + """Every tick""" + + if self.show_f3: + self.update_f3(delta_time) + + if not self.media_player.source and len(self.music) > 0: + if not self.media_player.standby: + self.media_player.standby = True + self.media_player.next_time = time.time() + random.randint(240, 360) + elif time.time() >= self.media_player.next_time: + self.media_player.standby = False + self.media_player.queue(random.choice(self.music)) + self.media_player.play() + + if not self.window.mouse_captured: + self.player.input = [0, 0, 0] + + self.joystick_controller.update_controller() + self.player.update(delta_time) + + self.world.tick(delta_time) + + def on_draw(self): + gl.glEnable(gl.GL_DEPTH_TEST) + self.shader.use() + self.player.update_matrices() + + while len(self.fences) > self.options.MAX_CPU_AHEAD_FRAMES: + fence = self.fences.popleft() + gl.glClientWaitSync(fence, gl.GL_SYNC_FLUSH_COMMANDS_BIT, 2147483647) + gl.glDeleteSync(fence) + + self.window.clear() + self.world.prepare_rendering() + self.world.draw() + + # Draw the F3 Debug screen + if self.show_f3: + self.draw_f3() + + # CPU - GPU Sync + if not self.options.SMOOTH_FPS: + self.fences.append(gl.glFenceSync(gl.GL_SYNC_GPU_COMMANDS_COMPLETE, 0)) + else: + gl.glFinish() + + def draw_f3(self): + """Draws the f3 debug screen. Current uses the fixed-function pipeline since pyglet labels uses it""" + gl.glDisable(gl.GL_DEPTH_TEST) + gl.glUseProgram(0) + gl.glBindVertexArray(0) + gl.glMatrixMode(gl.GL_MODELVIEW) + gl.glPushMatrix() + gl.glLoadIdentity() + + gl.glMatrixMode(gl.GL_PROJECTION) + gl.glPushMatrix() + gl.glLoadIdentity() + gl.glOrtho(0, self.width, 0, self.height, -1, 1) + + self.f3.draw() + + gl.glPopMatrix() + + gl.glMatrixMode(gl.GL_MODELVIEW) + gl.glPopMatrix() + + + # input functions + + def on_resize(self, width, height): + super(GameMain, self).on_resize(width, height) + logging.info(f"Resize {width} * {height}") + gl.glViewport(0, 0, width, height) + + self.player.view_width = width + self.player.view_height = height + self.f3.y = self.height - 10 + self.f3.width = self.width // 3 \ No newline at end of file diff --git a/community/joystick.py b/community/joystick.py index 455b136a..76057c45 100644 --- a/community/joystick.py +++ b/community/joystick.py @@ -41,7 +41,7 @@ def init_joysticks(self, joysticks): joystick.open(exclusive=True) def update_controller(self): - if not self.game.mouse_captured or not self.joysticks: + if not self.game.window.mouse_captured or not self.joysticks: return self.game.player.rotation[0] += self.joystick_look[0] * self.camera_sensitivity diff --git a/community/keyboard_mouse.py b/community/keyboard_mouse.py index c1146707..a89d7153 100644 --- a/community/keyboard_mouse.py +++ b/community/keyboard_mouse.py @@ -15,9 +15,9 @@ def __init__(self, game): self.game.on_key_release = self.on_key_release def on_mouse_press(self, x, y, button, modifiers): - if not self.game.mouse_captured: - self.game.mouse_captured = True - self.game.set_exclusive_mouse(True) + if not self.game.window.mouse_captured: + self.game.window.mouse_captured = True + self.game.window.set_exclusive_mouse(True) return @@ -26,7 +26,7 @@ def on_mouse_press(self, x, y, button, modifiers): elif button == pyglet.window.mouse.MIDDLE: self.interact(self.InteractMode.PICK) def on_mouse_motion(self, x, y, delta_x, delta_y): - if self.game.mouse_captured: + if self.game.window.mouse_captured: sensitivity = 0.004 self.game.player.rotation[0] += delta_x * sensitivity @@ -38,7 +38,7 @@ def on_mouse_drag(self, x, y, delta_x, delta_y, buttons, modifiers): self.on_mouse_motion(x, y, delta_x, delta_y) def on_key_press(self, key, modifiers): - if not self.game.mouse_captured: + if not self.game.window.mouse_captured: return if key == pyglet.window.key.D: self.start_move(self.MoveMode.RIGHT) @@ -61,7 +61,7 @@ def on_key_press(self, key, modifiers): elif key == pyglet.window.key.F10: self.misc(self.MiscMode.TOGGLE_AO) def on_key_release(self, key, modifiers): - if not self.game.mouse_captured: + if not self.game.window.mouse_captured: return if key == pyglet.window.key.D: self.end_move(self.MoveMode.RIGHT) diff --git a/community/logs/1644066580.3803027.logs b/community/logs/1644066580.3803027.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644066580.3803027.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644066589.0340598.logs b/community/logs/1644066589.0340598.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644066589.0340598.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644066833.5560026.logs b/community/logs/1644066833.5560026.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644066833.5560026.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644066890.710436.logs b/community/logs/1644066890.710436.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644066890.710436.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644066931.5696146.logs b/community/logs/1644066931.5696146.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644066931.5696146.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644066945.2327247.logs b/community/logs/1644066945.2327247.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644066945.2327247.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644067129.643187.logs b/community/logs/1644067129.643187.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644067129.643187.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644067182.604235.logs b/community/logs/1644067182.604235.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644067182.604235.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644067210.7173743.logs b/community/logs/1644067210.7173743.logs new file mode 100644 index 00000000..a310ef6b --- /dev/null +++ b/community/logs/1644067210.7173743.logs @@ -0,0 +1,14 @@ +[LOGS] +[2022-02-05 13:20:16,213] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:20:16,214] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:20:16,224] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:20:16,228] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:20:16,620] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:20:22,515] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:20:36,289] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:20:36,305] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:20:36,352] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644067266.2068014.logs b/community/logs/1644067266.2068014.logs new file mode 100644 index 00000000..7da313e8 --- /dev/null +++ b/community/logs/1644067266.2068014.logs @@ -0,0 +1,28 @@ +[LOGS] +[2022-02-05 13:21:13,430] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:21:13,430] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:21:13,445] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:21:13,445] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:21:13,820] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:21:19,653] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:21:33,490] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:21:33,506] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:21:33,553] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-05 13:21:42,207] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:21:42,207] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:21:42,223] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:21:42,223] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:21:42,624] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:21:48,480] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:22:02,479] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:22:02,495] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:22:02,542] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-05 13:22:02,554] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644067540.0752838.logs b/community/logs/1644067540.0752838.logs new file mode 100644 index 00000000..744e52ea --- /dev/null +++ b/community/logs/1644067540.0752838.logs @@ -0,0 +1,27 @@ +[LOGS] +[2022-02-05 13:25:46,861] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:25:46,862] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:25:46,866] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:25:46,866] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:25:47,257] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:25:53,164] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:26:07,052] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:26:07,052] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:26:07,115] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-05 13:26:25,904] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:26:25,904] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:26:25,904] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:26:25,920] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:26:26,295] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:26:32,181] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:26:46,761] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:26:46,774] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:26:46,819] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644067726.920262.logs b/community/logs/1644067726.920262.logs new file mode 100644 index 00000000..3b109618 --- /dev/null +++ b/community/logs/1644067726.920262.logs @@ -0,0 +1,14 @@ +[LOGS] +[2022-02-05 13:28:53,139] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:28:53,139] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:28:53,139] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:28:53,154] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:28:53,545] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:28:59,409] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:29:13,149] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:29:13,165] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:29:13,212] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644067819.0633264.logs b/community/logs/1644067819.0633264.logs new file mode 100644 index 00000000..51fafc03 --- /dev/null +++ b/community/logs/1644067819.0633264.logs @@ -0,0 +1,14 @@ +[LOGS] +[2022-02-05 13:30:25,816] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:30:25,816] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:30:25,831] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:30:25,831] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:30:26,222] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:30:32,088] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:30:45,711] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:30:45,727] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:30:45,769] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644067869.1284564.logs b/community/logs/1644067869.1284564.logs new file mode 100644 index 00000000..d2cfebc4 --- /dev/null +++ b/community/logs/1644067869.1284564.logs @@ -0,0 +1,14 @@ +[LOGS] +[2022-02-05 13:31:15,444] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:31:15,444] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:31:15,459] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:31:15,459] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:31:15,844] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:31:21,719] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:31:35,630] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:31:35,646] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:31:35,693] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644067975.1481597.logs b/community/logs/1644067975.1481597.logs new file mode 100644 index 00000000..0be9f101 --- /dev/null +++ b/community/logs/1644067975.1481597.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-05 13:33:01,577] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:33:01,577] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:33:01,577] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:33:01,593] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:33:01,968] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:33:07,884] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:33:21,613] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:33:21,613] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:33:21,660] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-05 13:34:41,864] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644068084.750459.logs b/community/logs/1644068084.750459.logs new file mode 100644 index 00000000..ea34e49d --- /dev/null +++ b/community/logs/1644068084.750459.logs @@ -0,0 +1,14 @@ +[LOGS] +[2022-02-05 13:34:51,567] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:34:51,567] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:34:51,583] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:34:51,583] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:34:51,973] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:34:57,865] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:35:11,723] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:35:11,738] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:35:11,785] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644068149.975369.logs b/community/logs/1644068149.975369.logs new file mode 100644 index 00000000..35e83962 --- /dev/null +++ b/community/logs/1644068149.975369.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-05 13:35:56,467] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:35:56,467] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:35:56,467] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:35:56,483] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:35:56,858] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:36:02,703] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:36:16,473] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:36:16,488] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:36:16,520] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-05 13:39:57,860] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644068401.027944.logs b/community/logs/1644068401.027944.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644068401.027944.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644068427.934449.logs b/community/logs/1644068427.934449.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644068427.934449.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644068454.265929.logs b/community/logs/1644068454.265929.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644068454.265929.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644068479.860526.logs b/community/logs/1644068479.860526.logs new file mode 100644 index 00000000..a88e959f --- /dev/null +++ b/community/logs/1644068479.860526.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-05 13:41:26,074] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:41:26,074] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:41:26,090] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:41:26,090] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:41:26,481] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:41:32,326] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:41:46,141] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:41:46,157] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:41:46,203] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-05 13:42:24,270] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644068575.6942272.logs b/community/logs/1644068575.6942272.logs new file mode 100644 index 00000000..3050ef9e --- /dev/null +++ b/community/logs/1644068575.6942272.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-05 13:43:02,027] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:43:02,027] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:43:02,027] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:43:02,042] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:43:02,433] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:43:08,366] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:43:22,211] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:43:22,227] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:43:22,274] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-05 13:43:46,666] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644068698.4923203.logs b/community/logs/1644068698.4923203.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644068698.4923203.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644068721.742721.logs b/community/logs/1644068721.742721.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644068721.742721.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644068782.8335724.logs b/community/logs/1644068782.8335724.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644068782.8335724.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644068824.845367.logs b/community/logs/1644068824.845367.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644068824.845367.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644068913.0820727.logs b/community/logs/1644068913.0820727.logs new file mode 100644 index 00000000..d0602403 --- /dev/null +++ b/community/logs/1644068913.0820727.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-05 13:48:39,500] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:48:39,500] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:48:39,515] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:48:39,515] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:48:39,910] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:48:45,797] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:48:59,684] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:48:59,684] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:48:59,747] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-05 13:49:28,273] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644069054.834381.logs b/community/logs/1644069054.834381.logs new file mode 100644 index 00000000..b728f508 --- /dev/null +++ b/community/logs/1644069054.834381.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-05 13:51:01,552] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:51:01,552] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:51:01,567] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:51:01,567] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:51:01,942] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:51:07,831] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:51:21,609] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:51:21,609] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-05 13:51:21,656] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-05 13:51:29,701] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644069120.6182787.logs b/community/logs/1644069120.6182787.logs new file mode 100644 index 00000000..7b3cc427 --- /dev/null +++ b/community/logs/1644069120.6182787.logs @@ -0,0 +1,13 @@ +[LOGS] +[2022-02-05 13:56:40,238] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-05 13:56:40,238] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-05 13:56:40,238] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-05 13:56:40,253] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-05 13:56:40,644] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-05 13:56:46,625] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-05 13:57:00,591] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-05 13:57:00,606] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera diff --git a/community/logs/1644142309.063243.logs b/community/logs/1644142309.063243.logs new file mode 100644 index 00000000..1ab3ea98 --- /dev/null +++ b/community/logs/1644142309.063243.logs @@ -0,0 +1,28 @@ +[LOGS] +[2022-02-06 10:11:58,009] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:11:58,009] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:11:58,025] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:11:58,025] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:11:58,603] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:12:02,200] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:12:02,201] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:12:02,210] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:12:02,215] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:12:02,599] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:12:08,338] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:12:08,338] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:12:08,349] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:12:08,353] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:12:08,710] [MainProcess/MainThread/INFO] (save.py/load) Loading world diff --git a/community/logs/1644142387.5476556.logs b/community/logs/1644142387.5476556.logs new file mode 100644 index 00000000..68d175cd --- /dev/null +++ b/community/logs/1644142387.5476556.logs @@ -0,0 +1,13 @@ +[LOGS] +[2022-02-06 10:13:16,543] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:13:16,543] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:13:16,559] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:13:16,559] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:13:16,965] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:13:23,038] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 10:13:37,272] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 10:13:37,288] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera diff --git a/community/logs/1644142455.9745388.logs b/community/logs/1644142455.9745388.logs new file mode 100644 index 00000000..d7624e52 --- /dev/null +++ b/community/logs/1644142455.9745388.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-06 10:14:23,190] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:14:23,190] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:14:23,205] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:14:23,205] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:14:23,596] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:14:29,721] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 10:14:43,784] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 10:14:43,800] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 10:14:43,846] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-06 10:14:48,560] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644142541.0553358.logs b/community/logs/1644142541.0553358.logs new file mode 100644 index 00000000..7316f93f --- /dev/null +++ b/community/logs/1644142541.0553358.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-06 10:15:48,012] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:15:48,012] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:15:48,022] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:15:48,032] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:15:48,415] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:15:54,421] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 10:16:08,417] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 10:16:08,433] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 10:16:08,480] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-06 10:16:27,821] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644142611.3890436.logs b/community/logs/1644142611.3890436.logs new file mode 100644 index 00000000..28fa012e --- /dev/null +++ b/community/logs/1644142611.3890436.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-06 10:16:58,074] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:16:58,074] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:16:58,090] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:16:58,090] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:16:58,480] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:17:04,384] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 10:17:18,069] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 10:17:18,085] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 10:17:18,131] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-06 10:17:33,410] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644142729.1588702.logs b/community/logs/1644142729.1588702.logs new file mode 100644 index 00000000..0caf8452 --- /dev/null +++ b/community/logs/1644142729.1588702.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-06 10:18:55,212] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:18:55,212] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:18:55,228] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:18:55,228] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:18:55,618] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:19:01,541] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 10:19:15,372] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 10:19:15,388] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 10:19:15,435] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-06 10:20:14,176] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644143192.0706403.logs b/community/logs/1644143192.0706403.logs new file mode 100644 index 00000000..4d82bb94 --- /dev/null +++ b/community/logs/1644143192.0706403.logs @@ -0,0 +1,14 @@ +[LOGS] +[2022-02-06 10:26:39,041] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:26:39,041] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:26:39,057] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:26:39,057] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:26:39,448] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:26:45,332] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 10:26:59,132] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 10:26:59,147] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 10:26:59,194] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644143335.1786792.logs b/community/logs/1644143335.1786792.logs new file mode 100644 index 00000000..7d0c5ee0 --- /dev/null +++ b/community/logs/1644143335.1786792.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-06 10:29:01,279] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:29:01,279] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:29:01,295] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:29:01,295] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:29:01,685] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:29:07,669] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 10:29:21,880] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 10:29:21,896] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 10:29:21,943] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-06 10:30:29,448] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644144292.3653753.logs b/community/logs/1644144292.3653753.logs new file mode 100644 index 00000000..cd7364df --- /dev/null +++ b/community/logs/1644144292.3653753.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-06 10:44:58,612] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:44:58,612] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:44:58,612] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:44:58,627] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:44:59,002] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:45:05,030] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 10:45:18,859] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 10:45:18,859] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 10:45:18,906] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-06 10:48:36,360] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644144600.3790636.logs b/community/logs/1644144600.3790636.logs new file mode 100644 index 00000000..e36900c9 --- /dev/null +++ b/community/logs/1644144600.3790636.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-06 10:50:17,937] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 10:50:17,937] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 10:50:17,937] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 10:50:17,937] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 10:50:18,359] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 10:50:24,319] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 10:50:38,132] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 10:50:38,147] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 10:50:38,194] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-06 10:53:24,000] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644146066.2632725.logs b/community/logs/1644146066.2632725.logs new file mode 100644 index 00000000..9b334c13 --- /dev/null +++ b/community/logs/1644146066.2632725.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-06 11:14:33,345] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 11:14:33,345] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 11:14:33,360] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 11:14:33,360] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 11:14:33,767] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 11:14:39,694] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 11:14:53,632] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 11:14:53,647] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 11:14:53,694] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-06 11:17:04,900] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644146476.8109665.logs b/community/logs/1644146476.8109665.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644146476.8109665.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644146531.0163143.logs b/community/logs/1644146531.0163143.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644146531.0163143.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644146595.609154.logs b/community/logs/1644146595.609154.logs new file mode 100644 index 00000000..23c8d780 --- /dev/null +++ b/community/logs/1644146595.609154.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-06 11:23:26,960] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 11:23:26,960] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 11:23:26,960] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 11:23:26,976] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 11:23:27,366] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 11:23:33,342] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 11:23:47,460] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 11:23:47,476] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 11:23:47,533] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-06 11:23:47,566] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644146852.9559436.logs b/community/logs/1644146852.9559436.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644146852.9559436.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644146870.9589648.logs b/community/logs/1644146870.9589648.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644146870.9589648.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644147046.652437.logs b/community/logs/1644147046.652437.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644147046.652437.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644147444.1665943.logs b/community/logs/1644147444.1665943.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644147444.1665943.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644147481.8290534.logs b/community/logs/1644147481.8290534.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644147481.8290534.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644147586.6211443.logs b/community/logs/1644147586.6211443.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644147586.6211443.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644147600.3879564.logs b/community/logs/1644147600.3879564.logs new file mode 100644 index 00000000..7aeb9064 --- /dev/null +++ b/community/logs/1644147600.3879564.logs @@ -0,0 +1 @@ +[LOGS] diff --git a/community/logs/1644147636.7340612.logs b/community/logs/1644147636.7340612.logs new file mode 100644 index 00000000..fe1900cd --- /dev/null +++ b/community/logs/1644147636.7340612.logs @@ -0,0 +1,15 @@ +[LOGS] +[2022-02-06 11:40:43,201] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 +System: AMD64 Windows 10 10.0.19044 +CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel +Display: Intel(R) UHD Graphics 630 +4.6.0 - Build 26.20.100.7926 +[2022-02-06 11:40:43,201] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders +[2022-02-06 11:40:43,216] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array +[2022-02-06 11:40:43,216] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models +[2022-02-06 11:40:43,622] [MainProcess/MainThread/INFO] (save.py/load) Loading world +[2022-02-06 11:40:49,512] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks +[2022-02-06 11:41:03,233] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks +[2022-02-06 11:41:03,248] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera +[2022-02-06 11:41:03,295] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio +[2022-02-06 11:44:48,321] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/main.py b/community/main.py index 40743f3e..f84de3f8 100644 --- a/community/main.py +++ b/community/main.py @@ -1,30 +1,29 @@ -import platform -import ctypes -import logging -import random -import time -import os - +from re import I import pyglet +from scene import Scene +from scene import __WIDTH__ +from scene import __HEIGHT__ +from scene import convert_hashColor_to_RGBA +from time import time, sleep +import options +from gamemain import GameMain +import os +import logging -pyglet.options["shadow_window"] = False -pyglet.options["debug_gl"] = False -pyglet.options["search_local_libs"] = True -pyglet.options["audio"] = ("openal", "pulse", "directsound", "xaudio2", "silent") +def init_logger(): + log_folder = "logs/" + log_filename = f"{time()}.logs" + log_path = os.path.join(log_folder, log_filename) -import pyglet.gl as gl -import shader -import player -import texture_manager + if not os.path.isdir(log_folder): + os.mkdir(log_folder) -import world + with open(log_path, 'x') as file: + file.write("[LOGS]\n") -import options -import time + logging.basicConfig(level=logging.INFO, filename=log_path, + format="[%(asctime)s] [%(processName)s/%(threadName)s/%(levelname)s] (%(module)s.py/%(funcName)s) %(message)s") -import joystick -import keyboard_mouse -from collections import deque class InternalConfig: def __init__(self, options): @@ -42,268 +41,101 @@ def __init__(self, options): self.COLORED_LIGHTING = options.COLORED_LIGHTING self.ANTIALIASING = options.ANTIALIASING +class IntroScreen(Scene): + def __init__(self, window): + super(IntroScreen, self).__init__(window, texture=None, color='#FFFFFF') -class Window(pyglet.window.Window): - def __init__(self, **args): - super().__init__(**args) + self.intro_text = pyglet.text.Label('Probably can\'t show the', font_size=40, font_name=('Verdana', 'Calibri', 'Arial'), x=self.window.width/2, y=self.window.height/2, multiline=False, width=self.window.width, height=self.window.height, color=(255, 165, 0, 255), anchor_x='center') + self.has_been_visible_since = time() - # Options - self.options = InternalConfig(options) - - if self.options.INDIRECT_RENDERING and not gl.gl_info.have_version(4, 2): - raise RuntimeError("""Indirect Rendering is not supported on your hardware - This feature is only supported on OpenGL 4.2+, but your driver doesnt seem to support it, - Please disable "INDIRECT_RENDERING" in options.py""") - - # F3 Debug Screen - - self.show_f3 = False - self.f3 = pyglet.text.Label("", x = 10, y = self.height - 10, - font_size = 16, - color = (255, 255, 255, 255), - width = self.width // 3, - multiline = True - ) - self.system_info = f"""Python: {platform.python_implementation()} {platform.python_version()} -System: {platform.machine()} {platform.system()} {platform.release()} {platform.version()} -CPU: {platform.processor()} -Display: {gl.gl_info.get_renderer()} -{gl.gl_info.get_version()}""" - - logging.info(f"System Info: {self.system_info}") - # create shader - - logging.info("Compiling Shaders") - if not self.options.COLORED_LIGHTING: - self.shader = shader.Shader("shaders/alpha_lighting/vert.glsl", "shaders/alpha_lighting/frag.glsl") - else: - self.shader = shader.Shader("shaders/colored_lighting/vert.glsl", "shaders/colored_lighting/frag.glsl") - self.shader_sampler_location = self.shader.find_uniform(b"u_TextureArraySampler") - self.shader.use() - - # create textures - logging.info("Creating Texture Array") - self.texture_manager = texture_manager.TextureManager(16, 16, 256) - - # create world - - self.world = world.World(self.shader, None, self.texture_manager, self.options) - - # player stuff - - logging.info("Setting up player & camera") - self.player = player.Player(self.world, self.shader, self.width, self.height) - self.world.player = self.player + def on_draw(self): + self.draw() + self.intro_text.draw() + if time() - 2 > self.has_been_visible_since: + self.intro_text.text = 'Mojang Logo due to copyright.' - # pyglet stuff - pyglet.clock.schedule(self.player.update_interpolation) - pyglet.clock.schedule_interval(self.update, 1 / 60) - self.mouse_captured = False +class MenuScreen(Scene): + def __init__(self, window): + image = pyglet.image.load("textures/dirt.png").get_texture() + self.window = window + image.height = self.window.height + image.width = self.window.width - # misc stuff + super(MenuScreen, self).__init__(window, texture=image, color='#000000') - self.holding = 50 + self.screen_text = pyglet.text.Label('Minecraft', font_size=50, font_name=('Verdana', 'Calibri', 'Arial'), x=self.window.width/2, y=self.window.height/2+170, multiline=False, width=self.window.width, height=self.window.height, color=(100, 100, 100, 255), anchor_x='center') - # bind textures + button_texture = pyglet.image.load('textures/button.png') + self.button_sprite = pyglet.sprite.Sprite(button_texture, x=self.window.width/2-button_texture.width, y=self.window.height/2-button_texture.height) + self.signal_text = pyglet.text.Label('Singalplayer', font_size=10, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x, y=self.button_sprite.y, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') - gl.glActiveTexture(gl.GL_TEXTURE0) - gl.glBindTexture(gl.GL_TEXTURE_2D_ARRAY, self.world.texture_manager.texture_array) - gl.glUniform1i(self.shader_sampler_location, 0) + def on_mouse_press(self, x, y, button, modifiers): + if x > self.button_sprite.x and x < (self.button_sprite.x + self.button_sprite.width): + if y > self.button_sprite.y and y < (self.button_sprite.y + self.button_sprite.height): + self.window.set_scene(GameMain(self.window)) - # enable cool stuff + def on_draw(self): + self.draw() + self.screen_text.draw() + self.button_sprite.draw() + self.signal_text.draw() - gl.glEnable(gl.GL_DEPTH_TEST) - gl.glEnable(gl.GL_CULL_FACE) - gl.glBlendFunc(gl.GL_SRC_ALPHA, gl.GL_ONE_MINUS_SRC_ALPHA) +class Window(pyglet.window.Window): + def __init__(self, refreshrate, **args): + super().__init__(**args) + self.refreshrate = refreshrate - if self.options.ANTIALIASING: - gl.glEnable(gl.GL_MULTISAMPLE) - gl.glEnable(gl.GL_SAMPLE_ALPHA_TO_COVERAGE) - gl.glSampleCoverage(0.5, gl.GL_TRUE) - - # controls stuff - self.controls = [0, 0, 0] - - # joystick stuff - self.joystick_controller = joystick.Joystick_controller(self) - - # mouse and keyboard stuff - self.keyboard_mouse = keyboard_mouse.Keyboard_Mouse(self) - - # music stuff - logging.info("Loading audio") - try: - self.music = [pyglet.media.load(os.path.join("audio/music", file)) for file in os.listdir("audio/music") if os.path.isfile(os.path.join("audio/music", file))] - except: - self.music = [] - - self.media_player = pyglet.media.Player() - self.media_player.volume = 0.5 - - if len(self.music) > 0: - self.media_player.queue(random.choice(self.music)) - self.media_player.play() - self.media_player.standby = False - else: - self.media_player.standby = True + # Options + self.options = InternalConfig(options) - self.media_player.next_time = 0 + self.alive = 1 - # GPU command syncs - self.fences = deque() - - def toggle_fullscreen(self): - self.set_fullscreen(not self.fullscreen) + self.currentScreen = IntroScreen(self) + self.screen_has_been_shown_since = time() - def on_close(self): - logging.info("Deleting media player") - self.media_player.delete() - for fence in self.fences: - gl.glDeleteSync(fence) - - pyglet.app.exit() - - def update_f3(self, delta_time): - """Update the F3 debug screen content""" - - player_chunk_pos = world.get_chunk_position(self.player.position) - player_local_pos = world.get_local_position(self.player.position) - chunk_count = len(self.world.chunks) - visible_chunk_count = len(self.world.visible_chunks) - quad_count = sum(chunk.mesh_quad_count for chunk in self.world.chunks.values()) - visible_quad_count = sum(chunk.mesh_quad_count for chunk in self.world.visible_chunks) - self.f3.text = \ -f""" -{round(pyglet.clock.get_fps())} FPS ({self.world.chunk_update_counter} Chunk Updates) {"inf" if not self.options.VSYNC else "vsync"}{"ao" if self.options.SMOOTH_LIGHTING else ""} -C: {visible_chunk_count} / {chunk_count} pC: {self.world.pending_chunk_update_count} pU: {len(self.world.chunk_building_queue)} aB: {chunk_count} -Client Singleplayer @{round(delta_time * 1000)} ms tick {round(1 / delta_time)} TPS - -XYZ: ( X: {round(self.player.position[0], 3)} / Y: {round(self.player.position[1], 3)} / Z: {round(self.player.position[2], 3)} ) -Block: {self.player.rounded_position[0]} {self.player.rounded_position[1]} {self.player.rounded_position[2]} -Chunk: {player_local_pos[0]} {player_local_pos[1]} {player_local_pos[2]} in {player_chunk_pos[0]} {player_chunk_pos[1]} {player_chunk_pos[2]} -Light: {max(self.world.get_light(self.player.rounded_position), self.world.get_skylight(self.player.rounded_position))} ({self.world.get_skylight(self.player.rounded_position)} sky, {self.world.get_light(self.player.rounded_position)} block) - -{self.system_info} - -Renderer: {"OpenGL 3.3 VAOs" if not self.options.INDIRECT_RENDERING else "OpenGL 4.0 VAOs Indirect"} {"Conditional" if self.options.ADVANCED_OPENGL else ""} -Buffers: {chunk_count} -Vertex Data: {round(quad_count * 28 * ctypes.sizeof(gl.GLfloat) / 1048576, 3)} MiB ({quad_count} Quads) -Visible Quads: {visible_quad_count} -Buffer Uploading: Direct (glBufferSubData) -""" - - def update(self, delta_time): - """Every tick""" - if self.show_f3: - self.update_f3(delta_time) - - if not self.media_player.source and len(self.music) > 0: - if not self.media_player.standby: - self.media_player.standby = True - self.media_player.next_time = time.time() + random.randint(240, 360) - elif time.time() >= self.media_player.next_time: - self.media_player.standby = False - self.media_player.queue(random.choice(self.music)) - self.media_player.play() - - if not self.mouse_captured: - self.player.input = [0, 0, 0] - - self.joystick_controller.update_controller() - self.player.update(delta_time) - - self.world.tick(delta_time) + def set_scene(self, scene): + self.currentScreen = scene def on_draw(self): - gl.glEnable(gl.GL_DEPTH_TEST) - self.shader.use() - self.player.update_matrices() - - while len(self.fences) > self.options.MAX_CPU_AHEAD_FRAMES: - fence = self.fences.popleft() - gl.glClientWaitSync(fence, gl.GL_SYNC_FLUSH_COMMANDS_BIT, 2147483647) - gl.glDeleteSync(fence) - - self.clear() - self.world.prepare_rendering() - self.world.draw() - - # Draw the F3 Debug screen - if self.show_f3: - self.draw_f3() - - # CPU - GPU Sync - if not self.options.SMOOTH_FPS: - self.fences.append(gl.glFenceSync(gl.GL_SYNC_GPU_COMMANDS_COMPLETE, 0)) - else: - gl.glFinish() - - def draw_f3(self): - """Draws the f3 debug screen. Current uses the fixed-function pipeline since pyglet labels uses it""" - gl.glDisable(gl.GL_DEPTH_TEST) - gl.glUseProgram(0) - gl.glBindVertexArray(0) - gl.glMatrixMode(gl.GL_MODELVIEW) - gl.glPushMatrix() - gl.glLoadIdentity() - - gl.glMatrixMode(gl.GL_PROJECTION) - gl.glPushMatrix() - gl.glLoadIdentity() - gl.glOrtho(0, self.width, 0, self.height, -1, 1) - - self.f3.draw() - - gl.glPopMatrix() - - gl.glMatrixMode(gl.GL_MODELVIEW) - gl.glPopMatrix() + self.render() + def on_key_press(self, symbol, mod): + self.currentScreen.on_key_press(symbol, mod) - # input functions + def on_key_release(self, key, modifiers): + self.currentScreen.on_key_release(key, modifiers) - def on_resize(self, width, height): - logging.info(f"Resize {width} * {height}") - gl.glViewport(0, 0, width, height) + def on_mouse_motion(self, x, y, delta_x, delta_y): + self.currentScreen.on_mouse_motion(x, y, delta_x, delta_y) - self.player.view_width = width - self.player.view_height = height - self.f3.y = self.height - 10 - self.f3.width = self.width // 3 + def on_mouse_drag(self, x, y, delta_x, delta_y, buttons, modifiers): + self.currentScreen.on_mouse_drag(x, y, delta_x, delta_y, buttons, modifiers) -class Game: - def __init__(self): - self.config = gl.Config(double_buffer = True, - major_version = 3, minor_version = 3, - depth_size = 16, sample_buffers=bool(options.ANTIALIASING), samples=options.ANTIALIASING) - self.window = Window(config = self.config, width = 852, height = 480, caption = "Minecraft clone", resizable = True, vsync = options.VSYNC) + def on_mouse_press(self, x, y, button, modifiers): + self.currentScreen.on_mouse_press(x, y, button, modifiers) - def run(self): - pyglet.app.run() + def render(self): + self.clear() + if time() - 5 > self.screen_has_been_shown_since and type(self.currentScreen) is not MenuScreen and type(self.currentScreen) is not GameMain: + self.currentScreen = MenuScreen(self) -def init_logger(): - log_folder = "logs/" - log_filename = f"{time.time()}.log" - log_path = os.path.join(log_folder, log_filename) - - if not os.path.isdir(log_folder): - os.mkdir(log_folder) - - with open(log_path, 'x') as file: - file.write("[LOGS]\n") - - logging.basicConfig(level=logging.INFO, filename=log_path, - format="[%(asctime)s] [%(processName)s/%(threadName)s/%(levelname)s] (%(module)s.py/%(funcName)s) %(message)s") - + self.currentScreen.on_draw() + self.flip() + def on_close(self): + self.currentScreen.on_close() + self.alive = 0 + def run(self): + while self.alive: + self.render() + self.dispatch_events() + pyglet.clock.tick() -def main(): - init_logger() - game = Game() - game.run() if __name__ == "__main__": - main() + init_logger() + win = Window(900, width = __WIDTH__, height = __HEIGHT__, caption = "Minecraft clone", resizable = True, vsync = options.VSYNC) + win.run() \ No newline at end of file diff --git a/community/scene.py b/community/scene.py new file mode 100644 index 00000000..c64b2ac3 --- /dev/null +++ b/community/scene.py @@ -0,0 +1,59 @@ +import pyglet + +__WIDTH__ = 852 +__HEIGHT__ = 480 + +def convert_hashColor_to_RGBA(color): + if '#' in color: + c = color.lstrip("#") + c = max(6-len(c),0)*"0" + c + r = int(c[:2], 16) + g = int(c[2:4], 16) + b = int(c[4:], 16) + color = (r,g,b,255) + return color + +class Scene(pyglet.sprite.Sprite): + def __init__(self, window, texture=None, color="#000000"): + self.window = window + width = window.width + height = window.height + x = width/2 + y = height/2 + if texture is None: + self.texture = pyglet.image.SolidColorImagePattern(convert_hashColor_to_RGBA(color)).create_image(width,height) + else: + self.texture = texture + super(Scene, self).__init__(self.texture) + + self.image.anchor_x = self.image.width / 2 + self.image.anchor_y = self.image.height / 2 + self.x = x + self.y = y + + def on_draw(self): + self.draw() + + def on_close(self): + pass + + def on_key_press(self, symbol, mod): + pass + + def on_key_release(self, key, modifiers): + pass + + def on_mouse_motion(self, x, y, delta_x, delta_y): + pass + + def on_mouse_drag(self, x, y, delta_x, delta_y, buttons, modifiers): + pass + + def on_mouse_press(self, x, y, button, modifiers): + pass + + def on_resize(self, width, height): + self.image.width = width + self.image.height = height + self.image.anchor_x = self.image.width / 2 + self.image.anchor_y = self.image.height / 2 \ No newline at end of file diff --git a/community/textures/button.png b/community/textures/button.png new file mode 100644 index 0000000000000000000000000000000000000000..f46300c9849d4eab3643b29ff60222033c0f2a44 GIT binary patch literal 3324 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 Date: Sun, 6 Feb 2022 12:09:28 +0000 Subject: [PATCH 02/13] Update .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 27541f05..ea5b23fc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ *.core *.log .vscode -*.ogg \ No newline at end of file +*.ogg +community/logs From b915d30df73f9af8e01c9ca8e5e4efb8461bb812 Mon Sep 17 00:00:00 2001 From: ajh123 <41990982+ajh123@users.noreply.github.com> Date: Sun, 6 Feb 2022 12:11:28 +0000 Subject: [PATCH 03/13] Delete community/logs directory --- community/logs/1644066580.3803027.logs | 1 - community/logs/1644066589.0340598.logs | 1 - community/logs/1644066833.5560026.logs | 1 - community/logs/1644066890.710436.logs | 1 - community/logs/1644066931.5696146.logs | 1 - community/logs/1644066945.2327247.logs | 1 - community/logs/1644067129.643187.logs | 1 - community/logs/1644067182.604235.logs | 1 - community/logs/1644067210.7173743.logs | 14 ------------- community/logs/1644067266.2068014.logs | 28 -------------------------- community/logs/1644067540.0752838.logs | 27 ------------------------- community/logs/1644067726.920262.logs | 14 ------------- community/logs/1644067819.0633264.logs | 14 ------------- community/logs/1644067869.1284564.logs | 14 ------------- community/logs/1644067975.1481597.logs | 15 -------------- community/logs/1644068084.750459.logs | 14 ------------- community/logs/1644068149.975369.logs | 15 -------------- community/logs/1644068401.027944.logs | 1 - community/logs/1644068427.934449.logs | 1 - community/logs/1644068454.265929.logs | 1 - community/logs/1644068479.860526.logs | 15 -------------- community/logs/1644068575.6942272.logs | 15 -------------- community/logs/1644068698.4923203.logs | 1 - community/logs/1644068721.742721.logs | 1 - community/logs/1644068782.8335724.logs | 1 - community/logs/1644068824.845367.logs | 1 - community/logs/1644068913.0820727.logs | 15 -------------- community/logs/1644069054.834381.logs | 15 -------------- community/logs/1644069120.6182787.logs | 13 ------------ community/logs/1644142309.063243.logs | 28 -------------------------- community/logs/1644142387.5476556.logs | 13 ------------ community/logs/1644142455.9745388.logs | 15 -------------- community/logs/1644142541.0553358.logs | 15 -------------- community/logs/1644142611.3890436.logs | 15 -------------- community/logs/1644142729.1588702.logs | 15 -------------- community/logs/1644143192.0706403.logs | 14 ------------- community/logs/1644143335.1786792.logs | 15 -------------- community/logs/1644144292.3653753.logs | 15 -------------- community/logs/1644144600.3790636.logs | 15 -------------- community/logs/1644146066.2632725.logs | 15 -------------- community/logs/1644146476.8109665.logs | 1 - community/logs/1644146531.0163143.logs | 1 - community/logs/1644146595.609154.logs | 15 -------------- community/logs/1644146852.9559436.logs | 1 - community/logs/1644146870.9589648.logs | 1 - community/logs/1644147046.652437.logs | 1 - community/logs/1644147444.1665943.logs | 1 - community/logs/1644147481.8290534.logs | 1 - community/logs/1644147586.6211443.logs | 1 - community/logs/1644147600.3879564.logs | 1 - community/logs/1644147636.7340612.logs | 15 -------------- 51 files changed, 457 deletions(-) delete mode 100644 community/logs/1644066580.3803027.logs delete mode 100644 community/logs/1644066589.0340598.logs delete mode 100644 community/logs/1644066833.5560026.logs delete mode 100644 community/logs/1644066890.710436.logs delete mode 100644 community/logs/1644066931.5696146.logs delete mode 100644 community/logs/1644066945.2327247.logs delete mode 100644 community/logs/1644067129.643187.logs delete mode 100644 community/logs/1644067182.604235.logs delete mode 100644 community/logs/1644067210.7173743.logs delete mode 100644 community/logs/1644067266.2068014.logs delete mode 100644 community/logs/1644067540.0752838.logs delete mode 100644 community/logs/1644067726.920262.logs delete mode 100644 community/logs/1644067819.0633264.logs delete mode 100644 community/logs/1644067869.1284564.logs delete mode 100644 community/logs/1644067975.1481597.logs delete mode 100644 community/logs/1644068084.750459.logs delete mode 100644 community/logs/1644068149.975369.logs delete mode 100644 community/logs/1644068401.027944.logs delete mode 100644 community/logs/1644068427.934449.logs delete mode 100644 community/logs/1644068454.265929.logs delete mode 100644 community/logs/1644068479.860526.logs delete mode 100644 community/logs/1644068575.6942272.logs delete mode 100644 community/logs/1644068698.4923203.logs delete mode 100644 community/logs/1644068721.742721.logs delete mode 100644 community/logs/1644068782.8335724.logs delete mode 100644 community/logs/1644068824.845367.logs delete mode 100644 community/logs/1644068913.0820727.logs delete mode 100644 community/logs/1644069054.834381.logs delete mode 100644 community/logs/1644069120.6182787.logs delete mode 100644 community/logs/1644142309.063243.logs delete mode 100644 community/logs/1644142387.5476556.logs delete mode 100644 community/logs/1644142455.9745388.logs delete mode 100644 community/logs/1644142541.0553358.logs delete mode 100644 community/logs/1644142611.3890436.logs delete mode 100644 community/logs/1644142729.1588702.logs delete mode 100644 community/logs/1644143192.0706403.logs delete mode 100644 community/logs/1644143335.1786792.logs delete mode 100644 community/logs/1644144292.3653753.logs delete mode 100644 community/logs/1644144600.3790636.logs delete mode 100644 community/logs/1644146066.2632725.logs delete mode 100644 community/logs/1644146476.8109665.logs delete mode 100644 community/logs/1644146531.0163143.logs delete mode 100644 community/logs/1644146595.609154.logs delete mode 100644 community/logs/1644146852.9559436.logs delete mode 100644 community/logs/1644146870.9589648.logs delete mode 100644 community/logs/1644147046.652437.logs delete mode 100644 community/logs/1644147444.1665943.logs delete mode 100644 community/logs/1644147481.8290534.logs delete mode 100644 community/logs/1644147586.6211443.logs delete mode 100644 community/logs/1644147600.3879564.logs delete mode 100644 community/logs/1644147636.7340612.logs diff --git a/community/logs/1644066580.3803027.logs b/community/logs/1644066580.3803027.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644066580.3803027.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644066589.0340598.logs b/community/logs/1644066589.0340598.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644066589.0340598.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644066833.5560026.logs b/community/logs/1644066833.5560026.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644066833.5560026.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644066890.710436.logs b/community/logs/1644066890.710436.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644066890.710436.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644066931.5696146.logs b/community/logs/1644066931.5696146.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644066931.5696146.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644066945.2327247.logs b/community/logs/1644066945.2327247.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644066945.2327247.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644067129.643187.logs b/community/logs/1644067129.643187.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644067129.643187.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644067182.604235.logs b/community/logs/1644067182.604235.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644067182.604235.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644067210.7173743.logs b/community/logs/1644067210.7173743.logs deleted file mode 100644 index a310ef6b..00000000 --- a/community/logs/1644067210.7173743.logs +++ /dev/null @@ -1,14 +0,0 @@ -[LOGS] -[2022-02-05 13:20:16,213] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:20:16,214] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:20:16,224] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:20:16,228] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:20:16,620] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:20:22,515] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:20:36,289] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:20:36,305] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:20:36,352] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644067266.2068014.logs b/community/logs/1644067266.2068014.logs deleted file mode 100644 index 7da313e8..00000000 --- a/community/logs/1644067266.2068014.logs +++ /dev/null @@ -1,28 +0,0 @@ -[LOGS] -[2022-02-05 13:21:13,430] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:21:13,430] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:21:13,445] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:21:13,445] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:21:13,820] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:21:19,653] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:21:33,490] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:21:33,506] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:21:33,553] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-05 13:21:42,207] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:21:42,207] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:21:42,223] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:21:42,223] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:21:42,624] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:21:48,480] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:22:02,479] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:22:02,495] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:22:02,542] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-05 13:22:02,554] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644067540.0752838.logs b/community/logs/1644067540.0752838.logs deleted file mode 100644 index 744e52ea..00000000 --- a/community/logs/1644067540.0752838.logs +++ /dev/null @@ -1,27 +0,0 @@ -[LOGS] -[2022-02-05 13:25:46,861] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:25:46,862] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:25:46,866] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:25:46,866] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:25:47,257] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:25:53,164] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:26:07,052] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:26:07,052] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:26:07,115] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-05 13:26:25,904] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:26:25,904] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:26:25,904] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:26:25,920] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:26:26,295] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:26:32,181] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:26:46,761] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:26:46,774] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:26:46,819] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644067726.920262.logs b/community/logs/1644067726.920262.logs deleted file mode 100644 index 3b109618..00000000 --- a/community/logs/1644067726.920262.logs +++ /dev/null @@ -1,14 +0,0 @@ -[LOGS] -[2022-02-05 13:28:53,139] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:28:53,139] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:28:53,139] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:28:53,154] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:28:53,545] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:28:59,409] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:29:13,149] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:29:13,165] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:29:13,212] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644067819.0633264.logs b/community/logs/1644067819.0633264.logs deleted file mode 100644 index 51fafc03..00000000 --- a/community/logs/1644067819.0633264.logs +++ /dev/null @@ -1,14 +0,0 @@ -[LOGS] -[2022-02-05 13:30:25,816] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:30:25,816] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:30:25,831] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:30:25,831] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:30:26,222] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:30:32,088] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:30:45,711] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:30:45,727] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:30:45,769] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644067869.1284564.logs b/community/logs/1644067869.1284564.logs deleted file mode 100644 index d2cfebc4..00000000 --- a/community/logs/1644067869.1284564.logs +++ /dev/null @@ -1,14 +0,0 @@ -[LOGS] -[2022-02-05 13:31:15,444] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:31:15,444] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:31:15,459] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:31:15,459] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:31:15,844] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:31:21,719] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:31:35,630] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:31:35,646] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:31:35,693] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644067975.1481597.logs b/community/logs/1644067975.1481597.logs deleted file mode 100644 index 0be9f101..00000000 --- a/community/logs/1644067975.1481597.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-05 13:33:01,577] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:33:01,577] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:33:01,577] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:33:01,593] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:33:01,968] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:33:07,884] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:33:21,613] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:33:21,613] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:33:21,660] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-05 13:34:41,864] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644068084.750459.logs b/community/logs/1644068084.750459.logs deleted file mode 100644 index ea34e49d..00000000 --- a/community/logs/1644068084.750459.logs +++ /dev/null @@ -1,14 +0,0 @@ -[LOGS] -[2022-02-05 13:34:51,567] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:34:51,567] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:34:51,583] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:34:51,583] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:34:51,973] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:34:57,865] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:35:11,723] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:35:11,738] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:35:11,785] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644068149.975369.logs b/community/logs/1644068149.975369.logs deleted file mode 100644 index 35e83962..00000000 --- a/community/logs/1644068149.975369.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-05 13:35:56,467] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:35:56,467] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:35:56,467] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:35:56,483] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:35:56,858] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:36:02,703] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:36:16,473] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:36:16,488] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:36:16,520] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-05 13:39:57,860] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644068401.027944.logs b/community/logs/1644068401.027944.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644068401.027944.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644068427.934449.logs b/community/logs/1644068427.934449.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644068427.934449.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644068454.265929.logs b/community/logs/1644068454.265929.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644068454.265929.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644068479.860526.logs b/community/logs/1644068479.860526.logs deleted file mode 100644 index a88e959f..00000000 --- a/community/logs/1644068479.860526.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-05 13:41:26,074] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:41:26,074] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:41:26,090] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:41:26,090] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:41:26,481] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:41:32,326] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:41:46,141] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:41:46,157] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:41:46,203] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-05 13:42:24,270] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644068575.6942272.logs b/community/logs/1644068575.6942272.logs deleted file mode 100644 index 3050ef9e..00000000 --- a/community/logs/1644068575.6942272.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-05 13:43:02,027] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:43:02,027] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:43:02,027] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:43:02,042] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:43:02,433] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:43:08,366] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:43:22,211] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:43:22,227] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:43:22,274] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-05 13:43:46,666] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644068698.4923203.logs b/community/logs/1644068698.4923203.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644068698.4923203.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644068721.742721.logs b/community/logs/1644068721.742721.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644068721.742721.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644068782.8335724.logs b/community/logs/1644068782.8335724.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644068782.8335724.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644068824.845367.logs b/community/logs/1644068824.845367.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644068824.845367.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644068913.0820727.logs b/community/logs/1644068913.0820727.logs deleted file mode 100644 index d0602403..00000000 --- a/community/logs/1644068913.0820727.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-05 13:48:39,500] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:48:39,500] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:48:39,515] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:48:39,515] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:48:39,910] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:48:45,797] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:48:59,684] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:48:59,684] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:48:59,747] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-05 13:49:28,273] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644069054.834381.logs b/community/logs/1644069054.834381.logs deleted file mode 100644 index b728f508..00000000 --- a/community/logs/1644069054.834381.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-05 13:51:01,552] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:51:01,552] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:51:01,567] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:51:01,567] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:51:01,942] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:51:07,831] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:51:21,609] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:51:21,609] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-05 13:51:21,656] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-05 13:51:29,701] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644069120.6182787.logs b/community/logs/1644069120.6182787.logs deleted file mode 100644 index 7b3cc427..00000000 --- a/community/logs/1644069120.6182787.logs +++ /dev/null @@ -1,13 +0,0 @@ -[LOGS] -[2022-02-05 13:56:40,238] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-05 13:56:40,238] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-05 13:56:40,238] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-05 13:56:40,253] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-05 13:56:40,644] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-05 13:56:46,625] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-05 13:57:00,591] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-05 13:57:00,606] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera diff --git a/community/logs/1644142309.063243.logs b/community/logs/1644142309.063243.logs deleted file mode 100644 index 1ab3ea98..00000000 --- a/community/logs/1644142309.063243.logs +++ /dev/null @@ -1,28 +0,0 @@ -[LOGS] -[2022-02-06 10:11:58,009] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:11:58,009] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:11:58,025] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:11:58,025] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:11:58,603] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:12:02,200] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:12:02,201] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:12:02,210] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:12:02,215] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:12:02,599] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:12:08,338] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:12:08,338] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:12:08,349] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:12:08,353] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:12:08,710] [MainProcess/MainThread/INFO] (save.py/load) Loading world diff --git a/community/logs/1644142387.5476556.logs b/community/logs/1644142387.5476556.logs deleted file mode 100644 index 68d175cd..00000000 --- a/community/logs/1644142387.5476556.logs +++ /dev/null @@ -1,13 +0,0 @@ -[LOGS] -[2022-02-06 10:13:16,543] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:13:16,543] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:13:16,559] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:13:16,559] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:13:16,965] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:13:23,038] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 10:13:37,272] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 10:13:37,288] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera diff --git a/community/logs/1644142455.9745388.logs b/community/logs/1644142455.9745388.logs deleted file mode 100644 index d7624e52..00000000 --- a/community/logs/1644142455.9745388.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-06 10:14:23,190] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:14:23,190] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:14:23,205] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:14:23,205] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:14:23,596] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:14:29,721] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 10:14:43,784] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 10:14:43,800] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 10:14:43,846] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-06 10:14:48,560] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644142541.0553358.logs b/community/logs/1644142541.0553358.logs deleted file mode 100644 index 7316f93f..00000000 --- a/community/logs/1644142541.0553358.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-06 10:15:48,012] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:15:48,012] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:15:48,022] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:15:48,032] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:15:48,415] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:15:54,421] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 10:16:08,417] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 10:16:08,433] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 10:16:08,480] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-06 10:16:27,821] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644142611.3890436.logs b/community/logs/1644142611.3890436.logs deleted file mode 100644 index 28fa012e..00000000 --- a/community/logs/1644142611.3890436.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-06 10:16:58,074] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:16:58,074] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:16:58,090] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:16:58,090] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:16:58,480] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:17:04,384] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 10:17:18,069] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 10:17:18,085] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 10:17:18,131] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-06 10:17:33,410] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644142729.1588702.logs b/community/logs/1644142729.1588702.logs deleted file mode 100644 index 0caf8452..00000000 --- a/community/logs/1644142729.1588702.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-06 10:18:55,212] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:18:55,212] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:18:55,228] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:18:55,228] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:18:55,618] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:19:01,541] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 10:19:15,372] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 10:19:15,388] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 10:19:15,435] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-06 10:20:14,176] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644143192.0706403.logs b/community/logs/1644143192.0706403.logs deleted file mode 100644 index 4d82bb94..00000000 --- a/community/logs/1644143192.0706403.logs +++ /dev/null @@ -1,14 +0,0 @@ -[LOGS] -[2022-02-06 10:26:39,041] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:26:39,041] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:26:39,057] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:26:39,057] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:26:39,448] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:26:45,332] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 10:26:59,132] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 10:26:59,147] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 10:26:59,194] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio diff --git a/community/logs/1644143335.1786792.logs b/community/logs/1644143335.1786792.logs deleted file mode 100644 index 7d0c5ee0..00000000 --- a/community/logs/1644143335.1786792.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-06 10:29:01,279] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:29:01,279] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:29:01,295] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:29:01,295] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:29:01,685] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:29:07,669] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 10:29:21,880] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 10:29:21,896] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 10:29:21,943] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-06 10:30:29,448] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644144292.3653753.logs b/community/logs/1644144292.3653753.logs deleted file mode 100644 index cd7364df..00000000 --- a/community/logs/1644144292.3653753.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-06 10:44:58,612] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:44:58,612] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:44:58,612] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:44:58,627] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:44:59,002] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:45:05,030] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 10:45:18,859] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 10:45:18,859] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 10:45:18,906] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-06 10:48:36,360] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644144600.3790636.logs b/community/logs/1644144600.3790636.logs deleted file mode 100644 index e36900c9..00000000 --- a/community/logs/1644144600.3790636.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-06 10:50:17,937] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 10:50:17,937] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 10:50:17,937] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 10:50:17,937] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 10:50:18,359] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 10:50:24,319] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 10:50:38,132] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 10:50:38,147] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 10:50:38,194] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-06 10:53:24,000] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644146066.2632725.logs b/community/logs/1644146066.2632725.logs deleted file mode 100644 index 9b334c13..00000000 --- a/community/logs/1644146066.2632725.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-06 11:14:33,345] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 11:14:33,345] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 11:14:33,360] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 11:14:33,360] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 11:14:33,767] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 11:14:39,694] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 11:14:53,632] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 11:14:53,647] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 11:14:53,694] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-06 11:17:04,900] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644146476.8109665.logs b/community/logs/1644146476.8109665.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644146476.8109665.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644146531.0163143.logs b/community/logs/1644146531.0163143.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644146531.0163143.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644146595.609154.logs b/community/logs/1644146595.609154.logs deleted file mode 100644 index 23c8d780..00000000 --- a/community/logs/1644146595.609154.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-06 11:23:26,960] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 11:23:26,960] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 11:23:26,960] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 11:23:26,976] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 11:23:27,366] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 11:23:33,342] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 11:23:47,460] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 11:23:47,476] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 11:23:47,533] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-06 11:23:47,566] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player diff --git a/community/logs/1644146852.9559436.logs b/community/logs/1644146852.9559436.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644146852.9559436.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644146870.9589648.logs b/community/logs/1644146870.9589648.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644146870.9589648.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644147046.652437.logs b/community/logs/1644147046.652437.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644147046.652437.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644147444.1665943.logs b/community/logs/1644147444.1665943.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644147444.1665943.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644147481.8290534.logs b/community/logs/1644147481.8290534.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644147481.8290534.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644147586.6211443.logs b/community/logs/1644147586.6211443.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644147586.6211443.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644147600.3879564.logs b/community/logs/1644147600.3879564.logs deleted file mode 100644 index 7aeb9064..00000000 --- a/community/logs/1644147600.3879564.logs +++ /dev/null @@ -1 +0,0 @@ -[LOGS] diff --git a/community/logs/1644147636.7340612.logs b/community/logs/1644147636.7340612.logs deleted file mode 100644 index fe1900cd..00000000 --- a/community/logs/1644147636.7340612.logs +++ /dev/null @@ -1,15 +0,0 @@ -[LOGS] -[2022-02-06 11:40:43,201] [MainProcess/MainThread/INFO] (gamemain.py/__init__) System Info: Python: CPython 3.10.2 -System: AMD64 Windows 10 10.0.19044 -CPU: Intel64 Family 6 Model 165 Stepping 3, GenuineIntel -Display: Intel(R) UHD Graphics 630 -4.6.0 - Build 26.20.100.7926 -[2022-02-06 11:40:43,201] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Compiling Shaders -[2022-02-06 11:40:43,216] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Creating Texture Array -[2022-02-06 11:40:43,216] [MainProcess/MainThread/INFO] (world.py/__init__) Loading block models -[2022-02-06 11:40:43,622] [MainProcess/MainThread/INFO] (save.py/load) Loading world -[2022-02-06 11:40:49,512] [MainProcess/MainThread/INFO] (world.py/__init__) Lighting chunks -[2022-02-06 11:41:03,233] [MainProcess/MainThread/INFO] (world.py/__init__) Generating chunks -[2022-02-06 11:41:03,248] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Setting up player & camera -[2022-02-06 11:41:03,295] [MainProcess/MainThread/INFO] (gamemain.py/__init__) Loading audio -[2022-02-06 11:44:48,321] [MainProcess/MainThread/INFO] (gamemain.py/on_close) Deleting media player From 2e33cc0e461c2fafaf30334652aa621090706151 Mon Sep 17 00:00:00 2001 From: ajh123 Date: Sun, 6 Feb 2022 13:01:25 +0000 Subject: [PATCH 04/13] Fix singelplayer typo --- community/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/main.py b/community/main.py index f84de3f8..45585586 100644 --- a/community/main.py +++ b/community/main.py @@ -67,7 +67,7 @@ def __init__(self, window): button_texture = pyglet.image.load('textures/button.png') self.button_sprite = pyglet.sprite.Sprite(button_texture, x=self.window.width/2-button_texture.width, y=self.window.height/2-button_texture.height) - self.signal_text = pyglet.text.Label('Singalplayer', font_size=10, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x, y=self.button_sprite.y, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') + self.signal_text = pyglet.text.Label('Singelplayer', font_size=10, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x, y=self.button_sprite.y, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') def on_mouse_press(self, x, y, button, modifiers): if x > self.button_sprite.x and x < (self.button_sprite.x + self.button_sprite.width): From 1e81d5e637b9a67a689d2eca596b6cc1a1d8bc6e Mon Sep 17 00:00:00 2001 From: ajh123 Date: Sun, 6 Feb 2022 13:44:19 +0000 Subject: [PATCH 05/13] Complete tempory main menu with gui button classs --- community/gui.py | 23 +++++++++++++++++++++++ community/main.py | 30 +++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 community/gui.py diff --git a/community/gui.py b/community/gui.py new file mode 100644 index 00000000..074a2a95 --- /dev/null +++ b/community/gui.py @@ -0,0 +1,23 @@ +import pyglet + +class GuiButton(): + def __init__(self, on_click_func, window, x, y, text): + self.func = on_click_func + self.window = window + self.text = text + button_texture = pyglet.image.load('textures/button.png') + self.font_size = button_texture.height/2 + self.x = x-button_texture.width/2 + self.y = y-button_texture.height/2 + self.button_sprite = pyglet.sprite.Sprite(button_texture, x=self.x, y=self.y) + self.button_text = pyglet.text.Label(text, font_size=self.font_size, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x+button_texture.width/2, y=(self.button_sprite.y+button_texture.height/2)-self.font_size/2, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') + + def draw(self): + self.button_sprite.draw() + self.button_text.draw() + + def on_mouse_press(self, x, y, button, modifiers): + if x > self.button_sprite.x and x < (self.button_sprite.x + self.button_sprite.width): + if y > self.button_sprite.y and y < (self.button_sprite.y + self.button_sprite.height): + self.func() + \ No newline at end of file diff --git a/community/main.py b/community/main.py index 45585586..be706c86 100644 --- a/community/main.py +++ b/community/main.py @@ -5,8 +5,9 @@ from scene import __HEIGHT__ from scene import convert_hashColor_to_RGBA from time import time, sleep -import options from gamemain import GameMain +from gui import GuiButton +import options import os import logging @@ -65,20 +66,31 @@ def __init__(self, window): self.screen_text = pyglet.text.Label('Minecraft', font_size=50, font_name=('Verdana', 'Calibri', 'Arial'), x=self.window.width/2, y=self.window.height/2+170, multiline=False, width=self.window.width, height=self.window.height, color=(100, 100, 100, 255), anchor_x='center') - button_texture = pyglet.image.load('textures/button.png') - self.button_sprite = pyglet.sprite.Sprite(button_texture, x=self.window.width/2-button_texture.width, y=self.window.height/2-button_texture.height) - self.signal_text = pyglet.text.Label('Singelplayer', font_size=10, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x, y=self.button_sprite.y, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') + self.singelplayer = GuiButton(self.on_singelplayer, self.window, self.window.width/2, self.window.height/2+25, 'Singelplayer') + self.multiplayer = GuiButton(self.on_multilplayer, self.window, self.window.width/2, self.window.height/2, 'Multiplayer') + self.options = GuiButton(self.on_options, self.window, self.window.width/2, self.window.height/2-25, 'Options') + + + def on_singelplayer(self): + self.window.set_scene(GameMain(self.window)) + + def on_multilplayer(self): + print("No multiplayer yet") + + def on_options(self): + print("No options yet") def on_mouse_press(self, x, y, button, modifiers): - if x > self.button_sprite.x and x < (self.button_sprite.x + self.button_sprite.width): - if y > self.button_sprite.y and y < (self.button_sprite.y + self.button_sprite.height): - self.window.set_scene(GameMain(self.window)) + self.singelplayer.on_mouse_press(x, y, button, modifiers) + self.multiplayer.on_mouse_press(x, y, button, modifiers) + self.options.on_mouse_press(x, y, button, modifiers) def on_draw(self): self.draw() self.screen_text.draw() - self.button_sprite.draw() - self.signal_text.draw() + self.singelplayer.draw() + self.multiplayer.draw() + self.options.draw() class Window(pyglet.window.Window): def __init__(self, refreshrate, **args): From c156c7b128b646b5fda066fb2c14f871425ea160 Mon Sep 17 00:00:00 2001 From: ajh123 Date: Sun, 6 Feb 2022 13:50:53 +0000 Subject: [PATCH 06/13] Button hovering --- community/gui.py | 16 ++++++++++++++-- community/main.py | 5 +++++ community/textures/button_hover.png | Bin 0 -> 3331 bytes 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 community/textures/button_hover.png diff --git a/community/gui.py b/community/gui.py index 074a2a95..c17a771e 100644 --- a/community/gui.py +++ b/community/gui.py @@ -1,3 +1,4 @@ +from tkinter.tix import Tree import pyglet class GuiButton(): @@ -5,19 +6,30 @@ def __init__(self, on_click_func, window, x, y, text): self.func = on_click_func self.window = window self.text = text + self.hovered=False button_texture = pyglet.image.load('textures/button.png') + button_texture_hover = pyglet.image.load('textures/button_hover.png') self.font_size = button_texture.height/2 self.x = x-button_texture.width/2 self.y = y-button_texture.height/2 self.button_sprite = pyglet.sprite.Sprite(button_texture, x=self.x, y=self.y) + self.button_sprite_hover = pyglet.sprite.Sprite(button_texture_hover, x=self.x, y=self.y) self.button_text = pyglet.text.Label(text, font_size=self.font_size, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x+button_texture.width/2, y=(self.button_sprite.y+button_texture.height/2)-self.font_size/2, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') def draw(self): - self.button_sprite.draw() + if self.hovered: + self.button_sprite_hover.draw() + else: + self.button_sprite.draw() self.button_text.draw() def on_mouse_press(self, x, y, button, modifiers): if x > self.button_sprite.x and x < (self.button_sprite.x + self.button_sprite.width): if y > self.button_sprite.y and y < (self.button_sprite.y + self.button_sprite.height): self.func() - \ No newline at end of file + + def on_mouse_motion(self, x, y, delta_x, delta_y): + self.hovered = False + if x > self.button_sprite.x and x < (self.button_sprite.x + self.button_sprite.width): + if y > self.button_sprite.y and y < (self.button_sprite.y + self.button_sprite.height): + self.hovered = True \ No newline at end of file diff --git a/community/main.py b/community/main.py index be706c86..4aeed737 100644 --- a/community/main.py +++ b/community/main.py @@ -85,6 +85,11 @@ def on_mouse_press(self, x, y, button, modifiers): self.multiplayer.on_mouse_press(x, y, button, modifiers) self.options.on_mouse_press(x, y, button, modifiers) + def on_mouse_motion(self, x, y, delta_x, delta_y): + self.singelplayer.on_mouse_motion(x, y, delta_x, delta_y) + self.multiplayer.on_mouse_motion(x, y, delta_x, delta_y) + self.options.on_mouse_motion(x, y, delta_x, delta_y) + def on_draw(self): self.draw() self.screen_text.draw() diff --git a/community/textures/button_hover.png b/community/textures/button_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..8cb9fb77a3e97ac9015865d8b8f0aadf9574ffd9 GIT binary patch literal 3331 zcmV+e4gB(nP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D446qoK~!i%?b}Ok z6iX0=;Wlp@5E9E}32cLjhpd8)Fk*ywnm5;9!e7KKH5Lo-k%G*Oj5zVgtm<~_-jkn~ zI9%fz*EovxfINTx{P*$?e*E~c#v33b`$ch zhG3oVp2Oa(^_V|oV~@y*4qyC}J6$lps@92Y{{_c-GxM=Oe_uK^G!N$K zNF4RReAdVI)~#FHdd7pfHu7ygx#AD>dtIQ<563aYJ!|GyF30fV#f!t!r%(SpAQZdcKG(~+m@ew z{&d;dQ=d8HTaJ^zxe*5&eEi|dmoLk=JgR|?@QpW~=IrYM`5VdsFRqJ=iQ}qF#IN{EnJFABL#mt_LR9iXRy?b}{jbD8X#o^by^P8Z9smCuL zez=Pl=&KjR)=M0(UcEY;pPwJLQ((9cDk;sY@kT&cA@rXfQ!v|m_wH>6X=F2b zz@E7DHBLjV>1Q)ZoD;2QUNz(W`}bS(i&L|jms>GF!#muXoZeauM)Bk%#)l6d7LPrg zd_I5vyj>8waur8xdypPyzIgT0yj+dh0$n!ht7q{L`E-G*J=mMIvzzC!b8pRaX%!M;4^fs~_Ic;v@-UIvh} zeRlL+9_u*y;1Zv$an?xK;V0EW>{YK3S7NKyPMwnbSKw=&E9ARZ)v%(o`#zZ>7CM2Pe`GwXM zX%s^d_9W-R5y{Zunml~$RUk>lUjW~?r;s@r^p-Uz%+b*jyzBndVXOf>e zopp1gT8KG;?Ag9~^JdkUPQ1RJPQPmHtmEac+A<;d!ZPu#jAGf&Xdl=4(WQSz{;RN9J>_6 z<)RD7*l7wl5IUs%x`1qep00Jtln^)!YkToq_f?0kgO`&c#P5yc?aJ2L9$R+6hu~x* z)`Z%!&Cl53mk%^I)*E&X(gidR^|5^RkQ0AAIMqpt3r1_U$JX+oD_ z$Z7W6UJnO|fvesDzIq(mC*>8`x8KNLESJx|czwFj%Sj&WoojhP{N>1Bj`4u8PyO;L zewQEUddbZ5;ZN{7KiH}gh(jM!g3LEbfl7j&&>7#od$+Ai1SCKzR2;!Q@!8U`spv3y zf*9;v7P-g^j2he;%zG&28z~%H$5ZpcSf2UdCF*|t`t=q^PA-CVmrSnew-@Lg8k-Jj z=3gFsNV#~hdhpoTv$kJv>~$H7$(F9MH>5R@AK#f{F@cR-ahiuN_4ETagHZvR0gCE^07AL~ z6&TDr7;__@bR=%cYtB_Dw^uNf5uB~M>NBUkH zTt+AlF?t|9JoAtN2Y>p0l)xnqe#RbtbHH8S$`vP$_}O+|_~`ozRK0BMlWYM$n|c-3 ze8BPv*|R0$^$L4F6{W#8(fbcKi38Ul$OJ5?S3siw|Ry13@xacYyQ0|_TkifTAqgaO5|MO=geb8uU>}`?uB5xj@!FSoy6hE3 zUrc^A1B~Lg&)(dqARo_S)=0vhEuCht-ycp5WnVMemt%S2sk!#!27Wc)o_r=3I~SuD zL-}PhM>eg^*~y>Zj7Mj*uUBH%zw&R+&!|6Bhf`iS%=@~m@Ae7K3BJId1al9hT)J#s z+VU=kVyBxi>|5Jc-;BYwT&Ms3UQQqN(6Pboyya!x8K$o`T>5E0uJxb0KY8-x@bcx$ zrLc)e05IoRu}BO4FUZatu|o%OW`pP*l(Aw0Kk;jd^@KfK>G%6_6nH9GJ)3IhCnpfUo`&Z1 z<=R6?s>{QGtGiJ=^Ui{u+&WKt_-E~G%ZT6FyAlnJWc%!;JfLB7ephEF!qU7!S*|a}ovlXji{%{OgU&5r?>JW{>uL zEkBUEp5mle2QkNo+q_(Zp4gX1k{%~poaXhbKccPeca}u1YKe!heUd*r5QBd_ap5o* zvonlWTsq>O80lsY&5IF=1#INuUa`eJ?Ps5x^MULC<@Ora_$v;F{{Wxxc9A7TbBzE1 N002ovPDHLkV1gj7wW Date: Sun, 6 Feb 2022 13:52:56 +0000 Subject: [PATCH 07/13] Remove random tkinter tree bc auto import thing --- community/gui.py | 1 - 1 file changed, 1 deletion(-) diff --git a/community/gui.py b/community/gui.py index c17a771e..efe165e3 100644 --- a/community/gui.py +++ b/community/gui.py @@ -1,4 +1,3 @@ -from tkinter.tix import Tree import pyglet class GuiButton(): From 04d75e09da26b007434e3499d145f472059e04f8 Mon Sep 17 00:00:00 2001 From: ajh123 Date: Sun, 6 Feb 2022 14:54:20 +0000 Subject: [PATCH 08/13] Working keyboard pause menu --- community/controller.py | 9 ++++- community/gamemain.py | 35 +++++++++++++++++ community/keyboard_mouse.py | 77 ++++++++++++++++++++----------------- community/main.py | 5 ++- community/scene.py | 4 +- 5 files changed, 90 insertions(+), 40 deletions(-) diff --git a/community/controller.py b/community/controller.py index 917537fc..c08d2d06 100644 --- a/community/controller.py +++ b/community/controller.py @@ -59,6 +59,11 @@ def misc(self, mode): elif mode == self.MiscMode.ESCAPE: self.game.window.mouse_captured = False self.game.window.set_exclusive_mouse(False) + self.game.show_pause = True + self.end_move(self.MoveMode.RIGHT) + self.end_move(self.MoveMode.LEFT) + self.end_move(self.MoveMode.FORWARD) + self.end_move(self.MoveMode.BACKWARD) elif mode == self.MiscMode.SPEED_TIME: self.game.world.speed_daytime() elif mode == self.MiscMode.FULLSCREEN: @@ -116,9 +121,9 @@ def end_move(self, mode): self.update_move(axis) def start_modifier(self, mode): - if mode == self.ModifierMode.SPRINT: + if mode == self.ModifierMode.SPRINT and not self.game.show_pause: self.game.player.target_speed = player.SPRINTING_SPEED def end_modifier(self, mode): - if mode == self.ModifierMode.SPRINT: + if mode == self.ModifierMode.SPRINT and not self.game.show_pause: self.game.player.target_speed = player.WALKING_SPEED \ No newline at end of file diff --git a/community/gamemain.py b/community/gamemain.py index 1756d5bc..7ddba3ae 100644 --- a/community/gamemain.py +++ b/community/gamemain.py @@ -7,6 +7,7 @@ import pyglet from scene import Scene +from gui import GuiButton pyglet.options["shadow_window"] = False pyglet.options["debug_gl"] = False @@ -43,6 +44,10 @@ def __init__(self, window): This feature is only supported on OpenGL 4.2+, but your driver doesnt seem to support it, Please disable "INDIRECT_RENDERING" in options.py""") + # Pause menu + self.show_pause = False + self.back_to_game = GuiButton(self.on_back_to_game, self.window, self.window.width/2, self.window.height/2+25, 'Back to game') + # F3 Debug Screen self.show_f3 = False @@ -139,6 +144,11 @@ def __init__(self, window): # GPU command syncs self.fences = deque() + + def on_back_to_game(self): + self.window.mouse_captured = True + self.window.set_exclusive_mouse(True) + self.show_pause = False def toggle_fullscreen(self): self.set_fullscreen(not self.fullscreen) @@ -220,6 +230,10 @@ def on_draw(self): # Draw the F3 Debug screen if self.show_f3: self.draw_f3() + + # Draw pause menu + if self.show_pause: + self.draw_pause() # CPU - GPU Sync if not self.options.SMOOTH_FPS: @@ -227,6 +241,27 @@ def on_draw(self): else: gl.glFinish() + def draw_pause(self): + """Draws the pause screen. Current uses the fixed-function pipeline since pyglet labels uses it""" + gl.glDisable(gl.GL_DEPTH_TEST) + gl.glUseProgram(0) + gl.glBindVertexArray(0) + gl.glMatrixMode(gl.GL_MODELVIEW) + gl.glPushMatrix() + gl.glLoadIdentity() + + gl.glMatrixMode(gl.GL_PROJECTION) + gl.glPushMatrix() + gl.glLoadIdentity() + gl.glOrtho(0, self.width, 0, self.height, -1, 1) + + self.back_to_game.draw() + + gl.glPopMatrix() + + gl.glMatrixMode(gl.GL_MODELVIEW) + gl.glPopMatrix() + def draw_f3(self): """Draws the f3 debug screen. Current uses the fixed-function pipeline since pyglet labels uses it""" gl.glDisable(gl.GL_DEPTH_TEST) diff --git a/community/keyboard_mouse.py b/community/keyboard_mouse.py index a89d7153..2bd37247 100644 --- a/community/keyboard_mouse.py +++ b/community/keyboard_mouse.py @@ -15,60 +15,65 @@ def __init__(self, game): self.game.on_key_release = self.on_key_release def on_mouse_press(self, x, y, button, modifiers): - if not self.game.window.mouse_captured: + if not self.game.window.mouse_captured and not self.game.show_pause: self.game.window.mouse_captured = True self.game.window.set_exclusive_mouse(True) + self.game.show_pause = False return - - if button == pyglet.window.mouse.RIGHT: self.interact(self.InteractMode.PLACE) - elif button == pyglet.window.mouse.LEFT: self.interact(self.InteractMode.BREAK) - elif button == pyglet.window.mouse.MIDDLE: self.interact(self.InteractMode.PICK) + elif self.game.show_pause: + self.game.back_to_game.on_mouse_press(x, y, button, modifiers) + else: + if button == pyglet.window.mouse.RIGHT: self.interact(self.InteractMode.PLACE) + elif button == pyglet.window.mouse.LEFT: self.interact(self.InteractMode.BREAK) + elif button == pyglet.window.mouse.MIDDLE: self.interact(self.InteractMode.PICK) def on_mouse_motion(self, x, y, delta_x, delta_y): - if self.game.window.mouse_captured: + if self.game.window.mouse_captured and not self.game.show_pause: sensitivity = 0.004 self.game.player.rotation[0] += delta_x * sensitivity self.game.player.rotation[1] += delta_y * sensitivity self.game.player.rotation[1] = max(-math.tau / 4, min(math.tau / 4, self.game.player.rotation[1])) + elif self.game.show_pause: + self.game.back_to_game.on_mouse_motion(x, y, delta_x, delta_y) def on_mouse_drag(self, x, y, delta_x, delta_y, buttons, modifiers): self.on_mouse_motion(x, y, delta_x, delta_y) def on_key_press(self, key, modifiers): - if not self.game.window.mouse_captured: + if not self.game.window.mouse_captured and not self.game.show_pause: return - - if key == pyglet.window.key.D: self.start_move(self.MoveMode.RIGHT) - elif key == pyglet.window.key.A: self.start_move(self.MoveMode.LEFT) - elif key == pyglet.window.key.W: self.start_move(self.MoveMode.FORWARD) - elif key == pyglet.window.key.S: self.start_move(self.MoveMode.BACKWARD) - elif key == pyglet.window.key.SPACE : self.start_move(self.MoveMode.UP) - elif key == pyglet.window.key.LSHIFT: self.start_move(self.MoveMode.DOWN) - - elif key == pyglet.window.key.LCTRL : self.start_modifier(self.ModifierMode.SPRINT) - - elif key == pyglet.window.key.F: self.misc(self.MiscMode.FLY) - elif key == pyglet.window.key.G: self.misc(self.MiscMode.RANDOM) - elif key == pyglet.window.key.O: self.misc(self.MiscMode.SAVE) - elif key == pyglet.window.key.R: self.misc(self.MiscMode.TELEPORT) - elif key == pyglet.window.key.ESCAPE: self.misc(self.MiscMode.ESCAPE) - elif key == pyglet.window.key.F6: self.misc(self.MiscMode.SPEED_TIME) - elif key == pyglet.window.key.F11: self.misc(self.MiscMode.FULLSCREEN) - elif key == pyglet.window.key.F3: self.misc(self.MiscMode.TOGGLE_F3) - elif key == pyglet.window.key.F10: self.misc(self.MiscMode.TOGGLE_AO) + else: + if key == pyglet.window.key.D: self.start_move(self.MoveMode.RIGHT) + elif key == pyglet.window.key.A: self.start_move(self.MoveMode.LEFT) + elif key == pyglet.window.key.W: self.start_move(self.MoveMode.FORWARD) + elif key == pyglet.window.key.S: self.start_move(self.MoveMode.BACKWARD) + elif key == pyglet.window.key.SPACE : self.start_move(self.MoveMode.UP) + elif key == pyglet.window.key.LSHIFT: self.start_move(self.MoveMode.DOWN) + + elif key == pyglet.window.key.LCTRL : self.start_modifier(self.ModifierMode.SPRINT) + + elif key == pyglet.window.key.F: self.misc(self.MiscMode.FLY) + elif key == pyglet.window.key.G: self.misc(self.MiscMode.RANDOM) + elif key == pyglet.window.key.O: self.misc(self.MiscMode.SAVE) + elif key == pyglet.window.key.R: self.misc(self.MiscMode.TELEPORT) + elif key == pyglet.window.key.ESCAPE: self.misc(self.MiscMode.ESCAPE) + elif key == pyglet.window.key.F6: self.misc(self.MiscMode.SPEED_TIME) + elif key == pyglet.window.key.F11: self.misc(self.MiscMode.FULLSCREEN) + elif key == pyglet.window.key.F3: self.misc(self.MiscMode.TOGGLE_F3) + elif key == pyglet.window.key.F10: self.misc(self.MiscMode.TOGGLE_AO) def on_key_release(self, key, modifiers): - if not self.game.window.mouse_captured: + if not self.game.window.mouse_captured and not self.game.show_pause: return - - if key == pyglet.window.key.D: self.end_move(self.MoveMode.RIGHT) - elif key == pyglet.window.key.A: self.end_move(self.MoveMode.LEFT) - elif key == pyglet.window.key.W: self.end_move(self.MoveMode.FORWARD) - elif key == pyglet.window.key.S: self.end_move(self.MoveMode.BACKWARD) - elif key == pyglet.window.key.SPACE : self.end_move(self.MoveMode.UP) - elif key == pyglet.window.key.LSHIFT: self.end_move(self.MoveMode.DOWN) - - elif key == pyglet.window.key.LCTRL : self.end_modifier(self.ModifierMode.SPRINT) \ No newline at end of file + else: + if key == pyglet.window.key.D: self.end_move(self.MoveMode.RIGHT) + elif key == pyglet.window.key.A: self.end_move(self.MoveMode.LEFT) + elif key == pyglet.window.key.W: self.end_move(self.MoveMode.FORWARD) + elif key == pyglet.window.key.S: self.end_move(self.MoveMode.BACKWARD) + elif key == pyglet.window.key.SPACE : self.end_move(self.MoveMode.UP) + elif key == pyglet.window.key.LSHIFT: self.end_move(self.MoveMode.DOWN) + + elif key == pyglet.window.key.LCTRL : self.end_modifier(self.ModifierMode.SPRINT) \ No newline at end of file diff --git a/community/main.py b/community/main.py index 4aeed737..d6a79d81 100644 --- a/community/main.py +++ b/community/main.py @@ -1,4 +1,4 @@ -from re import I +from re import I, S import pyglet from scene import Scene from scene import __WIDTH__ @@ -110,6 +110,9 @@ def __init__(self, refreshrate, **args): self.currentScreen = IntroScreen(self) self.screen_has_been_shown_since = time() + def show_menu(self): + self.currentScreen = MenuScreen(self) + def set_scene(self, scene): self.currentScreen = scene diff --git a/community/scene.py b/community/scene.py index c64b2ac3..f7e5b543 100644 --- a/community/scene.py +++ b/community/scene.py @@ -56,4 +56,6 @@ def on_resize(self, width, height): self.image.width = width self.image.height = height self.image.anchor_x = self.image.width / 2 - self.image.anchor_y = self.image.height / 2 \ No newline at end of file + self.image.anchor_y = self.image.height / 2 + self.x = width/2 + self.y = height/2 \ No newline at end of file From e015bcd9aad1ba628742b080defd55abfb66ccf5 Mon Sep 17 00:00:00 2001 From: ajh123 Date: Sun, 6 Feb 2022 15:15:35 +0000 Subject: [PATCH 09/13] Add save and quit pause button --- community/gamemain.py | 14 +++++++++++++- community/gui.py | 16 ++++++++-------- community/keyboard_mouse.py | 2 ++ community/save/0/1r/c.0.-1.dat | Bin 5049 -> 5049 bytes community/save/1/1r/c.1.-1.dat | Bin 4441 -> 4443 bytes community/save/2/2/c.2.2.dat | Bin 3201 -> 2968 bytes 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/community/gamemain.py b/community/gamemain.py index 7ddba3ae..67960425 100644 --- a/community/gamemain.py +++ b/community/gamemain.py @@ -47,6 +47,7 @@ def __init__(self, window): # Pause menu self.show_pause = False self.back_to_game = GuiButton(self.on_back_to_game, self.window, self.window.width/2, self.window.height/2+25, 'Back to game') + self.save_game = GuiButton(self.on_save_game, self.window, self.window.width/2, self.window.height/2, 'Save and quit to title') # F3 Debug Screen @@ -145,6 +146,13 @@ def __init__(self, window): # GPU command syncs self.fences = deque() + def on_save_game(self): + self.window.mouse_captured = False + self.window.set_exclusive_mouse(False) + self.show_pause = True + self.world.save.save() + self.window.show_menu() + def on_back_to_game(self): self.window.mouse_captured = True self.window.set_exclusive_mouse(True) @@ -256,6 +264,7 @@ def draw_pause(self): gl.glOrtho(0, self.width, 0, self.height, -1, 1) self.back_to_game.draw() + self.save_game.draw() gl.glPopMatrix() @@ -294,4 +303,7 @@ def on_resize(self, width, height): self.player.view_width = width self.player.view_height = height self.f3.y = self.height - 10 - self.f3.width = self.width // 3 \ No newline at end of file + self.f3.width = self.width // 3 + + self.back_to_game = GuiButton(self.on_back_to_game, self.window, self.window.width/2, self.window.height/2+25, 'Back to game') + self.save_game = GuiButton(self.on_back_to_game, self.window, self.window.width/2, self.window.height/2, 'Save and quit to title') diff --git a/community/gui.py b/community/gui.py index efe165e3..4260995d 100644 --- a/community/gui.py +++ b/community/gui.py @@ -6,14 +6,14 @@ def __init__(self, on_click_func, window, x, y, text): self.window = window self.text = text self.hovered=False - button_texture = pyglet.image.load('textures/button.png') - button_texture_hover = pyglet.image.load('textures/button_hover.png') - self.font_size = button_texture.height/2 - self.x = x-button_texture.width/2 - self.y = y-button_texture.height/2 - self.button_sprite = pyglet.sprite.Sprite(button_texture, x=self.x, y=self.y) - self.button_sprite_hover = pyglet.sprite.Sprite(button_texture_hover, x=self.x, y=self.y) - self.button_text = pyglet.text.Label(text, font_size=self.font_size, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x+button_texture.width/2, y=(self.button_sprite.y+button_texture.height/2)-self.font_size/2, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') + self.button_texture = pyglet.image.load('textures/button.png') + self.button_texture_hover = pyglet.image.load('textures/button_hover.png') + self.font_size = self.button_texture.height/2 + self.x = x-self.button_texture.width/2 + self.y = y-self.button_texture.height/2 + self.button_sprite = pyglet.sprite.Sprite(self.button_texture, x=self.x, y=self.y) + self.button_sprite_hover = pyglet.sprite.Sprite(self.button_texture_hover, x=self.x, y=self.y) + self.button_text = pyglet.text.Label(text, font_size=self.font_size, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x+self.button_texture.width/2, y=(self.button_sprite.y+self.button_texture.height/2)-self.font_size/2, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') def draw(self): if self.hovered: diff --git a/community/keyboard_mouse.py b/community/keyboard_mouse.py index 2bd37247..de078c99 100644 --- a/community/keyboard_mouse.py +++ b/community/keyboard_mouse.py @@ -23,6 +23,7 @@ def on_mouse_press(self, x, y, button, modifiers): return elif self.game.show_pause: self.game.back_to_game.on_mouse_press(x, y, button, modifiers) + self.game.save_game.on_mouse_press(x, y, button, modifiers) else: if button == pyglet.window.mouse.RIGHT: self.interact(self.InteractMode.PLACE) elif button == pyglet.window.mouse.LEFT: self.interact(self.InteractMode.BREAK) @@ -38,6 +39,7 @@ def on_mouse_motion(self, x, y, delta_x, delta_y): self.game.player.rotation[1] = max(-math.tau / 4, min(math.tau / 4, self.game.player.rotation[1])) elif self.game.show_pause: self.game.back_to_game.on_mouse_motion(x, y, delta_x, delta_y) + self.game.save_game.on_mouse_motion(x, y, delta_x, delta_y) def on_mouse_drag(self, x, y, delta_x, delta_y, buttons, modifiers): self.on_mouse_motion(x, y, delta_x, delta_y) diff --git a/community/save/0/1r/c.0.-1.dat b/community/save/0/1r/c.0.-1.dat index a1e4b255e63e9191046ce78ff2273f21886d6078..3e945b60ec56f0f8f7f89065c993285ca7fccf6e 100644 GIT binary patch delta 16 Ycmdm~zEhoDzMF&N$kYED**6IT05zrtrvLx| delta 16 Xcmdm~zEhoDzMF%?$?f$<_D#Y7E&2s= diff --git a/community/save/1/1r/c.1.-1.dat b/community/save/1/1r/c.1.-1.dat index 84fe36b0e48bc13a05d274fa198532fcc402d240..7c13f2b4df6cf2233194912bbe0276fd4401111f 100644 GIT binary patch delta 2598 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 HlZ^fYszkPb delta 2596 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 Date: Sun, 6 Feb 2022 17:43:30 +0000 Subject: [PATCH 10/13] Bit of mem cleanup --- community/gamemain.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/community/gamemain.py b/community/gamemain.py index 67960425..cc38eec1 100644 --- a/community/gamemain.py +++ b/community/gamemain.py @@ -150,6 +150,9 @@ def on_save_game(self): self.window.mouse_captured = False self.window.set_exclusive_mouse(False) self.show_pause = True + self.media_player.delete() + for fence in self.fences: + gl.glDeleteSync(fence) self.world.save.save() self.window.show_menu() From 22c9b641042dfd036296fa95fc0b03d9273053be Mon Sep 17 00:00:00 2001 From: ajh123 Date: Mon, 7 Feb 2022 15:30:53 +0000 Subject: [PATCH 11/13] Locked buttons and logo --- community/gamemain.py | 4 ++-- community/gui.py | 34 ++++++++++++++++++--------- community/main.py | 34 ++++++++++++++------------- community/textures/button_locked.png | Bin 0 -> 2580 bytes community/textures/logo.png | Bin 0 -> 5427 bytes 5 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 community/textures/button_locked.png create mode 100644 community/textures/logo.png diff --git a/community/gamemain.py b/community/gamemain.py index cc38eec1..6b20ec3a 100644 --- a/community/gamemain.py +++ b/community/gamemain.py @@ -162,7 +162,7 @@ def on_back_to_game(self): self.show_pause = False def toggle_fullscreen(self): - self.set_fullscreen(not self.fullscreen) + self.window.set_fullscreen(not self.window.fullscreen) def on_close(self): logging.info("Deleting media player") @@ -309,4 +309,4 @@ def on_resize(self, width, height): self.f3.width = self.width // 3 self.back_to_game = GuiButton(self.on_back_to_game, self.window, self.window.width/2, self.window.height/2+25, 'Back to game') - self.save_game = GuiButton(self.on_back_to_game, self.window, self.window.width/2, self.window.height/2, 'Save and quit to title') + self.save_game = GuiButton(self.on_back_to_game, self.window, self.window.width/2, self.window.height/2, 'Save and quit to title') \ No newline at end of file diff --git a/community/gui.py b/community/gui.py index 4260995d..09634bca 100644 --- a/community/gui.py +++ b/community/gui.py @@ -1,34 +1,46 @@ import pyglet class GuiButton(): - def __init__(self, on_click_func, window, x, y, text): + def __init__(self, on_click_func, window, x, y, text, locked=False): + self.locked = locked self.func = on_click_func self.window = window self.text = text self.hovered=False + self.button_texture = pyglet.image.load('textures/button.png') + self.button_texture_hover = pyglet.image.load('textures/button_hover.png') + + self.button_texture_locked = pyglet.image.load('textures/button_locked.png') + self.font_size = self.button_texture.height/2 self.x = x-self.button_texture.width/2 self.y = y-self.button_texture.height/2 self.button_sprite = pyglet.sprite.Sprite(self.button_texture, x=self.x, y=self.y) self.button_sprite_hover = pyglet.sprite.Sprite(self.button_texture_hover, x=self.x, y=self.y) + self.button_sprite_locked = pyglet.sprite.Sprite(self.button_texture_locked, x=self.x, y=self.y) self.button_text = pyglet.text.Label(text, font_size=self.font_size, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x+self.button_texture.width/2, y=(self.button_sprite.y+self.button_texture.height/2)-self.font_size/2, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') def draw(self): - if self.hovered: - self.button_sprite_hover.draw() + if not self.locked: + if self.hovered: + self.button_sprite_hover.draw() + else: + self.button_sprite.draw() else: - self.button_sprite.draw() + self.button_sprite_locked.draw() self.button_text.draw() def on_mouse_press(self, x, y, button, modifiers): - if x > self.button_sprite.x and x < (self.button_sprite.x + self.button_sprite.width): - if y > self.button_sprite.y and y < (self.button_sprite.y + self.button_sprite.height): - self.func() + if not self.locked: + if x > self.button_sprite.x and x < (self.button_sprite.x + self.button_sprite.width): + if y > self.button_sprite.y and y < (self.button_sprite.y + self.button_sprite.height): + self.func() def on_mouse_motion(self, x, y, delta_x, delta_y): - self.hovered = False - if x > self.button_sprite.x and x < (self.button_sprite.x + self.button_sprite.width): - if y > self.button_sprite.y and y < (self.button_sprite.y + self.button_sprite.height): - self.hovered = True \ No newline at end of file + if not self.locked: + self.hovered = False + if x > self.button_sprite.x and x < (self.button_sprite.x + self.button_sprite.width): + if y > self.button_sprite.y and y < (self.button_sprite.y + self.button_sprite.height): + self.hovered = True \ No newline at end of file diff --git a/community/main.py b/community/main.py index d6a79d81..72a6d1bc 100644 --- a/community/main.py +++ b/community/main.py @@ -64,36 +64,30 @@ def __init__(self, window): super(MenuScreen, self).__init__(window, texture=image, color='#000000') - self.screen_text = pyglet.text.Label('Minecraft', font_size=50, font_name=('Verdana', 'Calibri', 'Arial'), x=self.window.width/2, y=self.window.height/2+170, multiline=False, width=self.window.width, height=self.window.height, color=(100, 100, 100, 255), anchor_x='center') + image = pyglet.image.load("textures/logo.png") + self.logo = pyglet.sprite.Sprite(image, x=(self.window.width/2)-image.width/2, y=self.window.height-100) - self.singelplayer = GuiButton(self.on_singelplayer, self.window, self.window.width/2, self.window.height/2+25, 'Singelplayer') - self.multiplayer = GuiButton(self.on_multilplayer, self.window, self.window.width/2, self.window.height/2, 'Multiplayer') - self.options = GuiButton(self.on_options, self.window, self.window.width/2, self.window.height/2-25, 'Options') + self.singleplayer = GuiButton(self.on_singleplayer, self.window, self.window.width/2, self.window.height/2+25, 'Singleplayer') + self.multiplayer = GuiButton(None, self.window, self.window.width/2, self.window.height/2, 'Multiplayer', locked=True) + self.options = GuiButton(None, self.window, self.window.width/2, self.window.height/2-25, 'Options', locked=True) - - def on_singelplayer(self): + def on_singleplayer(self): self.window.set_scene(GameMain(self.window)) - def on_multilplayer(self): - print("No multiplayer yet") - - def on_options(self): - print("No options yet") - def on_mouse_press(self, x, y, button, modifiers): - self.singelplayer.on_mouse_press(x, y, button, modifiers) + self.singleplayer.on_mouse_press(x, y, button, modifiers) self.multiplayer.on_mouse_press(x, y, button, modifiers) self.options.on_mouse_press(x, y, button, modifiers) def on_mouse_motion(self, x, y, delta_x, delta_y): - self.singelplayer.on_mouse_motion(x, y, delta_x, delta_y) + self.singleplayer.on_mouse_motion(x, y, delta_x, delta_y) self.multiplayer.on_mouse_motion(x, y, delta_x, delta_y) self.options.on_mouse_motion(x, y, delta_x, delta_y) def on_draw(self): self.draw() - self.screen_text.draw() - self.singelplayer.draw() + self.logo.draw() + self.singleplayer.draw() self.multiplayer.draw() self.options.draw() @@ -109,6 +103,7 @@ def __init__(self, refreshrate, **args): self.currentScreen = IntroScreen(self) self.screen_has_been_shown_since = time() + self.not_first = 0 def show_menu(self): self.currentScreen = MenuScreen(self) @@ -148,6 +143,13 @@ def on_close(self): self.currentScreen.on_close() self.alive = 0 + # def on_resize(self, width, height): + # if self.not_first > 5: + # print("s") + # self.not_first = 0 + # self.currentScreen.on_resize(width, height) + # self.not_first += 1 + def run(self): while self.alive: self.render() diff --git a/community/textures/button_locked.png b/community/textures/button_locked.png new file mode 100644 index 0000000000000000000000000000000000000000..f2016b143ef8da14a938146c6b9b275b5064619a GIT binary patch literal 2580 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 literal 0 HcmV?d00001 From 687c022f4526e64b347744e8ca377fd6fba25cdc Mon Sep 17 00:00:00 2001 From: ajh123 Date: Mon, 7 Feb 2022 20:31:25 +0000 Subject: [PATCH 12/13] Make buttons bigger --- community/gamemain.py | 2 +- community/gui.py | 22 +++++++++++++++++++--- community/main.py | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/community/gamemain.py b/community/gamemain.py index 6b20ec3a..9b5a15f5 100644 --- a/community/gamemain.py +++ b/community/gamemain.py @@ -46,7 +46,7 @@ def __init__(self, window): # Pause menu self.show_pause = False - self.back_to_game = GuiButton(self.on_back_to_game, self.window, self.window.width/2, self.window.height/2+25, 'Back to game') + self.back_to_game = GuiButton(self.on_back_to_game, self.window, self.window.width/2, self.window.height/2+35, 'Back to game') self.save_game = GuiButton(self.on_save_game, self.window, self.window.width/2, self.window.height/2, 'Save and quit to title') # F3 Debug Screen diff --git a/community/gui.py b/community/gui.py index 09634bca..9e5ccbf4 100644 --- a/community/gui.py +++ b/community/gui.py @@ -9,18 +9,34 @@ def __init__(self, on_click_func, window, x, y, text, locked=False): self.hovered=False self.button_texture = pyglet.image.load('textures/button.png') - self.button_texture_hover = pyglet.image.load('textures/button_hover.png') - self.button_texture_locked = pyglet.image.load('textures/button_locked.png') + H_ratio = 1.5 + W_ratio = 1.2 + self.font_size = self.button_texture.height/2 self.x = x-self.button_texture.width/2 self.y = y-self.button_texture.height/2 + self.button_sprite = pyglet.sprite.Sprite(self.button_texture, x=self.x, y=self.y) + self.button_sprite.scale_x = W_ratio + self.button_sprite.scale_y = H_ratio + self.font_size = self.button_sprite.height/2 + self.x = x-self.button_sprite.width/2 + self.y = y-self.button_sprite.height/2 + self.button_sprite.x = self.x + self.button_sprite.y = self.y + self.button_sprite_hover = pyglet.sprite.Sprite(self.button_texture_hover, x=self.x, y=self.y) + self.button_sprite_hover.scale_x = W_ratio + self.button_sprite_hover.scale_y = H_ratio + self.button_sprite_locked = pyglet.sprite.Sprite(self.button_texture_locked, x=self.x, y=self.y) - self.button_text = pyglet.text.Label(text, font_size=self.font_size, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x+self.button_texture.width/2, y=(self.button_sprite.y+self.button_texture.height/2)-self.font_size/2, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') + self.button_sprite_locked.scale_x = W_ratio + self.button_sprite_locked.scale_y = H_ratio + + self.button_text = pyglet.text.Label(text, font_size=self.font_size, font_name=('Verdana', 'Calibri', 'Arial'), x=self.button_sprite.x+self.button_sprite.width/2, y=(self.button_sprite.y+self.button_sprite.height/2)-self.font_size/2, multiline=False, width=self.button_sprite.width, height=self.button_sprite.height, color=(255, 255, 255, 255), anchor_x='center') def draw(self): if not self.locked: diff --git a/community/main.py b/community/main.py index 72a6d1bc..9692000a 100644 --- a/community/main.py +++ b/community/main.py @@ -67,9 +67,9 @@ def __init__(self, window): image = pyglet.image.load("textures/logo.png") self.logo = pyglet.sprite.Sprite(image, x=(self.window.width/2)-image.width/2, y=self.window.height-100) - self.singleplayer = GuiButton(self.on_singleplayer, self.window, self.window.width/2, self.window.height/2+25, 'Singleplayer') + self.singleplayer = GuiButton(self.on_singleplayer, self.window, self.window.width/2, self.window.height/2+35, 'Singleplayer') self.multiplayer = GuiButton(None, self.window, self.window.width/2, self.window.height/2, 'Multiplayer', locked=True) - self.options = GuiButton(None, self.window, self.window.width/2, self.window.height/2-25, 'Options', locked=True) + self.options = GuiButton(None, self.window, self.window.width/2, self.window.height/2-35, 'Options', locked=True) def on_singleplayer(self): self.window.set_scene(GameMain(self.window)) From 2b3ececcf14e8fb0672480309bc0f8f91231a164 Mon Sep 17 00:00:00 2001 From: ajh123 Date: Tue, 8 Feb 2022 20:15:43 +0000 Subject: [PATCH 13/13] Make main logo bigger --- community/main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/community/main.py b/community/main.py index 9692000a..cf9f91a9 100644 --- a/community/main.py +++ b/community/main.py @@ -65,7 +65,13 @@ def __init__(self, window): super(MenuScreen, self).__init__(window, texture=image, color='#000000') image = pyglet.image.load("textures/logo.png") - self.logo = pyglet.sprite.Sprite(image, x=(self.window.width/2)-image.width/2, y=self.window.height-100) + self.logo = pyglet.sprite.Sprite(image, x=0, y=0) + H_ratio = 1.5 + W_ratio = 1.2 + self.logo.scale_x = W_ratio + self.logo.scale_y = H_ratio + self.logo.x = (self.window.width/2)-self.logo.width/2 + self.logo.y = self.window.height-100 self.singleplayer = GuiButton(self.on_singleplayer, self.window, self.window.width/2, self.window.height/2+35, 'Singleplayer') self.multiplayer = GuiButton(None, self.window, self.window.width/2, self.window.height/2, 'Multiplayer', locked=True)