From 9546c73e397c86445fe1c3dfe42bf3d5298e6d28 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 24 Sep 2002 20:04:20 +0000 Subject: [PATCH] Changed the image file so that use the Images/ prefix to help locate the files within the OpenSceneGraph-Data directory. --- Make/debugtests.bat | 8 ++++---- Make/makedirdefs | 2 +- Make/osgtests.bat | 8 ++++---- src/Demos/osgbillboard/osgbillboard.cpp | 10 ++++++---- src/Demos/osggeometry/osggeometry.cpp | 2 +- src/Demos/osgparticle/osgparticle.cpp | 2 +- src/Demos/osgtexture3D/osgtexture3D.cpp | 18 ++++++++++-------- 7 files changed, 27 insertions(+), 23 deletions(-) diff --git a/Make/debugtests.bat b/Make/debugtests.bat index 9adb8d1b4..aebe9aac4 100755 --- a/Make/debugtests.bat +++ b/Make/debugtests.bat @@ -87,8 +87,8 @@ echo osgscribe cow.osg osgscribe cow.osg more memleaks.log -echo osgstereoimage dog_left_eye.jpg dog_right_eye.jpg -osgstereoimage dog_left_eye.jpg dog_right_eye.jpg +echo osgstereoimage Images/dog_left_eye.jpg Images/dog_right_eye.jpg +osgstereoimage Images/dog_left_eye.jpg Images/dog_right_eye.jpg more memleaks.log echo osgtext @@ -99,8 +99,8 @@ echo osgtexture1D cow.osg osgtexture1D cow.osg more memleaks.log -echo osgtexture2D reflect.rgb lz.rgb -osgtexture2D reflect.rgb lz.rgb +echo osgtexture2D Images/reflect.rgb Images/lz.rgb +osgtexture2D Images/reflect.rgb Images/lz.rgb more memleaks.log echo osgtexture3D diff --git a/Make/makedirdefs b/Make/makedirdefs index d00c62efc..4f341f43a 100644 --- a/Make/makedirdefs +++ b/Make/makedirdefs @@ -60,7 +60,7 @@ PLUGIN_DIRS += png PLUGIN_DIRS += jpeg # comment in if you have libungif installed. -PLUGIN_DIRS += gif +# PLUGIN_DIRS += gif # comment in if you have libtiff installed. PLUGIN_DIRS += tiff diff --git a/Make/osgtests.bat b/Make/osgtests.bat index 6ac9742c2..535a17718 100755 --- a/Make/osgtests.bat +++ b/Make/osgtests.bat @@ -61,8 +61,8 @@ osgreflect cessna.osg echo osgscribe cow.osg osgscribe cow.osg -echo osgstereoimage dog_left_eye.jpg dog_right_eye.jpg -osgstereoimage dog_left_eye.jpg dog_right_eye.jpg +echo osgstereoimage Images/dog_left_eye.jpg Images/dog_right_eye.jpg +osgstereoimage Images/dog_left_eye.jpg Images/dog_right_eye.jpg echo osgtext osgtext @@ -70,8 +70,8 @@ osgtext echo osgtexture1D cow.osg osgtexture1D cow.osg -echo osgtexture2D reflect.rgb lz.rgb -osgtexture2D reflect.rgb lz.rgb +echo osgtexture2D Images/reflect.rgb Images/lz.rgb +osgtexture2D Images/reflect.rgb Images/lz.rgb echo osgtexture3D osgtexture3D diff --git a/src/Demos/osgbillboard/osgbillboard.cpp b/src/Demos/osgbillboard/osgbillboard.cpp index 07e0d7bda..a2dd1b9ec 100644 --- a/src/Demos/osgbillboard/osgbillboard.cpp +++ b/src/Demos/osgbillboard/osgbillboard.cpp @@ -120,7 +120,8 @@ osg::Node* createModel() osg::Billboard* center = osgNew osg::Billboard(); center->setMode(osg::Billboard::POINT_ROT_EYE); center->addDrawable( - createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("reflect.rgb")), + +createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("Images/reflect.rgb")), osg::Vec3(0.0f,0.0f,0.0f)); osg::Billboard* x_arrow = osgNew osg::Billboard(); @@ -128,7 +129,8 @@ osg::Node* createModel() x_arrow->setAxis(osg::Vec3(1.0f,0.0f,0.0f)); x_arrow->setNormal(osg::Vec3(0.0f,-1.0f,0.0f)); x_arrow->addDrawable( - createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("osg_posx.png")), + +createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("Images/osg_posx.png")), osg::Vec3(5.0f,0.0f,0.0f)); osg::Billboard* y_arrow = osgNew osg::Billboard(); @@ -136,7 +138,7 @@ osg::Node* createModel() y_arrow->setAxis(osg::Vec3(0.0f,1.0f,0.0f)); y_arrow->setNormal(osg::Vec3(1.0f,0.0f,0.0f)); y_arrow->addDrawable( - createSquare(osg::Vec3(0.0f,-0.5f,-0.5f),osg::Vec3(0.0f,1.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("osg_posy.png")), + createSquare(osg::Vec3(0.0f,-0.5f,-0.5f),osg::Vec3(0.0f,1.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("Images/osg_posy.png")), osg::Vec3(0.0f,5.0f,0.0f)); osg::Billboard* z_arrow = osgNew osg::Billboard(); @@ -144,7 +146,7 @@ osg::Node* createModel() z_arrow->setAxis(osg::Vec3(0.0f,0.0f,1.0f)); z_arrow->setNormal(osg::Vec3(0.0f,-1.0f,0.0f)); z_arrow->addDrawable( - createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("osg_posz.png")), + createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("Images/osg_posz.png")), osg::Vec3(0.0f,0.0f,5.0f)); diff --git a/src/Demos/osggeometry/osggeometry.cpp b/src/Demos/osggeometry/osggeometry.cpp index 20ab1eb1c..d7089e2cf 100644 --- a/src/Demos/osggeometry/osggeometry.cpp +++ b/src/Demos/osggeometry/osggeometry.cpp @@ -542,7 +542,7 @@ osg::Node* createBackground() { // we'll create a texture mapped quad to sit behind the Geometry - osg::Image* image = osgDB::readImageFile("primitives.gif"); + osg::Image* image = osgDB::readImageFile("Imags/primitives.gif"); if (!image) return NULL; diff --git a/src/Demos/osgparticle/osgparticle.cpp b/src/Demos/osgparticle/osgparticle.cpp index 931e22e4a..53e53cbcc 100644 --- a/src/Demos/osgparticle/osgparticle.cpp +++ b/src/Demos/osgparticle/osgparticle.cpp @@ -222,7 +222,7 @@ osgParticle::ParticleSystem *create_complex_particle_system(osg::Group *root) // We turn off the additive blending, because smoke has no self- // illumination. osgParticle::ParticleSystem *ps = osgNew osgParticle::ParticleSystem; - ps->setDefaultAttributes("smoke.rgb", false, false); + ps->setDefaultAttributes("Images/smoke.rgb", false, false); // assign the particle template to the system. ps->setDefaultParticleTemplate(ptemplate); diff --git a/src/Demos/osgtexture3D/osgtexture3D.cpp b/src/Demos/osgtexture3D/osgtexture3D.cpp index 50b2c379b..a142f05c6 100644 --- a/src/Demos/osgtexture3D/osgtexture3D.cpp +++ b/src/Demos/osgtexture3D/osgtexture3D.cpp @@ -33,19 +33,21 @@ class ConstructStateCallback : public osg::NodeCallback { // read 4 2d images - osg::ref_ptr image_0 = osgDB::readImageFile("lz.rgb"); - osg::ref_ptr image_1 = osgDB::readImageFile("reflect.rgb"); - osg::ref_ptr image_2 = osgDB::readImageFile("tank.rgb"); - osg::ref_ptr image_3 = osgDB::readImageFile("skymap.jpg"); + osg::ref_ptr image_0 = osgDB::readImageFile("Images/lz.rgb"); + osg::ref_ptr image_1 = osgDB::readImageFile("Images/reflect.rgb"); + osg::ref_ptr image_2 = osgDB::readImageFile("Images/tank.rgb"); + osg::ref_ptr image_3 = osgDB::readImageFile("Images/skymap.jpg"); if (!image_0 || !image_1 || !image_2 || !image_3) - { - return 0; + { + std::cout << "Warning: could not open files."<getPixelFormat()!=image_1->getPixelFormat() || image_0->getPixelFormat()!=image_2->getPixelFormat() || image_0->getPixelFormat()!=image_3->getPixelFormat()) { - return 0; + std::cout << "Warning: image pixel formats not compatible."<setTextureMode(0,GL_TEXTURE_GEN_R,osg::StateAttribute::ON); stateset->setTextureAttribute(0,texgen); stateset->setTextureAttributeAndModes(0,texture3D,osg::StateAttribute::ON); - + return stateset; }