浏览代码

Merge pull request #4855 from asmaloney/spelling

Fix several spelling mistakes
Kim Kulling 2 年之前
父节点
当前提交
33c32b6b35

+ 2 - 2
code/AssetLib/Collada/ColladaExporter.cpp

@@ -448,7 +448,7 @@ void ColladaExporter::WriteLight(size_t pIndex) {
     PushTag();
     PushTag();
     switch (light->mType) {
     switch (light->mType) {
     case aiLightSource_AMBIENT:
     case aiLightSource_AMBIENT:
-        WriteAmbienttLight(light);
+        WriteAmbientLight(light);
         break;
         break;
     case aiLightSource_DIRECTIONAL:
     case aiLightSource_DIRECTIONAL:
         WriteDirectionalLight(light);
         WriteDirectionalLight(light);
@@ -543,7 +543,7 @@ void ColladaExporter::WriteSpotLight(const aiLight *const light) {
     mOutput << startstr << "</spot>" << endstr;
     mOutput << startstr << "</spot>" << endstr;
 }
 }
 
 
-void ColladaExporter::WriteAmbienttLight(const aiLight *const light) {
+void ColladaExporter::WriteAmbientLight(const aiLight *const light) {
 
 
     const aiColor3D &color = light->mColorAmbient;
     const aiColor3D &color = light->mColorAmbient;
     mOutput << startstr << "<ambient>" << endstr;
     mOutput << startstr << "<ambient>" << endstr;

+ 1 - 1
code/AssetLib/Collada/ColladaExporter.h

@@ -101,7 +101,7 @@ protected:
     void WritePointLight(const aiLight *const light);
     void WritePointLight(const aiLight *const light);
     void WriteDirectionalLight(const aiLight *const light);
     void WriteDirectionalLight(const aiLight *const light);
     void WriteSpotLight(const aiLight *const light);
     void WriteSpotLight(const aiLight *const light);
-    void WriteAmbienttLight(const aiLight *const light);
+    void WriteAmbientLight(const aiLight *const light);
 
 
     /// Writes the controller library
     /// Writes the controller library
     void WriteControllerLibrary();
     void WriteControllerLibrary();

+ 1 - 1
code/AssetLib/Collada/ColladaHelper.h

@@ -666,7 +666,7 @@ struct ChannelEntry {
     const Collada::Accessor *mTimeAccessor; ///> Collada accessor to the time values
     const Collada::Accessor *mTimeAccessor; ///> Collada accessor to the time values
     const Collada::Data *mTimeData; ///> Source data array for the time values
     const Collada::Data *mTimeData; ///> Source data array for the time values
     const Collada::Accessor *mValueAccessor; ///> Collada accessor to the key value values
     const Collada::Accessor *mValueAccessor; ///> Collada accessor to the key value values
-    const Collada::Data *mValueData; ///> Source datat array for the key value values
+    const Collada::Data *mValueData; ///> Source data array for the key value values
 
 
     ChannelEntry() :
     ChannelEntry() :
             mChannel(),
             mChannel(),

+ 2 - 2
code/CMakeLists.txt

@@ -270,8 +270,8 @@ if (NOT ASSIMP_NO_EXPORT)
   # ASSIMP_BUILD_XXX_EXPORTER to TRUE for each exporter
   # ASSIMP_BUILD_XXX_EXPORTER to TRUE for each exporter
   OPTION(ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT "default value of all ASSIMP_BUILD_XXX_EXPORTER values" TRUE)
   OPTION(ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT "default value of all ASSIMP_BUILD_XXX_EXPORTER values" TRUE)
 
 
-  # macro to add the CMake Option ADD_ASSIMP_IMPORTER_<name> which enables compile of loader
-  # this way selective loaders can be compiled (reduces filesize + compile time)
+  # macro to add the CMake Option ADD_ASSIMP_EXPORTER_<name> which enables compilation of an exporter
+  # this way selective exporters can be compiled (reduces filesize + compile time)
   MACRO(ADD_ASSIMP_EXPORTER name)
   MACRO(ADD_ASSIMP_EXPORTER name)
     IF (ASSIMP_NO_EXPORT)
     IF (ASSIMP_NO_EXPORT)
       set(ASSIMP_EXPORTER_ENABLED FALSE)
       set(ASSIMP_EXPORTER_ENABLED FALSE)

+ 1 - 1
include/assimp/Importer.hpp

@@ -113,7 +113,7 @@ namespace Assimp {
 * If you need the Importer to do custom file handling to access the files,
 * If you need the Importer to do custom file handling to access the files,
 * implement IOSystem and IOStream and supply an instance of your custom
 * implement IOSystem and IOStream and supply an instance of your custom
 * IOSystem implementation by calling SetIOHandler() before calling ReadFile().
 * IOSystem implementation by calling SetIOHandler() before calling ReadFile().
-* If you do not assign a custion IO handler, a default handler using the
+* If you do not assign a custom IO handler, a default handler using the
 * standard C++ IO logic will be used.
 * standard C++ IO logic will be used.
 *
 *
 * @note One Importer instance is not thread-safe. If you use multiple
 * @note One Importer instance is not thread-safe. If you use multiple

+ 3 - 3
include/assimp/config.h.in

@@ -241,7 +241,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 /**
 /**
  *  @brief  Configures the #aiProcess_FindDegenerates to check the area of a
  *  @brief  Configures the #aiProcess_FindDegenerates to check the area of a
- *  trinagle to be greates than e-6. If this is not the case the triangle will
+ *  triangle to be greater than e-6. If this is not the case the triangle will
  *  be removed if #AI_CONFIG_PP_FD_REMOVE is set to true.
  *  be removed if #AI_CONFIG_PP_FD_REMOVE is set to true.
  */
  */
 #define AI_CONFIG_PP_FD_CHECKAREA \
 #define AI_CONFIG_PP_FD_CHECKAREA \
@@ -662,7 +662,7 @@ enum aiComponent
     "AI_CONFIG_FBX_CONVERT_TO_M"
     "AI_CONFIG_FBX_CONVERT_TO_M"
 
 
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
-/** @brief  Will enable the skeleton structo to store bone data.
+/** @brief  Will enable the skeleton struct to store bone data.
  *
  *
  *  This will decouple the bone coupling to the mesh. This feature is
  *  This will decouple the bone coupling to the mesh. This feature is
  *  experimental.
  *  experimental.
@@ -1083,7 +1083,7 @@ enum aiComponent
 #define AI_CONFIG_EXPORT_BLOB_NAME "EXPORT_BLOB_NAME"
 #define AI_CONFIG_EXPORT_BLOB_NAME "EXPORT_BLOB_NAME"
 
 
 /**
 /**
- *  @brief  Specifies a gobal key factor for scale, float value
+ *  @brief  Specifies a global key factor for scale, float value
  */
  */
 #define AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY "GLOBAL_SCALE_FACTOR"
 #define AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY "GLOBAL_SCALE_FACTOR"
 
 

+ 1 - 1
include/assimp/material.h

@@ -306,7 +306,7 @@ enum aiTextureType {
     aiTextureType_SHEEN = 19,
     aiTextureType_SHEEN = 19,
 
 
     /** Clearcoat
     /** Clearcoat
-    * Simulates a layer of 'polish' or 'laquer' layered on top of a PBR substrate
+    * Simulates a layer of 'polish' or 'lacquer' layered on top of a PBR substrate
     * https://autodesk.github.io/standard-surface/#closures/coating
     * https://autodesk.github.io/standard-surface/#closures/coating
     * https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_clearcoat
     * https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_clearcoat
     */
     */