v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed docs concerning Importer::ReadFile() after a hint in the forum. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@588 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
ulfjorensen 2010-03-06 10:31:37 +00:00
parent de9b7a52f9
commit 2acde008a9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/dox.h
View File

@ -21,7 +21,7 @@ some file formats contain data not supported by ASSIMP, some stuff would require
that it has not yet been implemented, and some formats have not completely been documented by their inventors): that it has not yet been implemented, and some formats have not completely been documented by their inventors):
<hr> <hr>
<br><tt> <br><tt>
<b>Collada</b> ( <i>*.dae;*.xml</i> ) <sup>3</sup><br> <b>Collada</b> ( <i>*.dae;*.xml</i> )<br>
<b>Biovision BVH </b> ( <i>*.bvh</i> ) <br> <b>Biovision BVH </b> ( <i>*.bvh</i> ) <br>
<b>3D Studio Max 3DS</b> ( <i>*.3ds</i> ) <br> <b>3D Studio Max 3DS</b> ( <i>*.3ds</i> ) <br>
<b>3D Studio Max ASE</b> ( <i>*.ase</i> ) <br> <b>3D Studio Max ASE</b> ( <i>*.ase</i> ) <br>
@ -51,6 +51,7 @@ that it has not yet been implemented, and some formats have not completely been
<b>3D GameStudio Model </b> ( <i>*.mdl</i> ) <br> <b>3D GameStudio Model </b> ( <i>*.mdl</i> ) <br>
<b>3D GameStudio Terrain</b> ( <i>*.hmp</i> )<br> <b>3D GameStudio Terrain</b> ( <i>*.hmp</i> )<br>
<b>Ogre</b> (<i>.mesh.xml, .skeleton.xml, .material</i>)<br><br> <b>Ogre</b> (<i>.mesh.xml, .skeleton.xml, .material</i>)<br><br>
<b>Milkshape 3D files</b> ( <i>*.ms3d</i> )<br>
</tt> </tt>
See the @link importer_notes Importer Notes Page @endlink for informations, what a specific importer can do and what not.<br> See the @link importer_notes Importer Notes Page @endlink for informations, what a specific importer can do and what not.<br>

5
include/assimp.hpp
View File

@ -326,8 +326,7 @@ public:
* instance. Use GetOrphanedScene() to take ownership of it. * instance. Use GetOrphanedScene() to take ownership of it.
* *
* @note Assimp is able to determine the file format of a file * @note Assimp is able to determine the file format of a file
* automatically. However, to enable automatic detection of the file * automatically.
* format, the input path *must* not have an extension at all.
*/ */
const aiScene* ReadFile( const aiScene* ReadFile(
const char* pFile, const char* pFile,
@ -366,7 +365,7 @@ public:
* buffers, but it doesn't handle model formats spreading their * buffers, but it doesn't handle model formats spreading their
* data across multiple files or even directories. Examples include * data across multiple files or even directories. Examples include
* OBJ or MD3, which outsource parts of their material stuff into * OBJ or MD3, which outsource parts of their material stuff into
* external scripts. f you need the full functionality, provide * external scripts. If you need the full functionality, provide
* a custom IOSystem to make Assimp find these files. * a custom IOSystem to make Assimp find these files.
*/ */
const aiScene* ReadFileFromMemory( const aiScene* ReadFileFromMemory(