Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

12783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giuseppe Barbieri
42c1c733b9 Update MD3Loader.cpp 2017-12-01 15:20:50 +01:00
Kim Kulling
77b0aa4f4b Merge pull request #1602 from Matter-and-Form/fix/multibody-binary-stls 
Restore import of multi mesh binary STLs
 2017-12-01 01:10:34 +01:00
Kim Kulling
2897433358 Update miniz.h 
Add an assertion test and return true to not change the expected behaviour of buggy function.
 2017-11-30 10:47:52 +01:00
Kim Kulling
4811c0bdd1 Merge branch 'master' into fix/multibody-binary-stls 2017-11-30 10:13:56 +01:00
Kim Kulling
4fe91f7a5b Merge pull request #1598 from assimp/export_3mf 
Export 3mf
 2017-11-30 10:13:36 +01:00
Kim Kulling
5822d1920e Update STLLoader.cpp 
Retrigger travis + appveyor.
 2017-11-30 09:22:55 +01:00
Kim Kulling
915ee95ad3 Fx nullptr dereference. 2017-11-30 09:12:41 +01:00
Kim Kulling
5aa84a2610 Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf 2017-11-30 00:32:51 +01:00
Kim Kulling
ac23034816 fix the exporter unittest when the export is disabled. 2017-11-30 00:32:37 +01:00
Kim Kulling
c27fda62e5 Merge branch 'master' into export_3mf 2017-11-30 00:32:23 +01:00
Kim Kulling
9be69a90b1 Merge branch 'master' into fix/multibody-binary-stls 2017-11-30 00:28:59 +01:00
Kim Kulling
9d224f6ac5 Merge pull request #1603 from Matter-and-Form/fix/gltf-node-name-conflict 
[gltf2] node name conflict fix
 2017-11-30 00:28:28 +01:00
Kim Kulling
46caecdf35 enable compiler switch test for no exporter requested. 2017-11-29 21:02:52 +01:00
Daniel Hritzkiv
98e98dc40c Fix node names sharing same name 
Uses node name if it is set, and globally unique id otherwise.

This may still break in some models (glTF2 spec doesn’t guaruntee name values to be unique). However, I couldn’t cause it to break any further using gltf2 models on hand.

Closes #1600
 2017-11-29 12:20:44 -05:00
Daniel Hritzkiv
5c9ed540b2 Add test for GLB import 
Currently fails (testing the issue in #1600)
 2017-11-29 12:20:44 -05:00
Daniel Hritzkiv
67c236647d Restore import of multi mesh binary STLs 
Regression introduced in: 9a9f18bbed

This restores the behaviour for binary STLs with multiple bodies.

The code could be improved (to reuse code found at the end of LoadASCIIFile) but for now this is a quick fix
 2017-11-29 11:20:09 -05:00
Kim Kulling
59dcfefeb2 fix unaligned memory access. 2017-11-29 16:45:09 +01:00
Kim Kulling
fd2da59427 fix unaligned memory access. 2017-11-29 16:23:12 +01:00
Kim Kulling
b5e79c3cb6 fix invalid include 2017-11-29 16:11:33 +01:00
Kim Kulling
ddd23fad3f Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf 2017-11-28 19:05:00 +01:00
Kim Kulling
e442f5838f Merge branch 'master' into export_3mf 2017-11-28 15:41:33 +01:00
Kim Kulling
e17f7010d1 Merge pull request #1599 from assimp/kimkulling-verbose-analyze 
Update .travis.sh
 2017-11-28 15:41:22 +01:00
Kim Kulling
ef4842e128 Update .travis.sh 
Make check more verbose.
 2017-11-28 15:15:43 +01:00
Kim Kulling
6a2cd1c91d Update D3MFExporter.cpp 
Fix the build
 2017-11-28 10:14:23 +01:00
Kim Kulling
9bd9b3d99c Merge branch 'master' into export_3mf 2017-11-28 09:24:02 +01:00
Kim Kulling
e6381b7616 Merge pull request #1594 from Matter-and-Form/fix/gltf2-transforms 
[glTF2] Fix transform matrices multiplication order
 2017-11-28 09:22:01 +01:00
Kim Kulling
4b6e49ca7b Update D3MFExporter.h 
Fix review findings.
 2017-11-28 09:09:04 +01:00
Kim Kulling
4f972661e8 Update D3MFExporter.cpp 
Fix review findings.
 2017-11-28 09:08:16 +01:00
Kim Kulling
7a395e274f Merge branch 'master' into fix/gltf2-transforms 2017-11-28 08:48:19 +01:00
Kim Kulling
3e9bb23688 Merge pull request #1595 from Matter-and-Form/fix/gltf2-preserve-node-names 
[glTF2] Preserve node names when importing
 2017-11-28 08:47:49 +01:00
Kim Kulling
8ce5985aa0 Merge branch 'master' into fix/gltf2-preserve-node-names 2017-11-28 00:50:07 +01:00
Kim Kulling
890920110c Merge pull request #1596 from Matter-and-Form/feature/gltf2-tangents 
[glTF2] Add support for tangents in import
 2017-11-28 00:49:42 +01:00
Kim Kulling
09f7769820 remove unused attribute. 2017-11-27 23:36:32 +01:00
Kim Kulling
8e413ac1e3 Merge branch 'master' into export_3mf 2017-11-27 22:50:17 +01:00
Kim Kulling
7280dec838 fix unittest. 2017-11-27 22:46:57 +01:00
Kim Kulling
3dfca3bc84 3MF: add export to a given archive. 2017-11-27 21:48:33 +01:00
awefers
0031165789 Add support for tangents in glTF2.0 import 
Closes #1562
 2017-11-27 13:45:40 -05:00
awefers
0b04ae1d91 Preserve node names when importing glTF2.0 
Closes #1522
 2017-11-27 11:58:19 -05:00
awefers
e53d4735b0 Fix transform matrices multiplication order per glTF2.0 spec 
Closes #1568
 2017-11-27 11:32:05 -05:00
Kim Kulling
0ce3641deb Merge pull request #1589 from aavenel/fix-typo-gltf 
Fix typo on gltf2 camera parameters
 2017-11-26 20:52:49 +01:00
Kim Kulling
623b5a515a Merge branch 'master' into fix-typo-gltf 2017-11-25 20:11:49 +01:00
Kim Kulling
44b38263a5 Merge pull request #1590 from aavenel/fix-cmake-unit-win 
Copy assimp dll to unit folder on windows
 2017-11-25 20:11:22 +01:00
Kim Kulling
b9845285ca Merge branch 'master' into fix-cmake-unit-win 2017-11-25 16:51:37 +01:00
Kim Kulling
a41bef0d54 Merge pull request #1591 from aavenel/fix-warnings-win 
Fix all warnings on MSVC14
 2017-11-25 12:28:51 +01:00
Alexandre Avenel
eb452b28a2 Fix warning on MSVC14 2017-11-25 11:38:12 +01:00
Alexandre Avenel
d529dd17f9 Fix warning cast double to float 2017-11-24 22:29:58 +01:00
Alexandre Avenel
273f6b0267 Fix MSVC14 warning cast double to real 2017-11-24 22:13:38 +01:00
Alexandre Avenel
f80e8b39a1 Fix warning C4138: '*/' found outside of comment on MSVC14 2017-11-24 22:08:50 +01:00
Alexandre Avenel
c63263b025 Fix typo on gltf2 camera parameters 2017-11-24 22:02:47 +01:00
Alexandre Avenel
d8d5cf1a2d Copy assimp dll to unit folder on windows 2017-11-24 19:50:25 +01:00