Commit Graph

775 Commits

Author SHA1 Message Date
bzt
0baec5f0bd Added M3D format support 2019-10-29 14:14:00 +01:00
Kim Kulling
61ea5a4ac6 Merge branch 'master' into collada_zae_textures_2710 2019-10-27 18:24:16 +01:00
Kim Kulling
120e97e55b Merge branch 'master' into assimp_version_2693 2019-10-27 13:47:59 +01:00
Malcolm Tyrrell
9bc2648615 Merge branch 'master' into fix-gltf-importer-crash 2019-10-21 15:29:18 +01:00
RichardTea
17eb292d73 Tests: Fix signed/unsigned warnings 2019-10-14 14:49:57 +01:00
RichardTea
f4bd11279f Update Collada ZAE tests to include encoded URIs 2019-10-14 12:25:42 +01:00
RichardTea
ce5c71d2e7 Collada ZAE import must convert manifest and image paths
Moved ConvertPath into ColladaParser and use it when reading all filenames from the XML

Added more EXPECTS to the Collada tests
2019-10-11 18:57:38 +01:00
RichardTea
059ee0e091 Update assimp legal and version
Will now report the major and minor versions specified in cmakelists
2019-10-11 16:28:14 +01:00
Malcolm Tyrrell
4cde72b4e6 Add unit tests. 2019-10-08 13:05:05 +01:00
Malcolm Tyrrell
5f8f5c3292 Organize test models better. 2019-10-08 12:51:31 +01:00
Malcolm Tyrrell
ce4cb39302 Make example minimal. 2019-10-08 11:46:07 +01:00
Malcolm Tyrrell
8498310fa0 A gltf v2 which exercises all the options. 2019-10-08 11:35:03 +01:00
Malcolm Tyrrell
77ebc53f1f Offset nodes. 2019-10-08 10:44:17 +01:00
Malcolm Tyrrell
1e7d1ffbc2 Add non-indexed unit test. 2019-10-08 10:34:08 +01:00
Kim Kulling
ecd413c86c Update utVersion.cpp
Fix the unittests as well.
2019-10-06 20:19:59 +02:00
Kim Kulling
fed7fcf2fb Update utFBXImporterExporter.cpp
put test in comments.
2019-09-18 14:09:48 +02:00
Kim Kulling
06542c49df Update utFBXImporterExporter.cpp
Disable test
2019-09-18 11:50:26 +02:00
Kim Kulling
2be0eba1ab put one in comments because the file seems to be corrupt. 2019-09-14 19:32:47 +02:00
Kim Kulling
ca0549558b closes https://github.com/assimp/assimp/issues/2653: introduce 2 tests to reproduce fbx-tokenize issue. 2019-09-14 10:31:35 +02:00
Kim Kulling
f9c6fed190 Add a camera unittest. 2019-09-11 22:34:53 +02:00
Kim Kulling
3546403284 Merge branch 'master' into crash_in_ai_mesh_desctuctor 2019-09-06 20:45:16 +02:00
Mike Samsonov
0324643cd5 Missing model files 2019-09-05 11:44:02 +01:00
Mike Samsonov
873a358ce4 A crash in the aiMesh descructor 2019-09-05 11:44:02 +01:00
escherstair
e317fbfbb6 prefer prefix ++/-- operators for non-primitive types 2019-09-03 08:01:56 +02:00
Kim Kulling
9a78f2c6f1 Merge branch 'master' into topic/fbxNodeChainFix 2019-08-23 17:24:04 +02:00
Gordon MacPherson
fbb34b1de1 ScaleProcess overhauled to improve compatibility with animations and unit conversion.
./assimp Added arguments --gs to assimp command line option to enable global scaling.

No scaling for mScale of 1.0.

Co-Authored-By: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 17:36:57 +01:00
Kim Kulling
84e9d9ddf8 Merge branch 'master' into topic/fbxNodeChainFix 2019-08-16 08:47:02 +02:00
Malcolm Tyrrell
5b81899302 Add failing test. 2019-08-09 15:24:18 +01:00
Kim Kulling
090e896ebf Merge branch 'master' into collada_zae 2019-08-06 21:22:02 +02:00
RichardTea
361609c60b Merge branch 'master' into test_exporter_ids 2019-07-26 22:21:16 +01:00
RichardTea
72e18ed4aa Fix Travis CI sign-compare warning
EXPECT_* triggers sign compare error with literal 0 and unsigned
Use 0u literal with size_t
2019-07-26 09:10:09 +01:00
RichardTea
7e8a3ec4cb Add unit test of valid and unique Exporter IDs, rename assjson id
"json" is a very vague exporter ID, change to "assjson"

Add a unit test to ensure all exporter have unique IDs
and that they all have an ID, description and extension
2019-07-25 13:38:49 +01:00
RichardTea
59a5343a1a Merge branch 'master' into test_gitignore_cleanup 2019-07-25 12:41:30 +01:00
RichardTea
e05ece2eec Add Exporter Unit Test output to gitignore 2019-07-25 11:12:06 +01:00
Kim Kulling
e828dd1757 Merge branch 'master' into collada_zae 2019-07-21 14:37:12 +02:00
Kim Kulling
78b283135e Update utIssues.cpp
use correct test for floats.
2019-07-21 13:32:31 +02:00
Kim Kulling
41ea607739 Merge branch 'master' into collada_zae 2019-07-20 14:12:18 +02:00
Kim Kulling
ff7ec7e454 Merge branch 'master' into fix-obj-line-continuation 2019-07-20 12:07:49 +02:00
Kim Kulling
f804036cf3 Update utBlenderWork.cpp
Fix compiler warning signed against unsigned.
2019-07-19 20:44:48 +02:00
kimkulling
b6616e7b79 Fix another signed unsigned comparison warning. 2019-07-19 13:28:00 +02:00
kimkulling
e84f961f78 change std::array<int, x > to std::array<unsigned int, x> to fix compiler warnings. 2019-07-19 13:03:08 +02:00
kimkulling
68520bff0c Fix another signed / unsigned comparison warning. 2019-07-19 11:55:12 +02:00
kimkulling
3416c04ad9 Unit: fix more compiler warnings. 2019-07-19 11:26:48 +02:00
kkulling
a8019cf8d8 Unit: Fix new compiler warnings. 2019-07-19 10:38:44 +02:00
Merwan
2f6a005fb8 Add unit test for OBJ line continuations 2019-07-17 20:17:49 +02:00
kimkulling
53c0f91305 Add unittest for json. 2019-07-12 16:08:51 +02:00
RichardTea
0c718a9c95 Add Collada ZAE unit test 2019-07-12 14:56:29 +01:00
RichardTea
d64e1bde13 First pass of Collada ZAE support
Reads the manifest and loads the DAE
Does not yet load embedded textures
2019-07-12 11:29:35 +01:00
kkulling
b463ddd399 closes https://github.com/assimp/assimp/issues/340: start integrating assimp2json. 2019-07-11 17:37:31 +02:00
Mike Samsonov
6d07473550 all textures use relative path except embedded, this is fix for it 2019-06-27 17:59:55 +01:00