From 7f7a51b1ca3344f55bd3d3d71d22a43f10428c0d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 3 Nov 2003 23:26:17 +0000 Subject: [PATCH] Fixed positioning of images. --- examples/slideshow3D/SlideShowConstructor.cpp | 5 +---- examples/slideshow3D/SlideShowConstructor.h | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/examples/slideshow3D/SlideShowConstructor.cpp b/examples/slideshow3D/SlideShowConstructor.cpp index d02bb31f3..19104547f 100644 --- a/examples/slideshow3D/SlideShowConstructor.cpp +++ b/examples/slideshow3D/SlideShowConstructor.cpp @@ -68,9 +68,7 @@ void SlideShowConstructor::createPresentation() _textWidth = _slideWidth*0.8f; _textOrigin = _slideOrigin + osg::Vec3(_slideWidth*0.1f,0.0f,_titleOrigin.z()-_slideOrigin.z()-2*_textHeight); - _imageOrigin = _slideOrigin + osg::Vec3(_slideWidth*0.7f,0.0f,_titleOrigin.z()*0.5f-_slideOrigin.z()); - _modelLeft = _slideOrigin + osg::Vec3(_slideWidth*0.0f,0.0f,_titleOrigin.z()*0.5f-_slideOrigin.z()); - _modelRight = _slideOrigin + osg::Vec3(_slideWidth*1.0f,0.0f,_titleOrigin.z()*0.5f-_slideOrigin.z()); + _imageOrigin = _slideOrigin + osg::Vec3(_slideWidth*0.7f,0.0f,_slideHeight*0.45f); _root = new osg::ClearNode; _root->setClearColor(_backgroundColor); @@ -129,7 +127,6 @@ void SlideShowConstructor::addSlide() // reset cursors _textCursor = _textOrigin; _imageCursor = _imageOrigin; - _modelCursor = _modelLeft*0.5f + _modelRight*0.5f; _slide = new osg::Switch; _slide->setName(std::string("Slide_")+_slideTitle); diff --git a/examples/slideshow3D/SlideShowConstructor.h b/examples/slideshow3D/SlideShowConstructor.h index 63c15f52c..3b3db704a 100644 --- a/examples/slideshow3D/SlideShowConstructor.h +++ b/examples/slideshow3D/SlideShowConstructor.h @@ -110,8 +110,6 @@ protected: osg::Vec3 _textOrigin; osg::Vec3 _imageOrigin; - osg::Vec3 _modelLeft; - osg::Vec3 _modelRight; osg::Vec3 _textCursor; osg::Vec3 _imageCursor;