[Gzz-commits] gzz ./TODO Documentation/VISION Documentation/M...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/11/29 08:29:03

Modified files:
        .              : TODO 
        Documentation  : VISION 
        Documentation/Manuscripts: gzigzag.bib 
        Documentation/Manuscripts/Irregu: irregu.tex 
        gfx/demo       : papertest.py 

Log message:
        Fixing

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.426&tr2=1.427&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/VISION.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/gzigzag.bib.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/irregu.tex.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text

Patches:
Index: gzz/Documentation/Manuscripts/Irregu/irregu.tex
diff -u gzz/Documentation/Manuscripts/Irregu/irregu.tex:1.90 
gzz/Documentation/Manuscripts/Irregu/irregu.tex:1.91
--- gzz/Documentation/Manuscripts/Irregu/irregu.tex:1.90        Fri Nov 29 
07:42:04 2002
+++ gzz/Documentation/Manuscripts/Irregu/irregu.tex     Fri Nov 29 08:29:03 2002
@@ -63,7 +63,7 @@
 that it is {\em not} possible that the wavy line is actually
 the shape of the machine part, it has to be an artifact of the drawing.
 
-\begin{figure}[h]
+\begin{figure}[t]
 \centering
 \includegraphics[width=5cm]{mercury5part.ps}
 \caption{
@@ -75,9 +75,12 @@
 }
 \end{figure}
 
-Instead of framing a part viewport to the canvas,
-we tear a part of the canvas non-photorealistically, using break lines to 
indicate
-the edges of the tear.
+Instead of framing a rectangular viewport to the canvas,
+we similarly
+``tear'' a part of the canvas non-photorealistically, 
+using break lines to indicate
+the torn edges.
+
 In the following sections, we first describe related work, then the reasons 
and design issues and
 which features are desirable. Next, we describe a mathematical solution to the
 geometric problem and discuss a hardware-accelerated implementation.
@@ -94,15 +97,18 @@
 have been used in user interfaces since Sutherland's
 Sketchpad system\cite{XXX}.
 
-This region is usually forced to be rectangular and parallel to the bounding 
rectangle of the canvas.
-(we shall not be concerned with occlusion by other graphical objects: we shall 
only
+% Viewports are used because the computer screen is finite and we need to be 
able
+% to see a part of the canvas in more detail.
+
+Viewports are usually rectangular and parallel to the bounding rectangle 
+of the canvas.
+(we shall not be concerned with occlusion by other graphical objects: 
+we shall only
 concentrate on the basic characteristics of the viewport).
 
-Viewports are used because the computer screen is finite and we need to be able
-to see a part of the canvas in more detail.
-Indeed, the conventional metaphor for representing viewports {\em is} the 
computer screen: 
-a rectangular region of pixels surrounded by a frame.
-The frame is not affected by the motion of the contents of the viewport.
+% Indeed, the conventional metaphor for representing viewports {\em is} the 
computer screen: 
+% a rectangular region of pixels surrounded by a frame.
+% The frame is not affected by the motion of the contents of the viewport.
 
 
 % and was brought to the current form by ... 
@@ -113,11 +119,13 @@
 
 % - very little variation
 
-Ever since there has been very little
-variation in viewports: they are almost always rectangular
-and framed.
+% Ever since there has been very little
+% variation in viewports: they are almost always rectangular
+% and framed.
+
 Even in systems that modify the conventional windowing model, 
-such as the 
+the viewports appear to be mostly rectangular;
+for example in the
 3D window manager Task Wall\cite{robertson00task},
 Data mountain\cite{robertson98data},
 Elastic Windows\cite{kandogan96elastic,kandogan97elastic}, 
@@ -132,19 +140,17 @@
 BookMap\cite{hascoet00navigationaids},
 the continuous zoom system in \cite{bartram95continuouszoom}
 and
-the Document Lens\cite{robertson93documentlens},
-the viewports are squarely rectangular. % XXX !!! ;^) 
+the Document Lens\cite{robertson93documentlens}.
 The Perspective Wall\cite{mackinlay91perspectivewall} 
 simply folds the rectangular basic shape.
-As an extreme example,
+As an extreme example of this,
 in \cite{carpendale01presspace}, dealing with fisheye magnification, 
 non-rectangular regions are magnified,
 but only rectangular regions are ``lifted off'' the original plane to become 
 their own viewports,  
 
-
 This list is not intended as a criticism of the above work; 
-what we are trying to demonstrate the dominance of rectangular,
+we are only trying to demonstrate the dominance of rectangular,
 framed viewports.
 Indeed, the only references we found in the literature where
 non-rectangular viewports are actually used are 
@@ -152,11 +158,10 @@
 and
 \cite{kramer94translucentwindows}.
 In the toolglass system\cite{bier93toolglass}, 
-a round magnifying glass is used; whether it should
-be called a viewport is debatable: it shows a part of the canvas
-underneath it magnified.
-This is also true for Kramer's work on translucent 
patches\cite{kramer94translucentwindows}:
-there, too, the non-rectangular windows are no viewports but rather complete 
regions, without 
+a round magnifying glass is used.
+In Kramer's work on translucent patches\cite{kramer94translucentwindows},
+the non-rectangular windows are actually
+not viewports but rather complete regions, without 
 a separate underlying canvas.
 
 
Index: gzz/Documentation/Manuscripts/gzigzag.bib
diff -u gzz/Documentation/Manuscripts/gzigzag.bib:1.75 
gzz/Documentation/Manuscripts/gzigzag.bib:1.76
--- gzz/Documentation/Manuscripts/gzigzag.bib:1.75      Fri Nov 29 07:32:39 2002
+++ gzz/Documentation/Manuscripts/gzigzag.bib   Fri Nov 29 08:29:03 2002
@@ -1674,7 +1674,7 @@
 @inproceedings{ perlin-noise-intro,
     author = "K. Perlin",
     title = "An Image Synthesizer",
-    journal = "Computer Graphics (SIGGRAPH '85 Proceedings)",
+    booktitle = "Computer Graphics (SIGGRAPH '85 Proceedings)",
     volume = "19",
     number = "3",
     editor = "B. A. Barsky",
@@ -1682,7 +1682,7 @@
     year = "1985"
 }
 
address@hidden perlin-hypertexture,
address@hidden perlin-hypertexture,
     author = "Ken Perlin, Eric M. Hoffert",
     title = "Hypertexture",
     journal = "Computer Graphics",
Index: gzz/Documentation/VISION
diff -u gzz/Documentation/VISION:1.9 gzz/Documentation/VISION:1.10
--- gzz/Documentation/VISION:1.9        Sun Nov  3 13:28:16 2002
+++ gzz/Documentation/VISION    Fri Nov 29 08:29:03 2002
@@ -41,6 +41,9 @@
 
 User interfaces
 
+    Scalability!
+       Handheld (200x150 screen) to PC (1600x1200) to CAVE environments
+
     Technology fragments (moved from research)
      
        - focus + context views
Index: gzz/TODO
diff -u gzz/TODO:1.426 gzz/TODO:1.427
--- gzz/TODO:1.426      Fri Nov 29 08:22:20 2002
+++ gzz/TODO    Fri Nov 29 08:29:03 2002
@@ -12,6 +12,7 @@
 0.8alpha4: Cleanup release after crucial demos; make it possible for anyone to
            get *THE* demo up and running
     jvk:
+       - find sutherland sketchpad ref
        - calculate size of 2D basis textures: number of RGBA texels in base 
level.
        - make callgl complain on broken stuff such as 
          the string "%(texid)s" in place of a number !!!!
Index: gzz/gfx/demo/papertest.py
diff -u gzz/gfx/demo/papertest.py:1.53 gzz/gfx/demo/papertest.py:1.54
--- gzz/gfx/demo/papertest.py:1.53      Sat Nov 23 14:03:35 2002
+++ gzz/gfx/demo/papertest.py   Fri Nov 29 08:29:03 2002
@@ -36,6 +36,7 @@
 def globalkey(k):
     global benchmark
     global currentScene
+    global zoom
     if k == "F12":
         currentScene = DummyScene()
        AbstractUpdateManager.setNoAnimation()
@@ -55,10 +56,12 @@
         currentScene.initpaper()
     if k == "d":
         gfx.libpaper.papermill.dbg = not gfx.libpaper.papermill.dbg
-    if k == "z":
-        rotatelist(zoom)
-    if k == "x":
-        rotatelist(paperzoom)
+    if k == "<":
+        zoom /= 1.1
+       print zoom
+    if k == ">":
+        zoom *= 1.1
+       print zoom
     if k == "c":
         global cmap
         x,y = 0,0
@@ -91,8 +94,7 @@
         print "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Time of", iters, "renders:", 
t, "s"
 
 
-zoom = [100.0, 500.0, 650.0, 800.0, 2000.0]
-paperzoom = [0.2, 1, 3, 0.05]
+zoom = 900
 
 
 passmask = [1,1,1,1]
@@ -176,7 +178,7 @@
         h = size.height
 
        cs1 = vs.coords.affineCoordsys(0, 10, 0, 0, w, 0, 0, h)
-       scale = zoom[0] / paperzoom[0]
+       scale = zoom
        cs2 = vs.coords.affineCoordsys(0, 0, 0, 0, scale / w, 0, 0, scale / h)
 
        cs1left = vs.coords.ortho(cs1, 0, 0, 0, .5, 1)
@@ -194,7 +196,7 @@
        vs.matcher.add(cs1right, "1r")
        vs.matcher.add(cs2right, "2r")
 
-       pscale = zoom[0]
+       pscale = zoom
 
 
        #print "Seed: ",self.seed," pq ",self.pq
@@ -309,7 +311,7 @@
         cs1w = .47*size.width/self.w
         cs1h = .47*size.height/self.h
 
-       scale = zoom[0] / paperzoom[0]
+       scale = zoom
        cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, scale/cs1w, 0, 0, scale/cs1h)
         vs.matcher.add(cs2, "tex")
 
@@ -393,8 +395,9 @@
        vs.map.put(background((.7,.8,.7)))
        print self.tex
        (x,y) = (0,0)
-       (w,h) = (150,150)
        sp = 10
+       size = vs.getSize().height / 4 - 2*sp
+       (w,h) = (size,size)
        for t in self.tex:
           vs.put(quad((t.getTexId())),  0, sp + x*(w+sp), sp + y*(h+sp), w, h)
           x += 1
@@ -440,6 +443,7 @@
     saveanim.saveframe(filename, w)
 
 def makeScreenshots():
+    w.setLocation(0,0,1400,1000)
     ps = MultiPaperScene()
     ps.seed = 199871850
     ps.initpaper()