Bläddra i källkod

Merge pull request #813 from striezel-stash/fix-typos

fix some typos
Andre Weissflog 2 år sedan
förälder
incheckning
e293e2fcc6
4 ändrade filer med 23 tillägg och 23 borttagningar
  1. 8 8
      CHANGELOG.md
  2. 8 8
      sokol_app.h
  3. 1 1
      sokol_fetch.h
  4. 6 6
      sokol_gfx.h

+ 8 - 8
CHANGELOG.md

@@ -25,7 +25,7 @@
   to first check the resource state via ```sg_query_*_state()```)
 
   Nevertheless, those functions may be useful to get a partially filled out
-  'creation blueprint' for creating similar resoures without the need
+  'creation blueprint' for creating similar resources without the need
   to keep and pass around the original desc structs.
 
   >MINOR BREAKING CHANGE: the struct members ```sg_image_info.width``` and
@@ -63,7 +63,7 @@
   any C++ code).
 
   **REQUIRED ACTION**: Since the sokol headers are now completely silent
-  without a logging callback (explanation below), it is highly recommened
+  without a logging callback (explanation below), it is highly recommended
   to use the standard logging callback provided by the new header ```sokol_log.h```.
   For instance for sokol_gfx.h it looks like this:
 
@@ -287,7 +287,7 @@
     was used. The fetched data is now accessible through an ```sfetch_range_t data```
     item (```data.ptr``` and ```data.size```). The old ```.fetched_offset``` item
     has been renamed to ```.data_offset``` to better conform with the new naming.
-  - The last two occurances of discrete ptr/size pairs in sokol_app.h now have also
+  - The last two occurrences of discrete ptr/size pairs in sokol_app.h now have also
     been replaced with ```sapp_range_t``` items, this only affects the structs
     ```sapp_html5_fetch_request``` and ```sapp_html5_fetch_response```.
 
@@ -325,7 +325,7 @@
   in sokol_app.h, sokol_args.h, sokol_audio.h and sokol_fetch.h:
   - the JS code has been 'modernized' (e.g. const and let instead of var,
     ```() => { ... }``` instead of ```function () { ... }``` for callbacks)
-  - false positives in the Closure static analysis have been supressed
+  - false positives in the Closure static analysis have been suppressed
     via inline hints
 
 - **16-Oct-2022** The Odin bindings generator and the generated bindings have
@@ -345,7 +345,7 @@
     The new Emscripten SDK also displays a couple of Javascript "static analyzer" warnings
     by the Closure compiler (used in release mode to optimize and minify the generated
     JS code). I fixed a couple of those warnings, but some warnings persist (all of them
-    false positives). Not sure yet if these can be fixed or need to be supressed, but
+    false positives). Not sure yet if these can be fixed or need to be suppressed, but
     that's for another time.
     - the webkitAudioContext() fallback in sokol_audio.h's Emscripten backend
     has been removed (only AudioContext is supported now), the fallback also
@@ -391,7 +391,7 @@
     - sokol_imgui.h will now set the cursor type via ```sapp_set_mouse_cursor()```. This can be
       disabled with the new ```simgui_desc_t``` item ```disable_set_mouse_cursor```.
     - sokol_imgui.h now automatically enables resizing windows from edges (not just the bottom-right corner),
-      this behavour can be disabled with the new ```simgui_desc_t``` item ```disable_windows_resize_from_edges```.
+      this behaviour can be disabled with the new ```simgui_desc_t``` item ```disable_windows_resize_from_edges```.
     - sokol_imgui.h can now optionally write to the alpha channel (useful if you want to render the UI
       into a separate render target, which is later composed onto the default framebuffer). The feature
       is enabled with the new ```simgui_desc_t``` item ```write_alpha_channel```.
@@ -753,7 +753,7 @@ so that it's easier to publish new bindings after updates to the sokol headers).
     ago (around iOS 12.x) MTKView started to ignore the contentScaleFactor
     property, which lead to sokol_app.h always setting up a HighDPI
     framebuffer even when sapp_desc.high_dpi wasn't set. The fix is to set
-    the MTKView's drawableSize explicitely now.
+    the MTKView's drawableSize explicitly now.
     - The iOS GL backend didn't support MSAA multisampling so far, this has
     been fixed now, but only one MSAA mode (4x) is available, which will be
     selected when sapp_desc.sample_count is greater than 1.
@@ -807,7 +807,7 @@ uses the **AVAudioSession** class to activate and deactivate audio output as nee
 This fixes sokol_audio.h for iPhones (so far, sokol_audio.h accidentally only worked
 for iPads). Please see [this issue](https://github.com/floooh/sokol/issues/431) for details.
 A somewhat unfortunate side effect of this fix is that sokol_audio.h must now be compiled
-as Objective-C when targetting iOS, also note that a new framework must be linked: ```AVFoundation```.
+as Objective-C when targeting iOS, also note that a new framework must be linked: ```AVFoundation```.
 Many thanks to @oviano for providing the PR!
 
 - **14-Feb-2021**: The Dear ImGui rendering backend in [sokol_imgui.h](https://github.com/floooh/sokol/blob/master/util/sokol_imgui.h) has been rewritten to only do a single

+ 8 - 8
sokol_app.h

@@ -780,7 +780,7 @@
     programmatically close the browser tab).
 
     On the web it's also not possible to run custom code when the user
-    closes a brower tab, so it's not possible to prevent this with a
+    closes a browser tab, so it's not possible to prevent this with a
     fancy custom dialog box.
 
     Instead the standard "Leave Site?" dialog box can be activated (or
@@ -4015,7 +4015,7 @@ _SOKOL_PRIVATE void _sapp_macos_poll_input_events() {
     /*
 
     NOTE: late event polling temporarily out-commented to check if this
-    causes infrequent and almost impossible to reproduce probelms with the
+    causes infrequent and almost impossible to reproduce problems with the
     window close events, see:
     https://github.com/floooh/sokol/pull/483#issuecomment-805148815
 
@@ -5393,7 +5393,7 @@ _SOKOL_PRIVATE EM_BOOL _sapp_emsc_key_cb(int emsc_type, const EmscriptenKeyboard
                 {
                     send_keyup_followup = true;
                 }
-                // only forward keys to the browser (can further be supressed by sapp_consume_event())
+                // only forward keys to the browser (can further be suppressed by sapp_consume_event())
                 switch (_sapp.event.key_code) {
                     case SAPP_KEYCODE_WORLD_1:
                     case SAPP_KEYCODE_WORLD_2:
@@ -6290,7 +6290,7 @@ _SOKOL_PRIVATE void _sapp_d3d11_create_device_and_swapchain(void) {
     _SOKOL_UNUSED(hr);
     #if defined(SOKOL_DEBUG)
     if (!SUCCEEDED(hr)) {
-        // if initialization with D3D11_CREATE_DEVICE_DEBUG failes, this could be because the
+        // if initialization with D3D11_CREATE_DEVICE_DEBUG fails, this could be because the
         // 'D3D11 debug layer' stopped working, indicated by the error message:
         // ===
         // D3D11CreateDevice: Flags (0x2) were specified which require the D3D11 SDK Layers for Windows 10, but they are not present on the system.
@@ -6318,7 +6318,7 @@ _SOKOL_PRIVATE void _sapp_d3d11_create_device_and_swapchain(void) {
     #endif
     SOKOL_ASSERT(SUCCEEDED(hr) && _sapp.d3d11.swap_chain && _sapp.d3d11.device && _sapp.d3d11.device_context);
 
-    // mimimize frame latency, disable Alt-Enter
+    // minimize frame latency, disable Alt-Enter
     hr = _sapp_d3d11_QueryInterface(_sapp.d3d11.device, _sapp_win32_refiid(_sapp_IID_IDXGIDevice1), (void**)&_sapp.d3d11.dxgi_device);
     if (SUCCEEDED(hr) && _sapp.d3d11.dxgi_device) {
         _sapp_dxgi_SetMaximumFrameLatency(_sapp.d3d11.dxgi_device, 1);
@@ -6869,7 +6869,7 @@ _SOKOL_PRIVATE void _sapp_win32_lock_mouse(bool lock) {
 
         /* while the mouse is locked, make the mouse cursor invisible and
            confine the mouse movement to a small rectangle inside our window
-           (so that we dont miss any mouse up events)
+           (so that we don't miss any mouse up events)
         */
         RECT client_rect = {
             _sapp.win32.mouse_locked_x,
@@ -10473,7 +10473,7 @@ _SOKOL_PRIVATE void _sapp_x11_process_event(XEvent* event) {
             }
             break;
         case FocusIn:
-            // NOTE: ingnoring NotifyGrab and NotifyUngrab is same behaviour as GLFW
+            // NOTE: ignoring NotifyGrab and NotifyUngrab is same behaviour as GLFW
             if ((event->xfocus.mode != NotifyGrab) && (event->xfocus.mode != NotifyUngrab)) {
                 _sapp_x11_app_event(SAPP_EVENTTYPE_FOCUSED);
             }
@@ -10483,7 +10483,7 @@ _SOKOL_PRIVATE void _sapp_x11_process_event(XEvent* event) {
             if (_sapp.mouse.locked) {
                 _sapp_x11_lock_mouse(false);
             }
-            // NOTE: ingnoring NotifyGrab and NotifyUngrab is same behaviour as GLFW
+            // NOTE: ignoring NotifyGrab and NotifyUngrab is same behaviour as GLFW
             if ((event->xfocus.mode != NotifyGrab) && (event->xfocus.mode != NotifyUngrab)) {
                 _sapp_x11_app_event(SAPP_EVENTTYPE_UNFOCUSED);
             }

+ 1 - 1
sokol_fetch.h

@@ -2363,7 +2363,7 @@ _SOKOL_PRIVATE void _sfetch_request_handler(_sfetch_t* ctx, uint32_t slot_id) {
     }
     else {
         /* just move all other items (e.g. paused or cancelled)
-           into the outgoing queue, so they wont get lost
+           into the outgoing queue, so they won't get lost
         */
         _sfetch_ring_enqueue(&ctx->chn[item->channel].user_outgoing, slot_id);
     }

+ 6 - 6
sokol_gfx.h

@@ -194,7 +194,7 @@
 
             sg_apply_viewport(int x, int y, int width, int height, bool origin_top_left)
 
-        ...or if you want to specifiy the viewport rectangle with float values:
+        ...or if you want to specify the viewport rectangle with float values:
 
             sg_apply_viewportf(float x, float y, float width, float height, bool origin_top_left)
 
@@ -385,7 +385,7 @@
             a convenience function to get a sg_context_desc struct filled out
             with context information provided by sokol_app.h
 
-    See the documention block of the sg_desc struct below for more information.
+    See the documentation block of the sg_desc struct below for more information.
 
 
     UNIFORM DATA LAYOUT:
@@ -465,7 +465,7 @@
     layout on the CPU side can be used for all sokol-gfx backends. To achieve this,
     a common subset of the std140 layout must be used:
 
-    - The uniform block layout hint in sg_shader_desc must be explicitely set to
+    - The uniform block layout hint in sg_shader_desc must be explicitly set to
       SG_UNIFORMLAYOUT_STD140.
     - Only the following GLSL uniform types can be used (with their associated sokol-gfx enums):
         - float => SG_UNIFORMTYPE_FLOAT
@@ -2559,7 +2559,7 @@ typedef struct sg_image_info {
 } sg_image_info;
 
 typedef struct sg_shader_info {
-    sg_slot_info slot;              /* resoure pool slot info */
+    sg_slot_info slot;              /* resource pool slot info */
 } sg_shader_info;
 
 typedef struct sg_pipeline_info {
@@ -2573,7 +2573,7 @@ typedef struct sg_pass_info {
 /*
     sg_log_item
 
-    An enum with a unique item for each log message, warning, errror
+    An enum with a unique item for each log message, warning, error
     and validation layer message.
 */
 #define _SG_LOG_ITEMS \
@@ -11343,7 +11343,7 @@ _SOKOL_PRIVATE sg_resource_state _sg_mtl_create_shader(_sg_shader_t* shd, const
 
     _sg_shader_common_init(&shd->cmn, desc);
 
-    /* create metal libray objects and lookup entry functions */
+    /* create metal library objects and lookup entry functions */
     id<MTLLibrary> vs_lib = nil;
     id<MTLLibrary> fs_lib = nil;
     id<MTLFunction> vs_func = nil;