Commit Graph

5834 Commits (6600446e2c5369956ec5713d00f9f7f3979854d7)

Author SHA1 Message Date
Kim Kulling 82f0dae835 FIx build 2017-08-31 11:53:00 +02:00
Kim Kulling 11f70e2140 Tests: add 3D-importer test. 2017-08-31 11:39:10 +02:00
Kim Kulling b4da9c4f56 Fix review findings: remove unused includes 2017-08-31 11:30:31 +02:00
Kim Kulling 00e3b03c5b closes https://github.com/assimp/assimp/issues/1406: fix merge issue + improve 3MF-tests 2017-08-31 11:04:13 +02:00
Kim Kulling 4f2fcf306e Merge pull request #1410 from THISISAGOODNAME/master
Fix assimp_qt_viewer build failed on OSX
2017-08-31 09:52:35 +02:00
THISISAGOODNAME 1e3a9ded11 Fix assimp_qt_viewer build failed on OSX 2017-08-30 23:18:36 +08:00
Kim Kulling fd9da14db7 Merge pull request #1408 from assimp/acgessler-patch-4
Update version check in FBX reader to check for version >= 7500 inste…
2017-08-30 09:22:29 +02:00
Alexander Gessler f8ef94095a Update version check in FBX reader to check for version >= 7500 instead of exactly 7500. 2017-08-29 15:41:25 +02:00
Kim Kulling 43a51df7ec Merge pull request #1405 from assimp/rickomax-master
Rickomax master
2017-08-28 21:22:08 +02:00
Kim Kulling 7151cf117b Merge branch 'master' of https://github.com/rickomax/assimp into rickomax-master 2017-08-25 16:47:08 +02:00
Kim Kulling ce9c8a4efc Merge pull request #1403 from kebby/fbx_anim_fix
FBX importer: Use actual min/max of anim keys when start/stop time is missing
2017-08-25 13:33:09 +02:00
Kim Kulling c6360ba1ab Merge pull request #1401 from melMass/python3
Detect if Anaconda and fixed 3d_viewer for Python 3
2017-08-25 12:23:24 +02:00
Tammo Hinrichs 12a28d33ce FBX importer: try a constant again (ll suffix this time) 2017-08-25 12:14:03 +02:00
Tammo Hinrichs 9a12b6ef0b FBX importer: Back to INT64_MIN but include <stdint.h> also. 2017-08-25 11:17:07 +02:00
Kim Kulling cac93ad0a8 Merge pull request #1400 from kebby/master
Collada importer: Add support for line strip primitives
2017-08-25 09:10:38 +02:00
Tammo Hinrichs 80489963a1 FBX importer: don't rely ont INT64_MIN / ..MAX macros 2017-08-24 17:18:54 +02:00
Kim Kulling e90c615c27 Update Readme.md
use new patreon badge.
2017-08-24 17:03:41 +02:00
Tammo Hinrichs 7182f89a51 FBX importer: Use actual min/max of animation keyframes when start/stop time is missing 2017-08-24 14:40:53 +02:00
Kim Kulling 3a89e36718 Merge pull request #1399 from m4c0/master
Re-enabling PACK_STRUCT for MDL files.
2017-08-23 21:11:45 +02:00
Kim Kulling 3fef573a45 Merge pull request #1398 from Eljay/fix-irrxml
Fix linking issue with irrXML
2017-08-23 21:10:22 +02:00
Mel Massadian 37f5619149 created a python3 version of the 3dviewer and fixed the / = float in py3 2017-08-23 20:02:58 +02:00
Tammo Hinrichs 92beee9924 Collada importer: Add support for line strip primitives 2017-08-23 17:52:53 +02:00
Eduardo Costa 2e5e56c000 Re-enabling PACK_STRUCT for MDL files.
When using this compiler:

    Apple LLVM version 7.3.0 (clang-703.0.31)
    Target: x86_64-apple-darwin15.4.0
    Thread model: posix

The MDL::Frame is aligned in 8-byte boundaries instead of 4. This
generates this error when loading old Quake 1 MDL files:

    ERROR: Failed to load file: Invalid MDL file. The file is too small
    or contains invalid data (File: MDLLoader.cpp Line: 422)

It seems this error was introduced by commit
bd2af6591f due to compilation warnings.
2017-08-21 09:27:40 +01:00
Lee Jeffery d0d45d1d22 Fix linking issue with irrXML 2017-08-20 19:07:09 +01:00
Kim Kulling 91f6a9a721 Readme: add TriLib to the official list of supported ports. 2017-08-19 22:09:30 +02:00
Kim Kulling a71a61f260 Merge pull request #1397 from Arshia001/master
Fix OBJ discarding all material names if the material library is missing
2017-08-18 23:54:41 +02:00
Arshia001 e0fc412e57 Fix OBJ discarding all material names if the material library is missing 2017-08-18 17:40:07 +04:30
Kim Kulling 6b4e3177e8 Merge pull request #1385 from gongminmin/FixForVS2017.3
Fix compiling problems under VS2017.3.
2017-08-15 21:27:38 +02:00
Minmin Gong b26fea4cf5 Fix compiling problems under VS2017.3.
1. WordIterator's operator== and operator!= must take const WordIterator& as parameter type.
2. OpenMP doesn't work with new two phase lookups. Need to disable twoPhase.
2017-08-14 21:51:59 -07:00
Kim Kulling dab0985994 assert: remove assert with more than one statement and use only ai_assert. 2017-08-14 22:20:26 +02:00
Kim Kulling 974eb669c8 Merge pull request #1383 from jeremyabel/patch-1
Replaced out-of-date old repo link with a wiki link to C4D file format build instructions
2017-08-13 17:51:15 +02:00
Jeremy Abel 7861c359ba Added wiki link to C4D file format 2017-08-12 15:06:36 -04:00
Kim Kulling f78614d33e Merge pull request #1382 from jeremyabel/master
Fixes for C4D importer
2017-08-12 20:40:28 +02:00
Jeremy Abel b1313b04b8 should be map, not set 2017-08-12 00:16:00 -04:00
Jeremy Abel 847e0291a0 changed a few leftover asserts to ai_assert 2017-08-12 00:13:24 -04:00
Kim Kulling 0629faf9b1 Merge pull request #1378 from dhritzkiv/feature/gltf-version
glTF version
2017-08-10 20:50:15 +02:00
Daniel Hritzkiv 5b3b80cbc2
Formatting 2017-08-09 11:41:12 -04:00
Daniel Hritzkiv 83bfa61f8d
version in glb header is stored as uint32_t
Validator complains about `1` not being a valid version, however.
2017-08-09 11:09:43 -04:00
Daniel Hritzkiv 7a4a32625c
Ensure gltf asset version is printed as \d.0 2017-08-09 10:47:34 -04:00
Kim Kulling 7fd9c3dc98 § 2017-08-05 18:54:17 +02:00
Kim Kulling 1a2c69fda8 Merge branch 'master' of https://github.com/assimp/assimp 2017-08-05 18:46:56 +02:00
Kim Kulling c3cd7349d0 unzip: latest greatest. 2017-08-05 18:46:34 +02:00
Kim Kulling 8091e46e81 Merge pull request #1370 from 0xcccc/master
Fix android build issues
2017-08-03 16:40:32 +02:00
Kim Kulling 267d3f41e8 ply-loader: add brackets. 2017-08-03 14:58:39 +02:00
Kim Kulling ba658e7813 ply-importer: fix creation of vertex attributes. 2017-08-03 14:57:48 +02:00
Kim Kulling 8478df7dbd PlyLoader: fix vertex attribute lookup. 2017-08-02 14:24:53 +02:00
Knox Shao def42bf624 Fix android build issues 2017-08-02 19:15:07 +08:00
Kim Kulling 81fd027860 closes https://github.com/assimp/assimp/issues/1270: use HasTexture for
texture coordinates.
2017-08-02 11:35:57 +02:00
Kim Kulling 232954c15e cmake cleanup. 2017-07-31 14:25:00 +02:00
Kim Kulling 919f2a1ea9 Commandline tool: fix url to project space. 2017-07-30 21:21:51 +02:00