gzz-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gzz-commits] gzz Documentation/Presentations/General2002/scr...


From: Tuomas J. Lukka
Subject: [Gzz-commits] gzz Documentation/Presentations/General2002/scr...
Date: Sun, 15 Sep 2002 05:45:00 -0400

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/15 05:45:00

Modified files:
        Documentation/Presentations/General2002: script.html 
        gzz/gfx/gl     : Stencil.java 
        lava/gfx/bugs  : stencil.cxx 

Log message:
        More thinking about the demo. The Xanadu model is actually not one of 
the real main points here - good to explain but even more important is the P2P 
versioning framework we've been thinking about

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Presentations/General2002/script.html.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/Stencil.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gfx/bugs/stencil.cxx.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/Documentation/Presentations/General2002/script.html
diff -c gzz/Documentation/Presentations/General2002/script.html:1.8 
gzz/Documentation/Presentations/General2002/script.html:1.9
*** gzz/Documentation/Presentations/General2002/script.html:1.8 Fri Sep 13 
13:57:53 2002
--- gzz/Documentation/Presentations/General2002/script.html     Sun Sep 15 
05:44:59 2002
***************
*** 1,4 ****
! <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 
Transitional//EN"><html><head><title>script</title>
    
  
    
--- 1,8 ----
! <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>
!   <title>script</title>
! 
!   
! 
    
  
    
***************
*** 15,24 ****
    
    
    
!   <meta http-equiv="content-type" content="text/html; 
charset=ISO-8859-1"></head><body>
  This is a rough script for a presentation about our research group's work. 
<br>
  <br>
  <table cellpadding="2" cellspacing="2" border="0" width="100%">
    <tbody>
      <tr>
        <td valign="top"><br>
--- 19,37 ----
    
    
    
!   
!   
!   <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
! </head><body>
  This is a rough script for a presentation about our research group's work. 
<br>
+ 
+ 
  <br>
+ 
+ 
  <table cellpadding="2" cellspacing="2" border="0" width="100%">
+ 
+ 
    <tbody>
      <tr>
        <td valign="top"><br>
***************
*** 44,50 ****
        <td valign="top">Before I start to tell you about our technology, let 
me explain our current status.<br>
        </td>
        <td valign="top">There have been a lot of releases, the last "stable"
! one being 0.6. However, 0.6 is not yet usable for real work, it's still 
proof-of-concept.<br>
        </td>
        <td valign="top">After 0.6, the system has been <b>completely</b> 
redesigned from a more solid ground.<br>
        </td>
--- 57,63 ----
        <td valign="top">Before I start to tell you about our technology, let 
me explain our current status.<br>
        </td>
        <td valign="top">There have been a lot of releases, the last "stable"
! one being 0.6. However, 0.6 was not yet usable for real work, it's still 
proof-of-concept.<br>
        </td>
        <td valign="top">After 0.6, the system has been <b>completely</b> 
redesigned from a more solid ground.<br>
        </td>
***************
*** 93,98 ****
--- 106,113 ----
  publically available from our CVS repository.<br>
        <br>
  This <b>doesn't</b> mean that it's ready for production use. Most of it is 
not. Making production-level software takes a lot of polishing.<br>
+       <br>
+ But if you see something that you want to productize, talk to me.<br>
        </td>
        <td valign="top"><br>
        </td>
***************
*** 111,120 ****
--- 126,139 ----
      </tr>
    </tbody>
  </table>
+ 
+ 
  <br>
  
  
  
+ 
+ 
  <h1>LibPaper basics: unique textures for identity<br>
  </h1>
  
***************
*** 122,127 ****
--- 141,148 ----
  
  
  
+ 
+ 
        
        
  <table cellpadding="2" cellspacing="0" border="0" width="100%">
***************
*** 131,136 ****
--- 152,159 ----
  
  
  
+ 
+ 
    <tbody>
      <tr>
        <td valign="top"><img src="script-img/pdf-plain.png" alt="" width="179" 
height="184">
***************
*** 220,245 ****
--- 243,278 ----
  
  
  
+ 
+ 
  <br>
  
  
  
+ 
+ 
  <h1>LibPaper context: connectivity, links<br>
  </h1>
  
  
  
+ 
+ 
  <br>
  
  
  
  
+ 
+ 
  <table>
  
  
  
  
  
+ 
+ 
      <tbody><tr>
        <td valign="top"><br>
        </td>
***************
*** 390,405 ****
--- 423,448 ----
  </table>
  
  
+ 
+ 
  <br>
  
+ 
+ 
  <h1>Buoys<br>
  </h1>
  
+ 
+ 
  <p><br>
  </p>
  
+ 
+ 
  <table cellpadding="2" cellspacing="2" border="0" width="100%">
  
+ 
+ 
    <tbody>
      <tr>
        <td valign="top"><img 
src="file:///home/tjl/gzz/Documentation/Presentations/General2002/script-img/pdf-connectedness.png"
 alt="" width="195" height="154">
***************
*** 610,618 ****
--- 653,667 ----
  </table>
  
  
+ 
+ 
  <h1>Some more about this "hyperstructure" stuff</h1>
  
+ 
+ 
  <table cellpadding="2" cellspacing="2" border="0" width="100%">
+ 
+ 
    <tbody>
      <tr>
        <td valign="top"><br>
***************
*** 737,742 ****
--- 786,793 ----
  there's no fundamental reason why you couldn't say "remember the connection"
  except that the systems' most fundamental parts were designed with computers,
  not humans in mind.<br>
+       <br>
+ Connections were not included in the design as "first-class citizens"<br>
        </td>
        <td valign="top"><br>
        </td>
***************
*** 843,851 ****
        <br>
  And indeed, the relational model is designed for machines: accounting, 
sending checks etc.<br>
        </td>
!       <td valign="top"><br>
        </td>
!       <td valign="top"><br>
        </td>
      </tr>
      <tr>
--- 894,905 ----
        <br>
  And indeed, the relational model is designed for machines: accounting, 
sending checks etc.<br>
        </td>
!       <td valign="top">We are interested in a more <i>ad hoc</i> 
structure.<br>
        </td>
!       <td valign="top">Actually,
! layering an ad hoc hyperstructure as above on top of a relational database
! would be a great topic for research; if you have a good application in mind,
! please talk to me. we'd be very interested in trying out something like 
that.<br>
        </td>
      </tr>
      <tr>
***************
*** 870,886 ****
--- 924,948 ----
      </tr>
    </tbody>
  </table>
+ 
+ 
  <br>
  
  
+ 
+ 
  <h1>Hyperstructure in teamwork<br>
  </h1>
  
  
+ 
+ 
  <table>
  
  
  
+ 
+ 
      <tbody><tr>
        <td valign="top"><img src="script-img/net-not-tv.png" alt="" 
width="154" height="149">
        <br>
***************
*** 914,919 ****
--- 976,1100 ----
        </td>
        <td valign="top"><br>
        </td>
+       <td valign="top">C<br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr><tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top">XXX Discuss Storm, P2P, merge ... as versioning and 
collaboration.<br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
        <td valign="top"><br>
        </td>
      </tr>
***************
*** 928,933 ****
--- 1109,1162 ----
        </td>
      </tr>
      <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+     <tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+     </tr>
+ </tbody>
+ </table>
+ <br>
+ <h1>Xanalogical hypertext (optional part)<br>
+ </h1>
+ <p>
+ <table>
+ 
+     <tbody><tr>
        <td valign="top"><img src="script-img/xu-intro.png" alt="" width="158" 
height="151">
        <br>
        </td>
***************
*** 1168,1174 ****
--- 1397,1413 ----
        </td>
        <td valign="top"><br>
        </td>
+     </tr><tr>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
+       <td valign="top"><br>
+       </td>
      </tr>
+ 
    </tbody>
  </table>
  
***************
*** 1177,1182 ****
--- 1416,1422 ----
  
  
  
+ 
  <br>
  
  
***************
*** 1184,1189 ****
--- 1424,1430 ----
  
  
  
+ 
  <br>
  
  
***************
*** 1191,1196 ****
--- 1432,1438 ----
  
  
  
+ 
  <br>
  
  
***************
*** 1198,1209 ****
--- 1440,1458 ----
  
  
  
+ 
  <br>
  
  
  
  
  
+ 
  <br>
+ 
  <br>
+ 
+ <br>
+ 
+ </p>
  </body></html>
Index: gzz/gzz/gfx/gl/Stencil.java
diff -c gzz/gzz/gfx/gl/Stencil.java:1.11 gzz/gzz/gfx/gl/Stencil.java:1.12
*** gzz/gzz/gfx/gl/Stencil.java:1.11    Fri Sep 13 14:41:26 2002
--- gzz/gzz/gfx/gl/Stencil.java Sun Sep 15 05:45:00 2002
***************
*** 50,60 ****
        initStencil = GZZGL.createCallList(
  " PushAttrib ENABLE_BIT STENCIL_BUFFER_BIT COLOR_BUFFER_BIT\n"+
  "    Enable STENCIL_TEST\n"+
! "    StencilFunc EQUAL 0 15\n"+
! "    StencilOp ZERO ZERO INCR\n"+ // XXX
! "    StencilMask 1\n"+
! "    ColorMask 0 0 0 0\n"+
! "    Disable DEPTH_TEST\n"
            );
  
        initOutside = GZZGL.createCallList(
--- 50,59 ----
        initStencil = GZZGL.createCallList(
  " PushAttrib ENABLE_BIT STENCIL_BUFFER_BIT COLOR_BUFFER_BIT\n"+
  "    Enable STENCIL_TEST\n"+
! "    StencilFunc ALWAYS 1 255\n"+
! "    StencilOp ZERO ZERO REPLACE\n"+ // XXX
! "    StencilMask 255\n"+
! "    ColorMask 0 0 0 0\n"
            );
  
        initOutside = GZZGL.createCallList(
***************
*** 92,98 ****
        initZero = GZZGL.createCallList(
  "    StencilFunc ALWAYS 1 1\n"+
  "    StencilOp ZERO ZERO ZERO\n"+ // XXX
! "    StencilMask 1\n"+
  "    ColorMask 0 0 0 0\n"
            );
        exit = GZZGL.createCallList(
--- 91,97 ----
        initZero = GZZGL.createCallList(
  "    StencilFunc ALWAYS 1 1\n"+
  "    StencilOp ZERO ZERO ZERO\n"+ // XXX
! "    StencilMask 255\n"+
  "    ColorMask 0 0 0 0\n"
            );
        exit = GZZGL.createCallList(
Index: gzz/lava/gfx/bugs/stencil.cxx
diff -c gzz/lava/gfx/bugs/stencil.cxx:1.1 gzz/lava/gfx/bugs/stencil.cxx:1.2
*** gzz/lava/gfx/bugs/stencil.cxx:1.1   Wed Sep 11 11:09:26 2002
--- gzz/lava/gfx/bugs/stencil.cxx       Sun Sep 15 05:45:00 2002
***************
*** 6,13 ****
--- 6,21 ----
   */
  
  #include <unistd.h>
+ #include <iostream>
  #include <GL/glut.h>
  
+ using std::cout;
+ 
+ #define GLERR { int er = glGetError(); if(er != GL_NO_ERROR) \
+                   cout << "===== OPENGL ERROR "<<__FILE__<<" "<<__LINE__ \
+                       <<"  "<<gluErrorString(er)<<"\n"; \
+           }
+ 
  void display() {
      glClearColor(0.5,0.2,0.2, 1);
      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | 
GL_STENCIL_BUFFER_BIT);
***************
*** 27,33 ****
      glEnable(GL_DEPTH_TEST);
      glDepthFunc(GL_LEQUAL);
      glEnable(GL_STENCIL_TEST);
!     glStencilMask(1);
  
      glColor3f(0,0,1);
      glBegin(GL_TRIANGLES);
--- 35,41 ----
      glEnable(GL_DEPTH_TEST);
      glDepthFunc(GL_LEQUAL);
      glEnable(GL_STENCIL_TEST);
!     glStencilMask(255);
  
      glColor3f(0,0,1);
      glBegin(GL_TRIANGLES);
***************
*** 54,60 ****
      glPopMatrix();
      glutSwapBuffers();
  
!     sleep(1);
  }
  
  void idle() { 
--- 62,86 ----
      glPopMatrix();
      glutSwapBuffers();
  
! #define WH 100
!     GLuint buf[WH*WH];
!     glReadPixels(0, 0, WH, WH, GL_STENCIL_INDEX, GL_UNSIGNED_INT, buf);
!     GLERR
!     for(int i=0; i<WH*WH; i++) {
!       if(buf[i] != 0) goto nonzero;
!     }
! 
! finish:
!     sleep(5);
!     return;
! 
! nonzero:
!     for(int i=0; i<WH*WH; i++) {
!       cout << buf[i] << " ";
!       buf[i] = 0;
!     }
!     cout << "\n\n\n\n";
!     goto finish;
  }
  
  void idle() { 
***************
*** 64,70 ****
  int main(int argc, char *argv[]) {
      glutInit(&argc, argv);
      glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_STENCIL);
!     glutInitWindowSize(1200,900);
      glutCreateWindow("stenciltest");
      glShadeModel(GL_SMOOTH);
      glutDisplayFunc(display);
--- 90,96 ----
  int main(int argc, char *argv[]) {
      glutInit(&argc, argv);
      glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_STENCIL);
!     glutInitWindowSize(100,100);
      glutCreateWindow("stenciltest");
      glShadeModel(GL_SMOOTH);
      glutDisplayFunc(display);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]