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

196 Commits (ef7009f2c3adcd0578a5dfe7098a37364cdad740)

Author SHA1 Message Date
Kim Kulling 12efa14777 add openddl_parser directly to assimp. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 11:37:58 +01:00
Kim Kulling 2717d51f7e Merge remote-tracking branch 'origin/master' into opengex_support 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ParsingUtils.h
 2015-03-17 14:26:39 +01:00
Alexander Gessler 09c15331c4 Improve error reporting during dump diffing. 2015-03-15 21:01:34 +01:00
Kim Kulling d9d7dd31ea fix linker error: undefined references to openddl_parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-11 19:05:37 +01:00
Turo Lamminen 5a74e07f5f Mark some more functions with AI_WONT_RETURN 2015-02-27 23:09:12 +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
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
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
abma 6c5f9ecb06 fix most warnings with -pendantic 2014-08-18 02:09:06 +02:00
Alexander Gessler cc32eda226 assimp_view: fix crash when trying to export while no model is loaded. 2014-07-22 20:35:09 +02:00
Alexander Gessler 247f5cee3a Assimp_cmd: Drop malformed version spec from rc file. 2014-06-14 22:47:18 +02:00
Léo Terziman e7e0a5a090 Fixed assimp_cmd version message 2014-05-19 14:56:39 +02:00
Kim Kulling f6925db3d8 update: add cmake_mimimum_required statement to each cmake file 
for consistency
 2014-05-10 10:31:42 +02:00
Kim Kulling 825a61fbc0 update: 
- update version info for 3.1
- aiGetVersionRevision will now return the git tag.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-05-01 11:32:15 +02:00
Léo Terziman 2047cf6764 Merge remote-tracking branch 'official/master' into contrib 2014-04-28 09:11:40 +02:00
Peter LaValle 4d2c7f116d XML filename tweaks 
This change encodes the XML strings for scenarios involving `&` et al in material file names
 2014-04-22 16:33:11 +01:00
Léo Terziman 7c3a039349 Merge remote-tracking branch 'official/master' into contrib 
Conflicts:
	include/assimp/matrix4x4.inl
	include/assimp/vector2.h
	include/assimp/vector3.h
 2014-04-22 14:32:59 +02:00
Peter LaValle 73e6908c36 fixed "<Colors ...> ... </Color>" typo 
The XML tags did not match. Mismatched tags confuse XML parser kits. So I fixed the tags to match.
 2014-04-15 15:10:48 +01:00
Léo Terziman 9cc1e8fa1c Fixed assimp_cmp version output message 2014-01-17 12:03:10 +01:00
Léo Terziman 800f835f6f In AssimpViewer: verification + asserts on the variables in DoExport function to try to understand the stack corruption arround szFileName 2014-01-17 11:54:04 +01:00
Léo Terziman e6bbb512d7 In AssimpViewer: postprocess steps added to export to correct bugs in export (especially conversion from left to right handed) 2014-01-17 11:53:27 +01:00
Marcel Metz 6b5b3c64e6 Removed invalid extern keyword. 2013-11-20 14:42:23 +01:00
Marcel Metz c4d797ef58 Replaced function parameters with correct literals. 2013-11-20 14:42:23 +01:00
Marcel Metz 8d0b76a535 Added parenthesis for explicit operator evaluation priority. 2013-11-20 14:42:23 +01:00
Marcel Metz 9e579324d0 Added conditions for compiler oder build mode dependend code. 2013-11-20 14:42:23 +01:00
Marcel Metz c3852c4743 Removed noops and warnings on unused variables. 2013-11-20 14:42:18 +01:00
Marcel Metz c6297ec333 Fixed variable assignment values. 2013-11-20 14:40:25 +01:00
Marcel Metz 846a8959f8 Fixed class attribute initialization order. 2013-11-20 14:40:25 +01:00
Marcel Metz c1b28ff1ce Removed unreferenced variables. 2013-11-20 14:40:25 +01:00
Marcel Metz 93fd1133ff Fixed mingw cross compiler issues. 2013-11-20 14:40:20 +01:00
Alexander Gessler 69acdabdef CMake: make assimp_view/assimp_cmd's file copying DEPEND on assimp. 2013-09-18 14:42:42 +02:00
Alexander Gessler de03173e6d CMake: simplify. 2013-09-18 14:37:49 +02:00
Alexander Gessler f8f7e2468c CMake: use copy_if_different instead of copy and only run PRE_BUILD on Windows as it is not required on *nix anyway. 2013-09-18 14:10:26 +02:00
Alexander Gessler 995978b163 CMake for assimp_cmd: also copy over assimp output binary as PRE_BUILD event. 2013-09-18 13:55:02 +02:00
Alexander Gessler d45689a2c1 CMake for assimp_view: copy dlls from assimp build over to output folder. 2013-09-18 13:52:49 +02:00
Alexander Gessler 0b9d6bec0d - drop a few swear words from documentation. Some of these are years old and I think the authors (me included) don't want them associated with their commits. 2013-03-21 19:54:55 +01:00
acgessler aca543176d - more vc12 fixes 2013-01-20 04:00:34 +01:00
Alexander Gessler acdd0bfcb3 - fix animation selection combobox in assimpview. 2012-07-26 03:01:08 +02:00
aramis_acg aaf0be0bbf - CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, DirectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 22:56:15 +00:00
aramis_acg ec6c62e005 - consistent use of ai_assert instead of assert. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1241 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:22:40 +00:00
aramis_acg adfef670cc - rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1240 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:14:39 +00:00
kimmi 71b8fa7cb5 Bugfix : Commit not saved changes. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1226 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-20 22:41:39 +00:00
kimmi 1fef449654 Update : Remove secure warnings from assimp_view. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1173 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-18 12:43:48 +00:00
jonathanklein eebba5348d - Added Debug Postfix 
- added Viewer Installer

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1172 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-18 10:55:47 +00:00
jonathanklein 6852eb6ffe - compiler error fixes for sample programs 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1171 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-18 10:53:58 +00:00
aramis_acg 23c16a3ef9 - assimpview: reuse textures to minimize memory usage. This may break editing stuff, but I'll fix this asap. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1168 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-16 00:05:47 +00:00
aramis_acg 745c1035bf - assimpview: do not create a new default texture each time we need one. Turns out memory is not unlimited. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1166 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-15 23:13:52 +00:00
aramis_acg 6f2ca1bb22 [3459159] Tidy up UI layout in assimp_view. 
I changed the size slightly, but left the majority of the patch unchanged. Many thanks to Tor Andersson for the original patch! (see https://sourceforge.net/tracker/?func=detail&aid=3459159&group_id=226462&atid=1067634)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1155 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 17:50:01 +00:00
aramis_acg 6fa251c2f2 - unify naming of all header files. Obviously, this is a breaking change that affects all users. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1150 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 17:04:06 +00:00
aramis_acg f07901df9d - update tools/ 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1149 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 16:26:11 +00:00