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

3501 Commits (41eeacefabd1ee806b115d9fc48f3cc89bc55e5c)

Author SHA1 Message Date
Turo Lamminen 3eb9b8e91b NFF: Use C++11 range-based for loop 2016-05-23 17:30:47 +03:00
Turo Lamminen ac676d4d3c MD5: Use C++11 range-based for loop 2016-05-23 17:30:47 +03:00
Turo Lamminen b9fbfbc18a LWO: Use C++11 range-based for loop 2016-05-23 17:30:42 +03:00
Kim Kulling 610cea8649 Update .travis.yml 
Try to enable osx-builds for travis.
 2016-05-23 15:12:29 +02:00
Alexander Gessler cd4f212b5f Merge pull request #891 from ciechowoj/blender_materials 
Blender materials
 2016-05-22 14:39:45 +02:00
Turo Lamminen 3031470ec1 IRR: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen c7c756d344 FBX: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen 8566b9aa90 D3MF: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen 52405bbe1b Collada: Use C++11 range-based for loop 2016-05-22 13:57:11 +03:00
Turo Lamminen f0ebb40f19 ASE: Use C++11 range-based for loop 2016-05-22 13:57:09 +03:00
Turo Lamminen b345f79d45 3DS: Use C++11 range-based for loop 2016-05-22 13:57:06 +03:00
Kim Kulling 38ce71d5a0 Update glTFAsset.inl 
closes https://github.com/assimp/assimp/issues/893: fix invalid memcpy usage.
 2016-05-19 09:10:56 +02:00
Kim Kulling c9c6fda28e Merge pull request #889 from ciechowoj/area_lights 
Adds support for area lights.
 2016-05-18 00:11:05 -07:00
Kim Kulling 84b9df3182 Merge pull request #890 from WroughtIronGames/master 
Add fix for IRR vs IRRMESH importer registry issue
 2016-05-17 14:35:42 -07:00
ciechowoj c554b55f97 Merge branch 'blender_materials' 
Conflicts:
	test/CMakeLists.txt
 2016-05-17 22:52:18 +02:00
ciechowoj c4a542a994 Adds blender material loading. 2016-05-17 21:17:51 +02:00
Kim Kulling 5168a6c8ca Regression tests: update database. 2016-05-17 07:46:51 -07:00
Richard Selneck fc5464eb38 Pull from upstream, 5/17/2016 2016-05-17 08:44:38 -04:00
ciechowoj 913f26475d Adds importing blender material. 2016-05-16 21:17:58 +02:00
ciechowoj 25d84a6aff Adds support for area lights. 2016-05-16 13:04:43 +02:00
Kim Kulling 560e1eebc1 fix for https://github.com/assimp/assimp/issues/887: add missing define. 2016-05-16 11:24:04 +02:00
Kim Kulling 1acd24e0ae iSIBImporter: fix possible dereferncing of a null pointer. 2016-05-15 19:56:29 +02:00
Kim Kulling 6575696459 OpenGEX: fix coverity findings. 2016-05-15 18:57:10 +02:00
Kim Kulling e1084b5314 Merge branch 'feature/opengex_missing_features' 2016-05-14 10:36:46 +02:00
Kim Kulling 71c2b91b98 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-14 10:10:33 +02:00
Kim Kulling 210182b17a OpenGEX: fix coverity findings. 2016-05-14 10:10:05 +02:00
Kim Kulling 142901fbc0 Merge pull request #885 from otgerrogla/master 
Fixed GLTF bugs, and added a few test models
 2016-05-10 23:38:54 +02:00
Otger 159af06524 Fixed GLTF bugs, and added a few test models 2016-05-10 16:25:15 +02:00
Richard Selneck 86a636fbbf Add in IRRMESH option 2016-05-09 18:26:18 -04:00
Kim Kulling d6ecc8b621 Regression test suite: add ogex-files to database. 2016-05-09 23:55:55 +02:00
Kim Kulling a55e31bc72 Merge pull request #881 from assimp/feature/opengex_missing_features 
Feature/opengex missing features
 2016-05-09 21:19:09 +02:00
Kim Kulling 2323320df8 OpenGEX: new camra model. 2016-05-09 20:50:22 +02:00
Kim Kulling e9085097f3 OpenGEX: add light impl and add examples. 2016-05-09 20:43:22 +02:00
Kim Kulling 0d5eb30a28 CameraObj: load camera data in the correct way. 2016-05-08 22:31:16 +02:00
Kim Kulling 9e63b769a5 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-08 12:23:02 +02:00
Alexander Gessler d1e355add2 Add STEP to list of exporters 2016-05-08 11:56:15 +02:00
Alexander Gessler 644e06d4a7 Add 3MF to readme, mark glTF as partial support 2016-05-08 11:55:18 +02:00
Kim Kulling 82f73b6d03 OpenGEX: fix invalid access to textures. Next steps to camera and light. 2016-05-08 11:09:53 +02:00
Kim Kulling 513576616c Merge branch 'master' of https://github.com/assimp/assimp 2016-05-07 18:01:21 +02:00
Kim Kulling 896e139470 Merge pull request #879 from gorilux/master 
Added 3MF importer
 2016-05-07 18:00:13 +02:00
Gorilux 00b574d746 Fixed compile issue for travis-ci 2016-05-07 15:36:05 +02:00
Gorilux 753b63c526 Removed override keywords so compilation success on gcc 4.6 2016-05-07 15:15:00 +02:00
Gorilux 89320bab46 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-07 14:18:17 +02:00
Gorilux 8f4f0047fb Added 3MF importer 2016-05-07 14:16:33 +02:00
Kim Kulling 301b6798c5 aiLight: fix a typo. 2016-05-07 11:16:33 +02:00
Alexander Gessler a931d2bac6 Merge pull request #877 from assimp/followups 
Followups
 2016-05-05 20:40:54 +02:00
Alexander Gessler 0b79d1ebda Revert previous glTF fix (e5233283ef) because it breaks ODR as pointed out by @turol, instead just make importer depend on the necessary definitions. 2016-05-05 19:11:33 +02:00
Alexander Gessler f5327a99ba Add using namespace std on top of assxml exporter so vsnprintf is found no matter where it lives. 2016-05-05 19:05:02 +02:00
Alexander Gessler 92b1431be3 Merge pull request #876 from assimp/travisfix 
Fix travis compile: glTFImporter chokes on unavailability of WriteLaz…
 2016-05-05 17:59:04 +02:00
Alexander Gessler c80fe16323 Update regression test suite. 
gltf could be a regression, left a question here: https://github.com/assimp/assimp/pull/697
 2016-05-05 16:59:26 +02:00