Changeset 384

Timestamp:

07/23/09 13:34:15 (12 months ago)

Author:

laura

Message:

tree

Location:

branches/adaptare/trunk/hfall

Files:

• Engine/Camera.py (modified) (1 diff)
• Engine/Object.py (modified) (1 diff)
• Quaternion.py (modified) (3 diffs)
• Tree.py (added)

branches/adaptare/trunk/hfall/Engine/Camera.py

@@ -170 +170 @@
             normal = VA.crossProduct(VD)
             normal.normalize()
-            plane = Plane(cameraPosition, normal)
-            return plane
+            return Plane(cameraPosition, normal)
         
         if string == 'right':
             normal = VB.crossProduct(VC)
             normal.normalize()
-            plane = Plane(cameraPosition, normal)
-            return plane
+            return Plane(cameraPosition, normal)
         
         if string == 'top':
             normal = VA.crossProduct(VB)
             normal.normalize()
-            plane = Plane(cameraPosition, normal)
-            return plane
+            return Plane(cameraPosition, normal)
         
         if string == 'bottom':
             normal == VC.crossProduct(VD)
             normal.normalize()
-            plane = Plane(cameraPosition, normal)
-            return plane
+            return Plane(cameraPosition, normal)
         
         if string == 'near':
-            plane = Plane(axPoint, self.viewVector())
-            return plane
+            return Plane(axPoint, self.viewVector())
         
         if string == 'far':
-            plane = Plane(auxPoint, -self.viewVector())
-            return plane
-
+            return Plane(auxPoint, -self.viewVector())

branches/adaptare/trunk/hfall/Engine/Object.py

@@ -98 +98 @@
                            
         self.projection *= m
-
-        

branches/adaptare/trunk/hfall/Quaternion.py

@@ -253 +253 @@
     @staticmethod
     def dot(Q1, Q2):
-        if isinstance(Q1, Quaternion):
-            if isinstance(Q2, Quaternion):
-                return Q1.x * Q2.x + Q1.y * Q2.y + Q1.z * Q2.z + Q1.w * Q2.w
-            else:
-                raise TypeError("Invalid argument")
-        else:
-            raise TypeError("Invalid argument")
+        return Q1.x * Q2.x + Q1.y * Q2.y + Q1.z * Q2.z + Q1.w * Q2.w
 
     @staticmethod
@@ -266 +260 @@
         Linearly interpolate each component, then normalize the Quaternion
         """
-        if isinstance(Q1, Quaternion):
-            if isinstance(Q2, Quaternion):
-                return (Q1 * (1-t) + Q2 * t).normalize()
-            else:
-                raise TypeError("Invalid argument")
-        else:
-            raise TypeError("Invalid argument")
-        
+        return (Q1 * (1-t) + Q2 * t).normalize()        
 
     @staticmethod
@@ -279 +266 @@
         """
         Spherical linear interpolation
-        """
-        if isinstance(Q1, Quaternion):
-            if isinstance(Q2, Quaternion):
-            
-                dot = Quaternion.dot(Q1, Q2)
-                if dot < 0:
-                    dot = -dot
-                    Q3 = -Q2
-                else:
-                    Q3 = Q2
+        """           
+        dot = Quaternion.dot(Q1, Q2)
+        if dot < 0:
+            dot = -dot
+            Q3 = -Q2
+        else:
+            Q3 = Q2
                 
-                if dot < 0.95:
-                    angle = math.acos(dot)
-                    w1 = math.sin(angle * (1-t)) / math.sin(angle)
-                    w2 = math.sin(angle * t) / math.sin(angle)
-                    return Q1 * w1 + Q3 * w2
-                else:
-                # The angle is small. We use linear interpolation
-                    Quaternion.LERP(Q1, Q3, t)
-                    
-            else:
-                raise TypeError("Invalid argument")
-        else:
-            raise TypeError("Invalid argument")            
+        if dot < 0.95:
+            angle = math.acos(dot)
+            w1 = math.sin(angle * (1-t)) / math.sin(angle)
+            w2 = math.sin(angle * t) / math.sin(angle)
+            return Q1 * w1 + Q3 * w2
+        else:
+        # The angle is small. We use linear interpolation
+            Quaternion.LERP(Q1, Q3, t)