Browse Source

- really update doc.
- update build & installer scripts.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@846 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

aramis_acg 15 years ago
parent
commit
ed3719e119

BIN
doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm


BIN
doc/AssimpDoc_Html/AssimpDoc.chm


+ 1 - 1
doc/Doxyfile

@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = Assimp
-PROJECT_NUMBER         = "v1.1 (April 2010)"
+PROJECT_NUMBER         = "v2.0 (November 2010)"
 OUTPUT_DIRECTORY       = 
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

+ 1 - 1
doc/Doxyfile_Cmd

@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = Assimp Command Line Tools
-PROJECT_NUMBER         = "v1.1 (April 2010)"
+PROJECT_NUMBER         = "v2.0 (November 2010)"
 OUTPUT_DIRECTORY       = 
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

+ 6 - 2
doc/dox.h

@@ -22,6 +22,7 @@ that it has not been implemented yet and some (most ...) formats lack proper spe
 <hr>
 <br><tt>
 <b>Collada</b> ( <i>*.dae;*.xml</i> )<br>
+<b>Blender</b> ( <i>*.blend</i> ) <sup>3</sup><br>
 <b>Biovision BVH </b> ( <i>*.bvh</i> ) <br>
 <b>3D Studio Max 3DS</b> ( <i>*.3ds</i> ) <br>
 <b>3D Studio Max ASE</b> ( <i>*.ase</i> ) <br>
@@ -34,6 +35,7 @@ that it has not been implemented yet and some (most ...) formats lack proper spe
 <b>Quake I</b> ( <i>*.mdl</i> ) <br>
 <b>Quake II</b> ( <i>*.md2</i> ) <br>
 <b>Quake III</b> ( <i>*.md3</i> ) <br>
+<b>Quake 3 BSP</b> ( <i>*.pk3</i> )  <sup>1</sup> <br>
 <b>RtCW</b> ( <i>*.mdc</i> )<br>
 <b>Doom 3</b> ( <i>*.md5mesh;*.md5anim;*.md5camera</i> ) <br>
 <b>DirectX X </b> ( <i>*.x</i> ). <br>		
@@ -55,14 +57,16 @@ that it has not been implemented yet and some (most ...) formats lack proper spe
 <b>Modo Model</b> ( <i>*.lxo</i> )<br>
 <b>CharacterStudio Motion</b> ( <i>*.csm</i> )<br>
 <b>Stanford Ply</b> ( <i>*.ply</i> )<br>
-<b>TrueSpace</b> ( <i>*.cob, *.scn</i> )<br><br>
+<b>TrueSpace</b> ( <i>*.cob, *.scn</i> )<sup>2</sup><br><br>
 </tt>
 See the @link importer_notes Importer Notes Page @endlink for informations, what a specific importer can do and what not. 
 Note that although this paper claims to be the official documentation, 
 http://assimp.sourceforge.net/main_features_formats.html 
 <br>is usually the most up-to-date list of file formats supported by the library. <br>
 
-<sup>3</sup>: These formats support animations, but ASSIMP doesn't yet support them (or they're buggy)
+<sup>1</sup>: Experimental loaders<br>
+<sup>2</sup>: Indicates very limited support - many of the format's features don't map to Assimp's data structures.<br>
+<sup>3</sup>: These formats support animations, but ASSIMP doesn't yet support them (or they're buggy)<br>
 <br>
 <hr>
 

+ 3 - 25
packaging/windows-innosetup/readme_installer.txt

@@ -4,35 +4,13 @@ Open Asset Import Library (Assimp) SDK Installer
 Release Notes
 ------------------------------------------------------------------------------------
 
+http://assimp.sf.net
 
-Known Bugs & Limitations
-========================
-
-
-Assimp
-
-- IRR, DXF, MOT, LWS support is limited 
-
-(the following issues are most likely to be addressed in a near bugfix update to 1.1)
-
-- COB is pretty new on the list, test coverage is bad. Please give feedback.
-- Ogre XML loader fails to load animations properly.
-- ColladaLoader handles instanced nodes not entirely correct.
-
-
-Viewer
-
-- If you toggle all UI components quickly, the app gets confused.
-- For files more than one embedded texture, only the first is loaded.
-- Normals appear flipped from time to time when either of the normals-related menu items was hit.
-- Alpha-sorting is implemented, but still causes artifacts when models are moved quickly.
-- Several important texture file formats (such as GIF) are not supported.
-- HUD is blurred on the right side. ATI/AMD hardware only.
 
 Troubleshooting
 ===============
 
-1. Missing d3dx9_42.dll? 
+1. Missing d3dx9_(some-number).dll? 
 Install the latest DirectX runtime or grab the file from somewhere (that's evil but mostly fine).
 
 2. Application configuration not correct / missing msvcr***.dll?
@@ -42,4 +20,4 @@ Reinstall Microsoft Visual C++ 2005 SP1 Redistributable (x86 or x64, depending o
 Add it to PATH. That's not a bug, the installer does not alter the PATH.
 
 4. Crashes immediately
-You CPU lacks SSE2 support. Build Assimp from scratch to suit your CPU, sorry.ut mostly fine).
+You CPU lacks SSE2 support. Build Assimp from scratch to suit your CPU, sorry.

+ 2 - 3
packaging/windows-innosetup/readme_installer_vieweronly.txt

@@ -4,14 +4,13 @@ Open Asset Import Library (Assimp) Viewer Installer
 Release Notes
 ------------------------------------------------------------------------------------
 
+http://assimp.sf.net
 
 Known Bugs & Limitations
 ========================
 
 Viewer
 
-- If you toggle all UI components quickly, the app gets confused.
-- For files more than one embedded texture, only the first is loaded.
 - Normals appear flipped from time to time when either of the normals-related menu items was hit.
 - Alpha-sorting is implemented, but still causes artifacts when models are moved quickly.
 - Several important texture file formats (such as GIF) are not supported.
@@ -20,7 +19,7 @@ Viewer
 Troubleshooting
 ===============
 
-1. Missing d3dx9_42.dll? 
+1. Missing d3dx9_(number).dll? 
 Install the latest DirectX runtime or grab the file from somewhere (that's evil but mostly fine).
 
 2. Application configuration not correct / missing msvcr***.dll?

+ 12 - 5
packaging/windows-innosetup/script.iss

@@ -2,7 +2,7 @@
 
 [Setup]
 AppName=Open Asset Import Library - SDK
-AppVerName=Open Asset Import Library - SDK (v1.1)
+AppVerName=Open Asset Import Library - SDK (v2.0)
 DefaultDirName={pf}\Assimp
 DefaultGroupName=Assimp
 UninstallDisplayIcon={app}\bin\x86\assimp.exe
@@ -12,9 +12,9 @@ SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico
 WizardImageFile=compiler:WizModernImage-IS.BMP
 WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP
 LicenseFile=License.rtf
-OutputBaseFileName=assimp-sdk-1.1-setup
-VersionInfoVersion=1.1.0.0
-VersionInfoTextVersion=1.1
+OutputBaseFileName=assimp-sdk-2.0-setup
+VersionInfoVersion=2.0.0.0
+VersionInfoTextVersion=2.0
 VersionInfoCompany=Assimp Development Team
 ArchitecturesInstallIn64BitMode=x64
 
@@ -29,9 +29,11 @@ Name: "tools"; Description: "Asset Viewer & Command Line Tools (32 and 64 Bit)";
 Name: "help"; Description: "Help Files"; Types: full compact
 Name: "samples"; Description: "Samples"; Types: full
 ;Name: "wsource"; Description: "Source Code"; Types: full
-Name: "test"; Description: "Test Models"; Types: full
+Name: "test"; Description: "Test Models (BSD-licensed)"; Types: full
+Name: "test_nonbsd"; Description: "Test Models (other (free) licenses)"; Types: full
 Name: "pyassimp"; Description: "Python Bindings"; Types: full
 Name: "dassimp"; Description: "D Bindings"; Types: full
+Name: "assimp_net"; Description: "C#/.NET Bindings"; Types: full
 ;Name: "vc8"; Description: "VC8 project files"; Types: full
 ;Name: "vc9"; Description: "VC9 project files"; Types: full
 
@@ -86,6 +88,10 @@ Source: "..\..\include\*"; DestDir: "{app}\include"; Flags: recursesubdirs
 
 ; dAssimp
 Source: "..\..\port\dAssimp\*"; DestDir: "{app}\port\D"; Flags: recursesubdirs; Components: dassimp
+Source: "..\..\port\swig\*"; DestDir: "{app}\port\D_SwigExperimental"; Flags: recursesubdirs; Components: dassimp
+
+; Assimp.NET
+Source: "..\..\port\Assimp.NET\*"; DestDir: "{app}\port\C#"; Flags: recursesubdirs; Components: assimp_net
 
 ; PyAssimp
 Source: "..\..\port\PyAssimp\*"; DestDir: "{app}\port\Python"; Excludes: "*.pyc,*.dll"; Flags: recursesubdirs; Components: pyassimp
@@ -93,6 +99,7 @@ Source: "..\..\port\PyAssimp\*"; DestDir: "{app}\port\Python"; Excludes: "*.pyc,
 ; Test repository
 Source: "..\..\test\models\*"; DestDir: "{app}\test\models"; Flags: recursesubdirs; Components: test
 Source: "..\..\test\regression\*"; DestDir: "{app}\test\regression"; Flags: recursesubdirs; Components: test
+Source: "..\..\test\models-nonbsd\*"; DestDir: "{app}\test\models-nonbsd"; Flags: recursesubdirs; Components: test_nonbsd
 
 ; Source Code & Workspaces
 ;Source: "..\..\code\*"; Excludes: "*.o"; DestDir: "{app}\code"; Flags: recursesubdirs; Components: wsource

+ 2 - 8
packaging/windows-mkzip/mkfinal.bat

@@ -49,7 +49,7 @@ SET /p REVISIONBASE= < tmpfile.txt
 DEL /q tmpfile.txt
 cd ..\packaging\windows-mkzip
 
-SET VERSIONBASE=1.1.%REVISIONBASE%
+SET VERSIONBASE=2.0.%REVISIONBASE%
 
 SET OUT_SDK=assimp--%VERSIONBASE%-sdk
 SET OUT_BIN=assimp--%VERSIONBASE%-bin
@@ -99,7 +99,7 @@ rem We take the current revision and remove some stuff
 rem that is nto yet ready to be published.
 rem -----------------------------------------------------
 
-svn export .\..\..\  final\%OUT_SDK%
+svn export .\..\..\  .\final\%OUT_SDK%
 
 mkdir final\%OUT_SDK%\doc\assimp_html
 mkdir final\%OUT_SDK%\doc\assimpcmd_html
@@ -121,12 +121,6 @@ rem Insert 'dummy' files into empty folders
 echo. > final\%OUT_SDK%\lib\dummy
 echo. > final\%OUT_SDK%\obj\dummy
 
-rem Remove WIP ports and language bindings
-RD  /s /q final\%OUT_SDK%\port\Assimp.NET
-RD  /s /q final\%OUT_SDK%\port\jAssimp
-RD  /s /q final\%OUT_SDK%\port\BrainFuckAssimp
-RD  /s /q final\%OUT_SDK%\port\swig
-
 rem Also, repackaging is not a must-have feature
 RD  /s /q final\%OUT_SDK%\packaging
 

+ 1 - 1
revision.h

@@ -1 +1 @@
-#define SVNRevision  805
+#define SVNRevision  842