Commit Graph

398 Commits (88340d0ce07bf08efe21d81b727bc45de75b1536)

Author SHA1 Message Date
Léo Terziman bac6b34504 Removing null characters from xml parser input to avoid parsing failures 2014-01-17 11:48:42 +01:00
Léo Terziman 2071b4fb2f Merge commit 'ca7542cf5d11ccde33e18365889343088bad9582' into contrib
Conflicts:
	CMakeLists.txt
	contrib/zlib/CMakeLists.txt
	contrib/zlib/zconf.h.included
2014-01-17 11:30:33 +01:00
Léo Terziman e4867646ab Small corrections for the upgrading of zlib 2014-01-17 11:25:22 +01:00
Alexander Gessler 639afc6f01 Apply patch from #168. Revert contrib/zlib/CMakeLists.txt hack from 561f3bc6ea, but leave all Zlib install stuff commented. 2013-10-29 00:52:47 +01:00
Alexander Gessler 561f3bc6ea Update CMakeLists.txt for zlib to build on MSVC again, closes #170. 2013-10-27 18:19:08 +01:00
Kim Kulling 1867a4a3a3 bugfix: add missing zconf file for cmake.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-14 20:09:35 +02:00
Kim Kulling b96cd522fa bugfix : add cmakein file for zlib.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-14 20:06:16 +02:00
Kim Kulling e88fcb27bf update: update zlib to version 1.2.8 ( see https://github.com/assimp/assimp/issues/134 )
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-14 19:27:40 +02:00
Jared Duke 9f2336e5d4 Fix Android compilation with STLport
Satisfy STLport's runtime_error constructor with an explicit string argument.
2013-08-20 20:02:07 -07:00
Kim Kulling d62c929b7a bugfix : fix compiler warning.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-08-15 20:51:34 +02:00
Alexander Gessler bae9db2f03 Merge branch 'master' of git://github.com/assimp/assimp 2012-12-21 16:24:05 +01:00
aramis_acg 0696d97399 - update clipper to v4.8.8
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1311 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-17 00:41:29 +00:00
acgessler 879f2ed177 - fix some -Wall warnings 2012-07-08 03:28:14 +02:00
kimmi 37fb338c1f - Update : Fix the M3-Importer: geometry import works.
- Update : Add a non-bsp example model for the m3-loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1176 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-19 09:10:04 +00:00
aramis_acg 4dbf539b44 - update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 03:38:30 +00:00
aramis_acg db3cee8501 # Ifc: fix bug while filling window contours.
# Ifc: filter out duplicate openings.
- poly2tri: change comparison epsilon to a more suitable value (found by trial&error).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1146 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 02:28:25 +00:00
aramis_acg 02fc5effba # poly2tri: fix Point::operator!= (http://code.google.com/p/poly2tri/issues/detail?id=38).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1135 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 03:05:41 +00:00
aramis_acg 850285b56e # poly2tri: add missing <stdexcept>
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1117 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 01:37:46 +00:00
aramis_acg 56eb2dd7ee + add polyclipper to assimp repository.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1116 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 01:19:20 +00:00
aramis_acg 1ebd116dff + add poly2tri to assimp repository.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1115 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 01:17:50 +00:00
aramis_acg 2ffac898d6 [3393728] [PATCH 1/2] ommit->omit and splitted->split
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1064 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-20 22:00:33 +00:00
aramis_acg 3db25db8e2 # when compiling with MSVC's C compiler, (void)param won't be accepted, omit it at all to avoid trouble.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1031 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 14:43:28 +00:00
aramis_acg 9edc0a9b8e merge with git://github.com/tonttu/assimp.git
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1029 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 14:29:32 +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 b0e9afea46 # update cppunit project file
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@936 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 14:23:49 +00:00
aramis_acg 118e2d1da7 Remove some vcproj.user files that managed to get into the repository by accident.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@787 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-21 07:52:27 +00:00
aramis_acg f7f8c90fa1 Fix missing zlib.h in ioapi.c.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@785 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-16 18:05:16 +00:00
aramis_acg 3204cf2736 Add conditional define to allow users to compile against their own zlib's.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@784 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-16 17:49:04 +00:00
ulfjorensen 3adce87c5c - Made it mostly compile again
- Updated VC9 project files

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@756 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-21 17:28:02 +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
aramis_acg 1b87557fd1 update to zlib 1.2.5.
blenderloader now reads gzip compressed files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@737 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-26 00:21:07 +00:00
aramis_acg 50264941dd [2972343] LightWave/modo patch. See http://sourceforge.net/tracker/index.php?func=detail&aid=2972343&group_id=226462&atid=1067634
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@618 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-18 17:20:49 +00:00
aramis_acg 5738860990 - Change BaseImporter::GetExtensionList to add all known file extensions to a std::set, so uniqueness is guaranteed. Also rewrite all related functions in Importer. NOTE: This does *not* change the public interface.
- FIX build error on vc8/release-noboost x64, ConvertUTF.c had wrong PCH settings.
- ADD knowext and listext verbs to assimp_cmd, add some raw docs.
- Update unit tests to reflect these changes. Currently I keep getting failures in some tests, this needs to be resolved *urgently*.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@567 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 17:38:01 +00:00
aramis_acg 17326515d4 Get rid of warnings on GCC4.4 with -wall
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@541 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-06 23:52:41 +00:00
aramis_acg a9ece90b81 FIX: Scons workspace was missing a reference to contrib/ConvertUTF.
FIX: assimp_cmd doesn't anymore execute ConvertToLeftHanded if only -fuv or -fwo is specified.
FIX: Amd64-Build with vc8 - invalid integer promotion
FIX: Remove '_asm int 3' debug stuff from IrrXML. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@512 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-12-14 17:17:41 +00:00
aramis_acg a251827cb9 Adding support for Unicode input files to most text file loaders (BVH and MD5 missing for now).
IrrXML receives memmapped UTF-8 input data now, it's own (faulty) conversion is not used anymore.
aiString's are explicitly UTF-8 now.
Slight refactorings and improvements.
Adding UTF-8/UTF-16 text files for ASE,obj,collada,ac3d. These contain various japanese/chinese character sequences.
Changing assimp_view's node view to display UTF-8 multibyte sequences correctly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@469 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-08-21 22:49:58 +00:00
ulfjorensen 98e53f976e - Bugfix: IrrXML loader ignores trailing whitespace on closing tags now
- Bugfix: Collada loader now filters bone vertex weights with weight zero - blame XSI collada export.
- Bugfix: Collada animation resolver now also considers IDs when searching for nodes by name

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@460 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-08-01 20:20:22 +00:00
aramis_acg 4bbc03332b General
- Added format auto-detection to most loaders
  - Simplified BaseImporter::CanRead() with some utility methods
  - improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
  - added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
  - vc8/vc9: revision number is now written to DLL version header
  - mkutil: some batch scripts to simplify tagging & building of release versions
  - some API cleanup
  - fixing some doxygen markup (+now explicit use of @file <filename>)
  - Icon for assimp_view and assimp_cmd

3DS
  - Normal vectors are not anymore inverted in some cases
  - Improved pivot handling
  - Improved handling of x-flipped meshes

Collada
  - fixed a minor bug (visual_scene element)

LWS 
  - WIP implementation. No animations yet, some bugs and crashes.
  - Animation system remains disabled, WIP code
  - many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.

STL
  - fixing a log warning which appears for every model
  - added binary&ascii test spider, exported from truespace

MD3 
  - Cleaning up output tags for automatically joined player models.


IRR
  - Fixing coordinate system issues. 
  - Instance handling improved.
  - Some of the reported crashes not yet fixed.

PretransformVertices
  - Numerous performance improvements.
  - Added config option to preserve the hierarchy during the step.

RemoveRedundantMaterials
  - Added config option to specify a list of materials which are kept in every case.

UNREAL
  - Added support for the old unreal data format (*.a,*.d,*.uc)
  - tested only with exports from Milkshape
  - more Unreal stuff to come soon



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
aramis_acg 03fcec7fe3 Removed direct STL dependency from the Assimp interface, should hopefully avoid problems with binary incompatible STLs. Some API changes, e.g. in the logger.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@321 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-23 21:06:43 +00:00
aramis_acg 7dabd7cd72 Enabled 'fast' STL for vc9. secure_stl=0 && iterator_debugging=0.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@318 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-21 21:33:56 +00:00
aramis_acg 3d5eae6be5 Moved some defines into the core, away from the public stuff.
Fixed build error regarding zutil.c with vc9.
Updated VC9 project files (again ...)
Moved version getters to aiVersion.h.
Deleted redundant fast_atof.h from irrXML.
Added vc9 config for cppunit
Fixed a missing include when building against stlport

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@307 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-19 19:34:34 +00:00
aramis_acg d41f570dc0 Added support for compressed x files (all files from dx sdk, except car2.x, work, no further tests yet).
Added a working makefile for mingw, provides more configs now. Not perfect yet.
Added decompression part of zlib (inflate).
Moved IrrXML to ./contrib dir.
Moved some IRR/IRRmesh shared code.
FIXME: makefile for gnu/linux is untested yet.
Code cleanup.
Unified #ifndef ASSIMP_BUILD_nnn_IMPORTER directives.
OBJ loader supports map_bump, map_ka, map_ks, map_ns now.
Endianess conversion in the ply loader is correct now.
Changed IRR/IRRMESH coordinate system conversion. Not absolutely right now, but better than before.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@305 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-18 23:48:25 +00:00
aramis_acg ce6ce098e9 Removed aiProcess_FindDegenerates from the viewer. The step seems to cause some problems that have not yet been solved.
Added irrmesh (Irrlicht Mesh Format) loader to Assimp. Works quite stable, but no lightmapping support yet.
Removed tinyxml, replaced it with irrxml instead. Added an IOStreamToIrrXML wrapper.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@194 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-24 20:37:54 +00:00
aramis_acg 8a879da320 Added tinyxml to the contrib dir.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@170 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-07 09:49:52 +00:00
aramis_acg 38d04b6796 MD5 bugfix.
WIP version of the OptimizeGraph-Step.
Added hashes to some string routines (speedup).
Improved property system for float and strings.
Refactoring code for computing normals from smoothinggroups.
Implemented C-ASSIMP.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@116 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-08-28 17:35:36 +00:00
kimmi b5c54703d0 Add ThreadID to default log stream output.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@106 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-08-11 19:17:33 +00:00
aramis_acg 0209fba554 Added cppunit_note.txt. The file contains a list of all changes I made to cppunit to be as slim as possible.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@71 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-07-28 19:52:39 +00:00
aramis_acg c1b6f29854 Added cppunit to the ./contrib dir. Build config for x64 and dll builds (some bugs remaining, but most configs are working)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@70 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-07-24 11:19:24 +00:00