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

3271 Commits (e9f47b08c59096e3da133f03a1c7a51a9234c005)

Author SHA1 Message Date
aramis_acg c12fadc93b - make fast_atof_move a template and rename it to fast_atoreal_move. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1125 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-31 16:18:32 +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
kimmi 007dae433f Update : Boost lookup uses now additional versions ( thanks to Jonathan from zfx ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1123 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-25 18:33:46 +00:00
aramis_acg edd1e2e99a # Ifc: re-introduce the previous triangulation code algorithm, but use Clipper to clip to the outer contour line and poly2tri as fallback. 
# Ifc: fix a issue when closing window contours. Sometimes a corner would be left out.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1122 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-17 17:40:15 +00:00
aramis_acg ab6c348c2d # Ifc: if generating wall openings fails, revert to the original wall rather than leaving polygon crap. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1121 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-17 02:18:59 +00:00
aramis_acg 90fb1525b1 # fix vc9 pch settings 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1120 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-17 02:06:12 +00:00
aramis_acg de865532f4 # DXFLoader: EOLs. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1119 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-17 01:50:37 +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
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 000ef3de02 # IFCLoader: < predicate to order representations by use for us was accidentally a total ordering. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1114 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-15 13:51:34 +00:00
aramis_acg 81ef6af2df Apply patch [3473792] - LWS loader failed to find LWO files referenced with inaccessible, absolute paths, but actually residing in the folder of the LWS file. Applied the patch to FileSystemFilter, so all loaders do this now. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1113 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-15 13:46:21 +00:00
aramis_acg b29b69f42b - update README. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1112 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-13 17:49:18 +00:00
aramis_acg 3f369342d6 - Redesign the C interface to allow per-import settings. 
- Make C-API threadsafe even without boost (no longer a global importer <-> scene map).
- Cleanup headers.
- Change the way how Importer::pimpl is accessed - all users are no longer friends of Importer to avoid spoiling the public interface. Rather, pimpl is exposed via a public member function and anyone having the definition of ImporterPimpl can access it.

THIS IS A BREAKING API CHANGE for anyone using properties with the C API. It is, however, a huge step forward and finally makes our C API functionally equivalent to the C++ interface.

I hope we can adapt all ports as soon as possible. I'd be grateful if the respective maintainers could do this.

Documentation is not yet up to date.

All this is in anticipation to the upcoming 3.0 release, which I'm actively working on.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1111 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-13 14:07:58 +00:00
aramis_acg 20495de804 + add aiString::C_Str 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1110 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-13 00:44:27 +00:00
aramis_acg d3d82030c7 Fix [3472966] "The public include export.h has a reference to boost" 
See http://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3472966&group_id=226462

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1109 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-13 00:31:21 +00:00
aramis_acg 2c0965795c [ 3460982] Patch for Bug 3460978 - Obj loader not generating new objects for material groups. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1108 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-11 13:38:56 +00:00
aramis_acg e52a49a990 Fix [3472310] Unnecessary output in LWOImporter 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1107 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-11 09:41:48 +00:00
aramis_acg f7c232cfe8 merge git://github.com/gellule/assimp.git 
Before, neither the texture index nor its semantic were kept in the
returned output. Now GetMaterialProperties returns a (name, color,
material, texture) tuple. Name is the name of the material. Color is a
dictionary of color properties. Material is a dictionary of material
properties. Textures is a triply nested dictionary addressed by the
following: textures[index][semantic][key]. See assimp documentation for
the meaning of index, semantic, and keys in general.



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1106 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-11 00:27:49 +00:00
aramis_acg 380737c4c4 merge git://github.com/gellule/assimp.git 
the strings used in materials and elsewhere in assimp. Because of this,
in PyAssimp3 strings in materials don't work properly on 64 bits
platforms. This commit adds a StringUInt32 ctypes structure and use it
in GetMaterialProperties as a workaround.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1105 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-11 00:26:54 +00:00
aramis_acg aa189c0247 # TextureTransform-Step: fix memory leak due to uvtrafo keys not being deleted properly. This fixes [3463286]. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1104 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-04 15:27:56 +00:00
aramis_acg afd462045d - assimp export: fix small issue when guessing output file format. See https://sourceforge.net/projects/assimp/forums/forum/817653/topic/4922378 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1103 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-04 15:10:27 +00:00
kimmi 67e8e52a00 Fix a compiler warning. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1102 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-12-27 17:22:47 +00:00
aramis_acg 848b98e5be - doc: clarify wording in bone section. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1101 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-12-18 20:54:50 +00:00
aramis_acg 48e72d7851 - add gellule to CREDITS. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1100 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-12-12 12:29:50 +00:00
ulfjorensen a73397198c - Bugfix #3457587: correct decomposition of matrices with negative scaling. Thanks to anonymous google account user for the fix. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1099 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-12-12 08:44:48 +00:00
aramis_acg 3aad6f8b6d - add M3 loader to vc9 workspace. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1098 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-12-12 00:05:23 +00:00
aramis_acg d9f7df6bcd - LWSLoader: don't use free(). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1097 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-12-12 00:04:58 +00:00
aramis_acg 5957e9996b merge https://github.com/gellule/assimp.git 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1096 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-12-11 23:54:04 +00:00
aramis_acg 052ad0e3de # LWO: set layer skip parameter, thanks to gellule for the patch [https://sourceforge.net/projects/assimp/forums/forum/817654/topic/4853762] 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1095 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-12-01 12:24:33 +00:00
aramis_acg 34089b4596 # include <memory> for auto_ptr [3445528] 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1094 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-30 13:34:28 +00:00
aramis_acg 3548127f02 # PyAssimp3: add dynlib to dll search path. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1093 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-30 13:15:12 +00:00
aramis_acg 3d00f36faf # fix unit tests, although static linkage to Assimp is a requirement or symbols will be missing. This involves declaring some members of certain pp step classes public to give the tests access to them. Those are harmless and completely safe to use from outside, though. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1092 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-29 13:53:24 +00:00
aramis_acg 6dc3bc1c88 # PyAssimp: fix data type for aiString::length. Thanks to Gellule for the patch. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1091 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-29 13:34:48 +00:00
mmathias01 7b14ea616e Update iOS README.txt, improve iOS build script and toolchain files. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1090 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-24 11:58:24 +00:00
mmathias01 9a4386ad16 Initial iOS build script and CMake toolchain files. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1089 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-24 11:01:19 +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
mmathias01 213c6c95c3 Creating initial iOS port folder and README, real iOS build scripts to follow 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1087 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-24 07:28:22 +00:00
klickverbot db29c9a20d Spelling fixes, thanks to Jan Dittberner. 
This patch replaces »continously« with »continuously« and »treshold« with »threshold«.

(merged from https://github.com/assimp/assimp/pull/2)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1086 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-08 12:15:18 +00:00
kimmi ab71ca60c3 - Feature : First buggy prototype of the M3-loader for starcraft models. 
- Bugfix  : Fix some typo's in the obj-loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1085 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-10-31 08:34:55 +00:00
aramis_acg 255ed412d5 + add Exporter::RegisterExporter and Exporter::UnregisterExporter pair of methods. Make parts of the internal export interface public to allow custom exporters to be added on the fly. This is a non-breaking API change. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1084 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-10-15 13:37:59 +00:00
aramis_acg c807fd65f3 - no longer distinguish between textured and non-textured default materials. Also, do not spit out dummy texture names. This was once a workaround to get some viewers to display a dummy texture rather than a plain shaded asset, but this is no longer appropriate. This involves removal of the public #define AI_DEFAULT_TEXTURED_MATERIAL_NAME. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1083 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-10-15 10:28:36 +00:00
kimmi e8d8b23d52 Update : Add an architecture var to cmake. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1082 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-28 09:04:49 +00:00
kimmi 1a6f1cb3e1 Bugfix : Patch for the debian-builds: remove a g++ specific printf-format bug. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1081 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-28 08:30:44 +00:00
kimmi 142814070e Update : Add IOhannes to the CREDITS-file. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1080 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-23 16:46:45 +00:00
kimmi d5bd7009a6 - Update : Apply simple patch for debian-specific build-fixes: adapt architecture-macro. 
- Bugfix : Fix a type in FixNormalStep.
- Bugfix : Fix a missing exception in Obj-Importer, texture coordinate import.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1079 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-23 16:45:17 +00:00
ulfjorensen 487071be77 Bugfix: FCollada's special texture tag "bump" now maps to aiTEXTURE_NORMAL. Thanks to agent8261 for the hint 
Bugfix: AssimpView now properly skips the leading quotation mark when being executed with a file

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1078 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-14 09:41:48 +00:00
aramis_acg 1305376060 # PolyTools.h, fix point of declaration for GetArea2D, thanks to Joe Hermaszewski to point it out. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1077 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-05 13:13:30 +00:00
aramis_acg 4f1a95a584 # STLLoader: avoid potential division by zero. 
# irrMeshLoader: fix potentially uninitialized variable.
Thanks to erikbuck for pointing these out (http://sourceforge.net/projects/assimp/forums/forum/817653/topic/4691387).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1076 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-04 15:09:45 +00:00