[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2827] trunk/py/scripts/addons/ render_povray: update for changes in matrix being column major now

[Campbell Barton]

Revision: 2827
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2827
Author:   campbellbarton
Date:     2011-12-31 04:31:00 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
update for changes in matrix being column major now

Modified Paths:
--------------
    trunk/py/scripts/addons/render_povray/render.py
    trunk/py/scripts/addons/render_povray/update_files.py

Modified: trunk/py/scripts/addons/render_povray/render.py
===================================================================
--- trunk/py/scripts/addons/render_povray/render.py	2011-12-30 20:30:01 UTC (rev 2826)
+++ trunk/py/scripts/addons/render_povray/render.py	2011-12-31 04:31:00 UTC (rev 2827)
@@ -210,16 +210,18 @@
         return name
 
     def writeMatrix(matrix):
-        tabWrite("matrix <%.6f, %.6f, %.6f,  %.6f, %.6f, %.6f,  %.6f, %.6f, %.6f,  %.6f, %.6f, " \
-                 "%.6f>\n" % (matrix[0][0], matrix[0][1], matrix[0][2], matrix[1][0], matrix[1][1],
-                              matrix[1][2], matrix[2][0], matrix[2][1], matrix[2][2], matrix[3][0],
-                              matrix[3][1], matrix[3][2]))
+        tabWrite("matrix <%.6f, %.6f, %.6f,  %.6f, %.6f, %.6f,  %.6f, %.6f, %.6f,  %.6f, %.6f, %.6f>\n" %
+                 (matrix[0][0], matrix[1][0], matrix[2][0],
+                  matrix[0][1], matrix[1][1], matrix[2][1],
+                  matrix[0][2], matrix[1][2], matrix[2][2],
+                  matrix[0][3], matrix[1][3], matrix[2][3]))
 
     def MatrixAsPovString(matrix):
-        sMatrix = ("matrix <%.6f, %.6f, %.6f,  %.6f, %.6f, %.6f,  %.6f, %.6f, %.6f,  %.6f, %.6f, " \
-                   "%.6f>\n" % (matrix[0][0], matrix[0][1], matrix[0][2], matrix[1][0], matrix[1][1],
-                                matrix[1][2], matrix[2][0], matrix[2][1], matrix[2][2], matrix[3][0],
-                                matrix[3][1], matrix[3][2]))
+        sMatrix = ("matrix <%.6f, %.6f, %.6f,  %.6f, %.6f, %.6f,  %.6f, %.6f, %.6f,  %.6f, %.6f, %.6f>\n" %
+                   (matrix[0][0], matrix[1][0], matrix[2][0],
+                    matrix[0][1], matrix[1][1], matrix[2][1],
+                    matrix[0][2], matrix[1][2], matrix[2][2],
+                    matrix[0][3], matrix[1][3], matrix[2][3]))
         return sMatrix
 
     def writeObjectMaterial(material, ob):
@@ -524,9 +526,9 @@
 
         # compute resolution
         Qsize = float(render.resolution_x) / float(render.resolution_y)
-        tabWrite("#declare camLocation  = <%.6f, %.6f, %.6f>;\n" % \
-                 (matrix[3][0], matrix[3][1], matrix[3][2]))
-        tabWrite("#declare camLookAt = <%.6f, %.6f, %.6f>;\n" % \
+        tabWrite("#declare camLocation  = <%.6f, %.6f, %.6f>;\n" %
+                 matrix.translation[:])
+        tabWrite("#declare camLookAt = <%.6f, %.6f, %.6f>;\n" %
                  tuple([degrees(e) for e in matrix.to_3x3().to_euler()]))
 
         tabWrite("camera {\n")
@@ -546,7 +548,7 @@
 
             tabWrite("rotate  <%.6f, %.6f, %.6f>\n" % \
                      tuple([degrees(e) for e in matrix.to_3x3().to_euler()]))
-            tabWrite("translate <%.6f, %.6f, %.6f>\n" % (matrix[3][0], matrix[3][1], matrix[3][2]))
+            tabWrite("translate <%.6f, %.6f, %.6f>\n" % matrix.translation[:])
             if camera.data.pov.dof_enable and focal_point != 0:
                 tabWrite("aperture %.3g\n" % camera.data.pov.dof_aperture)
                 tabWrite("blur_samples %d %d\n" % \

Modified: trunk/py/scripts/addons/render_povray/update_files.py
===================================================================
--- trunk/py/scripts/addons/render_povray/update_files.py	2011-12-30 20:30:01 UTC (rev 2826)
+++ trunk/py/scripts/addons/render_povray/update_files.py	2011-12-31 04:31:00 UTC (rev 2827)
@@ -20,8 +20,12 @@
 
 
 import bpy
-from bpy.props import StringProperty, BoolProperty, IntProperty, FloatProperty, \
-                      FloatVectorProperty, EnumProperty
+from bpy.props import (StringProperty,
+                       BoolProperty,
+                       IntProperty,
+                       FloatProperty,
+                       FloatVectorProperty,
+                       EnumProperty)
 
 
 def update2_0_0_9():