Fix to level editor sign bug
New config for supporting compositing test
This commit is contained in:
parent
dc64f981e3
commit
8857ba343e
|
|
@ -55,16 +55,23 @@ class ClusterClient(DirectObject.DirectObject):
|
|||
serverConfig.serverName,
|
||||
serverConfig.serverPort))
|
||||
else:
|
||||
self.notify.debug('send cam pos')
|
||||
#server.sendMoveCam(Point3(0), Vec3(0))
|
||||
self.notify.debug('send cam offset')
|
||||
server.sendCamOffset(serverConfig.xyz,serverConfig.hpr)
|
||||
if serverConfig.fFrustum:
|
||||
self.notify.debug('send cam frustum')
|
||||
server.sendCamFrustum(serverConfig.focalLength,
|
||||
serverConfig.filmSize,
|
||||
serverConfig.filmOffset)
|
||||
self.serverList.append(server)
|
||||
self.notify.debug('pre startMoveCam')
|
||||
self.startMoveCamTask()
|
||||
self.notify.debug('post startMoveCam')
|
||||
self.startMoveSelectedTask()
|
||||
|
||||
def startMoveCamTask(self):
|
||||
self.notify.debug('adding move cam')
|
||||
taskMgr.add(self.moveCameraTask, "moveCamTask", 49)
|
||||
|
||||
def moveCameraTask(self,task):
|
||||
|
|
@ -351,7 +358,9 @@ def createClusterClient():
|
|||
# Create Cluster Managers (opening connections to servers)
|
||||
# Are the servers going to be synced?
|
||||
if base.clusterSyncFlag:
|
||||
base.notify.warning('autoflip')
|
||||
base.graphicsEngine.setAutoFlip(0)
|
||||
base.notify.warning('ClusterClientSync')
|
||||
return ClusterClientSync(displayConfigs, base.clusterSyncFlag)
|
||||
else:
|
||||
return ClusterClient(displayConfigs, base.clusterSyncFlag)
|
||||
|
|
|
|||
|
|
@ -421,5 +421,24 @@ ClientConfigs = {
|
|||
'pos' : Vec3(.105,0,0),
|
||||
'hpr' : Vec3(0,0,-90)}
|
||||
],
|
||||
'composite' : [{'display name' : 'master',
|
||||
'display mode' : 'client',
|
||||
'pos' : Vec3(0),
|
||||
},
|
||||
{'display name' : 'left',
|
||||
'pos' : Vec3(-0.105, -0.020, 5.000),
|
||||
'hpr' : Vec3(-0.370, 0.000, 0.000),
|
||||
'focal length' : 0.815,
|
||||
'film size' : (1.000, 0.831),
|
||||
'film offset' : (0.000, 0.173),
|
||||
},
|
||||
{'display name' : 'right',
|
||||
'pos' : Vec3(0.105, -0.020, 5.000),
|
||||
'hpr' : Vec3(0.370, 0.000, 0.000),
|
||||
'focal length' : 0.815,
|
||||
'film size' : (1.000, 0.831),
|
||||
'film offset' : (0.000, 0.173),
|
||||
}
|
||||
],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1585,7 +1585,7 @@ class LevelEditor(NodePath, PandaObject):
|
|||
#newDNASign.setScale(VBase3(2.0, 1.0, 2.0))
|
||||
|
||||
baseline = DNASignBaseline('baseline')
|
||||
baseline.setCode("ImpressBT")
|
||||
baseline.setCode("humanist")
|
||||
baseline.setColor(VBase4(0.0, 0.0, 0.0, 1.0))
|
||||
#baseline.setKern(1.0);
|
||||
#baseline.setWiggle(30.0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue