Commit Graph

148 Commits (8ba10cf26aaec98aea9c1dd74cfbcfd9f430cb9e)

Author SHA1 Message Date
Fabian Herb 616aa022a7 CMake: whitespace consistency, variable naming 2016-07-01 16:57:45 +02:00
Kim Kulling 447a9642c2 closes https://github.com/assimp/assimp/issues/918: use correct lib
install name for macos.
2016-06-17 20:42:19 +02:00
Kim Kulling 62e07a8af0 closes https://github.com/assimp/assimp/issues/911: use correct include
path for unzip, when detected.
2016-06-14 20:27:40 +02:00
Richard Selneck fc5464eb38 Pull from upstream, 5/17/2016 2016-05-17 08:44:38 -04:00
Richard Selneck 86a636fbbf Add in IRRMESH option 2016-05-09 18:26:18 -04:00
Gorilux 8f4f0047fb Added 3MF importer 2016-05-07 14:16:33 +02:00
Otger d9b365eb90 Fixed a few GLTF importer/exporter bugs 2016-04-28 18:44:47 +02:00
Kim Kulling 829e56df0c cmake env: add license info. 2016-04-23 09:42:05 +02:00
Kim Kulling 6b243230b2 C++11-Support: remove boost. 2016-04-07 21:31:04 +02:00
Kim Kulling 2b09199f4a FBXImporter: move MeshGeometry declaration into its own header 2016-03-03 15:19:38 +01:00
Alexander Bobkov a5f9d0d3fc Fixed installing pdb file 2016-02-11 16:24:26 +03:00
Kim Kulling 6bfdeb6a12 sprintf replacement: introduce au_snprintf to support snprintf for v2013
and earier ( closes https://github.com/assimp/assimp/issues/743 )
2016-01-06 15:35:25 +01:00
rmitton d952823ffd Importer for Silo SIB files.
Wrote an importer for Nevercenter Silo's binary SIB model format
2015-12-13 22:14:19 -08:00
Vertexwahn 3013b6b62f Added missing DLL suffix for VS2015 build. 2015-12-09 21:58:29 +01:00
Otger ffdcc78d91 Merge 2015-12-02 21:06:22 +01:00
Kim Kulling f896c3329a Build: remove deprecated third party lib from cmake 2015-11-30 12:52:49 +01:00
Otger 166ff63af9 Updated CMAKE - removed removed package inclusion 2015-11-29 21:20:31 +01:00
Otger 4f757cdf5a Implemented basic glTF exporter and improved the importer (plus some code refactor) 2015-11-29 19:13:51 +01:00
Otger b307ec643d Created exporter class and fixed a few bugs 2015-11-27 01:16:48 +01:00
Otger 148a20a703 Experimental support for glTF 2015-11-26 02:36:22 +01:00
Kim Kulling db8845d2b2 glTF: add jsn reader + example model to work on. 2015-11-25 22:03:39 +01:00
Danke Xie 57d7085fb8 Fix AndroidJNI header path in CMakelists.txt 2015-11-15 22:53:11 -08:00
Kim Kulling 4a8b459706 OpenDDLParser: latest greatest. 2015-10-01 20:29:15 +02:00
Kim Kulling 4619625b84 OpenGEX: add class for exporter. 2015-07-01 20:43:37 +02:00
Richard e4b0c27a2e Refactor: Strip trailing whitespace 2015-06-28 16:09:18 -06:00
Richard 1d96486437 Refactored: Reformat CMake files to conform to editor config 2015-06-28 15:50:57 -06:00
Kim Kulling 6249a1c06f CMake: add comment for openddl-parser configuration. 2015-06-23 21:28:13 +02:00
abma b4f5c57b3e allow to compile only enabled loaders 2015-05-06 23:15:15 +02:00
Madrich 71ae322e7b Merge pull request #5 from assimp/master
Update Fork
2015-05-01 23:01:33 +02:00
Madrich ca8a3909be Add StepExporter.cpp(stp) Export
Fix XFile
2015-05-01 21:40:51 +02:00
Highlife1911 4acb1d4c92 Removed FORCE attribute from CMake variable LIBRARY_SUFFIX 2015-05-01 14:13:28 +02:00
U-ORADEV\albihern 7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05:00
abma 8c45a4dc3b Merge remote-tracking branch 'origin'
Conflicts:
	code/C4DImporter.cpp
	code/OgreImporter.h
2015-04-16 01:03:00 +02:00
abma bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
Kim Kulling 12efa14777 add openddl_parser directly to assimp.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 11:37:58 +01:00
Kim Kulling 2717d51f7e Merge remote-tracking branch 'origin/master' into opengex_support
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ParsingUtils.h
2015-03-17 14:26:39 +01:00
ulf b71ded1ad0 - manually merged C4D importer code from acgessler branch
- manually merged IFC bugfixes and improvements from schrompf branch
2015-02-23 14:23:28 +01:00
OgreTransporter 4e8f7fb802 Fix Visual Studio prefixes 2015-02-08 12:26:29 +01:00
Kim Kulling 20b3ce6a40 replace opengexparser by using openddl-parser.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 12:47:53 +01:00
Kim Kulling 063b2733fc Merge branch 'master' into opengex_support 2015-01-31 11:09:20 +01:00
Kim Kulling 1ee4c06e4b add openddl-parser to contrib.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 11:07:48 +01:00
Ricardo Ortiz a94e668486 Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX
to have a consistent library name accross platforms.
2015-01-23 14:19:29 -05:00
Kim Kulling f84589fec4 Merge branch 'master' into opengex_support 2014-10-24 15:24:32 +02:00
Filip Wasil 88f6e8213b Android JNI asset extraction support (API 9+)
- installation fixes

Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 17:05:14 +02:00
Filip Wasil 7224476ee1 Android JNI asset extraction support (API 9+)
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 16:33:43 +02:00
Kim Kulling ed9a466c30 update:
- add OpenGEX parser sceleton
- add base datatypes for OpenGEX support.
2014-09-04 19:41:14 +02:00
Gargaj 2e9195819a start assxml exporter basics 2014-08-28 15:17:53 +02:00
Kim Kulling 8126dce94d update: add sceleton for OpenGEX importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-27 23:00:19 +02:00
acgessler 33ffb0003e Collada Export: escape user-defined strings in XML output. 2014-08-23 15:42:47 -07:00
abma aafc8d5f3f CMake: changed cached bools into "option" 2014-08-17 23:10:06 +02:00