[pypy-svn] r29522 - in pypy/dist/pypy/translator/js: demo/jsdemo tools
ericvrp at codespeak.net
ericvrp at codespeak.net
Fri Jun 30 09:32:48 CEST 2006
Author: ericvrp
Date: Fri Jun 30 09:32:46 2006
New Revision: 29522
Added:
pypy/dist/pypy/translator/js/demo/jsdemo/msgstruct.py
- copied unchanged from r29470, pypy/dist/pypy/translator/js/proxy/testme/msgstruct.py
pypy/dist/pypy/translator/js/demo/jsdemo/servermessage.py
- copied unchanged from r29498, pypy/dist/pypy/translator/js/proxy/testme/servermessage.py
Modified:
pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py
pypy/dist/pypy/translator/js/tools/start_bnb.py
Log:
Refactor to use files from the demo directory only (no longer from proxy).
Prefend 'random' (non-update) messages to start a new request-response loop.
Modified: pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py (original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py Fri Jun 30 09:32:46 2006
@@ -7,8 +7,9 @@
from pypy.translator.js.demo.jsdemo.controllers import Root
from pypy.rpython.ootypesystem.bltregistry import BasicExternal, MethodDesc
-from pypy.translator.js.proxy.testme.servermessage import log, ServerMessage, PMSG_INLINE_FRAME, PMSG_DEF_ICON
-from pypy.translator.js.proxy.testme.msgstruct import *
+from pypy.translator.js.demo.jsdemo.servermessage import log, ServerMessage,\
+ PMSG_INLINE_FRAME, PMSG_DEF_ICON
+from pypy.translator.js.demo.jsdemo.msgstruct import *
from cherrypy import session
import re, time, sys, os, urllib, socket, copy, md5, random
@@ -139,27 +140,26 @@
@turbogears.expose(format='json')
def player_name(self, player_id, name):
- print "Changing player #%s name to %s" % (player_id, name)
+ log("Changing player #%s name to %s" % (player_id, name))
self.sessionSocket().send(message(CMSG_PLAYER_NAME, int(player_id), name))
- return self.get_message()
+ return dict()
@turbogears.expose(format='json')
def add_player(self, player_id):
- print "Adding player"
- print player_id
+ log("Adding player " + player_id)
self.sessionSocket().send(message(CMSG_ADD_PLAYER, int(player_id)))
- return self.get_message()
+ return dict()
@turbogears.expose(format='json')
def remove_player(self, player_id):
- print player_id
+ log("Remove player " + player_id)
self.sessionSocket().send(message(CMSG_REMOVE_PLAYER, int(player_id)))
- return self.get_message()
+ return dict()
@turbogears.expose(format='json')
def key(self, player_id, keynum):
self.sessionSocket().send(message(CMSG_KEY, int(player_id), int(keynum)))
- return self.get_message()
+ return dict()
@turbogears.expose(format='json')
def key0(self):
@@ -224,7 +224,7 @@
sessionid = session['_id']
self._serverMessage[sessionid] = ServerMessage('static/images/')
self._spriteManagers[sessionid] = SpriteManager()
- return dict()
+ return dict(messages=[])
@turbogears.expose(format="json")
def get_message(self):
@@ -308,7 +308,7 @@
sprite_manager.end_frame()
messages += to_append
#messages.append(to_append[0])
- #print len(messages)
+ #log(len(messages))
return dict(messages=messages)
BnbRootInstance = BnbRoot()
Modified: pypy/dist/pypy/translator/js/tools/start_bnb.py
==============================================================================
--- pypy/dist/pypy/translator/js/tools/start_bnb.py (original)
+++ pypy/dist/pypy/translator/js/tools/start_bnb.py Fri Jun 30 09:32:46 2006
@@ -149,12 +149,12 @@
prev_player_id = player.id
if player.id >= 0:
log("removing " + name)
- BnbRootInstance.remove_player(player.id, bnb_dispatcher)
+ BnbRootInstance.remove_player(player.id, ignore_dispatcher)
player.id = -1
if player_id != prev_player_id:
log("adding " + name)
- BnbRootInstance.add_player(player_id, bnb_dispatcher)
- BnbRootInstance.player_name(player_id, name, bnb_dispatcher)
+ BnbRootInstance.add_player(player_id, ignore_dispatcher)
+ BnbRootInstance.player_name(player_id, name, ignore_dispatcher)
player.id = player_id
@@ -183,16 +183,16 @@
elif c == '57': #ord('9'):
addPlayer(9)
elif c == '68': #ord('D'): #right
- BnbRootInstance.key(player.id, 0, bnb_dispatcher)
+ BnbRootInstance.key(player.id, 0, ignore_dispatcher)
log('start right')
elif c == '83': #ord('S'): #left
- BnbRootInstance.key(player.id, 1, bnb_dispatcher)
+ BnbRootInstance.key(player.id, 1, ignore_dispatcher)
log('start left')
elif c == '69': #ord('E'): #up
- BnbRootInstance.key(player.id, 2, bnb_dispatcher)
+ BnbRootInstance.key(player.id, 2, ignore_dispatcher)
log('start up')
elif c == '88': #ord('X'): #fire
- BnbRootInstance.key(player.id, 3, bnb_dispatcher)
+ BnbRootInstance.key(player.id, 3, ignore_dispatcher)
log('start fire')
else:
logWarning('unknown keydown: ' + c)
@@ -204,20 +204,22 @@
c == '53' or c == '54' or c == '55' or c == '56' or c == '57': #XXX c in (...) didn't work
pass #don't print warning
elif c == '68': #ord('D'): #right
- BnbRootInstance.key(player.id, 4, bnb_dispatcher)
+ BnbRootInstance.key(player.id, 4, ignore_dispatcher)
log('stop right')
elif c == '83': #ord('S'): #left
- BnbRootInstance.key(player.id, 5, bnb_dispatcher)
+ BnbRootInstance.key(player.id, 5, ignore_dispatcher)
log('stop left')
elif c == '69': #ord('E'): #up
- BnbRootInstance.key(player.id, 6, bnb_dispatcher)
+ BnbRootInstance.key(player.id, 6, ignore_dispatcher)
log('stop up')
elif c == '88': #ord('X'): #fire
- BnbRootInstance.key(player.id, 7, bnb_dispatcher)
+ BnbRootInstance.key(player.id, 7, ignore_dispatcher)
log('stop fire')
else:
logWarning('unknown keyup: ' + c)
+def ignore_dispatcher(msgs):
+ pass
def bnb_dispatcher(msgs):
BnbRootInstance.get_message(bnb_dispatcher)
@@ -226,7 +228,7 @@
stats.register_frame()
get_document().title = str(stats.n_sprites) + " sprites " + str(stats.fps)
#sc.revive()
-
+
def session_dispatcher(msgs):
#log("Something...")
BnbRootInstance.get_message(bnb_dispatcher)
More information about the Pypy-commit
mailing list