[Gzz-commits] gzz ./TODO gfx/libcoords/Coords.cxx gzz/vob/Vob...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/26 06:02:52

Modified files:
        .              : TODO 
        gfx/libcoords  : Coords.cxx 
        gzz/vob        : VobPlacer.java 
Added files:
        gfx/demo       : hierarch.py 

Log message:
        Core dump demo\!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.143&tr2=1.144&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/hierarch.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.cxx.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobPlacer.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.143 gzz/TODO:1.144
*** gzz/TODO:1.143      Thu Sep 26 05:12:54 2002
--- gzz/TODO    Thu Sep 26 06:02:52 2002
***************
*** 15,20 ****
--- 15,21 ----
            - a general test which tests that a CoordSys implementation
              and its inverse match up (enabled for most coordsys).
            - tests for the hierarchy working correctly
+           - a general test that transform() and performGL() do the same thing
        - implement DistortCoords::createInverse(). This is not easy, and 
          it IS allowable to use numeric approximation for root-finding.
          Make sure you abstract this into libdistort properly
Index: gzz/gfx/libcoords/Coords.cxx
diff -c gzz/gfx/libcoords/Coords.cxx:1.7 gzz/gfx/libcoords/Coords.cxx:1.8
*** gzz/gfx/libcoords/Coords.cxx:1.7    Thu Sep 26 04:31:24 2002
--- gzz/gfx/libcoords/Coords.cxx        Thu Sep 26 06:02:52 2002
***************
*** 12,17 ****
--- 12,21 ----
        virtual void vertex(const ZPt &p) const {
            glVertex3f(p.x, p.y, p.z);
        }
+       virtual bool canPerformGL() { return true; }
+         virtual bool performGL() {
+           return true;
+       }
      };
  
      /** Affine coordinate system (in xy), offset in z.
***************
*** 38,45 ****
            tr(p, mp);
            super->vertex(mp);
        }
!       virtual bool canPerformGL() { return true; }
          virtual bool performGL() {
              GLfloat matrix[16] = {
                  params[3], params[5], 0, 0,
                  params[4], params[6], 0, 0,
--- 42,50 ----
            tr(p, mp);
            super->vertex(mp);
        }
!       virtual bool canPerformGL() { return super->canPerformGL(); }
          virtual bool performGL() {
+           if(!super->performGL()) return false;
              GLfloat matrix[16] = {
                  params[3], params[5], 0, 0,
                  params[4], params[6], 0, 0,
***************
*** 61,68 ****
        enum { NParams = 1 };
        virtual void setParams(float *params) {
            CoordSys::setParams(params);
!           s = sin(params[0]);
!           c = cos(params[0]);
        }
        /** Perform the internal transformation of this 
         * coordsys.
--- 66,73 ----
        enum { NParams = 1 };
        virtual void setParams(float *params) {
            CoordSys::setParams(params);
!           s = sin(params[0] * M_PI / 180);
!           c = cos(params[0] * M_PI / 180);
        }
        /** Perform the internal transformation of this 
         * coordsys.
***************
*** 81,86 ****
--- 86,97 ----
            ZPt mp;
            tr(p, mp);
            super->vertex(mp);
+       }
+       virtual bool canPerformGL() { return super->canPerformGL(); }
+         virtual bool performGL() {
+           if(!super->performGL()) return false;
+           glRotatef(params[0], 0, 0, 1);
+           return true;
        }
      };
  
Index: gzz/gzz/vob/VobPlacer.java
diff -c gzz/gzz/vob/VobPlacer.java:1.5 gzz/gzz/vob/VobPlacer.java:1.6
*** gzz/gzz/vob/VobPlacer.java:1.5      Fri Aug 30 03:54:12 2002
--- gzz/gzz/vob/VobPlacer.java  Thu Sep 26 06:02:52 2002
***************
*** 35,40 ****
--- 35,41 ----
   */
  
  public interface VobPlacer {
+     void put(Vob vob);
      /** Place a <code>Vob</code> onto this scene. 
       *  @param vob   the vob to be placed
       *  @param coordsys The index of the coordinate system,