Commit Graph

1913 Commits (16fffb2ab1b7582164a5ac4bcd2598757450901f)

Author SHA1 Message Date
Stepan Hrbek 15d84825d9 Collada exporter: Fix isalnum(negative number) assert.
isalnum(negative number) asserts in MSVC.
It was first visible problem when exporting unicode filenames.
2015-12-31 03:18:11 +01:00
Kim Kulling 217ec76dfb coverity findings: fix possible derefencing of null pointer. 2015-12-30 21:56:24 +01:00
Kim Kulling e02a7cdb3c Merge pull request #732 from StepanHrbek/collada-export
Collada exporter: bind uv channel numbers with <bind_vertex_input>.
2015-12-30 21:31:29 +01:00
Kim Kulling 68b12ac0c4 Merge pull request #735 from JLouis-B/master
Fix a crash issue in XFileExporter
2015-12-30 21:26:34 +01:00
Kim Kulling 043fef6d21 coverity findings: fix resource leak in MakeVerboseFormat. 2015-12-30 20:39:58 +01:00
Kim Kulling 56e9a9168c coverity findings: add missing initializations. 2015-12-30 20:04:16 +01:00
Kim Kulling 1ea1f6dcfa coverity findings: add missind intialization in STEPFile. 2015-12-30 20:02:35 +01:00
Kim Kulling e1818d8ab6 coverity findings: initialize lookup table for materials. 2015-12-30 19:43:57 +01:00
JLouis-B a02cc6c98e Fix a crash issue in XFileExporter 2015-12-30 19:01:04 +01:00
Kim Kulling 0f1874d954 coverity findings: initialize index counter in line splitter. 2015-12-30 16:33:54 +01:00
Kim Kulling 7c3475c002 Coverity findings: fix resource leak in PlyLoader.cpp. 2015-12-30 15:38:30 +01:00
Kim Kulling 0c1b5355f4 Coverity finding: remove not used function. 2015-12-30 15:35:26 +01:00
Stepan Hrbek ad55e769bf Collada exporter: bind uv channels with <bind_vertex_input>.
When there are multiple uv channels used by multiple textures, <bind_vertex_input> specifies what channels to use. Without <bind_vertex_input>, at least some importers are unable to match channels to textures.
2015-12-29 17:08:16 +01:00
Kim Kulling 22f7f60ba0 glTF: usage of (hopefully) correct data type for size types: closes https://github.com/assimp/assimp/issues/723 2015-12-27 20:36:54 +01:00
Kim Kulling 9409ce3b56 https://github.com/assimp/assimp/issues/714: fix null pointer access with
unknown texture.
2015-12-27 00:19:11 +01:00
Kim Kulling 9af4747fa8 github.com/assimp/assimp/issues/730: use correct define check 2015-12-26 21:02:32 +01:00
Alexander Gessler 5847576f41 Merge pull request #703 from terziman/master
Improvement of collada transparency handling
2015-12-20 15:59:42 +01:00
Alexander Gessler 7e85f45abc Merge pull request #713 from ov/normalize-safe
GenVertexNormalsProcess produces invalid results for specific input
2015-12-20 00:06:58 +01:00
Alexander Gessler 891411514b Merge pull request #721 from luho383/fbx_file_import
Fix for FBX Files that do not have a Comma on a new line in a data block
2015-12-20 00:06:02 +01:00
lutz.hoeren 90ddb93940 Fix for FBX Files that do not have a Comma on a new line in a data block 2015-12-17 11:48:44 +01:00
lutz.hoeren e8a02ef890 Only read Element Data when there is a valid Mapping Information 2015-12-16 15:25:33 +01:00
Kim Kulling 87b3af4c3b Merge branch 'issue-707' of https://github.com/ov/assimp into ov-issue-707 2015-12-14 17:46:54 +01:00
Kim Kulling b60f57ece7 Merge pull request #716 from rmitton/empty_objmtl
Added support for empty .MTL files.
2015-12-14 09:29:31 +01:00
rmitton d952823ffd Importer for Silo SIB files.
Wrote an importer for Nevercenter Silo's binary SIB model format
2015-12-13 22:14:19 -08:00
rmitton b9a4e99607 Added support for empty .MTL files.
Some programs such as Silo export an empty .MTL file if you export a
.OBJ that doesn't use any materials. This patch allows the loading of
such files.
2015-12-13 22:13:25 -08:00
Vitaly Ovchinnikov b6f14eb917 Normalize() is replaced with NormalizeSafe() to prevent invalid vectors generation 2015-12-14 15:31:49 +13:00
Vitaly Ovchinnikov af40c99a6a trimming spaces around material names 2015-12-14 08:32:09 +13:00
Vitaly Ovchinnikov c9ef6132a8 a small fix 2015-12-13 23:10:31 +13:00
Vitaly Ovchinnikov 6214fbfbbe this patch fixes multiple objects generation in OBJ reader if faces are prepended with 'usemtl' line 2015-12-13 22:54:50 +13:00
Joe Hermaszewski 210764a6ff Correct spelling 2015-12-10 16:19:33 +00:00
Kim Kulling b440f67aae Merge pull request #704 from Vertexwahn/master
Added missing DLL suffix for VS2015 build.
2015-12-09 23:52:15 +01:00
Kim Kulling 35fafe3a6f ColladaParser: use initializer lists again. 2015-12-09 23:49:03 +01:00
Vertexwahn 3013b6b62f Added missing DLL suffix for VS2015 build. 2015-12-09 21:58:29 +01:00
Kim Kulling bf4ca8162d Update ColladaParser.cpp
Introduce workaround again to fix the build.
2015-12-09 15:07:58 +01:00
Kim Kulling 9ae7d438f0 Update ColladaParser.cpp
Try to close resource leak.
2015-12-09 12:10:31 +01:00
Kim Kulling b694bfd021 fix build 2015-12-08 20:36:31 +01:00
Léo Terziman 6eebf8455a Merge remote-tracking branch 'official/master' into contrib 2015-12-08 15:25:13 +01:00
Léo Terziman 445ae1fec3 In collada: implemented all missing transparency features from standard (ie RGB_ZERO, RGB_ONE and A_ZERO)
+ removed user option to invert transparency as it does not seem to be needed anymore
+ fixed bug in default reflectivity value
2015-12-08 15:24:07 +01:00
Kim Kulling 0a6788d56f try to fix build. 2015-12-07 20:43:01 +01:00
Kim Kulling f5e13874e0 glTF: check if exporter option has broke someting. 2015-12-06 16:49:10 +01:00
Kim Kulling 99b51eb456 Merge branch 'master' of https://github.com/assimp/assimp 2015-12-06 12:20:11 +01:00
Kim Kulling 6641188a8e assimp/issues/702: fix resource leak and use initializer list for all
attributes of the loader instance.
2015-12-06 12:18:33 +01:00
Otger ffdcc78d91 Merge 2015-12-02 21:06:22 +01:00
Kim Kulling 8736907009 Importer: fix overflowImporter: fix overflow. 2015-12-02 19:58:43 +01:00
Kim Kulling f896c3329a Build: remove deprecated third party lib from cmake 2015-11-30 12:52:49 +01:00
Otger 166ff63af9 Updated CMAKE - removed removed package inclusion 2015-11-29 21:20:31 +01:00
Otger c5cb7f7b73 Merge branch 'master' of git://github.com/assimp/assimp 2015-11-29 21:17:05 +01:00
Otger f2c49a69ba Fixing gcc errors - second attempt 2015-11-29 21:13:35 +01:00
Otger d72443d6b0 Fixed gcc warnings and errors 2015-11-29 20:17:06 +01:00
Otger 4f757cdf5a Implemented basic glTF exporter and improved the importer (plus some code refactor) 2015-11-29 19:13:51 +01:00
Kim Kulling ba35c97e9d assimp/assimp/issues/698: Increase upper limits for hints. 2015-11-28 10:06:26 +01:00
Otger 5942d60aea Fixed gcc errors 2015-11-27 02:31:18 +01:00
Otger 526027999b Merge 2015-11-27 01:44:06 +01:00
Otger b307ec643d Created exporter class and fixed a few bugs 2015-11-27 01:16:48 +01:00
Kim Kulling fc6f35dab2 Merge branch 'master' of https://github.com/assimp/assimp 2015-11-26 20:53:41 +01:00
Kim Kulling 502d9f17b6 glTF: add importer to registry and try to parse json. 2015-11-26 20:49:00 +01:00
Kim Kulling a655467b59 Merge pull request #692 from dankex/instance_image
instance_image support for sample2D in Collada 1.5
2015-11-26 14:06:09 +01:00
Kim Kulling 398c1361d3 Merge pull request #674 from suikki/master
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-11-26 13:50:34 +01:00
Otger 148a20a703 Experimental support for glTF 2015-11-26 02:36:22 +01:00
Kim Kulling 702ef1a513 glTF: add missing attribute buffer for text streams. 2015-11-25 22:31:23 +01:00
Kim Kulling db8845d2b2 glTF: add jsn reader + example model to work on. 2015-11-25 22:03:39 +01:00
Kim Kulling 65d366dad0 Merge pull request #694 from OtgerRP/master
Support for FBX embedded textures
2015-11-24 21:26:34 +01:00
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