Commit Graph

619 Commits (4f1a95a584c403899fff8384e417f3f0494ff156)

Author SHA1 Message Date
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
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 ffdb479411 + Blender: read specular hardness. Thanks to Marvin for the patch.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1032 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 15:10:54 +00:00
aramis_acg e479ca33d4 manual IFC merge, forgot some points
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1030 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 14:29:46 +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
ulfjorensen 2de55ee880 Bugfix: apply transformation as well when filtering out empty proxy nodes in XFile imports. Thanks to Magnus Norddahl for the patch
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1028 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-08 12:25:03 +00:00
aramis_acg 323b9d8400 # make source UV index for tangent space computation configurable via the AI_CONFIG_PP_CT_TEXTURE_CHANNEL_INDEX option.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1027 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-02 14:02:30 +00:00
aramis_acg 2f4989a35d # include <memory> and <typeinfo>, which were missing if compiled with the boost workaround enabled
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1026 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 18:15:50 +00:00
aramis_acg 1aab7e4a5e # noboost.tuple: prefix access of nested, but dependent templates with template<> for ISO compliance
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1025 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 18:14:16 +00:00
aramis_acg 89b6c2b288 # make noboost`s BOOST_FOREACH work with const containers
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1024 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 18:13:13 +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 b9f14beb76 - IFC: use boost::make_shared to cut the number of allocations by 50%.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1022 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 17:37:17 +00:00
aramis_acg 326b11b72f # bugfix boost workaround, shared_ptr didn't offer a const operator*
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1021 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 17:35:17 +00:00
aramis_acg a4e371af4b # fic gcc compile error caused by a temporary beeing accidentially bound to a non-const reference
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1020 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 14:33:46 +00:00
aramis_acg 1e2dd3eefc - IFC: use smart pointers to keep STEP-SELECT entities in the converted output data structures. This allows us to free the original parameter tuples early as ownership of their members can be transferred. This cuts down memory overhead to 8x (assuming a typical x64 builds) and reduces loading time on average by ~5% as measured on my system.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1019 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 14:23:43 +00:00
aramis_acg 228be125cf # really fix false negative reading compressed x files. Silently ignore out-of-bounds indices.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1017 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 13:27:52 +00:00
aramis_acg 15565c4858 # IFC: fix potential crash during merging of polygon boundaries
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1016 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 21:04:11 +00:00
aramis_acg 23ea1ac97d # STEP: reduce memory overhead of STEP reader. A typical x64 build now has approx. 10x overhead (compared to the size of the file being read), as opposed to 20-40x that it had before.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1015 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 20:17:57 +00:00
aramis_acg bf7b1d3514 # IFC: track references only for the types for which we actually need reverse indices. On average, this results in a 10% reduction in memory usage and a 5% speed improvement.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1014 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 15:38:48 +00:00
aramis_acg af8533a0bf # IFC: add workaround to read malformed files that contain IFCSIUNIT elements with the first field not set, which is not allowed by the IFC2X3 specification.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1013 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 14:52:39 +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 799ae75d67 # Obj: add missing check for empty normals, which caused models with no or partial normal sets to fail in some cases.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1010 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-29 20:38:46 +00:00