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

Fixes for Windows build

Browse Source
This commit is contained in:
Robert Osfield
2002-01-30 18:59:36 +00:00
parent 1aaa46dbe7
commit 08194e04d6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Demos/hangglide/base.cpp
View File

@@ -29,7 +29,7 @@ Node *makeBase( void )
c = 0;
for( i = 0; i <= 18; i++ )
{
theta = (float)i * 20.0 * M_PI/180.0;
theta = osg::DegreesToRadians((float)i * 20.0);
coords[c][0] = ir * cosf( theta );
coords[c][1] = ir * sinf( theta );

18
src/Demos/osgcopy/osgcopy.cpp
View File

@@ -74,7 +74,7 @@ class MyCopyOp : public osg::CopyOp
{
writeIndent(); std::cout << "copying Referenced "<<ref<<std::endl;
moveIn();
osg::Referenced* ret_ref = osg::CopyOp::operator()(ref);
osg::Referenced* ret_ref = CopyOp::operator()(ref);
moveOut();
return ret_ref;
}
@@ -85,7 +85,7 @@ class MyCopyOp : public osg::CopyOp
if (obj) std::cout<<" "<<obj->className();
std::cout<<std::endl;
moveIn();
osg::Object* ret_obj = osg::CopyOp::operator()(obj);
osg::Object* ret_obj = CopyOp::operator()(obj);
moveOut();
return ret_obj;
}
@@ -96,7 +96,7 @@ class MyCopyOp : public osg::CopyOp
if (node) std::cout<<" "<<node->className()<<" '"<<node->getName()<<"'";
std::cout<<std::endl;
moveIn();
osg::Node* ret_node = osg::CopyOp::operator()(node);
osg::Node* ret_node = CopyOp::operator()(node);
moveOut();
return ret_node;
}
@@ -107,7 +107,7 @@ class MyCopyOp : public osg::CopyOp
if (drawable) std::cout<<" "<<drawable->className();
std::cout<<std::endl;
moveIn();
osg::Drawable* ret_drawable = osg::CopyOp::operator()(drawable);
osg::Drawable* ret_drawable = CopyOp::operator()(drawable);
moveOut();
return ret_drawable;
}
@@ -118,7 +118,7 @@ class MyCopyOp : public osg::CopyOp
if (stateset) std::cout<<" "<<stateset->className();
std::cout<<std::endl;
moveIn();
osg::StateSet* ret_stateset = osg::CopyOp::operator()(stateset);
osg::StateSet* ret_stateset = CopyOp::operator()(stateset);
moveOut();
return ret_stateset;
}
@@ -129,7 +129,7 @@ class MyCopyOp : public osg::CopyOp
if (attr) std::cout<<" "<<attr->className();
std::cout<<std::endl;
moveIn();
osg::StateAttribute* ret_attr = osg::CopyOp::operator()(attr);
osg::StateAttribute* ret_attr = CopyOp::operator()(attr);
moveOut();
return ret_attr;
}
@@ -140,7 +140,7 @@ class MyCopyOp : public osg::CopyOp
if (text) std::cout<<" "<<text->className();
std::cout<<std::endl;
moveIn();
osg::Texture* ret_text = osg::CopyOp::operator()(text);
osg::Texture* ret_text = CopyOp::operator()(text);
moveOut();
return ret_text;
}
@@ -151,7 +151,7 @@ class MyCopyOp : public osg::CopyOp
if (image) std::cout<<" "<<image->className();
std::cout<<std::endl;
moveIn();
Image* ret_image = osg::CopyOp::operator()(image);
Image* ret_image = CopyOp::operator()(image);
moveOut();
return ret_image;
}
@@ -223,7 +223,7 @@ int main( int argc, char **argv )
// write out the various scene graphs so that they can be browsed, either
// in an editor or using a graphics diff tool gdiff/xdiff/xxdiff.
std::cout << std::endl << "Writing out the original scene graph as 'original.osg'"<<endl;
std::cout << std::endl << "Writing out the original scene graph as 'original.osg'"<<std::endl;
osgDB::writeNodeFile(*rootnode,"original.osg");
std::cout << "Writing out the deep copied scene graph as 'deep_copy.osg'"<<std::endl;