[cello-cvs] CVS cello

[ktilton]

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

Modified Files:
	ctl-toggle.lisp image.lisp ix-layer-expand.lisp lighting.lisp 
Log Message:


--- /project/cello/cvsroot/cello/ctl-toggle.lisp	2006/10/28 18:22:43	1.7
+++ /project/cello/cvsroot/cello/ctl-toggle.lisp	2006/11/03 13:38:24	1.8
@@ -50,9 +50,9 @@
   :style-id :button
   :skin (c? (skin .w.))
   :text-color (c? (cond
-                   ((not (^enabled)) +red+)
+                   ((not (^enabled)) +dark-gray+)
                    ((^depressed) +dark-gray+)
-                   (t +white+)))
+                   (t +black+)))
   :pre-layer  (c? (let* ((thick (min (u96ths 4) (* 0.08 (l-width self))))
                          (defl (if (clo::^depressed) (downs (/ thick 3)) 0))
                          (push-in (if (clo::^depressed) (xlout (* .5 thick)) 0)))
@@ -166,6 +166,8 @@
                                    (not (md-value tw)))))
           ,twisted-widget)))
 
+
+
 #| vestigial?
 
 (defmacro mk-twisted (twisted-name (label-class &rest label-args)
--- /project/cello/cvsroot/cello/image.lisp	2006/10/17 21:30:08	1.15
+++ /project/cello/cvsroot/cello/image.lisp	2006/11/03 13:38:24	1.16
@@ -179,7 +179,7 @@
 (defobserver mouse-over-p ()
   (bwhen (p .parent)
     (when (typep p 'ix-view)
-      (with-integrity(:change 'mose-over)
+      (with-integrity(:change 'mouse-over)
         (setf (mouse-over-p p) new-value)))))
 
 (defmethod ix-selectable ((self ix-view)) nil)
--- /project/cello/cvsroot/cello/ix-layer-expand.lisp	2006/10/28 18:22:43	1.9
+++ /project/cello/cvsroot/cello/ix-layer-expand.lisp	2006/11/03 13:38:24	1.10
@@ -145,7 +145,7 @@
 (defmethod ix-layer-expand ((self (eql :mat-shiny)) &rest values)
   `(progn
      (gl-disable gl_color_material)
-     (gl-materialf gl_front gl_shininess (* 128.0f0 (v2-h ,(car values))))))
+     (gl-materialf gl_front gl_shininess (* 128.0f0 ,(car values)))))
 
 (defmethod ix-layer-expand ((self (eql :mat-emission)) &rest values)
   (let ((emission (gensym)))
--- /project/cello/cvsroot/cello/lighting.lisp	2006/10/06 08:01:51	1.7
+++ /project/cello/cvsroot/cello/lighting.lisp	2006/11/03 13:38:24	1.8
@@ -58,16 +58,16 @@
      :initform (list (make-instance 'light
                        :id gl_light6
                        :enabled t
-                       :pos (make-ff-array :float 200 (downs 300) (nearer 1200) 1)
+                       :pos (make-ff-array :float  0 0 (nearer 1200) 1) ;; 200 (downs 300)
                        :ambient *dim*
                        :diffuse *bright*
                        :specular *bright*)
                  (make-instance 'light
                          :id gl_light1
                          :enabled t
-                         :pos (make-ff-array :float 700 (downs 600) (nearer 200) 1)
+                         :pos (make-ff-array :float 0 0 (nearer 200) 1) ;;  700 (downs 600) 
                          :ambient *dim*
-                         :diffuse *average*
+                         :diffuse *dim* ;; *average*
                          :specular *bright*)))))
 
 (defmethod ix-paint :before ((self ogl-lit-scene))