浏览代码

Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting

kkulling 5 年之前
父节点
当前提交
4e16716924
共有 100 个文件被更改,包括 165 次插入167 次删除
  1. 50 50
      INSTALL
  2. 1 1
      code/AssetLib/AMF/AMFImporter_Geometry.cpp
  3. 1 1
      code/AssetLib/AMF/AMFImporter_Macro.hpp
  4. 1 1
      code/AssetLib/AMF/AMFImporter_Material.cpp
  5. 1 1
      code/AssetLib/AMF/AMFImporter_Node.hpp
  6. 1 1
      code/AssetLib/MMD/MMDImporter.h
  7. 1 1
      code/AssetLib/glTF/glTFAsset.h
  8. 1 1
      code/AssetLib/glTF/glTFExporter.cpp
  9. 1 1
      code/AssetLib/glTF/glTFImporter.cpp
  10. 1 1
      code/AssetLib/glTF2/glTF2Exporter.cpp
  11. 1 1
      code/Common/ImporterRegistry.cpp
  12. 1 1
      code/PostProcessing/ArmaturePopulate.h
  13. 1 1
      code/PostProcessing/ScaleProcess.h
  14. 1 1
      code/PostProcessing/ValidateDataStructure.cpp
  15. 1 1
      contrib/Open3DGC/o3dgcSC3DMCDecoder.h
  16. 1 1
      contrib/android-cmake/README.md
  17. 1 1
      contrib/gtest/docs/Documentation.md
  18. 1 1
      contrib/gtest/docs/V1_5_Documentation.md
  19. 1 1
      contrib/gtest/docs/V1_5_PumpManual.md
  20. 1 1
      contrib/gtest/docs/V1_5_XcodeGuide.md
  21. 1 1
      contrib/gtest/docs/V1_6_Documentation.md
  22. 1 1
      contrib/gtest/docs/V1_6_XcodeGuide.md
  23. 1 1
      contrib/gtest/docs/V1_7_Documentation.md
  24. 1 1
      contrib/gtest/docs/V1_7_XcodeGuide.md
  25. 1 1
      contrib/gtest/docs/XcodeGuide.md
  26. 2 2
      contrib/poly2tri/README
  27. 1 1
      contrib/poly2tri/poly2tri/common/shapes.cc
  28. 1 1
      contrib/poly2tri/poly2tri/common/shapes.h
  29. 1 1
      contrib/poly2tri/poly2tri/poly2tri.h
  30. 1 1
      contrib/poly2tri/poly2tri/sweep/advancing_front.cc
  31. 1 1
      contrib/poly2tri/poly2tri/sweep/advancing_front.h
  32. 1 1
      contrib/poly2tri/poly2tri/sweep/cdt.cc
  33. 1 1
      contrib/poly2tri/poly2tri/sweep/cdt.h
  34. 1 1
      contrib/poly2tri/poly2tri/sweep/sweep.h
  35. 1 1
      contrib/stb_image/stb_image.h
  36. 1 1
      contrib/zip/.travis.sh
  37. 1 1
      contrib/zip/.travis.yml
  38. 1 1
      contrib/zlib/contrib/blast/test.txt
  39. 1 1
      contrib/zlib/contrib/dotzlib/LICENSE_1_0.txt
  40. 1 1
      contrib/zlib/contrib/testzlib/testzlib.txt
  41. 1 1
      contrib/zlib_note.txt
  42. 1 1
      doc/architecture/Assimp_Arch_Import.class.violet.html
  43. 1 1
      doc/architecture/Assimp_Arch_export.class.violet.html
  44. 1 1
      doc/architecture/assimp.object.violet.html
  45. 1 1
      doc/architecture/assimp_usecase.ucase.violet.html
  46. 1 1
      doc/architecture/process.class.violet.html
  47. 1 1
      include/assimp/scene.h
  48. 6 8
      packaging/windows-innosetup/WEB
  49. 1 1
      packaging/windows-innosetup/readme_installer_vieweronly.txt
  50. 1 1
      packaging/windows-mkzip/bin_readme.txt
  51. 11 11
      port/PyAssimp/pyassimp/errors.py
  52. 1 1
      port/jassimp/jassimp/src/jassimp/AiAnimation.java
  53. 1 1
      port/jassimp/jassimp/src/jassimp/AiBlendMode.java
  54. 1 1
      port/jassimp/jassimp/src/jassimp/AiCamera.java
  55. 1 1
      port/jassimp/jassimp/src/jassimp/AiProgressHandler.java
  56. 1 1
      port/jassimp/jassimp/src/jassimp/AiQuaternion.java
  57. 1 1
      port/jassimp/jassimp/src/jassimp/AiTextureType.java
  58. 1 1
      port/swig/DONOTUSEYET
  59. 1 1
      samples/SimpleAssimpViewX/README
  60. 1 1
      samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp
  61. 1 1
      test/models-nonbsd/3DS/jeep1.3ds.readme.txt
  62. 1 1
      test/models-nonbsd/3DS/pyramob.3ds.readme.txt
  63. 1 1
      test/models-nonbsd/ASE/Rifle.source.txt
  64. 1 1
      test/models-nonbsd/ASE/Rifle2.source.txt
  65. 1 1
      test/models-nonbsd/B3D/turtle.source.txt
  66. 1 1
      test/models-nonbsd/DXF/rifle.source.txt
  67. 1 1
      test/models-nonbsd/FBX/2013_ASCII/jeep1.fbx.readme.txt
  68. 1 1
      test/models-nonbsd/FBX/2013_ASCII/pyramob.fbx.readme.txt
  69. 1 1
      test/models-nonbsd/FBX/2013_BINARY/jeep1.fbx.readme.txt
  70. 1 1
      test/models-nonbsd/FBX/2013_BINARY/pyramob.fbx.readme.txt
  71. 1 1
      test/models-nonbsd/IFC/linklist.txt
  72. 1 1
      test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw.source.txt
  73. 1 1
      test/models-nonbsd/LWO/LWO2/rifle.source.txt
  74. 1 1
      test/models-nonbsd/LWS/QuickDraw v2.2.source.txt
  75. 1 1
      test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/readme_kubalwagon.txt
  76. 1 1
      test/models-nonbsd/MD3/readme_water.txt
  77. 1 1
      test/models-nonbsd/MMD/readme.txt
  78. 1 1
      test/models-nonbsd/NFF/NFFSense8/credits.txt
  79. 1 1
      test/models-nonbsd/OBJ/rifle.source.txt
  80. 1 1
      test/models-nonbsd/OBJ/segment.source.txt
  81. 1 1
      test/models-nonbsd/Ogre/OgreSDK/LICENSE
  82. 1 1
      test/models-nonbsd/Ogre/OgreSDK/README.md
  83. 1 1
      test/models-nonbsd/README.txt
  84. 1 1
      test/models/3DS/UVTransformTest/note.txt
  85. 1 1
      test/models/3DS/textures.txt
  86. 1 1
      test/models/ASE/MotionCaptureROM.source.txt
  87. 1 1
      test/models/BLEND/HUMAN.source.txt
  88. 1 1
      test/models/BVH/01_nn.bvh.source.txt
  89. 1 1
      test/models/CSM/ThomasFechten.source.txt
  90. 1 1
      test/models/IRRMesh/credits.txt
  91. 1 1
      test/models/LWO/LWO2/MappingModes/earthCylindric.txt
  92. 1 1
      test/models/LWO/LWO2/MappingModes/earthSpherical.source.txt
  93. 1 1
      test/models/LWO/LWO2/concrete.source.txt
  94. 1 1
      test/models/LWO/LWO2/uvtest-source.txt
  95. 1 1
      test/models/MD2/faerie-source.txt
  96. 1 1
      test/models/MD2/sidney-source.txt
  97. 1 1
      test/models/MD5/SimpleCube.source.txt
  98. 1 1
      test/models/MDL/MDL3 (3DGS A4)/minigun_readme.txt
  99. 1 1
      test/models/MDL/MDL5 (3DGS A5)/minigun_mdl5_readme.txt
  100. 1 1
      test/models/MS3D/jeep1.readme.txt

+ 50 - 50
INSTALL

@@ -1,50 +1,50 @@
-	
-========================================================================
-Open Asset Import Library (assimp) INSTALL 
-========================================================================
-
-------------------------------
-Getting the documentation
-------------------------------
-
-A regularly-updated copy is available at 
-http://assimp.sourceforge.net/lib_html/index.html
-
-A CHM file is included in the SVN repos: ./doc/AssimpDoc_Html/AssimpDoc.chm.
-To build the doxygen documentation on your own, follow these steps:
-
-a) download & install latest doxygen 
-b) make sure doxygen is in the executable search path
-c) navigate to ./doc
-d) and run 'doxygen'
-
-Open the generated HTML (AssimpDoc_Html/index.html) in the browser of your choice.
-Windows only: To generate the CHM doc, install 'Microsoft HTML Workshop'
-and configure the path to it in the DOXYFILE first. 
-
-------------------------------
-Building Assimp 
-------------------------------
-
-More detailed build instructions can be found in the documentation,
-this section is just for the inpatient among you.
-
-CMake is the preferred build system for Assimp. The minimum required version 
-is 2.6. If you don't have it yet, downloads for CMake can be found on
-http://www.cmake.org/. 
-
-For Unix:
-
-1. mkdir build && cd build
-2. cmake .. -G 'Unix Makefiles'
-3. make -j4
-
-For Windows:
-1. Open a command prompt
-2. mkdir build
-3. cd build
-4. cmake ..
-5. cmake --build .
-
-For iOS:
-Just check the following project, which deploys a compiler toolchain for different iOS-versions: https://github.com/assimp/assimp/tree/master/port/iOS
+	
+========================================================================
+Open Asset Import Library (assimp) INSTALL 
+========================================================================
+
+------------------------------
+Getting the documentation
+------------------------------
+
+A regularly-updated copy is available at 
+http://assimp.sourceforge.net/lib_html/index.html
+
+A CHM file is included in the SVN repos: ./doc/AssimpDoc_Html/AssimpDoc.chm.
+To build the doxygen documentation on your own, follow these steps:
+
+a) download & install latest doxygen 
+b) make sure doxygen is in the executable search path
+c) navigate to ./doc
+d) and run 'doxygen'
+
+Open the generated HTML (AssimpDoc_Html/index.html) in the browser of your choice.
+Windows only: To generate the CHM doc, install 'Microsoft HTML Workshop'
+and configure the path to it in the DOXYFILE first. 
+
+------------------------------
+Building Assimp 
+------------------------------
+
+More detailed build instructions can be found in the documentation,
+this section is just for the inpatient among you.
+
+CMake is the preferred build system for Assimp. The minimum required version 
+is 2.6. If you don't have it yet, downloads for CMake can be found on
+http://www.cmake.org/. 
+
+For Unix:
+
+1. mkdir build && cd build
+2. cmake .. -G 'Unix Makefiles'
+3. make -j4
+
+For Windows:
+1. Open a command prompt
+2. mkdir build
+3. cd build
+4. cmake ..
+5. cmake --build .
+
+For iOS:
+Just check the following project, which deploys a compiler toolchain for different iOS-versions: https://github.com/assimp/assimp/tree/master/port/iOS

+ 1 - 1
code/AssetLib/AMF/AMFImporter_Geometry.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

+ 1 - 1
code/AssetLib/AMF/AMFImporter_Macro.hpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

+ 1 - 1
code/AssetLib/AMF/AMFImporter_Material.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

+ 1 - 1
code/AssetLib/AMF/AMFImporter_Node.hpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

+ 1 - 1
code/AssetLib/MMD/MMDImporter.h

@@ -93,4 +93,4 @@ private:
 
 } // Namespace Assimp
 
-#endif
+#endif

+ 1 - 1
code/AssetLib/glTF/glTFAsset.h

@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 

+ 1 - 1
code/AssetLib/glTF/glTFExporter.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 

+ 1 - 1
code/AssetLib/glTF/glTFImporter.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 

+ 1 - 1
code/AssetLib/glTF2/glTF2Exporter.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 

+ 1 - 1
code/Common/ImporterRegistry.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

+ 1 - 1
code/PostProcessing/ArmaturePopulate.h

@@ -109,4 +109,4 @@ public:
 } // Namespace Assimp
 
 
-#endif // SCALE_PROCESS_H_
+#endif // SCALE_PROCESS_H_

+ 1 - 1
code/PostProcessing/ScaleProcess.h

@@ -94,4 +94,4 @@ private:
 } // Namespace Assimp
 
 
-#endif // SCALE_PROCESS_H_
+#endif // SCALE_PROCESS_H_

+ 1 - 1
code/PostProcessing/ValidateDataStructure.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

+ 1 - 1
contrib/Open3DGC/o3dgcSC3DMCDecoder.h

@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2013 Khaled Mammou - Advanced Micro Devices, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

+ 1 - 1
contrib/android-cmake/README.md

@@ -237,4 +237,4 @@ The _android-cmake_ should correctly handle projects with assembler sources (`*.
 
 ## Copying
 
-_android-cmake_ is distributed under the terms of [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
+_android-cmake_ is distributed under the terms of [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)

+ 1 - 1
contrib/gtest/docs/Documentation.md

@@ -11,4 +11,4 @@ documentation for that specific version instead.**
 To contribute code to Google Test, read:
 
   * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
-  * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files.
+  * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files.

+ 1 - 1
contrib/gtest/docs/V1_5_Documentation.md

@@ -9,4 +9,4 @@ This page lists all official documentation wiki pages for Google Test **1.5.0**
 To contribute code to Google Test, read:
 
   * DevGuide -- read this _before_ writing your first patch.
-  * [PumpManual](V1_5_PumpManual.md) -- how we generate some of Google Test's source files.
+  * [PumpManual](V1_5_PumpManual.md) -- how we generate some of Google Test's source files.

+ 1 - 1
contrib/gtest/docs/V1_5_PumpManual.md

@@ -174,4 +174,4 @@ You can find real-world applications of Pump in [Google Test](http://www.google.
 ## Tips ##
 
   * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1.
-  * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.
+  * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.

+ 1 - 1
contrib/gtest/docs/V1_5_XcodeGuide.md

@@ -90,4 +90,4 @@ The Debugger has exited with status 0.
 
 # Summary #
 
-Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.

+ 1 - 1
contrib/gtest/docs/V1_6_Documentation.md

@@ -11,4 +11,4 @@ documentation for that specific version instead.**
 To contribute code to Google Test, read:
 
   * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
-  * [PumpManual](V1_6_PumpManual.md) -- how we generate some of Google Test's source files.
+  * [PumpManual](V1_6_PumpManual.md) -- how we generate some of Google Test's source files.

+ 1 - 1
contrib/gtest/docs/V1_6_XcodeGuide.md

@@ -90,4 +90,4 @@ The Debugger has exited with status 0.
 
 # Summary #
 
-Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.

+ 1 - 1
contrib/gtest/docs/V1_7_Documentation.md

@@ -11,4 +11,4 @@ documentation for that specific version instead.**
 To contribute code to Google Test, read:
 
   * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
-  * [PumpManual](V1_7_PumpManual.md) -- how we generate some of Google Test's source files.
+  * [PumpManual](V1_7_PumpManual.md) -- how we generate some of Google Test's source files.

+ 1 - 1
contrib/gtest/docs/V1_7_XcodeGuide.md

@@ -90,4 +90,4 @@ The Debugger has exited with status 0.
 
 # Summary #
 
-Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.

+ 1 - 1
contrib/gtest/docs/XcodeGuide.md

@@ -90,4 +90,4 @@ The Debugger has exited with status 0.
 
 # Summary #
 
-Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.

+ 2 - 2
contrib/poly2tri/README

@@ -1,4 +1,4 @@
-==================
+==================
 INSTALLATION GUIDE
 ==================
 
@@ -48,4 +48,4 @@ Examples:
   ./p2t nazca_monkey.dat 0 0 9
   
   ./p2t random 10 100 5.0
-  ./p2t random 1000 20000 0.025
+  ./p2t random 1000 20000 0.025

+ 1 - 1
contrib/poly2tri/poly2tri/common/shapes.cc

@@ -362,4 +362,4 @@ void Triangle::DebugPrint()
   cout << points_[2]->x << "," << points_[2]->y << endl;
 }
 
-}
+}

+ 1 - 1
contrib/poly2tri/poly2tri/common/shapes.h

@@ -324,4 +324,4 @@ inline void Triangle::IsInterior(bool b)
 
 }
 
-#endif
+#endif

+ 1 - 1
contrib/poly2tri/poly2tri/poly2tri.h

@@ -35,4 +35,4 @@
 #include "common/shapes.h"
 #include "sweep/cdt.h"
 
-#endif
+#endif

+ 1 - 1
contrib/poly2tri/poly2tri/sweep/advancing_front.cc

@@ -105,4 +105,4 @@ AdvancingFront::~AdvancingFront()
 {
 }
 
-}
+}

+ 1 - 1
contrib/poly2tri/poly2tri/sweep/advancing_front.h

@@ -115,4 +115,4 @@ inline void AdvancingFront::set_search(Node* node)
 
 }
 
-#endif
+#endif

+ 1 - 1
contrib/poly2tri/poly2tri/sweep/cdt.cc

@@ -68,4 +68,4 @@ CDT::~CDT()
   delete sweep_;
 }
 
-}
+}

+ 1 - 1
contrib/poly2tri/poly2tri/sweep/cdt.h

@@ -102,4 +102,4 @@ public:
 
 }
 
-#endif
+#endif

+ 1 - 1
contrib/poly2tri/poly2tri/sweep/sweep.h

@@ -282,4 +282,4 @@ private:
 
 }
 
-#endif
+#endif

+ 1 - 1
contrib/stb_image/stb_image.h

@@ -7459,4 +7459,4 @@ AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ------------------------------------------------------------------------------
-*/
+*/

+ 1 - 1
contrib/zip/.travis.sh

@@ -15,4 +15,4 @@ else
     make -j 8
     make install
     ASAN_OPTIONS=detect_leaks=0 LSAN_OPTIONS=verbosity=1:log_threads=1 ctest -V
-fi
+fi

+ 1 - 1
contrib/zip/.travis.yml

@@ -19,4 +19,4 @@ after_success:
   - make
   - make test
   # Uploading report to CodeCov
-  - bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash)

+ 1 - 1
contrib/zlib/contrib/blast/test.txt

@@ -1 +1 @@
-AIAIAIAIAIAIA
+AIAIAIAIAIAIA

+ 1 - 1
contrib/zlib/contrib/dotzlib/LICENSE_1_0.txt

@@ -20,4 +20,4 @@ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+DEALINGS IN THE SOFTWARE.

+ 1 - 1
contrib/zlib/contrib/testzlib/testzlib.txt

@@ -7,4 +7,4 @@ copy to a directory file from :
 - contrib/masmx64
 - contrib/vstudio/vc7
 
-and open testzlib8.sln
+and open testzlib8.sln

+ 1 - 1
contrib/zlib_note.txt

@@ -8,4 +8,4 @@ This is a heavily modified and shrinked version of zlib 1.2.3
 
 Assimp itself does not use the compression part yet, so
 it needn't be compiled (trees.c, deflate.c, compress.c).
-Currently these units are just used by assimp_cmd.
+Currently these units are just used by assimp_cmd.

+ 1 - 1
doc/architecture/Assimp_Arch_Import.class.violet.html

@@ -351,4 +351,4 @@ BI8AxOURXedNEuG6jMiRPHKQsuuS4BGAuDzS0NCQlZV18JFlRI7qkRRdlwSPAHzCIynKaa5LgkcA
 ETwCgEfwCAAewSMAeASP4BEAPIJHAPAIHgFItrEBsYNHAD7BK4gZPAKAR/AIAB7BIwCQBvwfU/j0
 jy2hMWgAAAAASUVORK5C" />
 </BODY>
-</HTML>
+</HTML>

+ 1 - 1
doc/architecture/Assimp_Arch_export.class.violet.html

@@ -645,4 +645,4 @@ tQ2gtkFtg9oGQG2jtkFtA6C2UduA2gZQ26C2QW0DoLZR26C2AVDbqG1AbQMoKg8CahvUNgBqG7UN
 ahsAtY3aBtQ2AGobtQ1qGwC1jdoGtQ2A2kZtA2obALWN2ga1DUA1igr2o7ZBbQPw0/wD+/DsALUN
 gNpGbYPaBkBto7ZBbQMAAD/R/wDNluGGIxSgmAAAAABJRU5ErkJg" />
 </BODY>
-</HTML>
+</HTML>

+ 1 - 1
doc/architecture/assimp.object.violet.html

@@ -104,4 +104,4 @@ tfMWuhaZfgHUw0Q32sDAwIcPH4I/C1fbaJVKRX0GBwft4RA5hXdkNepJqndpKD2R7TlrjeqmxkKh
 oLOf5O8VrfC7XlrtOvYCO77PYocddthhhx122GGHHXbYYYcddthhhx122GGHHXbYYYdd29q1c83s
 I9m5B21Yuxg77FJtRzQV/wEjVLA5JUDyfgAAAABJRU5ErkJg" />
 </BODY>
-</HTML>
+</HTML>

+ 1 - 1
doc/architecture/assimp_usecase.ucase.violet.html

@@ -872,4 +872,4 @@ DYMQQgghNAxCCCGEEBoGIYQQQmgYhBBCCKFhEEIIIYTQMAghhBBCwyCEEEIIDYMQQgghNAxCCCGE
 EBoGIYQQQmgYhBBCCKFhEEIIIYTQMAghhBBCwyCEEEJI/PP/A0zci3P89Qf2AAAAAElFTkSuQmCC
 " />
 </BODY>
-</HTML>
+</HTML>

+ 1 - 1
doc/architecture/process.class.violet.html

@@ -334,4 +334,4 @@ CQCsyZpgTQCsyZpgTQCsyZpgTQCsyZpgTQCsCdZkTQBgTdZkTQBgTdZkTQBgTdYEawJgTdYEawJg
 TdYEawJgTbAmawIAa7ImawIAa7ImawIAa7ImWBMAa7ImWBMAa7ImWBPAvDIByoc1WRMA/uU3lI1q
 YU0ArAnWZE0AYE3WZE0AABY4/wVVY1WTrOVxIAAAAABJRU5ErkJg" />
 </BODY>
-</HTML>
+</HTML>

+ 1 - 1
include/assimp/scene.h

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

+ 6 - 8
packaging/windows-innosetup/WEB

@@ -1,8 +1,6 @@
-
-Project home page:
-http://assimp.sourceforge.net
-
-Sourceforge.net project page:
-http://www.sourceforge.net/projects/assimp
-
-
+
+Project home page:
+http://assimp.sourceforge.net
+
+Sourceforge.net project page:
+http://www.sourceforge.net/projects/assimp

+ 1 - 1
packaging/windows-innosetup/readme_installer_vieweronly.txt

@@ -29,4 +29,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.
+You CPU lacks SSE2 support. Build Assimp from scratch to suit your CPU, sorry.

+ 1 - 1
packaging/windows-mkzip/bin_readme.txt

@@ -26,4 +26,4 @@ Install the latest DirectX runtime or grab the file from somewhere (that's evil
 (Re)install Microsoft Visual C++ 2005 SP1 Redistributable (x86 or x64, depending on your system)
 
 3. Crashes immediately
-You CPU lacks SSE2 support. Build Assimp from scratch to suit your CPU, sorry.
+You CPU lacks SSE2 support. Build Assimp from scratch to suit your CPU, sorry.

+ 11 - 11
port/PyAssimp/pyassimp/errors.py

@@ -1,11 +1,11 @@
-#-*- coding: UTF-8 -*-
-
-"""
-All possible errors.
-"""
-
-class AssimpError(BaseException):
-    """
-    If an internal error occurs.
-    """
-    pass
+#-*- coding: UTF-8 -*-
+
+"""
+All possible errors.
+"""
+
+class AssimpError(BaseException):
+    """
+    If an internal error occurs.
+    """
+    pass

+ 1 - 1
port/jassimp/jassimp/src/jassimp/AiAnimation.java

@@ -172,4 +172,4 @@ public final class AiAnimation {
     public List<AiMeshAnim> getMeshChannels() {
         throw new UnsupportedOperationException("not implemented yet");
     }    
-}
+}

+ 1 - 1
port/jassimp/jassimp/src/jassimp/AiBlendMode.java

@@ -114,4 +114,4 @@ public enum AiBlendMode {
     * The mapped c/c++ integer enum value.
     */
    private final int m_rawValue;
-}
+}

+ 1 - 1
port/jassimp/jassimp/src/jassimp/AiCamera.java

@@ -300,4 +300,4 @@ public final class AiCamera {
      * Aspect ratio.
      */
     private final float m_aspect;
-}
+}

+ 1 - 1
port/jassimp/jassimp/src/jassimp/AiProgressHandler.java

@@ -43,4 +43,4 @@ package jassimp;
 public interface AiProgressHandler
 {
     boolean update(float percentage);
-}
+}

+ 1 - 1
port/jassimp/jassimp/src/jassimp/AiQuaternion.java

@@ -162,4 +162,4 @@ public final class AiQuaternion {
         return "[" + getX() + ", " + getY() + ", " + getZ() + ", " + 
                 getW() + "]";
     }    
-}
+}

+ 1 - 1
port/jassimp/jassimp/src/jassimp/AiTextureType.java

@@ -209,4 +209,4 @@ public enum AiTextureType {
     * The mapped c/c++ integer enum value.
     */
    private final int m_rawValue;
-}
+}

+ 1 - 1
port/swig/DONOTUSEYET

@@ -1 +1 @@
-The interface files are by no means complete yet and only work with the not-yet-released D SWIG backend, although adding support for other languages should not be too much of problem via #ifdefs.
+The interface files are by no means complete yet and only work with the not-yet-released D SWIG backend, although adding support for other languages should not be too much of problem via #ifdefs.

+ 1 - 1
samples/SimpleAssimpViewX/README

@@ -19,4 +19,4 @@ Troubleshooting:
   - OSX workspaces are not updated too frequently, so same files may be missing.
 
 If you have any problems which you can't solve on your own, 
-please report them on the thread above.
+please report them on the thread above.

+ 1 - 1
samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp

@@ -1,4 +1,4 @@
-// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 // Simple Assimp Directx11 Sample
 // This is a very basic sample and only reads diffuse texture
 // but this can load both embedded textures in fbx and non-embedded textures

+ 1 - 1
test/models-nonbsd/3DS/jeep1.3ds.readme.txt

@@ -12,4 +12,4 @@ http://xu1productions.com/3dstudio/index.html  -  3D Game Resources
 
 http://www.psionicdesign.com  -  My Main 2D/3D Digital Art site
 
-Psionic 2002
+Psionic 2002

+ 1 - 1
test/models-nonbsd/3DS/pyramob.3ds.readme.txt

@@ -9,4 +9,4 @@ http://www.elektrobar.com/lux/
 or mail to:
 [email protected]
 
-have fun.....VIRLUX
+have fun.....VIRLUX

+ 1 - 1
test/models-nonbsd/ASE/Rifle.source.txt

@@ -22,4 +22,4 @@ tutorials.
 INFO
 ====
 
-CONVERTED FROM 3DS TO ASE WITH AC3D
+CONVERTED FROM 3DS TO ASE WITH AC3D

+ 1 - 1
test/models-nonbsd/ASE/Rifle2.source.txt

@@ -21,4 +21,4 @@ tutorials.
 INFO
 ====
 
-CONVERTED FROM 3DS TO ASE WITH AC3D
+CONVERTED FROM 3DS TO ASE WITH AC3D

+ 1 - 1
test/models-nonbsd/B3D/turtle.source.txt

@@ -8,4 +8,4 @@ RESTRICTIONS:
 This model pack is available for use in freeware, shareware, commercial games/software with the following restrictions:-
 
 **You may not sell/re-sell this model pack or claim it as your own.
-***You may not redistribute this pack in  some other model pack through a website or on a compilation CD of any kind, without my written consent.
+***You may not redistribute this pack in  some other model pack through a website or on a compilation CD of any kind, without my written consent.

+ 1 - 1
test/models-nonbsd/DXF/rifle.source.txt

@@ -20,4 +20,4 @@ tutorials.
 INFO
 ====
 
-COnverted from 3ds to DXF with Ac3D
+COnverted from 3ds to DXF with Ac3D

+ 1 - 1
test/models-nonbsd/FBX/2013_ASCII/jeep1.fbx.readme.txt

@@ -12,4 +12,4 @@ http://xu1productions.com/3dstudio/index.html  -  3D Game Resources
 
 http://www.psionicdesign.com  -  My Main 2D/3D Digital Art site
 
-Psionic 2002
+Psionic 2002

+ 1 - 1
test/models-nonbsd/FBX/2013_ASCII/pyramob.fbx.readme.txt

@@ -9,4 +9,4 @@ http://www.elektrobar.com/lux/
 or mail to:
 [email protected]
 
-have fun.....VIRLUX
+have fun.....VIRLUX

+ 1 - 1
test/models-nonbsd/FBX/2013_BINARY/jeep1.fbx.readme.txt

@@ -12,4 +12,4 @@ http://xu1productions.com/3dstudio/index.html  -  3D Game Resources
 
 http://www.psionicdesign.com  -  My Main 2D/3D Digital Art site
 
-Psionic 2002
+Psionic 2002

+ 1 - 1
test/models-nonbsd/FBX/2013_BINARY/pyramob.fbx.readme.txt

@@ -9,4 +9,4 @@ http://www.elektrobar.com/lux/
 or mail to:
 [email protected]
 
-have fun.....VIRLUX
+have fun.....VIRLUX

+ 1 - 1
test/models-nonbsd/IFC/linklist.txt

@@ -1,4 +1,4 @@
 Good IFC test cases
 ===================
 
-http://www.iai.fzk.de/www-extern/index.php?id=1135
+http://www.iai.fzk.de/www-extern/index.php?id=1135

+ 1 - 1
test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw.source.txt

@@ -28,4 +28,4 @@ INFO
 
 
 These files belong to the QuickDraw model in the LWS folder - they are referenced
-and loaded into the LWS scene.
+and loaded into the LWS scene.

+ 1 - 1
test/models-nonbsd/LWO/LWO2/rifle.source.txt

@@ -21,4 +21,4 @@ tutorials.
 INFO
 ====
 
-CONVERTED FROM 3DS TO LWO2 WITH AC3D
+CONVERTED FROM 3DS TO LWO2 WITH AC3D

+ 1 - 1
test/models-nonbsd/LWS/QuickDraw v2.2.source.txt

@@ -12,4 +12,4 @@ In the future more 3d formats will be added and some other sections such as wall
 
 
 CHANGES:
-Paths have been modified
+Paths have been modified

+ 1 - 1
test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/readme_kubalwagon.txt

@@ -23,4 +23,4 @@ ID software, eskimo roll, EMSIPE, QkenneyQ
 DISTRIBUTION
 as long as this readme is included...!
 
---------------------------------------------------------------------------
+--------------------------------------------------------------------------

+ 1 - 1
test/models-nonbsd/MD3/readme_water.txt

@@ -23,4 +23,4 @@ ID software, eskimo roll, EMSIPE, QkenneyQ
 DISTRIBUTION
 as long as this readme is included...!
 
---------------------------------------------------------------------------
+--------------------------------------------------------------------------

+ 1 - 1
test/models-nonbsd/MMD/readme.txt

@@ -46,4 +46,4 @@ version 4
 ◯ クレジット
 企画: 株式会社ドワンゴ
 キャラクターデザイン: 黒星紅白
-モデリング: 雨刻
+モデリング: 雨刻

+ 1 - 1
test/models-nonbsd/NFF/NFFSense8/credits.txt

@@ -1,4 +1,4 @@
 teapot.nff, home4.nff - http://www.martinreddy.net/ukvrsig/wtk.html
 
 cokecan.nff -www.vrupl.evl.uic.edu/Eng591_Pages/cokecan.nff 
-TODO: License status to be confirmed
+TODO: License status to be confirmed

+ 1 - 1
test/models-nonbsd/OBJ/rifle.source.txt

@@ -24,4 +24,4 @@ tutorials.
 INFO
 ====
 
-Converted from 3DS to OBJ with AC3D
+Converted from 3DS to OBJ with AC3D

+ 1 - 1
test/models-nonbsd/OBJ/segment.source.txt

@@ -1,4 +1,4 @@
 Obj exported from Blender
 
 http://toychest.in.tum.de/wiki/projects:kuka_lwr
-License: Creative-Commons-by-Attribution-3.0
+License: Creative-Commons-by-Attribution-3.0

+ 1 - 1
test/models-nonbsd/Ogre/OgreSDK/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

+ 1 - 1
test/models-nonbsd/Ogre/OgreSDK/README.md

@@ -7,4 +7,4 @@ This asset set is used to test the full functionality of both binary and XML Ass
 * Material file was created by copying the relevant material parts from the sample sources. See the file for further information.
 * Some textures were converted from .png to .jpg to reduce the file size.
 
-See the LICENSE file in this folder for further copyright information about these assets.
+See the LICENSE file in this folder for further copyright information about these assets.

+ 1 - 1
test/models-nonbsd/README.txt

@@ -1,3 +1,3 @@
 These models are not generally redistributable under the terms of Assimp's BSD license. Usually, an additional requirement on the use of the data is imposed (i.e. no commercial use, need credits, some creative commons variants, ...).
 
-So, if you re-package Assimp for use in a 'clean' OSS package, consider removing this directory.
+So, if you re-package Assimp for use in a 'clean' OSS package, consider removing this directory.

+ 1 - 1
test/models/3DS/UVTransformTest/note.txt

@@ -8,4 +8,4 @@ In other words: TO DO, but only if someone REALLY needs it.
 
 To see how it should look like - test/ReferenceImages
 Note that the viewer has no 'decal' texture mapping mode, so
-the usual clamping is used.
+the usual clamping is used.

+ 1 - 1
test/models/3DS/textures.txt

@@ -1 +1 @@
-All textures are from cgtextures.com and are free for commercial use
+All textures are from cgtextures.com and are free for commercial use

+ 1 - 1
test/models/ASE/MotionCaptureROM.source.txt

@@ -1,3 +1,3 @@
 "MotionCaptureROM.ase" - Free for any purpose. 
 
-NOTE: The errors in the middle of the animation are caused by problems during recording, it's not an importer issue.
+NOTE: The errors in the middle of the animation are caused by problems during recording, it's not an importer issue.

+ 1 - 1
test/models/BLEND/HUMAN.source.txt

@@ -1,3 +1,3 @@
 HUMAN.blend (c) 2010, Tobias Rittig
 
-Redistribution and reuse allowed for any purpose, credits appreciated.
+Redistribution and reuse allowed for any purpose, credits appreciated.

+ 1 - 1
test/models/BVH/01_nn.bvh.source.txt

@@ -47,4 +47,4 @@ Here's the relevant paragraph from mocap.cs.cmu.edu:
   obtained from mocap.cs.cmu.edu.  The database was created with funding
   from NSF EIA-0196217."
 
-[...]
+[...]

+ 1 - 1
test/models/CSM/ThomasFechten.source.txt

@@ -1 +1 @@
-Recorded with vicon IQ, july 2008. Free for any purpose.
+Recorded with vicon IQ, july 2008. Free for any purpose.

+ 1 - 1
test/models/IRRMesh/credits.txt

@@ -1,2 +1,2 @@
 cellar.irrmesh - From irrlight/irrEdit. Irrlicht/irredit license (which?)
-Textures resized to 400*400, improved JPEG compression to make them smaller
+Textures resized to 400*400, improved JPEG compression to make them smaller

+ 1 - 1
test/models/LWO/LWO2/MappingModes/earthCylindric.txt

@@ -2,4 +2,4 @@ Wikipedia Commons,
 downloaded November 25th 08
 
 
-http://upload.wikimedia.org/wikipedia/commons/0/01/Lambert-cylindrical-equal-area-projection.jpg
+http://upload.wikimedia.org/wikipedia/commons/0/01/Lambert-cylindrical-equal-area-projection.jpg

+ 1 - 1
test/models/LWO/LWO2/MappingModes/earthSpherical.source.txt

@@ -6,4 +6,4 @@ http://earthobservatory.nasa.gov/Features/BlueMarble/BlueMarble_monthlies.php
 
 
 Downloaded November 24, 08.
-Rescaled to 2048 * 1024 with GIMP
+Rescaled to 2048 * 1024 with GIMP

+ 1 - 1
test/models/LWO/LWO2/concrete.source.txt

@@ -1,2 +1,2 @@
 cgtextures.com - free, even for commercial use. See the licensing conditions and the FAQ the site for more details.
-Great source for free textures, btw!
+Great source for free textures, btw!

+ 1 - 1
test/models/LWO/LWO2/uvtest-source.txt

@@ -1,2 +1,2 @@
 Regression file.
-by Tom Speed, see http://groups.google.com/group/bmx3d/browse_thread/thread/36db3b191f81be36
+by Tom Speed, see http://groups.google.com/group/bmx3d/browse_thread/thread/36db3b191f81be36

+ 1 - 1
test/models/MD2/faerie-source.txt

@@ -21,4 +21,4 @@ The Irrlicht Engine License
      appreciated but is not required.
   2. Altered source versions must be clearly marked as such, and must not be
      misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
+  3. This notice may not be removed or altered from any source distribution.

+ 1 - 1
test/models/MD2/sidney-source.txt

@@ -21,4 +21,4 @@ The Irrlicht Engine License
      appreciated but is not required.
   2. Altered source versions must be clearly marked as such, and must not be
      misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
+  3. This notice may not be removed or altered from any source distribution.

+ 1 - 1
test/models/MD5/SimpleCube.source.txt

@@ -1 +1 @@
-From http://www.doom3world.org/phpbb2/viewtopic.php?f=3&t=16842 (thanks, Rayne, whoever you are)
+From http://www.doom3world.org/phpbb2/viewtopic.php?f=3&t=16842 (thanks, Rayne, whoever you are)

+ 1 - 1
test/models/MDL/MDL3 (3DGS A4)/minigun_readme.txt

@@ -3,4 +3,4 @@ Hi everybody!!!
 This is my first published model so it isn't very good,but i'm still learning!..
 This model is free for everybody,but credit will be nice!
 You may reach me at [email protected]
-P.S: Excuse my bad english
+P.S: Excuse my bad english

+ 1 - 1
test/models/MDL/MDL5 (3DGS A5)/minigun_mdl5_readme.txt

@@ -3,4 +3,4 @@ Hi everybody!!!
 This is my first published model so it isn't very good,but i'm still learning!..
 This model is free for everybody,but credit will be nice!
 You may reach me at [email protected]
-P.S: Excuse my bad english
+P.S: Excuse my bad english

+ 1 - 1
test/models/MS3D/jeep1.readme.txt

@@ -12,4 +12,4 @@ http://xu1productions.com/3dstudio/index.html  -  3D Game Resources
 
 http://www.psionicdesign.com  -  My Main 2D/3D Digital Art site
 
-Psionic 2002
+Psionic 2002

部分文件因为文件数量过多而无法显示