Commit Graph

5982 Commits (c299755721f06d93d6305b6ad10514b362ed1a0c)

Author SHA1 Message Date
Tommy c1f353f6c7 FBX Export: Geometric transformations always create transformation chain.
In combination with fb213e4b, this fixes #1112.
2018-02-21 14:15:03 +01:00
Kim Kulling 50b6c63594
Merge branch 'master' into develop_kimkulling 2018-02-21 13:31:32 +01:00
Kim Kulling 22dbb6c2d2
Update FileSystemFilter.h
- Fix typo.
-test in public metod against invalid parameters
2018-02-21 13:10:51 +01:00
Tommy a8fc22fd3f assimp_cmd: Add --verbose flag to 'info' command, to print node transforms. 2018-02-21 12:57:45 +01:00
Tommy fb213e4bac FBX Importer: apply inverse of geometric transform to child nodes. 2018-02-21 12:45:09 +01:00
Kim Kulling 7cd1a66c8b Use correct lookup. 2018-02-20 22:08:40 +01:00
Kim Kulling 7c2f7c02ab
Merge branch 'master' into moffsetmatrix_documentation 2018-02-20 17:53:22 +01:00
Kim Kulling a92dbabc25
Update FileSystemFilter.h
Fix missing save.
2018-02-20 16:36:55 +01:00
Kim Kulling c97d19fd6f
Merge pull request #1802 from elect86/master
Typos + bug
2018-02-20 13:59:31 +01:00
Kim Kulling 7c33d932e3
Merge branch 'master' into master 2018-02-20 10:40:04 +01:00
Kim Kulling 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
Kim Kulling d49c5b6ecf
Merge branch 'master' into fix-paint3d-vertexcolor 2018-02-20 09:23:53 +01:00
Kim Kulling a84604f566
Merge branch 'master' into develop_kimkulling 2018-02-20 09:04:11 +01:00
Kim Kulling f0ccff70a4
Update FileSystemFilter.h
Fix review findings
2018-02-20 09:03:18 +01:00
Kim Kulling 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
Kim Kulling 5f4539db28
Merge branch 'master' into issue_1773 2018-02-19 22:55:11 +01:00
Kim Kulling d9af87d52a
Merge pull request #1792 from sacereda/globalscale-registry
globalScale process not registered
2018-02-19 22:54:46 +01:00
Kim Kulling b9a34dbc50
Merge branch 'master' into globalscale-registry 2018-02-19 20:19:17 +01:00
Kim Kulling f78f273916
Merge branch 'master' into issue_1773 2018-02-19 15:54:46 +01:00
Kim Kulling 385085f3e4
Merge pull request #1797 from assimp/develop_kimkulling
Develop kimkulling
2018-02-19 15:53:48 +01:00
Tommy 1de9b3232a Silence a clang warning. 2018-02-19 15:04:46 +01:00
Tommy 95f66f84ef Remove constexpr for MSVC. 2018-02-19 14:33:40 +01:00
Tommy 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
Kim Kulling 219702597f
Merge branch 'master' into develop_kimkulling 2018-02-19 11:47:41 +01:00
Tommy 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
Kim Kulling 8950504cf0 Fix import of materials. 2018-02-18 21:30:23 +01:00
Kim Kulling 0c8f574229
Merge pull request #1799 from mesilliac/streamwriter_improvements
Some StreamWriter improvements / additions.
2018-02-17 17:26:26 +01:00
Kim Kulling 58c653c874
Merge branch 'master' into streamwriter_improvements 2018-02-17 16:35:33 +01:00
Giuseppe Barbieri 58436068e7
Update BlenderScene.cpp 2018-02-16 22:16:10 +01:00
Kim Kulling 9e9c543cca
Merge pull request #1800 from sacereda/pbrmaterial_h
define missing type,N params
2018-02-16 16:08:04 +01:00
Sergio Acereda b9e60e674e define missing type,N params 2018-02-16 12:23:21 +01:00
Tommy 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
Kim Kulling 1b53c26943
Merge branch 'master' into globalscale-registry 2018-02-15 18:04:38 +01:00
Martin Buchner a7587cb526
Merge branch 'master' into issue_1773 2018-02-15 15:31:41 +01:00
Kim Kulling 86645d344f
Merge pull request #1795 from sacereda/pbrmaterial_h
idea: #include <assimp/pbrmaterial.h>
2018-02-13 21:02:49 +01:00
Kim Kulling b01795e453 Merge branch 'master' into develop_kimkulling 2018-02-13 20:37:02 +01:00
Kim Kulling f9b121c415 Merge branch 'develop_kimkulling' of https://github.com/assimp/assimp into develop_kimkulling 2018-02-13 20:36:59 +01:00
Kim Kulling ccbcaa2ee8 fix some static-analysis findings. 2018-02-13 20:36:22 +01:00
Kim Kulling cdfe33e3f2
Merge branch 'master' into pbrmaterial_h 2018-02-13 19:17:18 +01:00
Kim Kulling 4fb0e85d9d
Merge branch 'master' into issue_1773 2018-02-13 14:45:14 +01:00
Kim Kulling 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
Kim Kulling 5ac415ff62
Merge branch 'master' into issue_1781 2018-02-13 13:11:03 +01:00
Kim Kulling 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
Kim Kulling 11a3ee109e
Update fast_atof.h
Remove unused variable.
2018-02-13 11:36:05 +01:00
Sergio Acereda 9a7611a93e AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h 2018-02-12 22:33:51 +01:00
Kim Kulling 331e67c32d 3mf: introduce first prototype for basematerial support. 2018-02-12 22:07:12 +01:00
Sergio Acereda 8a4fd2f947 globalScale process not registered 2018-02-12 21:51:40 +01:00
Kim Kulling 78173177e8 closes https://github.com/assimp/assimp/issues/1564: remove copy constructor. 2018-02-12 21:45:47 +01:00
mbuchner 1299905026 Make FileSystemFilter forward all virtual functions to wrapped IOSystem instance
This makes it possible to override those functions. Previously the
default implementation was always used.

Fixes #1773
2018-02-12 12:13:44 +01:00
mbuchner 76b981aa2a Make MemoryIOStream::Seek accept pos=length as valid
Fixes assimp/assimp#1781.
2018-02-12 10:52:49 +01:00