Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAFH2/BattleEngine.py8
-rw-r--r--MAFH2/BattleMenu.py8
-rw-r--r--MAFH2/fortuneengine/DrawableFontObject.py8
-rw-r--r--MAFH2/fortuneengine/DrawableObject.py4
-rw-r--r--MAFH2/fortuneengine/Scene.py6
-rw-r--r--devtools/CompleteTestKit/DrawableFontObject.py5
-rw-r--r--devtools/CompleteTestKit/DrawableObject.py4
-rw-r--r--devtools/CompleteTestKit/FontDirtyTest.py5
8 files changed, 28 insertions, 20 deletions
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py
index 3694bc0..27b4ae1 100644
--- a/MAFH2/BattleEngine.py
+++ b/MAFH2/BattleEngine.py
@@ -43,18 +43,18 @@ class BattleEngine(GameEngineElement):
if e_index != '0':
curE = get_enemy( e_index )
self.enemy_list.append( curE )
- self.game_engine.get_scene().addObjects([curE.get_sprite()])
+ self.game_engine.get_scene().addObject(curE.get_sprite())
# Preload images
self.__drawableObjects = {}
for i in ['arrow_select']:
self.__drawableObjects[i] = DrawableObject([pygame.image.load( HUD_PATH + i + ".gif" )],'')
- self.game_engine.get_scene().addObjects([self.__drawableObjects[i]])
+ self.game_engine.get_scene().addObject(self.__drawableObjects[i])
self.__drawableObjects['hp'] = DrawableObject(Spritesheet( HUD_PATH + "hp.gif" ).img_extract(11,1,100,100), '')
self.__drawableObjects['bt'] = DrawableObject(Spritesheet( HUD_PATH + "bt.gif" ).img_extract(1,11,100,25), '')
- self.game_engine.get_scene().addObjects([self.__drawableObjects['hp']])
- self.game_engine.get_scene().addObjects([self.__drawableObjects['bt']])
+ self.game_engine.get_scene().addObject(self.__drawableObjects['hp'])
+ self.game_engine.get_scene().addObject(self.__drawableObjects['bt'])
self.add_to_engine()
self.game_engine.add_object('battlemenu', BattleMenuHolder( self.menu_callback ) )
diff --git a/MAFH2/BattleMenu.py b/MAFH2/BattleMenu.py
index 179bf29..473ccf9 100644
--- a/MAFH2/BattleMenu.py
+++ b/MAFH2/BattleMenu.py
@@ -1,5 +1,6 @@
import pygame
from fortuneengine.GameEngineElement import GameEngineElement
+from fortuneengine.DrawableObject import DrawableObject
from constants import MENU_PATH
from gettext import gettext as _
@@ -12,7 +13,9 @@ class BattleMenuHolder( GameEngineElement ):
GameEngineElement.__init__(self, has_draw=True, has_event=False)
self.menu = None
self.callback = callback
- self.background = pygame.image.load(MENU_PATH + "battleMenubackground.gif")
+ #self.background = pygame.image.load(MENU_PATH + "battleMenubackground.gif")
+ self.background = DrawableObject([pygame.image.load( MENU_PATH + "battleMenubackground.gif")],'')
+ self.game_engine.get_scene().addObject(self.background)
self.disp = ""
self.sec_des = ""
self.font = pygame.font.SysFont("cmr10",18,False,False)
@@ -28,7 +31,8 @@ class BattleMenuHolder( GameEngineElement ):
self.clear_menu()
def draw(self,screen,time_delta):
- screen.blit(self.background,(0,286,452,414))
+ #screen.blit(self.background,(0,286,452,414))
+ self.background.setPosition(0,286)
ren = self.font.render(self.disp, 1, (0,0,0))
screen.blit(ren, (250, 340))
diff --git a/MAFH2/fortuneengine/DrawableFontObject.py b/MAFH2/fortuneengine/DrawableFontObject.py
index dbd5d65..f06e514 100644
--- a/MAFH2/fortuneengine/DrawableFontObject.py
+++ b/MAFH2/fortuneengine/DrawableFontObject.py
@@ -6,9 +6,11 @@ class DrawableFontObject(DrawableObject, pygame.sprite.Sprite):
def __init__(self,text,font,fps = 10, x = 0, y = 0, xVelocity = 0, yVelocity = 0):
self.font = font
- self.textImage = font.render(text, True, (0,0,0))
+ self.textImage = font.render(text, 1, (255,255,255))
+ #self._image = self.textImage
DrawableObject.__init__(self, [self.textImage], '', fps, x, y, xVelocity, yVelocity)
- def changeText(self, newtext):
+ def changeText(self, newText):
- self._images[0] = font.render(newText, True, (0,0,0))
+ self._images[0] = self.font.render(newText, True, (111,22,45))
+ self.image = self._images[0]
diff --git a/MAFH2/fortuneengine/DrawableObject.py b/MAFH2/fortuneengine/DrawableObject.py
index 9a4b426..0a01ebf 100644
--- a/MAFH2/fortuneengine/DrawableObject.py
+++ b/MAFH2/fortuneengine/DrawableObject.py
@@ -11,8 +11,8 @@ class DrawableObject(pygame.sprite.Sprite):
self._images = []
self._origImages = []
while cnt < len(images):
- self._images.append(images[cnt].convert_to_alpha())
- self._origImages.append(images[cnt].convert_to_alpha())
+ self._images.append(images[cnt].convert_alpha())
+ self._origImages.append(images[cnt].convert_alpha())
cnt += 1
self._start = pygame.time.get_ticks()
self.image = self._images[0]
diff --git a/MAFH2/fortuneengine/Scene.py b/MAFH2/fortuneengine/Scene.py
index fcc4181..52f9504 100644
--- a/MAFH2/fortuneengine/Scene.py
+++ b/MAFH2/fortuneengine/Scene.py
@@ -67,9 +67,9 @@ class Scene(pygame.sprite.RenderUpdates):
def removeObject(self, sprite):
print "1"
RenderUpdates.remove_internal(self, sprite)
- PRINT "2"
- self._spritelist.remove(sprite)
- PRINT "3"
+ print "2"
+ #self._spritelist.remove(sprite)
+ print "3"
def getObject(self, index):
diff --git a/devtools/CompleteTestKit/DrawableFontObject.py b/devtools/CompleteTestKit/DrawableFontObject.py
index 7977d97..f06e514 100644
--- a/devtools/CompleteTestKit/DrawableFontObject.py
+++ b/devtools/CompleteTestKit/DrawableFontObject.py
@@ -10,6 +10,7 @@ class DrawableFontObject(DrawableObject, pygame.sprite.Sprite):
#self._image = self.textImage
DrawableObject.__init__(self, [self.textImage], '', fps, x, y, xVelocity, yVelocity)
- def changeText(self, newtext):
+ def changeText(self, newText):
- self._images[0] = font.render(newText, True, (0,0,0))
+ self._images[0] = self.font.render(newText, True, (111,22,45))
+ self.image = self._images[0]
diff --git a/devtools/CompleteTestKit/DrawableObject.py b/devtools/CompleteTestKit/DrawableObject.py
index ce7389f..b058104 100644
--- a/devtools/CompleteTestKit/DrawableObject.py
+++ b/devtools/CompleteTestKit/DrawableObject.py
@@ -11,8 +11,8 @@ class DrawableObject(pygame.sprite.Sprite):
self._images = []
self._origImages = []
while cnt < len(images):
- self._images.append(images[cnt].convert())
- self._origImages.append(images[cnt].convert())
+ self._images.append(images[cnt].convert_alpha())
+ self._origImages.append(images[cnt].convert_alpha())
cnt += 1
self._start = pygame.time.get_ticks()
self.image = self._images[0]
diff --git a/devtools/CompleteTestKit/FontDirtyTest.py b/devtools/CompleteTestKit/FontDirtyTest.py
index a93071d..4a37bfa 100644
--- a/devtools/CompleteTestKit/FontDirtyTest.py
+++ b/devtools/CompleteTestKit/FontDirtyTest.py
@@ -1,7 +1,6 @@
#! /usr/bin/env python
import pygame
from pygame.locals import *
-from boxes import BouncingBox
from time import time
from Scene import Scene
from DrawableObject import DrawableObject
@@ -32,9 +31,10 @@ start = time()
for aTrial in range(maxTrial):
start = time()
- font = pygame.font.SysFont("cmr10", 24)
+ font = pygame.font.SysFont("cmr10", 100)
d = DrawableFontObject("hello world", font)
d.goToAnim("anim1")
+
group1=Scene(d)
groups=[group1]
@@ -47,6 +47,7 @@ for aTrial in range(maxTrial):
start = time()
for frame in range(FRAME):
dirtyList=[]
+ d.changeText(str(frame))
for image in range(numImages):
#move / collision detection
groups[image].update(clock.get_time())
generated by cgit v0.9.1 at 2024-05-07 18:44:01 (GMT)