mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 18:31:55 -04:00
Fixed merge conflic
This commit is contained in:
parent
a182469159
commit
13c78ac7f1
@ -33,6 +33,18 @@ ClientConfigs = {
|
||||
'pos' : Vec3(0),
|
||||
'hpr' : Vec3(-30,0,0)}
|
||||
],
|
||||
'carttest' : [{'display name' : 'master',
|
||||
'display mode' : 'client',
|
||||
'pos' : Vec3(0),
|
||||
'hpr' : Vec3(0),
|
||||
},
|
||||
{'display name' : 'left',
|
||||
'pos' : Vec3(-.105,0,0),
|
||||
'hpr' : Vec3(0,0,-90)},
|
||||
{'display name' : 'right',
|
||||
'pos' : Vec3(.105,0,0),
|
||||
'hpr' : Vec3(0,0,-90)}
|
||||
],
|
||||
'parallax-two-server' : [{'display name' : 'master',
|
||||
'display mode' : 'client',
|
||||
'pos' : Vec3(0),
|
||||
@ -167,5 +179,56 @@ ClientConfigs = {
|
||||
'film offset' : (0.000, 0.173),
|
||||
},
|
||||
],
|
||||
'parallaxtest' : [{'display name' : 'master',
|
||||
'display mode' : 'client',
|
||||
'pos': Vec3(0),
|
||||
'hpr': Vec3(0),
|
||||
'focal length' : 0.815,
|
||||
'film size' : (1.000, 0.831),
|
||||
'film offset' : (0.000, 0.173),
|
||||
},
|
||||
{'display name' : 'la',
|
||||
'pos': Vec3(0),
|
||||
'hpr': Vec3(0),
|
||||
'focal length' : 0.809,
|
||||
'film size' : (1.000, 0.831),
|
||||
'film offset' : (0.000, 0.173),
|
||||
},
|
||||
{'display name' : 'lb',
|
||||
'pos': Vec3(0),
|
||||
'hpr': Vec3(0),
|
||||
'focal length' : 0.815,
|
||||
'film size' : (1.000, 0.831),
|
||||
'film offset' : (0.000, 0.173),
|
||||
},
|
||||
{'display name' : 'lc',
|
||||
'pos': Vec3(0),
|
||||
'hpr': Vec3(0),
|
||||
'focal length' : 0.820,
|
||||
'film size' : (1.000, 0.830),
|
||||
'film offset' : (-0.000, 0.173),
|
||||
},
|
||||
{'display name' : 'ra',
|
||||
'pos': Vec3(0),
|
||||
'hpr': Vec3(0),
|
||||
'focal length' : 0.820,
|
||||
'film size' : (1.000, 0.830),
|
||||
'film offset' : (0.000, 0.173),
|
||||
},
|
||||
{'display name' : 'rb',
|
||||
'pos': Vec3(0),
|
||||
'hpr': Vec3(0),
|
||||
'focal length' : 0.815,
|
||||
'film size' : (1.000, 0.831),
|
||||
'film offset' : (0.000, 0.173),
|
||||
},
|
||||
{'display name' : 'rc',
|
||||
'pos': Vec3(0),
|
||||
'hpr': Vec3(0),
|
||||
'focal length' : 0.809,
|
||||
'film size' : (1.000, 0.831),
|
||||
'film offset' : (-0.000, 0.173),
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user