[Community] Loading screen and menu screen and pause screen

.gitignore

@@ -2,4 +2,5 @@
 *.core
 *.log
 .vscode
-*.ogg
+*.ogg
+community/logs

community/controller.py

@@ -57,8 +57,13 @@ 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)
+			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

community/gamemain.py

@@ -0,0 +1,312 @@
+import platform
+import ctypes
+import logging
+import random
+import time
+import os
+
+import pyglet
+from scene import Scene
+from gui import GuiButton
+
+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""")
+
+		# 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
+
+		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 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()
+
+	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)
+
+	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()
+
+		# Draw pause menu
+		if self.show_pause:
+			self.draw_pause()
+
+		# 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_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()
+		self.save_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)
+		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
+
+		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')

community/gui.py

@@ -0,0 +1,34 @@
+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
+		self.hovered=False
+		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:
+			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()
+
+	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

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