[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./Makefile gfx/librenderables/Renderables.h...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] gzz ./Makefile gfx/librenderables/Renderables.h... |
|
Date: |
Wed, 04 Sep 2002 08:48:11 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/09/04 08:48:10
Modified files:
. : Makefile
gfx/librenderables: Renderables.hxx renderables.py
gzz/client : GraphicsAPI.java
gzz/client/gl : GLScreen.java
gzz/modules/pp : BuoyView.java ViewportVob.java Win.java
localpp.py
gzz/modules/pp/vob: BgVob.java
Added files:
gzz/vob : SolidBgVob.java
Log message:
The fixed solidbg vob. Mudyc: take note; if anything's unclear, ask me;
all changes were done for a reason.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.159&tr2=1.160&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.hxx.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/GraphicsAPI.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLScreen.java.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/BuoyView.java.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/ViewportVob.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/Win.java.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/localpp.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/BgVob.java.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/SolidBgVob.java?rev=1.1
Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.159 gzz/Makefile:1.160
*** gzz/Makefile:1.159 Wed Sep 4 07:54:03 2002
--- gzz/Makefile Wed Sep 4 08:48:09 2002
***************
*** 406,412 ****
$(GLLIB) $(JAVA) -Dgzzclient=gl -Xms128M -Xmx128M
org.python.util.jython gzz/modules/pp/ppclient.py $(PPSERVERHOST)
runpplocal:
! $(GLLIB) $(JYTHON) gzz/modules/pp/localpp.py
gzzgl:
make -C gfx all
--- 406,412 ----
$(GLLIB) $(JAVA) -Dgzzclient=gl -Xms128M -Xmx128M
org.python.util.jython gzz/modules/pp/ppclient.py $(PPSERVERHOST)
runpplocal:
! $(GLLIB) $(JYTHON) gzz/modules/pp/localpp.py $(DBG)
gzzgl:
make -C gfx all
Index: gzz/gfx/librenderables/Renderables.hxx
diff -c gzz/gfx/librenderables/Renderables.hxx:1.7
gzz/gfx/librenderables/Renderables.hxx:1.8
*** gzz/gfx/librenderables/Renderables.hxx:1.7 Tue Aug 20 12:33:21 2002
--- gzz/gfx/librenderables/Renderables.hxx Wed Sep 4 08:48:09 2002
***************
*** 20,28 ****
}
! #define STKS { int sa, sm; glGetIntegerv(GL_ATTRIB_STACK_DEPTH, &sa); \
glGetIntegerv(GL_MODELVIEW_STACK_DEPTH, &sm); \
! cout << __FILE__<<" "<<__LINE__<<" STACKS: "<<sa<<"
"<<sm<<"\n"; }
#if 0
--- 20,28 ----
}
! #define STKS { if(dbg) {int sa, sm; glGetIntegerv(GL_ATTRIB_STACK_DEPTH,
&sa); \
glGetIntegerv(GL_MODELVIEW_STACK_DEPTH, &sm); \
! cout << __FILE__<<" "<<__LINE__<<" STACKS: "<<sa<<"
"<<sm<<"\n";} }
#if 0
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.15
gzz/gfx/librenderables/renderables.py:1.16
*** gzz/gfx/librenderables/renderables.py:1.15 Mon Sep 2 08:58:10 2002
--- gzz/gfx/librenderables/renderables.py Wed Sep 4 08:48:09 2002
***************
*** 378,389 ****
lightParam.e0 << " " <<
lightParam.e1 << " " <<
lightParam.e2 << " " <<
! "\\n";
}
GLERR
for(Paper::Paper::iterator it = paper->begin(); it != paper->end();
++it) {
(*it).setUp(&lightParam);
GLERR
--- 378,401 ----
lightParam.e0 << " " <<
lightParam.e1 << " " <<
lightParam.e2 << " " <<
! "\\nCorners" <<
! corners[0] <<
! corners[1] <<
! corners[2] <<
! corners[3] <<
! "\\nCorners trans:" <<
! coords1.transform(corners[0]) <<
! coords1.transform(corners[1]) <<
! coords1.transform(corners[2]) <<
! coords1.transform(corners[3]) <<
! "\\n"
! ;
}
GLERR
for(Paper::Paper::iterator it = paper->begin(); it != paper->end();
++it) {
+ cout << "Pass\n";
(*it).setUp(&lightParam);
GLERR
Index: gzz/gzz/client/GraphicsAPI.java
diff -c gzz/gzz/client/GraphicsAPI.java:1.16
gzz/gzz/client/GraphicsAPI.java:1.17
*** gzz/gzz/client/GraphicsAPI.java:1.16 Thu Aug 29 05:41:16 2002
--- gzz/gzz/client/GraphicsAPI.java Wed Sep 4 08:48:09 2002
***************
*** 98,103 ****
--- 98,106 ----
/** Create a new vobscene of the appropriate type, with current window
* size as size.
+ * This vobscene will <b>not</b> contain any instructions
+ * to clear the window etc., since vobscenes can be used as
+ * viewports.
*/
public VobScene createVobScene() {
return createVobScene(getSize());
Index: gzz/gzz/client/gl/GLScreen.java
diff -c gzz/gzz/client/gl/GLScreen.java:1.25
gzz/gzz/client/gl/GLScreen.java:1.26
*** gzz/gzz/client/gl/GLScreen.java:1.25 Thu Aug 29 05:41:16 2002
--- gzz/gzz/client/gl/GLScreen.java Wed Sep 4 08:48:09 2002
***************
*** 33,39 ****
import java.util.HashMap;
public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.25 2002/08/29
09:41:16 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 33,39 ----
import java.util.HashMap;
public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.26 2002/09/04
12:48:09 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 169,175 ****
this,
size
);
! vs.put(getBGClear(), "NOCKEY", 10, 0, 0, 1, 1);
return vs;
}
--- 169,176 ----
this,
size
);
! // the API particularly forbids this.
! // vs.put(getBGClear(), "NOCKEY", 10, 0, 0, 1, 1);
return vs;
}
Index: gzz/gzz/modules/pp/BuoyView.java
diff -c gzz/gzz/modules/pp/BuoyView.java:1.25
gzz/gzz/modules/pp/BuoyView.java:1.26
*** gzz/gzz/modules/pp/BuoyView.java:1.25 Mon Aug 26 04:21:40 2002
--- gzz/gzz/modules/pp/BuoyView.java Wed Sep 4 08:48:09 2002
***************
*** 49,55 ****
*/
public class BuoyView implements View {
! public static final String rcsid = "$Id: BuoyView.java,v 1.25 2002/08/26
08:21:40 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
--- 49,55 ----
*/
public class BuoyView implements View {
! public static final String rcsid = "$Id: BuoyView.java,v 1.26 2002/09/04
12:48:09 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
***************
*** 146,151 ****
--- 146,153 ----
renderTools(into, 0, (int)(0.95*d.height),
d.width, (int)(0.05*d.height));
p("BUOYVIEW RENDERED");
+
+ into.dump();
}
void mapBuoySizes(List l) {
***************
*** 181,187 ****
Cell plane = cursor.h(Win.d_contains);
! int vd = 100;
float vx = x+w/3, vy = y + h/3, vw = 100, vh = 50;
float dy = -30;
--- 183,189 ----
Cell plane = cursor.h(Win.d_contains);
! int vd = 10;
float vx = x+w/3, vy = y + h/3, vw = 100, vh = 50;
float dy = -30;
Index: gzz/gzz/modules/pp/ViewportVob.java
diff -c gzz/gzz/modules/pp/ViewportVob.java:1.13
gzz/gzz/modules/pp/ViewportVob.java:1.14
*** gzz/gzz/modules/pp/ViewportVob.java:1.13 Fri Aug 9 19:02:26 2002
--- gzz/gzz/modules/pp/ViewportVob.java Wed Sep 4 08:48:09 2002
***************
*** 91,97 ****
if(vp == null) {
vp = GZZGL.createViewport();
cvp = GZZGL.createCloseViewport();
- // if(fr == null) fr = GZZGL.createFrame(0.05f);
}
if(displayList == null) {
--- 91,96 ----
***************
*** 113,122 ****
callList = GZZGL.createCallList(displayList);
}
curs = vp.addToListGL(win, list, curs, coordsys1, coordsys2);
curs = callList.addToListGL(win, list, curs, coordsys1, coordsys2);
curs = cvp.addToListGL(win, list, curs, coordsys1, coordsys2);
! // curs = fr.addToListGL(win, list, curs, coordsys1, coordsys2);
return curs;
}
--- 112,122 ----
callList = GZZGL.createCallList(displayList);
}
+ /*
curs = vp.addToListGL(win, list, curs, coordsys1, coordsys2);
curs = callList.addToListGL(win, list, curs, coordsys1, coordsys2);
curs = cvp.addToListGL(win, list, curs, coordsys1, coordsys2);
! */
return curs;
}
Index: gzz/gzz/modules/pp/Win.java
diff -c gzz/gzz/modules/pp/Win.java:1.47 gzz/gzz/modules/pp/Win.java:1.48
*** gzz/gzz/modules/pp/Win.java:1.47 Thu Aug 29 05:41:16 2002
--- gzz/gzz/modules/pp/Win.java Wed Sep 4 08:48:09 2002
***************
*** 36,42 ****
*/
public class Win extends AbstractBinder implements Shower {
! public static final String rcsid = "$Id: Win.java,v 1.47 2002/08/29 09:41:16
tjl Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
--- 36,42 ----
*/
public class Win extends AbstractBinder implements Shower {
! public static final String rcsid = "$Id: Win.java,v 1.48 2002/09/04 12:48:09
tjl Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
***************
*** 150,159 ****
--- 150,163 ----
spaceChanged();
}
+ Vob bg;
public VobScene generate() {
if(updatePending) updateSpace();
// See UnifiedShower.generate for margins
VobScene sc = this.screen.window.createVobScene();
+ if(bg == null)
+ bg = new SolidBgVob(this.screen.window, new Color(0.4f,0.4f,0.8f));
+ sc.map.put(bg,-1);
if(view != null)
view.render(sc, 0, new ZZViewContext(cursor));
Index: gzz/gzz/modules/pp/localpp.py
diff -c gzz/gzz/modules/pp/localpp.py:1.2 gzz/gzz/modules/pp/localpp.py:1.3
*** gzz/gzz/modules/pp/localpp.py:1.2 Wed Sep 4 03:37:10 2002
--- gzz/gzz/modules/pp/localpp.py Wed Sep 4 08:48:09 2002
***************
*** 8,15 ****
--- 8,24 ----
import gzz.client
import java.lang
import sys
+ import getopt
java.lang.System.setProperty("gzzclient", "gl")
+
+ opts, args = getopt.getopt(sys.argv[1:],
+ gzz.util.dbg.short,
+ gzz.util.dbg.long)
+ for o,a in opts:
+ print "Opt: ",o,a
+ if o in gzz.util.dbg.all:
+ gzz.util.dbg.option(o,a)
obsTrigger = SimpleObsTrigger();
Index: gzz/gzz/modules/pp/vob/BgVob.java
diff -c gzz/gzz/modules/pp/vob/BgVob.java:1.22
gzz/gzz/modules/pp/vob/BgVob.java:1.23
*** gzz/gzz/modules/pp/vob/BgVob.java:1.22 Wed Sep 4 02:31:11 2002
--- gzz/gzz/modules/pp/vob/BgVob.java Wed Sep 4 08:48:09 2002
***************
*** 36,42 ****
* used to pan pretty easily.
*/
public class BgVob extends gzz.vob.Vob {
! public static final String rcsid = "$Id: BgVob.java,v 1.22 2002/09/04
06:31:11 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
--- 36,42 ----
* used to pan pretty easily.
*/
public class BgVob extends gzz.vob.Vob {
! public static final String rcsid = "$Id: BgVob.java,v 1.23 2002/09/04
12:48:09 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
***************
*** 77,82 ****
--- 77,84 ----
}
static HashMap papers = new HashMap();
+ static GZZGL.DisplayList list;
+ static Vob triangle;
GZZGL.PaperQuad getPaperQuad(Cell c) {
GZZGL.PaperQuad ret = (GZZGL.PaperQuad)papers.get(c);
***************
*** 86,91 ****
--- 88,100 ----
pap = PaperMill.getInstance().getPaper(c.hashCode());
ret = GZZGL.createPaperQuad(pap, -1, -1, 1, 1);
papers.put(c, ret);
+
+ list = GZZGL.createDisplayList(
+ "Disable TEXTURE_2D\nColor 1 0 0 1\nBegin TRIANGLES\nVertex
-1 -1\n" +
+ "Vertex 1 -1\nVertex 1 1\nEnd\n"
+ );
+
+ triangle = GZZGL.createCallListCoorded(list);
}
return ret;
}
***************
*** 97,102 ****
--- 106,112 ----
GZZGL.PaperQuad pq = getPaperQuad(papercode);
curs = pq.addToListGL(win, list, curs, coordsys1, coordsys2);
+ curs = triangle.addToListGL(win, list, curs, coordsys1, -1);
return curs;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./Makefile gfx/librenderables/Renderables.h...,
Tuomas J. Lukka <=