Changeset 6094

Timestamp:

02/05/07 14:44:16

Author:

robert

Message:

Added Camera's s/getCameraThread() and updated wrappers

Files:

• OpenSceneGraph/trunk/genwrapper.conf (modified) (1 diff)
• OpenSceneGraph/trunk/include/osg/Camera (modified) (2 diffs)
• OpenSceneGraph/trunk/include/osg/DeleteHandler (modified) (1 diff)
• OpenSceneGraph/trunk/src/osg/Camera.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgWrappers/osg/Camera.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgWrappers/osg/DeleteHandler.cpp (modified) (1 diff)

OpenSceneGraph/trunk/genwrapper.conf

@@ -300 +300 @@
-end
-
+
+configure reflector "osg::DeleteHandler"
+        object-type
+end
+
-#############################################################################
-

OpenSceneGraph/trunk/include/osg/Camera

@@ -319 +319 @@
-        
-        
+        /** Create a operation thread for this camera.*/
+        void createCameraThread();
+
+        /** Assign a operation thread to the camera.*/
+        void setCameraThread(OperationsThread* gt);
+
+        /** Get the operation thread assigned to this camera.*/
+        OperationsThread* getCameraThread() { return _cameraThread.get(); }
+
+        /** Get the const operation thread assigned to this camera.*/
+        const OperationsThread* getCameraThread() const { return _cameraThread.get(); }
+
+
+
-        /** Set the GraphicsContext that provides the mechansim for managing the OpenGL graphics context associated with this camera.*/
-        void setGraphicsContext(GraphicsContext* context);
@@ -408 +422 @@
-        BufferAttachmentMap         _bufferAttachmentMap;
-
+        ref_ptr<OperationsThread>           _cameraThread;
+        
-        ref_ptr<GraphicsContext>            _graphicsContext;
+        
-        buffered_object< ref_ptr<Object> >  _renderingCache;
-        

OpenSceneGraph/trunk/include/osg/DeleteHandler

@@ -72 +72 @@
-    protected:
-
+        DeleteHandler(const DeleteHandler&) {}
+        DeleteHandler operator = (const DeleteHandler&) { return *this; }
+
-        int                 _numFramesToRetainObjects;
-        int                 _currentFrameNumber;

OpenSceneGraph/trunk/src/osg/Camera.cpp

@@ -57 +57 @@
-Camera::~Camera()
-{
+    setCameraThread(0);
+    
-    if (_graphicsContext.valid()) _graphicsContext->removeCamera(this);
-}
@@ -302 +304 @@
-}
-
+void Camera::createCameraThread()
+{
+    if (!_cameraThread)
+    {
+        setCameraThread(new OperationsThread);
+    }
+}
+
+void Camera::setCameraThread(OperationsThread* gt)
+{
+    if (_cameraThread==gt) return; 
+
+    if (_cameraThread.valid()) 
+    {
+        // need to kill the thread in some way...
+        _cameraThread->cancel();
+        _cameraThread->setParent(0);
+    }
+
+    _cameraThread = gt;
+    
+    if (_cameraThread.valid()) 
+    {
+        _cameraThread->setParent(this);
+    }
+}
+
+

OpenSceneGraph/trunk/src/osgWrappers/osg/Camera.cpp

@@ -15 +15 @@
-#include <osg/CopyOp>
-#include <osg/GraphicsContext>
+#include <osg/GraphicsThread>
-#include <osg/Image>
-#include <osg/Matrix>
@@ -330 +331 @@
-                  "Get the const BufferAttachmentMap, used to configure frame buffer objects, pbuffers and texture reads. ",
-                  "");
+        I_Method0(void, createCameraThread,
+                  __void__createCameraThread,
+                  "Create a operation thread for this camera. ",
+                  "");
+        I_Method1(void, setCameraThread, IN, osg::OperationsThread *, gt,
+                  __void__setCameraThread__OperationsThread_P1,
+                  "Assign a operation thread to the camera. ",
+                  "");
+        I_Method0(osg::OperationsThread *, getCameraThread,
+                  __OperationsThread_P1__getCameraThread,
+                  "Get the operation thread assigned to this camera. ",
+                  "");
+        I_Method0(const osg::OperationsThread *, getCameraThread,
+                  __C5_OperationsThread_P1__getCameraThread,
+                  "Get the const operation thread assigned to this camera. ",
+                  "");
-        I_Method1(void, setGraphicsContext, IN, osg::GraphicsContext *, context,
-                  __void__setGraphicsContext__GraphicsContext_P1,
@@ -389 +406 @@
-                         __BufferAttachmentMap_R1__getBufferAttachmentMap, 
-                         0);
+        I_SimpleProperty(osg::OperationsThread *, CameraThread, 
+                         __OperationsThread_P1__getCameraThread, 
+                         __void__setCameraThread__OperationsThread_P1);
-        I_SimpleProperty(const osg::Vec4 &, ClearColor, 
-                         __C5_Vec4_R1__getClearColor, 

OpenSceneGraph/trunk/src/osgWrappers/osg/DeleteHandler.cpp

@@ -26 +26 @@
-TYPE_NAME_ALIAS(std::list< osg::DeleteHandler::FrameNumberObjectPair >, osg::DeleteHandler::ObjectsToDeleteList);
-
-VALUE
+OBJECT
-        I_ConstructorWithDefaults1(IN, int, numberOfFramesToRetainObjects, 0,
-                                   ____DeleteHandler__int,