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

119 Commits (b725d7dbf5a8db57169ef12e713975a32ad16a01)

Author SHA1 Message Date
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