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

Fixes for dumb VS6.0 compiler

Browse Source
This commit is contained in:
Robert Osfield
2005-11-10 19:32:37 +00:00
parent 06117353df
commit 435e4b828c
4 changed files with 247 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/osgmovie/osgmovie.cpp
View File

@@ -201,7 +201,7 @@ void MovieEventHandler::getUsage(osg::ApplicationUsage& usage) const
}
osg::Geometry* createTexturedQuadGeometry(const osg::Vec3& pos,float width,float height, osg::Image* image, bool useTextureRectangle)
osg::Geometry* myCreateTexturedQuadGeometry(const osg::Vec3& pos,float width,float height, osg::Image* image, bool useTextureRectangle)
{
if (useTextureRectangle)
{
@@ -327,7 +327,7 @@ int main(int argc, char** argv)
if (image)
{
geode->addDrawable(createTexturedQuadGeometry(pos,image->s(),image->t(),image, useTextureRectangle));
geode->addDrawable(myCreateTexturedQuadGeometry(pos,image->s(),image->t(),image, useTextureRectangle));
pos.z() += image->t()*1.5f;
}

9
examples/osgparametric/osgparametric.cpp
View File

@@ -195,7 +195,8 @@ osg::Node* createModel(const std::string& shader, const std::string& textureFile
osg::Vec3 row(0.0f,0.0f,0.0);
unsigned int vert_no = 0;
for(unsigned int iy=0; iy<num_y; ++iy)
unsigned int iy;
for(iy=0; iy<num_y; ++iy)
{
osg::Vec3 column = row;
for(unsigned int ix=0;ix<num_x;++ix)
@@ -208,7 +209,7 @@ osg::Node* createModel(const std::string& shader, const std::string& textureFile
geom->setVertexArray(vertices);
for(unsigned int iy=0; iy<num_y-1; ++iy)
for(iy=0; iy<num_y-1; ++iy)
{
unsigned int element_no = 0;
osg::DrawElementsUInt* elements = new osg::DrawElementsUInt(GL_TRIANGLE_STRIP, num_x*2);
@@ -222,12 +223,8 @@ osg::Node* createModel(const std::string& shader, const std::string& textureFile
}
geom->setUseVertexBufferObjects(true);
return geode;
}
int main(int argc, char *argv[])