Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,501 Commits 19 Branches 43 Tags
e2addcee77473218b9480ce40089cb4a188fd310
Commit Graph

114 Commits

Author SHA1 Message Date
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