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

640 Commits (1ebd116dff21ca8e347676288bfda3056af18a8c)

Author SHA1 Message Date
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 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 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 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
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
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 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 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
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
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 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
rave3d c01d81c882 BUGFIX VC9 does not support unordered_map 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1075 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-04 07:40:25 +00:00
aramis_acg 78493b833c + Obj: implement exporting of p and l entities. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1074 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-27 23:32:53 +00:00
kimmi 40ed87e05c Bugfix : Fix patch. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1073 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-26 14:04:32 +00:00
kimmi 8928523266 - Committed the patch of Makr Page: VertexTriangleAdjacency set member. 
- Updated CREDITS.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1072 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-25 19:28:21 +00:00
aramis_acg ff705e6fa4 # Collada: allow empty meshes. Thanks to Mark Page for the patch (https://sourceforge.net/projects/assimp/forums/forum/817653/topic/4628297). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1071 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-23 16:27:07 +00:00
aramis_acg df63b4b3ed [3298060] OBJ: Add support for p and l elements 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1070 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-23 16:23:13 +00:00
aramis_acg ce08069399 - remove makefile from code, use CMake to generate one. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1068 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-22 20:47:24 +00:00
aramis_acg 9177c7df8d # fix float constant 'f' suffix 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1067 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-22 20:46:54 +00:00
aramis_acg 9d85c8834d - extract MaterialHelper and move all of its members to aiMaterial in /include. 
- pull in IOhannes' patch to set the gcc default visibility for all symbols to NO and to mark ASSIMP_API with __attribute__ ((visibility("default"))).
- drop unneeded ASSIMP_API from most internal classes in /code, we just need to keep some exports on Windows to keep AssimpView alive.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1066 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-22 20:22:51 +00:00
aramis_acg 9f32504792 [3393728] [PATCH 2/2] renamed MDL::IntSplittedGroupData_MDL7 to MDL::IntSplitGroupData_MDL7 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1065 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-20 22:01:46 +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 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 36b3695a31 - improve symmetry between Assimp::Importer and Assimp::Exporter. 
+ aiCopyScene -- a bit dysfunctional because we will also need getters and setters for all other scene components to avoid running into ownership & heap issues when users modify scenes.
# fix handling of postprocessing during exporting

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1061 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-04 08:53:59 +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 967e87d625 # ammendment to previous: take care for gcc.major > 4 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1059 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-28 21:53:52 +00:00
aramis_acg 4f5b36b850 # [3358562] disable the second set of LogFunctions<T>::LogXXX overloads, which cause trouble on Mac OSX with gcc 4.2 for reasons not totally comprehensible to me. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1058 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-28 12:23:39 +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 d29dde1646 # NoBoost: fix a critical issue in the foreach replacement. All local variables introduced by the loop header have longer, magic names now. This avoids unintended shadowing of other local variables. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1055 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-18 03:13:57 +00:00
aramis_acg de0b632e15 - IFC: implement the SameSense flag for IfcCompositeCurveSegment 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1053 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-18 02:17:36 +00:00
aramis_acg 409eb6cee7 - IFC: IfcTrimmingCurve sampling code now supports trimming by points rather than by parameter values. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1052 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-18 01:13:40 +00:00
aramis_acg 56a5230d3a # IFC: improve IfcTrimmedCurve implementation and support wrap-over parameters for closed, conic curves. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1051 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-17 23:35:39 +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
aramis_acg 0276a09a87 # Ifc: fix generation of wall openings, now no longer 'forgets' wall parts. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1043 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-15 21:51:33 +00:00
aramis_acg 47836d23e7 # fix vc10 compile warning 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1042 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-15 21:50:32 +00:00
kimmi b2c4963f72 Update : Add a hint for the source of the m3-data definition. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1041 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-15 11:15:10 +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 7ad99f3baf # lowercase include (mingw cross compile fix). Thanks to abma for the patch. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1038 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-14 16:59:18 +00:00
aramis_acg 29676ce70f # Fix gcc compile error (namespace ambiguous) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1034 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-06-14 16:46:33 +00:00