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

222 Commits (3a7b8d4aa579c5f880547b5e4905529457592a99)

Author SHA1 Message Date
Matthew Waters cbcaa107eb cfileio: fix leaks by not closing files in the destructor 
Numerous importers rely on the default C++ IOSystem implementation
having the destructor close the file for them.  The C IOSystem wrapper
wasn't and instead assumed that the Close() method was going to be
called.

This brings the C IOSystem wrapper in line with the default C++ IOSystem
by having the destructor close the file.
 2016-10-18 00:35:56 +11:00
Kim Kulling 905e48a35c Buffered stream API for big files: add next try of a prototype.^ 2016-10-11 12:29:40 +02:00
Alexandr Arutjunov 9d40f36f87 [F] Fixed type in list. 
[+] Added function to metadata class for conveniance.
[*] Enumeration AI_INT changed to AI_INT32.
 2016-10-04 23:58:51 +03:00
Alexandr Arutjunov 3086a07e86 [*] Docs and build-files fixes. 2016-10-02 17:27:13 +03:00
Alexandr Arutjunov db54eb98e3 Merge branch 'import_amf' into import_x3d 2016-09-30 00:30:26 +03:00
Alexandr Arutjunov ef9b6a7375 [F] Removed UTF-8 BOM 2016-09-29 23:16:59 +03:00
Alexandr Arutjunov 3274951f2a [+] X3D importer. 2016-09-29 18:50:24 +03:00
Alexandr Arutjunov 0a25b076b8 Merge branch 'master' into import_amf 2016-09-28 17:51:59 +03:00
Alexandr Arutjunov 386128febc [+] Building AMF-importer. 2016-09-26 12:57:44 +03:00
Kim Kulling b50d734d75 IFC: Switch generated file to 2 files to fix issue related to <mingw4.9 ( 
Thanks Qt! )
 2016-09-23 19:48:38 +02:00
Alexandr Arutjunov a9284e5a95 [F] Removed unneeded definitions. 
[F] Add library for linker.
 2016-09-15 20:39:39 +03:00
Alexandr Arutjunov 65048d1ef7 [F] Removed Unicode BOM at file beginning. 2016-09-15 14:45:00 +03:00
Alexandr Arutjunov 40cfb45c74 [F] Not set option-variable (only define for compilation was set. 
[F] For adding library can not be used TARGET_LINK_LIBRARIES
 2016-09-13 13:29:12 +03:00
Alexandr Arutjunov a375344052 Merge branch 'master' into gltf_o3dgc 2016-09-10 10:37:32 +03:00
Kim Kulling 7cedd4ab89 CMake: fix buildCMake: fix build.. 2016-09-10 08:48:01 +02:00
Alexandr Arutjunov 5fe32caa6d Merge branch 'master' into gltf_o3dgc 2016-09-10 09:14:28 +03:00
Kim Kulling b22f93eabf 3MFImporter: add source group for visual dtudio. 2016-09-09 20:41:04 +02:00
Alexandr Arutjunov d49ad6c93e [*] Stylistic changes. 
[F] Added all files from Open3DGC codec to CMakeLists.txt
 2016-09-09 16:38:43 +03:00
Alexandr Arutjunov 2732e5d9b6 [F] Removed Unicode BOM. 2016-08-14 19:49:05 +03:00
Alexandr Arutjunov e0356b09be Merge branch 'master' into gltf_o3dgc 2016-08-14 16:49:53 +03:00
Alexandr Arutjunov 48f8c117e2 [F] Conditional compilation for Open3DGC-extension. 
[F] Flag comp_allow did not reset when mesh can not be encoded.
 2016-08-14 16:27:16 +03:00
Kim Kulling b916857659 closes https://github.com/assimp/assimp/issues/967: add unzip include path 
when no other version was found.
 2016-08-14 11:44:21 +02:00
Alexandr Arutjunov de70f5c028 [+] Added link to RT library when using Open3DGC-compression. 2016-08-13 17:44:58 +03:00
Alexandr Arutjunov 2e452205aa [+] Building of Open3DGC codec. 2016-08-03 03:40:53 +03:00
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
Gargaj ac5c1f9df1 add to cmake 2014-08-06 13:27:09 +02:00
Gargaj 3d5e1b5cbc add basic framework (files, etc) 2014-08-05 20:54:38 +02:00
Alexander Gessler 6fde07f7e5 Initial implementation of 3DS Exporter. Hierarchy exporting and smoothing groups missing. 2014-07-23 18:27:22 +02:00
Madrich ec2ce90654 Add Scene Author + AuthorTool 
Add XFileExporter
Add Collada Triangle+Line export
Fix Obj Comment
 2014-06-06 01:56:54 +02:00
Jonne Nauha fe87b09246 Move pstdint.h for <= VC9 under include. Apps that include the Assimp headers need to have this available, as its pulled in by metadata.h. Fixes #290. 2014-05-30 01:57:21 +03:00
Jonne Nauha 0b937c5a4b OgreImporter: Proper rewrite of the XML parser to OgreXmlSerializer. Now more robust for XML sources, previously had hardcoded expectations on the child node ordering. Implement common Skeleton class for both binary and xml serialization. Implement shared IVertexData with proper bone assignment to Assimp bone weights functionality. 2014-05-20 04:52:53 +03:00
Jonne Nauha 4b16b182be OgreImporter: Implement Ogre binary mesh support (.mesh). All Ogre3D SDK media samples tested to work. Assimp repo does not yet have binary versions of Ogre meshes. 2014-05-18 11:57:44 +03:00
Kim Kulling f6925db3d8 update: add cmake_mimimum_required statement to each cmake file 
for consistency
 2014-05-10 10:31:42 +02:00
Jonne Nauha fcb97bb595 OgreImporter: Rename .hpp to .h. Shuffled parsing utils to a single file. 2014-05-02 00:28:12 +03:00
Léo Terziman 7c3a039349 Merge remote-tracking branch 'official/master' into contrib 
Conflicts:
	include/assimp/matrix4x4.inl
	include/assimp/vector2.h
	include/assimp/vector3.h
 2014-04-22 14:32:59 +02:00
xantares 0e62405406 use standard BUILD_SHARED_LIB option. Install dll to <prefix>/bin (mingw) 2014-04-21 21:36:33 +02:00
Léo Terziman 8fad549649 Merge remote-tracking branch 'official/master' into contrib 2014-03-10 17:21:26 +01:00
Léo Terziman 29e3b82238 Fixed some header files in CMakeLists 2014-03-10 17:20:14 +01:00
Kim Kulling 34882177a9 bugfix: install_name should be set to absolute path to installed library in macosx build #226 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-03-06 00:06:19 +01:00
Léo Terziman 94f156f809 In Collada: added support for exporting uncompressed embeded textures as bitmap 2014-01-17 11:53:41 +01:00
Léo Terziman d28fc25c5c Merge commit 'cc3f8b82f9f6fb4b295a39a3f7ac55154145cc04' into contrib 
Conflicts:
	CMakeLists.txt
 2014-01-17 11:45:57 +01:00
Léo Terziman 053df6907a Removed precompiled header because of a bug when switching configuration in visual studio 2014-01-17 11:35:30 +01:00
Léo Terziman bfd3a206ea Improved CMakeLists.txt source groups 2014-01-17 11:24:16 +01:00
acgessler fbb1a79248 Update CMakeLists 2013-11-22 13:57:50 +01:00
Alexander Gessler 88da17a246 Drop M3 Importer. 2013-06-13 11:22:23 +02:00
Alexander Gessler 4b748c2442 - CMake: use precompiled headers when compiling for msvc. This makes compilation about 40% faster. 2013-04-20 23:15:59 +02:00
Alexander Gessler 94a012ae7a - add metadata.h to cmake. 2013-03-29 13:37:55 +01:00
rdiankov 16744d78d7 fixed the broken cmake config files (assimp-cmake), adding version suffix libraries 2013-02-26 14:02:35 +09:00
Alexander Gessler f7680f7f28 - Ifc: refactor code, move opening generation and boolean clipping code to separate units. 2013-02-07 09:51:33 +01:00
Alexander Gessler 03c01685d3 - STEP: support UTF16, UTF32 and Mac/Roman escape sequences. 2013-01-24 19:51:46 +01:00
Alexander Gessler ef0dcaaea2 - fbx: refactor, move DOM utility functions to separate unit. 2012-08-10 23:02:38 +02:00