[Gzz-commits] gzz ./TODO ./genimages.pl gfx/libcoords/Coords....

[Tuomas J. Lukka]

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

Modified files:
        .              : TODO genimages.pl 
        gfx/libcoords  : Coords.cxx 
        gfx/libutil    : Vec23.hxx 
        gzz/media/impl : PageImageScroll.java 

Log message:
        More coordsys

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.201&tr2=1.202&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/genimages.pl.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.cxx.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/Vec23.hxx.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/PageImageScroll.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.201 gzz/TODO:1.202
*** gzz/TODO:1.201      Mon Sep 30 10:04:25 2002
--- gzz/TODO    Mon Sep 30 12:30:09 2002
***************
*** 41,52 ****
          papertest.py and others.
          Also avoids name clashes
      tuukkah:
        - unit tests for libcoords:
            - a general test that transform() and performGL() do the same thing
-           - needs unit test framework for C++
        - xupdf
            - review code, suggest cleanups and improvements
-       - when a gl window is closed, call Binder.windowClosed()
      humppake:
        - clippedPaperQuad (leave unrendered if outside cs3)
            - needs renderable3
--- 41,51 ----
          papertest.py and others.
          Also avoids name clashes
      tuukkah:
+       - when a gl window is closed, call Binder.windowClosed()
        - unit tests for libcoords:
            - a general test that transform() and performGL() do the same thing
        - xupdf
            - review code, suggest cleanups and improvements
      humppake:
        - clippedPaperQuad (leave unrendered if outside cs3)
            - needs renderable3
***************
*** 86,93 ****
                - special matcher?
                - really USE hierarchical keys
            - clean up the xupdf.py file
!           - frame rate ~= 25
!               - paperquad texture binding LOD?
            - better graphics for xu links
            - mouse clicks on buoys to work
            - better distortion
--- 85,91 ----
                - special matcher?
                - really USE hierarchical keys
            - clean up the xupdf.py file
!           - paperquad texture binding LOD?
            - better graphics for xu links
            - mouse clicks on buoys to work
            - better distortion
***************
*** 112,127 ****
      anybody:
        - if there are problems with performance, edit libcoords to use
          boost::object_pool for making allocations much faster
-       + a really comprehensive web page of screenshots
-         and instructions on how to get them and run.
        + make gldemo able to use fullscreen sync_to_vblank mode so that we 
could
          get the benefits of page flipping. How does this interact with e.g.
          twinview? Need to turn it off?
-       - make mstmpimg generate images also in a resolution which
-         better fits
-         1024x1024 textures - currently a LOT of space is being wasted
-           - note however that we DO want square texels;
-             ask Tjl for explanation
  
  0.8alpha4: Cleanup release after crucial demos; make it possible for anyone to
            get *THE* demo up and running
--- 110,118 ----
***************
*** 212,217 ****
--- 203,210 ----
              (Tjl's laptop, Geforce4Go) should be >= 24
                - string concenations in heavy loops
                - debug output
+       + a really comprehensive web page of screenshots
+         and instructions on how to get them and run.
  
  0.8alpha5: saving, loading etc. with mediaserver useful; tests
      jvk:
Index: gzz/genimages.pl
diff -c gzz/genimages.pl:1.3 gzz/genimages.pl:1.4
*** gzz/genimages.pl:1.3        Fri Sep 27 02:34:21 2002
--- gzz/genimages.pl    Mon Sep 30 12:30:09 2002
***************
*** 26,32 ****
      system($_[0]);
  }
  
! for $resolution (144, 72) {
  
      for $file (grep {!/$not/} @pdf) {
        $file =~ /b_(\w+)$/ or die "Invalid block name $file";
--- 26,32 ----
      system($_[0]);
  }
  
! for $resolution (85, 25) {
  
      for $file (grep {!/$not/} @pdf) {
        $file =~ /b_(\w+)$/ or die "Invalid block name $file";
Index: gzz/gfx/libcoords/Coords.cxx
diff -c gzz/gfx/libcoords/Coords.cxx:1.16 gzz/gfx/libcoords/Coords.cxx:1.17
*** gzz/gfx/libcoords/Coords.cxx:1.16   Mon Sep 30 08:53:33 2002
--- gzz/gfx/libcoords/Coords.cxx        Mon Sep 30 12:30:10 2002
***************
*** 139,144 ****
--- 139,148 ----
        enum { NParams = 4 };
        virtual void setParams(float *params) {
            CoordSys::setParams(params);
+           vec.x = params[0];
+           vec.y = params[1];
+           vec.z = params[2];
+           vec = vec.normalized();
  
            s = sin(params[3] * M_PI / 180);
            c = cos(params[3] * M_PI / 180);
***************
*** 147,156 ****
         * coordsys.
         */
        void tr(const ZPt &from, ZPt &to) const {
! 
!           to.x = c * from.x + s * from.y; 
!           to.y = -s * from.x + c * from.y; 
!           to.z = from.z;
        }
        virtual ZPt transform(const ZPt &p) const {
            ZPt mp;
--- 151,163 ----
         * coordsys.
         */
        void tr(const ZPt &from, ZPt &to) const {
!           ZVec v(from);
!           float same = v.dot(vec);
!           ZVec para = v - same*vec;
!           float  paral = para.length();
!           para = (1/paral)*para;
!           ZVec ortho = para.crossp(v).normalized();
!           to = ZPt( same * vec + paral * (c * para + s * ortho) );
        }
        virtual ZPt transform(const ZPt &p) const {
            ZPt mp;
Index: gzz/gfx/libutil/Vec23.hxx
diff -c gzz/gfx/libutil/Vec23.hxx:1.9 gzz/gfx/libutil/Vec23.hxx:1.10
*** gzz/gfx/libutil/Vec23.hxx:1.9       Thu Sep 26 04:31:24 2002
--- gzz/gfx/libutil/Vec23.hxx   Mon Sep 30 12:30:10 2002
***************
*** 65,71 ****
        T x, y, z;
        Point3() : x(0), y(0), z(0) { }
        Point3(T x, T y, T z) : x(x), y(y), z(z) { }
!       Point3(Point<T> &p, T z = 0) : x(p.x), y(p.y), z(z) { }
        Vector3<T> operator-(const Point3 &p) const { 
                return Vector3<T>(x - p.x, y - p.y, z - p.z); }
        Point3<T> operator+(const Vector3<T> v) 
--- 65,72 ----
        T x, y, z;
        Point3() : x(0), y(0), z(0) { }
        Point3(T x, T y, T z) : x(x), y(y), z(z) { }
!       Point3(const Point<T> &p, T z = 0) : x(p.x), y(p.y), z(z) { }
!       Point3(const Vector3<T> &v) : x(v.x), y(v.y), z(v.z) { }
        Vector3<T> operator-(const Point3 &p) const { 
                return Vector3<T>(x - p.x, y - p.y, z - p.z); }
        Point3<T> operator+(const Vector3<T> v) 
***************
*** 119,125 ****
        T x, y, z;
        Vector3() : x(0), y(0), z(0) { }
        Vector3(T x, T y, T z) : x(x), y(y), z(z) { }
!       Vector3(Vector<T> &v, float z) : x(v.x), y(v.y), z(z) { }
        Vector3 operator*(const double &s) const { return Vector3(s * x, s * y, 
s * z); } ;
  
        template<class U> const Vector3 &operator*=(const U &s) { x *= s; y *= 
s; z *= s;
--- 120,127 ----
        T x, y, z;
        Vector3() : x(0), y(0), z(0) { }
        Vector3(T x, T y, T z) : x(x), y(y), z(z) { }
!       Vector3(const Vector<T> &v, float z) : x(v.x), y(v.y), z(z) { }
!       Vector3(const Point3<T> &v) : x(v.x), y(v.y), z(v.z) { }
        Vector3 operator*(const double &s) const { return Vector3(s * x, s * y, 
s * z); } ;
  
        template<class U> const Vector3 &operator*=(const U &s) { x *= s; y *= 
s; z *= s;
***************
*** 143,148 ****
--- 145,151 ----
                    x * v.y - y * v.x
                    );
        }
+       Vector3 normalized() { return (1/length()) * *this ; }
      };
      template<class T> Vector3<T> operator*(const double &s, const Vector3<T> 
&v) {
        return v * s;
Index: gzz/gzz/media/impl/PageImageScroll.java
diff -c gzz/gzz/media/impl/PageImageScroll.java:1.8 
gzz/gzz/media/impl/PageImageScroll.java:1.9
*** gzz/gzz/media/impl/PageImageScroll.java:1.8 Fri Sep 27 02:34:21 2002
--- gzz/gzz/media/impl/PageImageScroll.java     Mon Sep 30 12:30:10 2002
***************
*** 38,51 ****
  
  public class PageImageScroll
         implements ScrollBlockManager.MediaserverScrollBlock {
! String rcsid = "$Id: PageImageScroll.java,v 1.8 2002/09/27 06:34:21 humppake 
Exp $";
      public static boolean dbg = true;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
  
      int WIDTH=612; // Letter size fixed, for now, in points, 1/72ths of 
inches..
      int HEIGHT=792;
!     int RESOLUTION=72; // sigh
  
      String DIR="../mstmpimg/"; // XXX Non-platform-independent!
  
--- 38,54 ----
  
  public class PageImageScroll
         implements ScrollBlockManager.MediaserverScrollBlock {
! String rcsid = "$Id: PageImageScroll.java,v 1.9 2002/09/30 16:30:10 tjl Exp 
$";
      public static boolean dbg = true;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
  
      int WIDTH=612; // Letter size fixed, for now, in points, 1/72ths of 
inches..
      int HEIGHT=792;
! 
!     /** Resolution of the images to use.
!      */
!     int RESOLUTION=85; // sigh
  
      String DIR="../mstmpimg/"; // XXX Non-platform-independent!