Skip to content

Commit 3956fd3

Browse files
syoyosyoyo
committed
Merge branch 'release' of github.com:tinyobjloader/tinyobjloader into release
2 parents 31a7db6 + 5cd3842 commit 3956fd3

2 files changed

Lines changed: 19 additions & 4 deletions

File tree

‎.github/FUNDING.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# These are supported funding model platforms
2+
3+
github: syoyo # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
12+
polar: # Replace with a single Polar username
13+
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
14+
thanks_dev: # Replace with a single thanks.dev username
15+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Tiny but powerful single file wavefront obj loader written in C++03. No dependen
1414

1515
`tinyobjloader` is good for embedding .obj loader to your (global illumination) renderer ;-)
1616

17-
If you are looking for C89 version, please see https://github.com/syoyo/tinyobjloader-c .
17+
If you are looking for C99 version, please see https://github.com/syoyo/tinyobjloader-c .
1818

1919
Version notice
2020
--------------
@@ -250,7 +250,7 @@ You can enable `double(64bit)` precision by using `TINYOBJLOADER_USE_DOUBLE` def
250250
When you enable `triangulation`(default is enabled),
251251
TinyObjLoader triangulate polygons(faces with 4 or more vertices).
252252

253-
Built-in trinagulation code may not work well in some polygon shape.
253+
Built-in triangulation code may not work well in some polygon shape.
254254

255255
You can define `TINYOBJLOADER_USE_MAPBOX_EARCUT` for robust triangulation using `mapbox/earcut.hpp`.
256256
This requires C++11 compiler though. And you need to copy `mapbox/earcut.hpp` to your project.
@@ -260,7 +260,7 @@ If you have your own `mapbox/earcut.hpp` file incuded in your project, you can d
260260

261261
```c++
262262
#define TINYOBJLOADER_IMPLEMENTATION // define this in only *one* .cc
263-
// Optional. define TINYOBJLOADER_USE_MAPBOX_EARCUT gives robust trinagulation. Requires C++11
263+
// Optional. define TINYOBJLOADER_USE_MAPBOX_EARCUT gives robust triangulation. Requires C++11
264264
//#define TINYOBJLOADER_USE_MAPBOX_EARCUT
265265
#include "tiny_obj_loader.h"
266266

@@ -332,7 +332,7 @@ for (size_t s = 0; s < shapes.size(); s++) {
332332

333333
```c++
334334
#define TINYOBJLOADER_IMPLEMENTATION // define this in only *one* .cc
335-
// Optional. define TINYOBJLOADER_USE_MAPBOX_EARCUT gives robust trinagulation. Requires C++11
335+
// Optional. define TINYOBJLOADER_USE_MAPBOX_EARCUT gives robust triangulation. Requires C++11
336336
//#define TINYOBJLOADER_USE_MAPBOX_EARCUT
337337
#include "tiny_obj_loader.h"
338338

0 commit comments

Comments
 (0)