Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,971 Commits 19 Branches 43 Tags
c321fb6a4445efc8e92da6272e857bc219ddab9b
Commit Graph

6971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kim Kulling
225b6fa166 Merge pull request #2404 from mlavik1/issue_2043 
Suggested fix for issue 2043
 2019-04-05 10:41:15 +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
01d4b10f14 Merge pull request #2399 from assimp/issue_2398 
closes https://github.com/assimp/assimp/issues/2398: fix the build.
 2019-04-04 12:40:54 +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
Kim Kulling
906a60a38d Merge pull request #2400 from mlavik1/issue_2393 
issue_2393: Added AI_MATKEY_TRANSPARENCYFACTOR
 2019-04-03 20:02:46 +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
d2b45377e4 Merge pull request #2397 from Cgettys/fix-more-lgtm-alerts 
Fix more LGTM Alerts
 2019-04-03 10:36:22 +02:00
Kim Kulling
838d0c35b6 Remove deprecated definition for boost workaround. 2019-04-02 21:55:41 +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
Kim Kulling
933fe5eb43 Merge pull request #2395 from TransformAndLighting/master 
added casts for rapidjson in gltf asset writer, converted std::to_string to internal to_string in fbx.
 2019-04-01 12:00:59 +02: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
5a85ceaf18 Merge branch 'master' into master 2019-03-30 18:27:41 +01:00
Kim Kulling
3e19545dc7 Merge pull request #2392 from Cgettys/fix-lgtm-alerts 
Fix lgtm alerts
 2019-03-30 18:26:25 +01:00
Charlie Gettys
e45d120f21 Remove experimental change unintentionally included in commit f001dfc8 2019-03-29 18:43:57 -04:00
Charlie Gettys
f001dfc840 * Fix error in previous commit improving imports 2019-03-29 18:36:17 -04:00
Charlie Gettys
5a53fbd65f port/PyAssimp/pyassimp/: Fix new warnings 2019-03-29 18:36:17 -04:00
Charlie Gettys
efbb85721c port/PyAssimp/pyassimp/: remove several unised imports 2019-03-29 18:36:17 -04:00
Charlie Gettys
1b9157440f port/PyAssimp/pyassimp/structs.py: remove unused import of c_int 2019-03-29 18:36:17 -04:00
Charlie Gettys
1614b7bea4 port/PyAssimp/pyassimp/core.py: convert_assimp_string now switches on 
version instead of just catching the exception if unicode is not defined
& _init_face uses is None instead of == None
 2019-03-29 18:36:17 -04:00
Charlie Gettys
ee79ac0f17 port/PyAssimp/pyassimp/sample.py: rename innerloop variable to clarify intent since it shadowed outer variable 2019-03-29 18:36:17 -04:00
Charlie Gettys
7930de9f37 port/PyAssimp/pyassimp/helper.py: replace from ctypes import POINTER; POINTER(something) with ctypes.POINTER(something) to remove warning about importing ctype twice 2019-03-29 18:36:17 -04:00
Charlie Gettys
e849b94f68 port/PyAssimp/pyassimp/core.py & helper.py: catch specific exceptions instead of BaseException 2019-03-29 18:36:17 -04:00
Charlie Gettys
0292acd5a9 scripts/BlenderImporter/genblenddna.py: return 0 on success 2019-03-29 18:36:17 -04:00
Charlie Gettys
51844b206d port/PyAssimp/pyassimp/formats.py: add missing comma (implicit string concatenation, assumed unintentional) 2019-03-29 18:36:17 -04:00
Charlie Gettys
44e89520eb scripts/StepImporter/CppGenerator.py: return 0 exit code on success 2019-03-29 18:36:17 -04:00
Charlie Gettys
4e714fce0e port/PyAssimp/pyassimp/core.py: remove unused import & second import of ctypes 2019-03-29 18:36:17 -04:00
Charlie Gettys
49033513ef port/PyAssimp/pyassimp/core.py: remove deprecated unused import & unnecessary from ctype import pointer 2019-03-29 18:36:17 -04:00
Charlie Gettys
1371cb59d9 scripts/StepImporter/CppGenerator.py: remove unused format parameter on line 158 2019-03-29 18:36:17 -04:00
Charlie Gettys
ae6c1e5ad8 Fix what I assume was a typo in scripts/StepImporter/CppGenerator.py - get_hierarchy is not used internally, so it did not cause runtime errors in the tests. Tests should perhaps be revised to reflect this. 2019-03-29 18:36:17 -04:00
Charlie Gettys
eb81619e56 Fix core.py raising string instead of correct RuntimeError 2019-03-29 18:36:17 -04:00
Matias Lavik
3ea9216c6e Merge branch 'master' into issue_2390 2019-03-29 22:10:30 +01:00
Kim Kulling
89b3de9473 Update FBXConverter.h 
Introduce using instead of typedef.
 2019-03-29 16:24:45 +01:00
Marco Di Benedetto
a79f832a54 updated cmakelists. 2019-03-29 12:21:47 +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
Kim Kulling
7721e430b4 Merge pull request #2389 from Cgettys/fix-miniz-bug 
zip: Update to latest version
 2019-03-29 10:50:35 +01:00
Kim Kulling
d62724ab4f Update test.c 
fix compiler warnings.
 2019-03-29 09:05:24 +01:00