Browse Source

Removing camera.rotationQuaternion

David Catuhe 10 years ago
parent
commit
a4b48b7015

+ 4 - 11
Exporters/Blender/io_export_babylon.py

@@ -1,7 +1,7 @@
 bl_info = {
 bl_info = {
     'name': 'Babylon.js',
     'name': 'Babylon.js',
     'author': 'David Catuhe, Jeff Palmer',
     'author': 'David Catuhe, Jeff Palmer',
-    'version': (1, 8, 1),
+    'version': (1, 8, 2),
     'blender': (2, 72, 0),
     'blender': (2, 72, 0),
     "location": "File > Export > Babylon.js (.babylon)",
     "location": "File > Export > Babylon.js (.babylon)",
     "description": "Export Babylon.js scenes (.babylon)",
     "description": "Export Babylon.js scenes (.babylon)",
@@ -1133,11 +1133,7 @@ class Camera(FCurveAnimatable):
         self.name = camera.name
         self.name = camera.name
         BabylonExporter.log('processing begun of camera (' + self.CameraType + '):  ' + self.name)
         BabylonExporter.log('processing begun of camera (' + self.CameraType + '):  ' + self.name)
         self.position = camera.location
         self.position = camera.location
-        if camera.rotation_mode == 'QUATERNION':
-            # need to apply a pre-rotation
-            self.rotationQuaternion = post_rotate_quaternion(camera.rotation_quaternion, math.pi*0.5)
-        else:
-            self.rotation = mathutils.Vector((-camera.rotation_euler[0] + math.pi / 2, camera.rotation_euler[1], -camera.rotation_euler[2])) # extra parens needed
+        self.rotation = mathutils.Vector((-camera.rotation_euler[0] + math.pi / 2, camera.rotation_euler[1], -camera.rotation_euler[2])) # extra parens needed
         self.fov = camera.data.angle
         self.fov = camera.data.angle
         self.minZ = camera.data.clip_start
         self.minZ = camera.data.clip_start
         self.maxZ = camera.data.clip_end
         self.maxZ = camera.data.clip_end
@@ -1195,10 +1191,7 @@ class Camera(FCurveAnimatable):
         write_string(file_handler, 'name', self.name, True)
         write_string(file_handler, 'name', self.name, True)
         write_string(file_handler, 'id', self.name)
         write_string(file_handler, 'id', self.name)
         write_vector(file_handler, 'position', self.position)
         write_vector(file_handler, 'position', self.position)
-        if hasattr(self, 'rotationQuaternion'):
-            write_quaternion(file_handler, "rotationQuaternion", self.rotationQuaternion)
-        else:
-            write_vector(file_handler, 'rotation', self.rotation)
+        write_vector(file_handler, 'rotation', self.rotation)
         write_float(file_handler, 'fov', self.fov)
         write_float(file_handler, 'fov', self.fov)
         write_float(file_handler, 'minZ', self.minZ)
         write_float(file_handler, 'minZ', self.minZ)
         write_float(file_handler, 'maxZ', self.maxZ)
         write_float(file_handler, 'maxZ', self.maxZ)
@@ -1905,4 +1898,4 @@ class ObjectPanel(bpy.types.Panel):
 
 
             layout.separator()
             layout.separator()
 
 
-            layout.prop(ob.data, 'autoAnimate')
+            layout.prop(ob.data, 'autoAnimate')

+ 1 - 6
src/Loading/Plugins/babylon.babylonFileLoader.ts

@@ -478,12 +478,7 @@
                 camera.target = BABYLON.Vector3.FromArray(parsedCamera.target);
                 camera.target = BABYLON.Vector3.FromArray(parsedCamera.target);
             }
             }
         } else {
         } else {
-            if (parsedCamera.rotationQuaternion) {
-                camera.rotationQuaternion = BABYLON.Quaternion.FromArray(parsedCamera.rotationQuaternion);
-            }
-            else {
-                camera.rotation = BABYLON.Vector3.FromArray(parsedCamera.rotation);
-            }
+            camera.rotation = BABYLON.Vector3.FromArray(parsedCamera.rotation);
         }
         }
 
 
         camera.fov = parsedCamera.fov;
         camera.fov = parsedCamera.fov;