Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,143 Commits 19 Branches 43 Tags
b87f4c03bab4df875d5ec05be15809bbec73d342
Commit Graph

3951 Commits

Author SHA1 Message Date
Otger
a51d9a3884 Ignore FBX 'PP' type connections (they were stopping the file parsing) 2015-11-24 17:51:11 +01:00
Yotam Gingold
da013350f9 aiGetExportFormatDescription() no longer uses free'd memory 
aiGetExportFormatDescription() now creates an Exporter object at the beginning of the function, so that a call to `GetExportFormatDescription()` doesn't access free'd memory.
 2015-11-23 23:50:25 -05:00
Otger
c876dce82b Fixed crashes for Video with no content 2015-11-23 21:46:55 +01:00
Kim Kulling
032fbe3fe5 Merge branch 'master' of https://github.com/assimp/assimp 2015-11-23 21:29:51 +01:00
Kim Kulling
70540616ce issue 693: add missing release call in c-export interface. 2015-11-23 21:28:35 +01:00
Otger
f94bc8d66e Initial support for FBX embedded textures 2015-11-23 19:49:54 +01:00
Danke Xie
24b68b1e3d Support instance_image in Collada 1.5 files 
The <instance_image> tag in sampler2D elements is not expected by
ColladaParser. This patch parses the instance_image element and
gets the image ID.
 2015-11-19 17:36:23 -08:00
Danke Xie
57d7085fb8 Fix AndroidJNI header path in CMakelists.txt 2015-11-15 22:53:11 -08:00
IOhannes m zmölnig
756cfd4f74 fix compilation on BigEndian 
cannot pass a function by reference where an lvalue is expected
(only applies to bigendian, where a macro expands to a byteswap function)

Closes https://github.com/assimp/assimp/issues/613
 2015-11-13 22:33:20 +01:00
Kim Kulling
e6ac1ed66a glTF-Importer: add files. 2015-11-08 20:29:05 +01:00
Kim Kulling
655cb65ab2 Version: increase version from 3.1.1 to 3.2. 2015-11-03 19:43:02 +01:00
Kim Kulling
eadc6116c0 OpenDDLParser: latest greatest. 2015-10-31 09:43:34 +01:00
Kim Kulling
6f75ea5702 Merge branch 'master' of https://github.com/assimp/assimp 2015-10-31 09:07:21 +01:00
Turo Lamminen
46121a1559 Mark single-parameter constructors explicit 
Suggested by cppcheck
 2015-10-29 14:04:23 +02:00
Turo Lamminen
9825d07764 OFFLoader: Throw error on certain invalid files instead of failing validation later 2015-10-28 14:20:13 +02:00
Turo Lamminen
7a5bc6eca3 OFFLoader: Use a temporary vector to store vertices instead of a raw array 
Prevents crash on certain malformed inputs but
they still cause a validation failure.
 2015-10-28 14:10:18 +02:00
Turo Lamminen
fba7ede639 OFFLoader: Don't use assignments as expressions 2015-10-28 13:39:10 +02:00
Olli Kallioinen
12ed07a939 FBX import: If animation is not defining keys for all vector components 
(x, y and z), use the node transform as the default value.
 2015-10-27 21:03:24 +02:00
Kim Kulling
5160975138 Merge branch 'master' of https://github.com/assimp/assimp 2015-10-27 19:48:36 +01:00
Łukasz Twarduś
3274bcf8d6 Properly build path to the mtl file when loading loading obj 2015-10-25 20:04:50 +01:00
Francesco Guastella
2750f8da24 Added support for reflection maps for OBJ files 2015-10-15 15:46:35 +02:00
Sebastien Bonopera
62ec784cef Fixed issue in PlyParser (uint16 values misparsed) 2015-10-12 20:08:25 +02:00
Jaakko Keränen
bfe3bee34b Merge branch 'master' into md5-fix 2015-10-07 16:49:45 +03:00
Kim Kulling
4a8b459706 OpenDDLParser: latest greatest. 2015-10-01 20:29:15 +02:00
Kim Kulling
7ed32fd5a9 fix typo. 2015-09-27 20:49:15 +02:00
Kim Kulling
1fbc0cc276 DefaultIOSystem: fix typo in macro. 2015-09-27 10:51:33 +02:00
Kim Kulling
f5c8f7b5e5 DefaultIOSystem: close cygwin issue assimp/assimp/issues/660. 2015-09-27 01:02:12 +02:00
Kim Kulling
d06945f17e DefaultIOSystem: fix issue assimp/assimp/issues/660 by checking for _WIN32 
as well.
 2015-09-24 23:51:04 +02:00
Kim Kulling
3fc251b326 BaseImporter: fix typo and rename attributes for better readability. 2015-09-24 00:57:47 +02:00
Kim Kulling
ef6baa0acf DefaultIOSystem: use correct define to detect Visual Studi compiler. 2015-09-22 00:23:33 +02:00
Kim Kulling
34ee4c4b9a DefaultIOSystem close assimp/assimp/issues/108 : use correct macro to 
detect vs-compiler.
 2015-09-21 20:43:58 +02:00
Kim Kulling
6b1cac5743 Merge branch 'master' of https://github.com/assimp/assimp 2015-09-21 17:34:01 +02:00
Kim Kulling
ca6296f609 STLLoader: mak functions local. 2015-09-21 17:33:41 +02:00
Kim Kulling
e9937ab0f7 IOSystem: add missing documentation. 2015-08-30 15:37:56 +02:00
Kim Kulling
e4510c26ba Obj-Importer: fix https://github.com/assimp/assimp/issues/641 2015-08-30 15:21:53 +02:00
Kim Kulling
9708a4db93 Subdivision: fix compiler warning from debug check. 2015-08-30 13:48:00 +02:00
Alexander Gessler
305e27d1a5 Merge pull request #645 from l337r007/fix-osx-cmake 
CMake: Don't try to set property on target before it is defined.
 2015-08-29 14:58:53 +02:00
Alexander Gessler
ce5baa95ca Merge pull request #647 from Gargaj/patch-1 
add opencollada extension
 2015-08-29 14:58:27 +02:00
Gargaj
1f6cead81b remove junk 2015-08-29 13:39:43 +02:00
Gargaj
9885c3e551 add opencollada extension 2015-08-28 16:20:17 +02:00
Wolfgang Herget
9f157ed9b8 CMake: Don't try to set property on target before it is defined. 
The exact same code this commit removes is repeated in line 748.
There, it actually works, since the "assimp" target is defined there.
 2015-08-26 12:36:57 +02:00
Jaakko Keränen
d74a1149b7 MD5: Fix quaternion conversions 
Some of the quaternions loaded from MD5 files were not converted
to follow Assimp conventions.

https://github.com/assimp/assimp/issues/495
 2015-08-18 11:49:06 +03:00
Kim Kulling
4afddf316f Merge pull request #632 from turol/afl-fixes 
Random crash fixes
 2015-08-14 16:13:54 +02:00
Kim Kulling
91881065d7 Merge pull request #635 from turol/fix-bad-references 
IFC: Don't store temporary values by reference
 2015-08-14 16:12:07 +02:00
Andreas Henne
ec43e08295 Fixed issue in STLLoader that lead to wrong node names. 2015-08-14 13:37:41 +02:00
Turo Lamminen
e67bcca744 IFC: Fix more bad references 2015-08-14 14:02:16 +03:00
Turo Lamminen
4540250116 IFC: Don't store temporary values by reference 
This is not legal in any way and should never have worked.
 2015-08-14 13:32:45 +03:00
Turo Lamminen
0b0ba2ec4d Refactor logic which checks for too large allocations 
It's now easier to change the limit
 2015-08-14 11:53:16 +03:00
Turo Lamminen
5575a54466 Add various checks to avoid either too large or zero-sized memory allocations 2015-08-14 11:53:16 +03:00
Turo Lamminen
e5ddb98dde STL: Fix another read past EOF 2015-08-14 11:53:13 +03:00