Commit Graph

369 Commits (bab8b8dbabfe87b912252167bc503916127747a3)

Author SHA1 Message Date
Kim Kulling cecab969c6 IFC: introduce new namespace fpr IFC-schema2x3 2018-01-13 10:27:45 +01:00
Kim Kulling 0fff3b1232
Merge branch 'master' into master 2018-01-08 15:36:03 +01:00
Alexis Breust 559bc38e5d Embedding images post-process 2018-01-08 09:26:52 +01:00
Christian Meurin 5ef13e7b38
Merge branch 'master' into master 2018-01-07 11:34:18 -08:00
BuildTools 66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Kim Kulling c66c7d7ae6 remove ctest to make workspace more readable. 2018-01-03 17:22:07 +01:00
Kim Kulling 8e413ac1e3
Merge branch 'master' into export_3mf 2017-11-27 22:50:17 +01:00
Kim Kulling 3dfca3bc84 3MF: add export to a given archive. 2017-11-27 21:48:33 +01:00
Kim Kulling c22b4acd47 3MF: Export initial commit. 2017-11-20 22:36:17 +01:00
Mika Rautio 4fb5038fb1 Add support for building Mac OS X Framework bundles 2017-11-20 00:10:05 +02:00
Kim Kulling f49de6ecfe closes https://github.com/assimp/assimp/issues/1514: add postprocess step for scaling 2017-10-29 20:28:59 +01:00
Kim Kulling d139b4d180 Merge pull request #1423 from Matter-and-Form/feature/gltf2
glTF 2 Importer + glTF 2 Spec Conformity
2017-09-13 20:01:38 +02:00
Kim Kulling cbedc448c6 closes https://github.com/assimp/assimp/issues/1426: add Defines.h to include folder for install. 2017-09-12 18:59:38 +02:00
Daniel Hritzkiv 63d3655f1b
Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List 2017-09-11 10:50:36 -04:00
Kim Kulling 44e2ba541f Merge pull request #1363 from jamesgk/gltf2
glTF2 export support
2017-07-29 15:08:52 +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
jamesgk d7cbbaf23e Compile with glTF2 export option (currently same as glTF1 output) 2017-07-25 17:34:03 -07:00
Patrick Dähne 457dff1bf1 X3D importer: Implemented support for binary X3D files 2017-07-11 19:28:40 +02:00
Kim Kulling afb2f3036e OpenDDLParser: latest greatest. 2017-06-25 13:21:36 +02:00
Kim Kulling 612ac234c5 SceneCombiner: move header for scenecombiner to public folder. 2017-06-21 14:21:16 +02:00
Kim Kulling d7e13e67c4 Utf8: integrate new lib. 2017-06-17 19:38:47 +02:00
Kim Kulling febf94f6aa Merge pull request #1212 from aoowweenn/umw_dev
MikuMikuDance Format
2017-05-17 12:01:46 +02:00
VennGrayDog 3d05df2d3e Fix location of config.h 2017-05-14 15:09:31 -04:00
Squareys cfb867b5e7 Fix config.h not being found during install 2017-05-09 21:51:49 +02:00
Kim Kulling a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Helio Chissini de Castro 4a0171bd82 - Apply mechanism to decide use for IrrXML external or internal
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.

Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists

Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
2017-04-29 08:10:44 +02:00
Guillaume Bittoun 0e3956caf1 Compilation fix: Removing the vector4 headers from code/CMakeLists.txt 2017-04-08 23:25:39 +02:00
Kim Kulling 2825d2daf8 Merge branch 'master' of https://github.com/assimp/assimp 2017-04-07 17:50:20 +02:00
Kim Kulling 38fab5ae8e doc updatedoc update 2017-04-07 17:46:53 +02:00
Andre Schulz 0f6782df27 Fix PDB file installation in RelWithDebInfo configuration 2017-04-01 16:03:01 +02:00
aoowweenn 51dae22828 merge master and adjust assimp/DefaultIOSystem.h 2017-03-27 22:35:19 +08:00
Kim Kulling 1c6145b39e Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api 2017-03-11 18:19:36 +01:00
aoowweenn 83db3fc084 fixup! remove dependency of ICU library 2017-03-05 23:14:21 +08:00
aoowweenn 7226d73682 merge master and mv FindDevIL to cmake-modules 2017-03-05 23:07:06 +08:00
aoowweenn 34906071fc remove dependency of ICU library 2017-03-05 22:59:53 +08:00
Antoine Bolvy 5dd1bb9d6c Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/ 2017-02-28 11:44:04 +09:00
Antoine Bolvy d77989088c Allow to enable importers in a whitelist manner 2017-02-28 11:42:53 +09:00
UMW e80d3aa9d4 finish mesh creation 2017-02-27 21:02:58 +08:00
aoowweenn 4045466f73 pass through but panic 2017-02-24 08:35:15 +08:00
Kim Kulling f121e2eb66 Fixes https://github.com/assimp/assimp/issues/1143: fix build. 2017-01-19 11:18:33 +01:00
Antti Määttä 9621dff027 Morph animation support for collada 2017-01-12 13:41:32 +02:00
Mika Rautio 8929760b3e Add better MinGW support for IFCReaderGen big objects 2016-12-05 12:57:05 +02:00
Mika Rautio 17fc3eea8f Do not build exporter if its importer is not built 2016-12-05 11:12:46 +02:00
Kim Kulling 43e1cae2ea Fix appveyor build: disable bugger mingw config. 2016-11-28 10:40:10 +01:00
Kim Kulling a9c5b6f1be Ensure that filelist for assimp lib is not empty for coveralls. 2016-11-17 19:57:24 +01:00
Jared Mulconry eceb61b854 Fixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set
for the 1 and 2-suffixed versions introduced in
commit 0a25b076b8.
2016-11-14 22:52:29 +11:00
Kim Kulling cbe2e9af49 Merge branch 'master' into new_obj_stream_handling 2016-10-22 21:04:02 +02:00
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
Alexander Gessler 24ce9495fd - fbx: add binary reading draft. Started from scratch after my first attempt had design flaws. The binary reader now sits on the lexer stage (really) and generates a (fake) token sequence similar to the text lexer's output - this means most parsing code can go unaffected. 2012-08-09 02:08:12 +02:00
Alexander Gessler 06acead438 - fbx: read deformers (Skin and Cluster). 2012-07-26 18:05:24 +02:00
Alexander Gessler b66dfc85e1 - fbx: read NodeAttribute and Camera. 2012-07-26 03:42:02 +02:00
Alexander Gessler 776d8e339b Merge branch 'master' of https://github.com/assimp/assimp 2012-07-24 03:30:47 +02:00
Alexander Gessler 67c55990cd - fbx: initial code to read animations plus the accompanying DOM classes. 2012-07-21 00:45:37 +02:00
aramis_acg aaf0be0bbf - CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, DirectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-17 22:56:15 +00:00
acgessler 8ec96d88c5 update CMake build 2012-07-07 21:11:09 +02:00
Alexander Gessler 0c0c9bce66 - update CMakeLists 2012-06-28 20:03:29 +02:00
acgessler b6d0f05143 - update CMakeLists. 2012-06-23 03:38:44 +02:00
kimmi 526150a8e3 Update: Debian-related cmake changes ( I changed the revision to 1256 instead of 1251 ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1256 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-11 11:49:08 +00:00
kimmi 97995e41f4 Debian-specific adapting cmake.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1255 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-05 19:30:45 +00:00
kimmi 7cb9438522 Refactoring : Move sources into one source variable to avoid redundant code.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1245 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-05-01 10:33:55 +00:00
aramis_acg adfef670cc - rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1240 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-22 23:14:39 +00:00
aramis_acg e479355d0a + add aiImporterDesc API to hold importer meta information.
- cleanup some Importer APIs: FindLoader -> GetImporter, add some utility APIs. Note that this is a breaking API change.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1232 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-18 23:07:52 +00:00
aramis_acg 397603bac0 + add XGL/ZGL importer. Some features (includes, object refs, textures not supported yet).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1210 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 16:52:33 +00:00
jonathanklein 3ed356d3c4 Ogre Importer: Support for Shared Geometry, as exported by Blender2Ogre for Blender 2.6 (still experimental)
CleanUp for OgreImporter (splitted the big file in smaller ones)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1190 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-07 22:42:40 +00:00
jonathanklein 521088e134 Ogre:
- better support for OgreXmlConverter generated files

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1177 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-20 10:27:27 +00:00
jonathanklein eebba5348d - Added Debug Postfix
- added Viewer Installer

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1172 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 10:55:47 +00:00
aramis_acg 08fe2e7d20 + add Ply exporter.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1169 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-16 02:11:29 +00:00
aramis_acg 6fa251c2f2 - unify naming of all header files. Obviously, this is a breaking change that affects all users.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1150 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:04:06 +00:00
aramis_acg 075b1acaf0 - move include/ to include/assimp/ to have consistent header locations between installed and trunk version.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1148 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 16:25:12 +00:00
aramis_acg ea3f655c57 - templatize math library. All standard math classes (i.e. aiMatrix4x4) have been replaced by templates which are usually named like the old type with a 't' postfix. For compatibility, typedefs to replace the old types exist. For the C interface, these still map to raw structures.
While principally backwards-compatible, this is still a breaking change since I also changed some method signatures (i.e. aiVector3t<TReal>(TReal) is now explicit). Normal users should not be affected, though.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1129 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 02:06:08 +00:00
kimmi 16a5bef3ba Bugfix: Bugfixes fror VS 2010 with CMake ( thanks to Jonathan Klein ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1124 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-25 18:42:14 +00:00
aramis_acg ad759f6efe - Ifc: use a combination of clipper and poly2tri to triangulate arbitrary polygons with arbitrarily-shaped holes (the former to workaround the cases not supported by the latter ...). Issues with doors et al. (i.e. openings touching the outer contour of a wall polygon) remain and are yet to be solved. Overall, this change should make IfcLoader much more robust, though. Since this means that the previous algorithm to triangulate walls is dropped altogether, regressions are highly likely.
Note 1: there are cases in which the previous algorithm may have produced 'better' triangles, but my big hope is that poly2tri's CDT implementation will implement more advanced refinement algorithms over time.

Note 2: This issue http://code.google.com/p/poly2tri/issues/detail?id=34 is relevant, first versions of my poly2tri embedding would indeed stackoverflow or assert. I somehow avoided this by using Clipper as prepass and scaling the entire polygon to 0..1 range (as recommended).


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1118 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 01:49:17 +00:00
mmathias01 2c0b36bc45 Update CMake environment to accept BUILD_STATIC_LIB option to allow building of static library for platforms that require it (such as iOS). Sorry if I overstepped any bounds here; feel free to revert if required.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1088 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-11-24 10:59:09 +00:00
aramis_acg 45b0ccfc92 + experimental STL exporter.
- improve process handling during exporting. This is still WIP.
+ BaseProcess::RequireVerboseFormat.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1062 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-04 11:27:13 +00:00
aramis_acg 665f73861e - move importer and postprocessing step construction chain to separate files to make them available to the exporter part.
+ introduce aiScene::mPrivate. This is a potentially breaking API change. The new member is added at the end of the structure though, so serious regressions are not to be expected.
+ add a mPreprocessing parameter to all Export API calls. Allow exporters to specify further PP steps to be executed prior to handing control to them. The entire export API now operates on a copy of the scene that the user passed in.
- mass refactoring: all constructors of BaseProcess/BaseImporter inherited classes are public now and Importer will perhaps feel a bit sad after having loft all of its friends.
# fix const correctness in SceneCombiner


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1060 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-01 20:58:31 +00:00
aramis_acg c58480d608 + first version of OBJ exporter
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1056 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-19 21:41:59 +00:00
aramis_acg a7e43173db git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1046 67173fc5-114c-0410-ac8e-9d2fd5bffc1f 2011-07-17 01:09:56 +00:00
kimmi cd963608c6 Feature : Add first M3-format deta definitions and a prototype importer for M3-models. Many thanks to libm3 for their great work ( see http://code.google.com/p/libm3/ ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1040 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-15 11:13:42 +00:00
aramis_acg 81ad224f84 - IFC: Refactor source to simplify maintenance.
- IFC: rate all available representations by a simple ranking system and take the one that is easiest to load. This should avoid loading the same geometry twice. Also it might result in quality improvements when BRep geometry is avoided in favour of extrusion geometry.
# IFC: Various bugfixes related to geometry loading.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1033 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-14 15:58:22 +00:00
aramis_acg 68a10dd1b0 + add dummy implementation of make_shared to boost workaround (unlike the original, it does *not* offer any performance benefits).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1023 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 17:38:22 +00:00
aramis_acg e7c9e4d5aa [3309083] Allow external unzip, and buildsys cleanup (many thanks to Rick Mattes for the patch).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1011 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 14:13:33 +00:00
aramis_acg bce502c0bc - update CMakeLists.txt, fix a small typo
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1003 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-13 00:54:53 +00:00
aramis_acg c05acabea9 - update cmake build environment, now includes targets to build debian packages for Assimp.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@997 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-09 19:34:21 +00:00
aramis_acg c55509132b - IFC: implement automatic conversion from polygons with holes to polygons that consist of only one piece and are thus applicable to triangulation by ear-cutting. This solves many of the broken windows that would fall victim to z-fighting in earlier revisions.
- IFC: reduce logging overhead
- Move parts of IFC and BLENDs logging code to a shared implementation.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@994 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-09 18:00:55 +00:00
aramis_acg 1400ae79e7 + add first prototype version of the IFC-STEP loader. Loads many test models fine but does not support some of the more sophisticated format features.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@979 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-06 23:55:38 +00:00
aramis_acg a6e0a5075f + integrate Debone-Process into Assimp. This step was contributed by mick-p, see [3262561] (https://sourceforge.net/tracker/?func=detail&aid=3262561&group_id=226462&atid=1067634)
- refactor ProcessHelper.h. Some functions now reside in ProcessHelper.cpp, which is new.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@946 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-15 15:09:53 +00:00
aramis_acg 2c83543b39 - remove aiAssert, use a plain assert instead. This removes the exit() call in Assimp.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@943 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-06 12:06:40 +00:00
aramis_acg f8add9bb22 -add missing unit to cmake script for assimp_cmd, fix linux build trouble.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@934 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 11:44:09 +00:00
aramis_acg 4bde6808b2 - CMakeLists: turn on export functionality by default, offer NO_EXPORT option to turn it off.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@931 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 11:21:34 +00:00
aramis_acg ee827e8870 - update CMakeLists. However, the export interface still remains disabled.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@914 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-08 16:15:09 +00:00
aramis_acg 4a88e50aa4 - revamp DXF loader. It now correctly distinguishes BLOCKS and ENTITIES and resolves cross references to entities from a block. Support for block-based coordinate-space transformations. Better polymesh handling. Improve error reporting. Refactor loader structure: the class itself is now stateless, reading is done using LineSplitter.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@905 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-22 19:58:29 +00:00
kimmi f1d02ecd5d - UPDATE : Add missing files for export-API.
- UPDATE : Disable export API for temporary until implementation is finished.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@890 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-09 19:39:42 +00:00
kimmi bd92f15128 - BUGFIX : Fix aiQuaternion::nomalize method.
- UPDATE : Improve performance by avoiding multiple divisions.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@873 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-27 13:53:34 +00:00
klickverbot 140efeadc0 Bump the SOVERSION on CMake builds as well.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@855 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 19:01:22 +00:00
klickverbot 76e15fd5c9 Use the *_SECURE_NO_WARNINGS defines for MSVC 2010 as well.
MSVC is Windows-only anyway, so I removed the extra check.
The version check could probably be just MSVC since I can think of no way the defines would break older or future versions.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@840 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-10 21:54:05 +00:00
aramis_acg c5c5338397 Add first version of the planned progress feedback API to the public Cpp API. Currently, progress reporting is done between each major import stage.
Fix various issues with the vc9 solution and assimp_cmd.
Declare some more Importer methods const. This marks them as safe to use from within a progress callback.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@806 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-26 18:16:12 +00:00
klickverbot 9cc61781d0 Changes forgotten in the previous commit – the code was moved out to the top-level CMakeLists.txt.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@803 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-25 16:55:38 +00:00
aramis_acg 81bebcd0ec Add basic support for the IZWARE NENDO file format (extension: ndo). The loader has been tested with files in format version 1.0, 1.1 and 1.2. Materials and textures are read but ignored for now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@791 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-09 08:24:16 +00:00
aramis_acg aae8637666 Add GLOB_MEASURE_TIME configuration option to profile the runtime of the postprocessing steps.
Start new documentation page for Performance/Profiling questions.
Migrate existing notes on multithreading to a new doc page, add more details.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@772 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-08 22:44:44 +00:00
aramis_acg d082330cea BLENDER: Fix potential stack overflow caused by a DOM object referencing itself.
Add general infrastructure to apply modifiers.
Implement mirror and subdivision modifiers using existing stuff.
Update BlenderDNA with related structures.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@763 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-07 14:50:19 +00:00
kimmi f017b5a4a4 - FEATURE : First version of PK3 format loader.
- FEATURE : First prototype of Quake 3 BSP format loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@755 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-18 17:36:46 +00:00