v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,382 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

322 Commits (kimkulling-issue_3790)

Author SHA1 Message Date
Kim Kulling 16c3f82222 closes https://github.com/assimp/assimp/issues/3975: Use latest version of OpenDDL-Parser 2021-07-26 11:24:18 +02:00
Rahul Sheth 1b37b74f9e Hunter fixes for stb_image 2021-07-07 17:01:19 -04:00
Rahul Sheth 0a5e49252d Merge remote-tracking branch 'origin/master' into HEAD 2021-07-07 16:35:29 -04:00
ihsinme 6dd9ab062c
the expression does not throw an exception. 
maybe you just forgot this word.
 2021-06-11 10:56:45 +03:00
Kim Kulling fc4ebefaa4
Merge branch 'master' into update_draco 2021-06-08 23:30:01 +02:00
Kim Kulling b0e7271449
Merge branch 'master' into stb-image-updated 2021-06-03 23:46:43 +02:00
Kim Kulling bf0f8d4c1b
Update pugiconfig.hpp 2021-06-03 23:29:53 +02:00
Kim Kulling cc912f09f7 update pugi_xml to 1.11 2021-06-03 23:16:20 +02:00
Kim Kulling e0d1a36523
Merge branch 'master' into stb-image-updated 2021-06-03 23:07:38 +02:00
RichardTea 53790e8273 Update Draco to upstream e4103dc 
Fixes some MSVC and mingw compiler issues
Sets VERSION and SO_VERSION
e4103dc39f
 2021-05-21 12:25:36 +01:00
Krishty ab43f3fefd Merge branch 'stb-image-updated' of https://github.com/krishty/assimp into stb-image-updated 2021-05-10 20:44:55 +02:00
Krishty d75f8bd5b0 silence warnings in stb_image.h 
Re-applies 09c5564d5b to stb_image.h’s new path.
 2021-05-10 20:44:43 +02:00
Kim Kulling 433620350e
Merge branch 'master' into stb-image-updated 2021-05-10 11:30:45 +02:00
Kim Kulling b30cbcf117
Merge branch 'master' into jc3-spam-killa 2021-05-09 21:47:17 +02:00
Krishty 816da9b677 merge and update all copies of stb_image.h 2021-05-05 23:15:41 +02:00
Jason C 558457e5bf [openddlparser] Remove default log handler and unsolicited output. 
This addresses part of #3862.

- Remove default log handler.
- Log callback can now be set to nullptr, which just makes logging a no-op.
- Initial log callback is nullptr.
- Also tweaked format of token error log message and removed newline.

Assimp code that uses this may regain logging output by installing a callback and directing the output through appropriate logging facilities.
 2021-05-04 21:54:14 -04:00
Jason C 7dd7a053a9 [gtest] Fixed a rogue std::isalnum 
Use IsAlNum instead (gtest-port.h), which deals with char signedness correctly. This was the only spot in gtest where a cctype function was called instead of its gtest-port.h equivalent.

Addresses https://github.com/assimp/assimp/issues/3867 and then some.
 2021-05-04 17:31:46 -04:00
Jason C 1ec8d4b6cf [draco] Make sure ctype calls use unsigned char. 
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
 2021-05-04 17:31:46 -04:00
kkulling 55fd820ed7 use const chars 2021-05-04 10:57:30 +02:00
Kim Kulling feeb89a1dd closes https://github.com/assimp/assimp/issues/3831 : update zip 2021-04-30 16:49:15 +02:00
Kim Kulling e5417ea41f
Merge branch 'master' into change_file_encoding 2021-03-13 18:45:58 +01:00
jaefunk e53335e58c change file encoding 2021-03-09 18:31:15 +09:00
Paul Engelhardt dffaeade94
Update crypt.c 2021-03-08 09:04:22 +01:00
Kim Kulling 888415246e
Merge branch 'master' into issue_2195_draco 2021-02-08 11:52:54 +01:00
Kim Kulling 710f1d17d4 RapidJSon: Upgrade to latest greatest 2021-02-05 21:45:37 +01:00
Kim Kulling 5fbbba2fac
Merge branch 'master' into issue_2195_draco 2021-01-31 16:02:57 +01:00
Kim Kulling 79eb9ecc86 Update all minimum cmake req to 3.10 2021-01-29 21:05:46 +01:00
RichardTea c917e6513f
Merge branch 'master' into issue_2195_draco 2021-01-26 16:43:46 +00:00
RichardTea deac3a9f6c Add Draco 1.4.1 sources 
Upstream: https://github.com/google/draco
 2021-01-20 10:14:20 +00:00
Kim Kulling 9334e07619
Update CMakeLists.txt 2021-01-16 16:14:49 +01:00
Kim Kulling 8ad2661e0c
Update CMakeLists.txt 2021-01-16 12:00:42 +01:00
Kim Kulling 6db343386b
remove install of zlibstatic 2021-01-15 16:46:15 +01:00
Kim Kulling d898ecc80c
Fix another typo. 2021-01-06 18:59:13 +01:00
Kim Kulling 2ad4218d25
Merge branch 'master' into master 2021-01-06 18:54:57 +01:00
Kim Kulling 5222ab989f
Fix a typo 2021-01-06 18:51:59 +01:00
Kim Kulling b23ecb4864
Update CMakeLists.txt 
- Update minimum cmake version
- install for win32-platforms to avoid conflicts with targets for win32
 2021-01-06 18:51:30 +01:00
ihsinme e1052f421b
Update OpenDDLParser.cpp 2021-01-06 16:52:28 +03:00
ihsinme 177304bb7c
Update o3dgcArithmeticCodec.cpp 2021-01-06 16:50:07 +03:00
Fabrice Fontaine bfe35fc06b contrib/zlib/CMakeLists.txt: don't install zlib 
Don't install zlib static library to avoid potential conflicts with a
system-wide zlib package

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 2020-12-27 15:27:41 +01:00
Jean-Louis c464d01778 Fix fopen64, ftello64, fseeko64 declarations on all platforms 2020-12-24 03:18:09 +01:00
Jean-Louis 54be7ac582 Update unzip contrib 2020-12-24 01:53:40 +01:00
Biswapriyo Nath c65f2cb3fb Remove extra semicolon while GCC being pedantic. 2020-12-13 00:12:44 +05:30
Biswapriyo Nath 8d8ba521e2 Check _MSC_VER for MSVC specific pragma directives. 
This fixes build issues when compiled with compiles like Clang or GCC.
 2020-12-02 02:05:14 +05:30
Kim Kulling 3fd95aff4e
Merge branch 'master' into fix/3365 2020-10-27 17:43:28 +01:00
Kim Kulling 22ad7028f0
Delete CMakeLists.txt 2020-10-27 09:42:46 +01:00
Kim Kulling 4bba338d92
Update CMakeLists.txt 2020-10-27 09:23:20 +01:00
Kim Kulling 7e1a8f09c5 more openddl-fixes 2020-10-26 21:35:44 +01:00
Kim Kulling 57e691e28e openddl: latest greatest. 2020-10-25 10:34:43 +01:00
Silvio Traversaro 3b5212067c Fix CMake config generation 
Use standard CMake function to generate the CMake config files.
 2020-10-14 23:55:28 +02:00
Kim Kulling 23f144a7b7 pugixml: use pugixml in headeronly mode. 2020-10-05 18:44:59 +02:00