TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-18 12:43:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Mark Mine 2001-10-01 23:24:31 +00:00
parent bfb9453f37
commit bd1c29dc40
10 changed files with 150 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/directdevices/DirectJoybox.py
View File

@ -40,9 +40,7 @@ class DirectJoybox(PandaObject):
# Get buttons and analogs
self.device = device
self.analogs = direct.deviceManager.createAnalogs(self.device)
print 'NUM ANALOGS', len(self.analogs)
self.buttons = direct.deviceManager.createButtons(self.device)
print 'NUM BUTTONS', len(self.buttons)
self.aList = [0,0,0,0,0,0,0,0]
self.bList = [0,0,0,0,0,0,0,0]
# For joybox fly mode

7
direct/src/directtools/DirectCameraControl.py
View File

@ -95,7 +95,8 @@ class DirectCameraControl(PandaObject):
# Allow intersection with unpickable objects
# And then spawn task to determine mouse mode
node, hitPt, hitPtDist = direct.iRay.pickGeom(
fIntersectUnpickable = 1, fIgnoreCamera = 1)
fIntersectUnpickable = 1,
fIgnoreCamera = 1 - base.getControl())
self.computeCOA(node, hitPt, hitPtDist)
# Record reference point
self.coaMarkerRef.iPosHprScale(direct.iRay.collisionRef)
@ -290,7 +291,7 @@ class DirectCameraControl(PandaObject):
# Filter out object's under camera
node = entry.getIntoNode()
nodePath = render.findPathDownTo(node)
if camera not in nodePath.getAncestry():
if direct.camera not in nodePath.getAncestry():
# Compute hit point
# KEH: use current display region ray
# hitPt = direct.iRay.parentToHitPt(entry)
@ -398,7 +399,7 @@ class DirectCameraControl(PandaObject):
# Record undo point
direct.pushUndo([direct.camera])
# Transform camera z axis to render space
mCam2Render = camera.getMat(render)
mCam2Render = direct.camera.getMat(render)
zAxis = Vec3(mCam2Render.xformVec(Z_AXIS))
zAxis.normalize()
# Compute rotation angle needed to upright cam

19
direct/src/directtools/DirectGeometry.py
View File

@ -13,7 +13,8 @@ UNIT_VEC = Vec3(1)
ZERO_POINT = Point3(0)
class LineNodePath(NodePath):
def __init__(self, parent = None, **kw):
def __init__(self, parent = None, name = None,
thickness = 1.0, colorVec = VBase4(1)):
# Initialize the superclass
NodePath.__init__(self)
@ -25,12 +26,14 @@ class LineNodePath(NodePath):
# the resulting node path
self.lineNode = GeomNode()
self.assign(parent.attachNewNode( self.lineNode ))
if name:
self.setName(name)
# Create a lineSegs object to hold the line
ls = self.lineSegs = LineSegs()
# Initialize the lineSegs parameters
ls.setThickness( kw.get('thickness', 1.0) )
ls.setColor( kw.get('colorVec', VBase4(1.0)) )
ls.setThickness(thickness)
ls.setColor(colorVec)
def moveTo( self, *_args ):
apply( self.lineSegs.moveTo, _args )
@ -95,7 +98,15 @@ class LineNodePath(NodePath):
self.drawTo(Point3(ev + Point3(a1x, a1y, z)))
self.moveTo(ev)
self.drawTo(Point3(ev + Point3(a2x, a2y, z)))
def drawLines(self, lineList):
"""
Given a list of lists of points, draw a separate line for each list
"""
for pointList in lineList:
apply(self.moveTo, pointList[0])
for point in pointList[1:]:
apply(self.drawTo, point)
##
## Given a point in space, and a direction, find the point of intersection

7
direct/src/directtools/DirectManipulation.py
View File

@ -87,7 +87,12 @@ class DirectManipulationControl(PandaObject):
# depending on flag.....
if self.mode == 'select':
# Check for object under mouse
node, hitPt, hitPtDist = direct.iRay.pickGeom()
if direct.fControl:
node, hitPt, hitPtDist = direct.iRay.pickGeom(
fIgnoreCamera = 0)
else:
node, hitPt, hitPtDist = direct.iRay.pickGeom(
fIgnoreCamera = 1)
if node:
# Record hit point information
self.hitPt.assign(hitPt)

2
direct/src/directtools/DirectSelection.py
View File

@ -432,7 +432,7 @@ class SelectionRay:
# Don't pick hidden nodes
if node.isHidden():
pass
elif fIgnoreCamera and (camera in nodePath.getAncestry()):
elif fIgnoreCamera and (direct.camera in nodePath.getAncestry()):
# This avoids things parented to a camera. Good idea?
pass
# Can pick unpickable, use the first visible node

71
direct/src/directtools/DirectSession.py
View File

@ -42,6 +42,7 @@ class DirectSession(PandaObject):
self.iRayList = map(lambda x: x.iRay, self.drList)
self.dr = self.drList[0]
self.camera = base.cameraList[0]
self.trueCamera = self.camera
self.iRay = self.dr.iRay
self.cameraControl = DirectCameraControl()
@ -157,7 +158,7 @@ class DirectSession(PandaObject):
'shift', 'shift-up', 'alt', 'alt-up',
'page_up', 'page_down',
'[', '{', ']', '}',
'A', 'b', 'l', 'L', 'p', 'r', 'R', 's',
'A', 'b', 'l', 'L', 'o', 'p', 'r', 'R', 's',
't', 'v', 'w']
self.mouseEvents = ['mouse1', 'mouse1-up',
'mouse2', 'mouse2-up',
@ -224,6 +225,72 @@ class DirectSession(PandaObject):
# But let mouse events pass through
self.enableMouseEvents()
def oobe(self):
# If oobeMode was never set, set it to false and create the
# structures we need to implement OOBE.
try:
self.oobeMode
except:
self.oobeMode = 0
self.oobeCamera = hidden.attachNewNode('oobeCamera')
self.oobeVis = loader.loadModelOnce('models/misc/camera')
if self.oobeVis:
self.oobeVis.arc().setFinal(1)
if self.oobeMode:
# Position a target point to lerp the oobe camera to
direct.cameraControl.camManipRef.iPosHpr(self.trueCamera)
t = self.oobeCamera.lerpPosHpr(
Point3(0), Vec3(0), 2.0,
other = direct.cameraControl.camManipRef,
task = 'manipulateCamera',
blendType = 'easeInOut')
# When move is done, switch to oobe mode
t.uponDeath = self.endOOBE
else:
# Place camera marker at true camera location
self.oobeVis.reparentTo(self.trueCamera)
# Remove any transformation on the models arc
self.oobeVis.clearMat()
# Make oobeCamera be a sibling of wherever camera is now.
cameraParent = NodePath(self.camera)
cameraParent.shorten(1)
# Prepare oobe camera
self.oobeCamera.reparentTo(cameraParent)
self.oobeCamera.iPosHpr(self.trueCamera)
# Put camera under new oobe camera
base.cam.reparentTo(self.oobeCamera)
# Position a target point to lerp the oobe camera to
direct.cameraControl.camManipRef.setPos(
self.trueCamera, Vec3(-2,-20, 5))
direct.cameraControl.camManipRef.lookAt(self.trueCamera)
t = self.oobeCamera.lerpPosHpr(
Point3(0), Vec3(0), 2.0,
other = direct.cameraControl.camManipRef,
task = 'manipulateCamera',
blendType = 'easeInOut')
# When move is done, switch to oobe mode
t.uponDeath = self.beginOOBE
def beginOOBE(self, state):
# Make sure we've reached our final destination
self.oobeCamera.iPosHpr(direct.cameraControl.camManipRef)
direct.camera = self.oobeCamera
self.oobeMode = 1
def endOOBE(self, state):
# Make sure we've reached our final destination
self.oobeCamera.iPosHpr(self.trueCamera)
# Disable OOBE mode.
base.cam.reparentTo(self.trueCamera)
direct.camera = self.trueCamera
# Get rid of ancillary node paths
self.oobeVis.reparentTo(hidden)
self.oobeCamera.reparentTo(hidden)
self.oobeMode = 0
def destroy(self):
self.disable()
@ -297,6 +364,8 @@ class DirectSession(PandaObject):
self.lights.toggle()
elif input == 'L':
self.cameraControl.toggleCOALock()
elif input == 'o':
self.oobe()
elif input == 'p':
if self.selected.last:
self.setActiveParent(self.selected.last)

9
direct/src/extensions/NodePath-extensions.py
View File

@ -53,8 +53,10 @@
"""Toggles visibility of a nodePath"""
if self.isHidden():
self.show()
return 1
else:
self.hide()
return 0
def showSiblings(self):
"""Show all the siblings of a node path"""
@ -110,6 +112,13 @@
else:
return [self]
def getTightBounds(self):
from PandaObject import *
v1 = Point3(0)
v2 = Point3(0)
self.calcTightBounds(v1,v2)
return v1, v2
def pprintPos(self, other = None, sd = 2):
""" Pretty print a node path's pos """
from PandaObject import *

35
direct/src/gui/DirectGuiBase.py
View File

@ -611,7 +611,7 @@ class DirectGuiBase(PandaObject.PandaObject):
del(self._hookDict)
del(self.__componentInfo)
def bind(self, event, command):
def bind(self, event, command, extraArgs = []):
"""
Bind the command (which should expect one arg) to the specified
event (such as ENTER, EXIT, B1PRESS, B1CLICK, etc.)
@ -619,7 +619,7 @@ class DirectGuiBase(PandaObject.PandaObject):
"""
# Need to tack on gui item specific id
gEvent = event + self.guiId
self.accept(gEvent, command)
self.accept(gEvent, command, extraArgs = extraArgs)
# Keep track of all events you're accepting
self._hookDict[gEvent] = command
@ -679,13 +679,17 @@ class DirectGuiWidget(DirectGuiBase, NodePath):
('borderWidth', (.1,.1), self.setBorderWidth),
('frameSize', None, self.setFrameSize),
('frameColor', (.8,.8,.8,1), self.setFrameColor),
('pad', (0,0), self.resetFrameSize),
('pad', (0,0), self.resetFrameSize),
# Override button id (beware! your name may not be unique!)
('guiId', None, INITOPT),
# Initial pos/scale of the widget
('pos', None, INITOPT),
('scale', None, INITOPT),
('color', None, INITOPT),
# Do events pass through this widget?
('suppressMouse', 1, INITOPT),
('suppressKeys', 0, INITOPT),
('enableEdit', 1, INITOPT),
)
# Merge keyword options with default options
self.defineoptions(kw, optiondefs)
@ -740,9 +744,18 @@ class DirectGuiWidget(DirectGuiBase, NodePath):
self.ur = Point3(0)
# Is drag and drop enabled?
if self.guiEdit:
if self['enableEdit'] and self.guiEdit:
self.enableEdit()
# Set up event handling
suppressFlags = 0
if self['suppressMouse']:
suppressFlags |= MouseWatcherRegion.SFMouseButton
suppressFlags |= MouseWatcherRegion.SFMousePosition
if self['suppressKeys']:
suppressFlags |= MouseWatcherRegion.SFOtherButton
self.guiItem.setSuppressFlags(suppressFlags)
# Bind destroy hook
self.bind(DESTROY, self.destroy)
@ -759,17 +772,19 @@ class DirectGuiWidget(DirectGuiBase, NodePath):
self.bind(B2PRESS, self.editStart)
self.bind(B2RELEASE, self.editStop)
self.bind(PRINT, self.printConfig)
mb = base.mouseWatcherNode.getModifierButtons()
mb.addButton(KeyboardButton.control())
base.mouseWatcherNode.setModifierButtons(mb)
# Can we move this to showbase
# Certainly we don't need to do this for every button!
#mb = base.mouseWatcherNode.getModifierButtons()
#mb.addButton(KeyboardButton.control())
#base.mouseWatcherNode.setModifierButtons(mb)
def disableEdit(self):
self.unbind(B2PRESS)
self.unbind(B2RELEASE)
self.unbind(PRINT)
mb = base.mouseWatcherNode.getModifierButtons()
mb.removeButton(KeyboardButton.control())
base.mouseWatcherNode.setModifierButtons(mb)
#mb = base.mouseWatcherNode.getModifierButtons()
#mb.removeButton(KeyboardButton.control())
#base.mouseWatcherNode.setModifierButtons(mb)
def editStart(self, event):
taskMgr.removeTasksNamed('guiEditTask')

5
direct/src/gui/OnscreenGeom.py
View File

@ -40,6 +40,7 @@ class OnscreenGeom(PandaObject, NodePath):
"""
# We ARE a node path. Initially, we're an empty node path.
NodePath.__init__(self)
self.parent = parent
# Assign geometry
self.sort = sort
if isinstance(geom, NodePath):
@ -81,10 +82,10 @@ class OnscreenGeom(PandaObject, NodePath):
self.removeNode()
# Assign geometry
if isinstance(geom, NodePath):
self.assign(geom.copyTo(parent))
self.assign(geom.copyTo(self.parent))
elif type(geom) == type(''):
self.assign(loader.loadModelCopy(geom))
self.reparentTo(parent)
self.reparentTo(self.parent)
def getGeom(self):
return self

18
direct/src/showbase/ShowBase.py
View File

@ -152,6 +152,11 @@ class ShowBase:
self.mak = self.dataRoot.attachNewNode(MouseAndKeyboard(self.win, 0, 'mak'))
self.mouseWatcherNode = MouseWatcher('mouseWatcher')
self.mouseWatcher = self.mak.attachNewNode(self.mouseWatcherNode)
mb = self.mouseWatcherNode.getModifierButtons()
mb.addButton(KeyboardButton.shift())
mb.addButton(KeyboardButton.control())
mb.addButton(KeyboardButton.alt())
self.mouseWatcherNode.setModifierButtons(mb)
# We also create a DataValve object above the trackball/drive
# interface, which will allow us to switch some of the mouse
@ -240,7 +245,18 @@ class ShowBase:
if self.oldexitfunc:
self.oldexitfunc()
def getAlt(self):
return base.mouseWatcherNode.getModifierButtons().isDown(
KeyboardButton.alt())
def getShift(self):
return base.mouseWatcherNode.getModifierButtons().isDown(
KeyboardButton.shift())
def getControl(self):
return base.mouseWatcherNode.getModifierButtons().isDown(
KeyboardButton.control())
def addAngularIntegrator(self):
"""addAngularIntegrator(self)"""