[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./Makefile gfx/demo/gldemo.py gfx/demo/pape...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz ./Makefile gfx/demo/gldemo.py gfx/demo/pape... |
Date: |
Wed, 11 Sep 2002 11:25:10 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/09/11 11:25:10
Modified files:
. : Makefile
gfx/demo : gldemo.py papertest.py
gfx/demo/opengl: glinfo.py
gzz/vob : GLTextStyle.java
Added files:
gfx/demo : buoydev.py
Log message:
Nadir, buoy work
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.163&tr2=1.164&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoydev.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/glinfo.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/GLTextStyle.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.163 gzz/Makefile:1.164
*** gzz/Makefile:1.163 Wed Sep 11 08:03:08 2002
--- gzz/Makefile Wed Sep 11 11:25:09 2002
***************
*** 397,407 ****
runfillets:
$(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/fillets.py
runglinfo:
! $(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/glinfo.py
runstencil:
$(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/opengl/stencil.py
runirregu:
$(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/irregularframe.py
runfisheye:
$(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/fisheye.py
--- 397,409 ----
runfillets:
$(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/fillets.py
runglinfo:
! $(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/opengl/glinfo.py
runstencil:
$(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/opengl/stencil.py
runirregu:
$(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/irregularframe.py
+ runbuoydev:
+ $(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/buoydev.py
runfisheye:
$(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/fisheye.py
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.10 gzz/gfx/demo/gldemo.py:1.11
*** gzz/gfx/demo/gldemo.py:1.10 Tue Sep 10 14:53:19 2002
--- gzz/gfx/demo/gldemo.py Wed Sep 11 11:25:10 2002
***************
*** 68,74 ****
try:
a=font
except:
! font = GZZGL.createFont("gzz/gfx/gl/a010013l.pfb", 24);
return font
--- 68,74 ----
try:
a=font
except:
! font = GZZGL.createFont("gfx/fonts/a010013l.pfb", 32);
return font
Index: gzz/gfx/demo/opengl/glinfo.py
diff -c gzz/gfx/demo/opengl/glinfo.py:1.1 gzz/gfx/demo/opengl/glinfo.py:1.2
*** gzz/gfx/demo/opengl/glinfo.py:1.1 Tue Sep 10 06:04:25 2002
--- gzz/gfx/demo/opengl/glinfo.py Wed Sep 11 11:25:10 2002
***************
*** 1,11 ****
from __future__ import nested_scopes
font = None
def getText(text, x = 0, y = 0, z = 2, w = 1, h = 1):
global font
if font == None:
#GZZGL.startContext()
! font = GZZGL.createFont("gfx/fonts/a010013l.pfb", 40)
#GZZGL.endContext()
return GZZGL.createHorizText(font, text, x, y, z, w,h)
--- 1,12 ----
from __future__ import nested_scopes
font = None
+ fontsize = 40
def getText(text, x = 0, y = 0, z = 2, w = 1, h = 1):
global font
if font == None:
#GZZGL.startContext()
! font = GZZGL.createFont("gfx/fonts/a010013l.pfb", fontsize)
#GZZGL.endContext()
return GZZGL.createHorizText(font, text, x, y, z, w,h)
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.20 gzz/gfx/demo/papertest.py:1.21
*** gzz/gfx/demo/papertest.py:1.20 Fri Sep 6 05:21:33 2002
--- gzz/gfx/demo/papertest.py Wed Sep 11 11:25:10 2002
***************
*** 229,241 ****
font = None
def getText(text, x = 0, y = 0, z = 2, w = 1, h = 1):
! global font
! if font == None:
! #GZZGL.startContext()
! font = GZZGL.createFont("gfx/fonts/a010013l.pfb", 40)
! #GZZGL.endContext()
!
! return GZZGL.createHorizText(font, text, x, y, z, w,h)
def putText(vs, cs1, text, color = None, x = 0, y = 0, z = 2, w = 1, h = 1):
if color != None:
--- 229,235 ----
font = None
def getText(text, x = 0, y = 0, z = 2, w = 1, h = 1):
! return GZZGL.createHorizText(getFont(), text, x, y, z, w,h)
def putText(vs, cs1, text, color = None, x = 0, y = 0, z = 2, w = 1, h = 1):
if color != None:
Index: gzz/gzz/vob/GLTextStyle.java
diff -c gzz/gzz/vob/GLTextStyle.java:1.8 gzz/gzz/vob/GLTextStyle.java:1.9
*** gzz/gzz/vob/GLTextStyle.java:1.8 Wed Aug 21 02:18:35 2002
--- gzz/gzz/vob/GLTextStyle.java Wed Sep 11 11:25:10 2002
***************
*** 31,37 ****
/** OpenGL implementation of TextStyle
*/
public class GLTextStyle extends TextStyle {
! public static final String rcsid = "$Id: GLTextStyle.java,v 1.8 2002/08/21
06:18:35 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 31,37 ----
/** OpenGL implementation of TextStyle
*/
public class GLTextStyle extends TextStyle {
! public static final String rcsid = "$Id: GLTextStyle.java,v 1.9 2002/09/11
15:25:10 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 45,51 ****
GLTextStyle s = instances[size];
if(s == null) {
if(theStaticFont == null)
! theStaticFont = GZZGL.createFont("gfx/fonts/a010013l.pfb", 36);
s = new GLTextStyle(theStaticFont, size / (float)36);
instances[size] = s;
}
--- 45,51 ----
GLTextStyle s = instances[size];
if(s == null) {
if(theStaticFont == null)
! theStaticFont = GZZGL.createFont("gfx/fonts/a010013l.pfb", 32);
s = new GLTextStyle(theStaticFont, size / (float)36);
instances[size] = s;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./Makefile gfx/demo/gldemo.py gfx/demo/pape...,
Tuomas J. Lukka <=