Commit Graph

2323 Commits (16f9ca35d2ee5e6817bae367e7fb264d0884532b)

Author SHA1 Message Date
Turo Lamminen 16f9ca35d2 Fix out-of-bounds read when OFF file contains no vertices 2015-01-29 23:22:56 +02:00
Turo Lamminen af09e68654 Fix memory corruption when LWO file contains bad-sized points chunk 2015-01-29 23:22:41 +02:00
Turo Lamminen 2f0675ac53 Fix memory corruption when 3DS file has more smoothing groups than faces 2015-01-29 23:18:19 +02:00
Turo Lamminen c5d048a98a Fix crash when 3DS file contains faces but no vertices 2015-01-28 18:37:36 +02:00
Turo Lamminen f167fe1d4a Ignore unix editor backup files 2015-01-28 18:36:23 +02:00
Kim Kulling 7d887204ac Merge pull request #449 from mikedh/master
default postprocessing options
2015-01-28 09:07:15 +01:00
Michael Dawson-Haggerty 25012f7b8a added list of supported formats, pulled from webpage and test/models 2015-01-27 22:53:31 -05:00
Michael Dawson-Haggerty 704e57db4e changed default postprocessing option to triangulate quad meshes 2015-01-27 22:47:05 -05:00
Alexander Gessler a482bc59f4 Merge pull request #448 from assimp/revert-447-master
Revert "Fix warnings under Visual Studio 12"
2015-01-26 19:54:18 +01:00
Alexander Gessler 8b55d276e9 Revert "Fix warnings under Visual Studio 12" 2015-01-26 19:54:02 +01:00
Alexander Gessler dee3a2c6d9 Merge pull request #447 from expipiplus1/master
Fix warnings under Visual Studio 12
2015-01-26 19:41:57 +01:00
Joe Hermaszewski 00d561982c Use size_t instead of int for number of points
This squashes warnings under Visual Studio 12
2015-01-26 15:46:58 +00:00
Joe Hermaszewski 1cf81227c4 Simplify behavior of SweepContext::InitEdges 2015-01-26 15:46:55 +00:00
Alexander Gessler a444bf48a1 Merge pull request #445 from turol/master
Avoid division by zero in assimp_cmd info when scene loading succeeds bu...
2015-01-25 21:46:26 +01:00
Turo Lamminen b97c26b1d2 Avoid division by zero in assimp_cmd info when scene loading succeeds but contains no meshes 2015-01-25 22:30:10 +02:00
Alexander Gessler cc346d3e12 Merge pull request #437 from CasperTech/master
Add support for component controlled matrix transforms, i.e transform(0)...
2015-01-25 19:44:27 +01:00
Alexander Gessler f62d03bd03 Merge pull request #439 from expipiplus1/master
Fix incorrect abs usage
2015-01-25 19:41:46 +01:00
Alexander Gessler 707c65283d Merge pull request #444 from Einarin/master
Check that zlib initialized correctly in FBX parser
2015-01-24 12:36:19 -08:00
Johnny Dickinson 380021e7c4 Check that zlib initialized correctly in FBX parser
Check the return code of inflateInit() indicates success to avoid
crashing later when zstream contains invalid data.
2015-01-24 00:00:35 -05:00
Alexander Gessler 1c60211a15 Merge pull request #436 from ricortiz/FixExportedLibraryNameVariable
Set ASSIMP_LIBRARIES to the proper library name
2015-01-22 23:12:40 -08:00
Alexander Gessler 5f646f2097 Merge pull request #440 from expipiplus1/correct_include
Use correct header for INT_MAX
2015-01-22 18:53:53 -08:00
Joe Hermaszewski 50dbb867ec Include stdint.h for uint64_t 2015-01-22 21:27:43 +00:00
Joe Hermaszewski 7494cb6e4b Use correct include file for INT_MAX
INT_MAX is defined in limits.h, not stdint.h
2015-01-22 20:19:34 +00:00
Joe Hermaszewski e8d4479344 Squash incorrect abs usage
Replace calls to abs with a float to calls to std::abs. Before int abs(int)
was being called.
2015-01-22 20:03:13 +00:00
Tom Mettam a09de30d83 Add support for component controlled matrix transforms, i.e transform(0)(0) etc. 2015-01-21 01:45:35 +00:00
Ricardo Ortiz 27f3771582 Set ASSIMP_LIBRARIES to the proper library name
in assimp-config.cmake so that other programs can find it.
2015-01-20 13:23:45 -05:00
Kim Kulling af48644e56 fix build.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-03 01:09:33 +01:00
Kim Kulling df4db6e6e2 using cmake 3.0
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-02 20:34:37 +01:00
Kim Kulling 6820f1a5c9 workaround for compiler bug with mingw ( too many sections ).
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-02 15:34:23 +01:00
Kim Kulling 797c89c896 fix check for minimum version of cmake.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-02 15:33:47 +01:00
Kim Kulling 69dbf3713c fix typo
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-02 12:38:06 +01:00
Alexander Gessler 4ef88f82f0 Merge pull request #432 from madeso/master
zlibstatic fixes
2014-12-29 17:24:50 +01:00
Gustav 7c17c5f46b Also install zlibstatic 2014-12-29 16:30:44 +01:00
Gustav e6988f62f6 Fixed cmake 3x cmp0048 warning 2014-12-29 16:18:17 +01:00
Kim Kulling ce01b413b1 add build matrix to support win32-build via cross compiler for windows platform.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-12-23 18:36:39 +01:00
Alexander Gessler 7a850a4131 Merge pull request #429 from abma/master
fix some errors/warnings found by static code analyzer
2014-12-17 01:02:35 +01:00
abma b1221ade64 fix some errors/warnings found by static code analyzer 2014-12-16 23:41:10 +01:00
Kim Kulling 7694561121 remove dead code from main CMakeLists.txt.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-12-16 22:34:24 +01:00
Alexander Gessler b6cc8d6da9 Add link to AssimpPascal headers
See https://github.com/ev1313/Pascal-Assimp-Headers
2014-12-12 02:43:15 +01:00
Alexander Gessler 29c09b24e7 Merge pull request #421 from heandreas/master
Added binary ply exporter.
2014-12-12 00:05:26 +01:00
Andreas Henne ab7754ab2a Code style changes. 2014-12-11 23:05:09 +01:00
Alexander Gessler 1e943d9fd4 Merge pull request #427 from sth519/patch-2
Update README.md for the iOS port
2014-12-10 19:48:55 +01:00
sth da93f5eb78 Update README.md for the iOS port
Just a small update to reflect the current state of the iOS port.
2014-12-10 19:37:18 +01:00
Alexander Gessler 585e7c69fb Merge pull request #423 from enkore/master
Fix some issues in jassimp
2014-12-06 23:56:45 +01:00
enkore fdf78fc13b README: Add a few lines on how to compile jassimp-native 2014-12-06 15:53:56 +01:00
enkore 6b4cbeea40 Fix outright compiler error in jassimp.cpp 2014-12-06 15:52:44 +01:00
enkore 6829af0dd6 Fix broken ant build 2014-12-06 15:52:26 +01:00
Andreas Henne 33f9745b62 Formatting changes. 2014-12-05 19:40:09 +01:00
Andreas Henne 4550279629 Added binary ply exporter. 2014-12-05 17:25:18 +01:00
Kim Kulling 06f80024cb Merge pull request #418 from xantares/patch-1
remove useless ASSIMP_BUILD_STATIC_LIB option
2014-12-04 17:20:38 +01:00