Changeset 13041 for OpenSceneGraph/trunk/include/osgDB/ReadFile
- Timestamp:
- 03/21/12 18:36:20 (15 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/include/osgDB/ReadFile (modified) (23 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/include/osgDB/ReadFile
r10812 r13041 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 2 2 * 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 5 5 * (at your option) any later version. The full license is in LICENSE file 6 6 * included with this distribution, and on the openscenegraph.org website. 7 * 7 * 8 8 * This library is distributed in the hope that it will be useful, 9 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 11 * OpenSceneGraph Public License for more details. 12 12 */ … … 27 27 28 28 29 /** Read an osg::Object from file. 29 /** Read an osg::Object from file. 30 30 * Return valid osg::Object on success, 31 31 * return NULL on failure. … … 36 36 extern OSGDB_EXPORT osg::Object* readObjectFile(const std::string& filename,const Options* options); 37 37 38 /** Read an osg::Object from file. 38 /** Read an osg::Object from file. 39 39 * Return valid osg::Object on success, 40 40 * return NULL on failure. … … 47 47 } 48 48 49 /** Read an osg::Image from file. 49 /** Read an osg::Image from file. 50 50 * Return valid osg::Image on success, 51 51 * return NULL on failure. … … 56 56 extern OSGDB_EXPORT osg::Image* readImageFile(const std::string& filename,const Options* options); 57 57 58 /** Read an osg::Image from file. 58 /** Read an osg::Image from file. 59 59 * Return valid osg::Image on success, 60 60 * return NULL on failure. … … 67 67 } 68 68 69 /** Read an osg::HeightField from file. 69 /** Read an osg::HeightField from file. 70 70 * Return valid osg::HeightField on success, 71 71 * return NULL on failure. … … 76 76 extern OSGDB_EXPORT osg::HeightField* readHeightFieldFile(const std::string& filename,const Options* options); 77 77 78 /** Read an osg::HeightField from file. 78 /** Read an osg::HeightField from file. 79 79 * Return valid osg::HeightField on success, 80 80 * return NULL on failure. … … 87 87 } 88 88 89 /** Read an osg::Node from file. 89 /** Read an osg::Node from file. 90 90 * Return valid osg::Node on success, 91 91 * return NULL on failure. … … 96 96 extern OSGDB_EXPORT osg::Node* readNodeFile(const std::string& filename,const Options* options); 97 97 98 /** Read an osg::Node from file. 98 /** Read an osg::Node from file. 99 99 * Return valid osg::Node on success, 100 100 * return NULL on failure. … … 134 134 } 135 135 136 /** Read an osg::Shader from file. 136 /** Read an osg::Shader from file. 137 137 * Return valid osg::Shader on success, 138 138 * return NULL on failure. … … 143 143 extern OSGDB_EXPORT osg::Shader* readShaderFile(const std::string& filename,const Options* options); 144 144 145 /** Read an osg::Shader from file. 145 /** Read an osg::Shader from file. 146 146 * Return valid osg::Shader on success, 147 147 * return NULL on failure. … … 154 154 } 155 155 156 /** Read an osg::Shader from file and set to specified shader type. 156 /** Read an osg::Shader from file and set to specified shader type. 157 157 * Return valid osg::Shader on success, 158 158 * return NULL on failure. … … 168 168 } 169 169 170 /** Read an osg::Shader from file and set to specified shader type 170 /** Read an osg::Shader from file and set to specified shader type 171 171 * Return valid osg::Shader on success, 172 172 * return NULL on failure. … … 179 179 } 180 180 181 /** Read an osg::Object from file. 181 /** Read an osg::Object from file. 182 182 * Return an assigned osg::ref_ptr on success, 183 183 * return an osg::ref_ptr with a NULL pointer assigned to it on failure. … … 188 188 extern OSGDB_EXPORT osg::ref_ptr<osg::Object> readRefObjectFile(const std::string& filename,const Options* options); 189 189 190 /** Read an osg::Object from file. 190 /** Read an osg::Object from file. 191 191 * Return an assigned osg::ref_ptr on success, 192 192 * return an osg::ref_ptr with a NULL pointer assigned to it on failure. … … 199 199 } 200 200 201 /** Read an osg::Image from file. 201 /** Read an osg::Image from file. 202 202 * Return an assigned osg::ref_ptr on success, 203 203 * return an osg::ref_ptr with a NULL pointer assigned to it on failure. … … 208 208 extern OSGDB_EXPORT osg::ref_ptr<osg::Image> readRefImageFile(const std::string& filename,const Options* options); 209 209 210 /** Read an osg::Image from file. 210 /** Read an osg::Image from file. 211 211 * Return an assigned osg::ref_ptr on success, 212 212 * return an osg::ref_ptr with a NULL pointer assigned to it on failure. … … 219 219 } 220 220 221 /** Read an osg::HeightField from file. 221 /** Read an osg::HeightField from file. 222 222 * Return an assigned osg::ref_ptr on success, 223 223 * return an osg::ref_ptr with a NULL pointer assigned to it on failure. … … 228 228 extern OSGDB_EXPORT osg::ref_ptr<osg::HeightField> readRefHeightFieldFile(const std::string& filename,const Options* options); 229 229 230 /** Read an osg::HeightField from file. 230 /** Read an osg::HeightField from file. 231 231 * Return an assigned osg::ref_ptr on success, 232 232 * return an osg::ref_ptr with a NULL pointer assigned to it on failure. … … 239 239 } 240 240 241 /** Read an osg::Node from file. 241 /** Read an osg::Node from file. 242 242 * Return an assigned osg::ref_ptr on success, 243 243 * return an osg::ref_ptr with a NULL pointer assigned to it on failure. … … 248 248 extern OSGDB_EXPORT osg::ref_ptr<osg::Node> readRefNodeFile(const std::string& filename,const Options* options); 249 249 250 /** Read an osg::Node from file. 250 /** Read an osg::Node from file. 251 251 * Return an assigned osg::ref_ptr on success, 252 252 * return an osg::ref_ptr with a NULL pointer assigned to it on failure. … … 259 259 } 260 260 261 /** Read an osg::Shader from file. 261 /** Read an osg::Shader from file. 262 262 * Return an assigned osg::ref_ptr on success, 263 263 * return an osg::ref_ptr with a NULL pointer assigned to it on failure. … … 268 268 extern OSGDB_EXPORT osg::ref_ptr<osg::Shader> readRefShaderFile(const std::string& filename,const Options* options); 269 269 270 /** Read an osg::Shader from file. 270 /** Read an osg::Shader from file. 271 271 * Return an assigned osg::ref_ptr on success, 272 272 * return an osg::ref_ptr with a NULL pointer assigned to it on failure.
