Commits

John Wise committed ec374f5

Adding include_dirs for files that need .h files. This was needed on
the two machines that I have installed yt-refactor on. Also I've
fixed an oversight during the merge process in the fisheye camera.

  • Participants
  • Parent commits 27258ef

Comments (0)

Files changed (2)

File yt/utilities/lib/setup.py

     config.add_extension("ContourFinding", 
                 ["yt/utilities/lib/ContourFinding.pyx",
                  "yt/utilities/lib/union_find.c"],
+                include_dirs=["yt/utilities/lib/"],
                 libraries=["m"], depends=["yt/utilities/lib/fp_utils.pxd"])
     config.add_extension("DepthFirstOctree", 
                 ["yt/utilities/lib/DepthFirstOctree.pyx"],
                 libraries=["m"], depends=["yt/utilities/lib/fp_utils.pxd"])
     config.add_extension("fortran_reader", 
                 ["yt/utilities/lib/fortran_reader.pyx"],
+                include_dirs=["yt/utilities/lib/"],
                 libraries=["m"], depends=["yt/utilities/lib/fp_utils.pxd"])
     config.add_extension("freetype_writer", 
                 ["yt/utilities/lib/freetype_writer.pyx"],
-                include_dirs = [freetype_inc,os.path.join(freetype_inc, "freetype2")],
+                include_dirs = [freetype_inc,os.path.join(freetype_inc, "freetype2"),
+                                "yt/utilities/lib"],
                 library_dirs = [freetype_lib], libraries=["freetype"],
                 depends=["yt/utilities/lib/freetype_includes.h"])
     config.add_extension("geometry_utils", 
     config.add_extension("marching_cubes", 
                 ["yt/utilities/lib/marching_cubes.pyx",
                  "yt/utilities/lib/FixedInterpolator.c"],
+                include_dirs=["yt/utilities/lib/"],
                 libraries=["m"],
                 depends=["yt/utilities/lib/fp_utils.pxd",
                          "yt/utilities/lib/fixed_interpolator.pxd",

File yt/visualization/volume_rendering/camera.py

             rot_vector = na.cross(rvec, self.normal_vector)
             rot_vector /= (rot_vector**2).sum()**0.5
             
-            self.rotation_matrix = get_rotation_matrix(angle,rot_vector)
+            self.rotation_matrix = get_rotation_matrix(self,angle,rot_vector)
             self.normal_vector = na.dot(self.rotation_matrix,self.normal_vector)
             self.north_vector = na.dot(self.rotation_matrix,self.north_vector)
             self.east_vector = na.dot(self.rotation_matrix,self.east_vector)