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

4658 Commits (3fef573a4560502684b289a7bee6f60dbd2eece2)

Author SHA1 Message Date
Kim Kulling 3fef573a45 Merge pull request #1398 from Eljay/fix-irrxml 
Fix linking issue with irrXML
 2017-08-23 21:10:22 +02: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
Alexander Gessler 36425677c7 Merge pull request #1365 from ihmcrobotics/feature/custom-library-loader 
Feature/custom library loader
 2017-07-30 00:14:03 +02:00
Kim Kulling 3c56117e4f Merge branch 'master' of https://github.com/assimp/assimp 2017-07-29 16:45:56 +02:00
Kim Kulling 5fe45a1aa3 Readme: update list of supported file formats. 2017-07-29 16:45:50 +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
Kim Kulling 1e99228861 Merge pull request #1366 from titorgalaxy/master 
Fix install for builds with MSVC compiler and NMake.
 2017-07-29 15:06:37 +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 eb8639d7c8 CHANGES: add documentation of featureset for 4.0.1 2017-07-28 22:33:41 +02: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 4b860dfc42 fix build second try 2017-07-27 13:31:22 +02:00
Kim Kulling d74306ad67 fix build 2017-07-27 13:07:26 +02:00
Jesper Smith 21391b1f74 Added javadoc for the JassimpLibraryLoader 2017-07-26 16:44:37 -05:00
jamesgk c91e9a94da glTF2: export materials' normal maps 2017-07-26 14:42:22 -07:00
Jesper Smith c4d0567a8a Provided access to the library loading code to allow custom library loaders 2017-07-26 16:41:09 -05: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
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