Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

From Paul Martz, build fixes

  • Loading branch information...
commit 42c492a54611821c68c7aa5ac2c29ed379685182 1 parent a558dc1
Robert OSFIELD authored
View
16 applications/present3D/present3D.cpp
@@ -428,11 +428,23 @@ int main( int argc, char **argv )
std::string 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())
{
+ OSG_NOTICE<<"Adding Device : "<<device<<std::endl;
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"))
@@ -448,7 +460,7 @@ int main( int argc, char **argv )
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())
{
viewer.addDevice(rest_http_device.get());
View
4 examples/osgframerenderer/EventProperty.cpp
@@ -7,7 +7,7 @@ void EventProperty::update(osgViewer::View* view)
{
if (view && view->getEventQueue() && _event.valid())
{
- view->getEventQueue()->addEvent(_event);
+ view->getEventQueue()->addEvent(_event.get());
}
}
@@ -38,4 +38,4 @@ namespace B
}
-}
+}
View
8 examples/osgframerenderer/gscframerenderer.cpp
@@ -274,7 +274,7 @@ int main( int argc, char **argv )
viewer.getCamera()->setGraphicsContext(gc.get());
- viewer.getCamera()->setDisplaySettings(ds);
+ viewer.getCamera()->setDisplaySettings(ds.get());
osgViewer::GraphicsWindow* gw = dynamic_cast<osgViewer::GraphicsWindow*>(gc.get());
if (gw)
@@ -322,14 +322,14 @@ int main( int argc, char **argv )
++itr, ++cameraNum)
{
osg::Camera* camera = *itr;
- camera->setFinalDrawCallback(screenShot);
+ camera->setFinalDrawCallback(screenShot.get());
screenShot->_cameraNumMap[camera] = cameraNum;
}
}
else if (cameras.size()==1)
{
osg::Camera* camera = cameras.front();
- camera->setFinalDrawCallback(screenShot);
+ camera->setFinalDrawCallback(screenShot.get());
}
else
{
@@ -379,4 +379,4 @@ int main( int argc, char **argv )
osg::ref_ptr<osgGA::StateSetManipulator> ss = dynamic_cast<osgGA::StateSetManipulator*>(object.get());
return 0;
-}
+}
View
24 examples/osgmultiplemovies/osgmultiplemovies.cpp
@@ -383,7 +383,7 @@ static osg::Node* readImageStream(const std::string& file_name, osg::Vec3& p, fl
if (img_stream)
{
- tex = new osg::Texture2D(img_stream);
+ tex = new osg::Texture2D(img_stream.get());
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();
text->setFont("arial.ttf");
text->setDataVariance(osg::Object::DYNAMIC);
- text->setUpdateCallback(new ImageStreamStateCallback(text, img));
+ text->setUpdateCallback(new ImageStreamStateCallback(text, img.get()));
text->setCharacterSize(24);
text->setPosition(p + osg::Vec3(10,-10,10));
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);
- geo->getOrCreateStateSet()->setTextureAttributeAndModes(0, tex);
+ geo->getOrCreateStateSet()->setTextureAttributeAndModes(0, tex.get());
osg::Vec4Array* colors = new osg::Vec4Array();
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;
- img->addDimensionsChangedCallback(new MyDimensionsChangedCallback(tex, geo));
+ img->addDimensionsChangedCallback(new MyDimensionsChangedCallback(tex.get(), geo));
return geode;
}
@@ -476,7 +476,7 @@ class ReplaceTextureVisitor : public osg::NodeVisitor {
void apply(osg::StateSet* ss)
{
if (ss && ss->getTextureAttribute(0, osg::StateAttribute::TEXTURE))
- ss->setTextureAttribute(0, _tex);
+ ss->setTextureAttribute(0, _tex.get());
}
private:
osg::ref_ptr<osg::Texture> _tex;
@@ -531,16 +531,16 @@ class SlideShowEventHandler : public osgGA::GUIEventHandler {
else if (_currentFile >= static_cast<int>(_files.size()))
_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());
if (!tex) {
osg::ref_ptr<osg::ImageStream> stream = dynamic_cast<osg::ImageStream*>(obj.get());
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)
{
- tex = new osg::Texture2D(stream);
+ tex = new osg::Texture2D(stream.get());
tex->setResizeNonPowerOfTwoHint(false);
}
}
@@ -548,7 +548,7 @@ class SlideShowEventHandler : public osgGA::GUIEventHandler {
osg::ref_ptr<osg::ImageStream> stream = dynamic_cast<osg::ImageStream*>(tex->getImage(0));
if (stream)
stream->play();
- ReplaceTextureVisitor v(tex);
+ ReplaceTextureVisitor v(tex.get());
_node->accept(v);
}
}
@@ -643,9 +643,9 @@ int main(int argc, char** argv)
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);
- movie_event_handler = new SlideShowEventHandler(node, files, options);
+ movie_event_handler = new SlideShowEventHandler(node, files, options.get());
}
else
{
@@ -657,7 +657,7 @@ int main(int argc, char** argv)
unsigned int num_videos = 0;
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)
group->addChild(node);
View
2  include/osg/ImageUtils
@@ -171,7 +171,7 @@ enum ColorSpaceOperation
};
/** 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);
}
View
2  src/osgPresentation/SlideShowConstructor.cpp
@@ -887,7 +887,7 @@ osg::Geometry* SlideShowConstructor::createTexturedQuadGeometry(const osg::Vec3&
stateset = pictureQuad->getOrCreateStateSet();
stateset->setTextureAttributeAndModes(0,
- texture,
+ texture.get(),
osg::StateAttribute::ON);
}
Please sign in to comment.
Something went wrong with that request. Please try again.