diff --git a/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm b/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm index 5179a8447..cd36cd342 100644 Binary files a/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm and b/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm differ diff --git a/doc/AssimpDoc_Html/AssimpDoc.chm b/doc/AssimpDoc_Html/AssimpDoc.chm index e5dc5b636..5d760fb11 100644 Binary files a/doc/AssimpDoc_Html/AssimpDoc.chm and b/doc/AssimpDoc_Html/AssimpDoc.chm differ diff --git a/doc/Doxyfile b/doc/Doxyfile index 831876bd1..ba5bd2d93 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = Assimp -PROJECT_NUMBER = r590 +PROJECT_NUMBER = "v1.1 (April 2010)" OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -172,7 +172,7 @@ DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project GENERATE_HTMLHELP = YES CHM_FILE = AssimpDoc.chm -HHC_LOCATION = "C:/Program Files/HTML Help Workshop/hhc.exe" +HHC_LOCATION = "C:\Program Files (x86)\HTML Help Workshop/hhc.exe" GENERATE_CHI = NO CHM_INDEX_ENCODING = BINARY_TOC = NO diff --git a/doc/Doxyfile_Cmd b/doc/Doxyfile_Cmd index 7cf427b6d..703d915cf 100644 --- a/doc/Doxyfile_Cmd +++ b/doc/Doxyfile_Cmd @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = Assimp Command Line Tools -PROJECT_NUMBER = r400 +PROJECT_NUMBER = "v1.1 (April 2010)" OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -170,7 +170,7 @@ DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project GENERATE_HTMLHELP = YES CHM_FILE = AssimpCmdDoc.chm -HHC_LOCATION = "C:/Program Files/HTML Help Workshop/hhc.exe" +HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe" GENERATE_CHI = NO CHM_INDEX_ENCODING = BINARY_TOC = NO diff --git a/doc/dox_cmd.h b/doc/dox_cmd.h index 7de5b2946..e764f7a83 100644 --- a/doc/dox_cmd.h +++ b/doc/dox_cmd.h @@ -46,6 +46,14 @@ The following commands are available: @link extract extract @endlink Extract an embedded texture image + + @link iinfo info @endlink + Load a model and print basic statistics + + + @link cmpdump cmpdump @endlink + Regression checking tool + If you use assimp's command line frequently, consider adding assimp to your PATH @@ -66,6 +74,73 @@ Display the version/revision of Assimp used. Display a really helpful text. */ +//---------------------------------------------------------------------------------------------- +// ASSIMP INFO + +/** +@page iinfo 'info'-Command + +Load a model file and print basic statistics. Full postprocessing is applied unless the -r switch is specified. Sample output (assimp info ./test/models/3DS/mar_rifle.3ds): + +@verbatim +Launching model import ... OK +Validating postprocessing flags ... OK +Importing file ... OK + import took approx. 0.02400 seconds + +Memory consumption: 69444 B +Nodes: 2 +Maximum depth 2 +Meshes: 1 +Animations: 0 +Textures (embed.): 0 +Materials: 1 +Cameras: 0 +Lights: 0 +Vertices: 843 +Faces: 572 +Bones: 0 +Animation Channels: 0 +Primitive Types: triangles +Average faces/mesh 572 +Average verts/mesh 843 +Minimum point (-3.522588 -11.573204 -40.340359) +Maximum point (3.522622 30.196556 75.941292) +Center point (0.000017 9.311676 17.800467) + +Named Materials: + 'mat1' + +Texture Refs: + 'm_rifl.bmp' + +Node hierarchy: +'<3DSRoot>', meshes: 0 +-- 'm_rifle', meshes: 1 +<-- +@endverbatim + +

Syntax:

+ +@code +assimp info file [-r] +@endcode + + +

Parameters:

+ +

+ +file

+Required. Input file. +

+

+ +-r
+Optional. Don't perform any postprocessing. The long form of this parameter is --raw. +

+ +*/ //---------------------------------------------------------------------------------------------- // ASSIMP CMPDUMP