Commit Graph

1491 Commits

Author SHA1 Message Date
Kim
fbe408dd2e update : implement obj-support for normal maps.
refactoring : some improvements for more readable code.

Signed-off-by: Kim <Kulling>
2013-01-26 14:11:57 +01:00
ulf
0f781516bf Merge branch 'master' of https://github.com/albert-wang/assimp
Conflicts:
	code/ColladaParser.cpp
2013-01-25 19:08:10 +01:00
Alexander Gessler
e375a1c944 Merge branch 'master' of github.com:assimp/assimp 2013-01-25 08:09:57 +01:00
Alexander Gessler
b90882a4cb - Ifc: more opening tweaks, half a step back again. 2013-01-25 08:09:32 +01:00
Alexander Gessler
d4bcd3ab69 - Ifc: [openings] more fine-tuning and some debugging aid. 2013-01-25 07:42:51 +01:00
Alexander Gessler
713894032a Merge pull request #16 from jdduke/master
Fix compilation under VC10 with Boost 1.49.0
2013-01-24 21:27:47 -08:00
Alexander Gessler
1a60697282 - Ifc: more opening tweaks. 2013-01-25 05:55:32 +01:00
Alexander Gessler
302fad13b0 - Ifc: [openings] don't accidentally mirror stuff when projecting onto 2D planes. 2013-01-25 05:16:02 +01:00
Jared Duke
528c7c7737 Update code/STEPFileEncoding.cpp
Fixing Boost 1.48 build.
2013-01-24 19:45:42 -08:00
Jared Duke
20506ead3c Update code/FBXConverter.cpp
Fixing VC10 build.
2013-01-24 19:44:08 -08:00
Alexander Gessler
af0d4ef3da - Ifc: clean up temporary wall points when switching from horizontal to vertical openings. 2013-01-25 04:35:30 +01:00
Alexander Gessler
9647c87c7c - Ifc: no need to generate contour skiplist twice. 2013-01-25 04:19:12 +01:00
Alexander Gessler
bbd10cd748 - Ifc: fix normalization of base mesh normal for opening generation. 2013-01-25 03:48:06 +01:00
Alexander Gessler
bbe8763d9e - FBX: workaround to handle files using the 'b' typecode. 2013-01-24 22:25:44 +01:00
Alexander Gessler
03c01685d3 - STEP: support UTF16, UTF32 and Mac/Roman escape sequences. 2013-01-24 19:51:46 +01:00
Alexander Gessler
da88ab4408 - STEP: support \S\ escaping for cp1252 characters. 2013-01-24 16:18:12 +01:00
Alexander Gessler
19c9683b5f - update Ifc parser generator script to assert if !python3 2013-01-24 15:16:38 +01:00
Alexander Gessler
5ac2354da0 - Ifc: implement IfcIShapeProfileDef entity. 2013-01-24 15:16:03 +01:00
Alexander Gessler
3b30a39fe1 - Ifc: add debug code for checking correctness of coordinate transforms. 2013-01-24 12:44:53 +01:00
Alexander Gessler
b42f279110 - Ifc: improve intersection check for openings. 2013-01-24 01:09:48 +01:00
Alexander Gessler
650e515dd6 - Ifc: bix bug that caused some openings to be generated twice. This stops lots of the z noise. 2013-01-22 16:50:18 +01:00
Alexander Gessler
2d01b9bdc9 - Ifc: pick average of all coordinates as projection plane. 2013-01-22 16:39:43 +01:00
Alexander Gessler
c2bd22507c - Ifc: check for self-intersecting contour lines to avoid duplicates. 2013-01-22 16:31:31 +01:00
Alexander Gessler
8b823bd631 - Ifc: improve heuristic to detect unwanted crossing lines by not running it when the window is not the result of arbitrary boolean ops on rectangles. 2013-01-22 16:08:44 +01:00
Alexander Gessler
e9bbe64115 - Ifc: fine-tune epsilons. Correct epsilon approximation for a squared value is max(e^2 +- 2e). 2013-01-21 22:46:11 +01:00
Alexander Gessler
6905229603 - Ifc: refactor border detection code. 2013-01-21 22:37:53 +01:00
Alexander Gessler
fcf86f1e0a - Ifc: add heuristic to detect remaining, unwanted "crossing caps" and to drop them silently. Testing this on some larger files, it typically reduces artifacts due to z-fighting on lower window caps. 2013-01-21 22:27:48 +01:00
Alexander Gessler
d20126f7a1 - Ifc: fine-tune some epsilons. 2013-01-21 21:56:55 +01:00
Alexander Gessler
6e7722c92f Merge branch 'master' of github.com:assimp/assimp 2013-01-21 21:11:46 +01:00
Alexander Gessler
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
Alexander Gessler
b47a3a5968 Deprecate README 2013-01-20 22:52:52 +01:00
Alexander Gessler
d3b951ecf7 Update Readme.md 2013-01-20 22:52:17 +01:00
acgessler
470f4f3757 - Ifc: fix another indexing error. 2013-01-20 17:40:09 +01:00
acgessler
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
acgessler
23a2ff629c - Ifc: drop flawed assertion. 2013-01-20 15:16:20 +01:00
acgessler
29a7126589 Merge git://github.com/bjowi/assimp 2013-01-20 13:33:03 +01:00
Björn Wingman
4dcc2f4bf8 These variables should have the ASSIMP_ prefix 2013-01-20 13:51:04 +01:00
acgessler
aca543176d - more vc12 fixes 2013-01-20 04:00:34 +01:00
Alexander Gessler
c42db3e9db Add FBX to Readme.md 2013-01-20 02:50:51 +01:00
Alexander Gessler
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
Alexander Gessler
e1b5a1db22 Update Readme.md 2013-01-19 17:07:23 +01:00
acgessler
f7106887cc - some fixes for vc12 2013-01-19 17:00:14 +01:00
acgessler
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
acgessler
7fd44f4ab7 Merge branch 'master' of git://github.com/assimp/assimp 2013-01-19 16:35:28 +01:00
Alexander Gessler
ab9587dd1e Merge pull request #12 from ccxvii/master
Precision fix and Collada robustness fix.
2013-01-15 12:04:48 -08:00
Kim Kulling
e7aeb8e08b Merge pull request #13 from rodrigob/master
Fixes to pyassimp
2013-01-15 00:53:48 -08:00
kimmi
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
Alexander Gessler
b993509087 - update vc9 workspace after merge. 2012-12-21 16:28:30 +01:00
Alexander Gessler
bae9db2f03 Merge branch 'master' of git://github.com/assimp/assimp 2012-12-21 16:24:05 +01:00
ulfjorensen
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