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
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
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
Turo Lamminen
d185cea81c
AC3D: Fix read past end of buffer
2015-08-14 11:37:00 +03:00
Turo Lamminen
4cc716a0f5
MDL: Fix read past end of buffer with malformed input
2015-08-14 11:37:00 +03:00
Andreas Henne
bcf3f985fb
Fixed spelling error.
2015-08-13 13:22:21 +02:00
Andreas Henne
860360bd86
Fixed merge conflicts.
2015-08-13 11:06:22 +02:00
Turo Lamminen
b39446b7bb
Avoid reading past EOF when encountering a malformed STL file
...
Since IsSpaceOrNewLine returns true on '\0' we might try to read past
end of buffer on line 310. Add explicit check to avoid this.
2015-08-10 15:50:05 +03:00
Kim Kulling
295a9abbdc
Update CMakeLists.txt
...
Fix for https://github.com/assimp/assimp/issues/166
2015-08-10 13:13:01 +02:00
Kim Kulling
524834c307
Fix line endings.
2015-08-08 18:02:37 +02:00
Kim Kulling
d8d64a8422
TLLoader: fix typo in comment.
2015-08-08 11:57:15 +02:00
Kim Kulling
e794aaf017
STL-Loader: fix https://github.com/assimp/assimp/issues/103 .
2015-08-08 10:55:10 +02:00
Kim Kulling
88746af2e6
Blender-Loader: fix issue https://github.com/assimp/assimp/issues/131 .
2015-08-07 21:22:09 +02:00
Kim Kulling
23dba9fcf2
Merge branch 'master' of https://github.com/assimp/assimp
2015-08-07 21:19:17 +02:00
Kim Kulling
8836fd6b34
PLY-Loader: fix https://github.com/assimp/assimp/issues/160 .
2015-08-07 21:18:20 +02:00
Turo Lamminen
154760ab52
Abort early when hitting unexpected EOF in AC3D loader
...
Without this the code will try to loop through the specified number
of surfaces which could be very large even though none will succeed.
2015-08-07 14:18:16 +03:00
Kim Kulling
752961edfe
Merge pull request #625 from turol/afl-fixes
...
Fix out-of-bounds write on malformed input
2015-08-06 17:41:09 +02:00
Turo Lamminen
128923a262
Fix out-of-bounds write on malformed input
2015-08-06 16:16:34 +03:00
Andreas Henne
5030fe8c7e
Formatting changes.
2015-08-06 13:37:16 +02:00
Andreas Henne
fb9e4d1266
Ply export now uses uchar as type for the number of vertices per polygon and int as vertex index type.
2015-08-06 13:30:49 +02:00
Andreas Henne
3fc56de33c
Fixed merge conflicts.
2015-08-06 12:04:05 +02:00
Ilya Smelkov
bb8d936246
Fix volume calculation
2015-08-02 19:45:39 +03:00
Wil Shipley
7a7a496320
- Add include of stdarg, because apparently that's needed to build of Github server with Travis.
2015-07-27 00:54:23 -07:00
Wil Shipley
8b7fa48d27
- Merge in latest from assimp/assimp on GitHub ( 5c00aef7cd
)
...
- Added at least some of the new files to my Xcode 6 project, as
well.
- Built and tested with the DAE importer, seems to work fine.
2015-07-26 19:16:01 -07:00
Kim Kulling
5c00aef7cd
iOpenGEX: use std::string for grammar::token.
2015-07-17 20:03:23 +02:00
Kim Kulling
5a207dbb19
Merge branch 'master' of https://github.com/assimp/assimp
2015-07-10 01:21:57 +02:00
Kim Kulling
14a849b398
Obj-loader: change include brackets.
2015-07-10 01:21:10 +02:00
Kim Kulling
e138a02dd5
Obj: fix issue 121 - set group names as the mesh names.
2015-07-09 20:15:44 +02:00
Kim Kulling
891c17ee7b
Obj: remove dead code.
2015-07-09 19:59:47 +02:00
Kim Kulling
36f0ccced1
Merge branch 'master' of https://github.com/assimp/assimp
...
Conflicts:
tools/assimp_cmd/ImageExtractor.cpp
2015-07-08 00:40:35 +02:00
Kim Kulling
bc8aa18eb2
Fix : https://github.com/assimp/assimp/issues/557
2015-07-08 00:34:28 +02:00
Kim Kulling
4a77170399
Coverity finding: fix 2 more resource leaks.
2015-07-06 20:47:45 +02:00
rdb
1eef4c387f
Correct value for mColorAmbient for COLLADA files
2015-07-05 14:30:27 +02:00