TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

adding frustum visualization and fov adjustment capability

Browse Source
This commit is contained in:
Josh Wilson 2009-08-01 01:03:33 +00:00
parent 9350eceee3
commit 30565b916a
2 changed files with 117 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
direct/src/distributed/DistributedCamera.py
View File

@ -4,35 +4,67 @@ from direct.interval.IntervalGlobal import *
from direct.distributed.DistributedObject import DistributedObject from direct.distributed.DistributedObject import DistributedObject
class Fixture(NodePath, FSM): class Fixture(NodePath, FSM):
def __init__(self, id, parent, pos, hpr): def __init__(self, id, parent, pos, hpr, fov):
NodePath.__init__(self, 'cam-%s' % id) NodePath.__init__(self, 'cam-%s' % id)
FSM.__init__(self, '%s-fsm' % self.getName()) FSM.__init__(self, '%s-fsm' % self.getName())
self.id = id self.id = id
self.lens = PerspectiveLens()
self.lens.setFov(base.camLens.getFov())
model = loader.loadModel('models/misc/camera', okMissing = True) model = loader.loadModel('models/misc/camera', okMissing = True)
model.reparentTo(self) model.reparentTo(self)
self.reparentTo(parent) self.reparentTo(parent)
self.setPos(*pos) self.setPos(pos)
self.setHpr(*hpr) self.setHpr(hpr)
self.setFov(fov)
self.setLightOff(100) self.setLightOff(100)
self.hide() self.hide()
self.scaleIval = None self.scaleIval = None
self.recordingInProgress = False self.recordingInProgress = False
self.dirty = False
pass pass
def __str__(self): def __str__(self):
return 'Fixture(%d, \'%s\', %s, %s)' % (self.id, self.state, self.getPos(), self.getHpr()) return 'Fixture(%d, \'%s\', %s, %s, %s)' % (self.id, self.state, self.getPos(), self.getHpr(), self.getFov())
def pack(self): def pack(self):
return 'Camera(%s, %s)' % (self.getPos(), self.getHpr()) return 'Camera(%s, %s, %s)' % (self.getPos(), self.getHpr(), self.getFov())
def setId(self, id): def setId(self, id):
self.id = id self.id = id
pass pass
def setFov(self, fov):
"""
fov should be a VBase2. Use VBase2(0) to indicate default.
"""
if fov != VBase2(0):
self.lens.setFov(fov)
pass
self.setupFrustum()
pass
def adjustFov(self, x, y):
fov = self.lens.getFov()
self.lens.setFov(fov[0]+x, fov[1]+y)
self.dirty = True
pass
def getFov(self):
return self.lens.getFov()
def setupFrustum(self):
oldFrustum = self.find('frustum')
if oldFrustum:
oldFrustum.detachNode()
pass
self.attachNewNode(GeomNode('frustum')).node().addGeom(self.lens.makeGeometry())
pass
def setRecordingInProgress(self, inProgress): def setRecordingInProgress(self, inProgress):
self.recordingInProgress = inProgress self.recordingInProgress = inProgress
if self.recordingInProgress and \ if self.recordingInProgress and \
@ -86,8 +118,10 @@ class Fixture(NodePath, FSM):
self.show() self.show()
if self.id == base.config.GetInt('camera-id', -1): if self.id == base.config.GetInt('camera-id', -1):
self.setColorScale(3,0,0,1) self.setColorScale(3,0,0,1)
self.getScaleIval().loop()
else: else:
self.setColorScale(3,3,0,1) self.setColorScale(3,3,0,1)
self.getScaleIval().finish()
pass pass
pass pass
@ -120,16 +154,53 @@ class Fixture(NodePath, FSM):
pass pass
pass pass
def enterUsing(self): def enterUsing(self, args = []):
localAvatar.b_setGameState('Camera') localAvatar.b_setGameState('Camera')
camera.setPosHpr(0,0,0,0,0,0) camera.setPosHpr(0,0,0,0,0,0)
camera.reparentTo(self) camera.reparentTo(self)
self.hide() self.hide()
base.cam.node().setLens(self.lens)
if args and args[0]:
self.accept('arrow_left', self.adjustFov, [-0.5,0])
self.accept('arrow_left-repeat', self.adjustFov, [-2,0])
self.accept('arrow_right', self.adjustFov, [0.5,0])
self.accept('arrow_right-repeat', self.adjustFov, [2,0])
self.accept('arrow_down', self.adjustFov, [0,-0.5])
self.accept('arrow_down-repeat', self.adjustFov, [0,-2])
self.accept('arrow_up', self.adjustFov, [0,0.5])
self.accept('arrow_up-repeat', self.adjustFov, [0,2])
# Could be toggled on/off on a fixture by fixture basis
# if added to the dc definition of the Fixture struct and
# saved out to the Camera file.
lodNodes = render.findAllMatches('**/+LODNode')
for i in xrange(0,lodNodes.getNumPaths()):
lodNodes[i].node().forceSwitch(lodNodes[i].node().getHighestSwitch())
pass
pass pass
def exitUsing(self): def exitUsing(self):
self.ignore('arrow_left')
self.ignore('arrow_left-repeat')
self.ignore('arrow_right')
self.ignore('arrow_right-repeat')
self.ignore('arrow_down')
self.ignore('arrow_down-repeat')
self.ignore('arrow_up')
self.ignore('arrow_up-repeat')
base.cam.node().setLens(base.camLens)
localAvatar.b_setGameState('LandRoam') localAvatar.b_setGameState('LandRoam')
self.show() self.show()
if self.dirty:
messenger.send('refresh-fixture', [self.id, self.pack()])
self.dirty = False
pass
pass pass
@ -191,7 +262,6 @@ class DistributedCamera(DistributedObject):
return self.parent return self.parent
def setFixtures(self, fixtures): def setFixtures(self, fixtures):
for x in range(len(fixtures), len(self.fixtures)): for x in range(len(fixtures), len(self.fixtures)):
fixture = self.fixtures.pop(x) fixture = self.fixtures.pop(x)
fixture.cleanup() fixture.cleanup()
@ -200,18 +270,21 @@ class DistributedCamera(DistributedObject):
recordingInProgress = False recordingInProgress = False
for x,fixture in enumerate(fixtures): for x,fixture in enumerate(fixtures):
fix = self.fixtures.get(x) pos = Point3(*(fixture[:3]))
if not fix: hpr = Point3(*(fixture[3:6]))
fix = Fixture(x, self.parent, fixture[:3], fixture[3:6]) fov = VBase2(*(fixture[6:8]))
self.fixtures[x] = fix state = fixture[8]
if x not in self.fixtures:
self.fixtures[x] = Fixture(x, self.parent, Point3(0), hpr = Point3(0), fov = VBase2(0))
pass pass
posHpr = fixture[:6] fix = self.fixtures.get(x)
state = fixture[6]
fix.setId(x) fix.setId(x)
fix.setPosHpr(*posHpr) fix.setPosHpr(pos,hpr)
fix.setState(state) fix.setState(state)
recordingInProgress = recordingInProgress or state == 'Recording' fix.setFov(fov)
recordingInProgress |= state == 'Recording'
pass pass
messenger.send('recordingInProgress', [recordingInProgress]) messenger.send('recordingInProgress', [recordingInProgress])
@ -219,7 +292,7 @@ class DistributedCamera(DistributedObject):
def testFixture(self, index): def testFixture(self, index):
fixture = self.fixtures.get(index) fixture = self.fixtures.get(index)
if fixture: if fixture:
fixture.request('Using') fixture.request('Using', [True])
self.accept('escape', self.stopTesting, [index]) self.accept('escape', self.stopTesting, [index])
pass pass
pass pass

27
direct/src/distributed/DistributedCameraOV.py
View File

@ -6,10 +6,12 @@ class DistributedCameraOV(DistributedObjectOV):
DistributedObjectOV.__init__(self, cr) DistributedObjectOV.__init__(self, cr)
self.parent = 0 self.parent = 0
self.fixtures = [] self.fixtures = []
self.accept('refresh-fixture', self.refreshFixture)
pass pass
def delete(self): def delete(self):
self.ignore('escape') self.ignore('escape')
self.ignore('refresh-fixture')
DistributedObjectOV.delete(self) DistributedObjectOV.delete(self)
def getObject(self): def getObject(self):
@ -29,17 +31,36 @@ class DistributedCameraOV(DistributedObjectOV):
f.close() f.close()
pass pass
def unpackFixture(self, data):
data = data.strip().replace('Camera','')
pos,hpr,fov = eval(data)
return pos,hpr,fov
def loadFromFile(self, name): def loadFromFile(self, name):
self.b_setFixtures([]) self.b_setFixtures([])
f = file('cameras-%s.txt' % name, 'r'); f = file('cameras-%s.txt' % name, 'r');
for line in f.readlines(): for line in f.readlines():
line = line.strip().replace('Camera(','').replace('))','') pos,hpr,fov = self.unpackFixture(line)
line = line.replace('Point3(','').replace('), VBase3(',', ') self.addFixture([pos[0],pos[1],pos[2],
eval('self.addFixture([%s, \'Standby\'])' % line) hpr[0],hpr[1],hpr[2],
fov[0],fov[1],
'Standby'])
pass pass
f.close() f.close()
pass pass
def refreshFixture(self, id, data):
pos,hpr,fov = self.unpackFixture(data)
fixture = self.fixtures[id]
fixture = [pos[0],pos[1],pos[2],
hpr[0],hpr[1],hpr[2],
fov[0],fov[1],
fixture[8]]
# distributed only
self.d_setFixtures(self.fixtures)
pass
def b_setFixtures(self, fixtures): def b_setFixtures(self, fixtures):
self.getObject().setFixtures(fixtures) self.getObject().setFixtures(fixtures)
self.setFixtures(fixtures) self.setFixtures(fixtures)