Update of /project/pal/cvsroot/pal In directory clnet:/tmp/cvs-serv25911

Modified Files: default-font.fnt default-font.png pal.lisp Log Message:

--- /project/pal/cvsroot/pal/default-font.fnt 2007/06/28 20:14:05 1.1 +++ /project/pal/cvsroot/pal/default-font.fnt 2007/10/15 19:04:55 1.2 @@ -2,98 +2,98 @@

Bitmap=default-font.png

-Char=" ",1,1,3,13,-1,2 -Char="!",5,1,4,13,1,0 -Char=""",10,1,5,13,0,1 -Char="#",16,1,10,13,0,-1 -Char="$",27,1,9,13,-1,0 -Char="%",37,1,12,13,0,-1 -Char="&",50,1,10,13,0,0 -Char="'",61,1,3,13,0,0 -Char="(",65,1,5,13,0,0 -Char=")",71,1,5,13,0,0 -Char="*",77,1,7,13,-1,0 -Char="+",85,1,9,13,0,0 -Char=",",95,1,5,13,-1,0 -Char="-",101,1,5,13,0,0 -Char=".",107,1,4,13,0,0 -Char="/",112,1,6,13,-1,-1 -Char="0",1,15,8,13,0,0 -Char="1",10,15,8,13,0,0 -Char="2",19,15,8,13,0,0 -Char="3",28,15,8,13,0,0 -Char="4",37,15,9,13,0,-1 -Char="5",47,15,8,13,0,0 -Char="6",56,15,8,13,0,0 -Char="7",65,15,8,13,0,0 -Char="8",74,15,8,13,0,0 -Char="9",83,15,8,13,0,0 -Char=":",92,15,4,13,0,0 -Char=";",97,15,5,13,-1,0 -Char="<",103,15,9,13,0,0 -Char="=",113,15,9,13,0,0 -Char=">",1,29,9,13,0,0 -Char="?",11,29,7,13,0,-1 -Char="@",19,29,12,13,0,-1 -Char="A",32,29,10,13,-1,-1 -Char="B",43,29,9,13,0,0 -Char="C",53,29,9,13,0,0 -Char="D",63,29,9,13,0,0 -Char="E",73,29,8,13,0,0 -Char="F",82,29,8,13,0,0 -Char="G",91,29,9,13,0,0 -Char="H",101,29,9,13,0,0 -Char="I",111,29,4,13,0,0 -Char="J",116,29,6,13,-2,0 -Char="K",1,43,10,13,0,-1 -Char="L",12,43,8,13,0,-1 -Char="M",21,43,11,13,0,0 -Char="N",33,43,9,13,0,0 -Char="O",43,43,10,13,0,0 -Char="P",54,43,9,13,0,-1 -Char="Q",64,43,10,13,0,0 -Char="R",75,43,9,13,0,-1 -Char="S",85,43,8,13,0,0 -Char="T",94,43,10,13,-1,-1 -Char="U",105,43,9,13,0,0 -Char="V",115,43,10,13,-1,-1 -Char="W",1,57,13,13,0,0 -Char="X",15,57,10,13,-1,-1 -Char="Y",26,57,10,13,-1,-1 -Char="Z",37,57,9,13,0,-1 -Char="[",47,57,6,13,0,-1 -Char="",54,57,6,13,-1,-1 -Char="]",61,57,6,13,-1,0 -Char="^",68,57,9,13,0,0 -Char="_",78,57,8,13,-1,-1 -Char="`",87,57,5,13,0,1 -Char="a",93,57,8,13,0,0 -Char="b",102,57,8,13,0,0 -Char="c",111,57,7,13,0,0 -Char="d",1,71,8,13,0,0 -Char="e",10,71,8,13,0,0 -Char="f",19,71,7,13,-1,-1 -Char="g",27,71,8,13,0,0 -Char="h",36,71,8,13,0,0 -Char="i",45,71,4,13,0,0 -Char="j",50,71,5,13,-1,0 -Char="k",56,71,9,13,0,-2 -Char="l",66,71,4,13,0,0 -Char="m",71,71,12,13,0,-1 -Char="n",84,71,8,13,0,0 -Char="o",93,71,8,13,0,0 -Char="p",102,71,8,13,0,0 -Char="q",111,71,8,13,0,0 -Char="r",120,71,6,13,0,-1 -Char="s",1,85,7,13,0,0 -Char="t",9,85,7,13,-1,-1 -Char="u",17,85,8,13,0,0 -Char="v",26,85,9,13,-1,-1 -Char="w",36,85,11,13,0,0 -Char="x",48,85,9,13,-1,-1 -Char="y",58,85,9,13,-1,-1 -Char="z",68,85,7,13,0,0 -Char="{",76,85,8,13,0,0 -Char="|",85,85,3,13,0,1 -Char="}",89,85,8,13,0,0 -Char="~",98,85,9,13,0,0 +Char=" ",1,1,3,15,-1,1 +Char="!",5,1,3,15,0,0 +Char=""",9,1,5,15,-1,0 +Char="#",15,1,9,15,-1,-1 +Char="$",25,1,7,15,0,0 +Char="%",33,1,11,15,0,0 +Char="&",45,1,9,15,0,-1 +Char="'",55,1,3,15,0,-1 +Char="(",59,1,5,15,0,-1 +Char=")",65,1,5,15,-1,0 +Char="*",71,1,7,15,-1,-1 +Char="+",79,1,7,15,0,0 +Char=",",87,1,3,15,0,0 +Char="-",91,1,5,15,-1,0 +Char=".",97,1,3,15,0,0 +Char="/",101,1,5,15,-1,-1 +Char="0",107,1,7,15,0,0 +Char="1",115,1,5,15,0,2 +Char="2",1,17,7,15,0,0 +Char="3",9,17,7,15,0,0 +Char="4",17,17,7,15,0,0 +Char="5",25,17,7,15,0,0 +Char="6",33,17,7,15,0,0 +Char="7",41,17,7,15,0,0 +Char="8",49,17,7,15,0,0 +Char="9",57,17,7,15,0,0 +Char=":",65,17,3,15,0,0 +Char=";",69,17,3,15,0,0 +Char="<",73,17,7,15,0,0 +Char="=",81,17,8,15,-1,0 +Char=">",90,17,7,15,0,0 +Char="?",98,17,7,15,0,0 +Char="@",106,17,13,15,0,-1 +Char="A",1,33,9,15,-1,-1 +Char="B",11,33,8,15,0,0 +Char="C",20,33,9,15,0,0 +Char="D",30,33,9,15,0,0 +Char="E",40,33,8,15,0,0 +Char="F",49,33,7,15,0,0 +Char="G",57,33,9,15,0,0 +Char="H",67,33,9,15,0,0 +Char="I",77,33,3,15,0,0 +Char="J",81,33,7,15,-1,0 +Char="K",89,33,9,15,0,-1 +Char="L",99,33,8,15,0,-1 +Char="M",108,33,9,15,0,0 +Char="N",1,49,9,15,0,0 +Char="O",11,49,9,15,0,0 +Char="P",21,49,8,15,0,0 +Char="Q",30,49,9,15,0,0 +Char="R",40,49,9,15,0,0 +Char="S",50,49,8,15,0,0 +Char="T",59,49,9,15,-1,-1 +Char="U",69,49,9,15,0,0 +Char="V",79,49,9,15,-1,-1 +Char="W",89,49,13,15,-1,-1 +Char="X",103,49,9,15,-1,-1 +Char="Y",113,49,9,15,-1,-1 +Char="Z",1,65,9,15,-1,-1 +Char="[",11,65,4,15,0,-1 +Char="",16,65,5,15,-1,-1 +Char="]",22,65,4,15,-1,0 +Char="^",27,65,7,15,-1,-1 +Char="_",35,65,9,15,-1,-1 +Char="`",45,65,4,15,0,0 +Char="a",50,65,7,15,0,0 +Char="b",58,65,7,15,0,0 +Char="c",66,65,6,15,0,0 +Char="d",73,65,7,15,0,0 +Char="e",81,65,7,15,0,0 +Char="f",89,65,6,15,-1,-2 +Char="g",96,65,7,15,0,0 +Char="h",104,65,7,15,0,0 +Char="i",112,65,3,15,0,0 +Char="j",116,65,5,15,-2,0 +Char="k",1,81,7,15,0,-1 +Char="l",9,81,3,15,0,0 +Char="m",13,81,11,15,0,0 +Char="n",25,81,7,15,0,0 +Char="o",33,81,7,15,0,0 +Char="p",41,81,7,15,0,0 +Char="q",49,81,7,15,0,0 +Char="r",57,81,5,15,0,-1 +Char="s",63,81,7,15,0,0 +Char="t",71,81,5,15,-1,-1 +Char="u",77,81,7,15,0,0 +Char="v",85,81,7,15,-1,-1 +Char="w",93,81,11,15,-1,-1 +Char="x",105,81,7,15,-1,-1 +Char="y",113,81,7,15,-1,-1 +Char="z",1,97,7,15,-1,-1 +Char="{",9,97,5,15,-1,0 +Char="|",15,97,3,15,0,0 +Char="}",19,97,5,15,0,-1 +Char="~",25,97,8,15,0,-1 Binary files /project/pal/cvsroot/pal/default-font.png 2007/06/28 20:14:05 1.1 and /project/pal/cvsroot/pal/default-font.png 2007/10/15 19:04:55 1.2 differ --- /project/pal/cvsroot/pal/pal.lisp 2007/10/11 19:26:23 1.31 +++ /project/pal/cvsroot/pal/pal.lisp 2007/10/15 19:04:55 1.32 @@ -728,7 +728,8 @@ (pal-ffi:gl-pop-attrib))

(defunct draw-circle (pos radius r g b a &key (fill t) absolutep (size 1f0) smoothp (segments 30)) - (vec pos single-float radius u8 r u8 g u8 b u8 a (or image symbol) fill boolean absolutep single-float size boolean smoothp fixnum segments) + (vec pos single-float radius u8 r u8 g u8 b u8 a + (or image symbol) fill boolean absolutep single-float size boolean smoothp fixnum segments) (declare (type vec pos) (type fixnum segments)) (draw-polygon (loop for a from 0 to (* 2 pi) by (/ (* 2 pi) segments) collecting (v+ pos