[cells-cvs] CVS update: cell-cultures/cellodemo/cellodemo.lpr cell-cultures/cellodemo/demo-window.lisp cell-cultures/cellodemo/hedron-decoration.lisp cell-cultures/cellodemo/hedron-render.lisp cell-cultures/cellodemo/light-panel.lisp
Kenny Tilton
ktilton at common-lisp.net
Wed Sep 29 02:50:18 UTC 2004
Update of /project/cells/cvsroot/cell-cultures/cellodemo
In directory common-lisp.net:/tmp/cvs-serv13558/cellodemo
Modified Files:
cellodemo.lpr demo-window.lisp hedron-decoration.lisp
hedron-render.lisp light-panel.lisp
Log Message:
Resolve problems with FTGL. Texture fonts will require upcoming fix in FTGL 2.1 currently in testing
Date: Wed Sep 29 04:50:11 2004
Author: ktilton
Index: cell-cultures/cellodemo/cellodemo.lpr
diff -u cell-cultures/cellodemo/cellodemo.lpr:1.2 cell-cultures/cellodemo/cellodemo.lpr:1.3
--- cell-cultures/cellodemo/cellodemo.lpr:1.2 Sun Jul 4 20:59:40 2004
+++ cell-cultures/cellodemo/cellodemo.lpr Wed Sep 29 04:50:11 2004
@@ -1,4 +1,4 @@
-;; -*- lisp-version: "6.2 [Windows] (May 12, 2004 22:13)"; common-graphics: "1.389.2.105.2.14"; -*-
+;; -*- lisp-version: "6.2 [Windows] (Sep 3, 2004 12:04)"; common-graphics: "1.389.2.105.2.14"; -*-
(in-package :common-graphics-user)
Index: cell-cultures/cellodemo/demo-window.lisp
diff -u cell-cultures/cellodemo/demo-window.lisp:1.1 cell-cultures/cellodemo/demo-window.lisp:1.2
--- cell-cultures/cellodemo/demo-window.lisp:1.1 Sat Jun 26 20:38:35 2004
+++ cell-cultures/cellodemo/demo-window.lisp Wed Sep 29 04:50:11 2004
@@ -28,7 +28,7 @@
(run-stylish-demos '(light-panel ft-jpg tu-geo ftgl-test demo-scroller)
'light-panel
:skin (c? (wand-ensure-typed 'wand-texture
- (car (md-value (fm-other :texture-picker)))))
+ (car (md-value (fm-other :texture-picker)))))
:focus (c-in nil)
:display-continuous (c-in nil)
:clear-rgba (list 0 0 0 1)
@@ -85,18 +85,28 @@
(make-instance 'gui-style-ftgl
:id :button
:face *gui-style-button-face*
- :sizes '(14 14 14 14 14)
+ :sizes '(12 12 12 12 12)
:text-color +white+)
(make-instance 'gui-style-ftgl
:id :label
:face *gui-style-button-face*
- :sizes '(14 14 16 14 14)
+ :sizes '(14 14 14 14 14)
+ :text-color +white+)
+ (make-instance 'gui-style-ftgl
+ :id :unique
+ :face *gui-style-button-face*
+ :sizes '(24 24 24 24 24)
+ :text-color +white+)
+ (make-instance 'gui-style-ftgl
+ :id :unique2
+ :face *gui-style-button-face*
+ :sizes '(18 18 18 18 18)
:text-color +white+)
(make-instance 'gui-style-ftgl
:id :default
:mode :texture
:face *gui-style-button-face*
- :sizes '(14 9 16 12 14)
+ :sizes '(14 9 14 14 14)
:text-color +green+))
(apply 'run-demos demo-names start-at iargs)))
@@ -125,8 +135,7 @@
:pos (make-ff-array :float 200 (downs 300) (farther 500) 1)
:ambient *dusk*
:diffuse *dim*
- :specular *bright*)
- )
+ :specular *bright*))
:recording nil #+not (c? (when (md-value (fm-other :record))
(make-recording
:wand (magick-wand-template)
@@ -236,7 +245,7 @@
(a-stack (:spacing (u16ths 1))
(texture-picker)
(demo-picker))
- (a-stack (:spacing (u96ths 6)
+ #+nah (a-stack (:spacing (u96ths 6)
:justify :center
:outset (u96ths 6)
:visible (c? (not (snapshot-release-id .w.)))
Index: cell-cultures/cellodemo/hedron-decoration.lisp
diff -u cell-cultures/cellodemo/hedron-decoration.lisp:1.1 cell-cultures/cellodemo/hedron-decoration.lisp:1.2
--- cell-cultures/cellodemo/hedron-decoration.lisp:1.1 Sat Jun 26 20:38:35 2004
+++ cell-cultures/cellodemo/hedron-decoration.lisp Wed Sep 29 04:50:11 2004
@@ -97,7 +97,7 @@
:resizeable nil
:content (c? (mk-part :shape (ix-stack)
:pre-layer (with-layers +white+ :fill)
- :md-value (c-in (list 'cube))
+ :md-value (c-in (list 'cello))
:kids (c? (loop for shape in '(cube 4 8 12 rhombic-dodecahedron 20
cylinder cone sphere torus
sierpinski-sponge teapot cello)
Index: cell-cultures/cellodemo/hedron-render.lisp
diff -u cell-cultures/cellodemo/hedron-render.lisp:1.1 cell-cultures/cellodemo/hedron-render.lisp:1.2
--- cell-cultures/cellodemo/hedron-render.lisp:1.1 Sat Jun 26 20:38:35 2004
+++ cell-cultures/cellodemo/hedron-render.lisp Wed Sep 29 04:50:11 2004
@@ -35,17 +35,19 @@
(glut-ftgl-cello font gl_fill))
(defun glut-wire-cello (font)
- (trc "string width"
- (font-string-width 96 font "Cello"))
+ (trc nil "string width"
+ (font-string-width 96 font
+ "2Cel2lo"))
(glut-ftgl-cello font gl_line))
(defun glut-ftgl-cello (font poly-style)
- (gl-polygon-mode gl_front_and_back poly-style)
- ; (gl-rotatef g_rot 1.0f0 0.5f0 0.0f0)
- (gl-scalef .05 .05 .05)
- ;(gl-Scalef .1 .1 .1)
- ;(gl-Translatef -20 -20 0)
- (ftgl-render font "Cello"))
+ (gl-polygon-mode gl_front_and_back poly-style)
+ ; (gl-rotatef g_rot 1.0f0 0.5f0 0.0f0)
+ (gl-scalef .05 .05 .05)
+ ;(gl-Scalef .1 .1 .1)
+ ;(gl-Translatef -20 -20 0)
+
+ (ftgl-render font "Cello"))
(defparameter *sponge-offset* (loop with fv = (fgn-alloc 'gldouble 3 :sponge)
for n below 3
Index: cell-cultures/cellodemo/light-panel.lisp
diff -u cell-cultures/cellodemo/light-panel.lisp:1.1 cell-cultures/cellodemo/light-panel.lisp:1.2
--- cell-cultures/cellodemo/light-panel.lisp:1.1 Sat Jun 26 20:38:35 2004
+++ cell-cultures/cellodemo/light-panel.lisp Wed Sep 29 04:50:11 2004
@@ -34,7 +34,7 @@
(mat-emission :initform nil :initarg :mat-emission :reader mat-emission))
(:default-initargs
:lighting :on
- :text-font (ftgl-make :extruded *gui-style-default-face* 36 96 18)
+ :text-font (ftgl-make :extruded *gui-style-default-face* 18 96 9)
:rotation (let ((rx 0)(ry 0)(rz 0))
(c? (let ((spinning (md-value (fm-other :spinning))))
(macrolet ((radj (axis ixid)
@@ -47,6 +47,9 @@
(radj ry :roty)
(radj rz :rotz)))))))))
+(defmethod display-text$ ((self Hedron))
+ "quick dirty to satisfy ix-styled ogl-disp-list-prep"
+ "2Cel2lo")
(defmodel rgba-mixer (ix-stack)
((red :cell nil :initarg :red :initform nil)
More information about the Cells-cvs
mailing list