Changeset 7780:2a1ae37eaaae

Timestamp:

12/14/07 17:11:47 (5 years ago)

Author:

Robert Bradshaw <robertwb@…>

Branch:

default

Children:

7781:81debe531ffd, 7855:0fed8c25284d

Message:

Support for n-polygons in Jmol

File:

• sage/plot/plot3d/index_face_set.pyx (modified) (2 diffs)

sage/plot/plot3d/index_face_set.pyx

@@ -128 +128 @@
                                                      face.vertices[0])
     else:
-        raise NotImplementedError, "pmesh doesn't support larger than quadrilaterals" # return join([str(face.vertices[i] + off) for i from 0 <= i < face.n] + [])
+        # Naive triangulation
+        all = []
+        for i from 1 <= i < face.n-1:
+            r = sprintf_4i(ss, "4\n%d\n%d\n%d\n%d", face.vertices[0], 
+                                                    face.vertices[i], 
+                                                    face.vertices[i+1], 
+                                                    face.vertices[0])
+            PyList_Append(all, PyString_FromStringAndSize(ss, r))
+        return "\n".join(all)
     # PyString_FromFormat is almost twice as slow
     return PyString_FromStringAndSize(ss, r)
@@ -504 +512 @@
         
         faces = [format_pmesh_face(self._faces[i]) for i from 0 <= i < self.fcount]
+        
+        # If a face has more than 4 vertices, it gets chopped up in format_pmesh_face
+        cdef Py_ssize_t extra_faces = 0
+        for i from 0 <= i < self.fcount:
+            if self._faces[i].n >= 5:
+                extra_faces += self._faces[i].n-3
+        
         _sig_off
         
         all = [str(self.vcount),
                points,
-               str(self.fcount),
+               str(self.fcount + extra_faces),
                faces]