Commit Graph

5534 Commits (d49996d8a672efe60ef6279782f74b521bcc8037)

Author SHA1 Message Date
Turo Lamminen d49996d8a6 3DS: Add Material constructor which takes material name 2018-01-23 19:38:38 +02:00
Turo Lamminen 024aade208 ASE: Add explicit default constructors and assignment operators to Material 2018-01-23 19:33:50 +02:00
Turo Lamminen 9e7b21f83d 3DS: Add explicit default constructors and assignment operators to Material 2018-01-23 19:24:22 +02:00
Turo Lamminen 4d946d9e31 ASE: Reformat another initializer list 2018-01-23 19:10:00 +02:00
Turo Lamminen 6c4e3bce53 3DS: Reformat initializer list 2018-01-23 18:58:23 +02:00
Turo Lamminen 70ae30f26a ASE: Reformat initializer list 2018-01-23 18:58:19 +02:00
Kim Kulling 2ec6b2d214
Merge pull request #1731 from assimp/fbx_unitscale_factor
Fbx unitscale factor
2018-01-23 17:21:19 +01:00
Kim Kulling 05b560ef44
Merge branch 'master' into fbx_unitscale_factor 2018-01-23 15:18:03 +01:00
kim kulling f80ed093f8 remove test artifacts from repo. 2018-01-23 15:13:49 +01:00
kim kulling 88a0bb1b6d FBX: store UnitScaleFactor for fbx-files. 2018-01-23 15:13:23 +01:00
kim kulling 8ac1de3287 closes https://github.com/assimp/assimp/issues/1390: aiScene now stores metadata as well. 2018-01-23 15:12:57 +01:00
Kim Kulling 51d0922d8d
Merge pull request #1730 from assimp/assimp_viewer_fi
Assimp viewer fixes
2018-01-23 13:48:17 +01:00
Kim Kulling ebaa8be106 fix findings. 2018-01-23 13:02:13 +01:00
Kim Kulling 98c053a9b9 Fix textures 2018-01-23 13:02:03 +01:00
Kim Kulling b43923a759
Merge pull request #1726 from assimp/issue_1722
closes https://github.com/assimp/assimp/issues/1722: use a const refe…
2018-01-22 15:13:00 +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
Kim Kulling 8358d585b0
Merge pull request #1712 from wanadev/gltf2-fixes
[glTF2] Fixed buffer alignment
2018-01-18 19:21:22 +01:00
Kim Kulling 8b9b770f9f
Merge branch 'master' into gltf2-fixes 2018-01-16 21:50:48 +01:00
Kim Kulling bedf506c0a
Merge pull request #1715 from assimp/issue_1660
STLLoader: closes https://github.com/assimp/assimp/issues/1660: use m…
2018-01-16 17:47:22 +01:00
Kim Kulling 81fbe2c7d3
Merge branch 'master' into issue_1660 2018-01-16 17:13:02 +01:00
Kim Kulling d230635ff6 STLLoader: closes https://github.com/assimp/assimp/issues/1660: use memcpy instead of a c-style dynamic cast to parse a aiVector3D 2018-01-16 16:31:15 +01:00
Kim Kulling 48d6006fea
Merge pull request #1683 from NebuHiiEjamu/master
Expose the importer/exporter extension API and util functions for external access
2018-01-16 10:14:19 +01:00
Alexis Breust 5e6cae3094 Force normalized normals 2018-01-16 09:56:44 +01:00
Alexis Breust 0f4189c77e Forced 4-bits alignment for glTF buffers 2018-01-16 09:26:18 +01:00
BuildTools 0c37ef55be IFCLoader.h fix 2018-01-15 19:23:13 -08:00
BuildTools f88572f572 fix includes 2018-01-15 19:14:44 -08:00
Christian Meurin 2f687ab91f
Merge branch 'master' into master 2018-01-15 19:11:53 -08:00
Christian Meurin 86fa0f4524
Merge branch 'master' into master 2018-01-15 19:10:14 -08:00
BuildTools d0c92e30be conflict resolution again, temp. move LogAux.h 2018-01-15 19:07:33 -08:00
BuildTools 68db518696 Fix IFC branch merge conflict 2018-01-15 19:00:56 -08:00
Kim Kulling d0bf5c10f9
Merge pull request #1704 from mesilliac/better_fbx_material_import
Improve FBX material import
2018-01-15 22:03:14 +01:00
Kim Kulling c07069821d
Merge branch 'master' into better_fbx_material_import 2018-01-14 22:04:20 +01:00
Kim Kulling fa321aba71
Merge pull request #1701 from mesilliac/document_material_reflectivity
Document AI_MATKEY_REFLECTIVITY and AI_MATKEY_COLOR_REFLECTIVE.
2018-01-14 22:03:41 +01:00
Kim Kulling 3820365a90
Merge branch 'master' into document_material_reflectivity 2018-01-14 12:22:19 +01:00
Kim Kulling 90978ef681
Merge pull request #1707 from assimp/ifc_40
IFC: introduce new namespace fpr IFC-schema2x3
2018-01-13 17:27:14 +01:00
Kim Kulling 03b43ee9c3
Merge branch 'master' into ifc_40 2018-01-13 14:40:50 +01:00
Kim Kulling 5e339d0ff0 fix case-sensitive typo in include. 2018-01-13 10:54:38 +01:00
Kim Kulling cecab969c6 IFC: introduce new namespace fpr IFC-schema2x3 2018-01-13 10:27:45 +01:00
Christian Meurin 6566dcaf34
Merge branch 'master' into master 2018-01-12 13:14:05 -08:00
Kim Kulling d360532667
Merge branch 'master' into document_material_reflectivity 2018-01-12 14:57:04 +01:00
Kim Kulling ee54e9a38e
Merge pull request #1700 from rspencer01/master
Add pyassimp code generation script for materials
2018-01-12 14:55:29 +01:00
Kim Kulling e53fdf365e
Merge branch 'master' into master 2018-01-12 13:14:32 +01:00
Kim Kulling fe4da15d07
Merge pull request #1699 from ombre5733/patch-3
Removed a stray semicolon
2018-01-12 13:14:11 +01:00
Kim Kulling 843c658a33
Merge branch 'master' into patch-3 2018-01-12 09:40:35 +01:00
Kim Kulling 7c16a589e7
Merge pull request #1698 from ombre5733/patch-2
Clarify the matrix layout in the documentation
2018-01-12 09:40:08 +01:00
BuildTools 4cb4d59682 revert problematic unit test models to last upstream commits 2018-01-11 16:13:13 -08:00
BuildTools dda91094f2 I want to see what GetErrorString() blurts out on the Travis failure real quick 2018-01-11 15:47:07 -08:00
BuildTools 4410de1c44 correct header path for new process 2018-01-11 13:21:40 -08:00
Christian Meurin 925be5e983
Merge branch 'master' into master 2018-01-11 13:13:46 -08:00
Manuel Freiberger d64d5f762f
Merge branch 'master' into patch-3 2018-01-11 21:07:31 +01:00