Commit Graph
625 Commits
Author SHA1 Message Date
Joerg Mueller 207911bdb3 Merge with trunk r37677 2011-06-20 22:55:18 +00:00
Nathan Letwory d278637337 Fix [#26912] [Collada] Screw up with names/ids on import
Reported by Valeriy Firsov

Use the node name if it exists, fall back to id otherwise.
2011-06-20 12:43:10 +00:00
Nathan Letwory 81f5679ff5 Fix [#26821] Import Collada: instance_node still incorrectly handled
reported by David Roy
patch submitted by Camillo Dell'mour
2011-06-20 10:50:17 +00:00
Nathan Letwory 201052a3ff Apply Patch [#27454] Add simple Transparency texture import for COLLADA
submitted by Steffen Ohrendorf.
2011-06-20 10:28:37 +00:00
Nathan Letwory bb851003b5 Remove redundant e usage. Energy is already multiplied into exported light. Fixes potential bug (e used uninitialised, reported by Campbell Barton on IRC). 2011-06-20 10:22:39 +00:00
Nathan Letwory dbe7488c43 Fix [#27474] Blender crashes on collada import if input_set is missing
reported by Rebin Cornelius.

This needs patch from upstream report http://code.google.com/p/opencollada/issues/list?thanks=164 applied to OpenCOLLADA. lib/windows/collada and lib/win64/collada have already been updated. Ensures we don't read past array boundaries.
2011-06-20 09:34:35 +00:00
Sukhitha Jayathilake adb81a0351 Fixed Armature Import Without Skin controllers. Armatures and animations get imported. Some inaccuracy remains with bone transforms. 2011-06-19 07:43:43 +00:00
Sukhitha Jayathilake 28f0d96bea 2011-06-19 04:20:43 +00:00
Campbell Barton 968b2a8afb rename cmake include/libraries to conform with suggested cmake names 2011-06-18 14:12:54 +00:00
Sukhitha Jayathilake 3f0e480ba9 unskinned armature import improved but unfinished. 2011-06-17 20:01:24 +00:00
Sukhitha Jayathilake c9b0ce8693 creating armatures for bones which are not skinned( in progress ) 2011-06-17 18:41:43 +00:00
Sukhitha Jayathilake d240733ae2 Reverted Exporter unit conversion modifications.
Animation Importer Code Cleanup.
2011-06-16 19:25:21 +00:00
Sukhitha Jayathilake 6aa524f357 AnimationExporter - Quaternion to euler conversion ( in progress )
AnimationImporter 
- Action group assignment to bones
- Revert to conversion of angles from deg to rad.
2011-06-16 15:04:37 +00:00
Sukhitha Jayathilake f3f3bcc45e New Animation Import system. Only Mesh object animation import support implemented for now. 2011-06-14 20:42:01 +00:00
Joerg Mueller 8ff0c2e107 Merge with trunk r37475. 2011-06-14 12:06:21 +00:00
Nathan Letwory 0af94b45e4 Fix [#27463] COLLADA light quadratic attenuation exported wrong?
Reported by Pelle Johnsen
Fix falloff import. Point light and Spot light always were set to inverse quad, instead of choosing the proper one based on imported values.

The
2011-06-13 15:07:36 +00:00
Nathan Letwory 05b54bec3b Apply [#27477] COLLADA export support for textures mapped to COLSPEC
Patch provided by Pelle Johnsen
2011-06-08 13:00:25 +00:00
Sukhitha Jayathilake f2daf2ca6b Add new animation export features.
- Bone animations are also exported as f-curve animations now. As a result euler rotaions of bones are also exported. All animations with BEZIER, LINEAR or STEP ipo are exported. 
- Quaternion rotations export.
- Object parented with armatures, animations to Armature Objects as a whole are also exported.
2011-06-05 18:58:22 +00:00
Joerg Mueller cd04cff180 Merge with trunk revision 37149. 2011-06-03 23:24:01 +00:00
Campbell Barton 09da9d4393 cmake maintenance
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
2011-05-31 01:15:44 +00:00
Sukhitha Jayathilake c61d39ef6c Add support for exporting F-Curves with BEZIER and STEP INTERPOLATION types. 2011-05-29 19:27:30 +00:00
Sukhitha Jayathilake 93e992c5d9 AnimationExporter class refactoring.
Exported AnimationExporter class to a separate set of files.
2011-05-26 17:07:38 +00:00
Sukhitha Jayathilake 433cc15527 Code Cleanup in DocumentExporter.cpp. (Test Commit) 2011-05-25 17:14:31 +00:00
Campbell Barton 70d059161b workaround/fix [#27162] Running commands in python console crashes blender 2011-04-25 12:39:53 +00:00
Nathan Letwory 2b79378f81 COLLADA lights:
* simplify export and import, now that we have blender profiles for lights. The vanilla import is now more in line with the specs. If a blender profile is found, skip normal import, use the profile data instead.
* multiply energy into color rgb export (common profile).
* recalc distance taking metrics in account
2011-03-30 10:51:01 +00:00
gsr b3d 5f5ec9ec3c SVN maintenance. 2011-03-28 21:30:41 +00:00
Nathan Letwory fee4cc34cc Add missing header for *nix machines. 2011-03-28 11:04:38 +00:00
Nathan Letwory bd9854e7d1 Import light blender profile if it exists. 2011-03-28 09:31:44 +00:00
Nathan Letwory 45f9dd4bd9 COLLADA lamp blender profile: add the remainder of the lamp variables to export. 2011-03-27 17:57:14 +00:00
Nathan Letwory 3cb6f52eec Add blender light profile. 2011-03-27 09:46:20 +00:00
gsr b3d 4b5819a5af SVN maintenance. 2011-03-26 23:55:54 +00:00
Damien Plisson ac2d935a32 Update cmake & scons scripts to use new Collada includes for building with latest blender collada updates 2011-03-26 09:09:00 +00:00
Nathan Letwory 32abf5eca8 Add ExtraTags class for handling tags inside an extra block. 2011-03-25 11:07:57 +00:00
Nathan Letwory c5c4b31d6b Mostly formatting commit, small elaboration in extra handling API (take pointer to importer). 2011-03-25 09:52:36 +00:00
Campbell Barton 66670b8f7f fix for building collada on linux 2011-03-23 15:07:30 +00:00
Nathan Letwory 3c45a2d298 COLLADA: supporting barebone class for <extra> support (incomplete). 2011-03-23 14:25:35 +00:00
Nathan Letwory 82f99a0db0 Adding header for offsetof() 2011-03-23 09:18:09 +00:00
Nathan Letwory 4470783264 Fix [#26474] double_sided wrong in COLLADA Export
reported by Juan Linietsky

The export was not really wrong, but Maya expects their profile to be present inside <geometry>. Added this for mesh with ME_TWOSIDED flag set.

Ideally this will change in the future to be controllable through options to the exporter (like current Google Earth and 3DS Max extensions for <double_sided>).
2011-03-23 00:19:38 +00:00
Nathan Letwory ee99cf5aa5 Wrong extension tag: show_double_sided -> double_sided 2011-03-23 00:03:52 +00:00
Nathan Letwory de89e78589 Fix [#26475] <instance_material> wrong in COLLADA export.
reported by Juan Linietsky
fix by Imran Syed (freakabcd)

Use material index suffixed to material name to create symbolic name.
2011-03-22 22:51:02 +00:00
Nathan Letwory 60b94886c8 Small tweak to material export: only export as <lambert> when spec intensity is 0.0 and diffuse shader is set to Lambert. Other cases will be handled in due time, until then phong. 2011-03-22 22:00:26 +00:00
Nathan Letwory f78e11dc38 [#26476] <specular> and <shininess> missing from Colada
reported by Juan Linietsky

Export <specular> for <phong> and <blinn> shaders, <shininess> was already being written for these.
<lambert> shader doesn't have <shininess>.

Right now we write <phong> when blender spec is phong, <blinn> when blender spec is blinn. When spec is
any other shader, and diffuse shader set to lambert, we export as <lambert>. Any other combination defaults
right now to <phong>. This will change when Blender specific profiles have been created for the shader
combinations in Blender.
2011-03-22 15:28:56 +00:00
Nathan Letwory e1a44e9ae6 COLLADA: small tweaks to directional light import. 2011-03-21 09:50:30 +00:00
Nathan Letwory 7e53769d09 COLLADA conformance: don't write empty libraries for effect, image and animation 2011-03-18 14:06:13 +00:00
Nathan Letwory a84e43c48b COLLADA: Don't write empty libraries for geometry, lights, cameras, controllers 2011-03-17 16:40:53 +00:00
Nathan Letwory 3e8c838a99 Fix [#26012] Import Collada: instance_node incorrectly handled
Reported by David Roy

When <instance_node>s where read, their transformation matrix got overwritten with the transform matrix
of their own node, not taking into account the parent node transformation. Instead of doing
that we now get the parent node transformation matrix and apply it to its own, and prevent
caller from overwriting this new transformation matrix.
2011-03-09 14:16:21 +00:00
Nathan Letwory 3f9bbde4a6 Fix [#26037] Import Collada crashes Blender
Submitted by David Roy

Multiple nodes can reference the same geometry, and specify the same materials. This lead
to the import code overwriting material mappings of faces in a destructive way. Instead of
just writing the material bindings always we now keep book of what geometry+material mapping
we've already handled.
2011-03-09 01:13:28 +00:00
Nathan Letwory 94b5fd6eb9 Skip materials that are invalid. 2011-03-08 20:41:43 +00:00
Nathan Letwory 3d05311d3c Apply [#26383] Triangle fans support for COLLADA importer
Submitted by Alexey Zakharov

This patch adds support to Blender for reading geometry data that's
represented as triangle fans.
2011-03-08 13:26:41 +00:00
Nathan Letwory 82b21ba166 Fix [#26213] Collada exporter id's not unique
Reported by Kevin Yoon

<material> could get same id as <node>, prevent that by suffixing -material.
2011-02-28 14:24:52 +00:00