Commit Graph

4713 Commits (d49f86f1e79eb97e2939f88d3d5b902d25f1ca3e)

Author SHA1 Message Date
jamesgk acf8c54e55 glTF2: Fix animation export 2017-07-26 14:20:53 -07:00
Doug Stephen 8243b01c06 Added missing include to stdlib.h and remove load library call 2017-07-26 15:48:42 -05:00
Patrick Dähne 16ed8861eb X3D importer: Workaround for buggy Android NDK (issue #1361) 2017-07-26 14:14:11 +02:00
jamesgk bb55246c18 Export glTF 2 2017-07-25 18:05:18 -07:00
jamesgk d7cbbaf23e Compile with glTF2 export option (currently same as glTF1 output) 2017-07-25 17:34:03 -07:00
jamesgk 38626d4260 glTF: start fork of files used in export, for glTF2 2017-07-25 17:34:03 -07:00
Kim Kulling cf0a83de17 unittests: fix build. 2017-07-25 09:46:54 +02:00
Kim Kulling 4013b319af unittests: add missing include to utProfiler. 2017-07-25 09:38:35 +02:00
Kim Kulling 256f28432a unittests: fix the build again. 2017-07-25 09:37:28 +02:00
Kim Kulling 4dc2cd8442 Profiler: fix invalid using statement. 2017-07-25 08:54:29 +02:00
Kim Kulling 2cb1a9efc6 Profiler: add a unittest. 2017-07-25 00:00:43 +02:00
Alexander Gessler 6bf68e063f Merge pull request #1355 from RodrigoFigueroaM/patch-1
Added support for python3
2017-07-23 01:57:57 +02:00
Alexander Gessler 96cb3f7140 Merge pull request #1359 from sacereda/profilerLogging
Elapsed seconds not shown correctly
2017-07-23 01:56:22 +02:00
Alexander Gessler ae9755286a Merge pull request #1358 from sacereda/optimizeMeshes
Low performance in OptimizeMeshesProcess with huge number of meshes
2017-07-23 01:55:40 +02:00
Sergio Acereda 6429502fc5 Elapsed seconds not shown correctly 2017-07-22 23:31:10 +02:00
Sergio Acereda 8606ec6060 Low performance in OptimizeMeshesProcess::ProcessNode with huge number of aiMeshes 2017-07-22 23:28:55 +02:00
Kim Kulling 5ce614be3b Merge pull request #1356 from assimp/fix_osx_travis
travis: check if cmake is installed with brew.
2017-07-21 19:45:49 +02:00
Kim Kulling d150874f06 travis: next try. 2017-07-21 19:10:32 +02:00
Kim Kulling e94bbe7e0a travis: fix dev/null access. 2017-07-21 18:58:55 +02:00
Kim Kulling 501f09307c travis: fix brew ls command. 2017-07-21 18:55:25 +02:00
Kim Kulling e7afc8baf3 travis: add next missing selicolon. 2017-07-21 14:37:42 +02:00
Kim Kulling 11e9173a09 travis: add missing semicolon in if-then statement. 2017-07-21 13:21:31 +02:00
Kim Kulling 91f888a254 travis: add missing semicolons. 2017-07-21 12:36:10 +02:00
Kim Kulling f7a7e57807 travis: check if cmake is installed with brew. 2017-07-21 12:03:09 +02:00
rodrigo figueroa 01a288ff35 Added support for python3
When using python3 and running any of the provided scripts I get:
NameError: name 'unicode' is not defined.  Python3 does not have unicode. Using try-except method helps to support python3
2017-07-20 22:48:07 -07:00
Kim Kulling 0ef54bbbef Merge pull request #1352 from sacereda/master
not compiling when using ASSIMP_DOUBLE_PRECISION
2017-07-20 18:48:32 +02:00
rickomax 147541ab7f Complementing last fix
Complementing last fix
2017-07-19 19:04:10 -03:00
rickomax 3d4b54f8fc Fixed FBX 7500 Binary reading
Seems that all FBX 7.5 Binary files uses 32 bits adresses. The code now is taking this in consideration. This commit fixes the https://github.com/assimp/assimp/issues/838 issue.
2017-07-19 19:00:53 -03:00
Sergio Acereda a965414ceb not compiling when using ASSIMP_DOUBLE_PRECISION 2017-07-19 14:05:54 +02:00
Kim Kulling b394546e55 unittests: fix typo. 2017-07-18 20:53:47 +02:00
Kim Kulling 6f9dabe49c unittests: fix version test. 2017-07-18 20:42:55 +02:00
Kim Kulling 52c8d06f5d Update CHANGES 2017-07-18 19:03:26 +02:00
Kim Kulling 3859cd692f Merge branch 'master' of https://github.com/assimp/assimp 2017-07-18 19:02:47 +02:00
Kim Kulling 5e98898dca Update version. 2017-07-18 19:02:08 +02:00
Kim Kulling a895808959 Merge branch 'master' of https://github.com/assimp/assimp 2017-07-18 17:03:45 +02:00
Kim Kulling 4361262029 PlyLoader: fix out of bound access. 2017-07-18 17:02:21 +02:00
Kim Kulling fc647742fe Merge pull request #1350 from Madrich/master
Some fixes
2017-07-17 11:23:29 +02:00
Madrich 80acc1f241 Fix Collada export image tag
Fix compiler double issues
2017-07-17 09:42:26 +02:00
Madrich ae0850b88c Merge pull request #13 from assimp/master
Update fork
2017-07-17 09:07:41 +02:00
Kim Kulling 3346fb517f fix compiler warnings. 2017-07-16 01:02:33 +02:00
Kim Kulling 123d06ca1c Merge pull request #1347 from rickomax/master
Fixed many FBX bugs
2017-07-15 20:55:57 +02:00
rickomax 328646f1d1 Merge branch 'master' of https://github.com/assimp/assimp 2017-07-15 11:22:14 -03:00
Kim Kulling c9d18ebe1f Merge pull request #1345 from jamesgk/master
Use unique node names when loading Collada files
2017-07-15 11:08:59 +02:00
Kim Kulling bd7fdfeeca Merge pull request #1338 from pdaehne/master
X3D importer: Support for binary X3D files
2017-07-15 11:08:08 +02:00
rickomax c86013b08d Fixed many FBX bugs
Fixed a bug where FBX loader won´t load embedded textures that don´t have the Content data filled. Some FBX files only fill this data once, so any embedded texture with the same source filename, should use the pre-loaded data.

Fixed another bug where FBX Texture "Filename" field came different than  on some files than the one defined by the code. One suggestion is load all properties by the case-insensitive function created.

Added the "AI_CONFIG_IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES" flag to tell the importer to load embedded texture data from already loaded ones.
2017-07-15 00:27:33 -03:00
jamesgk 727cffdfb4 Use unique node names when loading Collada files 2017-07-14 11:54:37 -07:00
Kim Kulling c9912fd481 Merge pull request #1337 from terziman/master
Added support for metadata in assbin format
2017-07-12 21:28:37 +02:00
Patrick Dähne 0a1a4a0b96 X3D importer: Fixed iterator on MSVC 2015 2017-07-12 20:48:49 +02:00
Kim Kulling 8648fd223e update python readme. 2017-07-12 20:35:50 +02:00
Patrick Dähne c1442c63cf X3D importer: Fixed problems with auto, override and regex on older compilers 2017-07-12 19:57:10 +02:00