Commit Graph

11086 Commits (63183a048ce761248c25aec33675cce5d4077b7b)

Author SHA1 Message Date
Kim Kulling 5d8e5fd130
Update XFileParser.cpp
Fix typo
2022-02-15 16:10:33 +01:00
Kim Kulling 7c13b16d30 Add missing flush modes supported by zlib 2022-02-14 20:51:06 +01:00
Kim Kulling 416f823866 Merge branch 'kimkulling/introduce_compression' of https://github.com/assimp/assimp into kimkulling/introduce_compression 2022-02-14 20:25:27 +01:00
Kim Kulling c718500c55 Fix last review findings and finish windows bits 2022-02-14 20:25:18 +01:00
Kim Kulling 9a585d7b3c
Merge branch 'master' into kimkulling/introduce_compression 2022-02-13 19:58:22 +01:00
Kim Kulling 52b6c4f7c0 Fix broken importer and add some review findings2 2022-02-13 18:44:22 +01:00
Kim Kulling 3e09d462fa Fix compression for fbx 2022-02-12 09:25:45 +01:00
Kim Kulling 97c7e084c2
Merge pull request #4380 from malytomas/tomas/fixsizet
fix missing include for size_t
2022-02-11 08:55:35 +01:00
Kim Kulling 23b43d1825 Fix X-Importer decompress algorithm 2022-02-08 21:43:14 +01:00
Kim Kulling 27bcddfb1a Migrate more importers to compression class 2022-02-08 20:43:47 +01:00
Tomas Maly acf73659d8 fix missing include for size_t 2022-02-08 00:08:46 +01:00
Kim Kulling dcd5c1dcfd
Merge pull request #4375 from assimp/kimkulling/introduce_compression
Introduce compression class to encapsulate compression via zlib
2022-02-07 10:23:23 +01:00
Kim Kulling ce61ea56a5
Merge branch 'master' into kimkulling/introduce_compression 2022-02-07 10:02:51 +01:00
Kim Kulling ed8612ea35
Merge pull request #4376 from assimp/kimkulling-lwo-enum-validation_issue4236-1
LWO: validate enum value before parsing it
2022-02-07 10:02:13 +01:00
Kim Kulling 389fc11e5b
Merge branch 'master' into kimkulling-lwo-enum-validation_issue4236-1 2022-02-07 09:38:36 +01:00
Kim Kulling a9e2864cb4
Merge pull request #4378 from assimp/kimkulling-temporary-disable-hunter
Update ccpp.yml
2022-02-07 09:36:16 +01:00
Kim Kulling 836d12b9af
Update ccpp.yml
- Temporary disable hunter for windows
- closes https://github.com/assimp/assimp/issues/4377
2022-02-07 09:23:59 +01:00
Kim Kulling 9a15ca1007
LWO: validate enum value before parsing it
- Check for valid enum values
- closes https://github.com/assimp/assimp/issues/4236
2022-02-07 09:08:23 +01:00
Kim Kulling eb5a7938e0 Remove dead code 2022-02-06 21:16:04 +01:00
Kim Kulling 9335cc30ab INtroduce compression class to encapsulate compression via zlib 2022-02-06 20:42:58 +01:00
Kim Kulling ecfb9757d0
Merge pull request #4371 from assimp/kimkulling-remove_travis
Delete .travis.sh
2022-02-03 14:24:53 +01:00
Kim Kulling d643146192
Delete .travis.yml 2022-02-03 14:03:50 +01:00
Kim Kulling a595cdad06
Delete .travis.sh 2022-02-03 14:03:20 +01:00
Kim Kulling ce880331df
Merge pull request #4366 from malytomas/master
fix compilation with clangcl on windows
2022-02-02 22:36:01 +01:00
Kim Kulling 4141260fc9
Merge branch 'master' into master 2022-02-02 21:21:01 +01:00
Kim Kulling 6c4addf158
Merge pull request #4367 from umlaeute/bugfix/bigendian
use fully qualified namespace in byteswap macros
2022-01-31 23:48:41 +01:00
IOhannes m zmölnig (Debian/GNU) ed6b6cd65c use fully qualified namespace in byteswap macros
Closes: https://github.com/assimp/assimp/issues/4358
2022-01-31 14:42:59 +01:00
Tomas Maly 3976f9a092 fix compilation with clangcl on windows 2022-01-30 22:04:41 +01:00
Kim Kulling a214b0833f
Merge pull request #4359 from assimp/kimkulling-hmp_fix_override_issue4235
HMP: Fix override during copying position data
2022-01-27 00:09:20 +01:00
Kim Kulling f217bd4b5f
Update HMPLoader.cpp 2022-01-26 19:42:09 +01:00
Kim Kulling 305d1f45aa
Add some constants and fix compile 2022-01-26 19:36:38 +01:00
Kim Kulling 50b00d33b5
HMP: Fix override during copying position data
- Fix override
- closes https://github.com/assimp/assimp/issues/4235
2022-01-26 19:22:52 +01:00
Kim Kulling 5698d41bf9
Merge pull request #4355 from assimp/kimkulling_fix_win64_warning_unreachable_code
ASE: Fix warning unreachable code
2022-01-24 20:43:34 +01:00
Kim Kulling 06fffb4f83 ASE: Fix warning unreachable code 2022-01-24 20:05:25 +01:00
Kim Kulling 83d4ab8563
Merge pull request #4353 from assimp/kimkulling-preparation_v5.2.0
Udate version to 5.2.0
2022-01-23 23:30:08 +01:00
Kim Kulling 91737f1cc9
Fix copyright: last year 2022-01-23 21:18:31 +01:00
Kim Kulling c4a66ae988
Update utVersion.cpp 2022-01-23 21:10:19 +01:00
Kim Kulling 1d34cb2c72
Udate version to 5.2.0 2022-01-23 21:09:20 +01:00
Kim Kulling c5634be708
Merge pull request #4338 from leonvictor/respect-cmake-output-variables
CMAKE: Respect top-level CMAKE_*_OUTPUT_DIRECTORY variables
2022-01-23 19:03:36 +01:00
Kim Kulling 6cc469a5ae
Merge branch 'master' into respect-cmake-output-variables 2022-01-23 18:11:47 +01:00
Kim Kulling 8b1d94d6b1
Merge branch 'master' into deprecated_gltfpbr_macros 2022-01-23 12:16:49 +01:00
Kim Kulling d45af75a5e
Merge pull request #4344 from revu-design/bensewell-fixifcopening4343
IFC Reading: Fix opening reading.
2022-01-23 12:15:38 +01:00
Ben Sewell 3e6fc3a64b Merge remote-tracking branch 'origin/master' into bensewell-fixifcopening4343 2022-01-20 09:43:45 +00:00
Kim Kulling c142676908
Merge pull request #4346 from assimp/kimkulling-fuzzer_ase_outofbounds_issue_4232
ASE: Fix material parsing
2022-01-20 10:40:00 +01:00
Kim Kulling c1968823ad
ASE: Fix material parsing
- Fuzzer error found when material access get's an out-of-bound access.
- Break parsing when material index gets out of range.
- closes https://github.com/assimp/assimp/issues/4232
2022-01-20 10:25:52 +01:00
Kim Kulling 985a5b9667
Merge pull request #4342 from assimp/krishty-new-file-detection
Krishty new file detection
2022-01-19 23:05:27 +01:00
Kim Kulling cbc4459dda Fix compile error: missing var 2022-01-19 22:03:11 +01:00
Kim Kulling 43763f53d6 Fix compile error: missing var 2022-01-19 22:00:53 +01:00
Kim Kulling 15b08f643a Fix warning: unused variable 2022-01-19 21:55:24 +01:00
Kim Kulling 17d5633a5b Add missing SImpleExtensionCheck 2022-01-19 21:42:14 +01:00