Kim Kulling
81f8ebf2d4
Merge branch 'master' into kimkulling-2449
2019-05-16 17:04:09 +02:00
Kim Kulling
7cd021e704
Merge branch 'master' into pdb-install-fix
2019-05-16 14:49:29 +02:00
Mike Samsonov
6c13ec8190
fix for clang runtime checks for overflow
2019-05-16 11:59:23 +01:00
Mike Samsonov
c84ac7a135
Fragmented FBX ASCII emdedded resource
2019-05-16 11:59:23 +01:00
Mike Samsonov
13bba4fb4c
even more efficient
2019-05-16 11:58:48 +01:00
Mike Samsonov
b957d44943
Node names optimization and fixing non-unique name
2019-05-16 11:58:48 +01:00
Mike Samsonov
c58ed8da22
Support for FBX file sizes more than 4GB
2019-05-16 11:58:26 +01:00
Mike Samsonov
4e03a2c00d
Exception spam fix for FBXMaterial
2019-05-16 11:58:07 +01:00
Mike Samsonov
5bca43be74
Degenerate triangles with small area removing fix
2019-05-16 11:57:46 +01:00
Kim Kulling
77281b75b2
Merge branch 'master' into master
2019-05-16 11:13:48 +02:00
Kim Kulling
785ceaf58a
Merge branch 'master' into windows-external-zlib-fix
2019-05-14 22:07:56 +02:00
Kim Kulling
747a7c963b
Merge branch 'master' into assimpview_unicode
2019-05-13 23:49:06 +02:00
Kim Kulling
815730c92d
Update CMakeLists.txt
...
closes https://github.com/assimp/assimp/issues/2449 : fix uwp handling
2019-05-13 21:49:50 +02:00
Kim Kulling
adbdbf2be6
closes https://github.com/assimp/assimp/issues/2459 : fix duplicated fbx-type propertry.
2019-05-13 21:41:37 +02:00
Jack Andersen
461e21f66d
Fix Windows build with external zlib
...
assimp.rc contains an include with a double-parent header search.
In a default build configuration, this is resolved via the
configuration header path generated for in-tree zlib.
When external zlib is used, this header search path is not provided
to the RC compiler, therefore fails to find revision.h.
This is solved by simply including "revision.h" since the root of
the binary directory is already used as a search path.
2019-05-12 10:56:59 -10:00
Jack Andersen
cb0c47764a
Set directory and name properties for installing static lib PDB
2019-05-11 12:11:52 -10:00
Kim Kulling
4f7de109a1
Merge branch 'master' into assimpview_unicode
2019-05-10 18:52:32 +02:00
Kim Kulling
741be6f9db
Merge branch 'master' into fbxexport_crashfix
2019-05-10 15:32:18 +02:00
Kim Kulling
700954c115
Update FBXExporter.cpp
...
Just fixed some typos.
2019-05-10 09:09:47 +02:00
Matias
a443544986
Replaced binary literals with hex literals (since binary literals was introduced in C++14)
2019-05-09 15:28:00 +02:00
Matias
9903504c42
Removed some code that I didn't mean to fix (I already submitted this in another PR: https://github.com/assimp/assimp/pull/2450 ).
2019-05-09 14:57:18 +02:00
Matias
575ef4d927
Added support for embedded textures to the FBXExporter (both binary and ASCII). Also made the FBX-namespaces more consistent (we had both Assimp::FBX:: and FBX::). Since we seem to support two types of embedded texture references (both asterisk+texture_id and filepath) I made the exporter use aiScene::GetEmbeddedTexture for looking up texture reference and integrated @loebl 's modification of the function to support the old ("*1") type of references ( https://github.com/loebl/assimp/commit/e217358 )
2019-05-09 14:50:22 +02:00
Matias
6736f3d24b
Don't call PutString with an empty string. Both DumpChildrenAscii and EndAscii can return without modifyting the string, so we need to check the string before calling PutString. This used to cause a crash.
2019-05-09 11:19:05 +02:00
Kim Kulling
56b82e9cd5
Merge branch 'master' into gltf2-import-animation-name
2019-05-07 21:43:29 +02:00
Kim Kulling
e1a0861556
Merge branch 'fbx_convert_to_unit' of https://github.com/assimp/assimp into fbx_convert_to_unit
2019-05-07 20:33:42 +02:00
Kim Kulling
390452bd06
Fix the build.
2019-05-07 20:32:45 +02:00
Kim Kulling
66a840d9e6
Merge branch 'master' into fbx_convert_to_unit
2019-05-07 15:26:52 +02:00
Kim Kulling
22b01ca3e8
Merge branch 'master' into master
2019-05-07 09:55:43 +02:00
Kim Kulling
e917b288a1
fix a typo.
2019-05-06 21:38:45 +02:00
Kim Kulling
4155f005be
Add implementation to convert from cm to m.
2019-05-06 21:21:58 +02:00
Kim Kulling
4a9cd08451
Prepaation for conversion.
2019-05-06 20:51:04 +02:00
Kim Kulling
df2a279895
Merge branch 'master' into issue_2054
2019-05-05 16:28:39 +02:00
Kim Kulling
9147fb8689
Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054
2019-05-05 16:24:05 +02:00
Kim Kulling
1324409c7b
fix build: fix wrong function prototype.
2019-05-05 16:23:42 +02:00
Kim Kulling
8c18c42afb
Merge branch 'master' into issue_2054
2019-05-05 16:16:45 +02:00
Kim Kulling
69ece762d1
fix the build: remove errorenous pragma statement.
2019-05-05 16:00:57 +02:00
Kim Kulling
fcff12b219
closes https://github.com/assimp/assimp/issues/2054 : make empty bone validation optional.
2019-05-05 13:39:10 +02:00
Kim Kulling
9b9f7b2876
Merge branch 'master' into bad-obj-file
2019-05-04 21:17:15 +02:00
Hugo Pereira
34ede5608b
Merge branch 'master' into fix_assimp_export_consistency
2019-05-03 11:12:56 +01:00
Kim Kulling
6d5f8cbe26
Merge branch 'master' into obj_nan
2019-05-02 01:36:45 +02:00
Kim Kulling
e108b6f1d2
Merge branch 'master' into fix-mingw-debug-build
2019-05-01 17:04:45 +02:00
b1skit
243b2618a9
Updated the FBXConverter to correctly set the material shading mode when a Phong shader is detected
2019-04-27 17:37:23 -07:00
b1skit
bc4e411284
Updated the FBXConverter to correctly set the material shading mode when a Phong shader is detected
2019-04-27 17:20:27 -07:00
Vitaly Ovchinnikov
42202c2204
a test for bad OBJ file format and code fix that handles it
2019-04-26 22:13:29 +12:00
Martin Vorbrodt
e83671f494
Generate attenuation constants if non are privded in the Blender file. Using: https://imdoingitwrong.wordpress.com/2011/01/31/light-attenuation/
2019-04-24 18:35:14 -04:00
Heorhii Shakula
0b42d55f73
Fix inconsistency between animation and node name in glTF2 Importer
2019-04-24 16:58:35 +03:00
Kim Kulling
48e5b948e3
Update ColladaExporter.cpp
...
Some reformattings
2019-04-24 09:03:59 +02:00
Hugo Pereira
5713be615c
[FBX export] fixed ordering of skin indices and weights, to be consistent between systems
2019-04-18 16:55:54 +01:00
RichardTea
c34327b355
use std::isfinite()
...
GCC is more standards compliant than MSVC
2019-04-17 14:30:40 +01:00
RichardTea
e8bcf162dd
OBJ coerce invalid nan or inf texture coords to 0
...
Some exporters (eg Vectorworks 2019) may export texture coordinate components as "nan".
While this is invalid, it's better to coerce these values to 0 rather than reject the entire file.
2019-04-17 13:55:08 +01:00
RichardTea
51be6236a7
Merge branch 'master' into assimpview_unicode
2019-04-17 12:10:14 +01:00
RichardTea
7b6cb57e3b
Merge branch 'collada_metadata'
2019-04-17 12:07:48 +01:00
RichardTea
00f1fd6f7c
Merge branch 'master' into assimpview_unicode
2019-04-17 10:48:37 +01:00
RichardTea
0b9da72ed8
Merge pull request #5 from assimp/master
...
Rollup FBX material fixes from upstream
2019-04-17 09:44:10 +01:00
RichardTea
836801d37e
CMake updates for VS2015/cmake 3.12 onwards
...
cmake 3.12 adds MSVC_TOOLSET_VERSION to define the version of MSVC toolchain in use
Use that if present instead of if-elseif chain
2019-04-17 09:32:24 +01:00
Kim Kulling
685a56266b
Merge branch 'master' into fix-fbx-face-material
2019-04-15 09:55:38 +02:00
Merwan Achibet
c92ae50e4f
Fix FBX face materials not being properly loaded if the face count mismatches the material count
2019-04-10 19:16:42 +02:00
Charlie Gettys
f7384dec95
Possible fix for #2406 . Shouldn't affect other compiled files, but have
...
not verified this. Also, if anyone tries to debug StepFileGen1.cpp on MinGW,
the debug info may not be there, but I think this is the best we can do.
2019-04-10 09:45:31 -04:00
Charlie Gettys
9aae110161
* Remove old non-maintained mingw makefile to prevent confusion
...
* Add notes on building with MinGW to Build.md
2019-04-10 09:29:21 -04:00
RichardTea
1f55bdd9a7
Save/Load Collada 1.4 Root Asset Metadata
...
Add Collada 1.4 <asset/> metadata to export and import.
Can store in the Scene or the Root Node for export, will be loaded into the Scene during Import
2019-04-09 16:28:15 +01:00
RichardTea
49459435df
Merge branch 'master' into collada_metadata
2019-04-09 12:38:29 +01:00
RichardTea
e3a397a98d
Merge pull request #3 from assimp/master
...
fast forward to master
2019-04-08 17:57:09 +01:00
RichardTea
d66166675a
first pass at collada metadata
2019-04-08 17:11:50 +01:00
kimkulling
cbd8b032e7
FBX: add test case
2019-04-08 17:37:40 +02:00
RichardTea
2a3626577f
Merge pull request #2 from assimp/master
...
Update to Assimp Master 0973f50
2019-04-08 14:06:36 +01:00
Kim Kulling
6dec1346ed
Merge branch 'master' into issue_1957
2019-04-08 14:27:32 +02:00
Kim Kulling
f7d226768c
Merge branch 'master' into issue_1650
2019-04-08 13:06:30 +02:00
Matias Lavik
ddfc140fc3
Added <stdint.h>-include
2019-04-07 00:02:22 +02:00
Matias Lavik
fac392d6cb
Added missing include and fixed a mistake
2019-04-06 23:44:14 +02:00
Matias Lavik
015e960d0e
Merge branch 'master' into issue_1957
2019-04-06 22:22:05 +02:00
Matias Lavik
b3177a2a9a
issue 1957: Added support for reading embedded content (textures) in ASCII FBX. In ASCII FBX embedded content is encoded in Base64 and is surrounded by double quotation marks. The decoding functions are based on those used in the glTF importer.
2019-04-06 19:31:56 +02:00
Kim Kulling
c321fb6a44
Update FBXConverter.cpp
...
FBX: Add missind initializers.
2019-04-06 08:59:30 +02:00
Matias Lavik
d0ad03d653
Merge branch 'master' into issue_2390
2019-04-05 13:16:29 +02:00
Matias Lavik
898e59d8ee
Merge branch 'master' into issue_2043
2019-04-04 16:36:44 +02:00
Matias
20acce1c5e
Suggested fix for issue : If available, use "Scaling" and "Translation" instead of "ModelUVScaling" and "ModelUVTranslation". This seems to be what 3DS Max and FBX SDK use.
2019-04-04 16:31:34 +02:00
Matias Lavik
3abb494dd6
Merge branch 'master' into issue_2390
2019-04-04 13:08:27 +02:00
Kim Kulling
010afeb1d8
Merge branch 'master' into issue_1650
2019-04-04 12:42:21 +02:00
Matias Lavik
e63b9d4cd8
Merge branch 'master' into issue_2390
2019-04-03 21:17:38 +02:00
Matias Lavik
6d1514dd10
replaced "typedef" with "using" (I didn't notice Kim Kulling's previous commit until now)
2019-04-03 20:19:44 +02:00
Kim Kulling
f10e759db6
Merge branch 'issue_2398' of https://github.com/assimp/assimp into issue_2398
2019-04-03 20:16:24 +02:00
Kim Kulling
42608c0260
Fix small review findings.
2019-04-03 20:15:55 +02:00
Kim Kulling
287924a7d6
Merge branch 'master' into issue_2398
2019-04-03 20:03:07 +02:00
Matias Lavik
0251633ea2
Merge branch 'master' into issue_2393
2019-04-03 12:46:11 +02:00
Matias
4884cf2172
issue_2393: Added TransparencyFactor material key
2019-04-03 12:35:09 +02:00
Matias Lavik
fa37018e08
Merge branch 'master' into issue_2390
2019-04-03 12:26:06 +02:00
Matias
0505dd7266
issue 2390: FBXConverter::GetUniqueName now uses a map for keeping track of duplicate node name count and a set for registering names that have been taken.This is required because the model might contain a several nodes called "nodename" and another one called "nodename001". In that case we can't add "001" to the second node called "nodename".
2019-04-03 12:19:23 +02:00
Kim Kulling
930af2da44
closes https://github.com/assimp/assimp/issues/2398 : fix the build.
2019-04-02 20:43:03 +02:00
Charlie Gettys
9d5a71e4af
Merge branch 'master' into fix-more-lgtm-alerts
2019-04-01 11:23:33 -04:00
Charlie Gettys
f15f37634d
BlenderDNA.h:
...
* Fix rethrow that would crash the program.
* QUESTION: am I throwing the right exception here.
COBLoader:
* catch exception by const ref
* fix equality checks using strncmp taht weren't actually checking equality
FBXMaterial: Catch exception by const ref (+ Debug log that it's done so)
FBXConverter: Rename local variables to avoid shadowing parameter
ImageExtractor: Remove duplicated/unreachable code
FBXConverter: Another shadowed variable fix
MD5Loader: 2 shadowed variables
IRRLoader: shadowed parameter
StepFileReader.cpp: Shadowed parameter
IRRLoader: remove empty else statement
STLExporter: Throw error instead of silently ignoring unimplemented option
Misc empty blocks removed or debug logging added
2019-03-30 16:08:25 -04:00
Kim Kulling
89b3de9473
Update FBXConverter.h
...
Introduce using instead of typedef.
2019-03-29 16:24:45 +01:00
Marco Di Benedetto
d314afaebc
added casts for rapidjson in gltf asset writer.
2019-03-29 12:19:39 +01:00
Marco Di Benedetto
faf12c6f5f
Merge https://github.com/assimp/assimp
2019-03-29 11:55:21 +01:00
Kim Kulling
d129259ae4
Merge branch 'master' into issue_2390
2019-03-29 10:51:35 +01:00
Charlie Gettys
4efa3736ba
Actually fix cmake this time
2019-03-27 12:03:39 -04:00
Charlie Gettys
d718793163
Fix change to CMakeLists.txt
...
change CMakeLists.txt to use add_definitions instead of add_compile_definitions on old versions of cmake
2019-03-27 11:43:21 -04:00
Charlie Gettys
769dd42b73
Add compile definition to fix issue
...
defines MINIZ_USE_UNALIGNED_LOADS_AND_STORES to be 0 to override default of 1 for x86 platforms.
2019-03-27 11:29:40 -04:00
Matias
ca08c4a209
FBX: Fix for loading taking a very long time on models with many duplicate names (issue_2390)
2019-03-27 11:20:16 +01:00
Kim Kulling
22f4667932
Merge branch 'master' into select_exporters
2019-03-17 23:44:35 +01:00
Kim Kulling
718b5b266b
Merge branch 'master' into fix_vs107_warnings
2019-03-16 18:41:54 +01:00
Andy Maloney
df6d257633
Fix 3MF importer
2019-03-16 11:55:16 -04:00
Andy Maloney
5ccd7d8c39
Adds a way to select which exporters you want to compile
...
Mimics the ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT / ASSIMP_BUILD_XXX_IMPORTER code but for exporters.
This works exactly the same way with one exception - ASSIMP_NO_EXPORT still overrides everything and turns off all exporting.
Fixes #2377
2019-03-16 11:40:17 -04:00
Kim Kulling
581d06a7b7
Merge branch 'master' into issue_1650
2019-03-16 16:22:47 +01:00
Kim Kulling
64bcf56101
Merge branch 'master' into issue_1650
2019-03-16 16:13:52 +01:00
Kim Kulling
a0c797a29e
Merge branch 'master' into fix_vs107_warnings
2019-03-16 16:09:14 +01:00
Kim Kulling
64a7a46406
Update MD3Loader.cpp
...
Fix typo.
2019-03-16 16:08:03 +01:00
Kim Kulling
ba6a7383b2
closes https://github.com/assimp/assimp/issues/1650 : build irrXml as shared lib.
2019-03-16 09:45:21 +01:00
Tomas Maly
9a533d826a
fix loading 3D uvs from obj
2019-03-15 22:43:12 +01:00
Rich ard
07bbb2c000
Nicer name for Assimp Binary importer
...
.assbin is not a nice name to show a user
2019-03-15 10:18:43 +00:00
kimkulling
61ffe017e8
Fix some coverity findings.
2019-03-14 17:37:28 +01:00
Aidmx
170549559e
fix: change ScaleProcess priority
2019-03-14 21:50:50 +08:00
Kim Kulling
04025f09cf
Merge branch 'master' into issue_934
2019-03-13 22:27:23 +01:00
Kim Kulling
145c3d1589
add missing changes.
2019-03-13 19:35:36 +01:00
kkulling
650fadebe9
Fix compiler warnings: var declarations hides other var.
2019-03-13 16:58:18 +01:00
kkulling
0dc2e9197a
Fix compiler warnings.
2019-03-13 14:40:02 +01:00
Charlie Gettys
5fd9789fc3
remove last warning?
2019-03-12 02:51:37 -04:00
Charlie Gettys
4728c1bb68
remove 1 more of the warnings
2019-03-12 02:49:33 -04:00
Charlie Gettys
27dc922d09
Hopefully fix all warnings?
2019-03-12 01:06:54 -04:00
Charlie Gettys
7bb1303773
ValidateDataStructure.cpp:
...
* Fixed warnings introduced by last commit (hopefully)
* Fixed case fallthrough (due to exception flow, it didn't make a practical difference, but hopefully will remove a warning)
* Minor formatting consistency improvements
2019-03-10 13:12:56 -04:00
Charlie Gettys
2e262dbbc6
Make syntax used to call ReportError & ReportWarning a bit more consistent
2019-03-09 12:36:21 -05:00
Charlie Gettys
80dffb63e8
Add aiNode::mName to ValidateDataStructure error reporting to ease debugging
2019-03-09 12:01:45 -05:00
Rich ard
3a610d3d66
Embed version information under Windows
2019-03-08 15:49:18 +00:00
Marco Di Benedetto
b15c93c726
Merge https://github.com/assimp/assimp
2019-03-07 14:35:41 +01:00
RichardTea
7d7574f189
Merge branch 'master' into ETC_Inc
2019-03-05 12:07:10 +00:00
Kim Kulling
b9c8e0856f
Merge branch 'master' into fix-bug-autogenerated-names
2019-03-01 20:24:45 +01:00
Lawrence Kok
e9eda062a1
In ColladaLoader in version 3.2.0 (release est. 2015) the name assignment was based on name attribute (xml) with optional fallbacks to id and sid. Over time this was changed to fix a bug and support for names was removed, only to be later (re)added using an optional `useColladaName` setting. We discovered a problem that with when using the name based assignment it doesn't assign automatically generated names like what it did in the logic in v3.2.0 and on the id based approach on current master.
...
We discovered this causes problems with matching the aiCamera and aiLight. So we rectified this problem by auto generating names also on the name based method.
2019-03-01 10:43:18 +07:00
Vitaly Ovchinnikov
7b01ff6b8d
ignoring invalid normals and uvs indices instead of canceling the import completely
2019-02-27 12:15:03 +13:00
Kim Kulling
16080ba60c
Merge branch 'master' into simple_skin_test
2019-02-25 22:06:56 +01:00
Kim Kulling
206004c7d6
introduce simple skin-test +some findings.
2019-02-25 22:06:24 +01:00
RichardTea
c1c42023fa
Merge branch 'master' into ETC_Inc
2019-02-20 16:58:41 +00:00
Kim Kulling
f59f3976c0
closes https://github.com/assimp/assimp/issues/1593 : fix computation of percentf for 3DS.
2019-02-20 00:02:19 +01:00
Kim Kulling
adbc7e8f70
closes https://github.com/assimp/assimp/issues/2115 : rollback setup of FBX-camera.
2019-02-19 20:23:20 +01:00
Kim Kulling
050430cae0
Merge branch 'master' into issue_2340
2019-02-19 13:14:59 +01:00
Kim Kulling
ae41ae3211
closes https://github.com/assimp/assimp/issues/305 ': fix viewer
2019-02-18 21:43:45 +01:00
Marc-Anton Boehm-von Thenen
4d0740a120
[Issue_2340] Proper closing endif()...
2019-02-18 14:15:39 +01:00
Marc-Anton Boehm-von Thenen
a94c8bf3f6
[Issue_2340] Wrong precondition layout... missed ANDROID=ON and ASSIMP_ANDROID_JNIIOSYSTEM=OFFvalid constellation
2019-02-18 14:14:27 +01:00
Marc-Anton Boehm-von Thenen
c3129e55d2
[Issue_2340] Added ASSIMP_ANDROID_JNIIOSYSTEM precheck to only remain set to ON in proper ANDROID enabled toolchain environment
2019-02-18 14:10:32 +01:00
Kim Kulling
0810b2d51b
Merge branch 'master' into ETC_Inc
2019-02-15 10:20:30 +01:00
Kim Kulling
4621bde985
Merge branch 'master' into topic/Bug2034_typeCodeC
2019-02-08 14:38:25 +01:00
Kim Kulling
6cc41d6be6
Merge branch 'master' into kimkulling-patch-3
2019-02-07 19:27:07 +01:00
Lassi Lääti
cc276c3180
cast size_t to unsigned int
2019-02-06 21:14:22 +02:00
Malcolm Tyrrell
02a5f6b62f
Remove unneeded newline.
2019-02-06 11:15:27 +00:00
Malcolm Tyrrell
f9014d7410
Add tokenization of 'c' type arrays, both compressed and uncompressed.
2019-02-06 11:15:21 +00:00
Kim Kulling
6e39c22554
Fix potential security issues.
2019-02-05 22:05:52 +01:00
Mike Samsonov
5ce1cfedfe
warning fix for gcc
2019-02-04 16:15:52 +00:00
Mike Samsonov
971ba308b3
Merged PR 2811682: buffer grow changes and large files support
...
Buffer grow changes:
The exporting of relatevely large data could take a few days, because reallocation of a buffer every time for a few new bytes is overkill. I've introduced standard capacity member for the buffer and growth it by 1.5 times every time. That helps a lot, descrease exporting to a minute (from a few days).
Large file support:
glTF is a json file, all lengths and offsets don't have a type, just numbers, but code was always reading it as uint32, this doesn't work for files bigger than int32 (almost all files we have as an example). So, I've changed it to be reading as size_t. Specification doesn't specify the type for it, so it's not against spec.
2019-02-04 15:16:28 +00:00
Kim Kulling
ce691d383f
Merge branch 'master' into kimkulling-patch-3
2019-02-02 15:21:31 +01:00
Kim Kulling
0801a62ef7
Merge branch 'master' into kimkulling-dev
2019-01-30 16:09:33 +01:00
kimkulling
a06133ab52
Update copyrights.
2019-01-30 09:41:39 +01:00
FRICOTEAUX
38bebaf4d3
Fix glTF2 export with no texture coordinates
2019-01-28 16:02:09 +01:00
Kim Kulling
b35331b92a
Update FindInvalidDataProcess.cpp
...
-Fix some review findings.
2019-01-28 10:50:36 +01:00
Kim Kulling
4c2898c82b
Merge branch 'master' into issue_2251
2019-01-28 10:06:44 +01:00
Kim Kulling
5d6fc7a557
Closes https://github.com/assimp/assimp/issues/2251 : introduce AI_CONFIG_PP_FID_IGNORE_TEXTURECOORDS to avoid removing textures.
2019-01-27 21:05:58 +01:00
Kim Kulling
3aa5a61516
Merge branch 'master' into ETC_Inc
2019-01-23 19:53:43 +01:00
Kim Kulling
05ea039846
Merge branch 'master' into ETC_Inc
2019-01-22 20:10:50 +01:00
Adrian Perez
8191080986
Adapt MemoryIOSystem to delegate unhandled calls to shadowed IO system
2019-01-21 14:14:48 -08:00
Kim Kulling
a04b96ef66
Disable step.
2019-01-20 20:29:23 +01:00
Kim Kulling
002af28e54
Merge branch 'master' into fbx-keep-material-params
2019-01-18 17:35:34 +01:00
Merwan Achibet
7dc32ab9b6
Preserve all the material parameters from FBX models
2019-01-17 19:07:15 +01:00
Richard
3c651be640
Exporter::ExportToBlob() Pass on preprocessing and properties. Issue #2302
2019-01-17 13:55:05 +00:00
SchroerDev
f7fe729c88
Update FBXConverter.cpp
2019-01-17 12:32:36 +01:00
SchroerDev
3a3340b926
add FBX Line Element support
...
add FBX Line Element support
2019-01-17 12:26:22 +01:00
Kim Kulling
19c3cea0db
Merge branch 'master' into fix_obj_progress_reporting
2019-01-09 22:09:25 +01:00
Marc Kurtz
e37a4de2c2
Fix progress reporting in ObjFileParser. Remove old unused code which is claiming to still take up "1/3" of the total progress.
2019-01-08 15:56:57 -05:00
rickomax
f170c84226
Test fixes
...
Test fixes
2019-01-06 19:38:29 -02:00
rickomax
35a044bda3
Various additions/fixes (FBX blend-shapes support added)
...
Added animMesh name assignment at ColladaLoader
Fixed animMesh post-processing on ConvertToLhProcess (blend-shapes weren't being affected by post-processing)
Added WindowsStore define. This is used to change some incompatible WinRT methods
Added FBX blend-shapes and blend-shapes animations support
Added Maya FBX specific texture slots parsing
Added extra FBX metadata parsing
Added GLTF2 vertex color parsing
Fixed IFC-Loader zip-buffer reading rountine
Fixed OBJ file parsing line-breaker bug
Fixed IOStreamBuffer cache over-read bug
Added mName field to aiAnimMesh
Reverted EmissiveFactor, TransparencyFactor and SpecularFactor assignment on FBXConverter. Really, the commit #817 breaks a lot of old code.
2019-01-06 16:37:30 -02:00
Kim Kulling
a44d56976c
Merge branch 'Coverity-findings' of https://github.com/assimp/assimp into Coverity-findings
2018-12-31 14:54:40 +01:00
Kim Kulling
c63b1a1fd5
fix review finding: dereference after null-check.
2018-12-31 14:47:54 +01:00
Kim Kulling
96032ca341
Merge branch 'master' into Coverity-findings
2018-12-31 12:16:55 +01:00
Kim Kulling
425a784b23
fix finding: possible override.
2018-12-31 12:16:20 +01:00
Kim Kulling
92bb0febdf
fix review finding: fix resource leak.
2018-12-30 16:11:39 +01:00
Kim Kulling
3596c822a5
fix review finding: Wrapper object use after free.
2018-12-30 16:04:49 +01:00
Kim Kulling
b42d959418
fix review warning: wrapper object used after free.
2018-12-30 16:02:22 +01:00
Kim Kulling
35d69c360c
fix out-of-bound access.
2018-12-30 15:59:15 +01:00
Kim Kulling
281c191367
fix streamreader::end definition for iterators.
2018-12-30 10:44:43 +01:00
Kim Kulling
a8fda89079
remove unique_ptr ina local function / method.
2018-12-30 10:36:23 +01:00
Kim Kulling
8912bb333c
Fix memory leak.
2018-12-30 10:33:21 +01:00
Kim Kulling
f6cbb26d9c
Fix unnecessary allocation.
2018-12-30 10:30:12 +01:00
Kim Kulling
e09428c95b
eremove useless assertion test.
2018-12-29 21:29:42 +01:00
Kim Kulling
f5e94a2840
Add a check for the resule of a dynamic cast.
2018-12-29 21:27:20 +01:00
Kim Kulling
c1dc3901e7
fix more findings.
2018-12-28 11:17:27 +01:00
Kim Kulling
db202584ab
remove dead code.
2018-12-28 01:45:47 +01:00
Kim Kulling
859153e3e6
more fixes for coverity-findings.
2018-12-28 01:44:56 +01:00
Kim Kulling
4c6db68d34
Coverity-findings
2018-12-27 22:28:23 +01:00
Marco Di Benedetto
ad7964be63
imported animation fix.
2018-12-21 10:36:03 +01:00
Andrés Iraolagoitía
3c1d6a3f87
Fix animations import in gltf2
2018-12-19 20:28:43 -03:00
Marco Di Benedetto
cf6dff0b93
Merge https://github.com/assimp/assimp
2018-12-19 17:27:17 +01:00
Kim Kulling
ae7a045396
Merge branch 'master' into timmmeh-gltf2-validation-patch
2018-12-11 07:59:11 +01:00
Kim Kulling
b5ebd24688
closes https://github.com/assimp/assimp/issues/817 : use emmisive factor instead of color.
2018-12-10 22:07:26 +01:00
Kim Kulling
e22e93e6d7
Merge branch 'master' into allow_step_disable
2018-12-08 21:38:18 +01:00
ardenpm
fd75e4923c
Merge pull request #7 from migenius/migenius-rsws52
...
Add check for NULL texcoord values.
2018-12-07 09:38:41 +11:00
Paul Arden
f63caf894e
Add check for NULL texcoord values.
2018-12-06 12:56:02 +11:00
tirichards
bb9e3c3593
Fix failed assimp validation for glTF2 sample animations
2018-12-05 14:46:56 -08:00
sfalexrog
af323de741
Use ADD_ASSIMP_IMPORTER for STEP importer
2018-12-04 23:28:50 +03:00
twhittock
8b6c6613f9
collada export: Use Camera local coordinate system
...
Fixes #2255
2018-12-04 14:44:49 +00:00
Kim Kulling
f49dbc8f62
Merge branch 'master' into OFF_Importer_Redesign_js_francal
2018-12-03 23:15:05 +01:00
Kim Kulling
b1da322deb
Update XFileParser.cpp
...
Add misisng bracket.
2018-12-03 23:13:10 +01:00
Kim Kulling
54be5fdb7b
Update XFileParser.cpp
2018-12-03 22:03:50 +01:00
Kim Kulling
ce91f5c888
Off-Importer: introduce unittest.
2018-12-03 21:24:06 +01:00
sfalexrog
30d3c8c6a3
Fix CMake target alias typo
2018-12-03 23:22:34 +03:00
Kim Kulling
bb66af544a
closes https://github.com/assimp/assimp/issues/2228 : prepare pull-request.
2018-12-02 13:08:47 +01:00