Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AstronClientRepository improvements #17

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

AstronClientRepository improvements #17

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ab24e5
acr: Add missing methods for handling generations with OTHER fields +…
LittleToonCat Nov 8, 2016
3405d82
acr: Get 'server-version' from the prc files when sending 'CLIENT_HELLO'
LittleToonCat Nov 8, 2016
6874154
acr: Whoops...
LittleToonCat Nov 8, 2016
034eb31
acr: Stupid GitHub... -_-
LittleToonCat Nov 8, 2016
f110fb7
acr: Missing comma...
LittleToonCat Nov 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 34 additions & 11 deletions direct/src/distributed/AstronClientRepository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from ClientRepositoryBase import ClientRepositoryBase
from MsgTypes import *
from direct.distributed.PyDatagram import PyDatagram
from pandac.PandaModules import STUint16, STUint32

class AstronClientRepository(ClientRepositoryBase):
"""
Expand Down Expand Up @@ -34,7 +33,9 @@ def __init__(self, *args, **kwargs):
self.message_handlers = {CLIENT_HELLO_RESP: self.handleHelloResp,
CLIENT_EJECT: self.handleEject,
CLIENT_ENTER_OBJECT_REQUIRED: self.handleEnterObjectRequired,
CLIENT_ENTER_OBJECT_REQUIRED_OTHER: self.handleEnterObjectRequiredOther,
CLIENT_ENTER_OBJECT_REQUIRED_OWNER: self.handleEnterObjectRequiredOwner,
CLIENT_ENTER_OBJECT_REQUIRED_OTHER_OWNER: self.handleEnterObjectRequiredOtherOwner,
CLIENT_OBJECT_SET_FIELD: self.handleUpdateField,
CLIENT_OBJECT_SET_FIELDS: self.handleUpdateFields,
CLIENT_OBJECT_LEAVING: self.handleObjectLeaving,
Expand Down Expand Up @@ -70,21 +71,37 @@ def handleEject(self, di):
messenger.send("CLIENT_EJECT", [error_code, reason])

def handleEnterObjectRequired(self, di):
do_id = di.getArg(STUint32)
parent_id = di.getArg(STUint32)
zone_id = di.getArg(STUint32)
dclass_id = di.getArg(STUint16)
do_id = di.get_uint32()
parent_id = di.get_uint32()
zone_id = di.get_uint32()
dclass_id = di.get_uint16()
dclass = self.dclassesByNumber[dclass_id]
self.generateWithRequiredFields(dclass, do_id, di, parent_id, zone_id)

def handleEnterObjectRequiredOther(self, di):
do_id = di.get_uint32()
parent_id = di.get_uint32()
zone_id = di.get_uint32()
dclass_id = di.get_uint16()
dclass = self.dclassesByNumber[dclass_id]
self.generateWithRequiredOtherFields(dclass, do_id, di, parent_id, zone_id)

def handleEnterObjectRequiredOwner(self, di):
avatar_doId = di.getArg(STUint32)
parentId = di.getArg(STUint32)
zoneId = di.getArg(STUint32)
dclass_id = di.getArg(STUint16)
avatar_doId = di.get_uint32()
parent_id = di.get_uint32()
zone_id = di.get_uint32()
dclass_id = di.get_uint16()
dclass = self.dclassesByNumber[dclass_id]
self.generateWithRequiredFieldsOwner(dclass, avatar_doId, di)

def handleEnterObjectRequiredOtherOwner(self, di):
avatar_doId = di.get_uint32()
parent_id = di.get_uint32()
zone_id = di.get_uint32()
dclass_id = di.get_uint16()
dclass = self.dclassesByNumber[dclass_id]
self.generateWithRequiredOtherFieldsOwner(dclass, avatar_doId, di)

def generateWithRequiredFieldsOwner(self, dclass, doId, di):
if doId in self.doId2ownerView:
# ...it is in our dictionary.
Expand Down Expand Up @@ -214,8 +231,14 @@ def sendUpdate(self, distObj, fieldName, args):
fieldName, distObj.doId, args)
self.send(dg)

# FIXME: The version string should default to a .prc variable.
def sendHello(self, version_string):
def sendHello(self, version_string=None):
# If the string is passed as an argument, use that.
if version_string == None:
# Or, get the string from the loaded prc files.
version_string = base.config.GetString('server-version', '')
if version_string == '':
self.notify.error('server-version is missing in your configuration files. It is needed in order to send \'CLIENT_HELLO\' to the server.')

dg = PyDatagram()
dg.add_uint16(CLIENT_HELLO)
dg.add_uint32(self.get_dc_file().get_hash())
Expand Down