Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,282 Commits 19 Branches 43 Tags
36cddcc8b758fc4ebb6a5b81a2c08a8bf034fdb2
Commit Graph

5282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
36cddcc8b7 Update miniz.h 
retrigger CI.
 2017-12-04 15:20:23 +01:00
Kim Kulling
fe6608175b Update miniz.h 
Fix test against null bytes to push back.
 2017-12-04 15:19:34 +01:00
Kim Kulling
a59f0b29d5 Merge pull request #1604 from assimp/kimkulling-miniz-memoryaccessfix 
Update miniz.h
 2017-12-04 14:39:36 +01:00
Kim Kulling
98cb898463 Merge branch 'master' into kimkulling-miniz-memoryaccessfix 2017-12-04 13:31:00 +01:00
Kim Kulling
b92c3ca161 fix invalid op 2017-12-04 13:19:34 +01:00
Kim Kulling
75b31377fc Merge pull request #1606 from elect86/patch-16 
Update MD3Loader.cpp, using index
 2017-12-02 23:40:58 +01:00
Kim Kulling
b8ab90ae4b Merge branch 'master' into patch-16 2017-12-02 21:15:54 +01:00
turol
ed361f0b53 Merge pull request #1608 from turol/analyze 
Re-enable Clang static analyzer
 2017-12-02 18:36:13 +02:00
Turo Lamminen
45f2f31011 miniz: Remove some dead assignments 2017-12-02 17:59:04 +02:00
Turo Lamminen
26f749fcd2 Re-enable Clang static analysis 2017-12-02 17:58:33 +02:00
turol
5702b907d4 Merge pull request #1607 from turol/unique_ptr 
Replace ScopeGuard with C++11 std::unique_ptr
 2017-12-02 17:57:35 +02:00
Turo Lamminen
2c3558fdd0 Remove ScopeGuard 2017-12-02 17:24:19 +02:00
Turo Lamminen
b60d84a8a2 C4D: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:23:49 +02:00
Turo Lamminen
bd4f024562 XGLLoader: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:22:19 +02:00
Turo Lamminen
e8eccfa27d FBX: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:19:18 +02:00
Turo Lamminen
6f50be82aa 3MF: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:15:57 +02:00
Turo Lamminen
f35d5952dc BlenderLoader: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:13:43 +02:00
Turo Lamminen
af8e297e0f BaseImporter: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:10:06 +02:00
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