Commit Graph

97 Commits

Author SHA1 Message Date
Damien Plisson
deb058a669 Collada : header files order dependency was making osx compile fail 2010-10-24 07:55:56 +00:00
Campbell Barton
c6976e7351 use explicit file paths for CMake rather then globing, This is recommended by cmake devs.
globbing vs explicit is discussed here.
http://www.cmake.org/pipermail/cmake/2008-December/025694.html

Practical implications are:
- developers need to keep CMakeLists.txt files up to date.
- Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure.
2010-10-23 04:05:55 +00:00
Campbell Barton
4d37cf90b9 remove G.sce, use G.main->name instead.
Both stored the filename of the blend file, but G.sce stored the last opened file.
This will make blender act differently in some cases since a relative path to the last opened file will no longer resolve (which is correct IMHO since that file isnt open and the path might not even be valid anymore).

Tested linking with durian files and rendering to relative paths when no files is loaded however we may need to have some operators give an error if they are used on the default startup.blend.
2010-10-18 06:41:16 +00:00
Nathan Letwory
03085d2cae Fix [#24200] COLLADA Exporter: Aspect ratio is not exported
Reported by Wenzel Jakob, patch [#24235] by Phil Gosch
2010-10-18 00:46:41 +00:00
Nathan Letwory
17085e967e Fix COLLADA import after recent API cleanups by Campbell. 2010-10-15 14:56:31 +00:00
Nathan Letwory
097a926d94 Fix [#24201] COLLADA Exporter: Light source energy incorrect
lamp->energy and lamp->distance are now taken in account by calculating
the constant, linear and quadratic attenuations based on this.

The import tries to do the reverse.

Note: this will work only properly for lamps that have att1 and att2 set to
1.0 or 0.0, other lamptypes won't import correctly again.
2010-10-14 09:40:56 +00:00
Nathan Letwory
8ec87bb45f COLLADA
Export unit system and scale instead of hard-coded 1 decimeter.
2010-10-11 12:38:52 +00:00
Nathan Letwory
d420d09da9 Fix compiling for MingW too. 2010-10-09 21:31:32 +00:00
Nathan Letwory
f72eef5de7 COLLADA
Import unit_settings to scene.

Note: I use here RNA to do this, and I think I might slowly work on replacing low-level DNA usage with RNA where possible.
2010-10-09 21:17:14 +00:00
Guillermo S. Romero
c9453b1357 SVN maintenance. 2010-10-07 01:20:59 +00:00
Nathan Letwory
c139faf171 COLLADA: Split EffectsExporter into separate files. 2010-10-07 00:24:42 +00:00
Guillermo S. Romero
47969866e0 SVN maintenance. 2010-10-06 20:40:16 +00:00
Nathan Letwory
c0b36a0be0 COLLADA: Split ImagesExporter into separate files. 2010-10-06 16:23:52 +00:00
Nathan Letwory
ca44eb3abd GCC fixes for r32346 2010-10-06 13:55:50 +00:00
Nathan Letwory
0d815d3528 COLLADA: Split MaterialsExporter into separate files. 2010-10-06 13:21:08 +00:00
Nathan Letwory
e161c22dc2 Assorted GCC fixes for OpenCOLLADA support 2010-10-06 12:04:56 +00:00
Nathan Letwory
7245280f6c COLLADA: Split ArmatureExporter, InstanceWriter and TransformWriter into separate files. 2010-10-06 11:02:44 +00:00
Nathan Letwory
c88a46e585 COLLADACOLLADA exporter: split geometry export into own files. 2010-10-06 09:53:06 +00:00
Nathan Letwory
fdadab1006 COLLADA exporter: split camera and light export into own files. 2010-10-06 07:13:42 +00:00
Nathan Letwory
4eae531f31 TextureCoordinateBinding.getName() -> TextureCoordinateBinding.getSemantic(); as per my own patch on OpenCOLLADA issue tracker. 2010-10-05 06:10:17 +00:00
Guillermo S. Romero
9f3d203acb SVN maintenance. 2010-10-05 00:49:39 +00:00
Nathan Letwory
82209cdc86 Reorganisation of COLLADA import code. Classes have been split into their own files.
No functional changes.

Where necessary extern "C" {} blocks have been added.
2010-10-05 00:05:14 +00:00
Arystanbek Dyussenov
c0a7b5c2a8 COLLADA exporter fix: do not create a duplicate <polylist> if an object has NULL materials linked along with normal materials. 2010-10-04 03:38:37 +00:00
Nathan Letwory
27fa0dfc70 Patch [#23589] Use Author field from User Preferences for COLLADA export.
Submitted by Imran Syed.

When U.author is set, it'll be used instead of default "Blender User".
2010-10-02 09:42:35 +00:00
Nathan Letwory
99ebe229f6 Fix [#21084] Collada messing up geometry on import and renaming uvlayers
Reported by Michael Williamson

Add support to write the uvlayer name as found in <bind_vertex_input> semantic attribute (Blender
exports in this one too, so reimport goes ok now).

I have created a patch for OpenCOLLADA to be applied against r769, which is needed
for this fix to work: http://code.google.com/p/opencollada/issues/detail?id=117

The Windows OpenCOLLADA updated builds (r769+patches) will be committed after this.

Note: This means that linux and osx users will have to patch OpenCOLLADA themselves, until
it's committed (or in case of OSX the libs updated in lib/darwinXXX).
2010-10-01 19:46:42 +00:00
Nathan Letwory
e8465555cb Prevent crash if image for image texture is not set, part II. 2010-09-30 11:49:48 +00:00
Nathan Letwory
0d1a9c7784 Prevent crash if image for image texture is not set. 2010-09-30 11:42:02 +00:00
Nathan Letwory
8a68326f81 COLLADA: Better import and export of cameras. 2010-09-28 08:01:20 +00:00
Arystanbek Dyussenov
396aece473 Partial fix of bug #23543 in COLLADA exporter:
* multiply the diffuse and specular colors by their respective intensities
* only output <transparency> if MA_TRANSP flag is on
* only output <reflective> and <reflectivity> if MA_RAYMIRROR flag is on
2010-09-12 20:19:15 +00:00
Arystanbek Dyussenov
5416fee99a Bug #23715: patch by Jan Diederich to avoid having duplicate IDs after they are translated.
For example, object ID names "1a", "2a", "3a", will be exported as "_a", "_a2", "_a3". Thanks Jan!
2010-09-10 15:24:10 +00:00
Arystanbek Dyussenov
7abf2faa20 Bug #23715 in COLLADA exporter: prepend an '_' to the ID if it starts with an illegal character.
Pointed out by Tom Haines. Thanks!
2010-09-09 11:01:30 +00:00
Arystanbek Dyussenov
ad48fd1db9 Patch by Jan Diederich, fixes bug #23715 in the COLLADA exporter.
Allow IDs to start only with an alphabetic character replacing digits with an '_'.
2010-09-09 08:14:36 +00:00
Arystanbek Dyussenov
979b06f739 Merge -c 31610 (<instance_node> support) from COLLADA branch into trunk. 2010-09-04 19:27:04 +00:00
Guillermo S. Romero
a8269c8946 SVN maintenance. 2010-09-03 03:30:20 +00:00
Nathan Letwory
6c113b54b3 Finally change SConscript tabs to spaces. 2010-08-29 20:52:05 +00:00
Nathan Letwory
92422ba452 Patch [#23389] Add authorship information to exported COLLADA files
Contributed by Imran Syed (freakabcd).

This adds basic authoring tool and author info ("Blender User" for now).

NOTE: Linux and OSX users need now to update their OpenCOLLADA libs - Blender should now compile fine with their latest revision.

Made some changes to the original patch to ensure linking is done correctly.
Some small cleanups for scons too.
2010-08-26 06:58:32 +00:00
Campbell Barton
3bd039eff9 apply rna rename most of the show_*, names. 2010-08-17 17:03:52 +00:00
Guillermo S. Romero
95aa8cfa4a Update address in license block. 2010-08-10 21:22:26 +00:00
Arystanbek Dyussenov
f9acf1b455 Fix bug #22828, "Exporting as COLLADA crashes Blender". 2010-08-09 18:15:50 +00:00
Thomas Dinges
0753766a57 Fix for the fix. 2010-08-01 16:38:30 +00:00
Thomas Dinges
4e031236d5 Compile fix for recent changes. Function needed 1 more argument.
Chingiz can you please check?
2010-08-01 16:35:27 +00:00
Brecht Van Lommel
f3cca3e192 2.5: more G.main changes. 2010-08-01 12:57:01 +00:00
Thomas Dinges
5b9059e2bd Compile fix for changes in "filldisplist" function. 2010-06-23 17:40:17 +00:00
Arystanbek Dyussenov
8e1a63dbc9 Merge -c 29322 from COLLADA branch into trunk. 2010-06-07 20:37:56 +00:00
Arystanbek Dyussenov
eb50486df2 Fix COLLADA build error. This was caused by the difference in OpenCollada versions between Windows and Linux/Mac. Windows uses OpenCollada revision 746, Linux/Mac - 721. 2010-06-07 20:07:31 +00:00
Arystanbek Dyussenov
05188c26ce Merge -c 29280 from COLLADA branch into trunk. 2010-06-06 19:32:12 +00:00
Nathan Letwory
a6d5f43ac8 * update CMake and SCons for the OpenCollada update (to r746).
- DocumentExporter changed due to function name change in API
  - no more UTF lib
  - enabled by default for win32

Note: debug libs will be added later, as well as 64bit windows libs.

For other platforms, get r746 of OpenCollada and build against that.
2010-06-06 00:33:59 +00:00
Arystanbek Dyussenov
a545998c84 Merge -c 29009,29081,29189 from COLLADA branch into trunk. 2010-06-03 17:41:33 +00:00
Stefan Gartner
03f983da85 Makefiles: fixed opencollada include path 2010-05-14 08:16:45 +00:00
Campbell Barton
93f420b666 correct typo's 2010-04-25 15:24:18 +00:00