Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,353 Commits 19 Branches 43 Tags
ff4e1d9446716a676874a68b00769ddeec8a1a8f
Commit Graph

2353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Gessler
ff4e1d9446 Sub-sample axis-angle channels if the delta between two consecutive key-frame angles is >= 180 degrees. Fixes #458. 2015-03-14 19:57:13 +01:00
Alexander Gessler
51b790c482 ColladaLoader: format. 2015-02-15 22:26:59 +01:00
Alexander Gessler
ce1302cd71 Fix VC12 warning "empty but controlled statement found". 2015-02-15 22:20:34 +01:00
Alexander Gessler
aae0f7e7b1 3DSExporter: export materials first, then meshes. Our own importer requires this. 2015-02-15 22:12:19 +01:00
Alexander Gessler
3f104fc080 Merge branch 'master' of github.com:assimp/assimp 2015-02-15 21:54:13 +01:00
Alexander Gessler
231e27cc0b Merge pull request #462 from OgreTransporter/master 
Fix Visual Studio prefixes
 2015-02-08 14:47:53 +01:00
OgreTransporter
4e8f7fb802 Fix Visual Studio prefixes 2015-02-08 12:26:29 +01:00
Alexander Gessler
8c9362e744 Merge branch 'master' of github.com:assimp/assimp 2015-02-05 20:12:31 +01:00
Alexander Gessler
be36878fb7 Merge pull request #460 from assimp/regression-suite-fixes 
Regression suite: 2.7 compatibility, force user to specify assimp binary, stable test order.
 2015-02-05 20:11:34 +01:00
Alexander Gessler
99e2803474 Regression suite: 2.7 compatibility, drop old logic to find assimp binary and require it to be explicitly specified. Process files in a stable order to make results diffable. 2015-02-05 12:33:19 +01:00
Alexander Gessler
b2ea487bda Regression test suite: Test files in proper lexicographic order instead of relying on OS directory iteration order. This ensures failures are listed in the same order. 2015-02-03 21:16:16 +01:00
Alexander Gessler
56132ed9bb Regression test suite: make Python files 2.7 backwards-compatible to ease use on Windows where oftentimes only one is easily accessible. Drop deprecated logic to locate assimp binary, we now require the binary to use to be specified in the command line. 2015-02-03 21:14:37 +01:00
Alexander Gessler
27a686210e Merge pull request #456 from turol/master 
Fix division by zero
 2015-02-02 23:52:07 +01:00
Turo Lamminen
de66f15a0a Fix division by zero 2015-02-02 16:03:24 +02:00
Alexander Gessler
48fa3153c6 Merge pull request #455 from turol/master 
Fix some infinite loops
 2015-02-01 12:54:15 +01:00
Turo Lamminen
b93bd167ed Fix infinite loop in STL loader error path 
It appears that this was never tested since hitting it caused an infinite loop.

Fixes testcase hangs/c2eb1fa3e74c6ffe0cebcb1672b03140
 2015-02-01 00:35:00 +02:00
Turo Lamminen
fe89773c6f Fix infinite loop in PLY parser 
Fixes testcase hangs/9ab979ab256c70aaec9b651f32f051e9
 2015-02-01 00:22:32 +02:00
Turo Lamminen
6b9f9afd7a Fix infinite loop in STL loader 
If next character was not part of valid token and not whitespace we
would end up spinning in the loop indefinitely. Fix by using do..while
loop which always skips at least one character.

Fixes testcase hangs/73b42cd3b6d05e2ddb5c0fe5888459bc
 2015-02-01 00:09:32 +02:00
Alexander Gessler
c7785014e4 Merge branch 'master' of github.com:assimp/assimp 2015-01-31 20:53:38 +01:00
Alexander Gessler
455d190fd0 CMakeLists: backwards compatibility with CMake < 3.0. 2015-01-31 20:51:36 +01:00
Alexander Gessler
08ad6ae8fe Merge pull request #450 from turol/afl-fixes 
Fix some bugs found with afl
 2015-01-31 20:51:07 +01:00
Turo Lamminen
792da49933 Fix out-of-bounds write when STL file node name is too long 2015-01-31 21:36:13 +02:00
Turo Lamminen
f971b66c47 Fix out-of-bounds read in invalid compressed X file 2015-01-31 21:36:08 +02:00
Turo Lamminen
95ad827277 Remove bogus delete[] on error path 
mBuffer is a pointer inside a std::vector so don't try to delete[] it.
 2015-01-29 23:22:56 +02:00
Turo Lamminen
0108d5b1f9 Fix read past end of buffer on malformed LWOB files 2015-01-29 23:22:56 +02:00
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
Kim Kulling
b700cd917f Merge pull request #452 from ricortiz/FixExportedLibraryNameVariable 
Fix exported library name variable
 2015-01-29 17:24:30 +01:00
Kim Kulling
80a2c9a9ab Merge pull request #446 from yeonseok-yi/master 
Fixed error of aiQuaterniont::Rotate()
 2015-01-29 11:37:03 +01: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
yeonseok-yi
1bdb31f8aa Fixed error of aiQuaterniont::Rotate() 
The function rotates a point to opposite direction.
Conjugate() should be applied to inverse of the quaternion.
 2015-01-26 21:09:54 +09: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
Ricardo Ortiz
a94e668486 Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX 
to have a consistent library name accross platforms.
 2015-01-23 14:19:29 -05:00
Ricardo Ortiz
e2a33e726d Add quotes to build type variable. 2015-01-23 10:10:51 -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