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

Changed the image file so that use the Images/ prefix to help locate the files

Browse Source 
within the OpenSceneGraph-Data directory.
This commit is contained in:
Robert Osfield
2002-09-24 20:04:20 +00:00
parent c7001dd041
commit 9546c73e39
7 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Make/debugtests.bat
View File

@@ -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

2
Make/makedirdefs
View File

@@ -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

8
Make/osgtests.bat
View File

@@ -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

10
src/Demos/osgbillboard/osgbillboard.cpp
View File

@@ -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));

2
src/Demos/osggeometry/osggeometry.cpp
View File

@@ -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;

2
src/Demos/osgparticle/osgparticle.cpp
View File

@@ -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);

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

@@ -33,19 +33,21 @@ class ConstructStateCallback : public osg::NodeCallback
{
// read 4 2d images
osg::ref_ptr<osg::Image> image_0 = osgDB::readImageFile("lz.rgb");
osg::ref_ptr<osg::Image> image_1 = osgDB::readImageFile("reflect.rgb");
osg::ref_ptr<osg::Image> image_2 = osgDB::readImageFile("tank.rgb");
osg::ref_ptr<osg::Image> image_3 = osgDB::readImageFile("skymap.jpg");
osg::ref_ptr<osg::Image> image_0 = osgDB::readImageFile("Images/lz.rgb");
osg::ref_ptr<osg::Image> image_1 = osgDB::readImageFile("Images/reflect.rgb");
osg::ref_ptr<osg::Image> image_2 = osgDB::readImageFile("Images/tank.rgb");
osg::ref_ptr<osg::Image> 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."<<std::endl;
return new osg::StateSet;
}
if (image_0->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."<<std::endl;
return new osg::StateSet;
}
// get max 3D texture size
@@ -97,7 +99,7 @@ class ConstructStateCallback : public osg::NodeCallback
stateset->setTextureMode(0,GL_TEXTURE_GEN_R,osg::StateAttribute::ON);
stateset->setTextureAttribute(0,texgen);
stateset->setTextureAttributeAndModes(0,texture3D,osg::StateAttribute::ON);
return stateset;
}