moved OpenGL caching (call lists) to the OpenGL model view plugin

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@1130 bbaffbd6-741e-11dd-a85d-61de82d9cad9

src/pycam/Geometry/Model.py

@@ -94,7 +94,6 @@ class BaseModel(TransformableContainer):
         self.maxz = None
         # derived classes should override this
         self._export_function = None
-        self._opengl_display_cache = {}
 
     def __add__(self, other_model):
         """ combine two models """
@@ -134,9 +133,7 @@ class BaseModel(TransformableContainer):
     def to_OpenGL(self, visible_filter=None, show_directions=False):
         if not GL_enabled:
             return
-        gl_color = tuple([float(val) for val in GL.glGetFloatv(GL.GL_CURRENT_COLOR)])
         # the index should contain all relevant context details
-        cache_index = (show_directions, gl_color)
         if not visible_filter is None:
             for item in self.next():
                 # ignore invisble things like the normal of a ContourModel
@@ -144,15 +141,7 @@ class BaseModel(TransformableContainer):
                     do_paint, color = visible_filter(item)
                     if do_paint:
                         item.to_OpenGL(color, show_directions=show_directions)
-        elif not cache_index in self._opengl_display_cache:
-            # compile an OpenGL display list
-            # Rendering a display list takes less than 5% of the time for a
-            # complete rebuild.
-            list_index = GL.glGenLists(1)
-            if list_index > 0:
-                self._opengl_display_cache[cache_index] = list_index
-                # somehow "GL_COMPILE_AND_EXECUTE" fails - we render it later
-                GL.glNewList(list_index, GL.GL_COMPILE)
+        else:
             if isinstance(self, Model):
                 get_coords = lambda p: (p.x, p.y, p.z)
                 def calc_normal(main, normals):
@@ -184,12 +173,6 @@ class BaseModel(TransformableContainer):
                     # ignore invisble things like the normal of a ContourModel
                     if hasattr(item, "to_OpenGL"):
                         item.to_OpenGL(show_directions=show_directions)
-            if list_index > 0:
-                GL.glEndList()
-                GL.glCallList(list_index)
-        else:
-            # render a previously compiled display list
-            GL.glCallList(self._opengl_display_cache[cache_index])
 
     def is_export_supported(self):
         return not self._export_function is None
@@ -247,18 +230,6 @@ class BaseModel(TransformableContainer):
         self.maxz = None
         for item in self.next():
             self._update_limits(item)
-        self._reset_opengl_display_cache()
-
-    def _reset_opengl_display_cache(self):
-        for index in self._opengl_display_cache.values():
-            GL.glDeleteLists(index, 1)
-        self._opengl_display_cache = {}
-
-    def __del__(self):
-        # Somehow remote pycam servers complain about this missing attribute
-        # during cleanup.
-        if GL_enabled and hasattr(self, "_opengl_display_cache"):
-            self._reset_opengl_display_cache()
 
     def _get_progress_callback(self, update_callback):
         if update_callback:

src/pycam/Plugins/OpenGLViewModel.py

@@ -36,11 +36,19 @@ class OpenGLViewModel(pycam.Plugins.PluginBase):
         self._gtk = gtk
         self._GL = OpenGL.GL
         self.core.register_event("visualize-items", self.draw_model)
+        self.core.emit_event("visual-item-updated")
+        self._cache = {}
         return True
 
     def teardown(self):
         self.core.unregister_event("visualize-items", self.draw_model)
-        return True
+        self.core.emit_event("visual-item-updated")
+
+    def _get_cache_key(self, model, *args, **kwargs):
+        if hasattr(model, "uuid"):
+            return "%s - %s - %s" % (model.uuid, repr(args), repr(kwargs))
+        else:
+            return None
 
     def draw_model(self):
         GL = self._GL
@@ -59,5 +67,27 @@ class OpenGLViewModel(pycam.Plugins.PluginBase):
                         GL.GL_AMBIENT_AND_DIFFUSE, color)
                 # we need to wait until the color change is active
                 GL.glFinish()
-                model.to_OpenGL(show_directions=self.core.get("show_directions"))
+                key = self._get_cache_key(model, color=color,
+                        show_directions=self.core.get("show_directions"))
+                do_caching = not key is None
+                if do_caching and not key in self._cache:
+                    # Rendering a display list takes less than 5% of the time for a
+                    # complete rebuild.
+                    list_index = GL.glGenLists(1)
+                    if list_index > 0:
+                        # somehow "GL_COMPILE_AND_EXECUTE" fails - we render it later
+                        GL.glNewList(list_index, GL.GL_COMPILE)
+                    else:
+                        do_caching = False
+                    # next: compile an OpenGL display list
+                if not do_caching or (not key in self._cache):
+                    model.to_OpenGL(show_directions=self.core.get("show_directions"))
+                if do_caching:
+                    if not key in self._cache:
+                        GL.glEndList()
+                        GL.glCallList(list_index)
+                        self._cache[key] = list_index
+                    else:
+                        # render a previously compiled display list
+                        GL.glCallList(self._cache[key])