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

6515 Commits (f8d8a43a352843ad942d4a48742a9a1df8e41064)

Author SHA1 Message Date
Kim Kulling 25c5384208
Merge branch 'master' into master 2018-01-25 09:11:14 +01:00
Kim Kulling 39ce3e1309
Merge pull request #1738 from assimp/issue_1728 
closes https://github.com/assimp/assimp/issues/1728: check if mesh is…
 2018-01-25 09:10:41 +01:00
Kim Kulling 2e7e16b52b
Merge branch 'master' into issue_1728 2018-01-24 23:58:55 +01:00
Kim Kulling 68aedce7b2
Merge pull request #1736 from assimp/issue_1721 
closes https://github.com/assimp/assimp/issues/1721: set camera param…
 2018-01-24 23:58:40 +01:00
Kim Kulling 1037ac5b93
Merge branch 'master' into issue_1721 2018-01-24 21:57:53 +01:00
Kim Kulling 5baba37414 closes https://github.com/assimp/assimp/issues/1728: check if mesh is a null instance before dereferencing it. 2018-01-24 21:43:36 +01:00
Giuseppe Barbieri 47a2775b94
Update FBXConverter.cpp 
Renamed nested looping variable
 2018-01-24 21:30:25 +01:00
Kim Kulling 0b15d5cd46 closes https://github.com/assimp/assimp/issues/1721: set camera parameters instead of nonsense. 2018-01-24 21:20:34 +01:00
Kim Kulling 3a7b8d4aa5
Merge branch 'master' into fix-paint3d-vertexcolor 2018-01-24 20:05:30 +01:00
Kim Kulling f80dbe2046
Merge pull request #1734 from carmenfan/master 
GetEmbeddedTexture should be a const function
 2018-01-24 20:01:48 +01:00
Rohan Singh b28bcc365c Interpret IndexAToDirect as Direct when the index element is missing 
Paint3D exports FBX like this, which is wrong, but could still support it
 2018-01-24 09:45:20 -05:00
carmenfan 5b948e9cca add const to GetEmbeddedTexture 2018-01-24 11:32:58 +00:00
turol 1b1d1e7376
Merge pull request #1732 from turol/threadsafe 
Fix thread-safety issue in 3DS and ASE loaders
 2018-01-24 13:07:09 +02:00
Turo Lamminen a8fd9f668f ASE: Explicitly write out Material move constructor and assignment operator 
Because MSVC doesn't support defaulting them
 2018-01-24 12:25:30 +02:00
Turo Lamminen cbd7916ced 3DS: Explicitly write out Material move constructor and assignment operator 
Because MSVC doesn't support defaulting them
 2018-01-24 12:11:19 +02:00
Turo Lamminen e6ff15d201 3DS: Initialize Material name in initializer list 2018-01-23 20:41:26 +02:00
Turo Lamminen 4acd96d405 3DS: Remove Material default constructor 2018-01-23 20:36:51 +02:00
Turo Lamminen dd7035372d 3DS: Pass default material name to constructor instead of changing after the fact 2018-01-23 20:36:05 +02:00
Turo Lamminen 10246bf052 3DS: Pass default material name to Material constructor 2018-01-23 20:29:46 +02:00
Turo Lamminen f2ec3eeeb8 ASE: Delete Material default constructor 2018-01-23 20:20:37 +02:00
Turo Lamminen 209966ef35 ASE: Pass default material name to constructor 2018-01-23 20:15:21 +02:00
Turo Lamminen 1b28124f21 ASE: Pass a default material name when resizing submaterials buffer 2018-01-23 19:54:16 +02:00
Turo Lamminen 4b1b5f1b59 ASE: Pass a default material name when resizing materials buffer 2018-01-23 19:50:20 +02:00
Turo Lamminen 60d78f1701 ASE: Add Material constructor which takes material name 2018-01-23 19:43:15 +02:00
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
Marco Di Benedetto 5f38bd01ec restored gltf checks. 2018-01-18 22:28:44 +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
Marco Di Benedetto c749594e9d gltf instant ok on valid extension. 2018-01-18 19:12:51 +01:00
Marco Di Benedetto 55ca48e838 Merge branch 'master' of https://github.com/assimp/assimp 2018-01-18 19:08:54 +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