Cleaned up osgWidget::VncClient and osgWidget::Browser so that their implementations are all more consitent with the osgWidget::PdfReader.

This commit is contained in:
Robert Osfield
2008-12-09 11:05:04 +00:00
parent d8c17e4c4c
commit c8190d9c54
11 changed files with 169 additions and 162 deletions

View File

@@ -11,9 +11,13 @@
* OpenSceneGraph Public License for more details.
*/
#include <osg/Notify>
#include <osgDB/ReadFile>
#include <osgViewer/ViewerEventHandlers>
#include <osgWidget/Browser>
#include <osg/Notify>
#include <osg/io_utils>
using namespace osgWidget;
@@ -39,21 +43,70 @@ void BrowserManager::init(const std::string& application)
_application = application;
}
BrowserImage* BrowserManager::createBrowserImage(const std::string& url)
{
return createBrowserImage(url, 1024, 1024);
}
BrowserImage* BrowserManager::createBrowserImage(const std::string& url, int width, int height)
{
osg::notify(osg::NOTICE)<<"Cannot created browser"<<std::endl;
return 0;
}
BrowserImage::BrowserImage()
Browser::Browser(const std::string& url, const GeometryHints& hints)
{
open(url, hints);
}
BrowserImage::~BrowserImage()
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);
pictureQuad->setEventCallback(new osgViewer::InteractiveImageHandler(_browserImage.get()));
addDrawable(pictureQuad);
return true;
}
bool Browser::open(const std::string& hostname, const GeometryHints& hints)
{
osg::ref_ptr<osg::Image> image = osgDB::readImageFile(hostname+".gecko");
return assign(dynamic_cast<BrowserImage*>(image.get()), hints);
}
void Browser::navigateTo(const std::string& url)
{
if (_browserImage.valid()) _browserImage->navigateTo(url);
}