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

38 Commits (b4b303ab5592bb5f17ac49fed9a75afe57a7410b)

Author SHA1 Message Date
Kim Kulling eadc6116c0 OpenDDLParser: latest greatest. 2015-10-31 09:43:34 +01:00
Richard 83de707587 Refactor: Expand tabs to 4 spaces 2015-06-28 16:04:15 -06:00
Richard a96a595a7a Refactor: Trim trailing whitespace 2015-06-28 16:01:32 -06:00
Richard 4c1a0507fe Refactor: Line endings are LF, not CRLF 2015-06-28 15:59:33 -06:00
abma bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
abma b1221ade64 fix some errors/warnings found by static code analyzer 2014-12-16 23:41:10 +01:00
Jared Duke 485aa8b39d Fix null check in Q3BSPFileImporter 
Reverse the null condition, preventing invalid texture stream
dereferencing. Fixes #380.
 2014-09-12 19:37:10 -07:00
abma 56ddb4f4af fix some compile warnings: 
- passing NULL to non-pointer
- unused vars
- unused function
- order of init
- parentheses
 2014-08-17 23:28:00 +02: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
Kim Kulling 38de6a658d bugfix: 
- fix redundant checks against nullptr ( see https://github.com/assimp/assimp/issues/241 ).

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-03-27 20:33:08 +01:00
Léo Terziman 77263c631f Fixed unzip support to use IOSystem/IOStream abstraction 2014-03-10 17:21:17 +01:00
ulfjorensen 81aef90f4a - manually pulled the three smaller change requests from Github. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1331 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-11-05 09:13:09 +00:00
aramis_acg 5a81b42ebe - add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1234 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 22:26:26 +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 075b1acaf0 - move include/ to include/assimp/ to have consistent header locations between installed and trunk version. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1148 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 16:25:12 +00:00
aramis_acg 4dbf539b44 - update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 03:38:30 +00:00
aramis_acg 9d85c8834d - extract MaterialHelper and move all of its members to aiMaterial in /include. 
- pull in IOhannes' patch to set the gcc default visibility for all symbols to NO and to mark ASSIMP_API with __attribute__ ((visibility("default"))).
- drop unneeded ASSIMP_API from most internal classes in /code, we just need to keep some exports on Windows to keep AssimpView alive.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1066 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-22 20:22:51 +00:00
kimmi cd963608c6 Feature : Add first M3-format deta definitions and a prototype importer for M3-models. Many thanks to libm3 for their great work ( see http://code.google.com/p/libm3/ ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1040 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-15 11:13:42 +00:00
aramis_acg 9edc0a9b8e merge with git://github.com/tonttu/assimp.git 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1029 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-06-09 14:29:32 +00:00
aramis_acg fc5ab64790 # q3bsp: quick compile fix 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1004 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-13 01:03:08 +00:00
kimmi e23767a170 Bugfix : Set right extension for Q3bsp loader 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1001 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-11 17:28:12 +00:00
aramis_acg ea3372f232 # pk3: fix CanRead() 
# fix small typo in Importer.cpp

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@962 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-22 16:08:31 +00:00
kimmi 1c37910f5f - UPDATE : VArious Bugfixes from rdb in the PK3BSP-Loader: fix lightmap copying, fix a typo, offer a way to get texture names from external, if they a re not part of the archive. 
- UPDATE : Make the loading of several formats for textures more generic, thanks to rdb for the idea.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@940 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-03 17:22:36 +00:00
aramis_acg 85cd9be46d # some fixes to reduce the size of the binary. Total savings are ~3%. Thanks to Krishty for his efforts in that regard. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@939 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-03 15:12:05 +00:00
kimmi 932d163d21 BUGFIX: Fix the build. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@927 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-03-31 21:41:28 +00:00
kimmi 5f10c38baa BUGFIX: Use the correct path for the file assimp.pc.in ( thanks to Roman Kharitonov ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@925 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-03-31 21:38:18 +00:00
aramis_acg 62f6b57637 # fix throw statement in Q3BSPFileImporter.cpp -- we don't new() DeadlyImportError. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@876 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-12-06 21:34:31 +00:00
kimmi 5ef9e63ac6 - UPDATE : Add first version of bsp-loader with assimp-internal texture support. 
- UPDATE : Actualize docu.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@835 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-05 18:45:42 +00:00
aramis_acg abec0f9a77 - windows.h not needed in Q3BSPFileImporter.cpp (merge flaw?). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@831 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-10-18 22:19:39 +00:00
kimmi d7ce23893e BUGFIX: Fix for material import in Q3-BSP-loader ( thanks to Matthias Fauconneau ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@829 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-10-18 19:18:28 +00:00
ulfjorensen 136ef7609d Bugfix: removed unnecessary windows.h include from Quake3BSP loader 
Bugfix: added workaround to allow reading invalid Collada files sporting negative indices into data arrays

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@824 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-10-04 18:12:35 +00:00
kimmi 733fd48f9e - UPDATE : Add documentation to Q3BSP-importer. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@822 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-09-29 19:42:50 +00:00
kimmi d4f563c795 - UPDATE : Add bugfixes for the correct topology import from a bsp-level. 
- UPDATE : Add the first pk3-archive for the bsp-loader.
- UPDATE : Add missing license info to aiAssert-file.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@818 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-09-26 15:56:52 +00:00
kimmi 8fef884dbc - UPDATE : Use of correct indices in Q3BSP-loader 
- UPDATE : Add enum for primitive-description in Q3BSP-loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@790 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-07 15:10:27 +00:00
aramis_acg 3204cf2736 Add conditional define to allow users to compile against their own zlib's. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@784 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-16 17:49:04 +00:00
aramis_acg b18d782231 Fix compile error in debug builds. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@774 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-09 17:45:21 +00:00
kimmi 7f2f5e7555 - UPDATE : Q3BSPLoader now imports topology of a quake-level. Known issues: It seems, that faces a still missing. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@771 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-08 21:25:48 +00:00
kimmi f017b5a4a4 - FEATURE : First version of PK3 format loader. 
- FEATURE : First prototype of Quake 3 BSP format loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@755 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-06-18 17:36:46 +00:00