dd996a3289
forcing users to use osgDB::readRef*File() methods. The later is preferable as it closes a potential threading bug when using paging databases in conjunction
with the osgDB::Registry Object Cache. This threading bug occurs when one thread gets an object from the Cache via an osgDB::read*File() call where only
a pointer to the object is passed back, so taking a reference to the object is delayed till it gets reassigned to a ref_ptr<>, but at the same time another
thread calls a flush of the Object Cache deleting this object as it's referenceCount is now zero. Using osgDB::readREf*File() makes sure the a ref_ptr<> is
passed back and the referenceCount never goes to zero.
To ensure the OSG builds when OSG_PROVIDE_READFILE is to OFF the many cases of osgDB::read*File() usage had to be replaced with a ref_ptr<> osgDB::readRef*File()
usage. The avoid this change causing lots of other client code to be rewritten to handle the use of ref_ptr<> in place of C pointer I introduced a serious of
templte methods in various class to adapt ref_ptr<> to the underly C pointer to be passed to old OSG API's, example of this is found in include/osg/Group:
bool addChild(Node* child); // old method which can only be used with a Node*
tempalte<class T> bool addChild(const osg::ref_ptr<T>& child) { return addChild(child.get()); } // adapter template method
These changes together cover 149 modified files, so it's a large submission. This extent of changes are warrent to make use of the Object Cache
and multi-threaded loaded more robust.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15164 16af8721-9629-0410-8352-f15c8da7e697
116 lines
3.6 KiB
C++
116 lines
3.6 KiB
C++
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 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 <osg/Notify>
|
|
#include <osgDB/ReadFile>
|
|
#include <osgViewer/ViewerEventHandlers>
|
|
|
|
#include <osgWidget/Browser>
|
|
|
|
#include <osg/io_utils>
|
|
|
|
using namespace osgWidget;
|
|
|
|
|
|
osg::ref_ptr<BrowserManager>& BrowserManager::instance()
|
|
{
|
|
static osg::ref_ptr<BrowserManager> s_BrowserManager = new BrowserManager;
|
|
return s_BrowserManager;
|
|
}
|
|
|
|
BrowserManager::BrowserManager()
|
|
{
|
|
OSG_INFO<<"Constructing base BrowserManager"<<std::endl;
|
|
}
|
|
|
|
BrowserManager::~BrowserManager()
|
|
{
|
|
OSG_INFO<<"Destructing base BrowserManager"<<std::endl;
|
|
}
|
|
|
|
void BrowserManager::init(const std::string& application)
|
|
{
|
|
_application = application;
|
|
}
|
|
|
|
BrowserImage* BrowserManager::createBrowserImage(const std::string& /*url*/, int /*width*/, int /*height*/)
|
|
{
|
|
OSG_NOTICE<<"Cannot create browser"<<std::endl;
|
|
return 0;
|
|
}
|
|
|
|
Browser::Browser(const std::string& url, const GeometryHints& hints)
|
|
{
|
|
open(url, hints);
|
|
}
|
|
|
|
bool Browser::assign(BrowserImage* browserImage, const GeometryHints& hints)
|
|
{
|
|
if (!browserImage) return false;
|
|
|
|
_browserImage = browserImage;
|
|
|
|
bool flip = _browserImage->getOrigin()==osg::Image::TOP_LEFT;
|
|
|
|
float aspectRatio = (_browserImage->t()>0 && _browserImage->s()>0) ? float(_browserImage->t()) / float(_browserImage->s()) : 1.0;
|
|
|
|
osg::Vec3 widthVec(hints.widthVec);
|
|
osg::Vec3 heightVec(hints.heightVec);
|
|
|
|
switch(hints.aspectRatioPolicy)
|
|
{
|
|
case(GeometryHints::RESIZE_HEIGHT_TO_MAINTAINCE_ASPECT_RATIO):
|
|
heightVec *= aspectRatio;
|
|
break;
|
|
case(GeometryHints::RESIZE_WIDTH_TO_MAINTAINCE_ASPECT_RATIO):
|
|
widthVec /= aspectRatio;
|
|
break;
|
|
default:
|
|
// no need to adjust aspect ratio
|
|
break;
|
|
}
|
|
|
|
osg::Geometry* pictureQuad = osg::createTexturedQuadGeometry(hints.position, widthVec, heightVec,
|
|
0.0f, flip ? 1.0f : 0.0f , 1.0f, flip ? 0.0f : 1.0f);
|
|
|
|
osg::Texture2D* texture = new osg::Texture2D(_browserImage.get());
|
|
texture->setResizeNonPowerOfTwoHint(false);
|
|
texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
|
|
texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
|
|
texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
|
|
|
|
pictureQuad->getOrCreateStateSet()->setTextureAttributeAndModes(0,
|
|
texture,
|
|
osg::StateAttribute::ON);
|
|
|
|
osg::ref_ptr<osgViewer::InteractiveImageHandler> handler = new osgViewer::InteractiveImageHandler(_browserImage.get());
|
|
|
|
pictureQuad->setEventCallback(handler.get());
|
|
pictureQuad->setCullCallback(handler.get());
|
|
|
|
addDrawable(pictureQuad);
|
|
|
|
return true;
|
|
}
|
|
|
|
bool Browser::open(const std::string& hostname, const GeometryHints& hints)
|
|
{
|
|
osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(hostname+".gecko");
|
|
return assign(dynamic_cast<BrowserImage*>(image.get()), hints);
|
|
}
|
|
|
|
void Browser::navigateTo(const std::string& url)
|
|
{
|
|
if (_browserImage.valid()) _browserImage->navigateTo(url);
|
|
}
|