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

2067 Commits (bc0393669b96cc79e1e185630970fbc855171ff4)

Author SHA1 Message Date
Kim Kulling d67c8c29b6 Merge pull request #898 from turol/cxx11-refactor 
Use C++11 range-based for loops
 2016-05-26 16:56:07 +02:00
Kim Kulling 8fa0071d16 closes https://github.com/assimp/assimp/issues/892: add own to_string 
implementation.
 2016-05-26 00:44:29 +02:00
Kim Kulling 4e982c0538 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-26 00:41:48 +02:00
Kim Kulling 2cbbc3da09 OpenGEX-Importer: remove dead code. 2016-05-26 00:41:31 +02:00
Kim Kulling abad093d09 Update OpenGEXImporter.cpp 
Fix compiler warning: remove unused variables.
 2016-05-25 10:18:24 +02:00
Kim Kulling 5463146688 Add std::string header. 2016-05-25 00:58:05 +02:00
Kim Kulling f9f493d017 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-25 00:27:16 +02:00
Kim Kulling 037fec275c std::to_string: add replacement for android build chain. 2016-05-25 00:26:41 +02:00
Turo Lamminen 381f87507f SplitLargeMeshes: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen 896ab8eee2 Unreal: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen d238597459 Raw: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen 6c9c040419 Q3BSP: Use C++11 range-based for loop 2016-05-23 17:33:51 +03:00
Turo Lamminen a09a6a40c0 OpenGEX: Use C++11 range-based for loop 2016-05-23 17:33:49 +03:00
Turo Lamminen 32e4dd0bd1 Ogre: Use C++11 range-based for loop 2016-05-23 17:30:48 +03:00
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
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
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
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 210182b17a OpenGEX: fix coverity findings. 2016-05-14 10:10:05 +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 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 82f73b6d03 OpenGEX: fix invalid access to textures. Next steps to camera and light. 2016-05-08 11:09:53 +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
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 e5233283ef Fix travis compile: glTFImporter chokes on unavailability of WriteLazyDict<T>. It does not use it directly, but instantiation of LazyDict<T> creates a reference. 
My understanding is that compilers were correct in rejecting this, but I may be missing some detail of C++' template instantiation rules.
 2016-05-05 16:37:55 +02:00
Alexander Gessler 896120b76a Assimp mostly uses unsigned int where it perhaps should've used size_t, nonetheless SPBC insisted on size_t, causing lots of noisy compile warnings. 2016-05-05 15:41:50 +02:00
Alexander Gessler 167bc579c5 Fix MSVC11 compile error in AssxmlExporter.cpp -- vsnprintf is not in std. 2016-05-05 15:41:12 +02:00