TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replaced toonbase with base and tcr with cr

Browse Source
This commit is contained in:
Mike Goslin 2004-05-05 01:44:58 +00:00
parent 004a47b819
commit 61d945086e
8 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/directutil/DistributedLargeBlobSender.py
View File

@ -29,7 +29,7 @@ class DistributedLargeBlobSender(DistributedObject.DistributedObject):
DistributedLargeBlobSender.notify.debug('announceGenerate')
DistributedObject.DistributedObject.announceGenerate(self)
if self.targetAvId != toonbase.localToon.doId:
if self.targetAvId != base.localAvatar.doId:
# it's not for us
return

2
direct/src/distributed/DistributedObject.py
View File

@ -308,7 +308,7 @@ class DistributedObject(PandaObject):
numToons = dgi.getUint16()
for i in range(numToons):
avId = dgi.getUint32()
if avId == toonbase.localToon.doId:
if avId == base.localAvatar.doId:
# We found localToon's Id; stop here.
self.__barrierContext = context
assert(self.notify.debug('setBarrierData(%s)' % (context)))

10
direct/src/level/CutScene.py
View File

@ -55,7 +55,7 @@ def foo1(self, track, subjectNodePath, duration):
"foo1(track=%s, subjectNodePath=%s, duration=%s)"%(
track, subjectNodePath, duration)))
track.append(Sequence(
Func(toonbase.localToon.stopUpdateSmartCamera),
Func(base.localAvatar.stopUpdateSmartCamera),
PosHprInterval(
camera,
other=subjectNodePath,
@ -73,7 +73,7 @@ def foo1(self, track, subjectNodePath, duration):
other=subjectNodePath,
pos=Point3(0, -28, 7.5),
hpr=VBase3(0, 0, 0)),
Func(toonbase.localToon.startUpdateSmartCamera),
Func(base.localAvatar.startUpdateSmartCamera),
))
return track
@ -82,7 +82,7 @@ def doorUnlock(self, track, subjectNodePath, duration):
"doorUnlock(track=%s, subjectNodePath=%s, duration=%s)"%(
track, subjectNodePath, duration)))
track.append(Sequence(
Func(toonbase.localToon.stopUpdateSmartCamera),
Func(base.localAvatar.stopUpdateSmartCamera),
PosHprInterval(
camera,
other=self,
@ -100,7 +100,7 @@ def doorUnlock(self, track, subjectNodePath, duration):
other=self,
pos=Point3(0, -28, 7.5),
hpr=VBase3(0, 0, 0)),
Func(toonbase.localToon.startUpdateSmartCamera),
Func(base.localAvatar.startUpdateSmartCamera),
))
return track
@ -176,7 +176,7 @@ class CutScene(BasicEntities.NodePathEntity, DirectObject.DirectObject):
if self.track:
self.track.pause()
self.track = None
toonbase.localToon.startUpdateSmartCamera()
base.localAvatar.startUpdateSmartCamera()
def setStartStop(self, event):
assert(self.debugPrint("setStartStop(event=%s)"%(event,)))

2
direct/src/level/DistributedEntity.py
View File

@ -35,7 +35,7 @@ class DistributedEntity(DistributedObject.DistributedObject, Entity.Entity):
DistributedEntity.notify.debug('announceGenerate (%s)' % self.entId)
# ask our level obj for our spec data
level = toonbase.tcr.doId2do[self.levelDoId]
level = base.cr.doId2do[self.levelDoId]
self.initializeEntity(level, self.entId)
# announce our presence (Level does this for non-distributed entities)
self.level.onEntityCreate(self.entId)

32
direct/src/level/DistributedLevel.py
View File

@ -81,10 +81,10 @@ class DistributedLevel(DistributedObject.DistributedObject,
# the entities get created.
# We should listen for any and all time-sync events and re-sync
# all our entities at that time.
toonbase.tcr.timeManager.synchronize('DistributedLevel.generate')
base.cr.timeManager.synchronize('DistributedLevel.generate')
# add factory menu to SpeedChat
toonbase.localToon.chatMgr.chatInputSpeedChat.addFactoryMenu()
base.localAvatar.chatMgr.chatInputSpeedChat.addFactoryMenu()
# add special camera views
self.factoryViews = FactoryCameraViews.FactoryCameraViews(self)
@ -98,7 +98,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
def setPlayerIds(self, avIdList):
self.avIdList = avIdList
assert toonbase.localToon.doId in self.avIdList
assert base.localAvatar.doId in self.avIdList
def setEntranceId(self, entranceId):
self.entranceId = entranceId
@ -159,7 +159,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
def setSpecSenderDoId(self, doId):
DistributedLevel.notify.debug('setSpecSenderDoId: %s' % doId)
blobSender = toonbase.tcr.doId2do[doId]
blobSender = base.cr.doId2do[doId]
def setSpecBlob(specBlob, blobSender=blobSender, self=self):
blobSender.sendAck()
@ -211,7 +211,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
# the entrancePoint entities register themselves with us
if self.entranceId not in self.entranceId2entity:
self.notify.warning('unknown entranceId %s' % self.entranceId)
toonbase.localToon.setPos(0,0,0)
base.localAvatar.setPos(0,0,0)
self.notify.warning('showing all zones')
self.setColorZones(1)
# put the toon in a random zone to start
@ -220,14 +220,14 @@ class DistributedLevel(DistributedObject.DistributedObject,
zoneEntId = random.choice(zoneEntIds)
if zoneEntId is not LevelConstants.UberZoneEntId:
initialZoneEnt = self.getEntity(zoneEntId)
toonbase.localToon.setPos(
base.localAvatar.setPos(
render,
initialZoneEnt.getZoneNode().getPos(render))
break
else:
epEnt = self.entranceId2entity[self.entranceId]
epEnt.placeToon(toonbase.localToon,
self.avIdList.index(toonbase.localToon.doId),
epEnt.placeToon(base.localAvatar,
self.avIdList.index(base.localAvatar.doId),
len(self.avIdList))
initialZoneEnt = self.getEntity(epEnt.getZoneEntId())
@ -338,7 +338,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
DistributedLevel.notify.debug('delete')
DistributedObject.DistributedObject.delete(self)
# remove factory menu to SpeedChat
toonbase.localToon.chatMgr.chatInputSpeedChat.removeFactoryMenu()
base.localAvatar.chatMgr.chatInputSpeedChat.removeFactoryMenu()
# remove special camera views
del self.factoryViews
# make sure the ouch task is stopped
@ -391,8 +391,8 @@ class DistributedLevel(DistributedObject.DistributedObject,
zoneNode = self.getZoneNode(zoneNum)
if zoneNode is None:
return
toonbase.localToon.setPos(zoneNode,0,0,0)
toonbase.localToon.setHpr(zoneNode,0,0,0)
base.localAvatar.setPos(zoneNode,0,0,0)
base.localAvatar.setHpr(zoneNode,0,0,0)
self.enterZone(zoneNum)
def showZone(self, zoneNum):
@ -639,7 +639,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
assert(uniqueElements(visibleZoneIds))
DistributedLevel.notify.debug('new viz list: %s' % visibleZoneIds)
toonbase.tcr.sendSetZoneMsg(self.levelZone, visibleZoneIds)
base.cr.sendSetZoneMsg(self.levelZone, visibleZoneIds)
def resetVisibility(self):
# start out with every zone visible, since none of the zones have
@ -781,7 +781,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
def b_setOuch(self, penalty, anim=None):
self.notify.debug('b_setOuch %s' % penalty)
av = toonbase.localToon
av = base.localAvatar
# play the stun track (flashing toon)
if not av.isStunned:
@ -793,10 +793,10 @@ class DistributedLevel(DistributedObject.DistributedObject,
def setOuch(self, penalty, anim = None):
if anim == "Squish":
toonbase.tcr.playGame.getPlace().fsm.request('squished')
base.cr.playGame.getPlace().fsm.request('squished')
elif anim == "Fall":
toonbase.tcr.playGame.getPlace().fsm.request('fallDown')
base.cr.playGame.getPlace().fsm.request('fallDown')
av = toonbase.localToon
av = base.localAvatar
av.stunToon()
av.playDialogueForString("!")

2
direct/src/showbase/Finder.py
View File

@ -165,7 +165,7 @@ def replaceStateFunc(oldFunc, newFunc):
def replaceTcrFunc(oldFunc, newFunc):
try:
res = toonbase.tcr.replaceMethod(oldFunc, newFunc)
res = base.cr.replaceMethod(oldFunc, newFunc)
except:
try:
res = simbase.air.replaceMethod(oldFunc, newFunc)

8
direct/src/showbase/GravityWalker.py
View File

@ -95,15 +95,15 @@ class GravityWalker(DirectObject.DirectObject):
self.platform = MovingPlatform.MovingPlatform()
self.platform.setupCopyModel(fakeId, model, 'platformcollision')
self.platformRoot = render.attachNewNode("GravityWalker-spawnTest-%s"%fakeId)
self.platformRoot.setPos(toonbase.localToon, Vec3(0.0, 0.0, 1.0))
self.platformRoot.setHpr(toonbase.localToon, Vec3.zero())
self.platformRoot.setPos(base.localAvatar, Vec3(0.0, 0.0, 1.0))
self.platformRoot.setHpr(base.localAvatar, Vec3.zero())
self.platform.reparentTo(self.platformRoot)
self.platform2 = MovingPlatform.MovingPlatform()
self.platform2.setupCopyModel(1+fakeId, model, 'platformcollision')
self.platform2Root = render.attachNewNode("GravityWalker-spawnTest2-%s"%fakeId)
self.platform2Root.setPos(toonbase.localToon, Vec3(-16.0, 30.0, 1.0))
self.platform2Root.setHpr(toonbase.localToon, Vec3.zero())
self.platform2Root.setPos(base.localAvatar, Vec3(-16.0, 30.0, 1.0))
self.platform2Root.setHpr(base.localAvatar, Vec3.zero())
self.platform2.reparentTo(self.platform2Root)
duration = 5

10
direct/src/showbase/PhysicsWalker.py
View File

@ -82,8 +82,8 @@ class PhysicsWalker(DirectObject.DirectObject):
self.platform = MovingPlatform.MovingPlatform()
self.platform.setupCopyModel(fakeId, model, 'platformcollision')
self.platformRoot = render.attachNewNode("physicsWalker-spawnTest-%s"%fakeId)
self.platformRoot.setPos(toonbase.localToon, Vec3(0.0, 3.0, 1.0))
self.platformRoot.setHpr(toonbase.localToon, Vec3.zero())
self.platformRoot.setPos(base.localAvatar, Vec3(0.0, 3.0, 1.0))
self.platformRoot.setHpr(base.localAvatar, Vec3.zero())
self.platform.reparentTo(self.platformRoot)
startPos = Vec3(0.0, -15.0, 0.0)
@ -403,9 +403,9 @@ class PhysicsWalker(DirectObject.DirectObject):
"""
if __debug__:
if self.wantAvatarPhysicsIndicator:
onScreenDebug.append("localToon pos = %s\n"%(toonbase.localToon.getPos().pPrintValues(),))
onScreenDebug.append("localToon h = % 10.4f\n"%(toonbase.localToon.getH(),))
onScreenDebug.append("localToon anim = %s\n"%(toonbase.localToon.animFSM.getCurrentState().getName(),))
onScreenDebug.append("localToon pos = %s\n"%(base.localAvatar.getPos().pPrintValues(),))
onScreenDebug.append("localToon h = % 10.4f\n"%(base.localAvatar.getH(),))
onScreenDebug.append("localToon anim = %s\n"%(base.localAvatar.animFSM.getCurrentState().getName(),))
#assert(self.debugPrint("handleAvatarControls(task=%s)"%(task,)))
physObject=self.actorNode.getPhysicsObject()
#rotAvatarToPhys=Mat3.rotateMatNormaxis(-self.avatarNodePath.getH(), Vec3.up())