Commit Graph

6205 Commits (f0c8ef68b296f1065a9e83b2a08719cdbb42a1e6)

Author SHA1 Message Date
Axel Wefers 901b981260 glTF: Always check signature
Always check signature for glTF 1.0 and glTF 2.0 files to select the correct importer. Fixes #1605
2018-01-09 09:37:57 -08:00
Axel Wefers 0eacddc5bf glTF 2.0: Import scale for normal textures and strength for occlusion textures
resolves #1693
2018-01-08 15:19:27 -08:00
Axel Wefers dc79b572cf glTF 2.0: Assign default material to meshes with no material reference.
fixes  #1691
2018-01-08 14:57:55 -08:00
Axel Wefers 4235765856 glTF 2.0: Set camera "look at" to (0.0, 0.0, -1.0). 2018-01-08 14:19:30 -08:00
Kim Kulling 0fff3b1232
Merge branch 'master' into master 2018-01-08 15:36:03 +01:00
Kim Kulling 89a62edb9a
Merge pull request #1688 from wanadev/import-postprocess-embedimages
Added post-process to embed images
2018-01-08 15:35:31 +01:00
Alexis Breust 559bc38e5d Embedding images post-process 2018-01-08 09:26:52 +01:00
Christian Meurin 5ef13e7b38
Merge branch 'master' into master 2018-01-07 11:34:18 -08:00
Kim Kulling 2aa68d7519
Merge pull request #1687 from assimp/issue_1574
closes https://github.com/assimp/assimp/issues/1574: add API to get n…
2018-01-07 12:33:43 +01:00
Kim Kulling dd7a323103
Merge branch 'master' into issue_1574 2018-01-07 11:30:03 +01:00
Kim Kulling 0a5aa69f21
Merge pull request #1677 from assimp/remove_ctest
remove ctest to make workspace more readable.
2018-01-07 10:54:25 +01:00
BuildTools 6a76959f5b "s, <s, and >s oh my... 2018-01-06 21:20:45 -08:00
BuildTools 0c4c66be50 I assume too much about header paths... 2018-01-06 21:00:11 -08:00
BuildTools 123fb1d009 ../../code header path oversight fixed 2018-01-06 20:50:01 -08:00
Christian Meurin 7b5c543b82
Merge branch 'master' into master 2018-01-06 14:48:23 -08:00
Kim Kulling abc01bcdf0 closes https://github.com/assimp/assimp/issues/1574: add API to get name of current branch. 2018-01-06 21:52:58 +01:00
Kim Kulling b2bfb40859
Merge branch 'master' into remove_ctest 2018-01-06 21:31:22 +01:00
Kim Kulling e8fffb7815
Merge pull request #1681 from wanadev/1674-buffer-relative-uri
[glTF2] Using relative buffers URI
2018-01-06 21:30:57 +01:00
Kim Kulling 3896f3ffce
Merge branch 'master' into 1674-buffer-relative-uri 2018-01-06 20:40:27 +01:00
Kim Kulling 84453cb3b4
Merge pull request #1686 from assimp/issue_1638
closes https://github.com/assimp/assimp/issues/1638: use memcpy inste…
2018-01-06 18:46:42 +01:00
Kim Kulling 527a5ea5f6
Merge branch 'master' into 1674-buffer-relative-uri 2018-01-06 18:06:26 +01:00
Kim Kulling 01081765ad closes https://github.com/assimp/assimp/issues/1638: use memcpy instead of dynamic_cast. 2018-01-06 18:03:27 +01:00
Kim Kulling e0e1b17881
Merge pull request #1685 from rspencer01/master
Remove check for 'assimp' in pyassimp search path
2018-01-06 16:11:02 +01:00
Robert Spencer f149a2641b Add compiled python files to the ignore list 2018-01-06 15:17:56 +02:00
Robert Spencer ce5b78f6c0 Remove check for 'assimp' in name of directories to be searched for library in python port 2018-01-06 15:17:29 +02:00
Kim Kulling 6bbdb669e1
Merge branch 'master' into master 2018-01-06 09:30:13 +01:00
A. Breust ca152f41e2
Merge branch 'master' into 1674-buffer-relative-uri 2018-01-06 09:19:48 +01:00
Kim Kulling d91d10f694
Merge pull request #1682 from wanadev/glb2-no-bin-file
[glTF2] Correctly export images with bufferView
2018-01-06 09:18:52 +01:00
BuildTools a8a1ca9894 header paths adjusted for unit tests and samples 2018-01-05 23:12:40 -08:00
BuildTools 66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Alexis Breust 9b5df71150 Not using external bin file for glb2 2018-01-05 10:28:12 +01:00
Alexis Breust 988acd00f1 Using relative buffers URI 2018-01-05 10:08:17 +01:00
Kim Kulling abb09cc1d8
Merge pull request #1679 from assimp/issue_1460
closes https://github.com/assimp/assimp/issues/1460: skip uv- and col…
2018-01-04 13:45:43 +01:00
Kim Kulling 96b9626601 FBX: add missing test file. 2018-01-04 13:17:42 +01:00
Kim Kulling a5e2a40d75 FBX: add simple unittest with a simple box. 2018-01-04 13:10:13 +01:00
Kim Kulling f376a3e8cd move data declaration after test if elements are in current scope. 2018-01-04 13:09:43 +01:00
Kim Kulling 9efa4282fe closes https://github.com/assimp/assimp/issues/1460: skip uv- and color-components if these are not defined. 2018-01-04 12:37:35 +01:00
Kim Kulling 2f6dab53f4
Merge branch 'master' into remove_ctest 2018-01-04 00:28:04 +01:00
Kim Kulling 840416831d
Merge pull request #1676 from terziman/master
Bug fixes for IFC
2018-01-04 00:27:17 +01:00
Kim Kulling c66c7d7ae6 remove ctest to make workspace more readable. 2018-01-03 17:22:07 +01:00
Leo Terziman d0bee866c0 Merge remote-tracking branch 'github/master' into contrib 2018-01-03 16:15:07 +01:00
Leo Terziman 712a7ee779 Fixed bug in IFC where SweptDiskSolid tessellation would fail for polylines with only 2 points.
Indeed, the EstimateSampleCount is not always accurate in this case, as the number of generated curvature pointer is greater by one. Moreover, it is redundant to call EstimateSampleCount, as the SampleDiscrete method will provide the (correct) number of points anyway. This commit fix the described bug, but also increase the efficiency of the ProcessSweptDiskSolid method, as EstimateSampleCount is only called once now, instead of two times.
2018-01-03 16:14:20 +01:00
Leo Terziman 32dfd423db Fixed bug in IFC when dimensional exponent parameters in IfcSIUnits is not defined.
Usually, the value of this parameter is derived from parents, but it is not always the case for some files.
2018-01-03 16:08:18 +01:00
Kim Kulling fd91acdfc4
Merge pull request #1673 from assimp/kimkulling-patch-2
Update o3dgcTimer.h
2018-01-03 01:24:21 +01:00
Kim Kulling cf59c7d153
Update o3dgcTimer.h
closes https://github.com/assimp/assimp/issues/1642: fix build on Hurd
2018-01-03 00:56:32 +01:00
Kim Kulling 837baabd36
Merge pull request #1671 from assimp/aiVector3_Reviewfindings
Fix some minor findings.
2018-01-02 23:16:10 +01:00
Kim Kulling 0be6c9efcd
Merge branch 'master' into aiVector3_Reviewfindings 2018-01-02 21:56:34 +01:00
Kim Kulling d2a6bb15c2
Merge pull request #1672 from turol/memfixes
Memory management fixes
2018-01-02 21:56:07 +01:00
Turo Lamminen 8a505398a3 MMD: Fix memory leak 2018-01-02 20:35:06 +02:00
Turo Lamminen aac41cf2c3 MMD: Fix delete / delete[] mismatch
Also this was a horrible abuse of std::vector and shouldn't have worked
2018-01-02 20:28:08 +02:00