Quellcode durchsuchen

New cave configuration

Mark Mine vor 23 Jahren
Ursprung
Commit
f6faa4d898
2 geänderte Dateien mit 54 neuen und 3 gelöschten Zeilen
  1. 1 1
      direct/src/cluster/ClusterClient.py
  2. 53 2
      direct/src/cluster/ClusterConfig.py

+ 1 - 1
direct/src/cluster/ClusterClient.py

@@ -345,7 +345,7 @@ def createClusterClient():
     
     
 class DummyClusterClient(DirectObject.DirectObject):
 class DummyClusterClient(DirectObject.DirectObject):
     """ Dummy class to handle command strings when not in cluster mode """
     """ Dummy class to handle command strings when not in cluster mode """
-    notify = DirectNotifyGlobal.directNotify.newCategory("ClusterClient")
+    notify = DirectNotifyGlobal.directNotify.newCategory("DummyClusterClient")
     def __init__(self):
     def __init__(self):
         pass
         pass
 
 

+ 53 - 2
direct/src/cluster/ClusterConfig.py

@@ -64,7 +64,15 @@ ClientConfigs = {
                       'film offset' : (-0.000, 0.173),
                       '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),
                           'pos' : Vec3(-0.105, -0.020, 5.000),
                           'hpr' : Vec3(51.213, 0.000, 0.000),
                           'hpr' : Vec3(51.213, 0.000, 0.000),
                           'focal length' : 0.809,
                           'focal length' : 0.809,
@@ -72,7 +80,6 @@ ClientConfigs = {
                           'film offset' : (0.000, 0.173),
                           'film offset' : (0.000, 0.173),
                           },
                           },
                          {'display name' : 'lb',
                          {'display name' : 'lb',
-                          'display mode' : 'client',
                           'pos' : Vec3(-0.105, -0.020, 5.000),
                           'pos' : Vec3(-0.105, -0.020, 5.000),
                           'hpr' : Vec3(-0.370, 0.000, 0.000),
                           'hpr' : Vec3(-0.370, 0.000, 0.000),
                           'focal length' : 0.815,
                           'focal length' : 0.815,
@@ -108,5 +115,49 @@ ClientConfigs = {
                           'film offset' : (-0.000, 0.173),
                           '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),
+                          },
+                         ],
     }
     }