← Back to branch summary

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

« back to all changes in this revision

Viewing changes to OpenSceneGraph/src/osgWrappers/deprecated-dotosg/osgTerrain/Layer.cpp

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2013-11-12 02:21:14 UTC
  • mfrom: (31.1.3 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131112022114-qaxfhdnhn88vnh10
Tags: 3.2.0~rc1-1ubuntu1
Fix deprecated url_feof.

Show diffs side-by-side

added added

removed removed

Lines of Context:
OpenSceneGraph/src/osgWrappers/deprecated-dotosg/osgTerrain/Layer.cpp
34
34
    osgTerrain::Layer& layer = static_cast<osgTerrain::Layer&>(obj);
35
35
 
36
36
    bool itrAdvanced = false;
37
 
    
 
37
 
38
38
    osg::ref_ptr<osg::Object> readObject = fr.readObjectOfType(osgDB::type_wrapper<osgTerrain::Locator>());
39
39
    osgTerrain::Locator* locator = dynamic_cast<osgTerrain::Locator*>(readObject.get());
40
40
    if (locator) layer.setLocator(locator);
41
 
    
 
41
 
42
42
    osg::Texture::FilterMode filter;
43
43
    if (fr[0].matchWord("MinFilter") && Layer_matchFilterStr(fr[1].getStr(),filter))
44
44
    {
76
76
bool Layer_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
77
77
{
78
78
    const osgTerrain::Layer& layer = static_cast<const osgTerrain::Layer&>(obj);
79
 
    
 
79
 
80
80
    if (layer.getLocator() && !(layer.getLocator()->getDefinedInFile()))
81
81
    {
82
82
        fw.writeObject(*layer.getLocator());
83
83
    }
84
 
    
 
84
 
85
85
    fw.indent()<<"MinFilter "<<Layer_getFilterStr(layer.getMinFilter())<<std::endl;
86
86
    fw.indent()<<"MagFilter "<<Layer_getFilterStr(layer.getMagFilter())<<std::endl;
87
87
 
88
88
    if (layer.getMinLevel()!=0)
89
89
    {
90
90
        fw.indent()<<"MinLevel "<<layer.getMinLevel()<<std::endl;
91
 
    } 
 
91
    }
92
92
 
93
93
    if (layer.getMaxLevel()!=MAXIMUM_NUMBER_OF_LEVELS)
94
94
    {
95
95
        fw.indent()<<"MaxLevel "<<layer.getMaxLevel()<<std::endl;
96
 
    } 
 
96
    }
97
97
 
98
98
    return true;
99
99
}