Commit Graph

665 Commits (db3bb229330f34ab31893223741b5da91e1b1702)

Author SHA1 Message Date
escherstair e97d07ce82
add clang to pushpack1.h 2018-11-08 09:25:48 +01:00
d 6d1dee606a integrated DropFaceNormals process (cmake, poststepregistry) 2018-10-29 16:26:50 +01:00
d 95c0deaaff added DropFaceNormals process 2018-10-29 16:23:11 +01:00
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
Kim Kulling 4f7bacd108 Collada: some reformatting + minor findings. 2018-09-11 20:01:16 +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
Kim Kulling 58c653c874
Merge branch 'master' into streamwriter_improvements 2018-02-17 16:35:33 +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 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 5ac415ff62
Merge branch 'master' into issue_1781 2018-02-13 13:11:03 +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 78173177e8 closes https://github.com/assimp/assimp/issues/1564: remove copy constructor. 2018-02-12 21:45:47 +01:00
mbuchner 76b981aa2a Make MemoryIOStream::Seek accept pos=length as valid
Fixes assimp/assimp#1781.
2018-02-12 10:52:49 +01:00
Turo Lamminen 123b9ca71a Initialize all members of aiMeshKey in constructor 2018-02-03 16:54:19 +02:00
Turo Lamminen e21b79a8bf Mark Importer assignment operator deleted 2018-02-03 16:45:07 +02:00
Turo Lamminen b0b125dfe6 Initialize all members of aiVertexWeight in constructor 2018-02-03 16:34:40 +02:00
Turo Lamminen 82980c8a9c Add missing assignment operator to aiBone 2018-02-03 16:24:45 +02:00
Turo Lamminen a64d515505 Fix varible shadowing issue 2018-02-03 16:04:14 +02:00
Turo Lamminen 6aafc58797 Add missing assignment operator to aiString 2018-02-03 15:51:20 +02:00
Tommy 35f2d8c907 Fix Matrix4x4t Decompose to rotation vector.
The calculation of the rotation matrix was for left-handed
coordinates with row-vectors, but assimp uses right-handed
coordinates and column-vectors.
2018-02-01 18:11:14 +01:00
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
Kim Kulling 6cde21bf2f
Merge branch 'master' into doc/find_degenerates_parameters 2018-01-25 20:34:28 +01:00
Daniel Löber cec006f74b Add note to aiProcess_FindDegenerates about AI_CONFIG_PP_FD_CHECKAREA 2018-01-25 14:56:37 +01:00
Kim Kulling 1037ac5b93
Merge branch 'master' into issue_1721 2018-01-24 21:57:53 +01:00
Kim Kulling 0b15d5cd46 closes https://github.com/assimp/assimp/issues/1721: set camera parameters instead of nonsense. 2018-01-24 21:20:34 +01:00
carmenfan 5b948e9cca add const to GetEmbeddedTexture 2018-01-24 11:32:58 +00:00
kim kulling 8ac1de3287 closes https://github.com/assimp/assimp/issues/1390: aiScene now stores metadata as well. 2018-01-23 15:12:57 +01:00
BuildTools f88572f572 fix includes 2018-01-15 19:14:44 -08:00
BuildTools d0c92e30be conflict resolution again, temp. move LogAux.h 2018-01-15 19:07:33 -08:00
Kim Kulling 0fff3b1232
Merge branch 'master' into master 2018-01-08 15:36:03 +01:00
Alexis Breust 559bc38e5d Embedding images post-process 2018-01-08 09:26:52 +01:00
Christian Meurin 5ef13e7b38
Merge branch 'master' into master 2018-01-07 11:34:18 -08:00
Christian Meurin 7b5c543b82
Merge branch 'master' into master 2018-01-06 14:48:23 -08:00
Kim Kulling abc01bcdf0 closes https://github.com/assimp/assimp/issues/1574: add API to get name of current branch. 2018-01-06 21:52:58 +01:00
Kim Kulling 01081765ad closes https://github.com/assimp/assimp/issues/1638: use memcpy instead of dynamic_cast. 2018-01-06 18:03:27 +01:00
BuildTools 66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Kim Kulling bd81869794 Fix some minor findings. 2018-01-01 20:57:59 +01:00
Kim Kulling 2294390917
Merge branch 'master' into iosystem-patch 2017-12-20 09:57:54 +01:00
rickomax 9c9e7a2e82 Fixed char comparision
Fixed char comparision
2017-12-18 19:18:11 -02:00
rickomax 987d315089 Fixed config file
Fixed config file
2017-12-18 18:53:25 -02:00
rickomax 4623c2f14c FBX Embedding Fix
FBX files may use a texture reference from an embedded texture that hasn't been loaded yet. This patch fixes this issue, storing all texture filenames, that can be acessed later via "scene::GetEmbeddedTexture", when all textures are already loaded.
Some warnings have been added to other file formats that uses embedded data.
2017-12-18 18:14:54 -02:00
Kim Kulling 04dc52fcf0
Merge branch 'master' into iosystem-patch 2017-12-18 08:59:14 +01:00
Kim Kulling d081b4ab4e
Merge branch 'master' into fix_clang5_issue 2017-12-17 16:11:44 +01:00
Turo Lamminen 87462165b5 Fix bad pointer arithmetic in aiVector2
Trying to reference 'y' via pointer arithmetic on 'x' is UB
2017-12-16 15:48:01 +02:00
Turo Lamminen 45ad63f373 Remove packed attribute from aiVector2
Returning a reference to a member of packed member is UB
2017-12-16 15:48:01 +02:00
Turo Lamminen 276fc5f466 Remove packed attribute from aiUVTransform
It would cause a warning when removing packed from aiVector2
2017-12-16 15:48:01 +02:00
Kim Kulling bef219a2d9 fix access violation in vector2. 2017-12-14 17:59:23 +01:00