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

185 Commits (f67c18d41a1a3e6d9a1e23fc7c26bd37952be789)

Author SHA1 Message Date
kim kulling 88a0bb1b6d FBX: store UnitScaleFactor for fbx-files. 2018-01-23 15:13:23 +01:00
Kim Kulling f0d03ec6b8 closes https://github.com/assimp/assimp/issues/1722: use a const reference to fix issue with ppc. 2018-01-22 14:35:06 +01:00
Christian Meurin 86fa0f4524
Merge branch 'master' into master 2018-01-15 19:10:14 -08:00
BuildTools 4cb4d59682 revert problematic unit test models to last upstream commits 2018-01-11 16:13:13 -08:00
Tommy aba8383283 Add unit test for correct FBX phong material import. 2018-01-11 17:49:17 +01:00
BuildTools a8a1ca9894 header paths adjusted for unit tests and samples 2018-01-05 23:12:40 -08:00
Kim Kulling 96b9626601 FBX: add missing test file. 2018-01-04 13:17:42 +01:00
Daniel Hritzkiv 5c9ed540b2
Add test for GLB import 
Currently fails (testing the issue in #1600)
 2017-11-29 12:20:44 -05:00
Unknown 12dbbd4ce9 Misc. typos 
Some are doxy comments, some are just trivial source comment typos. 
Found using `codespell -q 3 --skip="./contrib" -I ../assimp-whitelist.txt`
whereby whitelist contained:
```
childs
iff
lod
nto
ot
whitespaces
```
 2017-11-09 17:19:26 -05:00
Kim Kulling 26171a7949 SLD: add test model and a unit test. 2017-11-06 22:37:52 +01:00
Daniel Hritzkiv 6b4286abf6
check in gltf2 models to test directory 
Remove un-needed test models
 2017-09-11 10:50:38 -04:00
Kim Kulling a45b5cdfb5 OpenGEX: fix invalid handling with color4 token. 2017-05-16 21:45:23 +02:00
Kim Kulling ad80f97930 closes github.com/assimp/assimp/issues/1228: use test extension for exported test files. 2017-04-17 14:26:54 +02:00
Kim Kulling dfff37f724 X3D: add working example. 2017-03-29 21:13:44 +02:00
Kim Kulling bb7f387bcf Merge branch 'master' of https://github.com/assimp/assimp 2017-03-11 22:13:48 +01:00
Kim Kulling 143f91d541 Unittests: fix version test. 2017-03-08 10:54:12 +01:00
Kim Kulling b725d7dbf5 Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes 2017-03-08 10:27:57 +01:00
Kim Kulling 3bd9efa82c Cleanup_includes: fix linux build. 2017-03-08 09:55:44 +01:00
Kim Kulling 8d27945619 Merge branch 'master' into cleanup_includes 2017-03-05 15:15:29 +01:00
Kim Kulling e6dcad384a Fix missing includes. 2017-03-05 15:05:40 +01:00
Kim Kulling a75eb86af4 Issue-1169: fix clang build. 2017-02-27 21:59:50 +01:00
Kim Kulling 7a47f1f8f7 Issue-1183: add stp to the list of supported extensions for step-files. 2017-02-27 20:11:59 +01:00
Kim Kulling a75fa44bde PLY: prepare bugfix by adding missing unittest. 2017-02-11 14:19:34 +01:00
Kim Kulling da34ffd6ce Fix the build: next try ( with full namespaces ). 2017-02-05 20:51:18 +01:00
Kim Kulling 6ed1f7570e Merge branch 'master' of https://github.com/assimp/assimp 2017-02-05 19:30:11 +01:00
Kim Kulling 31bb9f7ba6 Obj: fix code review findings. 2017-02-04 18:32:04 +01:00
Kim Kulling 11e2ca173d Fix the build. 2017-02-04 18:15:50 +01:00
Kim Kulling 061afba7ab Blender: add import test to unit test suite. 2017-01-07 16:14:09 +01:00
Kim Kulling 859d15d3a0 closes assimp/assimp/issues/899: fix parsing of texture name. 2016-12-12 21:22:03 +01:00
Kim Kulling dcfc696e86 FBX: woraround for issue 1089. 2016-12-02 11:32:34 +01:00
Alexandr Arutjunov 165f0f0548 [+] Few models for AMF and X3D. 2016-10-06 17:44:54 +03:00
Kim Kulling b61aaf7ec4 New animation file for OpenGEX. 2016-10-05 20:14:42 +02:00
Kim Kulling 22cfe84cba 3MF: add a simple box example from the 3MF-sample repo. 2016-09-10 09:27:29 +02:00
ciechowoj c554b55f97 Merge branch 'blender_materials' 
Conflicts:
	test/CMakeLists.txt
 2016-05-17 22:52:18 +02:00
ciechowoj c4a542a994 Adds blender material loading. 2016-05-17 21:17:51 +02:00
ciechowoj 25d84a6aff Adds support for area lights. 2016-05-16 13:04:43 +02:00
Otger 159af06524 Fixed GLTF bugs, and added a few test models 2016-05-10 16:25:15 +02:00
Kim Kulling 2323320df8 OpenGEX: new camra model. 2016-05-09 20:50:22 +02:00
Kim Kulling e9085097f3 OpenGEX: add light impl and add examples. 2016-05-09 20:43:22 +02:00
Kim Kulling b42b974282 Regression test suite: remove broken model. 2016-04-08 18:55:33 +02:00
Eric Engestrom 87e7cf00a2 Fix spelling mistakes 2016-04-03 01:38:00 +01:00
Kim Kulling 322c959424 Merge pull request #791 from trond/collada_animation_clip 
Collada animation clip support
 2016-02-11 22:11:27 +01:00
Trond Abusdal 14e5cf380c Added regression test file for <library_animation_clips> support. Generated from Blender using 'Better Collada Exporter' from Godot team. 2016-02-11 00:22:32 +01:00
Kim Kulling 1550191256 Closes https://github.com/assimp/assimp/issues/777: fix invalid skipping 
of line during face defintion parsing.
 2016-02-08 18:07:00 +01:00
Kim Kulling 87b3af4c3b Merge branch 'issue-707' of https://github.com/ov/assimp into ov-issue-707 2015-12-14 17:46:54 +01:00
rmitton d952823ffd Importer for Silo SIB files. 
Wrote an importer for Nevercenter Silo's binary SIB model format
 2015-12-13 22:14:19 -08:00
Vitaly Ovchinnikov 6214fbfbbe this patch fixes multiple objects generation in OBJ reader if faces are prepended with 'usemtl' line 2015-12-13 22:54:50 +13:00
Kim Kulling db8845d2b2 glTF: add jsn reader + example model to work on. 2015-11-25 22:03:39 +01:00
Turo Lamminen 280641cee6 Add a testcase for invalid OFF file 
Testcase generated by AFL which used to crash the OFF loader
 2015-10-28 21:54:45 +02:00
Kim Kulling 524834c307 Fix line endings. 2015-08-08 18:02:37 +02:00
rdb 1eef4c387f Correct value for mColorAmbient for COLLADA files 2015-07-05 14:30:27 +02:00
wise86Android 2c194f629a fix macro for be uesed with expression 2015-05-19 21:57:51 +02:00
wise86Android fb4eb83e84 add the ability to export cameras information in a collada file 2015-05-17 20:54:45 +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 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 dca3f09940 Merge pull request #497 from assimp/regression-ci-test 
Regression suite fixes, fix cases of non-deterministic output #1.
 2015-03-16 09:15:55 +01:00
Alexander Gessler 741b070c7e Add blender 2.71 default scene as test file. 2015-03-15 00:48:16 +01:00
Alexander Gessler 3080c26a60 Add test files for previously fixed #458. 2015-03-14 19:57:43 +01:00
Kim Kulling 62225f61e4 Merge branch 'master' into opengex_support 
Conflicts:
	.gitignore
 2015-01-13 20:21:17 +01:00
Wolfgang Herget 926b7e98cc Tristripped version of cube.dae generated using openscenegraph. 
Command line used:
OSG_OPTIMIZER="TRISTRIP_GEOMETRY" osgconv cube.dae cube_tristrips.dae
 2014-12-01 18:08:21 +01:00
Kim Kulling ed9a466c30 update: 
- add OpenGEX parser sceleton
- add base datatypes for OpenGEX support.
 2014-09-04 19:41:14 +02:00
acgessler 33ffb0003e Collada Export: escape user-defined strings in XML output. 2014-08-23 15:42:47 -07:00
Kim Kulling d2e4dda393 update: add testcase for empty color. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-08-16 11:54:04 +02:00
Tyson Grant Nottingham f96375b5f6 Add test OBJ w/ multiple spaces between elements. 2014-07-22 22:01:18 -07:00
Tyson Grant Nottingham 084ab9d82e Add test OBJ containing various number formats. 2014-07-22 22:00:47 -07:00
Kim Kulling 08bacc73a6 update: add ply example for ply importer. 2014-05-13 14:14:53 +02:00
acgessler 08cbc0974b Add Blender 2.69 test files (first set - no UVs here or other fancy stuff) 2013-12-01 23:34:58 +01:00
acgessler a5667ada9c add ifc sample file to assimp. 2013-10-12 20:10:38 +02:00
aramis_acg ddea19ead1 - triangulation: re-introduce special handling for quads, now with proper support for concave quads. This should *really* fix [3429812], but it leaves me to suspect bugs in the general-purpose triangulation code for ngons. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1341 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-11-29 15:25:09 +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 e65087c338 + add test files for the new XGL/ZGL importer. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1211 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-20 16:53:10 +00:00
jonathanklein 7f1e7b7d6b Ogre: TestModel added, Texture-Bug in Materialloader fixed 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1195 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-10 23:04:02 +00:00
aramis_acg 8fc1d1c529 - add the test file that led to fix r1183 to the regression test suite. See https://sourceforge.net/projects/assimp/forums/forum/817654/topic/5052480 (I hope the licensing classification is right, if not, please inform me). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1185 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-23 16:40:00 +00:00
aramis_acg 8e5a2ad464 - add blender 2.6.2 test file. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1180 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-23 13:48:55 +00:00
aramis_acg c84a14a7a8 [3118522] OBJ material/texture filename with spaces support. 
I also added a test case for this issue.

(see https://sourceforge.net/tracker/?func=detail&aid=3118522&group_id=226462&atid=1067632)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1157 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 18:16:15 +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 0db3f8b3f4 + add 3 test cubes to improve testing coverage of the x file format. The compressed cube is a test for the previous commit, r1012, which fixed a bug in the x loader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1018 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-31 13:34:57 +00:00
aramis_acg 785b2c0ac3 + add two malformed obj files. Currently those will crash Assimp. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@981 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-07 11:13:06 +00:00
aramis_acg fdda697af7 Move test models with problematic license restrictions to test/models-nonbsd and update the test suites accordingly. 
Update note in LICENSE accordingly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@827 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-10-13 17:57:06 +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
aramis_acg 027e6e7453 Add test case for the recently solved collada instance node troubles (https://sourceforge.net/tracker/index.php?func=detail&aid=3054873&group_id=226462&atid=1067632). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@816 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-09-14 22:11:51 +00:00
aramis_acg cab35c496d [3053648] Obj: segfault when first line is a material. 
Add test file to reproduce the issues. Thanks to Ingo Kresse for providing the patch.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@807 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-27 12:36:02 +00:00
aramis_acg aae8637666 Add GLOB_MEASURE_TIME configuration option to profile the runtime of the postprocessing steps. 
Start new documentation page for Performance/Profiling questions.
Migrate existing notes on multithreading to a new doc page, add more details.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@772 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-08 22:44:44 +00:00
aramis_acg 91d01d72c6 BLENDER: add test file of heavily subdivided Suzanne. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@767 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-07 15:17:58 +00:00
aramis_acg d082330cea BLENDER: Fix potential stack overflow caused by a DOM object referencing itself. 
Add general infrastructure to apply modifiers.
Implement mirror and subdivision modifiers using existing stuff.
Update BlenderDNA with related structures.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@763 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-07 14:50:19 +00:00
aramis_acg 31ff5d27eb fix: colladaloader is now a bit more tolerant to empty top-level (library) elements. See https://sourceforge.net/tracker/index.php?func=detail&aid=3008871&group_id=226462&atid=1067632 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@744 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-29 20:53:42 +00:00
aramis_acg 1b87557fd1 update to zlib 1.2.5. 
blenderloader now reads gzip compressed files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@737 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-26 00:21:07 +00:00
aramis_acg 188aa3da37 blender loader now reads basic material colors and even simple textures, be them embedded into the BLEND file or not. 
adding some test files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@735 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-24 01:24:18 +00:00
aramis_acg 3cf20b605d blender loader now loads material assignments. 
blender loader no longer produces randomized output in some scenarious. nice side effect of less asthetic diversity: less segfaults.
assimpview is no longer topmost.



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@732 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-21 22:39:31 +00:00
aramis_acg aba91ce95d Add a first set of blender test files. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@715 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-09 14:41:04 +00:00
aramis_acg 3c03e0fca5 COB loader does now honour explicit chunk sizes. if none are given in a particular chunk, the loader reverts to the old behaviour. 
COB loader converts textures properly now.
Add textured test files to confirm the previous issue.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@652 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-06 00:13:30 +00:00
aramis_acg 4c1b5a532d Add first WIP version of a TrueSpace loader. Currently only ASCII COB/SCNs are supported. 
Add some fast_atof overloads to simplify calling it.
Add another convenience c'tor to aiColorMM.
Add COB test models.
Remove unreferenced member in B3D importer.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@633 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-02 04:17:05 +00:00
aramis_acg eff7bc9f73 Add jeep.3ds in milkshape format to test suite. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@612 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-16 21:54:27 +00:00
aramis_acg 6589ccc642 Add test file triggering a terrible buffer overflow in revisions prior to r609. Regression database not yet updated. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@611 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-16 00:12:33 +00:00
jonathanklein df9a4bf66c - New Ogre testmodel inclusive blend File 
- Changed axes for location keys

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@574 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-03 15:50:32 +00:00
aramis_acg 707b06a7fe Add experimental MS3D loader, static meshes only at the moment. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@542 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-07 00:54:48 +00:00
aramis_acg 2e3fee99f0 ADD Vertex utility class to simplify conversion from and to interleaved vertices. 
Refactor JoinVerticesProcess to utilize the new utility.
ADD basic operators for aiColor4D, move to dedicated header and implementation file.
ADD some utility functions to SpatialSort.
ADD my existing Catmull-Clark implementation to Assimp for all model formats with support for subdivision surfaces. Slightly WIP, likely to produce errors on non-closed meshes. Currently only implemented in the AC3D loader.
Switch to byteswap intrinsics instead of inline assembly (bswap). Currently MSVC only.
FIX phong shading in assimp_view.
VertexTriangleAdjacency class now also works on arbitrary polygons - UNTESTED, tbd.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@532 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-28 21:17:25 +00:00
aramis_acg 1452a7a83d FIX: ColladaLoader now ignores missing 'meter' attribute in Collada files produced by C4D. Adding a c4ddae test file. Thanks to Tobias Rittig to point it out. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@483 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-26 21:54:56 +00:00
jonathanklein 29bb83ebb6 - Meshs without UVs are now supported 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@479 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-17 19:05:46 +00:00
jonathanklein a8ccd6fbd5 Adding test models for ogre (not nice, because i made them myself) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@475 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-05 10:49:36 +00:00