v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,060 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

6060 Commits (224b43a3a9c8993c0ca96b1189ba91d968fe4e5d)

Author SHA1 Message Date
Daniel Hritzkiv 47c7c3cf50
Disambiguate Get methods 2017-09-11 10:50:37 -04:00
Daniel Hritzkiv f814acf33a
Update glTF2 Asset to use indexes 2017-09-11 10:50:37 -04:00
Daniel Hritzkiv 63d3655f1b
Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List 2017-09-11 10:50:36 -04:00
Kim Kulling f7d39cfa71 Merge pull request #1425 from jaredmulconry/issue_1065 
Issue 1065: Fix build warnings under x64 on MSVC
 2017-09-11 09:04:30 +02:00
Jared Mulconry 3c1cda0b8c Merge branch 'master' of github.com:assimp/assimp into issue_1065 2017-09-11 00:17:23 +10:00
Jared Mulconry 698cd5826d Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3. 2017-09-11 00:16:26 +10:00
Kim Kulling dfd109e640 Merge pull request #1424 from samitc/feature/fix-mesh-name-lost-with-PreTransformVertices-flag 
fix name lost when load with PreTransformVertices flag
 2017-09-10 16:13:12 +02:00
Jared Mulconry e40cd6c13c Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3. 2017-09-11 00:09:40 +10:00
Jared Mulconry 1167edaeca Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3. 2017-09-11 00:09:35 +10:00
Jared Mulconry 6db0a63d6e Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3. 2017-09-10 19:13:12 +10:00
Jared Mulconry 6e02bcd8d6 Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3. 2017-09-10 19:10:59 +10:00
Jared Mulconry b7f1277175 Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3. 2017-09-10 19:07:37 +10:00
Jared Mulconry 98532b45bf Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3. 2017-09-10 19:04:44 +10:00
Jared Mulconry 97b67d5cb5 Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3. 2017-09-10 18:47:24 +10:00
Kim Kulling 39e5b919ca Merge pull request #1422 from elect86/patch-9 
Added a link to pure jvm assimp port
 2017-09-09 20:52:14 +02:00
Amit Cirt 2ec46cc188 fix name lost in mesh and nodes when load with aiProcess_PreTransformVertices flag 2017-09-09 19:04:15 +03:00
Giuseppe Barbieri c2baa0f59d Added a link to pure jvm assimp port 2017-09-08 15:46:23 +02:00
Kim Kulling dbde54b4f7 Merge pull request #1421 from assimp/issue_1404 
closes https://github.com/assimp/assimp/issues/1404: set name with me…
 2017-09-08 01:02:21 +02:00
Kim Kulling e4c1557561 Traivis: make build amtrix smaller. 2017-09-07 22:02:09 +02:00
Kim Kulling c143d2e02c closes https://github.com/assimp/assimp/issues/1404: set name with merged meshes for output mesh. 2017-09-07 20:30:17 +02:00
Kim Kulling ee56ffa1f1 Merge pull request #1418 from umlaeute/debian-fixes-4.0.1 
Debian fixes 4.0.1
 2017-09-05 14:57:06 +02:00
IOhannes m zmölnig eb0ace4e18 exclude repository-settings from source-package generated via 'git archive' 2017-09-03 23:03:48 +02:00
IOhannes m zmölnig 042597552a split setup.py into multiple lines 
to make it easier for patching in Debian...
 2017-09-02 19:46:57 +02:00
IOhannes m zmölnig 3de9bbb73d fixed spelling error 2017-09-02 19:44:51 +02:00
Kim Kulling f8146e4da2 fix the buil 2017-08-31 14:15:23 +02:00
Kim Kulling 2df704edef fix the buil 2017-08-31 14:06:56 +02:00
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