v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,522 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

398 Commits (c3e6a01397ad3fee54d4a9b7aa0d256429db60f8)

Author SHA1 Message Date
Matthias Moulin 716205fde0
Replaced "../Include/" include from irrXMLWrapper.h 2018-10-06 15:22:10 +02:00
Kim Kulling abfc8fd048
Update texture.h 
Fix array init for older compilers.
 2018-09-21 18:51:45 +02:00
Kim Kulling 662f7086e3
Update types.h 
Fix VS2013: array initialization does not work.
 2018-09-21 18:46:30 +02:00
kimkulling f75bf6d99c MAke noexcept compiler-specific. 2018-09-21 16:25:27 +02:00
kimkulling f818a909e5 Fix static-code-analysis findings. 2018-09-21 16:07:09 +02:00
Kim Kulling 6ee9b07c49 closes https://github.com/assimp/assimp/issues/212: introduce unittest for line-splitter, will validate that the current behaviour is correct. 2018-09-16 17:13:34 +02:00
Turo Lamminen c3d8464a37 Remove aiCreateAndRegisterDefaultMaterial, it's completely wrong 2018-09-10 16:41:12 +03:00
Kim Kulling c3d043e761 FBX: some refactorings. 2018-08-09 21:51:53 +02:00
kimkulling 9a6b07e522 closes https://github.com/assimp/assimp/issues/1724: add default material access to the material API. 2018-07-25 15:11:24 +02:00
Max Vollmer 52c017b595 Added check to BaseImporter::SearchFileHeaderForToken making sure that a detected token is not in fact just a fraction of a longer token. Microsoft exported binary gltf files were detected as OBJ, because the "gltf " in the string "Microsoft GLTF Exporter 2.4.1.7" was detected as the token "f ". I added a new bool parameter to the method enabling this check. It's default false, and only ObjFileImporter sets it to true, so no other code should be affected. 2018-06-25 12:05:37 +02:00
Sebastian Maisch fbdb4b17fd Merge branch 'force_generate_normals' 
# solved Conflicts:
#	code/GenFaceNormalsProcess.cpp
#	code/GenVertexNormalsProcess.cpp
 2018-06-04 10:51:12 +02:00
Sebastian Maisch f15dcf7663 Added forced generation of normals with extra flag. 2018-06-01 17:32:02 +02:00
Turo Lamminen 6aa32b41a1 Replace type punning with explicit memcpys 2018-06-01 12:05:54 +03:00
Stanlo Slasinski a1a17c1dda Read and write the KHR_materials_unlit glTF/2.0 extension. 2018-05-18 14:52:02 -07:00
Kim Kulling 8d42b31e20
Update metadata.h 
Replace type pronning by a simple memcpy operation.
 2018-05-08 09:46:32 +02:00
Kim Kulling 948cf4d3cc
Merge branch 'master' into master 2018-05-07 21:32:13 +02:00
Nicholas Woodfield 458a7ae801 Silencing compile warnings during build, all little stuff like uint to size_t or BOOL to bool. 2018-05-03 15:03:14 -04:00
Kim Kulling b759aa63a0
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2 2018-05-03 20:33:50 +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 9f835ea843 closes https://github.com/assimp/assimp/issues/842: experimental suppor for ascii stl pointcloud export. 2018-05-01 09:06:22 +02:00
Sebastian Matusik af8f9a97a9
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2 2018-04-27 12:45:47 +01:00
Sebastian Matusik 1f9d6f1ec4 Fix for blendshapes import when using the JoinIdenticalVertices optimization flag 2018-04-27 11:52:31 +01:00
kimkulling 30c20eb5fc INtroduce new log macros. 2018-04-26 14:10:18 +02:00
kimkulling 0e15b25cd1 Next log call changes. 2018-04-20 16:23:24 +02:00
kimkulling b6f29bf54f Add usage of log macros, next files. 2018-04-19 17:21:21 +02:00
kimkulling 066349f36b Add usage of log macros. 2018-04-19 16:48:43 +02:00
kimkulling e57394a772 move log tools from blender to logger interface. 2018-04-12 16:09:01 +02:00
Kim Kulling 3bd80a2537 closes https://github.com/assimp/assimp/issues/1881: make template-based get and put in streamreader/writer public. 2018-04-06 12:05:30 +02:00
Kim Kulling d17047cfd1
Merge branch 'master' into fbx_export_ascii 2018-04-01 17:00:42 +02:00
Kim Kulling 4919d3da2f closes https://github.com/assimp/assimp/issues/1836: make documentation much more clear how to apply global scaling. 2018-03-30 16:58:11 +02:00
Tommy e549705af0 StreamWriter: add a PutChar method to write a single char. 2018-03-28 21:38:22 +02:00
Kim Kulling 13ae0a0ac3 FBX: fix parse error for uv-coordinates. 2018-03-22 22:14:10 +01:00
Kim Kulling e01e77a6c7
Merge branch 'master' into develop_kimkulling 2018-03-21 21:20:28 +01:00
Kim Kulling af3bba1572 fix review findings. 2018-03-20 23:38:08 +01:00
Kim Kulling f898f40486
Merge branch 'master' into master 2018-03-20 20:33:17 +01:00
Kim Kulling 5814e6f9f0 Optimize some std::string usages. 2018-03-20 18:43:54 +01:00
Kim Kulling 317f3e2a59 3MF: Export metadata. 2018-03-20 14:10:08 +01:00
Marco Di Benedetto 9d813a48b0 fixed emply buffer stream write, removed some cast warnings. 2018-03-19 18:22:27 +01:00
Kim Kulling a3ad45f3b3
Merge branch 'master' into 3mf_basematerial_support 2018-03-11 20:16:40 +01:00
Kim Kulling c8ae0bbb3d 3MF: fix model folder desc. 2018-03-11 20:15:49 +01:00
Kim Kulling 6668eeb68e Fix possible nullptr dereferencing. 2018-03-09 19:03:05 +01:00
Daniel Kirchner f4c37fa245 Collada: add importer property that forces the use of collada names. Closes #1375. 2018-03-06 00:30:33 +01:00
Kim Kulling bdb3a73486
Merge branch 'master' into moffsetmatrix_documentation 2018-02-23 21:13:35 +01:00
Kim Kulling d00c4a54e6
Update fast_atof.h 
fix typo
 2018-02-23 18:59:38 +01:00
Kim Kulling 437ae0c839
Merge branch 'master' into 3mf_basematerial_support 2018-02-23 18:29:54 +01:00
Kim Kulling 9c663e9630 fast_a_to_f: add some brackets. 2018-02-23 18:14:46 +01:00
Kim Kulling 1d901f075c 3mf-importer: fix parsing of base-material color. 2018-02-23 17:49:29 +01:00
Kim Kulling 7c2f7c02ab
Merge branch 'master' into moffsetmatrix_documentation 2018-02-20 17:53:22 +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