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

Merge branch 'master' into fix_zip_issue

9fae5fdabb24006929d2921483a0d15c5ebf889e authored almost 5 years ago

small refactorings.

f3b6b78d4d0a758380ca1c256c21fcd90cc20987 authored almost 5 years ago

closes https://github.com/assimp/assimp/issues/2954: upgrade to latest greatest.

bb3db0ebaffc6b76de256e597ec1d1e4d2a6663f authored almost 5 years ago

Merge pull request #3057 from shawwn/2020-03-09/fix

Only try to initialize members whose name starts with 'm' followed by an uppercase character

7b1187a917539e035bc53530b60f6eb44f983aee authored almost 5 years ago

Only try to initialize members whose name starts with 'm' followed by an uppercase character

f305f105512237d7b44ec6c28492ac943e47fbcc authored almost 5 years ago

clean all warnings for vs-2019

e8d2b840178b2b22336eb02b2535f32f3d5cc37b authored almost 5 years ago

Merge branch 'master' into fix-simpletextureddirectx11-sample2

5866f3f98f37006bb4c8b01cc54266d5c08bcca4 authored almost 5 years ago

Merge pull request #3056 from malortie/fix-matrix3x3-comparison-operators

Fixed wrong matrix type used in aiMatrix3x3t comparison operators.

339f9387a7c09809eaea38ae451072d11c93449b authored almost 5 years ago

Fixed wrong matrix type used in comparaison operators.

424f5e939f2c8f87116d757efe4f937583780028 authored almost 5 years ago

Added missing std namespace prefix to std types.

dda083fa7bd7034f8fb31bf8ffc0a4d2bccf80fd authored almost 5 years ago

Merge branch 'master' into raise-cmake-minimum-version-to-3.0

a3ff03f193d13e93790883da234b7c857257a99a authored almost 5 years ago

Merge pull request #3053 from malortie/fix-simpledirectx11-sample

Fixed SimpleTexturedDirectX11 sample.

1e2c3c9c016d7a557a364161ac3cd8fbee16c72d authored almost 5 years ago

Update ModelLoader.cpp

Apply asimp-code-style.

b5d65bf94e2cedd5dd60443d66de92d61f3ccf6d authored almost 5 years ago

Update Mesh.h

Apply code style.

31c6f0db928add0e4ff22877bd4c91b5418aa2e4 authored almost 5 years ago

Fixed memory leak caused by glutMainLoop() not returning.

Fixed memory leak by allowing glutMainLoop() to return to allow for the scene and streams to be ...

c620e9a2ac7db28c6b94a5b6388825783aee2e2b authored almost 5 years ago

Merge branch 'master' into sample-simpleopengl-minor-improvements

673a1dcea52ff4dd8f65cea6770c5991f0df304a authored almost 5 years ago

Fixed SimpleTexturedDirectX11 sample.

- Removed OpenGL/Glut references in SimpleTexturedDirectX11 CMakeFile
- Moved UTFConverter from ...

aa8a6122cefb8286817a1250d87528105be1de34 authored almost 5 years ago

Merge branch 'master' into raise-cmake-minimum-version-to-3.0

291d86c4e02b32f3ad33116969a2e1d0d826082b authored almost 5 years ago

ifdef the exporters as specifying harsher linker flags than what's in default CMake causes linking issues.

8b9abc58e72ea714070ca67016b127a96572ea4b authored almost 5 years ago

fix gltf2 exporter memory crash

bb62249f0c76124a7fd44398b90a76009182476c authored almost 5 years ago

Merge pull request #3039 from Nimer-88/gltf2_broken_bones_count

Fix for #3037 cause glTF2Importer creating bunch of bones with 0 for vertex with index 0

0201fc57dca48910ca7f9fdf7457534ea6a57efc authored almost 5 years ago

Merge branch 'master' into gltf2_broken_bones_count

0b227219b7eeff7d67b04577af072fd73307d3d1 authored almost 5 years ago

Merge branch 'master' into raise-cmake-minimum-version-to-3.0

a254690ba0f05157889443afe64b997893f9713f authored almost 5 years ago

next fixed warnings

920535165da40288f5603dded29404018f09d90c authored almost 5 years ago

Merge pull request #3040 from Nimer-88/split_by_bone_count_infinite_loop

Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop

772774495cfcbb8dc265c324b1be609b8d2975d7 authored almost 5 years ago

Trimmed trailing whitespaces

710dbba52dee0f4ac2f1e59a1f495ed287d88372 authored almost 5 years ago

Trimmed trailing whitespaces

496fcd35c19b8ae4521487ad6d498d5476f69cfa authored almost 5 years ago

Fix for #3037 cause glTF2Importer creating bunch of bones with 0 for vertex with index 0

5f35d62d612fbc4af6a4dd48653192b08c0a26ad authored almost 5 years ago

Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop

22311883ce2aca0477f764bb300541f02834645f authored almost 5 years ago

Merge pull request #3022 from iamAdrianIusca/master

small improvements in the CMakeLists.txt file

f343d3eec2c09bfeb8a2a0688d76a05aee22aa51 authored almost 5 years ago

xml-migration amf - next steps.

03182c21b8f7cb166cbfb8cd2fe4235027d3aa42 authored almost 5 years ago

Merge branch 'master' into master

440629f1d2cd7faf46a828940dd36391e823183b authored almost 5 years ago

Merge branch 'master' into sample-simpleopengl-minor-improvements

c5aa817bda52be448a87b352e16f95d002a48cc4 authored almost 5 years ago

Merge pull request #3010 from jcarpent/master

pkg-config: fix include path

5eca30e274fdf9f63eb29d7667eb50e500286b3e authored almost 5 years ago

Fixed and changed a few things.

- Removed references to test models with relative path.
- Fixed a compile warning.
- Added usage...

ed5aab94958b629c9b0857c1717b884f1f030310 authored almost 5 years ago

[RFC] cmake: targets: check lib or lib64 path

Linkage against lib or lib64 should be taken into assumption.

Without it we get:

The imported ...

3c081f5f709392849384c6bf8efba6fb0ff205cd authored almost 5 years ago

cmake: double quotes around the <path>

see https://cmake.org/cmake/help/latest/command/file.html#to-native-path

4182d6fb60ee205c4f784c7e252e553687e85f27 authored almost 5 years ago

Raised minimum CMake version to 3.0 for assimp_cmd and assimp_view.

This is a follow-up to PR #3024, in which I explained that I would then change the version of CM...

957abaa15adfccda8c1b78a41c062e1cd4750320 authored almost 5 years ago

Merge branch 'master' into master

919ae489fc320338b8669e0acf53e84efad35d89 authored almost 5 years ago

Merge branch 'master' into master

100a7a7c1150cb7add4b2eb2864b62124d9ca711 authored almost 5 years ago

Merge pull request #3024 from malortie/remove-else-endif-constructs-cmake-files

Removed uneeded expression in else() and endif() constructs.

c5aa7cceee1800c6fac0735edc39db2bf25368c8 authored almost 5 years ago

Fix indentation.

e56def7585804f39ee4889d11afe2508207308d9 authored almost 5 years ago

Add support for orthographic camera information and use in glTF2 importer. Fixes #3030.

ae50c4ebdf23c7f6f61300dede5bf32e0d306eb2 authored almost 5 years ago

Fix to read orthographic camera data. Manual merge for this branch. Fixes #3028

fb5b01958a448e1c3dea9b6b2796b8bf9f98a5a7 authored almost 5 years ago

Merge pull request #13 from assimp/master

Update to upstream master

be391a3b66d8d80c390063abd0127033b865f034 authored almost 5 years ago

Merge branch 'master' into remove-else-endif-constructs-cmake-files

e4b2fd246d8954227489268f4cbc546452e9ec25 authored almost 5 years ago

Merge branch 'master' into master

28f4b95ff59de82931dfc2657fd16ac1064eb9d3 authored almost 5 years ago

Merge pull request #3009 from inhosens/master

A bug when importing multiple gltf files

824a412239005521862238a54032065cf1e79eb5 authored almost 5 years ago

Removed uneeded expression in else() and endif() constructs.

The following changes were tested against building with a master copy.

For a more detailed repo...

edfaaed56fb656a3923807cac1c875cc8ff2f4ba authored almost 5 years ago

Merge branch 'master' into master

55e9171e1f661778a1e94b4b7d00a2b727ab6553 authored almost 5 years ago

Merge branch 'master' into master

344170469cf56b973151e9312ed783874442121b authored almost 5 years ago

Merge pull request #3013 from malortie/common-directory-for-compiled-binaries

Made changes to write compiled binaries to a common directory.

55eb89d47607d247ddfd5b729fe99564c7695211 authored almost 5 years ago

Merge branch 'master' into common-directory-for-compiled-binaries

2d382c5e76cc0edcf3470d27e130f33c4125edfd authored almost 5 years ago

Merge branch 'master' into master

f3c89b0bd73ce78c25b222dcd178276767506296 authored almost 5 years ago

Merge remote-tracking branch 'origin/master'

4e414eb4ef01f80f11408469fd0ccaca8a22ccc9 authored almost 5 years ago

small improvements in the CMakeLists.txt file

If ASSIMP_NO_EXPORT is not defined:
- don't add the macro for the exporters
- don't include the ...

f28b087d163e0f027e027e6d634d4e42d55b727d authored almost 5 years ago

Merge branch 'master' into master

3f5136b7b2cb95bc188881aa3071e89f12c3a6f9 authored almost 5 years ago

Merge pull request #3014 from iamAdrianIusca/master

small changes

848922feae52a65ef6567a485b98d9efca37f1b4 authored almost 5 years ago

Merge branch 'master' into master

93d1586f442b1773e681fcf028ca7e81d7313bc8 authored almost 5 years ago

Merge pull request #3021 from malortie/fix-simpletexturedopengl-memory-leaks

Fixed memory leaks in SimpleTexturedOpenGL sample.

bc3ed5f702ce56658fb35d62e14aa3e2eda61eae authored almost 5 years ago

Fixed memory leaks in SimpleTexturedOpenGL sample.

- Added function "cleanup" to centralize release of resources.
- Added function "freeTextureIds"...

4d27fccd0bec68a5d2525a740b1ab1eb34d0be1a authored almost 5 years ago

Merge branch 'master' into master

93de3963731751e5b6db69c636b7f4f84a302bd8 authored almost 5 years ago

Merge pull request #3020 from assimp/kimkulling-clangformat

Keep post-processor intentions

8639bbabc7cebacbd8cf799f670fe5862e341f6d authored almost 5 years ago

Update .clang-format

Update clang.format to keep formatting of hashes in include file to optimize readabilaty.

8d6d8e2e3820c89fc6a2ff9758795c00e9aa0f77 authored almost 5 years ago

small fix

4de0237167dd8019838cb28a5622bba522f74842 authored almost 5 years ago

more changes

a5524ffcd9befe3f008e27d65b6de620b897c49c authored almost 5 years ago

.clear in destructor is redundant

ad52c5c5f6ac771124c3bd3585f24daa61fbbdbd authored almost 5 years ago

small changes

bf85fc1386fa06c184be5874d0a54cb11828347e authored almost 5 years ago

small changes

016c0a866557b7a22e6d47c9c89cc13939f121ce authored almost 5 years ago

Merge remote-tracking branch 'origin/master'

76908002c6eb719ae0dae653eaa3200770b70fb3 authored almost 5 years ago

fixed the = default on the destructor

d0922230a93c2a9bac8676cf7f2f7d96f8aa6deb authored almost 5 years ago

Merge branch 'master' into master

ba925e8860cb5d8d68dafc8de168006723e94110 authored almost 5 years ago

Merge branch 'master' into master

0811a69dabf1d649ea37cc0d8781a4355f0cf423 authored almost 5 years ago

Merge remote-tracking branch 'origin/master'

485e474a0c89c0f96fdd4026786c0dbf76161c5a authored almost 5 years ago

fixed the make_unique

a65bac27e9ee0dca6c4178f5134b1bb10ce7ef91 authored almost 5 years ago

Merge branch 'master' into enable_vs_warning_all

fb3c3048a580542181e3bc92448f30ef8c56683d authored almost 5 years ago

next warnings.

6e13381bdb7029d263b480d70dacdf1c92a43317 authored almost 5 years ago

Merge pull request #3015 from malortie/fix-simpletexturedopengl-sample

Fixed SimpleTexturedOpenGL sample.

10c84c9226b125c3b461794aabf64f3f8dfdf00d authored almost 5 years ago

Merge branch 'master' into fix-simpletexturedopengl-sample

51ebe1abfb62ef52785b070dd566a42537858212 authored almost 5 years ago

Merge branch 'master' into kimkulling_dev

221e56769f45775fba656ef300feea2e7c286a33 authored almost 5 years ago

Update irrArray.h

fix init ordering.

92da00329fc645db2148fdee5ee8af11695845ec authored almost 5 years ago

Merge branch 'master' into enable_vs_warning_all

22118dff1d1b0d87d9369bcf8ebbe45a97987967 authored almost 5 years ago

fix more warnings.

c2bfbdacf4d9f4560fd769af8a8c2beffc4820ec authored almost 5 years ago

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

Update .clang-format

919da48cdcf9b82020f3a7b86a85fe21a1002938 authored almost 5 years ago

Update irrString.h

fiix ordering of initializiation

d75f46280dc6e23b8834e769016e4415ac96d4ac authored almost 5 years ago

Update AssxmlExporter.cpp

Fix the build.

ec3a5620d0992d652fa03a2b7355c02d390f66f2 authored almost 5 years ago

Merge branch 'master' into kimkulling_dev

ada4f51d5bb0e46ebc15cba50abbd4efecf3ca82 authored almost 5 years ago

Update CMakeLists.txt

temporary disable iiXml test until xml-parser migration is ready.

b3d894ee739afc1abd7e84b4cef3f083526a67d6 authored almost 5 years ago

Update .clang-format

Disable tabs.

eb8abfa02cc76f41ce93f3832972fb490f3b9321 authored almost 5 years ago

Fixed SimpleTexturedOpenGL sample.

Several places in the sample's code were calling Unicode versions of Win32 functions with "multi...

d9042e46098a903de391e74ac1f5f12340c3cfee authored almost 5 years ago

Merge branch 'master' into master

4f44b4d25f3418009c96a91e75b935d601c99ad6 authored almost 5 years ago

Merge remote-tracking branch 'origin/master'

024b5e60bcf25ec4acb4bc712a96cb13b9577fd2 authored almost 5 years ago

very small changes

- FIND_PACKAGE(DirectX) is already used in the samples and assimp tool cmake files - so is not n...

5c99d6a864f9e2fc43960eb3113f212f32c7cb21 authored almost 5 years ago

Made changes to write compiled binaries to a common directory.

The following changes were tested with the following projects:

- assimp DLL
- unit tests
- tool...

be4fe131d5fee47c6e407e76f46b12edf29edba9 authored almost 5 years ago

disable arning for irrXml.

4a3ecbea14f009ac9a9cf8fca102f145b701706f authored almost 5 years ago

disable warnings for zib.

b072614fad0f4dffd90934808b12fb06d0fc72d5 authored almost 5 years ago

Merge pull request #3003 from iamAdrianIusca/master

minor code improvements for the obj code

a0000e5be4b5f3098eacb841c2bc84fa504ccd92 authored almost 5 years ago

Merge branch 'master' into master

00a104efde46cccfc20a246281dd44bfe8fd4af9 authored almost 5 years ago

Enable all warnings for Visual Studio.

693aa5c1d60a25efa1550fe4d2a34ac22b233bd9 authored almost 5 years ago

Merge pull request #3000 from malortie/search-invalid-textures-missing-texture-types

Added missing texture types when searching for invalid textures.

82beb35b78e8efd423be7cd4eba592177ac9ab4d authored almost 5 years ago