Skip to content

Commit

Permalink
loading screen
Browse files Browse the repository at this point in the history
  • Loading branch information
mthenault committed Jun 1, 2012
1 parent 7cafeb8 commit 265a65f
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 77 deletions.
6 changes: 5 additions & 1 deletion sources/game.py
Expand Up @@ -22,6 +22,10 @@
single_sprites = dict()
sprite_sequences = dict()

#create the menu ( we create it here in order to let the menu object read the configuration,
#to set the correct screen size

menu=menu.Menu()
#fill up our dictionnaries
(sounds, single_sprites, sprite_sequences) = load_resources.load_resources(pygame)

Expand Down Expand Up @@ -50,7 +54,7 @@

hud= hud.Hud(single_sprites)
#start the menu
menu=menu.Menu(single_sprites, sounds, background, hud)
menu.init2(single_sprites, sounds, background, hud)
menu.launch(0)


Expand Down
83 changes: 24 additions & 59 deletions sources/load_resources.py
Expand Up @@ -2,6 +2,7 @@
import common_pygame
import sprite_handling
import menu
import progressbar

pygame = common_pygame.pygame
sounds = dict()
Expand All @@ -26,76 +27,40 @@ def add_sprite_sequence(spritesequence, h, w):
sprite_handling.load_sliced_sprites( w, h, spritesequence )

def load_resources(pygame_arg):
prog = progressbar.progressBar()
#loading sounds
#sounds is a dict that contains all the sounds
#global pygame = pygame_arg
prog.update(0)
soundlist=["laser.wav", "laser2.wav", "laser3.wav", "laser4.wav","laser5.wav", \
"explosion.wav", "explosion2.wav", "life.wav", "ouch.wav", "loser.wav", "shield1.wav", \
"armor.wav", "plasma1.wav", "plasmagun.wav"]

for index in xrange (len(soundlist)):
add_sound(soundlist[index])
prog.update(index*40/len(soundlist))

add_sound("laser.wav")
add_sound("laser2.wav")
add_sound("laser3.wav")
add_sound("laser4.wav")
add_sound("laser5.wav")
add_sound("explosion.wav")
add_sound("explosion2.wav")
add_sound("life.wav")
add_sound("ouch.wav")
add_sound("loser.wav")
add_sound("shield1.wav")
add_sound("armor.wav")
add_sound("plasma1.wav")
add_sound("plasmagun.wav")
#single_sprites is a dict that contains all the single sprites
sprite_load_list=["sprite_ship.png","sprite_ship_fire.png", "sprite_ship_weapon2.png", \
"sprite_laser.png", "sprite_laser_blue.png", "sprite_lasershoot.png","sprite_enemy.png", \
"sprite_enemy_fire.png", "background.png","backgroundtransp.png", "asteroid1.png", \
"asteroid2.png", "asteroid3.png", "planet1.png", "planet2.png", "planet3.png", \
"lifebonus.png", "armorbonus.png", "lifeBonusRing.png", "armorBonusRing.png", \
"lifemask.png", "ball1.png", "sprite_laser_blue_light.png","sprite_laser_light.png", \
"ball1_light.png","lifeBonusLight.png","menu_micshooter.png", "menu_options.png",
"menu_optionsblurry.png", "menu_play.png","menu_playblurry.png","menu_resume.png", \
"menu_resumeblurry.png", "menu_quit.png", "menu_quitblurry.png","menu_sound.png", \
"menu_on.png", "menu_off.png","menu_resolution.png","menu_800600.png", "menu_800500.png" ]

add_sprite("sprite_ship.png")
add_sprite("sprite_ship_fire.png")
add_sprite("sprite_ship_weapon2.png")
add_sprite("sprite_laser.png")
add_sprite("sprite_laser_blue.png")
add_sprite("sprite_lasershoot.png")
add_sprite("sprite_enemy.png")
add_sprite("sprite_enemy_fire.png")
add_sprite("background.png")
#add_sprite("stars.png")
add_sprite("backgroundtransp.png")
add_sprite("asteroid1.png")
add_sprite("asteroid2.png")
add_sprite("asteroid3.png")
add_sprite("planet1.png")
add_sprite("planet2.png")
add_sprite("planet3.png")
add_sprite("lifebonus.png")
add_sprite("armorbonus.png")
add_sprite("lifeBonusRing.png")
add_sprite("armorBonusRing.png")
add_sprite("lifemask.png")
add_sprite("ball1.png")
for index in xrange (len(sprite_load_list)):
add_sprite(sprite_load_list[index])
prog.update((index*60/len(sprite_load_list))+40)


#light
add_sprite("sprite_laser_blue_light.png")
add_sprite("sprite_laser_light.png")
add_sprite("ball1_light.png")
add_sprite("lifeBonusLight.png")

#menu
add_sprite("menu_micshooter.png")
add_sprite("menu_options.png")
add_sprite("menu_optionsblurry.png")
add_sprite("menu_play.png")
add_sprite("menu_playblurry.png")
add_sprite("menu_resume.png")
add_sprite("menu_resumeblurry.png")
add_sprite("menu_quit.png")
add_sprite("menu_quitblurry.png")
add_sprite("menu_sound.png")
add_sprite("menu_on.png")
add_sprite("menu_off.png")
add_sprite("menu_resolution.png")
add_sprite("menu_800600.png")
add_sprite("menu_800500.png")
#loading sprite sequences
#sprite_explosion_list = sprite_handling.load_sliced_sprites(pygame, 64, 64, "explosion_sheet.png" )
add_sprite_sequence("sprite_explosion_list.png", 192, 192)
add_sprite_sequence("sprite_explosion_list_asteroid.png", 192, 192)
prog.update(100)
return (sounds, single_sprites, sprite_sequences)

35 changes: 20 additions & 15 deletions sources/menu.py
Expand Up @@ -16,8 +16,24 @@ def play_sound(self, sound):
if self.config['sound']:
sound.play()

def __init__ (self):
self.config={}
if os.path.exists(os.path.join('data','config.conf')):
with open(os.path.join('data','config.conf'), 'rb') as fichier:
depickler = pickle.Unpickler(fichier)
self.config= depickler.load()
else:
self.config = {
"sound" : 1,
"resolution" : 0}


if self.config['resolution']==0:
common_pygame.pygame.display.set_mode((800,600))
else:
common_pygame.pygame.display.set_mode((800,500))

def __init__(self, single_sprites, sounds, background, hud):
def init2(self, single_sprites, sounds, background, hud):
self.single_sprites=single_sprites
self.sounds=sounds
self.background=background
Expand All @@ -31,25 +47,14 @@ def __init__(self, single_sprites, sounds, background, hud):
#1: option menu
self.menuStatus=0
self.font = pygame.font.Font(None,32)
self.config={}
#self.config={}
self.hud=hud

if os.path.exists(os.path.join('data','config.conf')):
with open(os.path.join('data','config.conf'), 'rb') as fichier:
depickler = pickle.Unpickler(fichier)
self.config= depickler.load()
else:
self.config = {
"sound" : 1,
"resolution" : 0}


if self.config['resolution']==0:
common_pygame.pygame.display.set_mode((800,600))
self.hud.offset=0
else:
common_pygame.pygame.display.set_mode((800,500))
self.hud.offset=100




#self.sound=1
Expand Down
4 changes: 2 additions & 2 deletions sources/sprite_handling.py
Expand Up @@ -14,10 +14,10 @@ def load_sliced_sprites(w, h, filename):

columns = master_width/w
rows =master_height/h
print(master_width, master_height, columns, rows)
#print(master_width, master_height, columns, rows)
for i in xrange (rows):
for j in xrange (columns):
print(j*w,i*h,w,h)
#print(j*w,i*h,w,h)
cursurf = master_image.subsurface((j*w,i*h,w,h))
cursurf.set_colorkey((255,0,255))
images.append(cursurf)
Expand Down

0 comments on commit 265a65f

Please sign in to comment.