[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2859] trunk/py/scripts/addons/ io_scene_x3d: update for matrix row/col switch
Campbell Barton
ideasman42 at gmail.com
Mon Jan 2 11:53:21 CET 2012
Revision: 2859
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2859
Author: campbellbarton
Date: 2012-01-02 10:53:05 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
update for matrix row/col switch
Modified Paths:
--------------
trunk/py/scripts/addons/io_scene_x3d/export_x3d.py
trunk/py/scripts/addons/io_scene_x3d/import_x3d.py
Modified: trunk/py/scripts/addons/io_scene_x3d/export_x3d.py
===================================================================
--- trunk/py/scripts/addons/io_scene_x3d/export_x3d.py 2012-01-02 09:55:54 UTC (rev 2858)
+++ trunk/py/scripts/addons/io_scene_x3d/export_x3d.py 2012-01-02 10:53:05 UTC (rev 2859)
@@ -1164,7 +1164,7 @@
elif uniform['type'] == gpu.GPU_DYNAMIC_OBJECT_IMAT:
frag_uniform_var_map[uniform['varname']] = None
if uniform['datatype'] == gpu.GPU_DATA_16F:
- value = ' '.join(['%.6f' % f for v in (global_matrix * obj.matrix_world).inverted() for f in v])
+ value = ' '.join(['%.6f' % f for v in (global_matrix * obj.matrix_world).inverted().transposed() for f in v])
field_descr = " <!--- Object Invertex Matrix '%s' -->" % obj.name
fw('%s<field name="%s" type="SFMatrix4f" accessType="inputOutput" value="%s" />%s\n' % (ident, uniform['varname'], value, field_descr))
else:
Modified: trunk/py/scripts/addons/io_scene_x3d/import_x3d.py
===================================================================
--- trunk/py/scripts/addons/io_scene_x3d/import_x3d.py 2012-01-02 09:55:54 UTC (rev 2858)
+++ trunk/py/scripts/addons/io_scene_x3d/import_x3d.py 2012-01-02 10:53:05 UTC (rev 2859)
@@ -1414,16 +1414,8 @@
# -----------------------------------------------------------------------------------
import bpy
from bpy_extras import image_utils
-# import BPyImage
-# import BPySys
-# reload(BPySys)
-# reload(BPyImage)
-# import Blender
-# from Blender import Texture, Material, Mathutils, Mesh, Types, Window
from mathutils import Vector, Matrix
-RAD_TO_DEG = 57.29578
-
GLOBALS = {'CIRCLE_DETAIL': 16}
More information about the Bf-extensions-cvs
mailing list