v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,489 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

2489 Commits (c2e6e3439e07f7a43297ee00119ac738c1f9032f)

Author SHA1 Message Date
Turo Lamminen 308884f144 Remove unnecessary semicolons after function definition 
Picked up by clang -Wextra-semi
 2015-02-27 23:09:12 +02:00
Turo Lamminen e8bcad0840 Silence a warning and add an assertion 
Another false positive uninitialized variable. Actually it's only false
if ToOutputVertexIndex does't return NULL which should only happen if
index is out of bounds. Add assertion to make sure of that.
 2015-02-27 23:09:03 +02:00
ulf b71ded1ad0 - manually merged C4D importer code from acgessler branch 
- manually merged IFC bugfixes and improvements from schrompf branch
 2015-02-23 14:23:28 +01:00
Alexander Gessler 7c38a33225 Merge pull request #466 from mbp566/master 
Fixed many doxygen errors
 2015-02-18 12:15:33 +01:00
mbp566 7bab42f55f Fixed many doxygen errors 2015-02-18 17:02:30 +09: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
Kim Kulling 0292868917 add geomentry node handling. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-14 16:12:09 +01:00
Kim Kulling f5f0c9f7cf update openddl-parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-14 16:11:46 +01:00
Turo Lamminen 570d02ff6e Silence more uninitialized variable warnings 
These are false positives since aiMaterial::Get will have written to output
if it returns AI_SUCCESS but the compiler can't see that.
 2015-02-13 13:15:26 +02:00
Turo Lamminen f708d0b122 Silence some uninitialized variable warnings 
These are false positives but the compiler isn't smart enough to see that.
Also it might make more sense to use switch here.
 2015-02-13 12:21:59 +02:00
Turo Lamminen 84a9514d4b Fix warning about possibly uninitialized variable 
It might be better to move FindEmptyUVChannel call earlier
 2015-02-13 12:14:39 +02:00
Kim Kulling bd1168af30 fix invalid line endling handling. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 20:46:02 +01:00
Kim Kulling 9e87fa178a add property parsing to opengex parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 20:09:26 +01:00
Kim Kulling 556bc9c1f3 fix build 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 20:09:03 +01:00
Kim Kulling c3e2fa0761 - untabify obj parser. 
- bugfix openddl: latest version

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 19:31:23 +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
Kim Kulling 124f408976 add property parsing. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 19:52:06 +01:00
Kim Kulling 065ad7173a fix build: no c++11 support 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 18:26:57 +01:00
Kim Kulling 303a6893fc fix the build. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 13:23:32 +01:00
Kim Kulling 20b3ce6a40 replace opengexparser by using openddl-parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 12:47:53 +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
Kim Kulling e9dcad4181 openddl-parser: latest greatest. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 21:23:50 +01: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
Kim Kulling 0e579bfb06 openddl-parser: latest greatest. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 12:01:18 +01:00
Kim Kulling e1c6a16b85 support of openddlparser lib without x++11. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 11:46:13 +01:00
Kim Kulling 8e87613bb3 add mmissing header. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 11:31:39 +01:00
Kim Kulling 063b2733fc Merge branch 'master' into opengex_support 2015-01-31 11:09:20 +01:00
Kim Kulling 1ee4c06e4b add openddl-parser to contrib. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 11:07:48 +01: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