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

From Paul Martz, build fixes

Browse Source
This commit is contained in:
Robert Osfield 2012-11-19 11:25:52 +00:00
parent e2ee774705
commit 8b30807ef1
6 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
applications/present3D/present3D.cpp
View File

@ -428,11 +428,23 @@ int main( int argc, char **argv )
std::string device; std::string device;
while (arguments.read("--device", device)) while (arguments.read("--device", device))
{ {
osg::ref_ptr<osgGA::Device> dev = osgDB::readFile<osgGA::Device>(device); osg::ref_ptr<osg::Object> obj = osgDB::readObjectFile(device);
osg::ref_ptr<osgGA::Device> dev = dynamic_cast<osgGA::Device*>(obj.get());
if (dev.valid()) if (dev.valid())
{ {
OSG_NOTICE<<"Adding Device : "<<device<<std::endl;
viewer.addDevice(dev.get()); viewer.addDevice(dev.get());
} }
else
{
osgGA::GUIEventHandler* handler = dynamic_cast<osgGA::GUIEventHandler*>(obj.get());
if (handler)
{
OSG_NOTICE<<"Adding Device event handler : "<<device<<std::endl;
viewer.getEventHandlers().push_front(handler);
}
}
} }
if (arguments.read("--http-control")) if (arguments.read("--http-control"))
@ -448,7 +460,7 @@ int main( int argc, char **argv )
osg::ref_ptr<osgDB::Options> device_options = new osgDB::Options("documentRegisteredHandlers"); osg::ref_ptr<osgDB::Options> device_options = new osgDB::Options("documentRegisteredHandlers");
osg::ref_ptr<osgGA::Device> rest_http_device = osgDB::readFile<osgGA::Device>(server_address+":"+server_port+"/"+document_root+".resthttp", device_options); osg::ref_ptr<osgGA::Device> rest_http_device = osgDB::readFile<osgGA::Device>(server_address+":"+server_port+"/"+document_root+".resthttp", device_options.get());
if (rest_http_device.valid()) if (rest_http_device.valid())
{ {
viewer.addDevice(rest_http_device.get()); viewer.addDevice(rest_http_device.get());

4
examples/osgframerenderer/EventProperty.cpp
View File

@ -7,7 +7,7 @@ void EventProperty::update(osgViewer::View* view)
{ {
if (view && view->getEventQueue() && _event.valid()) if (view && view->getEventQueue() && _event.valid())
{ {
view->getEventQueue()->addEvent(_event); view->getEventQueue()->addEvent(_event.get());
} }
} }
@ -38,4 +38,4 @@ namespace B
} }
} }

8
examples/osgframerenderer/gscframerenderer.cpp
View File

@ -274,7 +274,7 @@ int main( int argc, char **argv )
viewer.getCamera()->setGraphicsContext(gc.get()); viewer.getCamera()->setGraphicsContext(gc.get());
viewer.getCamera()->setDisplaySettings(ds); viewer.getCamera()->setDisplaySettings(ds.get());
osgViewer::GraphicsWindow* gw = dynamic_cast<osgViewer::GraphicsWindow*>(gc.get()); osgViewer::GraphicsWindow* gw = dynamic_cast<osgViewer::GraphicsWindow*>(gc.get());
if (gw) if (gw)
@ -322,14 +322,14 @@ int main( int argc, char **argv )
++itr, ++cameraNum) ++itr, ++cameraNum)
{ {
osg::Camera* camera = *itr; osg::Camera* camera = *itr;
camera->setFinalDrawCallback(screenShot); camera->setFinalDrawCallback(screenShot.get());
screenShot->_cameraNumMap[camera] = cameraNum; screenShot->_cameraNumMap[camera] = cameraNum;
} }
} }
else if (cameras.size()==1) else if (cameras.size()==1)
{ {
osg::Camera* camera = cameras.front(); osg::Camera* camera = cameras.front();
camera->setFinalDrawCallback(screenShot); camera->setFinalDrawCallback(screenShot.get());
} }
else else
{ {
@ -379,4 +379,4 @@ int main( int argc, char **argv )
osg::ref_ptr<osgGA::StateSetManipulator> ss = dynamic_cast<osgGA::StateSetManipulator*>(object.get()); osg::ref_ptr<osgGA::StateSetManipulator> ss = dynamic_cast<osgGA::StateSetManipulator*>(object.get());
return 0; return 0;
} }

24
examples/osgmultiplemovies/osgmultiplemovies.cpp
View File

@ -383,7 +383,7 @@ static osg::Node* readImageStream(const std::string& file_name, osg::Vec3& p, fl
if (img_stream) if (img_stream)
{ {
tex = new osg::Texture2D(img_stream); tex = new osg::Texture2D(img_stream.get());
tex->setResizeNonPowerOfTwoHint(false); tex->setResizeNonPowerOfTwoHint(false);
} }
@ -402,7 +402,7 @@ static osg::Node* readImageStream(const std::string& file_name, osg::Vec3& p, fl
osgText::Text* text = new osgText::Text(); osgText::Text* text = new osgText::Text();
text->setFont("arial.ttf"); text->setFont("arial.ttf");
text->setDataVariance(osg::Object::DYNAMIC); text->setDataVariance(osg::Object::DYNAMIC);
text->setUpdateCallback(new ImageStreamStateCallback(text, img)); text->setUpdateCallback(new ImageStreamStateCallback(text, img.get()));
text->setCharacterSize(24); text->setCharacterSize(24);
text->setPosition(p + osg::Vec3(10,-10,10)); text->setPosition(p + osg::Vec3(10,-10,10));
text->setAxisAlignment(osgText::TextBase::XZ_PLANE); text->setAxisAlignment(osgText::TextBase::XZ_PLANE);
@ -424,7 +424,7 @@ static osg::Node* readImageStream(const std::string& file_name, osg::Vec3& p, fl
geode->addDrawable(geo); geode->addDrawable(geo);
geo->getOrCreateStateSet()->setTextureAttributeAndModes(0, tex); geo->getOrCreateStateSet()->setTextureAttributeAndModes(0, tex.get());
osg::Vec4Array* colors = new osg::Vec4Array(); osg::Vec4Array* colors = new osg::Vec4Array();
colors->push_back(osg::Vec4(0.7, 0.7, 0.7, 1)); colors->push_back(osg::Vec4(0.7, 0.7, 0.7, 1));
@ -434,7 +434,7 @@ static osg::Node* readImageStream(const std::string& file_name, osg::Vec3& p, fl
p[0] += w + 10; p[0] += w + 10;
img->addDimensionsChangedCallback(new MyDimensionsChangedCallback(tex, geo)); img->addDimensionsChangedCallback(new MyDimensionsChangedCallback(tex.get(), geo));
return geode; return geode;
} }
@ -476,7 +476,7 @@ public:
void apply(osg::StateSet* ss) void apply(osg::StateSet* ss)
{ {
if (ss && ss->getTextureAttribute(0, osg::StateAttribute::TEXTURE)) if (ss && ss->getTextureAttribute(0, osg::StateAttribute::TEXTURE))
ss->setTextureAttribute(0, _tex); ss->setTextureAttribute(0, _tex.get());
} }
private: private:
osg::ref_ptr<osg::Texture> _tex; osg::ref_ptr<osg::Texture> _tex;
@ -531,16 +531,16 @@ private:
else if (_currentFile >= static_cast<int>(_files.size())) else if (_currentFile >= static_cast<int>(_files.size()))
_currentFile = 0; _currentFile = 0;
osg::ref_ptr<osg::Object> obj = osgDB::readRefObjectFile(_files[_currentFile], _options); osg::ref_ptr<osg::Object> obj = osgDB::readRefObjectFile(_files[_currentFile], _options.get());
osg::ref_ptr<osg::Texture> tex = dynamic_cast<osg::Texture*>(obj.get()); osg::ref_ptr<osg::Texture> tex = dynamic_cast<osg::Texture*>(obj.get());
if (!tex) { if (!tex) {
osg::ref_ptr<osg::ImageStream> stream = dynamic_cast<osg::ImageStream*>(obj.get()); osg::ref_ptr<osg::ImageStream> stream = dynamic_cast<osg::ImageStream*>(obj.get());
if (!stream) if (!stream)
stream = dynamic_cast<osg::ImageStream*>(osgDB::readImageFile(_files[_currentFile], _options)); stream = dynamic_cast<osg::ImageStream*>(osgDB::readImageFile(_files[_currentFile], _options.get()));
if (stream) if (stream)
{ {
tex = new osg::Texture2D(stream); tex = new osg::Texture2D(stream.get());
tex->setResizeNonPowerOfTwoHint(false); tex->setResizeNonPowerOfTwoHint(false);
} }
} }
@ -548,7 +548,7 @@ private:
osg::ref_ptr<osg::ImageStream> stream = dynamic_cast<osg::ImageStream*>(tex->getImage(0)); osg::ref_ptr<osg::ImageStream> stream = dynamic_cast<osg::ImageStream*>(tex->getImage(0));
if (stream) if (stream)
stream->play(); stream->play();
ReplaceTextureVisitor v(tex); ReplaceTextureVisitor v(tex.get());
_node->accept(v); _node->accept(v);
} }
} }
@ -643,9 +643,9 @@ int main(int argc, char** argv)
if (slide_show) if (slide_show)
{ {
osg::Node* node = readImageStream(files[0], pos, desired_height, options); osg::Node* node = readImageStream(files[0], pos, desired_height, options.get());
group->addChild(node); group->addChild(node);
movie_event_handler = new SlideShowEventHandler(node, files, options); movie_event_handler = new SlideShowEventHandler(node, files, options.get());
} }
else else
{ {
@ -657,7 +657,7 @@ int main(int argc, char** argv)
unsigned int num_videos = 0; unsigned int num_videos = 0;
for(osgDB::DirectoryContents::iterator i = files.begin(); (i != files.end()) && (num_videos < max_videos); ++i) for(osgDB::DirectoryContents::iterator i = files.begin(); (i != files.end()) && (num_videos < max_videos); ++i)
{ {
osg::Node* node = readImageStream(*i, pos, desired_height, options); osg::Node* node = readImageStream(*i, pos, desired_height, options.get());
if (node) if (node)
group->addChild(node); group->addChild(node);

2
include/osg/ImageUtils
View File

@ -171,7 +171,7 @@ enum ColorSpaceOperation
}; };
/** Convert the RGBA values in a Image based on a ColorSpaceOperation defined scheme.*/ /** Convert the RGBA values in a Image based on a ColorSpaceOperation defined scheme.*/
extern osg::Image* colorSpaceConversion(ColorSpaceOperation op, osg::Image* image, const osg::Vec4& colour); extern OSG_EXPORT osg::Image* colorSpaceConversion(ColorSpaceOperation op, osg::Image* image, const osg::Vec4& colour);
} }

2
src/osgPresentation/SlideShowConstructor.cpp
View File

@ -887,7 +887,7 @@ osg::Geometry* SlideShowConstructor::createTexturedQuadGeometry(const osg::Vec3&
stateset = pictureQuad->getOrCreateStateSet(); stateset = pictureQuad->getOrCreateStateSet();
stateset->setTextureAttributeAndModes(0, stateset->setTextureAttributeAndModes(0,
texture, texture.get(),
osg::StateAttribute::ON); osg::StateAttribute::ON);
} }