SpindleyQ/tennisfortwo
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added error checking for front-end network code, and a menu for the multiple single-player modes. Multi-line widgets never cleared their text -- fixed. Fixed up py2exe script to automatically copy proper fonts, and ignore the CVS directory.

Browse source
This commit is contained in:
jpenner 2005-06-16 15:25:45 +00:00
parent 251444bc15
commit 254ed927d6
4 changed files with 78 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
TennisForTwo.leo
View file

@ -10,12 +10,12 @@
<vnodes> <vnodes>
<v t="jpenner.20050319120705" a="E"><vh>Files</vh> <v t="jpenner.20050319120705" a="E"><vh>Files</vh>
<v t="jpenner.20050305105206" a="E" <v t="jpenner.20050305105206" a="E"
expanded="jpenner.20050601180947,jpenner.20050305124252,jpenner.20050319143816,jpenner.20050604112932,jpenner.20050605102056,jpenner.20050305121157,jpenner.20050604175241,jpenner.20050305120654,jpenner.20050320112219,jpenner.20050306103246,jpenner.20050305122430,"><vh>@thin TennisForTwo.py</vh></v> expanded="jpenner.20050601180947,jpenner.20050305124252,jpenner.20050319143816,jpenner.20050604112932,jpenner.20050305121157,jpenner.20050305120654,jpenner.20050320112219,jpenner.20050306103246,jpenner.20050305122430,"><vh>@thin TennisForTwo.py</vh></v>
<v t="jpenner.20050604112932.1" <v t="jpenner.20050604112932.1"
expanded="jpenner.20050604112932.6,jpenner.20050604112932.16,jpenner.20050604112932.30,jpenner.20050604112932.41,"><vh>@thin widgets.py</vh></v> expanded="jpenner.20050604112932.41,jpenner.20050604112932.47,"><vh>@thin widgets.py</vh></v>
<v t="jpenner.20050604113053" <v t="jpenner.20050604113053"
expanded="jpenner.20050604113053.2,"><vh>@thin widgetsdemo.py</vh></v> expanded="jpenner.20050604113053.2,"><vh>@thin widgetsdemo.py</vh></v>
<v t="jpenner.20050319120621"><vh>@thin pygame2exe.py</vh></v> <v t="jpenner.20050319120621" a="ETV"><vh>@thin pygame2exe.py</vh></v>
<v t="jpenner.20050604144534"><vh>@thin pygame2app.py</vh></v> <v t="jpenner.20050604144534"><vh>@thin pygame2app.py</vh></v>
</v> </v>
<v t="jpenner.20050605105545"><vh>Tasks</vh> <v t="jpenner.20050605105545"><vh>Tasks</vh>
@ -26,8 +26,6 @@ expanded="jpenner.20050604113053.2,"><vh>@thin widgetsdemo.py</vh></v>
</v> </v>
<v t="jpenner.20050319120705.1" a="E"><vh>Utilities</vh> <v t="jpenner.20050319120705.1" a="E"><vh>Utilities</vh>
<v t="jpenner.20050305121227" a="E"><vh>@run TennisForTwo.py</vh></v> <v t="jpenner.20050305121227" a="E"><vh>@run TennisForTwo.py</vh></v>
<v t="jpenner.20050320113047" a="E"><vh>@run TennisForTwo.py client localhost 7554</vh></v>
<v t="jpenner.20050604113053.7" a="E"><vh>@run widgetsdemo.py</vh></v>
<v t="jpenner.20050307190605"><vh>@run PyGame2Exe.py py2exe</vh></v> <v t="jpenner.20050307190605"><vh>@run PyGame2Exe.py py2exe</vh></v>
<v t="jpenner.20050604144534.1"><vh>@run python2.4 pygame2app.py py2app</vh></v> <v t="jpenner.20050604144534.1"><vh>@run python2.4 pygame2app.py py2app</vh></v>
</v> </v>
@ -35,52 +33,8 @@ expanded="jpenner.20050604113053.2,"><vh>@thin widgetsdemo.py</vh></v>
<tnodes> <tnodes>
<t tx="jpenner.20050305121227"></t> <t tx="jpenner.20050305121227"></t>
<t tx="jpenner.20050307190605"></t> <t tx="jpenner.20050307190605"></t>
<t tx="jpenner.20050319120621">@ignore
@language python
#make standalone, needs at least pygame-1.5.3 and py2exe-0.3.1
from distutils.core import setup
import sys, os, pygame, shutil, glob
import py2exe
#setup the project variables here.
#i can't claim these will cover all the cases
#you need, but they seem to work for all my
#projects, just change as neeeded.
script = "TennisForTwo.py" #name of starting .PY
icon_file = "" #ICO file for the .EXE (not working well)
optimize = 2 #0, 1, or 2; like -O and -OO
dos_console = 0 #set to 0 for no dos shell when run
extra_data = ['data'] #extra files/dirs copied to game
extra_modules = ['pygame.locals'] #extra python modules not auto found
#use the default pygame icon, if none given
if not icon_file:
path = os.path.split(pygame.__file__)[0]
icon_file = '"' + os.path.join(path, 'pygame.ico') + '"'
#unfortunately, this cool icon stuff doesn't work in current py2exe :(
#icon_file = ''
project_name = os.path.splitext(os.path.split(script)[1])[0]
#this will create the executable and all dependencies
setup(#name=project_name,
windows=[script],
data_files=[("data", glob.glob("data\\*"))]
)
</t>
<t tx="jpenner.20050319120705"></t> <t tx="jpenner.20050319120705"></t>
<t tx="jpenner.20050319120705.1"></t> <t tx="jpenner.20050319120705.1"></t>
<t tx="jpenner.20050320113047"></t>
<t tx="jpenner.20050604113053.3">def __init__( self ): <t tx="jpenner.20050604113053.3">def __init__( self ):
"""Initialize Demo Class""" """Initialize Demo Class"""
# instead of pygame.init(), initialize modules manually to # instead of pygame.init(), initialize modules manually to
@ -130,17 +84,17 @@ setup(#name=project_name,
self.animline.width = 5 self.animline.width = 5
self.animline.left = self.animrect.left self.animline.left = self.animrect.left
</t> </t>
<t tx="jpenner.20050604113053.7"></t>
<t tx="jpenner.20050604144534.1"></t> <t tx="jpenner.20050604144534.1"></t>
<t tx="jpenner.20050605102056.1">self.addwidget(TextClass(self, (120, 40, 400, 30), "Tennis For Two", 36)) <t tx="jpenner.20050605102056.1">self.addwidget(TextClass(self, (120, 40, 400, 30), "Tennis For Two", 36))
self.addwidget(ButtonClass(self, self.startSingle, (120, 120, 400, 30), "Start Single-Player Game")) self.addwidget(ButtonClass(self, self.startSingle, (120, 120, 400, 30), "Start Single-Player Game"))
self.addwidget(ButtonClass(self, self.startAI, (120, 155, 400, 30), "Start Game Vs. Tennis-O-Tron"))
self.addwidget(TextClass(self, (120, 190, 400, 20), "Your IP Address: " + getMyIP())) self.addwidget(TextClass(self, (120, 220, 450, 20), "Your IP Address: " + getMyIP()))
self.addwidget(TextClass(self, (120, 215, 60, 20), "Port:")) self.addwidget(TextClass(self, (120, 245, 60, 20), "Port:"))
self.serverPort = EditClass(self, None, (180, 215, 60, 20), "7554") self.serverPort = EditClass(self, None, (180, 245, 60, 20), "7554")
self.addwidget(self.serverPort) self.addwidget(self.serverPort)
self.addwidget(ButtonClass(self, self.startServer, (120, 240, 400, 30), "Start Server")) self.addwidget(ButtonClass(self, self.startServer, (120, 270, 400, 30), "Start Server"))
self.addwidget(TextClass(self, (120, 310, 160, 20), "Server Address:")) self.addwidget(TextClass(self, (120, 310, 160, 20), "Server Address:"))
self.clientAddr = EditClass(self, None, (280, 310, 240, 20)) self.clientAddr = EditClass(self, None, (280, 310, 240, 20))

78
TennisForTwo.py
View file

@ -28,6 +28,8 @@ class Game:
AIPlayer = 0 AIPlayer = 0
SeverPort = 7554 SeverPort = 7554
Port = None Port = None
logfile = None
#@nonl #@nonl
#@-node:jpenner.20050310195953:Globals #@-node:jpenner.20050310195953:Globals
#@+node:jpenner.20050424164431:Logging #@+node:jpenner.20050424164431:Logging
@ -35,6 +37,7 @@ def startLogging(fn):
Game.logfile = open(fn, 'wt') Game.logfile = open(fn, 'wt')
def log(text): def log(text):
if Game.logfile <> None:
Game.logfile.write(str(text) + '\n') Game.logfile.write(str(text) + '\n')
def stopLogging(): def stopLogging():
@ -58,13 +61,16 @@ def getMyIP():
try: try:
f = urllib.urlopen('http://checkip.dyndns.org') f = urllib.urlopen('http://checkip.dyndns.org')
s = f.read() s = f.read()
m = re.search('([\d]*\.[\d]*\.[\d]*\.[\d]*)', s) log("checkip: " + s)
m = re.search('Current IP Address: ([\d]*\.[\d]*\.[\d]*\.[\d]*)', s)
outsideip = m.group(0) outsideip = m.group(0)
log("outside ip: " + outsideip)
except: except:
outsideip = None outsideip = None
try: try:
insideip = socket.gethostbyname(socket.gethostname()) insideip = socket.gethostbyname(socket.gethostname())
log("inside ip: " + insideip)
except: except:
insideip = None insideip = None
@ -72,7 +78,7 @@ def getMyIP():
ip = "Unknown" ip = "Unknown"
else: else:
if (outsideip == None): if (outsideip == None):
ip = insideip + " (No internet?)" ip = insideip + " (Firewalled / Proxied?)"
else: else:
ip = outsideip ip = outsideip
if (insideip <> None) and (insideip <> outsideip): if (insideip <> None) and (insideip <> outsideip):
@ -268,12 +274,13 @@ class MainMenu(BaseMenu):
self.addwidget(TextClass(self, (120, 40, 400, 30), "Tennis For Two", 36)) self.addwidget(TextClass(self, (120, 40, 400, 30), "Tennis For Two", 36))
self.addwidget(ButtonClass(self, self.startSingle, (120, 120, 400, 30), "Start Single-Player Game")) self.addwidget(ButtonClass(self, self.startSingle, (120, 120, 400, 30), "Start Single-Player Game"))
self.addwidget(ButtonClass(self, self.startAI, (120, 155, 400, 30), "Start Game Vs. Tennis-O-Tron"))
self.addwidget(TextClass(self, (120, 190, 400, 20), "Your IP Address: " + getMyIP())) self.addwidget(TextClass(self, (120, 220, 450, 20), "Your IP Address: " + getMyIP()))
self.addwidget(TextClass(self, (120, 215, 60, 20), "Port:")) self.addwidget(TextClass(self, (120, 245, 60, 20), "Port:"))
self.serverPort = EditClass(self, None, (180, 215, 60, 20), "7554") self.serverPort = EditClass(self, None, (180, 245, 60, 20), "7554")
self.addwidget(self.serverPort) self.addwidget(self.serverPort)
self.addwidget(ButtonClass(self, self.startServer, (120, 240, 400, 30), "Start Server")) self.addwidget(ButtonClass(self, self.startServer, (120, 270, 400, 30), "Start Server"))
self.addwidget(TextClass(self, (120, 310, 160, 20), "Server Address:")) self.addwidget(TextClass(self, (120, 310, 160, 20), "Server Address:"))
self.clientAddr = EditClass(self, None, (280, 310, 240, 20)) self.clientAddr = EditClass(self, None, (280, 310, 240, 20))
@ -286,10 +293,14 @@ class MainMenu(BaseMenu):
#@nl #@nl
def startSingle(self): def startSingle(self):
# Game.myplayer = SINGLE_PLAYER Game.myplayer = SINGLE_PLAYER
Game.isClient = False
Game.rules.infinitehits = True
Game.gameMgr.changeState(Game.gameMgr.STATE_SINGLE_PLAYER)
def startAI(self):
Game.myplayer = 1 Game.myplayer = 1
Game.isClient = False Game.isClient = False
# Game.rules.infinitehits = True
Game.AIPlayer = 2 Game.AIPlayer = 2
Game.gameMgr.changeState(Game.gameMgr.STATE_SINGLE_PLAYER) Game.gameMgr.changeState(Game.gameMgr.STATE_SINGLE_PLAYER)
@ -352,6 +363,21 @@ class ClientWait(BaseMenu):
Game.network.sendEvent(ConnectEvent()) Game.network.sendEvent(ConnectEvent())
#@-node:jpenner.20050605180040:Client Wait Screen #@-node:jpenner.20050605180040:Client Wait Screen
#@+node:jpenner.20050616085506:Failure Screen
class FailScreen(BaseMenu):
def menuLayout(self):
self.errText = MultiLineTextClass(self, (120, 60, 400, 270), "", 24)
self.addwidget(self.errText)
self.addwidget(ButtonClass(self, self.ok, (120, 360, 400, 30), "OK"))
def ok(self):
Game.gameMgr.changeState(Game.gameMgr.STATE_MENU)
def onEnter(self):
BaseMenu.onEnter(self)
self.errText.settext(Game.failure)
#@nonl
#@-node:jpenner.20050616085506:Failure Screen
#@-others #@-others
#@-node:jpenner.20050604112932:Menu #@-node:jpenner.20050604112932:Menu
#@+node:jpenner.20050305121157:Game #@+node:jpenner.20050305121157:Game
@ -683,7 +709,6 @@ class InputManager:
def sdl_event(self, event): def sdl_event(self, event):
if event.type == MOUSEBUTTONUP: if event.type == MOUSEBUTTONUP:
angle = makeAngle(event.pos) angle = makeAngle(event.pos)
log("userangle: " + str(math.degrees(angle)))
Game.evMgr.postEvent( ClickEvent(velocityFromAngle(angle), Game.myplayer) ) Game.evMgr.postEvent( ClickEvent(velocityFromAngle(angle), Game.myplayer) )
if event.type == KEYUP: if event.type == KEYUP:
@ -750,21 +775,24 @@ class GameMgr (StateMachine):
self.STATE_SINGLE_PLAYER = 2 self.STATE_SINGLE_PLAYER = 2
self.STATE_WAIT_FOR_CLIENT = 3 self.STATE_WAIT_FOR_CLIENT = 3
self.STATE_CONNECT = 4 self.STATE_CONNECT = 4
self.STATE_FAILURE = 5
inputMgr = InputManager() inputMgr = InputManager()
self.graphicsMgr = TFTGraphicsMgr() self.graphicsMgr = TFTGraphicsMgr()
self.physicsMgr = PhysicsMgr() self.physicsMgr = PhysicsMgr()
mainMenu = MainMenu() mainMenu = MainMenu()
failScreen = FailScreen()
self.serverWait = ServerWait() self.serverWait = ServerWait()
self.clientWait = ClientWait() self.clientWait = ClientWait()
StateMachine.__init__(self, StateMachine.__init__(self,
[GameState(MainMenu(), mainMenu.onEnter), [GameState(mainMenu, mainMenu.onEnter),
GameState(GameLoop([inputMgr, Game.evMgr, self.physicsMgr, self.graphicsMgr]), self.gameEnter), GameState(GameLoop([inputMgr, Game.evMgr, self.physicsMgr, self.graphicsMgr]), self.gameEnter),
GameState(GameLoop([inputMgr, AIPlayer(), Game.evMgr, PhysicsEngine(), self.graphicsMgr]), self.gameEnter), GameState(GameLoop([inputMgr, AIPlayer(), Game.evMgr, PhysicsEngine(), self.graphicsMgr]), self.gameEnter),
GameState(GameLoop([Game.evMgr, self.serverWait]), self.serverEnter, self.networkExit), GameState(GameLoop([Game.evMgr, self.serverWait]), self.serverEnter, self.networkExit),
GameState(GameLoop([Game.evMgr, self.clientWait]), self.clientEnter, self.networkExit) GameState(GameLoop([Game.evMgr, self.clientWait]), self.clientEnter, self.networkExit),
GameState(failScreen, failScreen.onEnter, self.networkExit)
]) ])
def gameEnter(self): def gameEnter(self):
@ -772,23 +800,31 @@ class GameMgr (StateMachine):
self.physicsMgr.onEnter() self.physicsMgr.onEnter()
def clientEnter(self): def clientEnter(self):
self.clientWait.onEnter()
Game.network = TFTProtocol() Game.network = TFTProtocol()
def onResolve(ip): def onResolve(ip):
Game.network.address = (ip, Game.ServerPort) Game.network.address = (ip, Game.ServerPort)
Game.port = reactor.listenUDP(0, Game.network) Game.port = reactor.listenUDP(0, Game.network)
reactor.resolve(Game.ServerIP).addCallback(onResolve) def onFail(err):
self.clientWait.onEnter() Game.failure = err.getErrorMessage()
self.changeState(self.STATE_FAILURE)
reactor.resolve(Game.ServerIP).addCallback(onResolve).addErrback(onFail)
def serverEnter(self): def serverEnter(self):
Game.network = TFTProtocol()
Game.port = reactor.listenUDP(Game.ServerPort, Game.network)
log ("Listening on " + str(Game.ServerPort))
self.serverWait.onEnter() self.serverWait.onEnter()
def networkExit(self): Game.network = TFTProtocol()
if (self.newstate == self.STATE_MENU) and (Game.port <> None): # cancelled try:
Game.port.stopListening() Game.port = reactor.listenUDP(Game.ServerPort, Game.network)
log ("Listening on " + str(Game.ServerPort))
except:
Game.failure = "Unable to listen on UDP port " + str(Game.ServerPort) + ". Make sure nothing else is using that port, and you have the proper permissions to create a server on it."
self.changeState(self.STATE_FAILURE)
def networkExit(self):
if ((self.newstate == self.STATE_MENU) or (self.newstate == self.STATE_FAILURE)) and (Game.port <> None): # cancelled
Game.port.stopListening()
#@-node:jpenner.20050606072251.1:Game Manager #@-node:jpenner.20050606072251.1:Game Manager
#@-others #@-others
@ -799,7 +835,7 @@ def main():
random.seed() random.seed()
pygame.init() pygame.init()
startLogging('tennis.log') # startLogging('tennis.log')
Game.screen = pygame.display.set_mode(SCREENRECT.size, DOUBLEBUF, 16) Game.screen = pygame.display.set_mode(SCREENRECT.size, DOUBLEBUF, 16)
@ -813,7 +849,7 @@ def main():
reactor.run() reactor.run()
#cleanup #cleanup
stopLogging() # stopLogging()

14
pygame2exe.py
View file

@ -1,3 +1,6 @@
#@+leo-ver=4-thin
#@+node:jpenner.20050319120621:@thin pygame2exe.py
#@@language python
#make standalone, needs at least pygame-1.5.3 and py2exe-0.3.1 #make standalone, needs at least pygame-1.5.3 and py2exe-0.3.1
from distutils.core import setup from distutils.core import setup
@ -17,11 +20,6 @@ dos_console = 0 #set to 0 for no dos shell when run
extra_data = ['data'] #extra files/dirs copied to game extra_data = ['data'] #extra files/dirs copied to game
extra_modules = ['pygame.locals'] #extra python modules not auto found extra_modules = ['pygame.locals'] #extra python modules not auto found
#use the default pygame icon, if none given #use the default pygame icon, if none given
if not icon_file: if not icon_file:
path = os.path.split(pygame.__file__)[0] path = os.path.split(pygame.__file__)[0]
@ -31,10 +29,12 @@ if not icon_file:
project_name = os.path.splitext(os.path.split(script)[1])[0] project_name = os.path.splitext(os.path.split(script)[1])[0]
#this will create the executable and all dependencies #this will create the executable and all dependencies
setup(#name=project_name, setup(#name=project_name,
windows=[script], windows=[script],
data_files=[("data", glob.glob("data\\*"))] data_files=[("data", glob.glob("data\\*.wav")),(".", ["C:\\python24\\lib\\site-packages\\pygame\\freesansbold.ttf"])]
) )
#@-node:jpenner.20050319120621:@thin pygame2exe.py
#@-leo

2
widgets.py
View file

@ -1006,6 +1006,8 @@ class MultiLineTextClass:
#@+node:jpenner.20050604112932.50:settext #@+node:jpenner.20050604112932.50:settext
def settext( self, newtext ): def settext( self, newtext ):
"""Replace the text of the widget""" """Replace the text of the widget"""
self.lines = [] # clear current text
# expand tabs # expand tabs
newtext = newtext.expandtabs() newtext = newtext.expandtabs()
# append each line separately # append each line separately