Skip to content

Commit 87efe50

Browse files
Chat removed + others
1 parent 24a1daf commit 87efe50

File tree

12 files changed

+49
-92
lines changed

12 files changed

+49
-92
lines changed

functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def load_textures(self):
2727
self.texture[n] = pyglet.graphics.TextureGroup(texture)
2828
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)
2929

30-
print("Successful loaded", n, "texture!")
30+
print("Loaded", n, "texture!")
3131
done = []
3232
items = sorted(self.texture_dir.items(), key=lambda i: i[0])
3333
for n1, d in items:

game/GUI/GUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class GUI:
66
def __init__(self, gl):
7-
print("Init GUI class...")
7+
print("Started GUI class...")
88

99
self.GUI_TEXTURES = {}
1010
self.shows = {}

game/GUI/ModalWindow.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
from OpenGL.GL import *
33
from functions import checkHover
44

5+
from pypresence import Presence
6+
import time
7+
58

69
class ModalWindow:
710
def __init__(self, gl):
@@ -26,6 +29,8 @@ def destroyWindow(self):
2629

2730
self.gl.updateEvents.pop(self.windowId)
2831

32+
33+
2934
def drawWindow(self):
3035
self.clickWait += 1
3136
if self.clickWait == 25:

game/Particles.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ def drawParticles(self):
6464
i[0][0] += i[3][0] / 50
6565
i[0][2] += i[3][2] / 50
6666

67-
# self.gl.stuffBatch.add(24,
68-
# GL_QUADS,
69-
# i[1].t[1],
70-
# ('v3f', flatten(cube_vertices((i[0][0], i[0][1], i[0][2]), i[2]))))
7167
x, y, z = tuple(i[0])
7268
X, Y, Z = x + i[2], y + i[2], z + i[2]
7369

game/Scene.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from game.blocks.DestroyBlock import DestroyBlock
1414
from game.blocks.droppedBlock import droppedBlock
1515
from game.entity.Inventory import Inventory
16-
from game.entity.Zombie import Zombie
1716
from game.world.Clouds import Clouds
1817
from game.world.worldGenerator import worldGenerator
1918
from game.blocks.CubeHandler import CubeHandler
@@ -81,8 +80,8 @@ def vertexList(self):
8180
self.reticle = pyglet.graphics.vertex_list(4, ('v2f', (x - 10, y, x + 10, y, x, y - 10, x, y + 10)),
8281
('c3f', (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)))
8382

84-
def initScene(self):
85-
print("Init OpenGL scene...")
83+
def startScene(self):
84+
print("Started OpenGL scene...")
8685

8786
glClearColor(0.5, 0.7, 1, 1)
8887
glClearDepth(1.0)
@@ -111,10 +110,6 @@ def initScene(self):
111110
self.cubes = CubeHandler(self.opaque, self.block, self.opaque,
112111
('leaves_taiga', 'leaves_oak', 'tall_grass', 'nocolor'), self)
113112

114-
self.zombie = Zombie(self)
115-
self.zombie.position = [0, 53, 0]
116-
self.entity.append(self.zombie)
117-
118113
self.set3d()
119114

120115
def set2d(self):

game/entity/Inventory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def __init__(self, glClass):
3434
font_size=10,
3535
x=self.gl.WIDTH // 2, y=60)
3636

37-
def initWindow(self):
37+
def startWindow(self):
3838

3939
self.window = ModalWindow(self.gl)
4040
self.window.setWindow(self.gl.gui.GUI_TEXTURES["inventory_window"])

game/entity/Player.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -177,18 +177,6 @@ def move(self, dt, dx, dy, dz):
177177
if self.position[0] != col[0] or self.position[2] != col[2]:
178178
if col2 in self.gl.cubes.cubes and self.shift <= 0:
179179
self.gl.blockSound.playStepSound(self.gl.cubes.cubes[col2].name)
180-
# Dynamic FOV
181-
# if self.position[0] != col[0] or self.position[2] != col[2]:
182-
# if self.gl.fov < FOV + 20:
183-
# self.gl.fov += 0.2
184-
# else:
185-
# self.gl.fov = FOV + 20
186-
# else:
187-
# if self.gl.fov > FOV:
188-
# self.gl.fov -= 0.2
189-
# else:
190-
# self.gl.fov = FOV
191-
#
192180
if not self.bInAir:
193181
for i in range(1, 6):
194182
col21 = roundPos((col[0], col[1] - i, col[2]))

game/sound/Sound.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
class Sound:
77
def __init__(self):
8-
print("Init Sound class...")
8+
print("Started Sound class...")
99
self.BLOCKS_SOUND = {}
1010
self.SOUNDS = {}
1111
self.MUSIC = []
@@ -16,7 +16,7 @@ def __init__(self):
1616

1717
self.volume = 1
1818

19-
def initMusic(self, t):
19+
def startMusic(self, t):
2020
self.musicPlayer.stop()
2121
del self.musicPlayer
2222
self.musicPlayer = pygame.mixer.music

game/world/Explosion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def __init__(self, gl, pos, fr, bc):
66
self.gl, self.pos, self.fr, self.bc = gl, list(pos), fr, bc
77

88
def run(self):
9-
self.gl.particles.addParticle(self.pos, self.bc, numbers=range(-15, 15), direction="down", count=0)#100)
9+
self.gl.particles.addParticle(self.pos, self.bc, numbers=range(-15, 15), direction="down", count=0) #100) # Particles
1010
self.gl.cubes.remove(tuple(self.pos))
1111

1212
for x in range(-(self.fr // 2) + randint(-1, 1), self.fr // 2 + randint(-1, 1)):

0 commit comments

Comments
 (0)