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

2731 Commits

Author SHA1 Message Date
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
Kim Kulling
2cb1a9efc6 Profiler: add a unittest. 2017-07-25 00:00:43 +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
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
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
Madrich
80acc1f241 Fix Collada export image tag 
Fix compiler double issues
 2017-07-17 09:42:26 +02:00
Kim Kulling
3346fb517f fix compiler warnings. 2017-07-16 01:02:33 +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
Patrick Dähne
0a1a4a0b96 X3D importer: Fixed iterator on MSVC 2015 2017-07-12 20:48:49 +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
Patrick Dähne
e97ba7aec2 X3D importer: Fixed missing header file 2017-07-11 21:32:47 +02:00