Commit Graph

2373 Commits (ba4689fd0509fc33667671a20a56dcd51c0f16cd)

Author SHA1 Message Date
Albert Wang 0ea6ec4e84 Fixing some whitespace issues in ColladaParser 2012-11-12 12:39:11 -06:00
Albert Wang 7d4ee98350 Adjusting the Collada Color Parser
The collada parser parses the RGB descriptor out of the
xml file, but does not use this information when constructing
the actual mColors array.

If you export a collada file with RGB colors, and then import it,
it used to create color values in the form RGBR, taking the
R component from the next color tuple instead of filling in
sensible defaults for the alpha channel.

This patch uses the information to fill each color.
2012-11-12 12:33:51 -06:00
Séverin Lemaignan 6bcc5db350 [pyassimp] Minor formatting in README.md 2012-11-10 23:55:52 +01:00
Séverin Lemaignan d3dbde02d6 [pyassimp] Simplified and beautify simple_opengl_viewer.py
Since the new SDL based viewer is much better suited to interactive exploration, simplify
the basic OpenGL viewer to make it an easy introductive read.
2012-11-10 23:55:39 +01:00
Séverin Lemaignan 2cdda51455 [pyassimp] Added a new pygame/sdl based OpenGL viewer
This viwer uses a shader-based pipeline and has working keyboard/mouse
controls.

Makes a starting point for 'modern' OpenGL apps.
2012-11-10 23:52:42 +01:00
Séverin Lemaignan f1bf843b55 [pyassimp] Remove obsolete code 2012-11-10 23:02:11 +01:00
Séverin Lemaignan 76d2eb7057 [pyassimp] Rework material dict
- Normalize the names
- Do not create numpy arrays for the properties
2012-11-10 22:57:07 +01:00
Séverin Lemaignan bfbcdfbae1 [pyassimp] Fixed transformations in bounding box computation 2012-11-10 22:44:15 +01:00
aramis_acg 6d3cedc0b1 - add missing files from the last commit
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1334 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-10 16:01:55 +00:00
aramis_acg 0313e5b5b4 - add Séverin Lemaignan to CREDITS
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1333 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-09 11:43:57 +00:00
aramis_acg 4286c72e60 merge severin-lemaignan:for-upstream from github. This is a full rewrite of pyassimp, rendering it much easier to use.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1332 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-09 11:39:34 +00:00
ulfjorensen 81aef90f4a - manually pulled the three smaller change requests from Github.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1331 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-05 09:13:09 +00:00
aramis_acg 54040901f0 - update Assimp.NET
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1330 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-03 02:49:19 +00:00
aramis_acg 3f38d91e88 - Ifc: further improvements to opening caps algorithm.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1329 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-03 00:43:28 +00:00
aramis_acg 1553bd91f6 - Ifc: work on generating proper closing caps for openings generated by doing a boolean difference.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1328 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-02 23:56:38 +00:00
aramis_acg 7484dd379c - Ifc: revamped Quadrify() version now correctly clips overlapping non-rectangular windows.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1327 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-02 04:46:46 +00:00
aramis_acg ccf629bd19 - Ifc: allow arbitrary IfcSolidModel entities as difference operands for openings (rather than just IfcExtrudedAreaSolid et al).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1326 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-02 03:29:04 +00:00
aramis_acg 612f67da0a - Ifc: avoid duplicate points in opening contour lines, this sometimes screws up the clipping algorithm.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1325 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-01 21:36:39 +00:00
aramis_acg 11b2219b1a - Ifc: fix regressions caused by previous commit. This also fixes a bug which caused openings to appear at the wrong place.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1324 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-01 20:40:45 +00:00
kimmi 39ae26bfd8 bugfix : fix level 4 compiler warnings for Visual studio 2012.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1323 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-27 19:41:56 +00:00
ulfjorensen 2a580c5518 - fixed/changed/worked on issue 3580054 - XFile materials don't have ambient colours, but emissive
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1322 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-25 10:28:40 +00:00
aramis_acg d128e3d531 - Ifc: fix projection artifacts during opening generation.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1321 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 21:50:30 +00:00
aramis_acg c3adc004bf - Ifc: always remove degenerate geometry from geometric entities after finishing processing.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1320 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 19:12:18 +00:00
aramis_acg a598ac53b4 - Ifc: improve robustness towards degenerate geometry.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1319 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 18:52:48 +00:00
aramis_acg 33a50f515a - Ifc: move some utility functions to TempMesh. Add TempMesh::RemoveDegenerates() method.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1318 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 18:32:25 +00:00
aramis_acg 7ed1400c68 - Ifc: better handling of degenerate primitives occuring in clipping operations.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1317 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 18:10:56 +00:00
aramis_acg f6f2c087db - Ifc: skip lines during boolean differentiation between two solids.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1316 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 17:08:12 +00:00
aramis_acg d660ec35ad - Ifc: first attempt at also supporting extruded area solids for boolean differentiation.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1315 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 16:58:22 +00:00
aramis_acg 71fb04849c - Ifc: experimental code to connect window holes, commented by default.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1314 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 01:05:48 +00:00
aramis_acg 2f5475d50a - Ifc: [Quadrulation] use generalized matrix multiplication for projections. Add table to map from contours to the openings they originated from and from openings to the points that were generated from it.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1313 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-20 23:18:48 +00:00
aramis_acg a3d5b2e0d7 - Ifc: replace old algorithm to merge nested polygons with a version that reduces the problem to an instance of the quadrulate algorithm. This great reduces artifacts in walls.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1312 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-20 21:26:49 +00: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
aramis_acg 8a77193a33 - Ifc: more sanity clamping, improve error messages for degenerate windows.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1310 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-17 00:37:52 +00:00
aramis_acg f8974b7209 - Ifc: explicitly clamp some computations to [0,1] even if this is already their (arithmetically) defined range to improve numerical robustness.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1309 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-17 00:32:59 +00:00
aramis_acg 745a7383f6 Ifc: fix artifacts from window boundaries.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1308 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-17 00:04:24 +00:00
aramis_acg f329e1af6f - IFC: fix possible infinite recursion in QuadrifyPart()
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1307 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-16 21:27:01 +00:00
aramis_acg 39d13faf9a - Ifc: minor code cleanup.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1306 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-16 20:55:19 +00:00
aramis_acg 11a22b671b - IFC: revamp binary subtraction and opening generation logic, which now supports 90deg rotated opening proxies. The new version adds extra cleanup steps to prepare the data for processing by clipper. It also has a slightly refactored code base.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1305 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-16 19:51:00 +00:00
aramis_acg fa1016ddc8 - Ifc/Step: support line continuations in parser.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1304 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-02 14:19:24 +00:00
ulfjorensen 54a5088e14 - added a workaround to load Collada files correctly in case the "texcoord" attribute was missing in a <texture> element
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1303 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-09-24 08:45:23 +00:00
ulfjorensen 2944e7b210 - Added a workaround for some XFileExporter omitting separator chars at the end of data vectors
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1302 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-09-21 18:53:36 +00:00
ulfjorensen 62b0284100 - applied patch by peteredc to make the Collada loader write mesh names
- applied patch by asmaloney for better error messages in the Collada parser

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1301 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-09-21 08:44:37 +00:00
aramis_acg e22bb03f80 - IFC: fix face winding for IfcSweptDiskSolid geometry
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1300 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-09-10 01:28:19 +00:00
aramis_acg 15c0b8b955 - IFC: avoid artifacts in high-curvature regions (or the boundaries thereof) of IfcSweptDiskSolid elements.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1299 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-09-10 00:40:41 +00:00
Alexander Gessler c1cd88e9de - fbx: take shortest quaternion path when interpolating. 2012-08-26 20:10:01 +02:00
Alexander Gessler 310235dd5b - fbx: more warn policy tuning. 2012-08-26 18:58:08 +02:00
Alexander Gessler a1713052e5 - fbx: support reading LimbNode attachments, less Property70 warnings. 2012-08-26 18:53:15 +02:00
Alexander Gessler 5bc573edb8 - fbx: pre-filter animated property we don't support as early as possible. 2012-08-26 18:40:04 +02:00
Alexander Gessler 51d84dcfc0 - fbx: improve logging 2012-08-26 17:54:17 +02:00
Alexander Gessler 9ea7fc2856 - fbx: don't die if a file contains no GlobalSettings. 2012-08-26 17:45:09 +02:00