Skip to content

Commit de41ee6

Browse files
shochetshochet
committed
*** empty log message ***
1 parent cdc7311 commit de41ee6

33 files changed

+305
-458
lines changed

‎direct/src/actor/Actor.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,18 @@ def getAnimControlDict(self):
301301

302302
def getPartBundleDict(self):
303303
return self.__partBundleDict
304-
304+
305+
305306
def getLODNames(self):
306307
"""getLODNames(self):
307308
Return list of Actor LOD names. If not an LOD actor,
308-
returns 'lodRoot'"""
309-
return self.__partBundleDict.keys()
309+
returns 'lodRoot'
310+
Sorts them from highest lod to lowest.
311+
"""
312+
lodNames = self.__partBundleDict.keys()
313+
# Reverse sort the doing a string->int
314+
lodNames.sort(lambda x,y : cmp(int(y), int(x)))
315+
return lodNames
310316

311317
def getPartNames(self):
312318
"""getPartNames(self):

‎direct/src/cluster/ClusterClient.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def moveCamera(self, xyz, hpr):
9292

9393
def startMoveCamTask(self):
9494
task = Task.Task(self.moveCameraTask,49)
95-
taskMgr.spawnTaskNamed(task, "moveCamTask")
95+
taskMgr.add(task, "moveCamTask")
9696
return None
9797

9898
def moveCameraTask(self,task):
@@ -113,7 +113,7 @@ def __init__(self, dispConfigs):
113113

114114
def startSwapCoordinatorTask(self):
115115
task = Task.Task(self.swapCoordinator,51)
116-
taskMgr.spawnTaskNamed(task, "clientSwapCoordinator")
116+
taskMgr.add(task, "clientSwapCoordinator")
117117
return None
118118

119119
def swapCoordinator(self,task):

‎direct/src/cluster/ClusterServer.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def __init__(self,cameraGroup,camera):
4545

4646
def startListenerPollTask(self):
4747
task = Task.Task(self.listenerPoll)
48-
taskMgr.spawnTaskNamed(task, "serverListenerPollTask")
48+
taskMgr.add(task, "serverListenerPollTask")
4949
return None
5050

5151
def listenerPoll(self, task):
@@ -69,7 +69,7 @@ def listenerPoll(self, task):
6969

7070
def startReaderPollTask(self):
7171
task = Task.Task(self.readerPollUntilEmpty,-10)
72-
taskMgr.spawnTaskNamed(task, "serverReaderPollTask")
72+
taskMgr.add(task, "serverReaderPollTask")
7373
return None
7474

7575
def readerPollUntilEmpty(self, task):
@@ -144,7 +144,7 @@ def __init__(self,cameraGroup,camera):
144144

145145
def startListenerPollTask(self):
146146
task = Task.Task(self.listenerPoll,-2)
147-
taskMgr.spawnTaskNamed(task, "serverListenerPollTask")
147+
taskMgr.add(task, "serverListenerPollTask")
148148
return None
149149

150150
def listenerPoll(self, task):
@@ -175,7 +175,7 @@ def listenerPoll(self, task):
175175

176176
def startReaderPollTask(self):
177177
task = Task.Task(self.readPos,-1)
178-
taskMgr.spawnTaskNamed(task, "serverReadPosTask")
178+
taskMgr.add(task, "serverReadPosTask")
179179
return None
180180

181181
def readPos(self, task):
@@ -202,7 +202,7 @@ def sendSwapReady(self):
202202

203203
def startSwapCoordinator(self):
204204
task = Task.Task(self.swapCoordinatorTask, 51)
205-
taskMgr.spawnTaskNamed(task, "serverSwapCoordinator")
205+
taskMgr.add(task, "serverSwapCoordinator")
206206
return None
207207

208208
def swapCoordinatorTask(self, task):

‎direct/src/directdevices/DirectFastrak.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ def enable(self):
4545
# Initialize tracker
4646
self.tracker = direct.deviceManager.createTracker(self.device)
4747
# Update task
48-
taskMgr.spawnMethodNamed(self.updateTask, self.name + '-updateTask')
48+
taskMgr.add(self.updateTask, self.name + '-updateTask')
4949

5050
def disable(self):
51-
taskMgr.removeTasksNamed(self.name + '-updateTask')
51+
taskMgr.remove(self.name + '-updateTask')
5252

5353
def destroy(self):
5454
self.disable()

‎direct/src/directdevices/DirectJoybox.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ def enable(self):
8080
self.acceptSwitchModeEvent()
8181
self.acceptUprightCameraEvent()
8282
# Update task
83-
taskMgr.spawnMethodNamed(self.updateTask, self.name + '-updateTask')
83+
taskMgr.add(self.updateTask, self.name + '-updateTask')
8484

8585
def disable(self):
86-
taskMgr.removeTasksNamed(self.name + '-updateTask')
86+
taskMgr.remove(self.name + '-updateTask')
8787
# Ignore button events
8888
self.ignoreSwitchModeEvent()
8989
self.ignoreUprightCameraEvent()
@@ -189,7 +189,7 @@ def showMode(self, modeText):
189189
def hideText(state, s = self):
190190
s.readout.setText('')
191191
return Task.done
192-
taskMgr.removeTasksNamed(self.name + '-showMode')
192+
taskMgr.remove(self.name + '-showMode')
193193
# Update display
194194
self.readout.setText(modeText)
195195
t = taskMgr.doMethodLater(3.0, hideText, self.name + '-showMode')

‎direct/src/directdevices/DirectRadamec.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ def enable(self):
4646
# Kill existing task
4747
self.disable()
4848
# Update task
49-
taskMgr.spawnMethodNamed(self.updateTask, self.name + '-updateTask')
49+
taskMgr.add(self.updateTask, self.name + '-updateTask')
5050

5151
def disable(self):
52-
taskMgr.removeTasksNamed(self.name + '-updateTask')
52+
taskMgr.remove(self.name + '-updateTask')
5353

5454
def destroy(self):
5555
self.disable()

‎direct/src/directtools/DirectCameraControl.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def mouseFlyStart(self):
8484
self.spawnMouseRotateTask()
8585

8686
def mouseFlyStop(self):
87-
taskMgr.removeTasksNamed('manipulateCamera')
87+
taskMgr.remove('manipulateCamera')
8888
stopT = globalClock.getFrameTime()
8989
deltaT = stopT - self.startT
9090
stopF = globalClock.getFrameCount()
@@ -111,39 +111,39 @@ def mouseFlyStop(self):
111111

112112
def spawnXZTranslateOrHPanYZoom(self):
113113
# Kill any existing tasks
114-
taskMgr.removeTasksNamed('manipulateCamera')
114+
taskMgr.remove('manipulateCamera')
115115
# Spawn the new task
116116
t = Task.Task(self.XZTranslateOrHPanYZoomTask)
117117
# For HPanYZoom
118118
t.zoomSF = Vec3(self.coaMarker.getPos(direct.camera)).length()
119-
taskMgr.spawnTaskNamed(t, 'manipulateCamera')
119+
taskMgr.add(t, 'manipulateCamera')
120120

121121
def spawnXZTranslateOrHPPan(self):
122122
# Kill any existing tasks
123-
taskMgr.removeTasksNamed('manipulateCamera')
123+
taskMgr.remove('manipulateCamera')
124124
# Spawn new task
125-
taskMgr.spawnMethodNamed(self.XZTranslateOrHPPanTask,
126-
'manipulateCamera')
125+
taskMgr.add(self.XZTranslateOrHPPanTask,
126+
'manipulateCamera')
127127

128128
def spawnXZTranslate(self):
129129
# Kill any existing tasks
130-
taskMgr.removeTasksNamed('manipulateCamera')
130+
taskMgr.remove('manipulateCamera')
131131
# Spawn new task
132-
taskMgr.spawnMethodNamed(self.XZTranslateTask, 'manipulateCamera')
132+
taskMgr.add(self.XZTranslateTask, 'manipulateCamera')
133133

134134
def spawnHPanYZoom(self):
135135
# Kill any existing tasks
136-
taskMgr.removeTasksNamed('manipulateCamera')
136+
taskMgr.remove('manipulateCamera')
137137
# Spawn new task
138138
t = Task.Task(self.HPanYZoomTask)
139139
t.zoomSF = Vec3(self.coaMarker.getPos(direct.camera)).length()
140-
taskMgr.spawnTaskNamed(t, 'manipulateCamera')
140+
taskMgr.add(t, 'manipulateCamera')
141141

142142
def spawnHPPan(self):
143143
# Kill any existing tasks
144-
taskMgr.removeTasksNamed('manipulateCamera')
144+
taskMgr.remove('manipulateCamera')
145145
# Spawn new task
146-
taskMgr.spawnMethodNamed(self.HPPanTask, 'manipulateCamera')
146+
taskMgr.add(self.HPPanTask, 'manipulateCamera')
147147

148148
def XZTranslateOrHPanYZoomTask(self, state):
149149
if direct.fShift:
@@ -205,7 +205,7 @@ def HPPanTask(self, state):
205205

206206
def spawnMouseRotateTask(self):
207207
# Kill any existing tasks
208-
taskMgr.removeTasksNamed('manipulateCamera')
208+
taskMgr.remove('manipulateCamera')
209209
# Set at markers position in render coordinates
210210
self.camManipRef.setPos(self.coaMarkerPos)
211211
self.camManipRef.setHpr(direct.camera, ZERO_POINT)
@@ -214,7 +214,7 @@ def spawnMouseRotateTask(self):
214214
t.constrainedDir = 'y'
215215
else:
216216
t.constrainedDir = 'x'
217-
taskMgr.spawnTaskNamed(t, 'manipulateCamera')
217+
taskMgr.add(t, 'manipulateCamera')
218218

219219
def mouseRotateTask(self, state):
220220
# If moving outside of center, ignore motion perpendicular to edge
@@ -245,15 +245,15 @@ def mouseRotateTask(self, state):
245245

246246
def spawnMouseRollTask(self):
247247
# Kill any existing tasks
248-
taskMgr.removeTasksNamed('manipulateCamera')
248+
taskMgr.remove('manipulateCamera')
249249
# Set at markers position in render coordinates
250250
self.camManipRef.setPos(self.coaMarkerPos)
251251
self.camManipRef.setHpr(direct.camera, ZERO_POINT)
252252
t = Task.Task(self.mouseRollTask)
253253
t.coaCenter = getScreenXY(self.coaMarker)
254254
t.lastAngle = getCrankAngle(t.coaCenter)
255255
t.wrtMat = direct.camera.getMat( self.camManipRef )
256-
taskMgr.spawnTaskNamed(t, 'manipulateCamera')
256+
taskMgr.add(t, 'manipulateCamera')
257257

258258
def mouseRollTask(self, state):
259259
wrtMat = state.wrtMat
@@ -383,7 +383,7 @@ def homeCam(self):
383383
self.updateCoaMarkerSize()
384384

385385
def uprightCam(self):
386-
taskMgr.removeTasksNamed('manipulateCamera')
386+
taskMgr.remove('manipulateCamera')
387387
# Record undo point
388388
direct.pushUndo([direct.camera])
389389
# Pitch camera till upright
@@ -395,7 +395,7 @@ def uprightCam(self):
395395
task = 'manipulateCamera')
396396

397397
def orbitUprightCam(self):
398-
taskMgr.removeTasksNamed('manipulateCamera')
398+
taskMgr.remove('manipulateCamera')
399399
# Record undo point
400400
direct.pushUndo([direct.camera])
401401
# Transform camera z axis to render space
@@ -439,7 +439,7 @@ def centerCamNow(self):
439439
self.centerCamIn(0.)
440440

441441
def centerCamIn(self, t):
442-
taskMgr.removeTasksNamed('manipulateCamera')
442+
taskMgr.remove('manipulateCamera')
443443
# Record undo point
444444
direct.pushUndo([direct.camera])
445445
# Determine marker location
@@ -456,7 +456,7 @@ def centerCamIn(self, t):
456456
t.uponDeath = self.updateCoaMarkerSizeOnDeath
457457

458458
def zoomCam(self, zoomFactor, t):
459-
taskMgr.removeTasksNamed('manipulateCamera')
459+
taskMgr.remove('manipulateCamera')
460460
# Record undo point
461461
direct.pushUndo([direct.camera])
462462
# Find a point zoom factor times the current separation
@@ -474,7 +474,7 @@ def zoomCam(self, zoomFactor, t):
474474

475475
def spawnMoveToView(self, view):
476476
# Kill any existing tasks
477-
taskMgr.removeTasksNamed('manipulateCamera')
477+
taskMgr.remove('manipulateCamera')
478478
# Record undo point
479479
direct.pushUndo([direct.camera])
480480
# Calc hprOffset
@@ -525,7 +525,7 @@ def spawnMoveToView(self, view):
525525

526526
def swingCamAboutWidget(self, degrees, t):
527527
# Remove existing camera manipulation task
528-
taskMgr.removeTasksNamed('manipulateCamera')
528+
taskMgr.remove('manipulateCamera')
529529

530530
# Record undo point
531531
direct.pushUndo([direct.camera])
@@ -553,7 +553,7 @@ def reparentCam(self, state):
553553
def fitOnWidget(self, nodePath = 'None Given'):
554554
# Fit the node on the screen
555555
# stop any ongoing tasks
556-
taskMgr.removeTasksNamed('manipulateCamera')
556+
taskMgr.remove('manipulateCamera')
557557
# How big is the node?
558558
nodeScale = direct.widget.scalingNode.getScale(render)
559559
maxScale = max(nodeScale[0],nodeScale[1],nodeScale[2])
@@ -601,16 +601,16 @@ def moveToFit(self):
601601
# Push state onto undo stack
602602
direct.pushUndo(direct.selected)
603603
# Remove the task to keep the widget attached to the object
604-
taskMgr.removeTasksNamed('followSelectedNodePath')
604+
taskMgr.remove('followSelectedNodePath')
605605
# Spawn a task to keep the selected objects with the widget
606-
taskMgr.spawnMethodNamed(self.stickToWidgetTask, 'stickToWidget')
606+
taskMgr.add(self.stickToWidgetTask, 'stickToWidget')
607607
# Spawn a task to move the widget
608608
t = direct.widget.lerpPos(Point3(centerVec),
609609
CAM_MOVE_DURATION,
610610
other = direct.camera,
611611
blendType = 'easeInOut',
612612
task = 'moveToFitTask')
613-
t.uponDeath = lambda state: taskMgr.removeTasksNamed('stickToWidget')
613+
t.uponDeath = lambda state: taskMgr.remove('stickToWidget')
614614

615615
def stickToWidgetTask(self, state):
616616
# Move the objects with the widget
@@ -636,5 +636,5 @@ def disableMouseFly(self):
636636
base.enableMouse()
637637

638638
def removeManipulateCameraTask(self):
639-
taskMgr.removeTasksNamed('manipulateCamera')
639+
taskMgr.remove('manipulateCamera')
640640

0 commit comments

Comments
 (0)