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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c1cd88e9de
- fbx: take shortest quaternion path when interpolating.
2012-08-26 20:10:01 +02:00
310235dd5b
- fbx: more warn policy tuning.
2012-08-26 18:58:08 +02:00
a1713052e5
- fbx: support reading LimbNode attachments, less Property70 warnings.
2012-08-26 18:53:15 +02:00
5bc573edb8
- fbx: pre-filter animated property we don't support as early as possible.
2012-08-26 18:40:04 +02:00
51d84dcfc0
- fbx: improve logging
2012-08-26 17:54:17 +02:00
9ea7fc2856
- fbx: don't die if a file contains no GlobalSettings.
2012-08-26 17:45:09 +02:00
cdb7caffbd
- fbx: add special output node name tag to mark fbx null nodes.
2012-08-25 22:24:08 +02:00
eed3cebc18
- fbx: add support for reading Null node attributes.
2012-08-25 20:12:53 +02:00
4921114c7d
- fbx: better error reporting reading property tables.
2012-08-25 19:53:46 +02:00
c9facf16fa
- fbx: support reading of scenes containing no geometry.
2012-08-25 18:17:11 +02:00
1dc2ea05fa
- fbx: fix crashbug when animating the root node.
2012-08-25 17:57:07 +02:00
375c4b4242
- fbx: read framerate and output it in aiAnimation::mTicksPerSecond.
2012-08-25 17:31:15 +02:00
d881bb9cdc
- fbx: add support for reading GlobalSettings.
2012-08-25 16:23:37 +02:00
5ea9de5d3e
- fbx: return time in seconds.
2012-08-25 16:13:19 +02:00
3f2a796b9d
- fbx: fix time scaling in my previous patch.
2012-08-20 19:23:54 +02:00
99aab0d9a7
- fbx: also handle cases where some of the SRT channels are empty/constant.
2012-08-20 19:15:59 +02:00
6bbbbfde4c
- fbx: collapse animation nodes whenever possible to avoid overly busted output scenes.
2012-08-20 18:33:54 +02:00
8336aa423f
- fbx: fix reading of short data tokens in binary files.
2012-08-20 17:39:44 +02:00
a038288af9
Ogre: Fixed memoryleak and missing \0 at end of cstring
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1298 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-08-12 17:00:53 +00:00
3e86e1b857
- fbx: add import settings to public assimp config interface.
2012-08-11 16:41:44 +02:00
eb16c193ea
- fbx: also support reading binary arrays of UNSIGNED data.
2012-08-11 04:48:08 +02:00
96033e9fc0
- fbx: fix stupid typos killing the decompression logic.
2012-08-11 04:39:47 +02:00
811e2492df
- fbx: fix object names when reading binary files.
2012-08-11 04:29:21 +02:00
29b11f1cde
- fbx: FINALLY got reading binary data buffers (vertices, normals etc) working! Found out fbx uses deflate to compress them.
2012-08-11 04:16:46 +02:00
1cd04a2671
- fbx: formatting.
2012-08-11 02:24:59 +02:00
826b97a4fa
- fbx: handle arbitrary rotation orders (all combinations of euler angles etc).
2012-08-11 02:17:22 +02:00
1bdf39448a
- fbx: extend list of supported property data types.
2012-08-11 01:59:10 +02:00
391a69e68b
- fbx: extend DOM to include the declarations for FBX' rotation order and inheritance enums.
2012-08-11 01:57:32 +02:00
1a5bf26e91
- fbx: light & camera conversion was missing in assimp, somehow.
2012-08-11 01:51:04 +02:00
bc0e465f91
- fbx: declare more dynamic properties of Model.
2012-08-10 23:40:02 +02:00
8d5b78c035
- fbx: 32 bit build fixes.
2012-08-10 23:26:49 +02:00
315285faf0
- fbx: refactor parsing code, move all parsing stuff to FBXParser.cpp. Parsing errors now carry the prefix "FBX-Parser".
2012-08-10 23:24:58 +02:00
ef0dcaaea2
- fbx: refactor, move DOM utility functions to separate unit.
2012-08-10 23:02:38 +02:00
ffbac847ef
- fbx: add DOM classes for light and camera node attachments. Devise a new macro-based system to easily define dynamic fbx properties.
2012-08-10 22:58:54 +02:00
c126cfa1ff
- fbx: rework material reading to support negative indices (these will be assigned a default material).
...
- fbx: fix uninitialized variable.
2012-08-10 22:33:57 +02:00
729e98fef0
+ fbx: Parser::IsBinary(), Document::IsBinary()
2012-08-10 21:39:47 +02:00
49cfcf4c07
- fbx: add binary support to the various ReadXXX parsing utilities.
2012-08-10 11:06:59 +02:00
10fac9bcd8
- fbx: finished binary tokenizer. Now correctly skips over compressed data arrays.
2012-08-10 10:47:50 +02:00
5250240ed6
- fbx: format fixes.
2012-08-09 02:10:13 +02:00
24ce9495fd
- fbx: add binary reading draft. Started from scratch after my first attempt had design flaws. The binary reader now sits on the lexer stage (really) and generates a (fake) token sequence similar to the text lexer's output - this means most parsing code can go unaffected.
2012-08-09 02:08:12 +02:00
3899fc5257
- fbx: bone bind matrix now includes mesh world transformation.
2012-07-27 22:36:40 +02:00
d5d6df36e3
- fbx: fix rotation order and a whole bunch of related problems.
2012-07-27 21:09:45 +02:00
4c58328c98
- fbx: switch to always generating a full transformation chain (temporary solution to get the transformation order right for now!).
2012-07-27 19:41:14 +02:00
6efe9517f0
- fbx: forgot child links in transformation chains.
2012-07-27 19:29:57 +02:00
4aac334358
- fbx: bugfix node chain generation, was omitting some nodes.
2012-07-27 19:20:05 +02:00
54be52ea28
- fbx: add option to detect dummy animation tracks and to remove them. Actually, this is mostly a debugging aid (and it cuts down memory usage).
2012-07-27 18:45:02 +02:00
0d2cb96092
- fbx: re-enable FixNodeName(), forgot that a commit ago.
2012-07-27 17:58:34 +02:00
bb8e8c6673
- fbx: ignore IKEffector nodes.
2012-07-27 17:57:30 +02:00
44259f0c23
- fbx: fix small typo with big effect.
2012-07-27 17:57:19 +02:00
bead86a830
- fbx: take care not to drop transformation chain nodes that have node animations assigned, even if they specify identity transform in bind pose.
2012-07-27 16:18:47 +02:00
80e7e18e28
- fbx: refactor animation code.
2012-07-27 15:53:17 +02:00
ffd084a7a7
- fbx: generate inverse nodeanim channels for pivots.
2012-07-27 15:42:06 +02:00
3c37c8e7da
- fbx: generate node anims for complex transformation chains with pivots and offsets.
2012-07-27 15:31:02 +02:00
94e1e78c55
- fbx: work on converting animations for complex transformation chains (i.e. chains that contain pivots and offsets). (WIP)
2012-07-27 04:55:56 +02:00
7f082e0aae
- fbx: revamp transformation code to support rotation/scaling pivots and offsets. The information is encoded in additional nodes in the scene hierarchy, which are tagged with a special naming scheme to make them easy for users to identify and map to their systems.
2012-07-27 03:00:16 +02:00
23c62f07f7
- fbx: fix memleak in exception cases.
2012-07-27 01:49:02 +02:00
916947327f
- fbx: fix weight conversion for multi-mesh geometry.
2012-07-27 00:50:58 +02:00
f230ac2f60
- fbx: further work and bugfixes on deformer conversion.
2012-07-26 23:45:07 +02:00
d194c83ed8
- fbx: bugfix Model -> Cluster connections.
2012-07-26 22:58:48 +02:00
3e3eb6fb7c
- fbx: permit empty deformers.
2012-07-26 22:57:52 +02:00
666f2776d7
- fbx: convert fbx deformers to assimp bones.
2012-07-26 22:53:31 +02:00
05ec3c2e90
- fbx: read Geometry -> Skin and Model -> Cluster connections. Improve logging, some refactoring.
2012-07-26 19:13:19 +02:00
06acead438
- fbx: read deformers (Skin and Cluster).
2012-07-26 18:05:24 +02:00
8d1db6229c
- fbx: drop empty animation stacks to pass assimp validation.
2012-07-26 04:13:16 +02:00
6ea67963ba
- fbx: fix parsing of CameraSwitcher.CameraIndexName.
2012-07-26 04:07:29 +02:00
44606a1e53
- fbx: fix 64 bit compile warning.
2012-07-26 04:04:29 +02:00
c882ef841f
- fbx: fix boost compile error.
2012-07-26 04:03:55 +02:00
d5c05c7d84
- fbx: NodeAttribute can now be target for AnimCurveNode.
...
- fbx: rename Camera -> CameraSwitcher.
2012-07-26 03:58:42 +02:00
cab713b4c5
- fbx: attach node attachments to their nodes.
2012-07-26 03:45:37 +02:00
b66dfc85e1
- fbx: read NodeAttribute and Camera.
2012-07-26 03:42:02 +02:00
38be981151
- set aiNodeAnim.mNodeName
2012-07-26 03:11:14 +02:00
776d8e339b
Merge branch 'master' of https://github.com/assimp/assimp
2012-07-24 03:30:47 +02:00
8747614e89
- fbx: ensure node names are converted consistently and with no ambiguity.
2012-07-22 02:12:38 +02:00
29057096fd
- add extra check whether the keyframes are well-ordered.
2012-07-22 01:23:23 +02:00
5ff8c90a35
- fbx: set animation duration.
2012-07-21 23:48:52 +02:00
f617e766b1
- fbx: add "strict" import mode (only accept 2012,2013 files).
2012-07-21 23:08:48 +02:00
b7456307dd
- fbx: fix "could not read property name" warn message.
2012-07-21 22:45:23 +02:00
fd828a1b44
- fbx: always set all tracks in aiNodeAnim to pass validation.
2012-07-21 22:29:42 +02:00
e4305149be
- fbx: bugfix animation interpolation code, fix various quirks.
2012-07-21 21:28:02 +02:00
09aaaba7b8
- fbx: improved DOM object construction and dependency resolution.
2012-07-21 20:02:00 +02:00
5db5634494
- fbx: add utility functions to filter connections to other objects by their type.
2012-07-21 18:02:10 +02:00
4f6dbac919
- fbx: prevent infinite recursion when resolving objects with cyclic references.
2012-07-21 17:13:03 +02:00
378bc93593
- fbx: resolve target node for node animations.
2012-07-21 17:12:04 +02:00
ae3007b42b
- fbx: better size estimate for keyframe buffer.
2012-07-21 16:19:46 +02:00
382f4619ad
- fbx: animation conversion from fbx's representation to assimp's. This involves evaluating animation layers etc.
2012-07-21 04:15:10 +02:00
711878567a
- more fine-grained import settings.
2012-07-21 01:00:26 +02:00
67c55990cd
- fbx: initial code to read animations plus the accompanying DOM classes.
2012-07-21 00:45:37 +02:00
aaf0be0bbf
- CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, DirectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190 )
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-17 22:56:15 +00:00
d8c2295962
- blend: compute parent inverses on your own instead of trusting the blend input. Thanks to Kalmár Dániel for the patch.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1291 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-17 22:18:10 +00:00
3f47ac3fe2
Bugfix : Fix an invalid getName function. Thanks to cyrilchampier.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1290 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-17 21:48:03 +00:00
56bf755c4b
- Ifc: fix handling of curves with RADIAN parameters.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1289 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-12 00:20:28 +00:00
d7fe61c255
- Ifc: improved subsampling of curves for IfcSweptDiskSolid entities.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1288 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-11 23:08:44 +00:00
d7410e6f08
- Ifc: implement basic support for IfcSweptDiskSolid elements.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1287 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-11 22:11:16 +00:00
c70646912c
- add IFCZIP support to IFC loader.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1286 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-11 19:18:51 +00:00
ab93c6f38e
Merge branch 'master' of github.com:acgessler/assimp-gsoc2012-fbx
2012-07-08 01:29:49 +02:00
879f2ed177
- fix some -Wall warnings
2012-07-08 03:28:14 +02:00
8ec96d88c5
update CMake build
2012-07-07 21:11:09 +02:00
30422fa683
- fix confusion between ASSIMP_BUILD_NO_COLLADA_IMPORTER and ASSIMP_BUILD_NO_DAE_IMPORTER (in favour of the first).
2012-07-07 20:53:24 +02:00
e56b39ecaf
fbx: gcc 4.6 compile fixes
2012-07-07 20:46:29 +02:00
1a9790ae9a
- fbx: read first set of header properties (format version, timestamp etc).
2012-07-06 22:46:19 +02:00
e4aee83c5b
- fbx: set mesh names, drop prefix from root node, simplify mesh splitting logic.
2012-07-06 19:32:41 +02:00
6441f9d984
- fbx: strip prefixes from Material and Mesh names. Don't set empty material names.
2012-07-06 17:08:02 +02:00
72f1734f82
- fbx: fix another stupid bug in the multi-mesh splitting code.
2012-07-06 17:00:59 +02:00
2d2a87b70c
- fbx: fix stupid bug that kills the node hierarchy.
2012-07-06 16:55:25 +02:00
4bfd5c11d7
- fbx: bugfix multi-material splitting.
2012-07-06 16:48:09 +02:00
d6e929b670
- fbx: accidentially passed a wrong predicate for sorting Connections to std::sort.
2012-07-05 17:18:54 +02:00
4db113395c
- fbx: read local transforms (different modes of rotation not yet implemented, though).
2012-07-05 17:06:15 +02:00
3179e949bb
- fbx: set default material when no material layer is assigned to a mesh.
2012-07-05 16:37:13 +02:00
61c6c37e30
- fbx: implement mesh splitting for meshes with multiple materials.
2012-07-05 16:35:08 +02:00
cfb05376d2
- fbx: fix diffuse material color.
2012-07-05 14:26:26 +02:00
04c77029e8
- fbx: fix boost build errors (was building with BOOST_WORKAROUND for a while).
2012-07-04 17:06:55 +02:00
6e6dbe97de
- fbx: fix bug that caused normals to be wrong.
2012-07-04 16:47:10 +02:00
0d2f04d50a
- fbx: fix recursive node construction.
2012-07-04 16:38:12 +02:00
89d5380c81
- fbx: argh. forgot to add FBXModel.cpp
2012-07-04 16:33:46 +02:00
bf79c83bf2
- fbx: read node hierarchy and assign model material indices. Cache already converted materials and meshes to make FBX instancing work as intended.
2012-07-04 16:33:21 +02:00
17629f1ff1
- fbx: work on resolving material links.
2012-07-04 15:07:57 +02:00
2f5ec6f136
- fbx: fix bug that caused textures to be ignored in some cases.
2012-07-04 01:45:15 +02:00
c7ee6fd70f
- fbx: texture conversion & UV channel mapping.
2012-07-03 20:41:21 +02:00
a0c45f9190
- fbx: read texture -> material connections.
2012-07-03 19:42:14 +02:00
effcaf066a
- fbx: Objects now carry their ID.
2012-07-03 19:36:38 +02:00
8a12b179a6
- fbx: add utility functions to get object connections in sequential (i.e. insertion) order.
2012-07-03 17:57:21 +02:00
fd451f7ba6
- fbx: read object-object and object-property connections.
2012-07-03 16:50:58 +02:00
23914685f9
- fbx: read textures.
2012-07-03 14:59:40 +02:00
97b69364ad
- fbx: refactor code for fetching property templates.
2012-07-03 14:40:45 +02:00
ec50632f2e
- fbx: fix bug that caused vertex colors to be not loaded correctly.
2012-07-03 00:26:40 +02:00
990e6bdf3f
- fbx: better conversion of material colors.
2012-07-02 23:31:48 +02:00
3f811f4a62
- fbx: DOM Material -> aiMaterial converter (WIP!).
2012-07-02 19:59:31 +02:00
131008cea1
- fbx: read materials.
2012-07-02 17:37:00 +02:00
b49cf16bc2
- fbx: change const semantics for PropertyTable's. Lazy parsing of properties no longer affects logical constness.
2012-07-02 17:09:32 +02:00
97e1761ecd
- fbx: support more property data types (there are way more, though - don't know yet how to handle them, fbx files don't seem to have overly strong semantics for properties).
2012-07-02 17:00:56 +02:00
21713841d3
- fbx: read property templates. Fix some memory leaks.
2012-07-02 16:51:19 +02:00
00f249b8dd
- fbx: add property system
2012-07-02 15:57:51 +02:00
6ddb1c9aa7
- fbx: refactor code
2012-07-01 14:38:14 +02:00
7a3e3b1353
- fbx: create dummy root node and assign converted meshes. This is a temporary solution to be able to test mesh reading.
2012-06-28 23:44:23 +02:00
524285c90d
- fbx: converter now handles FBX mesh to aiMesh conversion.
2012-06-28 23:24:46 +02:00
0c0c9bce66
- update CMakeLists
2012-06-28 20:03:29 +02:00
d7270aa278
- fbx: skeleton for DOM -> aiScene converter.
2012-06-28 20:02:09 +02:00
e945998fc8
- fbx: warn about empty meshes and ignore them.
2012-06-28 19:23:08 +02:00
d61c86081c
- fbx: depending on settings.readAllLayers, the loader now scans through all geometry layers and pulls in all vertex data channels that fit into the output data structure.
2012-06-28 19:20:44 +02:00
05bc8ab684
- fbx: add ImportSettings to keep track of fbx-specific import settings. The settings are generated by the importer instance and injected into parser and DOM.
2012-06-28 19:16:14 +02:00
3f10314656
- fbx: support ByPolygon mapping for materials, refactor code to read material indices.
2012-06-28 17:13:13 +02:00
e821988c64
- fbx: also read vertex colors, tangents and binormals.
2012-06-28 16:51:55 +02:00
ffe0ed7926
- fbx: refactor code to handle FBX vertex data access. Support the same access & indexing types for UVs and normals.
2012-06-28 02:06:24 +02:00
026cec7d7b
- fbx: UVs, normals and materials arw now read properly. Fix bug related to reading vertices.
2012-06-28 01:49:52 +02:00
fcdb2fc6b8
- fbx: work on reading normals, UVs and material channels.
2012-06-28 00:35:40 +02:00
f9e310edfb
- fbx: work on reading vertex data.
2012-06-27 23:02:00 +02:00
f354d8d7c7
- fbx: add some utility functions to parse tokens to values and to handle errors automatically.
2012-06-27 21:55:28 +02:00
e658a7f98f
Added Animationoverview diagram to documentation
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1270 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-26 19:46:18 +00:00
7108713238
- fbx: work on reading the first layer of geometry data channels.
2012-06-26 21:35:16 +02:00
79711b018a
- blend: patch for material importer, read emissive color. Thanks to Laurent Belcour for the patch!
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1269 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-26 19:16:09 +00:00
a996ecba75
- fbx: add helper functions to read FBX data arrays.
2012-06-26 20:05:24 +02:00
acgessler
kimmi
ulfjorensen
aramis_acg
Tor Andersson
Albert Wang
jonathanklein