Skip to content

Commit 685cc92

Browse files
authored
fix save and load bug.
2 and 3 are save and load. it had a mistake to only load once and save broke.
1 parent 2385f3b commit 685cc92

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

main.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@ def init():
106106
img2 = pygame.image.load("images/back2.png")
107107
img2_rect = img.get_rect(center = (screen_size[0]/2, screen_size[1]/2))
108108
global screen
109-
screen = pygame.Surface(screen_size)
110-
screen.blit(img, img_rect)
109+
screen = pygame.Surface(screen_size, SRCALPHA)
110+
# screen.set_alpha(0)
111+
# screen.blit(img, img_rect)
111112

112113
picture_exchange()
113114

@@ -129,8 +130,10 @@ def init():
129130

130131
global texLocation
131132
texLocation = glGetUniformLocation(shaderProgram, "textureObj")
133+
light_angle = glGetUniformLocation(shaderProgram, "angle")
132134
glUseProgram(shaderProgram)
133135
glUniform1i(texLocation, 0)
136+
glUniform1f(light_angle, 0)
134137

135138
def clear(color=(0, 0, 0)):
136139
pygame.display.flip()
@@ -143,7 +146,6 @@ def picture_exchange():
143146
height = screen.get_height()
144147
glTexImage2D(GL_TEXTURE_2D, 0, 3, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, textureData)
145148

146-
147149
def render():
148150
picture_exchange()
149151
glDrawArrays(GL_QUADS, 0, 4)
@@ -169,6 +171,7 @@ def rotatewindow():
169171
spd_collect = 0
170172
angle_spd = 2
171173
flip_spd = 10
174+
move_spd = 0.1
172175
quick_save = False
173176
has_save = False
174177
global save_matrix
@@ -225,7 +228,15 @@ def load_matrix_file():
225228
elif e.key == pygame.K_x:
226229
glRotatef(flip_spd, 0, 0, -1)
227230

228-
231+
elif e.key == pygame.K_RIGHT:
232+
glTranslatef(move_spd, 0, 0)
233+
elif e.key == pygame.K_LEFT:
234+
glTranslatef(-move_spd, 0, 0)
235+
elif e.key == pygame.K_UP:
236+
glTranslatef(0, move_spd, 0)
237+
elif e.key == pygame.K_DOWN:
238+
glTranslatef(0, -move_spd, 0)
239+
229240
elif e.key == pygame.K_0:
230241
if not(quick_save):
231242
glPushMatrix()
@@ -241,7 +252,7 @@ def load_matrix_file():
241252
elif e.key == pygame.K_3:
242253
if has_save:
243254
glLoadMatrixf(save_matrix)
244-
has_save = False
255+
# has_save = False
245256
elif e.key == pygame.K_1:
246257
glLoadMatrixf(correct_matrix)
247258

@@ -294,9 +305,6 @@ def load_matrix_file():
294305
screen.blit(img, img_rect)
295306
render()
296307

297-
# render()
298-
# clear()
299-
300308
if __name__ == '__main__':
301309
move = False
302310
angle = 0

0 commit comments

Comments
 (0)