Commit Graph

5431 Commits (e8fffb781581892cc54269fb345e95dffd5c7351)

Author SHA1 Message Date
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
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
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 840416831d
Merge pull request #1676 from terziman/master
Bug fixes for IFC
2018-01-04 00:27:17 +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
Turo Lamminen 7ebd8e7543 glTFAsset: Use std:unique_ptr for Image data 2018-01-02 20:09:22 +02:00
Turo Lamminen d308cfcb43 glTF: Fix delete / delete[] mismatch 2018-01-02 19:23:21 +02:00
Kim Kulling bb8527a671
Merge branch 'master' into aiVector3_Reviewfindings 2018-01-01 22:16:52 +01:00
Kim Kulling 085a85569e
Merge pull request #1670 from assimp/update_gtest_to_1_8_0
new gtest version: 1.8.0
2018-01-01 20:58:33 +01:00
Kim Kulling bd81869794 Fix some minor findings. 2018-01-01 20:57:59 +01:00
Kim Kulling fb660823fc new gtest version: 1.8.0 2018-01-01 19:42:01 +01:00
Kim Kulling fe5277e117
Merge pull request #1668 from rspencer01/master
Version bump pyassimp
2017-12-31 16:06:59 +01:00
Kim Kulling 02c0cba0dc
Merge branch 'master' into master 2017-12-31 14:04:07 +01:00
Kim Kulling 5920526b7a
Merge pull request #1666 from aavenel/fix_obj_crash
Fix some crashes when parsing ill-formed OBJ file
2017-12-31 14:03:56 +01:00
Kim Kulling da120b03b4
Merge branch 'master' into fix_obj_crash 2017-12-31 12:09:19 +01:00
Kim Kulling 3407889ec9
Merge pull request #1663 from assimp/issue_1655
closes https://github.com/assimp/assimp/issues/1655: add typedef for …
2017-12-31 12:08:57 +01:00
Alexandre Avenel ced6e8ce43 Use std::unique_ptr in ObjFileParser 2017-12-30 13:23:44 +01:00
Robert Spencer d3150eedfb Version bump pyassimp 2017-12-29 19:46:16 +02:00
Alexandre Avenel 606fd6b1a1 Replace assertion by an exception in Obj parsing
This crash could happen when the user try to parse an ill-formed obj file.
2017-12-29 18:07:41 +01:00
Alexandre Avenel 7de7c548fb Add unit test to OBj importer for homogeneous coord
This test triggers an assertion when we divide by zero in homogeneous
coordinates.
2017-12-29 18:06:20 +01:00
Alexandre Avenel 20ef807982 Remove assertion in ObjFileImporter
This assertion is already handled by an exception, and could lead to a
crash when parsing an ill-formed OBJ file.
2017-12-29 17:56:30 +01:00
Kim Kulling 58c38022ab
Merge branch 'master' into issue_1655 2017-12-29 17:09:38 +01:00
Kim Kulling dc5726bd0f
Merge pull request #1664 from JLouis-B/QtViewer-fixes
Qt viewer : fixes for failed imports
2017-12-28 21:33:57 +01:00
Jean-Louis Boudrand 04d5f49f6d Use QString::number
easier to read + typos
2017-12-28 15:10:55 +01:00
Kim Kulling 6a9df80f68 closes https://github.com/assimp/assimp/issues/1655: add typedef for android NDK. 2017-12-28 14:52:41 +01:00
Jean-Louis Boudrand e030d374b9 Qt Viewer : Fixes for failed imports
Fix the UI when an import fail
2017-12-28 13:55:41 +01:00
Kim Kulling f8eeaf176a
Merge pull request #1661 from JLouis-B/master
Qt viewer : Improve exports
2017-12-28 09:35:55 +01:00