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

49 Commits (a9284e5a95f5b4216b8d231984ed7875005082bc)

Author SHA1 Message Date
Kim Kulling ffdca3593b ObjImporter: remove unused code. 2016-09-06 15:41:37 +02:00
Chris Russ 05a6ee6473 Adding double precision import support for formats that can be exported 2016-07-16 18:23:33 +10:00
Roy Shilkrot 7d98643bcf adding support for per-vertex colors. 2016-06-27 20:08:22 -04:00
Kim Kulling 1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Turo Lamminen 46121a1559 Mark single-parameter constructors explicit 
Suggested by cppcheck
 2015-10-29 14:04:23 +02:00
Francesco Guastella 2750f8da24 Added support for reflection maps for OBJ files 2015-10-15 15:46:35 +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
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
Kim Kulling 2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
abma 470ad98281 fix "headercheck": 
part of https://github.com/assimp/assimp/issues/534
 2015-04-15 21:22:26 +02:00
Kim Kulling fbaf89492d bugfix: Obj-importer is now able to deal with 3d-texture coordinates. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-04-29 00:04:54 +02:00
Judith Hartmann 7d1a704ed7 saves value in the 'Ke'-Attribute in ObjMtl Files in COLOR_EMISSIVE 2014-03-16 21:30:10 +01:00
Nick Overdijk f433746bfa Add support for emissive and gloss-maps 
Conflicts:
	code/ObjFileMtlImporter.cpp
	Someone added support for loading more bump maps, I added support for emmissive-maps. Easy merge.
 2013-12-14 01:40:37 +01:00
gongwei 0860254a2b Fix Obj texture parsing error: where obj texture map statement contains texture option, it will fail to parse the correct image url, as a result, the texture won't be shown. Besides, we also add clamp texture mode for obj 2013-12-02 22:55:51 +08:00
Kim Kulling 685612b9f4 - refactoring : remove not used mesh index from private method in obj-importer. 
- refactoring : remove commented code.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2013-10-11 15:29:17 +02:00
Andy Maloney 1da281c1f8 Make sure members are initialized properly 
Prefer initialization lists
Assignment operator should not return a const ref
 2013-06-21 10:56:11 -04:00
Kim fbe408dd2e update : implement obj-support for normal maps. 
refactoring : some improvements for more readable code.

Signed-off-by: Kim <Kulling>
 2013-01-26 14:11:57 +01:00
kimmi cc88a3a0de update : add displacement map support to obj-material importer. this feature is supported by some special exporters. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1347 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2013-01-07 21:05:53 +00:00
kimmi 01972bbbcf bugfix : Fix a memory leak in the obj-loader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1344 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-12-08 12:28:06 +00:00
kimmi b724ac5c2c - Bugfix : Fix build of Obj-FileImporter ( this is currently only a work-around, loader is leaking memory, I am working on it ). 
- Update : Merge fixes from GitHub, thanks to Riku Palomäki ( more fixes will merged soon ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1213 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-20 20:31:14 +00:00
kimmi 648e8fe924 - Bugfix: Fix two possible reasons for bug ID 3039342 : On skipping an invalid material description in obj-loader avoid creating aiMaterial instance. Release obj-specific material instances. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1186 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-26 13:36:29 +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 df63b4b3ed [3298060] OBJ: Add support for p and l elements 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1070 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-23 16:23:13 +00:00
aramis_acg 94767ecf8c Merge https://github.com/tonttu/assimp 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@903 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-02-20 00:01:52 +00:00
kimmi f3310b0f36 BUGFIX : Fix handling of multiple materials per object definition in Obj-Loader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@745 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-30 12:45:38 +00:00
kimmi a22e44f94d - BUGFIX :: Fix typos in doxygen documentation. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@723 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-13 15:55:35 +00:00
aramis_acg 7cea2eb497 Change date in license header to 2006-2010. This involves updating quite a few files, sorry. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@661 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-10 15:30:22 +00:00
aramis_acg 17326515d4 Get rid of warnings on GCC4.4 with -wall 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@541 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-06 23:52:41 +00:00
kimmi eda47a6f0b - Add new helper funtion to detect end of buffer. 
- Bugfix Obj-loader: If material file is not ended with a newline material loader crashes: Check for end of buffer.
- Refactoring: Rename helper function isSpace to isSeparator to make sense of function much clearer!

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@461 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-02 17:11:38 +00:00
aramis_acg 0d53ac5ad5 Fixing build errors. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@395 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-19 10:36:36 +00:00
aramis_acg c42611ea5e [ 2659155 ] Missing initializations 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@353 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-03-04 19:46:18 +00:00
aramis_acg 4048eb92f5 Fixed illumination model conversion in the OBJ loader. 
Added map_d support to obj.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@332 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-02-05 18:13:34 +00:00
aramis_acg d41f570dc0 Added support for compressed x files (all files from dx sdk, except car2.x, work, no further tests yet). 
Added a working makefile for mingw, provides more configs now. Not perfect yet.
Added decompression part of zlib (inflate).
Moved IrrXML to ./contrib dir.
Moved some IRR/IRRmesh shared code.
FIXME: makefile for gnu/linux is untested yet.
Code cleanup.
Unified #ifndef ASSIMP_BUILD_nnn_IMPORTER directives.
OBJ loader supports map_bump, map_ka, map_ks, map_ns now.
Endianess conversion in the ply loader is correct now.
Changed IRR/IRRMESH coordinate system conversion. Not absolutely right now, but better than before.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@305 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-01-18 23:48:25 +00:00
aramis_acg a7088d6263 Rewrote 3DS loader to support BE - added temporary light & camera & animation support. few models not working anymore, transformation bug still unsolved. 
Fixed normal vector handling in the ASE loader. Improved animation & camera & light support - as for the 3DS Loader, still in the works.
Fixed AC - Loader. It is now able to load models with complex hierarchies correctly. Added a small workaround for Quick3D, which writes invalid AC files.
DXF-Loader skips {...} blocks produced by 3DS Max & AutoCad correctly now.
DefaultLogger doesn't repeat identical log messages now.
FindInvalidData-Process removes empty or dummy animation tracks now.
LWO-Loader recognizes complex shaders (such as Fresnel) correctly now. Other LLWO bugs still unsolved.
Fixed bugs in the Ply parser, causing non-triangular faces to crash.
Added some additional helperutilities to StreamReader.
Fixed a bug in ProcessHelper.h causing SPlitLargeMeses and SortBxPType to crash for meshes containing many bones.
Changed OB default material from black to gray.
Added additional test fils: ply (bugfix), ase (animation), QUick3D & Irr (in the works), STL (export from 3DS Max)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@210 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-10-31 19:32:00 +00:00
cgmelt 7d665832f6 destructors implemented 
per mesh normals

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@159 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-09-22 08:16:37 +00:00
kimmi fa8edfe207 - BUGFIX: Fixed a crash in the normal-loader method of obj loader. 
- CHANGE: Improve and fix a bug in texture coordinate loading in obj loader.
- CHANGE: Use ai_assert instead of assert.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@112 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-08-14 21:25:50 +00:00
kimmi 0e125c2255 CHANGE: Prototype for correct material loading, now the meshes have correct references to the used material. 
BUGFIX: Parsing of normals and texture coordinates fixed.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@61 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-07-02 18:12:54 +00:00
kimmi a3d2ff5f26 CHANGE: Bugfixes for ObjFile material import 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@53 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-06-03 21:32:56 +00:00
aramis_acg 8c002e6998 Changed "Free" to "Open", Java build configs, port directory added, intellij idea5.1 project file added 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@25 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-05-22 10:20:31 +00:00
ulfjorensen 71fa1b508e - corrected all local include paths so that there are no "additional include paths" necessary in the build configuration anymore 
- wrote some further documentation text
- moved ObjFileParser.h to the code directory

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@23 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-05-21 15:35:28 +00:00
kimmi a052251bcf FEATURE: First prototype for ObjFile material-importer, the assimp data structure will not be created yet. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@17 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-05-16 17:57:48 +00:00
aramis_acg db9c5fef2b - ASE loader alpha 
- MDL loader stable
- 3ds bugfixes,
- API extensions
- New viewer features - WIP
- Support for C

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@11 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-05-09 17:24:28 +00:00
kimmi b76f999cb7 Initiual commit: AssetImporter source moved from ZFXCE repository to its own repository. PLease do not use the ZFXCE repo any more. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-05-05 12:36:31 +00:00