[Gzz-commits] libvob ./Makefile include/vob/geom/Quadrics.hxx...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/06/05 03:55:10

Modified files:
        .              : Makefile 
        include/vob/geom: Quadrics.hxx 
        src/jni        : Makefile 
Added files:
        include/vob/opt: Zero1D.hxx 
        src/geom       : Makefile Quadrics.cxx 

Log message:
        Ellipse code

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/Makefile.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/geom/Quadrics.hxx.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/opt/Zero1D.hxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/geom/Makefile?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/geom/Quadrics.cxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Makefile.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: libvob/Makefile
diff -u libvob/Makefile:1.37 libvob/Makefile:1.38
--- libvob/Makefile:1.37        Tue May 27 03:45:29 2003
+++ libvob/Makefile     Thu Jun  5 03:55:10 2003
@@ -1,6 +1,6 @@
 include rules.mk
 
-SUBDIRS = src/trans src/util src/texture src/paper src/lines src/os src/main
+SUBDIRS = src/trans src/util src/texture src/paper src/lines src/os src/main 
src/geom
 # ctest off for now
 
 RAWSRC = `find org/ -name "*.java"` 
Index: libvob/include/vob/geom/Quadrics.hxx
diff -u libvob/include/vob/geom/Quadrics.hxx:1.4 
libvob/include/vob/geom/Quadrics.hxx:1.5
--- libvob/include/vob/geom/Quadrics.hxx:1.4    Mon Jun  2 14:18:42 2003
+++ libvob/include/vob/geom/Quadrics.hxx        Thu Jun  5 03:55:10 2003
@@ -68,6 +68,15 @@
     }
 
 
+    /** A rather special geometric problem arising from fillets.
+     * Given a 2D point and a normal, find the ellipse that passes through
+     * the point with the normal that also passes through origin tangent to 
the 
+     * X axis and is symmetric w.r.t. the Y axis.
+     * @return A 2D point, y component is vertical radius of ellipse, x 
component is
+     *                         horizontal radius.
+     */
+    Vec symmellipse__point_norm(Vec point, Vec normal);
+
 }
 }
 
Index: libvob/src/jni/Makefile
diff -u libvob/src/jni/Makefile:1.29 libvob/src/jni/Makefile:1.30
--- libvob/src/jni/Makefile:1.29        Mon May 19 05:13:00 2003
+++ libvob/src/jni/Makefile     Thu Jun  5 03:55:10 2003
@@ -19,6 +19,7 @@
 OSOBJS=../os/Os-GLX.o 
 TEXTUREOBJS=../texture/Texture.o ../texture/Texture_pipetexture.o 
 UTILOBJS=../util/Perlin.o ../util/buildmipmaps.o ../util/Debug.o 
../util/ImageLoader.o ../util/intersect.o
+GEOMOBJS=../geom/Quadrics.o
 
 TRANSOBJS=../trans/Transform.o ../trans/Coorder.o
 
@@ -26,7 +27,7 @@
 
 OBJS= $(sources:%.cxx=%.o)
 
-JNIOBJS=$(OBJS) $(VOB_OBJS) $(TRANS_OBJS) $(OSOBJS) $(TEXTUREOBJS) $(UTILOBJS) 
$(CALLGLOBJS) $(TRANSOBJS) $(MAINOBJS) $(GLMOSAICTEXTOBJS) $(PAPEROBJS) 
$(LINESOBJ)
+JNIOBJS=$(OBJS) $(VOB_OBJS) $(TRANS_OBJS) $(OSOBJS) $(TEXTUREOBJS) $(UTILOBJS) 
$(CALLGLOBJS) $(TRANSOBJS) $(MAINOBJS) $(GLMOSAICTEXTOBJS) $(PAPEROBJS) 
$(LINESOBJ) $(GEOMOBJS)
 
 
 EXTRAINCLUDE=-I${JAVAHOME}/include -I${JAVAHOME}/include/linux 
-I${JAVAHOME}/include/kaffe