PT(Camera)

This commit is contained in:
David Rose 2003-01-10 21:07:13 +00:00
parent b66c44c4e4
commit b3d91a4ad4
2 changed files with 9 additions and 6 deletions

View File

@ -255,10 +255,9 @@ get_pipe() const {
// Function: DisplayRegion::set_camera // Function: DisplayRegion::set_camera
// Access: Published // Access: Published
// Description: Sets the camera that is associated with this // Description: Sets the camera that is associated with this
// DisplayRegion. There is a one-to-one association // DisplayRegion. There is a one-to-many association
// between cameras and DisplayRegions; if this camera // between cameras and DisplayRegions; one camera may be
// was already associated with a different // shared by multiple DisplayRegions.
// DisplayRegion, that association is removed.
// //
// The camera is actually set via a NodePath, which // The camera is actually set via a NodePath, which
// clarifies which instance of the camera (if there // clarifies which instance of the camera (if there
@ -291,7 +290,8 @@ set_camera(const NodePath &camera) {
// Function: DisplayRegion::get_camera // Function: DisplayRegion::get_camera
// Access: Published // Access: Published
// Description: Returns the camera associated with this // Description: Returns the camera associated with this
// DisplayRegion, or NULL if no camera is associated. // DisplayRegion, or an empty NodePath if no camera is
// associated.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
const NodePath &DisplayRegion:: const NodePath &DisplayRegion::
get_camera() const { get_camera() const {

View File

@ -100,7 +100,10 @@ private:
GraphicsLayer *_layer; GraphicsLayer *_layer;
NodePath _camera; NodePath _camera;
Camera *_camera_node;
// This needs to be a PT(Camera) so we prevent the Camera node from
// destructing while we hold its pointer.
PT(Camera) _camera_node;
bool _active; bool _active;