[cello-cvs] CVS cello

[fgoenninger]

Update of /project/cello/cvsroot/cello
In directory clnet:/tmp/cvs-serv21334

Modified Files:
	ix-opengl.lisp 
Log Message:
Minor change only. Added some comments and code reformatted.

--- /project/cello/cvsroot/cello/ix-opengl.lisp	2006/08/28 21:45:22	1.5
+++ /project/cello/cvsroot/cello/ix-opengl.lisp	2006/10/01 20:47:54	1.6
@@ -17,13 +17,20 @@
 
 (in-package :cello)
 
+(export! .og.
+	 .ogc.
+	 ogl-shared-resource-tender
+	 ogl-node
+	 ogl-family
+	 dsp-list)
+
 (defmethod ogl-dsp-list-prep progn (self)
   (declare (ignore self))
   (assert (not *ogl-listing-p*)))
 
 (defvar *ogl-shared-resource-tender*)
 
-(defclass ogl-shared-resource-tender ()
+(defclass ogl-shared-resource-tender () ;; mixin
   ((display-lists :initform nil :accessor display-lists)
    (quadrics :initform nil :accessor quadrics)
    (textures :initform nil :accessor textures)))
@@ -44,8 +51,6 @@
 (defmethod ogl-node-window (other)
   (c-break "ogl-node-window undefined for ~a" other))
 
-(export! .og. .ogc.)
-
 (define-symbol-macro .og.
     (or (ogl-context self)
       (setf (ogl-context self) (upper self ctk::togl))))
@@ -55,30 +60,30 @@
 (defmodel ogl-node ()
   ((ogl-context :cell nil :initform nil :accessor ogl-context)
    (dsp-list :initarg :dsp-list :accessor dsp-list
-     :initform nil #+not (c-formula (:lazy :until-asked)
-                 (assert (not *ogl-listing-p*))
-                 (progn 
-                   (ogl-dsp-list-prep self)
-                   (when (without-c-dependency
-                          (every 'dsp-list (kids self)))
-                     (let ((display-list-name (or .cache
-                                                (gl-gen-lists 1)))
-                           (*ogl-shared-resource-tender*
-                            (ogl-shared-resource-tender self)))
-                       (gl-new-list display-list-name gl_compile)
-                       (trc nil "---------------starting display list" display-list-name self)
-                       (let ((*ogl-listing-p* self)
-                             *selecting* *render-clip-l* *render-clip-r* *render-clip-t* *render-clip-b*)
-                         (with-metrics (nil nil "ix-paint" self)
-                           (ix-paint self)))
-                       (trc nil "---------------finished display list" display-list-name self)
-                       (gl-end-list)
-                       (setf (redisplayp .og.) t)
-                       display-list-name)))))
+     :initform (c-in nil)
+      #+not (c-formula (:lazy :until-asked)
+	     (assert (not *ogl-listing-p*))
+	     (progn 
+	       (ogl-dsp-list-prep self)
+	       (when (without-c-dependency
+		       (every 'dsp-list (kids self)))
+		 (let ((display-list-name (or .cache
+					      (gl-gen-lists 1)))
+		       (*ogl-shared-resource-tender*
+			(ogl-shared-resource-tender self)))
+		   (gl-new-list display-list-name gl_compile)
+		   (trc nil "---------------starting display list" display-list-name self)
+		   (let ((*ogl-listing-p* self)
+			 *selecting* *render-clip-l* *render-clip-r* *render-clip-t* *render-clip-b*)
+		     (with-metrics (nil nil "ix-paint" self)
+			 (ix-paint self)))
+		   (trc nil "---------------finished display list" display-list-name self)
+		   (gl-end-list)
+		   (setf (redisplayp .og.) t)
+		   display-list-name)))))
    (gl-name :initarg :gl-name :initform nil :accessor gl-name)))
 
 
-
 (defun render (self)
   (let (*selecting* *render-clip-l* *render-clip-r* *render-clip-t* *render-clip-b*)
     (assert (zerop (glgeterror)))
@@ -86,12 +91,11 @@
       (trc nil "render" self (^height))
       (ix-paint self))))
 
-(defmodel ogl-family ()
+(defmodel ogl-family () ;; mixin
   ()
-  
   (:default-initargs
       :gl-name (c? (incf (gl-name-highest .w.)))
-    :clipped nil))
+      :clipped nil))
 
 (defobserver dsp-list ()
   (when old-value