259fd2df2d
Merge pull request #1805 from assimp/develop_kimkulling
...
Update FileSystemFilter.h
2018-02-23 18:27:29 +01:00
9c663e9630
fast_a_to_f: add some brackets.
2018-02-23 18:14:46 +01:00
606a28dbe8
Merge branch 'master' into develop_kimkulling
2018-02-23 17:54:58 +01:00
1d901f075c
3mf-importer: fix parsing of base-material color.
2018-02-23 17:49:29 +01:00
c7dc63af8a
Merge pull request #1806 from mesilliac/fbx_geometric_transforms_fix
...
FBX geometric transforms fix
2018-02-22 20:47:09 +01:00
f847d4817d
FBX Export: fix logic for determining if scale transformation is identity.
...
Previously it was comparing scale.SquareLength() to 1.0.
2018-02-21 15:29:59 +01:00
c1f353f6c7
FBX Export: Geometric transformations always create transformation chain.
...
In combination with fb213e4bfixes #1112 .
2018-02-21 14:15:03 +01:00
50b6c63594
Merge branch 'master' into develop_kimkulling
2018-02-21 13:31:32 +01:00
22dbb6c2d2
Update FileSystemFilter.h
...
- Fix typo.
-test in public metod against invalid parameters
2018-02-21 13:10:51 +01:00
a8fc22fd3f
assimp_cmd: Add --verbose flag to 'info' command, to print node transforms.
2018-02-21 12:57:45 +01:00
fb213e4bac
FBX Importer: apply inverse of geometric transform to child nodes.
2018-02-21 12:45:09 +01:00
7cd1a66c8b
Use correct lookup.
2018-02-20 22:08:40 +01:00
7c2f7c02ab
Merge branch 'master' into moffsetmatrix_documentation
2018-02-20 17:53:22 +01:00
a92dbabc25
Update FileSystemFilter.h
...
Fix missing save.
2018-02-20 16:36:55 +01:00
c97d19fd6f
Merge pull request #1802 from elect86/master
...
Typos + bug
2018-02-20 13:59:31 +01:00
7c33d932e3
Merge branch 'master' into master
2018-02-20 10:40:04 +01:00
222c7b7d51
Merge pull request #1735 from Rohansi/fix-paint3d-vertexcolor
...
Interpret IndexToDirect as Direct when the index element is missing
2018-02-20 10:39:34 +01:00
d49c5b6ecf
Merge branch 'master' into fix-paint3d-vertexcolor
2018-02-20 09:23:53 +01:00
a84604f566
Merge branch 'master' into develop_kimkulling
2018-02-20 09:04:11 +01:00
f0ccff70a4
Update FileSystemFilter.h
...
Fix review findings
2018-02-20 09:03:18 +01:00
18539ef1ad
Merge pull request #1790 from mabuchner/issue_1773
...
Make FileSystemFilter forward all functions to wrapped IOSystem instances
2018-02-20 08:54:27 +01:00
5f4539db28
Merge branch 'master' into issue_1773
2018-02-19 22:55:11 +01:00
d9af87d52a
Merge pull request #1792 from sacereda/globalscale-registry
...
globalScale process not registered
2018-02-19 22:54:46 +01:00
b9a34dbc50
Merge branch 'master' into globalscale-registry
2018-02-19 20:19:17 +01:00
f78f273916
Merge branch 'master' into issue_1773
2018-02-19 15:54:46 +01:00
385085f3e4
Merge pull request #1797 from assimp/develop_kimkulling
...
Develop kimkulling
2018-02-19 15:53:48 +01:00
1de9b3232a
Silence a clang warning.
2018-02-19 15:04:46 +01:00
95f66f84ef
Remove constexpr for MSVC.
2018-02-19 14:33:40 +01:00
242b5d5874
Initial FBX Export Support, sponsored by MyDidimo (mydidimo.com).
...
Supports:
* mesh data with normals and uvs
* lambert and phong materials
* file textures
* bones / skeletons
* skinning
Does not yet support:
* animations
* cameras
* lights
* embedded textures
2018-02-19 13:53:55 +01:00
219702597f
Merge branch 'master' into develop_kimkulling
2018-02-19 11:47:41 +01:00
24d452e27c
Fix aiBone->mOffsetMatrix documentation, which was incorrect.
...
Also elaborated a bit on what mOffsetMatrix is, and what it is for.
2018-02-19 11:34:26 +01:00
8950504cf0
Fix import of materials.
2018-02-18 21:30:23 +01:00
0c8f574229
Merge pull request #1799 from mesilliac/streamwriter_improvements
...
Some StreamWriter improvements / additions.
2018-02-17 17:26:26 +01:00
58c653c874
Merge branch 'master' into streamwriter_improvements
2018-02-17 16:35:33 +01:00
58436068e7
Update BlenderScene.cpp
2018-02-16 22:16:10 +01:00
9e9c543cca
Merge pull request #1800 from sacereda/pbrmaterial_h
...
define missing type,N params
2018-02-16 16:08:04 +01:00
b9e60e674e
define missing type,N params
2018-02-16 12:23:21 +01:00
c4ff978a2f
Some StreamWriter improvements / additions.
...
Added the following functions:
* Flush() to flush the internal StreamWriter buffer to the stream
* Tell() gives the current stream position
* Seek() seeks to a given offset in the stream
* PutString(aiString&) to write an aiString
* PutString(std::string&) to write a std::string
2018-02-16 12:06:16 +01:00
1b53c26943
Merge branch 'master' into globalscale-registry
2018-02-15 18:04:38 +01:00
a7587cb526
Merge branch 'master' into issue_1773
2018-02-15 15:31:41 +01:00
86645d344f
Merge pull request #1795 from sacereda/pbrmaterial_h
...
idea: #include <assimp/pbrmaterial.h>
2018-02-13 21:02:49 +01:00
b01795e453
Merge branch 'master' into develop_kimkulling
2018-02-13 20:37:02 +01:00
f9b121c415
Merge branch 'develop_kimkulling' of https://github.com/assimp/assimp into develop_kimkulling
2018-02-13 20:36:59 +01:00
ccbcaa2ee8
fix some static-analysis findings.
2018-02-13 20:36:22 +01:00
cdfe33e3f2
Merge branch 'master' into pbrmaterial_h
2018-02-13 19:17:18 +01:00
4fb0e85d9d
Merge branch 'master' into issue_1773
2018-02-13 14:45:14 +01:00
ae88cab2ba
Merge pull request #1789 from mabuchner/issue_1781
...
Make MemoryIOStream::Seek accept pos=length as valid
2018-02-13 14:44:19 +01:00
5ac415ff62
Merge branch 'master' into issue_1781
2018-02-13 13:11:03 +01:00
e1b4ff0d18
Merge pull request #1794 from assimp/develop_kimkulling
...
closes https://github.com/assimp/assimp/issues/1564 : remove copy cons…
2018-02-13 13:09:31 +01:00
11a3ee109e
Update fast_atof.h
...
Remove unused variable.
2018-02-13 11:36:05 +01:00
Kim Kulling
Kim Kulling
Tommy
Giuseppe Barbieri
Sergio Acereda
Martin Buchner