LoicFr
a5791b66fe
Merge branch 'master' into master
2018-05-02 17:47:32 +02:00
Kim Kulling
292e454d86
Merge pull request #1939 from assimp/issue_1934
...
closes code/SortByPTypeProcess.cpp: fix memory leak.
2018-05-02 17:25:04 +02:00
LoicFr
99139e9c9e
Merge branch 'master' into master
2018-05-02 17:11:54 +02:00
kimkulling
a0bf664695
closes code/SortByPTypeProcess.cpp: fix memory leak.
2018-05-02 16:42:22 +02:00
Kim Kulling
6ef9e8848d
Merge pull request #1922 from kwuerl/issue-1167
...
Fix ply exporter to be conformant to spec respecting vertex colors.
2018-05-02 16:33:43 +02:00
Loïc Fricoteaux
ed86023016
Change glTF2 file extensions from gltf2/glb2 to gltf/glb in the exporter so that it matches the importer and respect the standard specifications
2018-05-02 16:13:17 +02:00
Kim Kulling
2acb513732
Merge branch 'master' into issue-1167
2018-05-02 15:45:52 +02:00
Kim Kulling
18ad80fd20
Merge pull request #1929 from Trylz/fix_fbx_empty_names
...
Fix empty fbx mesh names
2018-05-02 15:44:00 +02:00
Kim Kulling
7bb2d6271b
Merge branch 'master' into fix_fbx_empty_names
2018-05-02 14:57:08 +02:00
Kim Kulling
9385f83ea3
Merge pull request #1931 from kwuerl/issue-1923
...
Fix Issue #1923 : OBJ Exporter can't correctly export vertex colors
2018-05-02 14:45:04 +02:00
Kim Kulling
5c5226a98c
Merge branch 'master' into issue-1923
2018-05-01 21:10:52 +02:00
Kim Kulling
66f77e93ba
Merge pull request #1935 from assimp/issue_842
...
Issue 842: Solving for ascii stl point cloud export
2018-05-01 17:11:33 +02:00
Kim Kulling
1679c8b08e
STL: reenable unittest.
2018-05-01 16:03:56 +02:00
Kim Kulling
037a213bb4
STL-Exporter: fix division by zero in normalize method during update
2018-05-01 15:06:56 +02:00
Kim Kulling
eced86b949
some refactorings.
2018-05-01 13:41:39 +02:00
Kim Kulling
2c47717ca6
Introduce export with test for point clouds.
2018-05-01 13:28:53 +02:00
Korbinian Würl
2247513064
Fix for TravisCI
2018-05-01 11:23:38 +02:00
Kim Kulling
9f835ea843
closes https://github.com/assimp/assimp/issues/842 : experimental suppor for ascii stl pointcloud export.
2018-05-01 09:06:22 +02:00
Korbinian Würl
4b7b692e5e
Fix Issue #1923 : OBJ Exporter can't correctly export vertex colors
...
The indexMap for vertices now uses a combined vp + vc index
2018-04-30 16:29:22 +02:00
Korbinian Würl
9cfdb8d365
Fixed test .obj file: OBJ Vertex Colors are expected to be floats 0-1
...
See https://github.com/cnr-isti-vclab/vcglib/blob/master/wrap/io_trimesh/import_obj.h#L326
2018-04-30 16:29:10 +02:00
Korbinian Würl
9e484daa65
Unit test for Issue #1923 : OBJ Exporter can't correctly export vertex colors
2018-04-30 16:29:02 +02:00
Trylz
6fb9ebe3c8
Apply fix
2018-04-28 23:34:07 -04:00
Korbinian Würl
1533aec21c
Fix ply exporter to be conformant to spec respecting vertex colors.
...
Vertex colors should be defined as red, green, blue, alpha instead of r, g, b, a and should have the type 'uchar' instead of 'float'
2018-04-27 22:11:36 +02:00
Kim Kulling
410e9d4b3f
Merge pull request #1918 from assimp/use_log_macros
...
Use log macros
2018-04-26 22:47:24 +02:00
Kim Kulling
e2d0c07791
Merge branch 'master' into use_log_macros
2018-04-26 22:02:18 +02:00
Kim Kulling
b877b3e10e
use correct log macro.
2018-04-26 22:01:41 +02:00
kimkulling
6a311210e7
fix another bug of misusage of the log macros.
2018-04-26 17:01:22 +02:00
kimkulling
8626b185fb
Fix misused log macros + compiler warnings.
2018-04-26 16:38:42 +02:00
kimkulling
c299755721
DXF: fix macro issues.
2018-04-26 16:13:57 +02:00
kimkulling
a5e14db19b
fix invaid macro usage.
2018-04-26 15:41:31 +02:00
kimkulling
68288782e4
Merge branch 'use_log_macros' of https://github.com/assimp/assimp into use_log_macros
2018-04-26 15:18:24 +02:00
Kim Kulling
3d589d8fc8
Merge pull request #1917 from wuxq/fix_gltf2_export_componentType_error
...
Fix gltf2 export component type error
2018-04-26 15:06:16 +02:00
kimkulling
75c7b15b55
Fix c++11 usage.
2018-04-26 15:05:49 +02:00
kimkulling
3d79472172
fix the build.
2018-04-26 14:36:59 +02:00
Kim Kulling
dd7d0943f6
Update glTF2Asset.inl
...
Move creation of vars to avoid useless creation in case of an error.
2018-04-26 14:24:00 +02:00
Kim Kulling
8f26b9d840
Merge branch 'master' into use_log_macros
2018-04-26 14:13:04 +02:00
kimkulling
30c20eb5fc
INtroduce new log macros.
2018-04-26 14:10:18 +02:00
Kim Kulling
972fffe70b
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-04-26 13:40:49 +02:00
Kim Kulling
90b4b6a18d
Merge pull request #1916 from LoicFr/master
...
Add vertex color support to glTF2 export
2018-04-26 13:37:30 +02:00
wuxiaoqian
f6af6ded1f
fixed the bug of export gltf2, the JOINTS_0 componentType is Incorrect
2018-04-26 11:03:50 +08:00
wuxiaoqian
6b4caa0f12
fix export gltf2, The JOINTS_0 componentType is incorrect
2018-04-26 10:56:56 +08:00
Kim Kulling
1755dd325c
Merge branch 'master' into master
2018-04-25 21:27:28 +02:00
Kim Kulling
f7be098bb2
Merge pull request #1915 from nuclearsandwich/use-install-prefix-as-root-dir
...
Use CMAKE_INSTALL_PREFIX as ASSIMP_ROOT_DIR.
2018-04-25 21:27:02 +02:00
Loïc Fricoteaux
a8077baed5
Add vertex color support to glTF2 export
2018-04-25 11:37:56 +02:00
Kim Kulling
4ee34fbce6
Merge branch 'master' into use-install-prefix-as-root-dir
2018-04-24 20:29:02 +02:00
Kim Kulling
a54d114245
Merge pull request #1913 from Binero/patch-1
...
Changed 'souces' to 'sources'.
2018-04-24 20:13:35 +02:00
Steven! Ragnarök
0fdb79871f
Use CMAKE_INSTALL_PREFIX as ASSIMP_ROOT_DIR.
...
Since the ASSIMP_LIB_INSTALL_DIR where this CMake config file is
installed to may contain multiple nested directories, we should not use
it to back-calculate the location of the ASSIMP_ROOT_DIR unless we can
take the directory depth into account. Instead use the
CMAKE_INSTALL_PREFIX as the ASSIMP_ROOT_DIR at configure-time.
This approach is more flexible with respect to install directories but
it means that assimp files are not relocatable after installation and I
don't think it works if a DESTDIR option is provided when running `make
install` after cmake configuration.
2018-04-24 10:12:30 -07:00
Jeroen Bollen
2d6782cc9f
Changed 'souces' to 'sources'.
...
There was a typo in the `CMakeLists.txt` where if zlib was not found, it would say "Compiling from souces" instead of "Compiling from sources". Added a 'r' to fix the typo.
2018-04-24 16:44:22 +02:00
Kim Kulling
620182770d
Merge pull request #1910 from sacereda/master
...
ImproveCacheLocality crashes if non triangular faces
2018-04-24 14:53:24 +02:00
Sergio Acereda
43dedb6e09
unit test: missing mNumIndices
2018-04-23 12:23:12 +02:00