From 5776362b8075f7870b8592627d082b8e4e2aaf2c Mon Sep 17 00:00:00 2001 From: luz paz Date: Wed, 17 Mar 2021 20:43:45 -0400 Subject: Fix misc. typos Found via `codespell` --- AssetLoader/README.md | 2 +- AssetLoader/src/GLTFLoader.cpp | 2 +- HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp | 4 ++-- NativeApp/Android/arcore_sdk/include/arcore_c_api.h | 8 ++++---- NativeApp/Android/ndk_helper/include/JNIHelper.h | 2 +- NativeApp/Android/ndk_helper/src/tapCamera.cpp | 4 ++-- NativeApp/Apple/Source/Classes/OSX/GLView.mm | 4 ++-- NativeApp/Apple/Source/Classes/OSX/WindowController.mm | 2 +- NativeApp/Apple/Source/Classes/iOS/AppViewBase.mm | 2 +- NativeApp/include/AppBase.hpp | 2 +- NativeApp/include/Linux/LinuxAppBase.hpp | 2 +- NativeApp/include/NativeAppBase.hpp | 2 +- NativeApp/include/UWP/UWPAppBase.hpp | 2 +- README.md | 6 +++--- TextureLoader/include/PNGCodec.h | 2 +- TextureLoader/src/DDSLoader.cpp | 4 ++-- TextureLoader/src/PNGCodec.c | 4 ++-- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/AssetLoader/README.md b/AssetLoader/README.md index 5fe2fe3..2c4f7a6 100644 --- a/AssetLoader/README.md +++ b/AssetLoader/README.md @@ -1,6 +1,6 @@ # Asset Loader -The asset loading libary currently supports GLTF 2.0 format. +The asset loading library currently supports GLTF 2.0 format. ## GLTF 2.0 diff --git a/AssetLoader/src/GLTFLoader.cpp b/AssetLoader/src/GLTFLoader.cpp index 485def6..ff77f0b 100644 --- a/AssetLoader/src/GLTFLoader.cpp +++ b/AssetLoader/src/GLTFLoader.cpp @@ -220,7 +220,7 @@ void Node::UpdateTransforms() if (pSkin != nullptr) { // Update join matrices - auto InverseTransform = pMesh->Transforms.matrix.Inverse(); // TODO: do not use inverse tranform here + auto InverseTransform = pMesh->Transforms.matrix.Inverse(); // TODO: do not use inverse transform here if (pMesh->Transforms.jointMatrices.size() != pSkin->Joints.size()) pMesh->Transforms.jointMatrices.resize(pSkin->Joints.size()); for (size_t i = 0; i < pSkin->Joints.size(); i++) diff --git a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp index 5a1572a..2ef42e9 100644 --- a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp +++ b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp @@ -123,7 +123,7 @@ int HLSL2GLSLConverterApp::ParseCmdLine(int argc, char** argv) m_ShaderType = SHADER_TYPE_COMPUTE; else { - LOG_ERROR_MESSAGE("Unknow shader type ", argv[a], "; Allowed values: vs,gs,ps,ds,hs,cs"); + LOG_ERROR_MESSAGE("Unknown shader type ", argv[a], "; Allowed values: vs,gs,ps,ds,hs,cs"); return -1; } } @@ -137,7 +137,7 @@ int HLSL2GLSLConverterApp::ParseCmdLine(int argc, char** argv) } else { - LOG_ERROR_MESSAGE("Unknow command line option ", argv[a]); + LOG_ERROR_MESSAGE("Unknown command line option ", argv[a]); return -1; } } diff --git a/NativeApp/Android/arcore_sdk/include/arcore_c_api.h b/NativeApp/Android/arcore_sdk/include/arcore_c_api.h index ec9266a..2d210f9 100644 --- a/NativeApp/Android/arcore_sdk/include/arcore_c_api.h +++ b/NativeApp/Android/arcore_sdk/include/arcore_c_api.h @@ -1093,7 +1093,7 @@ void ArCoreApk_checkAvailability(void *env, void *context, ArAvailability *out_availability); -/// Initiates installation of ARCore if needed. When your apllication launches +/// Initiates installation of ARCore if needed. When your application launches /// or enters an AR mode, it should call this method with @c /// user_requested_install = 1. /// @@ -1996,7 +1996,7 @@ void ArPose_getPoseRaw(const ArSession *session, /// @param[in] session The ARCore session /// @param[in] pose The pose to convert /// @param[out] out_matrix_col_major_4x4 Pointer to an array of 16 floats, to be -/// filled with a column-major homogenous transformation matrix, as used by +/// filled with a column-major homogeneous transformation matrix, as used by /// OpenGL. void ArPose_getMatrix(const ArSession *session, const ArPose *pose, @@ -2076,7 +2076,7 @@ void ArCamera_getDisplayOrientedPose(const ArSession *session, /// @param[in] session The ARCore session /// @param[in] camera The session's camera. /// @param[inout] out_col_major_4x4 Pointer to an array of 16 floats, to be -/// filled with a column-major homogenous transformation matrix, as used by +/// filled with a column-major homogeneous transformation matrix, as used by /// OpenGL. void ArCamera_getViewMatrix(const ArSession *session, const ArCamera *camera, @@ -2122,7 +2122,7 @@ void ArCamera_getTrackingFailureReason( /// @param[in] near Specifies the near clip plane, in meters /// @param[in] far Specifies the far clip plane, in meters /// @param[inout] dest_col_major_4x4 Pointer to an array of 16 floats, to -/// be filled with a column-major homogenous transformation matrix, as used +/// be filled with a column-major homogeneous transformation matrix, as used /// by OpenGL. void ArCamera_getProjectionMatrix(const ArSession *session, const ArCamera *camera, diff --git a/NativeApp/Android/ndk_helper/include/JNIHelper.h b/NativeApp/Android/ndk_helper/include/JNIHelper.h index 81d5c2f..55e572d 100644 --- a/NativeApp/Android/ndk_helper/include/JNIHelper.h +++ b/NativeApp/Android/ndk_helper/include/JNIHelper.h @@ -225,7 +225,7 @@ class JNIHelper { /* * Retrieve external file directory through JNI call * - * return: std::string containing external file diretory + * return: std::string containing external file directory */ std::string GetExternalFilesDir(); diff --git a/NativeApp/Android/ndk_helper/src/tapCamera.cpp b/NativeApp/Android/ndk_helper/src/tapCamera.cpp index e753ab1..586bef9 100644 --- a/NativeApp/Android/ndk_helper/src/tapCamera.cpp +++ b/NativeApp/Android/ndk_helper/src/tapCamera.cpp @@ -212,7 +212,7 @@ void TapCamera::Drag(const Vec2& v) { } //---------------------------------------------------------- -// Pinch controll +// Pinch control //---------------------------------------------------------- void TapCamera::BeginPinch(const Vec2& v1, const Vec2& v2) { if (dragging_) EndDrag(); @@ -289,7 +289,7 @@ void TapCamera::Pinch(const Vec2& v1, const Vec2& v2) { } //---------------------------------------------------------- -// Trackball controll +// Trackball control //---------------------------------------------------------- void TapCamera::BallUpdate() { if (dragging_) { diff --git a/NativeApp/Apple/Source/Classes/OSX/GLView.mm b/NativeApp/Apple/Source/Classes/OSX/GLView.mm index d4aef78..a942252 100644 --- a/NativeApp/Apple/Source/Classes/OSX/GLView.mm +++ b/NativeApp/Apple/Source/Classes/OSX/GLView.mm @@ -90,7 +90,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink, { [super prepareOpenGL]; - // Application must be initialized befor display link is started + // Application must be initialized before display link is started [self initGL]; CVDisplayLinkRef displayLink; @@ -148,7 +148,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink, // cost of framerate and battery life due to the GPU needing to render more // pixels. - // Any calculations the renderer does which use pixel dimentions, must be + // Any calculations the renderer does which use pixel dimensions, must be // in "retina" space. [NSView convertRectToBacking] converts point sizes // to pixel sizes. Thus the renderer gets the size in pixels, not points, // so that it can set it's viewport and perform and other pixel based diff --git a/NativeApp/Apple/Source/Classes/OSX/WindowController.mm b/NativeApp/Apple/Source/Classes/OSX/WindowController.mm index e3f7923..5904f6c 100644 --- a/NativeApp/Apple/Source/Classes/OSX/WindowController.mm +++ b/NativeApp/Apple/Source/Classes/OSX/WindowController.mm @@ -118,7 +118,7 @@ // this controller (self) [self setWindow:[self standardWindow]]; - // Set the content of the orginal window to the view + // Set the content of the original window to the view [[self window] setContentView: [self fullscreenWindow].contentView]; // Show the window and make it the key window for input diff --git a/NativeApp/Apple/Source/Classes/iOS/AppViewBase.mm b/NativeApp/Apple/Source/Classes/iOS/AppViewBase.mm index 84d1b01..3e75910 100644 --- a/NativeApp/Apple/Source/Classes/iOS/AppViewBase.mm +++ b/NativeApp/Apple/Source/Classes/iOS/AppViewBase.mm @@ -85,7 +85,7 @@ // Set it to our _animationFrameInterval [_displayLink setPreferredFramesPerSecond:_preferredFramesPerSecond]; - // Have the display link run on the default runn loop (and the main thread) + // Have the display link run on the default run loop (and the main thread) [_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; [super startAnimation]; diff --git a/NativeApp/include/AppBase.hpp b/NativeApp/include/AppBase.hpp index 34d99fa..3a9eddb 100644 --- a/NativeApp/include/AppBase.hpp +++ b/NativeApp/include/AppBase.hpp @@ -110,7 +110,7 @@ public: /// Called by the framework to request the desired initial window size. /// This method is called before the platform-specific window is created. - /// An application may override this method to speciy required initial + /// An application may override this method to specify required initial /// window width and height. virtual void GetDesiredInitialWindowSize(int& width, int& height) { diff --git a/NativeApp/include/Linux/LinuxAppBase.hpp b/NativeApp/include/Linux/LinuxAppBase.hpp index 809f831..33c2b26 100644 --- a/NativeApp/include/Linux/LinuxAppBase.hpp +++ b/NativeApp/include/Linux/LinuxAppBase.hpp @@ -56,7 +56,7 @@ class LinuxAppBase : public AppBase public: /// Called when GL context is initialized - /// An application must override this method to perform requred + /// An application must override this method to perform required /// initialization operations after OpenGL context has been initialized /// by the framework /// \param [in] display - XLib display. diff --git a/NativeApp/include/NativeAppBase.hpp b/NativeApp/include/NativeAppBase.hpp index 803e8ad..522bf27 100644 --- a/NativeApp/include/NativeAppBase.hpp +++ b/NativeApp/include/NativeAppBase.hpp @@ -77,7 +77,7 @@ } #else -# error Usnupported paltform +# error Usnupported platform #endif diff --git a/NativeApp/include/UWP/UWPAppBase.hpp b/NativeApp/include/UWP/UWPAppBase.hpp index 359ce7a..3434dbb 100644 --- a/NativeApp/include/UWP/UWPAppBase.hpp +++ b/NativeApp/include/UWP/UWPAppBase.hpp @@ -52,7 +52,7 @@ public: // Notifies the app that it is being suspended. virtual void OnSuspending() {} - // Notifes the app that it is no longer suspended. + // Notifies the app that it is no longer suspended. virtual void OnResuming() {} // Notifies renderers that device resources need to be released. diff --git a/README.md b/README.md index bcc8717..52103ad 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ This module implements additional functionality on top of the [Diligent Engine](https://github.com/DiligentGraphics/DiligentEngine)'s core module and contains the following libraries: -* [Texture loader](TextureLoader): a texture loading libary. The following formats are currently supported: jpg, png, tiff, dds, ktx. -* [Asset Loader](AssetLoader): an asset loading libary. The library currently supports GLTF 2.0. +* [Texture loader](TextureLoader): a texture loading library. The following formats are currently supported: jpg, png, tiff, dds, ktx. +* [Asset Loader](AssetLoader): an asset loading library. The library currently supports GLTF 2.0. * To enable Draco compression, download [Draco repository](https://github.com/google/draco) and include it into your project. Make sure that Draco source folder is processed by CMake *before* DiligentTools folder. Alternatively, you can specify a path to the Draco installation folder using `DRACO_PATH` CMake variable. @@ -48,7 +48,7 @@ In submitting any content to this repository, and you agree that the content is free of any Intellectual Property claims and you have the right to license it under those terms. Diligent Engine uses [clang-format](https://clang.llvm.org/docs/ClangFormat.html) to ensure -consistent source code style throught the code base. The format is validated by appveyor and travis +consistent source code style throughout the code base. The format is validated by appveyor and travis for each commit and pull request, and the build will fail if any code formatting issue is found. Please refer to [this page](https://github.com/DiligentGraphics/DiligentCore/blob/master/doc/code_formatting.md) for instructions on how to set up clang-format and automatic code formatting. diff --git a/TextureLoader/include/PNGCodec.h b/TextureLoader/include/PNGCodec.h index 3df5493..b0dace4 100644 --- a/TextureLoader/include/PNGCodec.h +++ b/TextureLoader/include/PNGCodec.h @@ -34,7 +34,7 @@ DILIGENT_BEGIN_NAMESPACE(Diligent) /// PNG decoding result. DILIGENT_TYPED_ENUM(DECODE_PNG_RESULT, Uint32) { - /// Decoding was successfull. + /// Decoding was successful. DECODE_PNG_RESULT_OK = 0, /// Invalid arguments (e.g. null pointer). diff --git a/TextureLoader/src/DDSLoader.cpp b/TextureLoader/src/DDSLoader.cpp index d6a4335..3f61369 100644 --- a/TextureLoader/src/DDSLoader.cpp +++ b/TextureLoader/src/DDSLoader.cpp @@ -485,7 +485,7 @@ static TEXTURE_FORMAT DXGIFormatToTexFormat( DXGI_FORMAT TexFormat ) case DXGI_FORMAT_BC7_UNORM: return TEX_FORMAT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return TEX_FORMAT_BC7_UNORM_SRGB; - default: UNEXPECTED( "Unsupported DXGI formate" ); return TEX_FORMAT_UNKNOWN; + default: UNEXPECTED( "Unsupported DXGI format" ); return TEX_FORMAT_UNKNOWN; } } @@ -619,7 +619,7 @@ static DXGI_FORMAT GetDXGIFormat(const DDS_PIXELFORMAT& ddpf) // No DXGI format maps to ISBITMASK(0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000) aka D3DFMT_X8B8G8R8 // Note that many common DDS reader/writers (including D3DX) swap the - // the RED/BLUE masks for 10:10:10:2 formats. We assumme + // the RED/BLUE masks for 10:10:10:2 formats. We assume // below that the 'backwards' header mask is being used since it is most // likely written by D3DX. The more robust solution is to use the 'DX10' // header extension and specify the DXGI_FORMAT_R10G10B10A2_UNORM format directly diff --git a/TextureLoader/src/PNGCodec.c b/TextureLoader/src/PNGCodec.c index 9ccb920..d02cb9e 100644 --- a/TextureLoader/src/PNGCodec.c +++ b/TextureLoader/src/PNGCodec.c @@ -159,7 +159,7 @@ DECODE_PNG_RESULT Diligent_DecodePng(IDataBlob* pSrcPngBits, //Array of row pointers. One for every row. rowPtrs = malloc(sizeof(png_bytep) * pDstImgDesc->Height); - //Alocate a buffer with enough space. + //Allocate a buffer with enough space. pDstImgDesc->RowStride = pDstImgDesc->Width * (Uint32)bit_depth * pDstImgDesc->NumComponents / 8u; // Align stride to 4 bytes pDstImgDesc->RowStride = (pDstImgDesc->RowStride + 3u) & ~3u; @@ -169,7 +169,7 @@ DECODE_PNG_RESULT Diligent_DecodePng(IDataBlob* pSrcPngBits, for (size_t i = 0; i < pDstImgDesc->Height; i++) rowPtrs[i] = pRow0 + i * pDstImgDesc->RowStride; - //Read the imagedata and write it to the adresses pointed to + //Read the imagedata and write it to the addresses pointed to //by rowptrs (in other words: our image databuffer) png_read_image(png, rowPtrs); -- cgit v1.2.3