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

1776 Commits (c65d2dc05c89373dc80fa29087df159216248428)

Author SHA1 Message Date
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
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