[brlcad-commits] SF.net SVN: brlcad:[58261] brlcad/trunk/src/proc-db/lens.c

[<car...@us...>]

Revision: 58261
          http://sourceforge.net/p/brlcad/code/58261
Author:   carlmoore
Date:     2013-10-22 20:59:42 +0000 (Tue, 22 Oct 2013)
Log Message:
-----------
make MakeP and MakeD look as much alike as possible; remove -1 factor in favor of a simple -

Modified Paths:
--------------
    brlcad/trunk/src/proc-db/lens.c

Modified: brlcad/trunk/src/proc-db/lens.c
===================================================================
--- brlcad/trunk/src/proc-db/lens.c	2013-10-22 20:47:26 UTC (rev 58260)
+++ brlcad/trunk/src/proc-db/lens.c	2013-10-22 20:59:42 UTC (rev 58261)
@@ -109,7 +109,7 @@
 	    bu_log("Warning - specified thickness too thin for lens\n");
 
 	VSET(origin, 0, -rcc_h, 0);
-	VSET(height, 0, -1*lens_type*epa_H, 0);
+	VSET(height, 0, -lens_type*epa_H, 0);
 	VSET(breadth, 0, 0, 1);
 	bu_vls_trunc(&str, 0);
 	bu_vls_printf(&str, "%s-epa.s", prefix);
@@ -127,9 +127,8 @@
 	bu_vls_trunc(&str, 0);
 	bu_vls_printf(&str, "%s.r", prefix);
 	mk_lcomb(file, bu_vls_addr(&str), &lens, 1, "glass", "ri=1.5", NULL, 0);
-    } else {
+    } else
 	bu_log("Error - specified parameters result in non-physical geometry");
-    }
 }
 
 
@@ -161,7 +160,6 @@
     BU_LIST_INIT(&lens.l);
 
     if (epa_R > 0 && epa_H > 0) {
-
 	if (rcc_h >= 0) {
 	    VSET(origin, 0, -rcc_h/2, 0);
 	    VSET(height, 0, rcc_h, 0);
@@ -173,7 +171,7 @@
 	    bu_log("Warning - specified thickness too thin for lens\n");
 
 	VSET(origin, 0, -rcc_h/2, 0);
-	VSET(height, 0, -1 * lens_type * epa_H, 0);
+	VSET(height, 0, -lens_type*epa_H, 0);
 	VSET(breadth, 0, 0, 1);
 	bu_vls_trunc(&str, 0);
 	bu_vls_printf(&str, "%s-epa1.s", prefix);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.