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

3951 Commits

Author SHA1 Message Date
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
Amit Cirt
2ec46cc188 fix name lost in mesh and nodes when load with aiProcess_PreTransformVertices flag 2017-09-09 19:04:15 +03: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
IOhannes m zmölnig
3de9bbb73d fixed spelling error 2017-09-02 19:44:51 +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
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
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
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
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
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
Arshia001
e0fc412e57 Fix OBJ discarding all material names if the material library is missing 2017-08-18 17:40:07 +04:30
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
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
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
8091e46e81 Merge pull request #1370 from 0xcccc/master 
Fix android build issues
 2017-08-03 16:40:32 +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
44e2ba541f Merge pull request #1363 from jamesgk/gltf2 
glTF2 export support
 2017-07-29 15:08:52 +02:00
Kim Kulling
efa0aaf729 Merge pull request #1364 from pdaehne/master 
X3D importer: Workaround for buggy Android NDK (issue #1361)
 2017-07-29 15:07:38 +02:00
7557fdbb72 Fix install for builds with MSVC compiler and NMake. 
The CMake variable "MSVC" and the related versioned variables indicate that the
Visual Studio compiler is used but when using that compiler and the "NMake
Makefiles JOM" build generator the files it tried to install weren't in the
expected Debug folder.
 2017-07-29 07:45:25 -04:00
Kim Kulling
3fe8c72f5d new release: update to 4.0.1. 2017-07-28 22:27:36 +02:00
Kim Kulling
6c526d7c64 PPdPmdParser: fix compilation for clang. 2017-07-28 22:23:08 +02:00
jamesgk
5939d81138 glTF2: Use better mipmap filter defaults 2017-07-27 15:18:35 -07:00
Kim Kulling
d052b74b96 Merge branch 'master' of https://github.com/assimp/assimp 2017-07-27 20:49:54 +02:00
Kim Kulling
a2bbf76cf4 StreamReader: fix out-of-range exception 2017-07-27 20:49:49 +02:00
Kim Kulling
d74306ad67 fix build 2017-07-27 13:07:26 +02:00
jamesgk
c91e9a94da glTF2: export materials' normal maps 2017-07-26 14:42:22 -07:00
jamesgk
b7b17b03ec glTF2: use opacity for diffuse alpha + alphaMode 
The "transparency" attribute is unused in glTF2.
 2017-07-26 14:39:35 -07:00
jamesgk
acf8c54e55 glTF2: Fix animation export 2017-07-26 14:20:53 -07: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
4dc2cd8442 Profiler: fix invalid using statement. 2017-07-25 08:54:29 +02:00