← Back to branch summary

~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support

« back to all changes in this revision

Viewing changes to OpenSceneGraph/src/osgPlugins/ive/TextureCubeMap.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Loic Dachary (OuoU)
  • Date: 2009-03-23 14:08:20 UTC
  • mfrom: (1.1.7 upstream) (2.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20090323140820-i4j3jozdlhyn4lre
http://bugs.debian.org/517671
rules prevent lib64 with -D LIB_POSTFIX="" (Closes: #517671)

Show diffs side-by-side

added added

removed removed

Lines of Context:
OpenSceneGraph/src/osgPlugins/ive/TextureCubeMap.cpp
38
38
    // Write number of mipmap levels
39
39
    out->writeInt(getNumMipmapLevels());
40
40
 
41
 
    // Should we include images date in stream
42
 
    IncludeImageMode includeImg = out->getIncludeImageMode();
43
 
    out->writeChar(includeImg);
 
41
    if (out->getVersion() >= VERSION_0029)
 
42
    {
 
43
        out->writeImage(getImage(osg::TextureCubeMap::POSITIVE_X));
 
44
        out->writeImage(getImage(osg::TextureCubeMap::NEGATIVE_X));
 
45
        out->writeImage(getImage(osg::TextureCubeMap::POSITIVE_Y));
 
46
        out->writeImage(getImage(osg::TextureCubeMap::NEGATIVE_Y));
 
47
        out->writeImage(getImage(osg::TextureCubeMap::POSITIVE_Z));
 
48
        out->writeImage(getImage(osg::TextureCubeMap::NEGATIVE_Z));
 
49
    }
 
50
    else
 
51
    {
 
52
        // Should we include images date in stream
 
53
        IncludeImageMode includeImg = out->getIncludeImageMode(getImage(osg::TextureCubeMap::POSITIVE_X));
 
54
        out->writeChar(includeImg);
44
55
 
45
 
    out->writeImage(includeImg,getImage(osg::TextureCubeMap::POSITIVE_X));
46
 
    out->writeImage(includeImg,getImage(osg::TextureCubeMap::NEGATIVE_X));
47
 
    out->writeImage(includeImg,getImage(osg::TextureCubeMap::POSITIVE_Y));
48
 
    out->writeImage(includeImg,getImage(osg::TextureCubeMap::NEGATIVE_Y));
49
 
    out->writeImage(includeImg,getImage(osg::TextureCubeMap::POSITIVE_Z));
50
 
    out->writeImage(includeImg,getImage(osg::TextureCubeMap::NEGATIVE_Z));
 
56
        out->writeImage(includeImg,getImage(osg::TextureCubeMap::POSITIVE_X));
 
57
        out->writeImage(includeImg,getImage(osg::TextureCubeMap::NEGATIVE_X));
 
58
        out->writeImage(includeImg,getImage(osg::TextureCubeMap::POSITIVE_Y));
 
59
        out->writeImage(includeImg,getImage(osg::TextureCubeMap::NEGATIVE_Y));
 
60
        out->writeImage(includeImg,getImage(osg::TextureCubeMap::POSITIVE_Z));
 
61
        out->writeImage(includeImg,getImage(osg::TextureCubeMap::NEGATIVE_Z));
 
62
    }
51
63
}
52
64
 
53
65
void TextureCubeMap::read(DataInputStream* in)
74
86
        // Read number of mipmap levels
75
87
        setNumMipmapLevels((unsigned int)in->readInt());
76
88
 
77
 
        // Should we read image data from stream
78
 
        IncludeImageMode includeImg = (IncludeImageMode)in->readChar();
 
89
        if (in->getVersion() >= VERSION_0029)
 
90
        {
 
91
            setImage(osg::TextureCubeMap::POSITIVE_X,in->readImage());
 
92
            setImage(osg::TextureCubeMap::NEGATIVE_X,in->readImage());
 
93
            setImage(osg::TextureCubeMap::POSITIVE_Y,in->readImage());
 
94
            setImage(osg::TextureCubeMap::NEGATIVE_Y,in->readImage());
 
95
            setImage(osg::TextureCubeMap::POSITIVE_Z,in->readImage());
 
96
            setImage(osg::TextureCubeMap::NEGATIVE_Z,in->readImage());
 
97
        }
 
98
        else
 
99
        {
 
100
            // Should we read image data from stream
 
101
            IncludeImageMode includeImg = (IncludeImageMode)in->readChar();
79
102
 
80
 
        setImage(osg::TextureCubeMap::POSITIVE_X,in->readImage(includeImg));
81
 
        setImage(osg::TextureCubeMap::NEGATIVE_X,in->readImage(includeImg));
82
 
        setImage(osg::TextureCubeMap::POSITIVE_Y,in->readImage(includeImg));
83
 
        setImage(osg::TextureCubeMap::NEGATIVE_Y,in->readImage(includeImg));
84
 
        setImage(osg::TextureCubeMap::POSITIVE_Z,in->readImage(includeImg));
85
 
        setImage(osg::TextureCubeMap::NEGATIVE_Z,in->readImage(includeImg));
 
103
            setImage(osg::TextureCubeMap::POSITIVE_X,in->readImage(includeImg));
 
104
            setImage(osg::TextureCubeMap::NEGATIVE_X,in->readImage(includeImg));
 
105
            setImage(osg::TextureCubeMap::POSITIVE_Y,in->readImage(includeImg));
 
106
            setImage(osg::TextureCubeMap::NEGATIVE_Y,in->readImage(includeImg));
 
107
            setImage(osg::TextureCubeMap::POSITIVE_Z,in->readImage(includeImg));
 
108
            setImage(osg::TextureCubeMap::NEGATIVE_Z,in->readImage(includeImg));
 
109
        }
86
110
        
87
111
    }
88
112
    else{