github.com/assimp/assimp commits | Ecosyste.ms: OpenCollective

Merge branch 'master' into search-invalid-textures-missing-texture-types

bdd5e52176dc9c92be02a2a2d23d06ac074aa8b4 authored almost 5 years ago

pkg-config: fix include path

1e828cb8bb18218735a8a5fa00f18ba2c544f7bd authored almost 5 years ago

Merge branch 'master' into master

1473c6616b51f5e7433124bf1a792e1c387b5930 authored almost 5 years ago

Merge pull request #2986 from bubba/gltf-camera-pos

Use the translation matrix in gltf2 cameras for aiCamera.mPosition

f7abd61cca1fc62da79404131522ecd240e86888 authored almost 5 years ago

Merge branch 'master' into master

d662b25b173e3c134a73a8c1d722f025cbaf5d8a authored almost 5 years ago

A bug when importing multiple gltf files

meshOffsets are not cleared when importing multiple gltf files

d04df3e7c52e5566c30875236567a1656b365d9f authored almost 5 years ago

Merge branch 'master' into gltf-camera-pos

523e6c9f73f45d9449e11741cb8316415c6839aa authored almost 5 years ago

Merge pull request #2995 from runforu/master

Fix: GLTF animation works on RTS not matrix; fix matrix related bug; …

d5b7ecd2ec7272fba3618b71d0e965badd171651 authored almost 5 years ago

Fix: GLTF animation works on RTS not matrix; fix matrix related bug.

b62bd38c71293f0425a1ac5f163c746ecb7c6c5b authored almost 5 years ago

Merge branch 'master' into master

56a71f22e1069c929dd3a394be2360c0842f0b1e authored almost 5 years ago

Merge pull request #2985 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix

Fixed size check to use correct value

a4868a9530b8a93a8e2ff21710b598600fbe1764 authored almost 5 years ago

more minor changes

25feb77982aefd895769dc0b79a3b50e0f05dae2 authored almost 5 years ago

reduced the scope of iStep variable

6f1870681bf5a37ac21a8fd8fb47d753431e2677 authored almost 5 years ago

revert small change

24cdb1f22184adaabb9155ac303c888843e0a7b7 authored almost 5 years ago

Merge branch 'master' into master

6f53e8b43bf227684d50b3d3fc5f9f41acf66235 authored almost 5 years ago

minor code improvements for the obj code

- make use of range for loops
- make use of empty() method for the std::vector
- removed unneces...

fc4dd6455a87fc01a9ef734d64718945207b09f2 authored almost 5 years ago

Merge branch 'master' into FBXMeshGeometry_checksizes_fix

f5af79163356fb13cd08b35a7f2155510c9c30de authored almost 5 years ago

Merge pull request #2973 from bztsrc/master

Additional checks on invalid input

58b9dcbdc713730680ddb7c340d869e978b446e2 authored almost 5 years ago

Update M3DImporter.cpp

Fix a memoryleak.

47fc3f262751c1f15e0912358dedc33abe8cd5ca authored almost 5 years ago

Merge branch 'master' into master

1c13c793f050c92a78acf46bcd73ebfb52e62da6 authored almost 5 years ago

Merge pull request #2971 from ms-maxvollmer/FBXParser_check_inputlength_fix

Check input token length before copy

aed762acd7ab5efd883f57558b4e9d7621a70181 authored almost 5 years ago

Added missing texture types when searching for invalid textures.

50334086cfb693f720d18d1664d177e63d200f0d authored almost 5 years ago

Update FBXParser.cpp

add missing brackets.

58990d4e3ff84906b459164c211ce379fe63751c authored almost 5 years ago

Merge branch 'master' into FBXParser_check_inputlength_fix

5e979d72c94990f9f11a3378d79a04c5f6aa43a9 authored almost 5 years ago

Merge pull request #2969 from LoicFr/master

Import/export of embedded texture names for the glTF/glTF2 format

c722061f18d76f3d3a824bab194a4117070b195b authored almost 5 years ago

Merge branch 'master' into master

471f9b23c93a4f3de250eba0d80ea609e70edede authored almost 5 years ago

Merge pull request #2994 from iamAdrianIusca/master

Small changes in the CMake file

c6000db3be9cdc521d83766595b740cc45ba0e3c authored almost 5 years ago

Merge branch 'master' into master

d38e541e89f84eb314e7e01375ee3f20f5225a1c authored almost 5 years ago

Merge pull request #2987 from Frooxius/master

Fixed population of bone armature and node fields for some meshes

91633dc437d132f7257bffc9580ffc8a16df0d1c authored almost 5 years ago

- don't include HunterGate.cmake if you don't enable HUNTER package manager

- don't check for DirectX if you don't build the assimp tools or samples

ca08cbcb0cfb3e966480fdaaf603cb8c8d367819 authored almost 5 years ago

Update ArmaturePopulate.cpp

- Introduce tabs width of 4.
- Add missing brackets
- Use c++ comment blocks

8fd053315ce535fca5f103c13c2d1800d4a092ab authored almost 5 years ago

Merge branch 'master' into master

407c5502405ce83503281a0ebe9b9d61b15a55d4 authored almost 5 years ago

Merge pull request #2989 from malortie/multiple-texture-type-to-string-definitions

Fixed TextureTypeToString defined multiple times.

5a674bb464f7cba4b4c14356b04779bab656ccb9 authored almost 5 years ago

Merge branch 'master' into multiple-texture-type-to-string-definitions

95a7772b5a1b44582184682103aa91d31eb31d28 authored almost 5 years ago

Merge branch 'master' into FBXParser_check_inputlength_fix

af9705e3d130a79e06880f551ee110bea7706486 authored almost 5 years ago

Merge pull request #2990 from assimp/kimkulling-sponoring-update-1

Update FUNDING.yml

97a6d80cb1a233fff3fff0a60cfcd9e303a8f0c3 authored almost 5 years ago

Update FUNDING.yml

Add paypal sponsoring

d3a70c73c445c01b03495fe2d0c8513bf16e5fb7 authored almost 5 years ago

Merge branch 'master' into master

acf57bdb13a7eef3cff8468b8d70ab52d2b472fe authored almost 5 years ago

Fixed TextureTypeToString defined multiple times.

- Moved TextureTypeToString to it's own file.
- Added new file to CMakeLists.txt.
- Added 6 miss...

8c09cd2ef3d72ba150b7a8faf67ea7fcd913984b authored almost 5 years ago

Merge pull request #2942 from malortie/hl1-mdl-remove-texture-256-clamping-2

[MDL HL1] Removed texture dimensions limitation.

355131e2612e12f92c13a3e23ec1221d4fde1e86 authored almost 5 years ago

Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2

b33272b1c8aaf6ebcf5e5696b10f6861a58e2b58 authored almost 5 years ago

Fixed invalid armature node population when there's mesh on a node with the same name as the bone

29603128f434e23cb93398955fe9fe22e101ed6e authored almost 5 years ago

Merge pull request #4 from assimp/master

Updating to the latest version from upstream

cb02e2fc652fde41e7d320ada0ef7fd99ae9af92 authored almost 5 years ago

xml-migration: migration of XGLImporter.

979153522c46c6a1af9c53262fbd7dce53374b2e authored almost 5 years ago

Use the translation matrix in gltf2 cameras for aiCamera.mPosition

18c01a023cd876ba328478a5cd4c6ff389904789 authored almost 5 years ago

Merge pull request #2974 from malortie/rename-writedumb-to-writedump

Renamed WriteDumb.cpp to WriteDump.cpp

fa60ae28857a13ebc77526ed77da891c4d7b25f9 authored almost 5 years ago

Merge branch 'master' into FBXMeshGeometry_checksizes_fix

7047d05bf04949ffd0a47f893617e974a737b353 authored almost 5 years ago

In "ByVertice" case tempData.size() needs to be mapping_offsets.size(), not vertex_count

8af0229e0d257f7443b8f254fe2c75339680da57 authored almost 5 years ago

Merge branch 'master' into rename-writedumb-to-writedump

f00256d185a3d25dcf9206b752eb0906f4edfc6e authored almost 5 years ago

Merge pull request #2984 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix

Removed unnecessary checks that may result in false positives rejecting valid models.

f7c59ace4419d47235850903fc8a15294cf7f762 authored almost 5 years ago

Merge branch 'master' into FBXMeshGeometry_checksizes_fix

eb1d25631bb269ca822a90c207450ccfd60892f2 authored almost 5 years ago

Merge branch 'FBXMeshGeometry_checksizes_fix' of https://github.com/ms-maxvollmer/assimp into FBXMeshGeometry_checksizes_fix

ec024085ab8a9505cd55b8e9e4dc29da71622e87 authored almost 5 years ago

Removed unnecessary checks that may result in false positives rejecting valid models

cb55e2658db85558104b828d17b3455d0a24c6f0 authored almost 5 years ago

xml-migration: migrate shared code from irr-loader.

1a8d5667b699d5cf5d8d2605a9a8c873d552826a authored almost 5 years ago

Merge pull request #2976 from hbina/fix_clang_warnings

Fixed a bunch of clang warnings

c9244a4ae373bc5402217eccee1d90dc65d94da5 authored almost 5 years ago

Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml

bd2ffc8d586c9c39e63fbc59d5d2bef24fccca78 authored almost 5 years ago

XMl-Migration: Migration of IrrMesh.

c1fcee9c5ab1682990d73fec8e83a9b4673242c5 authored almost 5 years ago

Merge branch 'master' into fix_clang_warnings

ad286a8ab1e97601780213fad61c6feb36877a8d authored almost 5 years ago

Update MDLLoader.cpp

fix a tab.

8e009c3d0cd11bcabf7a66952d33e3fa55b9ae12 authored almost 5 years ago

Merge pull request #2978 from malortie/scene-combiner-memory-leak

Fixed mValues allocated twice in SceneCombiner.cpp.

c0dc3b3f5855609ab99dc9688a370dbee730fe43 authored almost 5 years ago

Merge branch 'master' into scene-combiner-memory-leak

2d5c28ac46bb59409853f36b73849265420b954d authored almost 5 years ago

Merge branch 'master' into master

99175e3eaf228cec40ebdcd856d2c5299e0ecbcf authored almost 5 years ago

Merge pull request #2970 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix

Added missing checks for tempData and uvIndices sizes in all cases

5eb040c744bc2fbf5cf72a81a0106135cb615b0d authored almost 5 years ago

Merge branch 'master' into FBXMeshGeometry_checksizes_fix

4862d11807200aca89cc75908d379f9dd20e224e authored almost 5 years ago

Fixed wrong changes applied during merge.

d6567e606e6acb472f2b64f700834f8fc1ef41ff authored almost 5 years ago

Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2

3386e9ea58446eeb36af16393c5ddd3612a879c8 authored almost 5 years ago

Fixed mValues allocated twice.

mValues is already allocated in aiMetadata::Alloc().

ede860173eeb232db58fb768d9c097ed14edf2b4 authored almost 5 years ago

Merge branch 'master' into master

9a971ffeaccbef7609b82d0ba7e2b907ea697a09 authored almost 5 years ago

Update glTF2Exporter.cpp

Replacing tabs by spaces.

026900088433e46ee5e35162e062d733c547a121 authored almost 5 years ago

Update glTFImporter.cpp

Replace tabs by spaces.

187b74355bd7ee18b02da9c84d44e6dc186b0c9e authored almost 5 years ago

Update glTFExporter.cpp

Replacing tabs by spaces.

0af44fb3e8597b812db47f69e59a31cfb640620a authored almost 5 years ago

Merge branch 'master' into master

ca614a741949960e6afbd31d535d74e4279c3613 authored almost 5 years ago

Fixed what kimkulling broke

e434c63c31d474c506b7cb573762aa7ac307e37a authored almost 5 years ago

Fixed a bunch of clang warnings

1. Fix misleading indentation warnings.
2. Fix creating a temporary const copy when iterating ov...

bbe6f7f213b5e2ee689146df5c068dc1a55ea919 authored almost 5 years ago

Renamed WriteDumb.cpp to WriteDump.cpp

This includes as well changes to places referencing WriteDumb.cpp.

2c1c1d846e4584990e2397f195fb3225ec6a8668 authored almost 5 years ago

Merge pull request #2972 from malortie/refactor-assxml-and-xml-dump-writer

Refactored Assxml exporter and dump xml writer.

78b074ac5aa3ff3573675d49d154b358ba8e9700 authored almost 5 years ago

Merge branch 'master' into refactor-assxml-and-xml-dump-writer

53c394179cbdb4dbfb87814501436b61e818e099 authored almost 5 years ago

Merge branch 'master' into FBXMeshGeometry_checksizes_fix

dc01f99fed13efd98ed2d23558d58b1e645461e4 authored almost 5 years ago

Merge branch 'master' into FBXParser_check_inputlength_fix

feeb875453e85654094a291dc5117e4ce899c364 authored almost 5 years ago

Update M3DImporter.cpp

Fix some review finding:
- Add missing brackets to make code more readable
- fix scope of vari...

a2ef0b5bd5e2695d65f29f46cad84eecec1800e1 authored almost 5 years ago

Update M3DImporter.cpp

Add missing brackets

605336832ff0aa6fc8a2b9cde1e1a944dc9e9dc3 authored almost 5 years ago

Merge branch 'master' into master

0273ffc3678aad5c239763973b31b4395c61ab27 authored almost 5 years ago

Merge pull request #2880 from assimp/kimkulling-patch-1

Update EmbedTexturesProcess.cpp

02ce1d07760fbc89327d25540a89b3c53bbc4ce0 authored almost 5 years ago

Merge branch 'master' into master

cb623f8b74d95253466b543a68bf626ccdbd1a5c authored almost 5 years ago

Additional checks on invalid input

398a8f757e401bfac5569940e56f82659c7f9e74 authored almost 5 years ago

Refactored Assxml exporter and dump xml writer.

- Moved AssxmlExporter serialization code in a new file AssxmlFileWriter.cpp/h
- Added new files...

ff168d7bc09f14d56e17ec037e3a10ccb49bf7ba authored almost 5 years ago

Added missing checks for tempData and uvIndices sizes in all cases

9e46fca9a911db010a6be87780073336785efccb authored almost 5 years ago

Check input token length before copy

0d672efa905412ecc5beda33dad2124bd8890480 authored almost 5 years ago

Merge branch 'master' into kimkulling-patch-1

6c95ee145cb69bb3d155a516761c21a87bda08b8 authored almost 5 years ago

Import/export of embedded texture names for the glTF/glTF2 format

194d31002d62aca910687bfda5bc9301203c948b authored almost 5 years ago

Merge pull request #2941 from LoicFr/master

Fix version revision formatting in glTF metadata

26179cd4d25d0d3db21907399dc3c6791ff4e8a8 authored almost 5 years ago

Merge branch 'master' into master

e40df80d0e8914954bcf45b0d1ae393a98caee62 authored almost 5 years ago

Merge pull request #2968 from assimp/issue_1592

closes https://github.com/assimp/assimp/issues/1592:

0c9c0ab3608e460e19078b5de0becb0ad1eb6044 authored almost 5 years ago

Merge branch 'master' into issue_1592

3ce35074c72ffebf0566e7a5e65cbe90f7b64546 authored almost 5 years ago

Merge pull request #2967 from malortie/refactor-assbin-export-and-dump-writer

Refactored Assbin exporter and assimp_cmd binary serialization functions.

6c3afe2633a17c48e72bffce735c2c9c8824b351 authored almost 5 years ago

Update appveyor.yml

Disable compilers to improve appveyor build performance

5860d63efcebdf650aef13757a6ac9b948ed8a8b authored almost 5 years ago

Potentially fixed strncpy warning by Coverity.

81bc7825d112fdb37461be9414dcb6b1547cf547 authored almost 5 years ago

closes https://github.com/assimp/assimp/issues/1592: make install optional, default enabled.

dd1a11b58533af01d843edaa73036ad9bde39a8e authored almost 5 years ago

Added missing cmd writting.

5f30d4c0f8b551f87c41b2b300ecfa6111b51fc5 authored almost 5 years ago

Fixed "printf format not a literal error" in build.

a328c18286aba201bbd66898304c5b4c945cc151 authored almost 5 years ago