[ff-cvs] libvob include/vob/trans/Primitives.hxx org/non...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/09/01 06:20:31

Modified files:
        include/vob/trans: Primitives.hxx 
        org/nongnu/libvob: AbstractUpdateManager.java 
        org/nongnu/libvob/impl/gl: GLUpdateManager.java 
Added files:
        org/nongnu/libvob/util: PrioritizeBackground.java 

Log message:
        patch-25
        Allow access to instance for use as bg
        patch-26
        Of course, getInstance makes more sense as a static method... ;)
        patch-27
        Fix the bug that had been bothering humppake and mudyc. Inverse 
transformations with potentially gl performable things were not handled right.
        patch-28
        An implementation of background that allows priority offsetting
        patch-29
        Really fix the glperformable bug - have to be careful about the 
overloadings

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/trans/Primitives.hxx.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/AbstractUpdateManager.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/util/PrioritizeBackground.java?rev=1.1

Patches:
Index: libvob/include/vob/trans/Primitives.hxx
diff -u libvob/include/vob/trans/Primitives.hxx:1.5 
libvob/include/vob/trans/Primitives.hxx:1.6
--- libvob/include/vob/trans/Primitives.hxx:1.5 Fri Jun  6 04:31:00 2003
+++ libvob/include/vob/trans/Primitives.hxx     Mon Sep  1 06:20:30 2003
@@ -167,18 +167,25 @@
        // alternative versions for transforms with and without
        // given features.
 
-       bool performGL(GLPerformablePrimitiveTransform &t) const {
+       bool performGL(const GLPerformablePrimitiveTransform *_) const {
            t.performGL();
            return super->performGL();
        }
-       template<class T> bool performGL(T &t) const {
+       bool performGL(const PotentiallyGLPerformablePrimitiveTransform *_) 
const {
+           if(!t.performGL()) return false;
+           return super->performGL();
+       }
+       bool performGL(const void *t) const {
            return false;
        }
 
-       bool canPerformGL(GLPerformablePrimitiveTransform &t) const {
+       bool canPerformGL(const GLPerformablePrimitiveTransform *_) const {
            return super->canPerformGL();
        }
-       template<class T> bool canPerformGL(T &t) const {
+       bool canPerformGL(const PotentiallyGLPerformablePrimitiveTransform *_) 
const {
+           return t.canPerformGL() && super->canPerformGL() ;
+       }
+       bool canPerformGL(const void *t) const {
            return false;
        }
 
@@ -196,11 +203,11 @@
            return super->isNonlinear();
        }
 
-       float selfNonlinearity(NonlinearPrimitiveTransform &t,
+       float selfNonlinearity(const NonlinearPrimitiveTransform *_,
                    const ZPt &p, float radius) const {
            return t.nonlinearity(p, radius);
        }
-       template<class T> float selfNonlinearity(T &t,
+       float selfNonlinearity(const void *t,
                    const ZPt &p, float radius) const {
            return 0;
        }
@@ -236,12 +243,12 @@
            glVertex3f(mp.x, mp.y, mp.z);
        }
 
-       virtual bool performGL() const { return performGL(t); }
+       virtual bool performGL() const { return performGL(&t); }
 
-       virtual bool canPerformGL() const { return canPerformGL(t); }
+       virtual bool canPerformGL() const { return canPerformGL(&t); }
 
        virtual float nonlinearity(const ZPt &p, float radius) const {
-           float s = selfNonlinearity(t, p, radius);
+           float s = selfNonlinearity(&t, p, radius);
            ZPt mp;
            t.tr(p, mp);
            float su = super->nonlinearity(mp, radius);
@@ -257,7 +264,8 @@
        virtual void dump(std::ostream &out) const {
            out << "[inversetrans "<<
                PrimitiveHierarchicalTransform<OrigPrimitive>::name
-                   << " ";
+                   <<"("<<this->canPerformGL()
+                   << ") ";
            super->dump(out);
            dumpParams(&t, out);
            out <<"]";
@@ -480,7 +488,8 @@
        }
 
        virtual void dump(std::ostream &out) const {
-           out << "[trans "<<name<< " ";
+           out << "[trans "<<name<<"("<<this->canPerformGL()<<
+                   ") ";
            super->dump(out);
            dumpParams(&t, out);
            out <<"]";
Index: libvob/org/nongnu/libvob/AbstractUpdateManager.java
diff -u libvob/org/nongnu/libvob/AbstractUpdateManager.java:1.7 
libvob/org/nongnu/libvob/AbstractUpdateManager.java:1.8
--- libvob/org/nongnu/libvob/AbstractUpdateManager.java:1.7     Sun Aug 31 
08:27:36 2003
+++ libvob/org/nongnu/libvob/AbstractUpdateManager.java Mon Sep  1 06:20:31 2003
@@ -46,7 +46,7 @@
  */
 
 public abstract class AbstractUpdateManager implements Runnable, 
org.nongnu.libvob.util.Background {
-public static final String rcsid = "$Id: AbstractUpdateManager.java,v 1.7 
2003/08/31 12:27:36 tjl Exp $";
+public static final String rcsid = "$Id: AbstractUpdateManager.java,v 1.8 
2003/09/01 10:20:31 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { 
        System.err.println("AbstractUpdateManager: "+s); }
@@ -57,6 +57,9 @@
            throw new Error("Trying to start two updateManagers");
        if(dbg) pa("Updatemanager "+in);
        instance = in;
+    }
+    public static AbstractUpdateManager getInstance() {
+       return instance;
     }
 
     private Runnable initRunnable;
Index: libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java
diff -u libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java:1.4 
libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java:1.5
--- libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java:1.4   Tue Jul 22 
08:01:50 2003
+++ libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java       Mon Sep  1 
06:20:31 2003
@@ -36,7 +36,7 @@
 
 
 public class GLUpdateManager extends AbstractUpdateManager {
-public static final String rcsid = "$Id: GLUpdateManager.java,v 1.4 2003/07/22 
12:01:50 tjl Exp $";
+public static final String rcsid = "$Id: GLUpdateManager.java,v 1.5 2003/09/01 
10:20:31 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("GLUpdateManager: 
"+s); }
 
@@ -70,7 +70,6 @@
             actionListener.actionPerformed(e);
         }         
     }
-    public static GLUpdateManager getInstance() { return 
(GLUpdateManager)instance; }
     private int freeMemoryCountdown = 50;
 
     protected boolean doIdle() {