[Gzz-commits] gzz ./Makefile ./TODO gfx/jni/GzzGL-jni.cxx gfx...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/04 03:37:10

Modified files:
        .              : Makefile TODO 
        gfx/jni        : GzzGL-jni.cxx 
        gfx/libmosaic  : Mosaic.cxx Mosaic.hxx 
        gfx/libpaper   : colors.py papermill.py textures.py 
        gzz/modules/pp : localpp.py 

Log message:
        More integration

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.157&tr2=1.158&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/GzzGL-jni.cxx.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libmosaic/Mosaic.cxx.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libmosaic/Mosaic.hxx.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/colors.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/textures.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/localpp.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.157 gzz/Makefile:1.158
*** gzz/Makefile:1.157  Wed Sep  4 03:08:53 2002
--- gzz/Makefile        Wed Sep  4 03:37:09 2002
***************
*** 406,412 ****
        $(GLLIB) $(JAVA) -Dgzzclient=gl -Xms128M -Xmx128M 
org.python.util.jython gzz/modules/pp/ppclient.py $(PPSERVERHOST)
  
  runpplocal: 
!       $(GLLIB) $(JAVA) -Dgzzclient=gl -Xms128M -Xmx128M 
org.python.util.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
  
  gzzgl:
        make -C gfx all
Index: gzz/TODO
diff -c gzz/TODO:1.71 gzz/TODO:1.72
*** gzz/TODO:1.71       Wed Sep  4 03:08:54 2002
--- gzz/TODO    Wed Sep  4 03:37:09 2002
***************
*** 38,46 ****
            - background color
            - cell borders???
            - text vobs' size
-       + Fix UML sequence diagram: now you have to put
-         seqobjects *after* the sequence...
-       + bidirectional jlinks
  
  0.8alpha3: Critical tests:
      anybody:
--- 38,43 ----
***************
*** 51,58 ****
          Absolutely necessary to avoid breakage of one or the other system.
        - Go through test/ and convert tests to either .py or move to basalt/
        - Some basic tests for gfx/
-     tjl, jvk:
-       + (maybe to "PP release") unit tests for libpaper?
  
  0.8alpha4: Crucial demos for continued funding
        - PP
--- 48,53 ----
***************
*** 70,75 ****
--- 65,73 ----
          The path from structure to bytes and bytes to structure
          needs to be ABSOLUTELY clear and transparent.
        - first cut at merge
+       + Fix UML sequence diagram: now you have to put
+         seqobjects *after* the sequence...
+       + bidirectional jlinks
  
  
  0.8alpha7: PP release
***************
*** 91,96 ****
--- 89,95 ----
            - visibility (when the anchor is not visible)
      tjl, jvk:
        - production version of libPaper
+       - unit tests for libpaper?
      
      PEG:
        - 1003
Index: gzz/gfx/jni/GzzGL-jni.cxx
diff -c gzz/gfx/jni/GzzGL-jni.cxx:1.10 gzz/gfx/jni/GzzGL-jni.cxx:1.11
*** gzz/gfx/jni/GzzGL-jni.cxx:1.10      Mon Sep  2 08:58:10 2002
--- gzz/gfx/jni/GzzGL-jni.cxx   Wed Sep  4 03:37:10 2002
***************
*** 71,77 ****
          cerr << "Couldn't set window to current -> returning\n";
          return;
        }
!       DBG(dbg) << "Set current\n";
  
  }
  void releaseWindow(int wid = -1) {
--- 71,77 ----
          cerr << "Couldn't set window to current -> returning\n";
          return;
        }
!       DBG(dbg) << "Set current "<<wid<<"\n";
  
  }
  void releaseWindow(int wid = -1) {
***************
*** 81,86 ****
--- 81,87 ----
          cerr << "Couldn't release window current!!!";
          exit(17);
      }
+     DBG(dbg) << "Release current "<<wid<<"\n";
  }
  
  struct GZZJNIEventHandler : public Os::Eventhandler {
***************
*** 340,345 ****
--- 341,347 ----
        setWindow();
        GLuint ret;
        glGenTextures(1, &ret);
+       DBG(dbg) << "Created texture id "<<ret<<"\n";
        GLERR
        releaseWindow();
        return ret;
***************
*** 366,371 ****
--- 368,374 ----
        jstring format,
            jstring name, jobjectArray params) {
        setWindow();
+       DBG(dbg)<<"Shade into "<<id<<"\n";
  
        const char *name_utf = env->GetStringUTFChars(name, 0);
  
***************
*** 551,557 ****
        GLERR
  
        releaseWindow(wid);
-       DBG(dbg) << "Set current\n";
    }
  
  JNIEXPORT void JNICALL Java_gzz_gfx_gl_GZZGL_compileCallGL
--- 554,559 ----
***************
*** 681,687 ****
          releaseWindow(window);
        }
  
-       DBG(dbg) << "Did releasecurrent\n";
  
    }
  
--- 683,688 ----
***************
*** 748,754 ****
          releaseWindow(window);
        }
  
-       DBG(dbg) << "Did releasecurrent\n";
  
        return t;
    }
--- 749,754 ----
Index: gzz/gfx/libmosaic/Mosaic.cxx
diff -c gzz/gfx/libmosaic/Mosaic.cxx:1.4 gzz/gfx/libmosaic/Mosaic.cxx:1.5
*** gzz/gfx/libmosaic/Mosaic.cxx:1.4    Wed Aug 21 03:12:43 2002
--- gzz/gfx/libmosaic/Mosaic.cxx        Wed Sep  4 03:37:10 2002
***************
*** 130,135 ****
--- 130,136 ----
      }
  
      MosaicTile MosaicBuilder::alloc(int w, int h, int border) {
+       if(textures.size() == 0) createNew();
        int pw = w + 2*border;
        int ph = h + 2*border;
        Talloc::Block b = textures.back()->
Index: gzz/gfx/libmosaic/Mosaic.hxx
diff -c gzz/gfx/libmosaic/Mosaic.hxx:1.6 gzz/gfx/libmosaic/Mosaic.hxx:1.7
*** gzz/gfx/libmosaic/Mosaic.hxx:1.6    Wed Aug 21 03:12:43 2002
--- gzz/gfx/libmosaic/Mosaic.hxx        Wed Sep  4 03:37:10 2002
***************
*** 431,437 ****
        /** MosaicBuilder takes ownership of fact.
         */
        MosaicBuilder(Texture2DFactory *fact) : fact(fact) {
-           createNew();
        }
        ~MosaicBuilder() {
            for(unsigned i=0; i<textures.size(); i++)
--- 431,436 ----
Index: gzz/gfx/libpaper/colors.py
diff -c gzz/gfx/libpaper/colors.py:1.1 gzz/gfx/libpaper/colors.py:1.2
*** gzz/gfx/libpaper/colors.py:1.1      Tue Sep  3 17:16:12 2002
--- gzz/gfx/libpaper/colors.py  Wed Sep  4 03:37:10 2002
***************
*** 1,6 ****
--- 1,8 ----
  # Choosing colors and 3-dotproduct factors for papers.
  
  class Colors:
+     def _js(self, arg):
+       return " ".join([str(a) for a in arg])
      def __init__(self, seed):
        rnd = self.rnd = java.util.Random(seed)
        # currently, 4 colors
***************
*** 20,26 ****
              if abdiff(col[2], col[3]) < 40: continue
              break
  
!       self.colors = [js(c) for c in col]
  
        self.randvecs = [self._randvec2() for i in range(0,15)]
  
--- 22,28 ----
              if abdiff(col[2], col[3]) < 40: continue
              break
  
!       self.colors = [self._js(c) for c in col]
  
        self.randvecs = [self._randvec2() for i in range(0,15)]
  
***************
*** 34,37 ****
        return [x, y, z]
  
      def getNVDP3VecStr(self, ind):
!       return js(self.randvecs[ind % len(self.randvecs)])+" 1"
--- 36,39 ----
        return [x, y, z]
  
      def getNVDP3VecStr(self, ind):
!       return self._js(self.randvecs[ind % len(self.randvecs)])+" 1"
Index: gzz/gfx/libpaper/papermill.py
diff -c gzz/gfx/libpaper/papermill.py:1.22 gzz/gfx/libpaper/papermill.py:1.23
*** gzz/gfx/libpaper/papermill.py:1.22  Wed Sep  4 02:31:11 2002
--- gzz/gfx/libpaper/papermill.py       Wed Sep  4 03:37:10 2002
***************
*** 60,65 ****
--- 60,66 ----
        assert 0, "Sorry, can't do without NVIDIA register combiners yet."
  
      for f in files:
+       print "Load file ",f
        execfile("gfx/libpaper/"+f, globals())
  
  def randvec(rnd): return [rnd.nextDouble() for i in range(0,3)]
Index: gzz/gfx/libpaper/textures.py
diff -c gzz/gfx/libpaper/textures.py:1.5 gzz/gfx/libpaper/textures.py:1.6
*** gzz/gfx/libpaper/textures.py:1.5    Wed Sep  4 02:31:11 2002
--- gzz/gfx/libpaper/textures.py        Wed Sep  4 03:37:10 2002
***************
*** 31,37 ****
  
  tres = 128
  
! textures["RGB2"] = [
  mt(i) for i in [
  #    ("rgbn", [512, 512, 0, 3, "RGB", "RGB",
  #       "noise", ["type", "turbulence", "freq", "40", "scale", "-3", "bias", 
"2"]]),
--- 31,37 ----
  
  tres = 128
  
! ptextures["RGB2"] = [
  mt(i) for i in [
  #    ("rgbn", [512, 512, 0, 3, "RGB", "RGB",
  #       "noise", ["type", "turbulence", "freq", "40", "scale", "-3", "bias", 
"2"]]),
***************
*** 42,48 ****
  ]]
  
  def getPaperTexture(type, gen):
!     return selectRandom(textures[type], gen)
  
  if 0:
              rgbTextures = [
--- 42,48 ----
  ]]
  
  def getPaperTexture(type, gen):
!     return selectRandom(ptextures[type], gen)
  
  if 0:
              rgbTextures = [
Index: gzz/gzz/modules/pp/localpp.py
diff -c gzz/gzz/modules/pp/localpp.py:1.1 gzz/gzz/modules/pp/localpp.py:1.2
*** gzz/gzz/modules/pp/localpp.py:1.1   Tue Sep  3 06:14:34 2002
--- gzz/gzz/modules/pp/localpp.py       Wed Sep  4 03:37:10 2002
***************
*** 9,14 ****
--- 9,16 ----
  import java.lang
  import sys
  
+ java.lang.System.setProperty("gzzclient", "gl")
+ 
  
  obsTrigger = SimpleObsTrigger();
  cellTexter = SimpleVStreamTexter(FakeSpanMaker(), 
Enfilade1DImpl.Enfilade1DImplMaker())