6e7722c92f
Merge branch 'master' of github.com:assimp/assimp
2013-01-21 21:11:46 +01:00
58f087e04d
- Ifc: fix boolean differentiation for 3D openings to avoid having duplicate contour lines or inner points in the contour data that gets used as input for window cap generation. This solves various instances of 'crossing' caps in windows.
2013-01-21 21:11:16 +01:00
b47a3a5968
Deprecate README
2013-01-20 22:52:52 +01:00
d3b951ecf7
Update Readme.md
2013-01-20 22:52:17 +01:00
470f4f3757
- Ifc: fix another indexing error.
2013-01-20 17:40:09 +01:00
0e5db8a369
- Ifc: fix loop indexing error in detection of overlapping window contours. Improve numerical robustness of intersection tests by explicitly catching a/b=inf.
2013-01-20 15:40:36 +01:00
23a2ff629c
- Ifc: drop flawed assertion.
2013-01-20 15:16:20 +01:00
29a7126589
Merge git://github.com/bjowi/assimp
2013-01-20 13:33:03 +01:00
4dcc2f4bf8
These variables should have the ASSIMP_ prefix
2013-01-20 13:51:04 +01:00
aca543176d
- more vc12 fixes
2013-01-20 04:00:34 +01:00
c42db3e9db
Add FBX to Readme.md
2013-01-20 02:50:51 +01:00
c50926b43b
Merge pull request #10 from severin-lemaignan/for-upstream
...
[pyassimp] New sample application based on SDL/pygame + various fixes
2013-01-19 17:48:22 -08:00
e1b5a1db22
Update Readme.md
2013-01-19 17:07:23 +01:00
f7106887cc
- some fixes for vc12
2013-01-19 17:00:14 +01:00
4e27339f5b
Revert "- update readme to describe my fbx work and to link to blenderwiki."
...
This reverts commit bd98ee8681
2013-01-19 16:37:18 +01:00
7fd44f4ab7
Merge branch 'master' of git://github.com/assimp/assimp
2013-01-19 16:35:28 +01:00
ab9587dd1e
Merge pull request #12 from ccxvii/master
...
Precision fix and Collada robustness fix.
2013-01-15 12:04:48 -08:00
e7aeb8e08b
Merge pull request #13 from rodrigob/master
...
Fixes to pyassimp
2013-01-15 00:53:48 -08:00
cc88a3a0de
update : add displacement map support to obj-material importer. this feature is supported by some special exporters.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1347 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2013-01-07 21:05:53 +00:00
b993509087
- update vc9 workspace after merge.
2012-12-21 16:28:30 +01:00
bae9db2f03
Merge branch 'master' of git://github.com/assimp/assimp
2012-12-21 16:24:05 +01:00
84939d5aec
- fixed preprocessor checks for some importers
...
- fixed warning about shadowing variables in quaternion.h
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1346 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-20 11:43:09 +00:00
f507994299
- Ifc: vastly improved algorithm for fixing up window caps.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1345 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-19 02:24:06 +00:00
01972bbbcf
bugfix : Fix a memory leak in the obj-loader.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1344 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-08 12:28:06 +00:00
4ccf4c751a
Merge git://github.com/assimp/assimp
2012-12-07 21:57:42 +01:00
7b253016b7
Fixing compilation on gcc 4.5.2
2012-12-07 21:57:39 +01:00
ac7d7d20c9
- fixed compilation error on GCC in IFC loader. Thanks to larsp for the report!
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1343 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-04 07:42:15 +00:00
e88f6ef227
- copy&paste error in aiColor3D::operator- apparently nobody's using these. Thanks to Robin Tucker for pointing this out
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1342 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-03 12:00:36 +00:00
f07f520798
Merge github.com:rodrigob/assimp
2012-11-29 19:08:32 +01:00
c883967735
Fixed pyassimp core.py
2012-11-29 19:07:56 +01:00
24927ff4cc
fixed sample.py
2012-11-29 19:06:26 +01:00
ddea19ead1
- triangulation: re-introduce special handling for quads, now with proper support for concave quads. This should *really* fix [3429812], but it leaves me to suspect bugs in the general-purpose triangulation code for ngons.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1341 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-29 15:25:09 +00:00
771d804c46
ColladaParser: Tolerate empty data arrays and controller weights.
2012-11-28 13:02:51 +01:00
c40b767016
Matrix to Quaternion conversion precision fix.
...
See below links for reasoning, but in short, avoid sqrt and division
of small values. It's also possible to normalize the quaternion after
the conversion, but better precision is preferable.
http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/index.htm
http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/ethan.htm
2012-11-28 13:02:51 +01:00
477995f860
- Ifc: fix lost line that causes compile errors in debug build, WIP work on removing overlapping window caps.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1340 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-27 19:59:09 +00:00
c338b665ed
- applied patch to fix compilation errors with CLang following issue #3590305
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1339 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-27 18:40:38 +00:00
d395e88670
- Ifc: more refactoring in the window generation code.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1338 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-18 19:41:26 +00:00
b7ee62080a
- Ifc: refactor opening/window generation code.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1337 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-18 16:36:38 +00:00
30ce13a617
Github merge: Adjusting the Collada Color Parser from albert-wang.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1336 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-17 12:47:15 +00:00
e3e8c92546
- Ifc: since overlapping opening bounding boxes cause lots of trouble, we now try to avoid them in a subset of all cases. This is possible whenever two openings overlap in a way that their bounding boxes can easily be made disjunct by differentiating the polygons.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1335 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-17 02:04:53 +00:00
0ea6ec4e84
Fixing some whitespace issues in ColladaParser
2012-11-12 12:39:11 -06:00
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
6bcc5db350
[pyassimp] Minor formatting in README.md
2012-11-10 23:55:52 +01:00
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
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
f1bf843b55
[pyassimp] Remove obsolete code
2012-11-10 23:02:11 +01:00
76d2eb7057
[pyassimp] Rework material dict
...
- Normalize the names
- Do not create numpy arrays for the properties
2012-11-10 22:57:07 +01:00
bfbcdfbae1
[pyassimp] Fixed transformations in bounding box computation
2012-11-10 22:44:15 +01:00
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
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
Alexander Gessler
Björn Wingman
Kim Kulling
kimmi
ulfjorensen
aramis_acg
Rodrigo Benenson
Tor Andersson
Albert Wang
Séverin Lemaignan
Séverin Lemaignan