Code for episode 14

community/block_type.py

@@ -3,7 +3,6 @@
 import models.cube # default model
 
 class Block_type:
-	# new optional model argument (cube model by default)
 	def __init__(self, texture_manager, name = "unknown", block_face_textures = {"all": "cobblestone"}, model = models.cube):
 		self.name = name
 		self.block_face_textures = block_face_textures
@@ -12,6 +11,7 @@ def __init__(self, texture_manager, name = "unknown", block_face_textures = {"al
 		# create members based on model attributes
 
 		self.transparent = model.transparent
+		self.transparency = model.transparency
 		self.is_cube = model.is_cube
 		self.glass = model.glass
 		self.translucent = model.translucent
@@ -23,7 +23,7 @@ def __init__(self, texture_manager, name = "unknown", block_face_textures = {"al
 		for _collider in model.colliders:
 			self.colliders.append(collider.Collider(*_collider))
 
-		# replace data contained in numbers.py with model specific data
+		# get model specific data
 
 		self.vertex_positions = model.vertex_positions
 		self.tex_coords = model.tex_coords # to deprecate
@@ -32,8 +32,10 @@ def __init__(self, texture_manager, name = "unknown", block_face_textures = {"al
 
 		def set_block_face(face, texture):
 			# make sure we don't add inexistent face
+
 			if face > len(self.tex_coords) - 1:
 				return
+
 			self.tex_indices[face] = texture
 
 		for face in block_face_textures:

community/chunk.py

@@ -3,7 +3,7 @@
 
 import pyglet.gl as gl
 
-import subchunk 
+import subchunk
 
 import options
 
@@ -14,27 +14,26 @@
 class Chunk:
 	def __init__(self, world, chunk_position):
 		self.world = world
-		self.shader_chunk_offset_location = self.world.shader.find_uniform(b"u_ChunkPosition")
-
+
 		self.modified = False
 		self.chunk_position = chunk_position
 
 		self.position = (
 			self.chunk_position[0] * CHUNK_WIDTH,
 			self.chunk_position[1] * CHUNK_HEIGHT,
 			self.chunk_position[2] * CHUNK_LENGTH)
-		
+
 		self.blocks = [[[0 for z in range(CHUNK_LENGTH)]
 							for y in range(CHUNK_HEIGHT)]
 							for x in range(CHUNK_WIDTH)]
 		# Numpy is really slow there
 		self.lightmap = [[[0 for z in range(CHUNK_LENGTH)]
 							for y in range(CHUNK_HEIGHT)]
 							for x in range(CHUNK_WIDTH)]
-		
+
 		self.subchunks = {}
 		self.chunk_update_queue = deque()
-		
+
 		for x in range(int(CHUNK_WIDTH / subchunk.SUBCHUNK_WIDTH)):
 			for y in range(int(CHUNK_HEIGHT / subchunk.SUBCHUNK_HEIGHT)):
 				for z in range(int(CHUNK_LENGTH / subchunk.SUBCHUNK_LENGTH)):
@@ -53,48 +52,48 @@ def __init__(self, world, chunk_position):
 		self.vao = gl.GLuint(0)
 		gl.glGenVertexArrays(1, self.vao)
 		gl.glBindVertexArray(self.vao)
-		
+
 		self.vbo = gl.GLuint(0)
 		gl.glGenBuffers(1, self.vbo)
 		gl.glBindBuffer(gl.GL_ARRAY_BUFFER, self.vbo)
 		gl.glBufferData(gl.GL_ARRAY_BUFFER, ctypes.sizeof(gl.GLfloat * CHUNK_WIDTH * CHUNK_HEIGHT * CHUNK_LENGTH * 7), None, gl.GL_DYNAMIC_DRAW)
 
-		gl.glVertexAttribPointer(0, 3, gl.GL_FLOAT, 
+		gl.glVertexAttribPointer(0, 3, gl.GL_FLOAT,
 				gl.GL_FALSE, 7 * ctypes.sizeof(gl.GLfloat), 0)
 		gl.glEnableVertexAttribArray(0)
-		gl.glVertexAttribPointer(1, 1, gl.GL_FLOAT, 
+		gl.glVertexAttribPointer(1, 1, gl.GL_FLOAT,
 				gl.GL_FALSE, 7 * ctypes.sizeof(gl.GLfloat), 3 * ctypes.sizeof(gl.GLfloat))
 		gl.glEnableVertexAttribArray(1)
-		gl.glVertexAttribPointer(2, 1, gl.GL_FLOAT, 
+		gl.glVertexAttribPointer(2, 1, gl.GL_FLOAT,
 				gl.GL_FALSE, 7 * ctypes.sizeof(gl.GLfloat), 4 * ctypes.sizeof(gl.GLfloat))
 		gl.glEnableVertexAttribArray(2)
-		gl.glVertexAttribPointer(3, 1, gl.GL_FLOAT, 
+		gl.glVertexAttribPointer(3, 1, gl.GL_FLOAT,
 				gl.GL_FALSE, 7 * ctypes.sizeof(gl.GLfloat), 5 * ctypes.sizeof(gl.GLfloat))
 		gl.glEnableVertexAttribArray(3)
-		gl.glVertexAttribPointer(4, 1, gl.GL_FLOAT, 
+		gl.glVertexAttribPointer(4, 1, gl.GL_FLOAT,
 				gl.GL_FALSE, 7 * ctypes.sizeof(gl.GLfloat), 6 * ctypes.sizeof(gl.GLfloat))
 		gl.glEnableVertexAttribArray(4)
-		
+
 
 
 		gl.glBindBuffer(gl.GL_ELEMENT_ARRAY_BUFFER, world.ibo)
-		
+
 		if self.world.options.INDIRECT_RENDERING:
 			self.indirect_command_buffer = gl.GLuint(0)
 			gl.glGenBuffers(1, self.indirect_command_buffer)
 			gl.glBindBuffer(gl.GL_DRAW_INDIRECT_BUFFER, self.indirect_command_buffer)
 			gl.glBufferData(
-				gl.GL_DRAW_INDIRECT_BUFFER, 
+				gl.GL_DRAW_INDIRECT_BUFFER,
 				ctypes.sizeof(gl.GLuint * 10),
 				None,
 				gl.GL_DYNAMIC_DRAW
-			)	
+			)
 
 		self.draw_commands = []
 
 		self.occlusion_query = gl.GLuint(0)
 		gl.glGenQueries(1, self.occlusion_query)
-		
+
 
 	def __del__(self):
 		gl.glDeleteQueries(1, self.occlusion_query)
@@ -132,20 +131,20 @@ def get_transparency(self, position):
 
 		if not block_type:
 			return 2
-		
+
 		return block_type.transparent
 
 	def is_opaque_block(self, position):
 		# get block type and check if it's opaque or not
 		# air counts as a transparent block, so test for that too
-		
+
 		block_type = self.world.block_types[self.get_block_number(position)]
-		
+
 		if not block_type:
 			return False
-		
+
 		return not block_type.transparent
-	
+
 	def update_subchunk_meshes(self):
 		self.chunk_update_queue.clear()
 		for subchunk in self.subchunks.values():
@@ -193,7 +192,7 @@ def process_chunk_updates(self):
 
 	def update_mesh(self):
 		# combine all the small subchunk meshes into one big chunk mesh
-		
+
 		for subchunk in self.subchunks.values():
 			self.mesh += subchunk.mesh
 			self.translucent_mesh += subchunk.translucent_mesh
@@ -208,7 +207,7 @@ def update_mesh(self):
 
 		self.mesh = []
 		self.translucent_mesh = []
-	
+
 	def send_mesh_data_to_gpu(self): # pass mesh data to gpu
 		if not self.mesh_quad_count:
 			return
@@ -217,8 +216,8 @@ def send_mesh_data_to_gpu(self): # pass mesh data to gpu
 
 		gl.glBindBuffer(gl.GL_ARRAY_BUFFER, self.vbo)
 		gl.glBufferData(gl.GL_ARRAY_BUFFER, # Orphaning
-			ctypes.sizeof(gl.GLfloat * CHUNK_WIDTH * CHUNK_HEIGHT * CHUNK_LENGTH * 7), 
-			None, 
+			ctypes.sizeof(gl.GLfloat * CHUNK_WIDTH * CHUNK_HEIGHT * CHUNK_LENGTH * 7),
+			None,
 			gl.GL_DYNAMIC_DRAW
 		)
 		gl.glBufferSubData(
@@ -236,7 +235,7 @@ def send_mesh_data_to_gpu(self): # pass mesh data to gpu
 
 		if not self.world.options.INDIRECT_RENDERING:
 			return
-		
+
 		self.draw_commands = [
 			# Index Count                    Instance Count  Base Index     Base Vertex               Base Instance
 			self.mesh_quad_count        * 6,       1,            0,              0,                        0,     # Opaque mesh commands
@@ -255,7 +254,7 @@ def draw_direct(self, mode):
 		if not self.mesh_quad_count:
 			return
 		gl.glBindVertexArray(self.vao)
-		gl.glUniform2i(self.shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
+		gl.glUniform2i(self.world.block_shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
 		gl.glDrawElements(
 			mode,
 			self.mesh_quad_count * 6,
@@ -269,7 +268,7 @@ def draw_indirect(self, mode):
 
 		gl.glBindVertexArray(self.vao)
 		gl.glBindBuffer(gl.GL_DRAW_INDIRECT_BUFFER, self.indirect_command_buffer)
-		gl.glUniform2i(self.shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
+		gl.glUniform2i(self.world.block_shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
 
 		gl.glDrawElementsIndirect(
 			mode,
@@ -282,7 +281,7 @@ def draw_direct_advanced(self, mode):
 			return
 
 		gl.glBindVertexArray(self.vao)
-		gl.glUniform2i(self.shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
+		gl.glUniform2i(self.world.block_shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
 
 		gl.glBeginQuery(gl.GL_ANY_SAMPLES_PASSED, self.occlusion_query)
 		gl.glDrawElements(
@@ -293,7 +292,7 @@ def draw_direct_advanced(self, mode):
 		)
 		gl.glEndQuery(gl.GL_ANY_SAMPLES_PASSED)
 
-		
+
 		gl.glBeginConditionalRender(self.occlusion_query, gl.GL_QUERY_BY_REGION_WAIT)
 		gl.glDrawElements(
 			mode,
@@ -309,7 +308,7 @@ def draw_indirect_advanced(self, mode):
 
 		gl.glBindVertexArray(self.vao)
 		gl.glBindBuffer(gl.GL_DRAW_INDIRECT_BUFFER, self.indirect_command_buffer)
-		gl.glUniform2i(self.shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
+		gl.glUniform2i(self.world.block_shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
 
 		gl.glBeginQuery(gl.GL_ANY_SAMPLES_PASSED, self.occlusion_query)
 		gl.glDrawElementsIndirect(
@@ -319,7 +318,7 @@ def draw_indirect_advanced(self, mode):
 		)
 		gl.glEndQuery(gl.GL_ANY_SAMPLES_PASSED)
 
-		
+
 		gl.glBeginConditionalRender(self.occlusion_query, gl.GL_QUERY_BY_REGION_WAIT)
 		gl.glDrawElementsIndirect(
 			mode,
@@ -335,9 +334,9 @@ def draw_indirect_advanced(self, mode):
 	def draw_translucent_direct(self, mode):
 		if not self.mesh_quad_count:
 			return
-		
+
 		gl.glBindVertexArray(self.vao)
-		gl.glUniform2i(self.shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
+		gl.glUniform2i(self.world.block_shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
 
 		gl.glDrawElementsBaseVertex(
 			mode,
@@ -350,10 +349,10 @@ def draw_translucent_direct(self, mode):
 	def draw_translucent_indirect(self, mode):
 		if not self.translucent_quad_count:
 			return
-		
+
 		gl.glBindVertexArray(self.vao)
 		gl.glBindBuffer(gl.GL_DRAW_INDIRECT_BUFFER, self.indirect_command_buffer)
-		gl.glUniform2i(self.shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
+		gl.glUniform2i(self.world.block_shader_chunk_offset_location, self.chunk_position[0], self.chunk_position[2])
 
 		gl.glMemoryBarrier(gl.GL_COMMAND_BARRIER_BIT)
 
@@ -364,4 +363,4 @@ def draw_translucent_indirect(self, mode):
 		)
 
 	draw_translucent = draw_translucent_indirect if options.INDIRECT_RENDERING else draw_translucent_direct
-		
+

community/controller.py

@@ -2,6 +2,7 @@
 import player
 import chunk
 import hit
+import mob
 
 from enum import IntEnum
 
@@ -21,6 +22,7 @@ class MiscMode(IntEnum):
 		TELEPORT = 6
 		TOGGLE_F3 = 7
 		TOGGLE_AO = 8
+		SPAWN = 9
 
 	class MoveMode(IntEnum):
 		LEFT = 0
@@ -54,6 +56,14 @@ def hit_callback(current_block, next_block):
 	def misc(self, mode):
 		if mode == self.MiscMode.RANDOM:
 			self.game.holding = random.randint(1, len(self.game.world.block_types) - 1)
+
+		elif mode == self.MiscMode.SPAWN:
+			# _mob = mob.Mob(self.game.world, random.choice([*self.game.world.entity_types.values()]))
+			_mob = mob.Mob(self.game.world, random.choice([self.game.world.entity_types["Zombie"], self.game.world.entity_types["Creeper"], self.game.world.entity_types["Skeleton"]]))
+			self.game.world.entities.append(_mob)
+
+			_mob.teleport(self.game.player.position)
+
 		elif mode == self.MiscMode.SAVE:
 			self.game.world.save.save()
 		elif mode == self.MiscMode.ESCAPE:

community/data/entities.mcpy

@@ -0,0 +1,7 @@
+Player:   name "Player", width 0.6, height 1.8, model models.pig, texture pig
+Pig:      name "Pig", width 0.9, height 0.9, model models.pig, texture pig
+Zombie:   name "Zombie", width 0.6, height 1.95, model models.zombie, texture zombie
+Skeleton: name "Skeleton", width 0.6, height 1.99, model models.skeleton, texture skeleton
+Creeper:  name "Creeper", width 0.6, height 1.7, model models.creeper, texture creeper
+Cow:      name "Cow", width 0.9, height 1.3, model models.cow, texture cow
+Curry:    name "Curry", width 0.9, height 1.8, model models.curry, texture curry