FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added ImagePager first cut, and updated wrappers

Browse Source
This commit is contained in:
Robert Osfield 2008-07-21 10:10:01 +00:00
parent c2432b22da
commit 09e7bcdf4e
6 changed files with 459 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
include/osgDB/ImagePager Normal file
View File

@ -0,0 +1,94 @@
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
*
* This library is open source and may be redistributed and/or modified under
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
* (at your option) any later version. The full license is in LICENSE file
* included with this distribution, and on the openscenegraph.org website.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* OpenSceneGraph Public License for more details.
*/
#ifndef OSGDB_IMAGEPAGER
#define OSGDB_IMAGEPAGER 1
#include <osg/Image>
#include <OpenThreads/Thread>
#include <OpenThreads/Mutex>
#include <osgDB/ReaderWriter>
namespace osgDB
{
class OSGDB_EXPORT ImagePager : public osg::Referenced
{
public:
ImagePager();
struct ImageRequest : public osg::Referenced
{
ImageRequest():
osg::Referenced(true) {}
std::string _fileName;
osg::ref_ptr<ReaderWriter::Options> _loadOptions;
osg::ref_ptr<osg::Object> _objectToAttachTo;
osg::ref_ptr<osg::Image> _loadedImage;
};
class OSGDB_EXPORT ImageThread : public osg::Referenced, public OpenThreads::Thread
{
public:
enum Mode
{
HANDLE_ALL_REQUESTS,
HANDLE_NON_HTTP,
HANDLE_ONLY_HTTP
};
ImageThread(ImagePager* pager, Mode mode, const std::string& name);
ImageThread(const ImageThread& dt, ImagePager* pager);
void setDone(bool done) { _done = done; }
bool getDone() const { return _done; }
virtual int cancel();
virtual void run();
protected:
virtual ~ImageThread();
bool _done;
ImagePager* _pager;
Mode _mode;
std::string _name;
};
/** Return true if there are pending updates to the scene graph that require a call to updateSceneGraph(double). */
bool requiresUpdateSceneGraph() const;
/** Merge the changes to the scene graph. */
virtual void updateSceneGraph(double currentFrameTime);
public:
virtual ~ImagePager();
};
}
#endif

66
src/osgDB/ImagePager.cpp Normal file
View File

@ -0,0 +1,66 @@
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
*
* This library is open source and may be redistributed and/or modified under
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
* (at your option) any later version. The full license is in LICENSE file
* included with this distribution, and on the openscenegraph.org website.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* OpenSceneGraph Public License for more details.
*/
#include <osgDB/ImagePager>
#include <osg/Notify>
using namespace osgDB;
//////////////////////////////////////////////////////////////////////////////////////
//
// ImageThread
//
ImagePager::ImageThread::ImageThread(ImagePager* pager, Mode mode, const std::string& name)
{
}
ImagePager::ImageThread::ImageThread(const ImageThread& dt, ImagePager* pager)
{
}
ImagePager::ImageThread::~ImageThread()
{
}
int ImagePager::ImageThread::cancel()
{
}
void ImagePager::ImageThread::run()
{
}
//////////////////////////////////////////////////////////////////////////////////////
//
// ImagePager
//
ImagePager::ImagePager()
{
}
ImagePager::~ImagePager()
{
}
bool ImagePager::requiresUpdateSceneGraph() const
{
//osg::notify(osg::NOTICE)<<"ImagePager::requiresUpdateSceneGraph()"<<std::endl;
return false;
}
void ImagePager::updateSceneGraph(double currentFrameTime)
{
//osg::notify(osg::NOTICE)<<"ImagePager::updateSceneGraph(double currentFrameTime)"<<std::endl;
}

5
src/osgWrappers/osg/ImageStream.cpp
View File

@ -11,6 +11,7 @@
#include <osgIntrospection/Attributes>
#include <osg/CopyOp>
#include <osg/FrameStamp>
#include <osg/Image>
#include <osg/ImageStream>
#include <osg/Object>
@ -147,9 +148,9 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream)
__float__getVolume,
"",
"");
I_Method0(void, update,
I_Method1(void, update, IN, osg::FrameStamp *, fs,
Properties::VIRTUAL,
__void__update,
__void__update__osg_FrameStamp_P1,
"",
"");
I_ProtectedMethod0(void, applyLoopingMode,

19
src/osgWrappers/osgViewer/Scene.cpp
View File

@ -12,6 +12,7 @@
#include <osg/Node>
#include <osgDB/DatabasePager>
#include <osgDB/ImagePager>
#include <osgViewer/Scene>
// Must undefine IN and OUT macros defined in Windows headers
@ -55,6 +56,21 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Scene)
__C5_osgDB_DatabasePager_P1__getDatabasePager,
"",
"");
I_Method1(void, setImagePager, IN, osgDB::ImagePager *, ip,
Properties::NON_VIRTUAL,
__void__setImagePager__osgDB_ImagePager_P1,
"",
"");
I_Method0(osgDB::ImagePager *, getImagePager,
Properties::NON_VIRTUAL,
__osgDB_ImagePager_P1__getImagePager,
"",
"");
I_Method0(const osgDB::ImagePager *, getImagePager,
Properties::NON_VIRTUAL,
__C5_osgDB_ImagePager_P1__getImagePager,
"",
"");
I_StaticMethod1(osgViewer::Scene *, getScene, IN, osg::Node *, node,
__Scene_P1__getScene__osg_Node_P1_S,
"Get the Scene object that has the specified node assigned to it. ",
@ -65,6 +81,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Scene)
I_SimpleProperty(osgDB::DatabasePager *, DatabasePager,
__osgDB_DatabasePager_P1__getDatabasePager,
__void__setDatabasePager__osgDB_DatabasePager_P1);
I_SimpleProperty(osgDB::ImagePager *, ImagePager,
__osgDB_ImagePager_P1__getImagePager,
__void__setImagePager__osgDB_ImagePager_P1);
I_SimpleProperty(osg::Node *, SceneData,
__osg_Node_P1__getSceneData,
__void__setSceneData__osg_Node_P1);

19
src/osgWrappers/osgViewer/View.cpp
View File

@ -20,6 +20,7 @@
#include <osg/Timer>
#include <osg/View>
#include <osgDB/DatabasePager>
#include <osgDB/ImagePager>
#include <osgGA/EventQueue>
#include <osgGA/GUIEventHandler>
#include <osgGA/MatrixManipulator>
@ -145,6 +146,21 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View)
__C5_osgDB_DatabasePager_P1__getDatabasePager,
"Get the const View's database pager. ",
"");
I_Method1(void, setImagePager, IN, osgDB::ImagePager *, ip,
Properties::NON_VIRTUAL,
__void__setImagePager__osgDB_ImagePager_P1,
"Set the View's image pager. ",
"");
I_Method0(osgDB::ImagePager *, getImagePager,
Properties::NON_VIRTUAL,
__osgDB_ImagePager_P1__getImagePager,
"Get the View's image pager. ",
"");
I_Method0(const osgDB::ImagePager *, getImagePager,
Properties::NON_VIRTUAL,
__C5_osgDB_ImagePager_P1__getImagePager,
"Get the const View's image pager. ",
"");
I_Method1(void, setEventQueue, IN, osgGA::EventQueue *, eventQueue,
Properties::NON_VIRTUAL,
__void__setEventQueue__osgGA_EventQueue_P1,
@ -345,6 +361,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View)
I_SimpleProperty(float, FusionDistanceValue,
__float__getFusionDistanceValue,
0);
I_SimpleProperty(osgDB::ImagePager *, ImagePager,
__osgDB_ImagePager_P1__getImagePager,
__void__setImagePager__osgDB_ImagePager_P1);
I_SimpleProperty(osgViewer::Scene *, Scene,
__Scene_P1__getScene,
0);

258
src/osgWrappers/osgViewer/ViewerEventHandlers.cpp
View File

@ -11,7 +11,12 @@
#include <osgIntrospection/Attributes>
#include <osg/ApplicationUsage>
#include <osg/BufferObject>
#include <osg/Camera>
#include <osg/GraphicsContext>
#include <osg/Image>
#include <osg/RenderInfo>
#include <osg/Timer>
#include <osgGA/GUIActionAdapter>
#include <osgGA/GUIEventAdapter>
#include <osgViewer/ViewerEventHandlers>
@ -24,6 +29,14 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::CaptureOperation)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_BaseType(osg::Referenced);
I_Constructor0(____CaptureOperation,
"",
"");
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgViewer::HelpHandler)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_BaseType(osgGA::GUIEventHandler);
@ -203,6 +216,56 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::RecordCameraPathHandler)
__void__setKeyEventToggleRecord__int);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgViewer::ScreenCaptureHandler)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_BaseType(osgGA::GUIEventHandler);
I_Constructor0(____ScreenCaptureHandler,
"",
"");
I_Method1(void, setKeyEventTakeScreenShot, IN, int, key,
Properties::NON_VIRTUAL,
__void__setKeyEventTakeScreenShot__int,
"",
"");
I_Method0(int, getKeyEventTakeScreenShot,
Properties::NON_VIRTUAL,
__int__getKeyEventTakeScreenShot,
"",
"");
I_Method1(void, setCaptureOperation, IN, osgViewer::CaptureOperation *, operation,
Properties::NON_VIRTUAL,
__void__setCaptureOperation__CaptureOperation_P1,
"",
"");
I_Method0(osgViewer::CaptureOperation *, getCaptureOperation,
Properties::NON_VIRTUAL,
__CaptureOperation_P1__getCaptureOperation,
"",
"");
I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa,
Properties::VIRTUAL,
__bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1,
"Deprecated, Handle events, return true if handled, false otherwise. ",
"");
I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage,
Properties::VIRTUAL,
__void__getUsage__osg_ApplicationUsage_R1,
"Get the keyboard and mouse usage of this manipulator. ",
"");
I_ProtectedMethod1(void, addCallbackToViewer, IN, osgViewer::ViewerBase &, viewer,
Properties::NON_VIRTUAL,
Properties::NON_CONST,
__void__addCallbackToViewer__osgViewer_ViewerBase_R1,
"",
"");
I_SimpleProperty(osgViewer::CaptureOperation *, CaptureOperation,
__CaptureOperation_P1__getCaptureOperation,
__void__setCaptureOperation__CaptureOperation_P1);
I_SimpleProperty(int, KeyEventTakeScreenShot,
__int__getKeyEventTakeScreenShot,
__void__setKeyEventTakeScreenShot__int);
END_REFLECTOR
BEGIN_ENUM_REFLECTOR(osgViewer::StatsHandler::StatsType)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_EnumLabel(osgViewer::StatsHandler::NO_STATS);
@ -393,6 +456,129 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::ThreadingHandler)
__void__setKeyEventChangeThreadingModel__int);
END_REFLECTOR
TYPE_NAME_ALIAS(std::map< osg::GraphicsContext * COMMA osg::ref_ptr< osgViewer::WindowCaptureCallback::ContextData > >, osgViewer::WindowCaptureCallback::ContextDataMap)
BEGIN_ENUM_REFLECTOR(osgViewer::WindowCaptureCallback::Mode)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_EnumLabel(osgViewer::WindowCaptureCallback::READ_PIXELS);
I_EnumLabel(osgViewer::WindowCaptureCallback::SINGLE_PBO);
I_EnumLabel(osgViewer::WindowCaptureCallback::DOUBLE_PBO);
I_EnumLabel(osgViewer::WindowCaptureCallback::TRIPLE_PBO);
END_REFLECTOR
BEGIN_ENUM_REFLECTOR(osgViewer::WindowCaptureCallback::FramePosition)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_EnumLabel(osgViewer::WindowCaptureCallback::START_FRAME);
I_EnumLabel(osgViewer::WindowCaptureCallback::END_FRAME);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgViewer::WindowCaptureCallback)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_BaseType(osg::Camera::DrawCallback);
I_Constructor3(IN, osgViewer::WindowCaptureCallback::Mode, mode, IN, osgViewer::WindowCaptureCallback::FramePosition, position, IN, GLenum, readBuffer,
____WindowCaptureCallback__Mode__FramePosition__GLenum,
"",
"");
I_Method0(osgViewer::WindowCaptureCallback::FramePosition, getFramePosition,
Properties::NON_VIRTUAL,
__FramePosition__getFramePosition,
"",
"");
I_Method1(osgViewer::WindowCaptureCallback::ContextData *, createContextData, IN, osg::GraphicsContext *, gc,
Properties::NON_VIRTUAL,
__ContextData_P1__createContextData__osg_GraphicsContext_P1,
"",
"");
I_Method1(osgViewer::WindowCaptureCallback::ContextData *, getContextData, IN, osg::GraphicsContext *, gc,
Properties::NON_VIRTUAL,
__ContextData_P1__getContextData__osg_GraphicsContext_P1,
"",
"");
I_Method1(void, setCaptureOperation, IN, osgViewer::CaptureOperation *, operation,
Properties::NON_VIRTUAL,
__void__setCaptureOperation__CaptureOperation_P1,
"",
"");
I_Method0(osgViewer::CaptureOperation *, getCaptureOperation,
Properties::NON_VIRTUAL,
__CaptureOperation_P1__getCaptureOperation,
"",
"");
I_SimpleProperty(osgViewer::CaptureOperation *, CaptureOperation,
__CaptureOperation_P1__getCaptureOperation,
__void__setCaptureOperation__CaptureOperation_P1);
I_SimpleProperty(osgViewer::WindowCaptureCallback::FramePosition, FramePosition,
__FramePosition__getFramePosition,
0);
I_PublicMemberProperty(osgViewer::WindowCaptureCallback::Mode, _mode);
I_PublicMemberProperty(osgViewer::WindowCaptureCallback::FramePosition, _position);
I_PublicMemberProperty(GLenum, _readBuffer);
I_PublicMemberProperty(OpenThreads::Mutex, _mutex);
I_PublicMemberProperty(osgViewer::WindowCaptureCallback::ContextDataMap, _contextDataMap);
END_REFLECTOR
TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Image > >, osgViewer::WindowCaptureCallback::ContextData::ImageBuffer)
TYPE_NAME_ALIAS(std::vector< GLuint >, osgViewer::WindowCaptureCallback::ContextData::PBOBuffer)
BEGIN_OBJECT_REFLECTOR(osgViewer::WindowCaptureCallback::ContextData)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_BaseType(osg::Referenced);
I_Constructor3(IN, osg::GraphicsContext *, gc, IN, osgViewer::WindowCaptureCallback::Mode, mode, IN, GLenum, readBuffer,
____ContextData__osg_GraphicsContext_P1__Mode__GLenum,
"",
"");
I_Method3(void, getSize, IN, osg::GraphicsContext *, gc, IN, int &, width, IN, int &, height,
Properties::NON_VIRTUAL,
__void__getSize__osg_GraphicsContext_P1__int_R1__int_R1,
"",
"");
I_Method4(void, updateTimings, IN, osg::Timer_t, tick_start, IN, osg::Timer_t, tick_afterReadPixels, IN, osg::Timer_t, tick_afterMemCpy, IN, unsigned int, dataSize,
Properties::NON_VIRTUAL,
__void__updateTimings__osg_Timer_t__osg_Timer_t__osg_Timer_t__unsigned_int,
"",
"");
I_Method0(void, read,
Properties::NON_VIRTUAL,
__void__read,
"",
"");
I_Method0(void, readPixels,
Properties::NON_VIRTUAL,
__void__readPixels,
"",
"");
I_Method1(void, singlePBO, IN, osg::BufferObject::Extensions *, ext,
Properties::NON_VIRTUAL,
__void__singlePBO__osg_BufferObject_Extensions_P1,
"",
"");
I_Method1(void, multiPBO, IN, osg::BufferObject::Extensions *, ext,
Properties::NON_VIRTUAL,
__void__multiPBO__osg_BufferObject_Extensions_P1,
"",
"");
I_PublicMemberProperty(osg::GraphicsContext *, _gc);
I_PublicMemberProperty(unsigned int, _index);
I_PublicMemberProperty(osgViewer::WindowCaptureCallback::Mode, _mode);
I_PublicMemberProperty(GLenum, _readBuffer);
I_PublicMemberProperty(GLenum, _pixelFormat);
I_PublicMemberProperty(GLenum, _type);
I_PublicMemberProperty(int, _width);
I_PublicMemberProperty(int, _height);
I_PublicMemberProperty(unsigned int, _currentImageIndex);
I_PublicMemberProperty(osgViewer::WindowCaptureCallback::ContextData::ImageBuffer, _imageBuffer);
I_PublicMemberProperty(unsigned int, _currentPboIndex);
I_PublicMemberProperty(osgViewer::WindowCaptureCallback::ContextData::PBOBuffer, _pboBuffer);
I_PublicMemberProperty(unsigned int, _reportTimingFrequency);
I_PublicMemberProperty(unsigned int, _numTimeValuesRecorded);
I_PublicMemberProperty(double, _timeForReadPixels);
I_PublicMemberProperty(double, _timeForFullCopy);
I_PublicMemberProperty(double, _timeForMemCpy);
I_PublicMemberProperty(osg::Timer_t, _previousFrameTick);
I_PublicMemberProperty(osg::ref_ptr< osgViewer::CaptureOperation >, _captureOperation);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgViewer::WindowSizeHandler)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_BaseType(osgGA::GUIEventHandler);
@ -494,3 +680,75 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::WindowSizeHandler)
__void__setToggleFullscreen__bool);
END_REFLECTOR
BEGIN_ENUM_REFLECTOR(osgViewer::WriteToFileCaptureOperation::SavePolicy)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_EnumLabel(osgViewer::WriteToFileCaptureOperation::OVERWRITE);
I_EnumLabel(osgViewer::WriteToFileCaptureOperation::SEQUENTIAL_NUMBER);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgViewer::WriteToFileCaptureOperation)
I_DeclaringFile("osgViewer/ViewerEventHandlers");
I_BaseType(osgViewer::CaptureOperation);
I_ConstructorWithDefaults3(IN, const std::string &, filename, , IN, const std::string &, extension, , IN, osgViewer::WriteToFileCaptureOperation::SavePolicy, savePolicy, osgViewer::WriteToFileCaptureOperation::OVERWRITE,
____WriteToFileCaptureOperation__C5_std_string_R1__C5_std_string_R1__SavePolicy,
"",
"");
I_Method1(void, setSavePolicy, IN, osgViewer::WriteToFileCaptureOperation::SavePolicy, savePolicy,
Properties::NON_VIRTUAL,
__void__setSavePolicy__SavePolicy,
"",
"");
I_Method0(osgViewer::WriteToFileCaptureOperation::SavePolicy, getSavePolicy,
Properties::NON_VIRTUAL,
__SavePolicy__getSavePolicy,
"",
"");
I_SimpleProperty(osgViewer::WriteToFileCaptureOperation::SavePolicy, SavePolicy,
__SavePolicy__getSavePolicy,
__void__setSavePolicy__SavePolicy);
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgViewer::WindowCaptureCallback::ContextData >)
I_DeclaringFile("osg/ref_ptr");
I_Constructor0(____ref_ptr,
"",
"");
I_Constructor1(IN, osgViewer::WindowCaptureCallback::ContextData *, ptr,
Properties::NON_EXPLICIT,
____ref_ptr__T_P1,
"",
"");
I_Constructor1(IN, const osg::ref_ptr< osgViewer::WindowCaptureCallback::ContextData > &, rp,
Properties::NON_EXPLICIT,
____ref_ptr__C5_ref_ptr_R1,
"",
"");
I_Method0(osgViewer::WindowCaptureCallback::ContextData *, get,
Properties::NON_VIRTUAL,
__T_P1__get,
"",
"");
I_Method0(bool, valid,
Properties::NON_VIRTUAL,
__bool__valid,
"",
"");
I_Method0(osgViewer::WindowCaptureCallback::ContextData *, release,
Properties::NON_VIRTUAL,
__T_P1__release,
"",
"");
I_Method1(void, swap, IN, osg::ref_ptr< osgViewer::WindowCaptureCallback::ContextData > &, rp,
Properties::NON_VIRTUAL,
__void__swap__ref_ptr_R1,
"",
"");
I_SimpleProperty(osgViewer::WindowCaptureCallback::ContextData *, ,
__T_P1__get,
0);
END_REFLECTOR
STD_MAP_REFLECTOR(std::map< osg::GraphicsContext * COMMA osg::ref_ptr< osgViewer::WindowCaptureCallback::ContextData > >)
STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Image > >)