Commit Graph

2164 Commits (64273d58e34516a9ae8b3df3de2156ffc5736556)

Author SHA1 Message Date
Richard Selneck 12613720ff Fix macro used for detecting IRR support 2016-05-02 18:24:26 -04:00
Kim Kulling 8449afad71 Merge pull request #868 from otgerrogla/master
Fixed a few GLTF importer/exporter bugs
2016-04-28 22:56:41 +02:00
Otger 11e52dc3d7 Removed rogue comma 2016-04-28 21:34:31 +02:00
Otger 2fe401fc54 Fixed gcc compilation error 2016-04-28 21:22:01 +02:00
Otger 64f78e003f Fixed crashes when files were not found, and fixed some warnings 2016-04-28 20:50:01 +02:00
Kim Kulling 46e7ae5dc0 OpenGEX: prepare light- and camera-node and object. 2016-04-28 20:20:40 +02:00
Otger d9b365eb90 Fixed a few GLTF importer/exporter bugs 2016-04-28 18:44:47 +02:00
Kim Kulling 5192b837da Replace std::endl by using backslash n. 2016-04-27 17:58:40 +02:00
Kim Kulling 7468ca5c35 VS2015-code analysis: fix finding ( index var type too small ). 2016-04-23 09:43:20 +02:00
Kim Kulling 829e56df0c cmake env: add license info. 2016-04-23 09:42:05 +02:00
mpersano 473d2ca052 Fix texture coords exporting on binary PLY files 2016-04-22 16:09:45 -03:00
Kim Kulling 2f9c33e3e9 closes https://github.com/assimp/assimp/issues/857 2016-04-20 23:27:59 +02:00
Kim Kulling 0ec1e91722 Regression Testsuite: update database. 2016-04-19 08:49:14 +02:00
Kim Kulling 22dc22778d Assxml exporter: Make some local functions static. 2016-04-19 08:48:37 +02:00
Kim Kulling 1b94b8969f Blender Importer: fix review findings. 2016-04-19 08:45:04 +02:00
tomacd 5a8c15d826 fix SceneCombiner copy of aiNode not setting mParent field 2016-04-18 11:28:21 +02:00
Kim Kulling de39c49c4c assxml export: make local functions static. 2016-04-17 23:29:46 +02:00
Kim Kulling a6e7938696 Assxml io function: use vsprintf for var-argument list. 2016-04-17 21:33:11 +02:00
Kim Kulling dec93efc92 AssxmlExporter: fix crash in writing header info in VS2015. 2016-04-16 18:42:49 +02:00
Kim Kulling 6b243230b2 C++11-Support: remove boost. 2016-04-07 21:31:04 +02:00
Kim Kulling 632b58f27e Merge pull request #850 from mensinda/no-boost
Replaced boost with c++11 features
2016-04-06 21:16:23 +02:00
mensinda b045a1ec5c Deleted move constructor of LazyObject 2016-04-06 21:03:54 +02:00
mensinda 3eafc7e746 Renamed Math.h --> MathFunctions.h 2016-04-06 16:54:03 +02:00
mensinda f59cba13eb Try fixing clang builds 2016-04-06 11:10:12 +02:00
mensinda 726b004806 Removed boost/noncopyable.hpp 2016-04-06 10:51:18 +02:00
mensinda 51c80ecb80 Moved gcd and lcm implemetation 2016-04-06 10:21:59 +02:00
mensinda cc0fce8568 Replaced boost::timer with std::chrono 2016-04-06 10:13:02 +02:00
mensinda ae99f99b99 Replaced boost::tuple with std::tuple 2016-04-06 00:17:21 +02:00
mensinda b37e25cd7d Replaced boost::format with internal formater 2016-04-06 00:03:05 +02:00
mensinda 5dacda0a08 replaced boost smart pointers with c++11 smart pointers 2016-04-05 23:23:53 +02:00
mensinda cff5b0d1a0 Replaced depreacated std::auto_ptr with std::unique_ptr 2016-04-05 22:56:11 +02:00
mensinda 18843fe5e1 Replaced BOOST_FOREACH with c++11 ranged for loops 2016-04-05 22:53:54 +02:00
mensinda 4836a2993e Replaced boost::thread with std::thread 2016-04-05 22:28:21 +02:00
Kim Kulling 20630e950a Regression test suite: add ui for simpler text execution. 2016-04-05 22:02:02 +02:00
Kim Kulling a2d9cbef7e Update STEPFileReader.cpp
StepFileReadder: initialize var with nullptr.
2016-04-04 12:52:22 +02:00
Kim Kulling f2d5921252 Update FBXConverter.cpp
FBXConverter: initialize aiNodeAnim with nullptr.
2016-04-04 12:48:53 +02:00
Eric Engestrom 87e7cf00a2 Fix spelling mistakes 2016-04-03 01:38:00 +01:00
Kim Kulling d094dfc3a1 Merge pull request #800 from pkholland/master
Can't add integer to string pointer
2016-04-01 10:01:23 +02:00
Kim Kulling 49d60dc856 Merge pull request #832 from assimp/no-boost
Removed usage of Boost static assert.
2016-03-31 15:42:53 +02:00
boxdot 0d44479399 Import reflectance factor from Blender. 2016-03-29 21:16:26 +02:00
Kim Kulling 1592a18210 PLYLoader: fix review comments. 2016-03-25 00:09:56 +01:00
Kim Kulling 42d29b1bfe Merge branch 'master' of https://github.com/assimp/assimp 2016-03-24 19:54:33 +01:00
Kim Kulling 7c71f0b7a9 PLYLoader: improve readability by refactorings. 2016-03-24 19:53:15 +01:00
Kim Kulling 6be4d82a6b Merge pull request #835 from robertliebo/VCS-1030/ObjMtlFilenameFallback
Vcs 1030/obj mtl filename fallback
2016-03-22 20:35:41 +01:00
Kim Kulling 23892a6ded FBX: add debugging tool to log class type + info. 2016-03-22 20:30:25 +01:00
Kim Kulling ca0fa2ba69 FBX-Importer: put debug printf into comments. 2016-03-22 20:25:29 +01:00
Robert Liebo 124fc9ae27 [VCS-1030] add log info about .mtl fallback 2016-03-22 18:39:52 +01:00
Robert Liebo abb3e6b854 [VCS-1030] fallback for non-found .mtl file: try file name of original obj with just the file extension replaced by "mtl" 2016-03-22 18:38:28 +01:00
Sherief Farouk 397fa374a3 Removed usage of Boost static assert. 2016-03-18 17:02:39 -07:00
Kim Kulling 76e4e82ecb FBX: fix https://github.com/assimp/assimp/issues/782 2016-03-16 20:26:33 +01:00
Kim Kulling 644d6a9a67 Collada: refactorings. 2016-03-15 21:17:38 +01:00
Kim Kulling d89e7943ad FBX Close issue-806: support version 7400. 2016-03-15 21:16:47 +01:00
Kim Kulling e3d7ca264c Collada: reset workaround. 2016-03-15 19:28:57 +01:00
Kim Kulling 3a7c3a5698 Test for issue-731: possible overflow. 2016-03-14 21:00:08 +01:00
Kim Kulling 7e9fe2d654 OpenGEX: use correct number of uv-coordinates for texture coordinates. 2016-03-13 20:22:36 +01:00
Turo Lamminen 555f533777 MD3: Check file is big enough to contain all the advertised surfaces 2016-03-13 00:57:08 +02:00
Turo Lamminen da0b180901 MD3: Fix crash on invalid vertex index 2016-03-13 00:57:08 +02:00
Turo Lamminen b0f453dba8 MD2: Check file is big enough to contain all the advertised frames 2016-03-13 00:57:08 +02:00
Turo Lamminen 8d2af995de MD2: Fix integer overflows on malformed input 2016-03-13 00:57:08 +02:00
Turo Lamminen e2361bf209 MDL: Fix read past end of buffer on malformed input 2016-03-12 22:35:54 +02:00
Kim Kulling 6ee5fdf567 OpenGEX: fix review finding. 2016-03-12 20:55:11 +01:00
Kim Kulling b4b303ab55 OpenGEX: fix alloc for texture coordinates. 2016-03-12 13:22:09 +01:00
emvivre 93be0f69da PlyParser: fix invalid loading when comment is empty. 2016-03-10 17:47:07 +01:00
Thiago Goulart 3c9e57fd73 Fix memory leak in OBJ loader when a mesh has no faces. 2016-03-04 03:40:47 -08:00
Kim Kulling 53370d0d31 FBXImporter: some refactorings to increase readability. 2016-03-03 18:38:50 +01:00
Kim Kulling 2b09199f4a FBXImporter: move MeshGeometry declaration into its own header 2016-03-03 15:19:38 +01:00
Kim Kulling 3079b90622 Importer: when the right importer was found log this info. 2016-02-29 15:57:47 +01:00
Kim Kulling e9f47b08c5 FBXImporter: fx build. 2016-02-28 20:56:11 +01:00
Kim Kulling 28d327b7ea FBXImporter: fix build. 2016-02-28 20:27:31 +01:00
Kim Kulling 2496e8a0a3 Lib: reduce number of header files included. 2016-02-28 17:30:11 +01:00
Kim Kulling 58fc3940f2 Obj Importer: add missing semicolon to fix the build. 2016-02-25 19:04:13 +01:00
Kim Kulling 99f00834ec closes ssues/804: add statement to take care of emissive texture, new
version.
2016-02-25 18:00:09 +01:00
Paul Holland f20a5afcf0 can't add integer to string pointer 2016-02-18 12:17:47 -08:00
Alexander Gessler 38d462f0b3 Merge pull request #764 from rmitton/sib_import
Validation fix for empty SIB scenes.
2016-02-18 11:58:26 +01:00
Alexander Gessler 88fee56cce Merge pull request #790 from ov/safe-normalizing-in-smoothing-groups
use NormalizeSafe to prevent NaN when normalizing zero vectors
2016-02-18 11:53:57 +01:00
Turo Lamminen b71bd3df84 LWO: Fix division by zero 2016-02-13 23:37:08 +02:00
Kim Kulling 322c959424 Merge pull request #791 from trond/collada_animation_clip
Collada animation clip support
2016-02-11 22:11:27 +01:00
Kim Kulling f0717b1d7c Merge pull request #793 from AlexBobkov/master
Fixed installing pdb file
2016-02-11 22:10:21 +01:00
Alexander Bobkov a5f9d0d3fc Fixed installing pdb file 2016-02-11 16:24:26 +03:00
rdb 7d4a713a86 Fix loading of pk3 q3bsp maps
This fixes loading of pk3 maps.  The pk3 files contain directory entries with a size of 0, which triggered an assertion.
2016-02-11 14:10:49 +01:00
Trond Abusdal ccd9f92533 Fixed a couple of nested template brackets that wasn't spaced out correctly. 2016-02-11 01:00:03 +01:00
Vitaly Ovchinnikov 4d5df6dc9a use NormalizeSafe to prevent NaN when normalizing zero vectors 2016-02-11 12:19:06 +13:00
Trond Abusdal 7e58a47ba0 * Combining single-channel animations like the previous code did, except now it has been deferred until after all nodes have been read. This makes the regression tests pass for a database created before these code changes.
* Changed name of ColladaParser::RebuildRootAnimationsFromClips to ColladaParser::PostProcessRootAnimations as it now does more than it did before.
2016-02-10 23:57:29 +01:00
Kim Kulling d9017299a8 iObjParser: refactorings. 2016-02-10 10:40:39 +01:00
Kim Kulling 8681abe845 Obj_Importer: remove dead code. 2016-02-09 17:50:08 +01:00
Kim Kulling 1550191256 Closes https://github.com/assimp/assimp/issues/777: fix invalid skipping
of line during face defintion parsing.
2016-02-08 18:07:00 +01:00
Trond Abusdal c34717639e Collada: Importer generates animations from <library_animation_clips>, if the node is present. 2016-02-07 23:36:49 +01:00
rmitton 72b5ed50e9 Bump just to get AppVeyor to re-test it. 2016-02-07 13:21:58 -08:00
Kim Kulling 37a3976b30 Revert "Fix issue: OBJ import takes forever (#759) (attempt 2)" 2016-02-07 20:03:24 +01:00
Kim Kulling c084a47c5d Merge pull request #771 from andrewparlane/obj_load_forever_fix
Fix issue: OBJ import takes forever (#759) (attempt 2)
2016-02-07 20:00:03 +01:00
Kim Kulling 522f4e0882 Closes https://github.com/assimp/assimp/issues/786:
- fix invalid value get for index data.
- update OpenDDL-library
2016-02-07 17:58:28 +01:00
Kim Kulling dfbae1294f JoinVerticesProcess: iAdd test for possible null pointer access. 2016-02-05 18:53:23 +01:00
Kim Kulling a74b321ed1 Add unittests for defect reproduction. 2016-02-04 20:43:02 +01:00
Kim Kulling 699aa9c583 Closes https://github.com/assimp/assimp/issues/754: use correct index
token.
2016-02-03 21:09:20 +01:00
Turo Lamminen 0e06404ec1 SIBImporter: Properly fix C++11 issues for Clang
C-style cast has a higher precedence than & -operator so this was getting
parsed differently than Kim assumed. Thou shalt not use C-style casts.
2016-02-02 20:29:40 +02:00
Kim Kulling a1bd83d797 ai_assert: split 2 checks in one macro to 2 separate ai_assert tests. 2016-02-01 16:16:09 +01:00
Kim Kulling 16fffb2ab1 Merge branch 'master' of https://github.com/assimp/assimp 2016-01-31 00:42:02 +01:00
Kim Kulling a37ea18f09 SIBImporter: fix c++14 compilation issue for clang. 2016-01-31 00:41:14 +01:00
Kim Kulling bcd38707c5 3DSConverter: fix level 4 compiler warning. 2016-01-29 21:22:41 +01:00
Kim Kulling bac6067869 gltf: make code more radable and check against one possible null ptr
access.
2016-01-27 20:26:38 +01:00
Kim Kulling 0e7446af83 Merge branch 'master' of https://github.com/assimp/assimp 2016-01-27 18:49:26 +01:00
Kim Kulling 8bbd55a790 PostProcessing: first prototype of customized post processing. 2016-01-27 18:49:01 +01:00
Kim Kulling f473b17c99 Merge pull request #773 from boxdot/master
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 17:20:26 +01:00
boxdot 13ec11bca8 Import mClipPlane{Near,Far} and mHorizontalFOV from Blender. 2016-01-27 02:12:15 +01:00
abma b3b08728fa fix new / delete missmatch 2016-01-26 22:47:50 +01:00
Andrew Parlane 109f6feb6e ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.

This time I've fixed the order of evaluation bug in the call to getFace().
2016-01-25 20:44:31 -04:00
Andrew Parlane c7d86e97cc ObjTools: Update getName() to work with const iterators.
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
2016-01-25 20:43:34 -04:00
Kim Kulling 4633266c31 Revert "Fix issue: OBJ import takes forever (#759)" 2016-01-25 23:53:59 +01:00
rmitton f23285a1ce Fixed whitespace to match coding standard. 2016-01-25 13:45:08 -08:00
rmitton 94a35dfdd2 Fixed NULL pointers to match coding standards. 2016-01-25 13:42:30 -08:00
Andrew Parlane 9969167c2a ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.
2016-01-23 20:01:44 -04:00
Andrew Parlane ce64dfb3fd ObjTools: Update getName() to work with const iterators.
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
2016-01-23 20:01:44 -04:00
rmitton ae2cce0899 Validation fix for empty scenes.
The validator requires empty scenes to have NULL pointers.
2016-01-23 15:22:48 -08:00
Kim Kulling 0e4cf64a45 Merge pull request #763 from andrewparlane/mtlFix
ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
2016-01-23 19:51:49 +01:00
Andrew Parlane 3c4e06c23f ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
We don't handle reflection textures during MTL import. This allowed a NULL
ptr to be used. Simply return in the case of a reflection texture.
2016-01-23 13:11:47 -04:00
Stepan Hrbek c062eb0db4 Collada exporter: improve compatibility when exported path contains ':'.
Old code exported "c:/foo.jpg" path as "c%3a/foo.jpg".
Replacing : with %3a was probably legal, but it made paths unreadable for existing Max importers.
2016-01-21 22:35:44 +01:00
Kim Kulling df9bb8b915 Update license date. 2016-01-21 19:53:25 +01:00
Kim Kulling ded37e8307 Merge pull request #736 from StepanHrbek/collada-unicode
Collada exporter: fix unicode.
2016-01-19 16:35:48 +01:00
Stepan Hrbek 24f03141d6 Reimplement isalnum(c,C locale) because I can't make AppVeyor see satndard version. 2016-01-18 10:10:49 +01:00
wise86Android c7f69e151e fix memory leak 2016-01-17 15:18:12 +01:00
wise86Android 4af9632269 fix memory leak 2016-01-17 00:00:43 +01:00
wise86Android bd032488e4 remove read unitilize memory 2016-01-16 23:42:43 +01:00
wise86Android d51c2e6435 free the allocated import 2016-01-16 23:37:24 +01:00
wise86Android f0fca826db remove initialization warnings 2016-01-16 23:28:52 +01:00
wise86Android 01a5035920 remove initialization warnings 2016-01-16 23:26:46 +01:00
Kim Kulling 8c13c8a558 PLYExporter: forbit copying + add empty destructor. 2016-01-14 20:44:09 +01:00
Kim Kulling 18c0e41d8f Colladaloader: fix usage of floorf. 2016-01-13 10:04:24 +01:00
Kim Kulling 42c1f9d3ba Closes https://github.com/assimp/assimp/issues/630: fix mis-merge. 2016-01-12 20:22:37 +01:00
Kim Kulling d3ddabbd3e Merge branch 'master' of https://github.com/assimp/assimp 2016-01-11 21:16:17 +01:00
Kim Kulling 36668aa31a ASEParser: fix invalid size of buffer for log writing. 2016-01-11 21:15:30 +01:00
Andrew Parlane 1632f1fbb9 ObjImporter: Added better progress reporting during file import.
There are two stages to this:
1) Processing '\'s - this accounts for 1/3rd of the file import progress.
2) Parsing the file data - this accounts for the other 2/3rds.
2016-01-11 12:21:24 -04:00
Kim Kulling bd268bd864 coverity scan: add missing initialization. 2016-01-10 20:25:01 +01:00
Kim Kulling ec32da512b coverity scan: fix not initialized member in copy constructor. 2016-01-10 20:21:32 +01:00
Kim Kulling 3033d8c847 ColladaLoader: add missing .f 2016-01-09 18:09:52 +01:00
Kim Kulling d18f978178 ColladaLoader: add missing members to initializer list. 2016-01-09 18:09:10 +01:00
Kim Kulling 430b614a69 coverity scan: make place of false positive more understandable. 2016-01-08 16:18:32 +01:00
Kim Kulling 7ef579674d GenVertexNormalsProcess: use initalizer list instead of setting the earch angle in the constructor. 2016-01-07 15:03:10 +01:00
Kim Kulling 56a77b2429 snprintf-replacement: fix invalid preprocessor defines for compiler
detection on windows for older vs-versions
2016-01-06 19:55:04 +01:00
Kim Kulling d43a083dc1 snprintf replacement: fix usage of ai_snprintf when snprintf is available. 2016-01-06 19:25:35 +01:00
Kim Kulling 6bfdeb6a12 sprintf replacement: introduce au_snprintf to support snprintf for v2013
and earier ( closes https://github.com/assimp/assimp/issues/743 )
2016-01-06 15:35:25 +01:00
Kim Kulling 67c258e75d snprintf: change next couple of sprintf to snprintf. 2016-01-05 11:38:06 +01:00
Kim Kulling c3d4be1dce sprintf: replace more sprintf by snprintf. 2016-01-04 22:24:25 +01:00
Kim Kulling c9d00beab8 sprintf: replace sprintf by snprintf. 2016-01-04 20:24:51 +01:00
Kim Kulling f4d3d15bbb UnrealLoader: replace sprintf by snprintf. 2016-01-04 20:22:46 +01:00
Kim Kulling 847644ca75 DefaultLogger: fix missing sprintf calls. 2016-01-03 23:29:37 +01:00
Kim Kulling 540c9f3e9f Fix assimp/assimp/issues/737: use snprintf instead of sprintf. 2016-01-02 21:29:46 +01:00
Kim Kulling 1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Kim Kulling 189340a99f License file: update to 2016 2016-01-01 20:24:10 +01:00
Kim Kulling 912cf63b71 Merge branch 'master' of https://github.com/assimp/assimp 2015-12-31 19:49:37 +01:00
Kim Kulling 4e9ee4e406 coverity findings: add missing initialization. 2015-12-31 16:00:19 +01:00
Stepan Hrbek 39ab716e11 Collada exporter: Fix unicode filenames.
Although existing code uses "C" locale partially, both calls to isalnum() clearly did not use it.
So for example character "ä" was written to .dae as is, rather than converted to %e4, generated .dae was unreadable to many parsers.
2015-12-31 03:22:25 +01:00
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