Tweaks.

diff --git a/Makefile.am b/Makefile.am
index c1794e2f7db24ceda9e5e5efea46a5a72dcc1204..9f83df0f5ebe49e7371d0217e5411f5f2c6e3dce 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ fgfs-base: fgfs-base-tar fgfs-base-zip fgfs-base-patch fgfs-textures-high
 
 fgfs-base-tar:
        (cd $(HOME); \
-       tar czvf fgfs-base-$(VERSION).tar.gz \
+       tar --exclude=CVS -czvf fgfs-base-$(VERSION).tar.gz \
        FlightGear/A[A-su-z]* \
        FlightGear/[B-CE-R]* \
        FlightGear/Scenery/w130n30/w123n37 \
@@ -46,7 +46,8 @@ fgfs-base-zip:
        FlightGear/Sounds \
        FlightGear/Textures \
        FlightGear/T[A-Za-df-z]* \
-       FlightGear/[U-W]* FlightGear/[c-z]*)
+       FlightGear/[U-W]* FlightGear/[c-z]* \
+       -x '*/CVS/*' )
 
 fgfs-base-patch:
        (cd $(HOME); \

diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx
index 25e420b8cb1eb000ac4223c67860bb49708781d2..0cb64fe8aa9da3a5aa4843932fc1cb1f3ead4a77 100644 (file)
--- a/src/Objects/obj.cxx
+++ b/src/Objects/obj.cxx
@@ -267,7 +267,7 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) {
 }
 
 
-static float sgTriArea( sgVec3 p0, sgVec3 p1, sgVec3 p2 ) {
+static float fgTriArea( sgVec3 p0, sgVec3 p1, sgVec3 p2 ) {
     /* 
        From comp.graph.algorithms FAQ
        2A(P) = abs(N.(sum_{i=0}^{n-1}(v_i x v_{i+1})))
@@ -295,7 +295,7 @@ static float sgTriArea( sgVec3 p0, sgVec3 p1, sgVec3 p2 ) {
 
 
 #if 0
-// this works too, but Norman claims sgTriArea() is more efficient :-)
+// this works too, but Norman claims fgTriArea() is more efficient :-)
 static double triangle_area_3d( float *p1, float *p2, float *p3 ) {
     // Heron's formula: A^2 = s(s-a)(s-b)(s-c) where A is the area,
     // a,b,c are the side lengths, s=(a+b+c)/2. In R^3 you can compute
@@ -352,7 +352,7 @@ static void gen_random_surface_points( ssgLeaf *leaf, ssgVertexArray *lights,
            p1 = leaf->getVertex(n1);
            p2 = leaf->getVertex(n2);
            p3 = leaf->getVertex(n3);
-           double area = sgTriArea( p1, p2, p3 );
+           double area = fgTriArea( p1, p2, p3 );
            double num = area / factor;
 
            // generate a light point for each unit of area