Commit Graph

8349 Commits (c7628d0f9289845af7b9408dbfd8093ae89c6fac)

Author SHA1 Message Date
Max Vollmer 0d672efa90 Check input token length before copy 2020-01-29 15:04:26 +00:00
Kim Kulling 6c95ee145c
Merge branch 'master' into kimkulling-patch-1 2020-01-29 14:37:32 +01:00
Loïc 194d31002d Import/export of embedded texture names for the glTF/glTF2 format 2020-01-29 14:04:41 +01:00
Kim Kulling 26179cd4d2
Merge pull request #2941 from LoicFr/master
Fix version revision formatting in glTF metadata
2020-01-29 13:19:01 +01:00
Kim Kulling e40df80d0e
Merge branch 'master' into master 2020-01-29 10:57:06 +01:00
Kim Kulling 0c9c0ab360
Merge pull request #2968 from assimp/issue_1592
closes https://github.com/assimp/assimp/issues/1592:
2020-01-29 10:56:35 +01:00
Kim Kulling 3ce35074c7
Merge branch 'master' into issue_1592 2020-01-29 08:13:31 +01:00
Kim Kulling 6c3afe2633
Merge pull request #2967 from malortie/refactor-assbin-export-and-dump-writer
Refactored Assbin exporter and assimp_cmd binary serialization functions.
2020-01-29 08:11:32 +01:00
Kim Kulling 5860d63efc
Update appveyor.yml
Disable compilers to improve appveyor build performance
2020-01-28 22:02:29 +01:00
Marc-Antoine Lortie 81bc7825d1 Potentially fixed strncpy warning by Coverity. 2020-01-28 14:02:09 -05:00
Kim Kulling dd1a11b585 closes https://github.com/assimp/assimp/issues/1592: make install optional, default enabled. 2020-01-28 19:37:38 +01:00
Marc-Antoine Lortie 5f30d4c0f8 Added missing cmd writting. 2020-01-28 12:30:09 -05:00
Marc-Antoine Lortie a328c18286 Fixed "printf format not a literal error" in build. 2020-01-28 11:06:17 -05:00
Marc-Antoine Lortie 21edb13ff8 Added missing header for unique_ptr. 2020-01-28 10:55:22 -05:00
Marc-Antoine Lortie 20388d6a4f Refactored Assbin exporter and assimp_cmd binary serialization functions.
- Renamed AssimpExport to AssimpFileWriter.
- Moved AssimpFileWriter to it's own file.
- Added a try catch in WriteBinaryDump to fix a case with memory leak.
- Replaced calls to WriteBinaryDump with AssimpFileWriter.
- Added new AssimpFileWriter files to CMakeLists.txt.
2020-01-28 09:55:05 -05:00
Kim Kulling 27449f17ca
Merge branch 'master' into master 2020-01-28 14:13:29 +01:00
Kim Kulling 7cad59bf0e
Merge pull request #2943 from malortie/hl1-mdl-fix-texture-format
[MDL HL1] Fixed wrong texture format used.
2020-01-28 13:02:18 +01:00
Kim Kulling 2c430bc82a
Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-28 11:13:17 +01:00
Kim Kulling 6cb2236cf7
Merge pull request #2958 from malortie/assimp-cmd-improved-error-codes
Uniformized error codes (return values) in assimp_cmd.
2020-01-28 09:22:32 +01:00
Marc-Antoine Lortie 21e4632b99
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-27 18:01:24 -05:00
Marc-Antoine Lortie 16d71908d7
Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-27 18:01:03 -05:00
Marc-Antoine Lortie 26a5c5a8ad
Merge branch 'master' into assimp-cmd-improved-error-codes 2020-01-27 18:00:16 -05:00
Kim Kulling e41a59ee1f
Merge pull request #2960 from tellypresence/revert-corrupt-image-files
Revert image files corrupted by a8a1ca9
2020-01-27 23:55:31 +01:00
Kim Kulling d59ffcb674
Merge branch 'master' into assimp-cmd-improved-error-codes 2020-01-27 20:44:48 +01:00
Kim Kulling 46faa1e523
Merge branch 'master' into revert-corrupt-image-files 2020-01-27 20:24:17 +01:00
Kim Kulling 1e3f7137fa
Merge pull request #2962 from RichardTea/macos_rpath
Remove explicit setting of macos install_name
2020-01-27 20:21:18 +01:00
RichardTea 4337c07e4b Remove explicit setting of macos install_name
Use CMake default behaviour for libassimp

Fixes #2961
2020-01-27 17:08:56 +00:00
tellypresence 9e1eba7912 Revert image files corrupted by a8a1ca9 2020-01-27 19:58:05 +09:00
Marc-Antoine Lortie ab284f7996 Fixed enumeral mismatch error in build. 2020-01-26 14:02:16 -05:00
Marc-Antoine Lortie b23c0b0637 Uniformized error codes (return values) in assimp_cmd. 2020-01-26 13:10:21 -05:00
Marc-Antoine Lortie 5d5a4faf47
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-25 13:35:14 -05:00
Marc-Antoine Lortie 5ab67f6491
Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-25 13:34:59 -05:00
Kim Kulling a1fbe74e87
Merge pull request #2952 from malortie/hl1-mdl-load-external-textures
Added support to load HL1 MDL external texture files directly.
2020-01-25 19:23:05 +01:00
Kim Kulling fc4ae3586e
Update utMDLImporter.cpp
unittests: Fix compiler warning: comparison between signed and unsigned.
2020-01-25 11:31:14 +01:00
Marc-Antoine Lortie 48bb2978af Added support to load HL1 MDL external texture files directly. 2020-01-24 13:14:37 -05:00
Marc-Antoine Lortie e093066a2c
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-24 07:22:59 -05:00
Marc-Antoine Lortie b9ae88f200
Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-24 07:20:03 -05:00
Kim Kulling 57c735cdca
Merge branch 'master' into master 2020-01-24 11:30:59 +01:00
Kim Kulling dbee3807b3
Merge pull request #2948 from malortie/update-texture-format-size
Updated places where read/write for achFormatHint (Redone).
2020-01-24 11:27:00 +01:00
Marc-Antoine Lortie 770c822621 Updated places to achFormatHint referencing array size. 2020-01-23 15:26:49 -05:00
Kim Kulling 316a8dff4e
Merge pull request #2928 from malortie/hl1-mdl-deletion-temp-nodes
[MDL HL1] Fixed children nodes not deleted.
2020-01-23 20:38:53 +01:00
Kim Kulling e569831253
Update HL1MDLLoader.cpp
Fix possible x64 issue.
2020-01-23 16:20:34 +01:00
Kim Kulling b74b96fca4
Merge branch 'master' into hl1-mdl-deletion-temp-nodes 2020-01-23 15:17:19 +01:00
Kim Kulling 5b09758f15
Update HL1MDLLoader.cpp
Fix compiler warning
2020-01-23 15:04:07 +01:00
Kim Kulling 259d670f54
Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-23 11:14:05 +01:00
Kim Kulling eb5c581b82
Merge pull request #2933 from malortie/update-copyright-end-date
Updated copyright dates.
2020-01-23 11:02:18 +01:00
Kim Kulling 092883cf19
Merge branch 'master' into update-copyright-end-date 2020-01-22 18:03:43 +01:00
Marc-Antoine Lortie 2081b71838
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-22 10:52:51 -05:00
Marc-Antoine Lortie 11d98e7cf6
Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-22 10:47:34 -05:00
Turo Lamminen eb5b3bc347
Merge pull request #2940 from turol/memleak-fix
Fix memory leak in .X importer
2020-01-22 17:18:57 +02:00