diff --git a/direct/src/cluster/ClusterClient.py b/direct/src/cluster/ClusterClient.py index 23092ec03b..578bba022e 100644 --- a/direct/src/cluster/ClusterClient.py +++ b/direct/src/cluster/ClusterClient.py @@ -345,7 +345,7 @@ def createClusterClient(): class DummyClusterClient(DirectObject.DirectObject): """ Dummy class to handle command strings when not in cluster mode """ - notify = DirectNotifyGlobal.directNotify.newCategory("ClusterClient") + notify = DirectNotifyGlobal.directNotify.newCategory("DummyClusterClient") def __init__(self): pass diff --git a/direct/src/cluster/ClusterConfig.py b/direct/src/cluster/ClusterConfig.py index 19ea1a1bf8..03733502b1 100644 --- a/direct/src/cluster/ClusterConfig.py +++ b/direct/src/cluster/ClusterConfig.py @@ -64,7 +64,15 @@ ClientConfigs = { 'film offset' : (-0.000, 0.173), }, ], - 'cavetest' : [{'display name' : 'la', + 'cavetest' : [{'display name' : 'master', + 'display mode' : 'client', + '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' : 'la', 'pos' : Vec3(-0.105, -0.020, 5.000), 'hpr' : Vec3(51.213, 0.000, 0.000), 'focal length' : 0.809, @@ -72,7 +80,6 @@ ClientConfigs = { 'film offset' : (0.000, 0.173), }, {'display name' : 'lb', - 'display mode' : 'client', 'pos' : Vec3(-0.105, -0.020, 5.000), 'hpr' : Vec3(-0.370, 0.000, 0.000), 'focal length' : 0.815, @@ -108,5 +115,49 @@ ClientConfigs = { 'film offset' : (-0.000, 0.173), }, ], + 'cavetest5' : [{'display name' : 'master', + 'display mode' : 'client', + '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' : 'la', + 'pos' : Vec3(-0.105, -0.020, 5.000), + 'hpr' : Vec3(51.213, 0.000, 0.000), + 'focal length' : 0.809, + 'film size' : (1.000, 0.831), + 'film offset' : (0.000, 0.173), + }, + {'display name' : 'lb', + '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' : 'lc', + 'pos' : Vec3(-0.105, -0.020, 5.000), + 'hpr' : Vec3(-51.675, 0.000, 0.000), + 'focal length' : 0.820, + 'film size' : (1.000, 0.830), + 'film offset' : (-0.000, 0.173), + }, + {'display name' : 'ra', + 'pos' : Vec3(0.105, -0.020, 5.000), + 'hpr' : Vec3(51.675, 0.000, 0.000), + 'focal length' : 0.820, + 'film size' : (1.000, 0.830), + 'film offset' : (0.000, 0.173), + }, + {'display name' : 'rb', + '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), + }, + ], }