5a5db25df6
Fix AssimpView build
...
- Use std::min/max instead of min/max macro in windef.h
- Use mmsytem.h instead of timeapi.h with MinGW
2018-05-08 00:28:53 +02:00
cce5647338
Merge pull request #1938 from LoicFr/master
...
Change glTF2 file extensions from gltf2/glb2 to gltf/glb in the expor…
2018-05-06 19:38:37 +02:00
be0203229b
Merge branch 'master' into master
2018-05-06 16:41:12 +02:00
dd2b71dab5
Merge pull request #1943 from Z-EMB/master
...
1740 Issue - Enabling and Disabling importers
2018-05-06 16:38:21 +02:00
36c6ce7431
Merge branch 'master' into master
2018-05-06 12:29:21 +02:00
12f22142db
Merge pull request #1921 from Nimer-88/fix/blendshapes_join_identical_vertices_optimization_flag_v2
...
Fix for blendshapes import when using the JoinIdenticalVertices optimization flag
2018-05-06 10:03:19 +02:00
908ef3e44a
1740 Issue - Enabling and Disabling importers
...
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT will be respected by the macro
--using local variable ASSIMP_IMPORTER_ENABLED to include or exclude
--an importer
-Fixes individual importer ex: set(ASSIMP_BUILD_FBX_IMPORTER OFF)
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT is cached
--if assimp is a child cmake project, need to force cache
--from parent project
--ex: set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT CACHE INTERNAL FALSE)
2018-05-05 16:57:59 -04:00
b759aa63a0
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-05-03 20:33:50 +02:00
5eb7928ce8
Merge pull request #1940 from wanadev/gltf2-mesh-names
...
[glTF2] Added name to nodes
2018-05-03 20:32:45 +02:00
4aaf7ad547
Added name to nodes
2018-05-03 11:07:39 +02:00
a5791b66fe
Merge branch 'master' into master
2018-05-02 17:47:32 +02:00
292e454d86
Merge pull request #1939 from assimp/issue_1934
...
closes code/SortByPTypeProcess.cpp: fix memory leak.
2018-05-02 17:25:04 +02:00
99139e9c9e
Merge branch 'master' into master
2018-05-02 17:11:54 +02:00
a0bf664695
closes code/SortByPTypeProcess.cpp: fix memory leak.
2018-05-02 16:42:22 +02:00
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
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
2acb513732
Merge branch 'master' into issue-1167
2018-05-02 15:45:52 +02:00
18ad80fd20
Merge pull request #1929 from Trylz/fix_fbx_empty_names
...
Fix empty fbx mesh names
2018-05-02 15:44:00 +02:00
7bb2d6271b
Merge branch 'master' into fix_fbx_empty_names
2018-05-02 14:57:08 +02:00
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
5c5226a98c
Merge branch 'master' into issue-1923
2018-05-01 21:10:52 +02:00
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
1679c8b08e
STL: reenable unittest.
2018-05-01 16:03:56 +02:00
037a213bb4
STL-Exporter: fix division by zero in normalize method during update
2018-05-01 15:06:56 +02:00
eced86b949
some refactorings.
2018-05-01 13:41:39 +02:00
2c47717ca6
Introduce export with test for point clouds.
2018-05-01 13:28:53 +02:00
2247513064
Fix for TravisCI
2018-05-01 11:23:38 +02:00
9f835ea843
closes https://github.com/assimp/assimp/issues/842 : experimental suppor for ascii stl pointcloud export.
2018-05-01 09:06:22 +02:00
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
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
9e484daa65
Unit test for Issue #1923 : OBJ Exporter can't correctly export vertex colors
2018-04-30 16:29:02 +02:00
6fb9ebe3c8
Apply fix
2018-04-28 23:34:07 -04:00
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
af8f9a97a9
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-04-27 12:45:47 +01:00
1f9d6f1ec4
Fix for blendshapes import when using the JoinIdenticalVertices optimization flag
2018-04-27 11:52:31 +01:00
410e9d4b3f
Merge pull request #1918 from assimp/use_log_macros
...
Use log macros
2018-04-26 22:47:24 +02:00
e2d0c07791
Merge branch 'master' into use_log_macros
2018-04-26 22:02:18 +02:00
b877b3e10e
use correct log macro.
2018-04-26 22:01:41 +02:00
6a311210e7
fix another bug of misusage of the log macros.
2018-04-26 17:01:22 +02:00
8626b185fb
Fix misused log macros + compiler warnings.
2018-04-26 16:38:42 +02:00
c299755721
DXF: fix macro issues.
2018-04-26 16:13:57 +02:00
a5e14db19b
fix invaid macro usage.
2018-04-26 15:41:31 +02:00
68288782e4
Merge branch 'use_log_macros' of https://github.com/assimp/assimp into use_log_macros
2018-04-26 15:18:24 +02:00
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
75c7b15b55
Fix c++11 usage.
2018-04-26 15:05:49 +02:00
3d79472172
fix the build.
2018-04-26 14:36:59 +02:00
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
8f26b9d840
Merge branch 'master' into use_log_macros
2018-04-26 14:13:04 +02:00
30c20eb5fc
INtroduce new log macros.
2018-04-26 14:10:18 +02:00
972fffe70b
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-04-26 13:40:49 +02:00
Jean-Louis
Kim Kulling
Eugene Barnett
Alexis Breust
LoicFr
kimkulling
Loïc Fricoteaux
Korbinian Würl
Trylz
Sebastian Matusik