Commit Graph

1914 Commits

Author SHA1 Message Date
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
Kim Kulling
4633266c31 Revert "Fix issue: OBJ import takes forever (#759)" 2016-01-25 23:53:59 +01: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
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