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

40 Commits (7cc46ebc22536cb02ade489d724d27aa9fe1d8fe)

Author SHA1 Message Date
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
Alexander Gessler faea2ecccc OBJ: Support spaces in material names, fixes #545. 
Adding test file.
 2015-05-10 23:50:18 +02:00
Kim Kulling 995bc41d57 color node handling opengex 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-29 11:57:39 +02:00
Alexander Gessler f435712273 Fix Mac build issues (clang 6.0 compiling x86_64) 2015-04-17 06:42:58 +02:00
abma bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
Jared Duke c7b6b5ea2f Support lowercase 'ns' and 'ni' obj material tokens 
Previously, the obj material parser would interpret all key tokens
starting with 'n' as 'newmtl' tokens. However, there are other tokens
that can start with 'n', namely 'ns' and 'ni' for material properties.
Make the parser robust to such cases, despite their canonical forms
being uppercase.

Resolves #410.
 2014-11-18 16:56:46 -08:00
Kim Kulling a5afbcf29c refactoring: remove duplicate code. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-23 23:34:05 +02:00
Kim Kulling b359deb7fd update: 
- add assert test in obj-import
- fix material token in Obj.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-21 20:37:36 +02:00
Kim Kulling 5e265610fb bugfix: add obj-material handling for <color> 0 instead of <color> r g b. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-08-16 11:39:28 +02:00
acgessler 203d5d6fcc Obj: make mtl importer accept kd, ks etc. as well (Kd, Ks being the correct form). This is for keeping up compatibility with assimp's own Obj exporter, which has been inaccurate about this since inception. 2014-08-02 21:18:21 -07:00
Robin ce37d3bcad Fixed possible bug with map_emmissive keyword and removed second check for ambient texture keyword 2014-07-11 08:11: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 0b88f72be2 refactor the code, also parse texture option explictly 2013-12-02 22:58:15 +08: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 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 f9cd8845b1 - Bugfix : Bug 3511751 closed, handling no defined material name. 
- Update : Add a model for the regression test.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1244 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-01 09:39:51 +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 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
kimmi d3ff282987 - Removed dead code. 
- Fixed some compiler warnings ( occurred with warning level 4 ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@467 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-19 20:45:51 +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 13804abf2e FIX: ObjLoader reads opacity now. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@419 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-10 00:08:06 +00:00
aramis_acg 077511b1a0 FIX: WaveFront MTL files will no line break at the end will now read properly. 
Manually removing the line break from a test file for regression testing.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@418 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-09 23:54:16 +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
kimmi 06e4262f80 - Refactorized obj-material-loader: removed duplicated float separation and made it to a template. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@235 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-11-09 18:22:01 +00:00
aramis_acg 1db46c242f Added temporary boost workaround - some assimp features work with reduced functionality in this case. 
Added AC-loader, WIP version.
PLY loader is now able to load models from blender, test model added. Refactoring.
Added FindInvalidData step.
Added support for precompiled headers, the release builds in VC8 are configued to use PCH now.
Added separate makefile for mingw, no -FPic warning anymore, -clear works now.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@176 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-10-13 16:45:48 +00:00
kimmi cb7d509017 FIX: Material files with blanks in the filename can be loaded. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@169 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-10-05 13:05:53 +00:00
cgmelt 31e2408732 git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@157 67173fc5-114c-0410-ac8e-9d2fd5bffc1f 2008-09-22 08:08:48 +00:00
ulfjorensen b776f04251 More bugfixes from Jonathan: 
- fixed material loading in OBJ importer
- Bugfix: loads obj files without texture coords correctly now

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@144 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-09-16 13:53:10 +00:00
aramis_acg 8991496cf5 Fixes for build with mingw (no warnings in 32 Bit build, even with -wall). 
SMD bugfix.
Makefile is up to date now.
Added pack-attribute for aiVector3D and aiVector2D. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@132 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-09-12 20:25:11 +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 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
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
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