[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz client/Fallback.java vob/vobs/ColoredSe...
From: |
Asko Soukka |
Subject: |
[Gzz-commits] gzz/gzz client/Fallback.java vob/vobs/ColoredSe... |
Date: |
Wed, 05 Mar 2003 05:34:28 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Asko Soukka <address@hidden> 03/03/05 05:34:28
Modified files:
gzz/client : Fallback.java
gzz/vob/vobs : ColoredSectorVob.java
ColoredSquareSectorVob.java
Log message:
fixes crashing gl client, SquareSector ready for stenciling
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/ColoredSectorVob.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/ColoredSquareSectorVob.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gzz/gzz/client/Fallback.java
diff -u gzz/gzz/client/Fallback.java:1.56 gzz/gzz/client/Fallback.java:1.57
--- gzz/gzz/client/Fallback.java:1.56 Fri Feb 21 15:02:37 2003
+++ gzz/gzz/client/Fallback.java Wed Mar 5 05:34:28 2003
@@ -79,7 +79,7 @@
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
-public static final String rcsid = "$Id: Fallback.java,v 1.56 2003/02/21
20:02:37 tjl Exp $";
+public static final String rcsid = "$Id: Fallback.java,v 1.57 2003/03/05
10:34:28 humppake Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -266,7 +266,7 @@
if(cached) return cachedVobScene;
VobScene sc = this.screen.window.createVobScene();
- sc.map.put(new SolidBgVob(bg), 0);
+ sc.map.put(new SolidBgVob(bg));
for(int i=0; i<decorators.length; i++) {
if(dbg) pa("Call scene decorator: "+decorators[i]);
Index: gzz/gzz/vob/vobs/ColoredSectorVob.java
diff -u gzz/gzz/vob/vobs/ColoredSectorVob.java:1.8
gzz/gzz/vob/vobs/ColoredSectorVob.java:1.9
--- gzz/gzz/vob/vobs/ColoredSectorVob.java:1.8 Wed Mar 5 04:37:29 2003
+++ gzz/gzz/vob/vobs/ColoredSectorVob.java Wed Mar 5 05:34:28 2003
@@ -46,7 +46,7 @@
*/
public class ColoredSectorVob extends Vob {
-public static final String rcsid = "$Id: ColoredSectorVob.java,v 1.8
2003/03/05 09:37:29 humppake Exp $";
+public static final String rcsid = "$Id: ColoredSectorVob.java,v 1.9
2003/03/05 10:34:28 humppake Exp $";
public static boolean dbg = false;
static final void p(String s) { if(dbg) System.out.println(s); }
static final void pa(String s) { System.out.println(s); }
@@ -57,8 +57,8 @@
if (!circleGLReady) {
for (int i=0;i<360;i++) {
float a = (float)((Math.PI / 180) * (360-i));
- circleGL[i][0] = r + x(a, r);
- circleGL[i][1] = r + y(a, r);
+ circleGL[i][0] = 0.5f + x(a, r);
+ circleGL[i][1] = 0.5f + y(a, r);
}
circleGLReady = true;
}
Index: gzz/gzz/vob/vobs/ColoredSquareSectorVob.java
diff -u gzz/gzz/vob/vobs/ColoredSquareSectorVob.java:1.4
gzz/gzz/vob/vobs/ColoredSquareSectorVob.java:1.5
--- gzz/gzz/vob/vobs/ColoredSquareSectorVob.java:1.4 Wed Mar 5 04:37:29 2003
+++ gzz/gzz/vob/vobs/ColoredSquareSectorVob.java Wed Mar 5 05:34:28 2003
@@ -45,7 +45,7 @@
*/
public class ColoredSquareSectorVob extends ColoredSectorVob {
-public static final String rcsid = "$Id: ColoredSquareSectorVob.java,v 1.4
2003/03/05 09:37:29 humppake Exp $";
+public static final String rcsid = "$Id: ColoredSquareSectorVob.java,v 1.5
2003/03/05 10:34:28 humppake Exp $";
public ColoredSquareSectorVob() {
super(90, 360, 10);
@@ -102,8 +102,11 @@
if (!circleGLReady) prepareCircleGL((float)Math.sqrt(50)/10);
String bgcall = "";
- if(nsolids > 0) bgcall += glSolidsString();
- else bgcall += glBgString();
+ if(nsolids > 0) {
+ // Enable Stencil here
+ bgcall += glSolidsString();
+ // Disable Stencil here
+ } else bgcall += glBgString();
if(drawBorder) bgcall += glBorderString();
glList = GLRen.createCallListBoxCoorded(
@@ -116,6 +119,34 @@
vs.map.put(glList, coordsys1);
return 0;
}
+
+ protected String glBgString() {
+ String glString = "";
+ glString += (
+ "Color "+ColorUtil.colorGLString(bg)+" 1\n" +
+ "Begin QUAD_STRIP\n"+
+ "Vertex 1 1\nVertex 1 0\n"+
+ "Vertex 0 1\nVertex 0 0\n"+
+ "End\n");
+ return glString;
+ }
+
+ protected String glBorderString() {
+ String glString = "";
+ glString += (
+ "Color 0 0 0 1\n"+
+ "Begin LINE_STRIP\n"+
+ "Vertex 1 1\n"+
+ "Vertex 1 0\n"+
+ "Vertex 0 0\n"+
+ "Vertex 0 1\n"+
+ "Vertex 1 1\n"+
+ "End\n"
+ );
+ return glString;
+ }
+
+
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gzz client/Fallback.java vob/vobs/ColoredSe...,
Asko Soukka <=