[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob include/vob/LinearPrimitives.hxx org/non...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] libvob include/vob/LinearPrimitives.hxx org/non... |
Date: |
Mon, 10 Mar 2003 13:15:55 -0500 |
CVSROOT: /cvsroot/libvob
Module name: libvob
Changes by: Tuomas J. Lukka <address@hidden> 03/03/10 13:15:55
Modified files:
include/vob : LinearPrimitives.hxx
org/nongnu/libvob/gl: GL.java
org/nongnu/libvob/impl/gl: GLVobCoorder.java
Log message:
Wow... it compiles...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/LinearPrimitives.hxx.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/GL.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: libvob/include/vob/LinearPrimitives.hxx
diff -u libvob/include/vob/LinearPrimitives.hxx:1.8
libvob/include/vob/LinearPrimitives.hxx:1.9
--- libvob/include/vob/LinearPrimitives.hxx:1.8 Mon Mar 10 11:02:05 2003
+++ libvob/include/vob/LinearPrimitives.hxx Mon Mar 10 13:15:53 2003
@@ -273,9 +273,10 @@
{
enum { NParams = 7 };
template<class Ptr> void setParams(Ptr p) {
- offset.x = p[0];
- offset.y = p[1];
- offset.z = p[2];
+ offset.z = p[0];
+
+ offset.x = p[1];
+ offset.y = p[2];
xdot.x = p[3];
xdot.y = p[4];
@@ -323,7 +324,7 @@
};
/** Explicit parametrization of ortho.
- * Parameter layout: x, y, depth, xx, yy
+ * Parameter layout: depth, x, y, xx, yy
*/
struct Ortho_Explicit :
public Ortho,
@@ -331,14 +332,40 @@
{
enum { NParams = 5 };
template<class Ptr> void setParams(Ptr p) {
- x = p[0];
- y = p[1];
- z = p[2];
+ z = p[0];
+ x = p[1];
+ y = p[2];
sx = p[3];
sy = p[4];
}
};
VOB_PRIMITIVETRANS_DEFINED(Ortho_Explicit, "ortho");
+
+ class OrthoBox :
+ public Ortho,
+ public BoxPrimitiveTransform
+ {
+ public:
+ Pt box;
+ Pt getSqSize() const { return box; }
+ };
+
+ struct OrthoBox_Explicit :
+ public OrthoBox,
+ public ParametrizedPrimitiveTransform
+ {
+ enum { NParams = 7 };
+ template<class Ptr> void setParams(Ptr p) {
+ z = p[0];
+ x = p[1];
+ y = p[2];
+ sx = p[3];
+ sy = p[4];
+ box.x = p[5];
+ box.y = p[6];
+ }
+ };
+ VOB_PRIMITIVETRANS_DEFINED(OrthoBox_Explicit, "orthoBox");
/** A coordinate system which has as its "unit square"
* the box
Index: libvob/org/nongnu/libvob/gl/GL.java
diff -u libvob/org/nongnu/libvob/gl/GL.java:1.3
libvob/org/nongnu/libvob/gl/GL.java:1.4
--- libvob/org/nongnu/libvob/gl/GL.java:1.3 Mon Mar 10 04:49:31 2003
+++ libvob/org/nongnu/libvob/gl/GL.java Mon Mar 10 13:15:54 2003
@@ -764,6 +764,9 @@
boolean show1,
int coordsys, boolean inverse, float[] points, float[]into);
+ public static native boolean transformSq(int ninds, int[] inds,
+ float[] pts, int coordsys, float[]into);
+
/** Get all the activated coordinate systems in whose unit squares the
* given point falls..
* @param parent (currently ignored, may be used to restrict in future)
Index: libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java
diff -u libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java:1.3
libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java:1.4
--- libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java:1.3 Mon Mar 10
11:02:05 2003
+++ libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java Mon Mar 10 13:15:55 2003
@@ -32,7 +32,7 @@
import java.util.HashMap;
public abstract class GLVobCoorder extends AffineVobCoorder {
-public static final String rcsid = "$Id: GLVobCoorder.java,v 1.3 2003/03/10
16:02:05 tjl Exp $";
+public static final String rcsid = "$Id: GLVobCoorder.java,v 1.4 2003/03/10
18:15:55 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -172,6 +172,9 @@
fract, show1, withCS, true, points, into);
}
+ public void getSqSize(int cs, float[] into) {
+ GL.transformSq(ninds, inds, floats, cs, into);
+ }
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] libvob include/vob/LinearPrimitives.hxx org/non...,
Tuomas J. Lukka <=