Revision: 40684
http://brlcad.svn.sourceforge.net/brlcad/?rev=40684&view=rev
Author: brlcad
Date: 2010-09-25 02:02:58 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
rename terrain.c to wavy.c since cmake requires unique target names and there
is already a terrain in src/util
Added Paths:
-----------
brlcad/trunk/src/proc-db/wavy.c
Removed Paths:
-------------
brlcad/trunk/src/proc-db/terrain.c
Deleted: brlcad/trunk/src/proc-db/terrain.c
===================================================================
--- brlcad/trunk/src/proc-db/terrain.c 2010-09-24 22:59:33 UTC (rev 40683)
+++ brlcad/trunk/src/proc-db/terrain.c 2010-09-25 02:02:58 UTC (rev 40684)
@@ -1,128 +0,0 @@
-/* T E R R A I N . C
- * BRL-CAD
- *
- * Copyright (c) 1991-2010 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file terrain.c
- *
- * Create a random terrain spline model database. Future additions to
- * this program would be to include random trees and objects to be
- * inserted into the database.
- *
- */
-
-#include "common.h"
-
-#include <stdlib.h>
-#include <math.h>
-#include "bio.h"
-
-#include "bu.h"
-#include "vmath.h" /* BRL-CAD Vector macros */
-#include "nurb.h" /* BRL-CAD Spline data structures */
-#include "raytrace.h"
-#include "wdb.h"
-
-
-/* Interpoate the data using b-splines */
-struct face_g_snurb **
-interpolate_data(fastf_t *grid)
-{
- struct face_g_snurb **surfs;
- struct face_g_snurb *srf;
- fastf_t rt_nurb_par_edge();
-
- BU_GETSTRUCT(srf, face_g_snurb);
-
- rt_nurb_sinterp(srf, 4, grid, 10, 10);
- rt_nurb_kvnorm(&srf->u);
- rt_nurb_kvnorm(&srf->v);
-
- surfs = (struct face_g_snurb **)bu_calloc(2, sizeof(struct face_g_snurb
*), "surfaces");
- surfs[0] = srf;
- surfs[1] = NULL;
-
- return surfs;
-}
-
-
-int
-main(int argc, char **argv)
-{
- char *id_name = "terrain database";
- char *nurb_name = "terrain";
- int i, j;
- fastf_t hscale;
- struct rt_wdb *outfp;
- fastf_t grid[10][10][3];
- struct face_g_snurb **surfaces;
-
- outfp = wdb_fopen("terrain.g");
-
- hscale = 2.5;
-
- while ((i=bu_getopt(argc, argv, "dh:")) != EOF) {
- switch (i) {
- case 'd':
- rt_g.debug |= DEBUG_MEM | DEBUG_MEM_FULL;
- break;
- case 'h':
- hscale = atof(bu_optarg);
- break;
- default:
- bu_exit(1, "Usage: %s [-d]\n", *argv);
- }
- }
-
- /* Create the database header record. this solid will consist of
- * three surfaces a top surface, bottom surface, and the sides (so
- * that it will be closed).
- */
-
- mk_id(outfp, id_name);
-
- for (i = 0; i < 10; i++) {
- for (j = 0; j < 10; j++) {
- fastf_t v;
-
- v = (hscale * drand48()) + 10.0;
-
- grid[i][j][0] = i;
- grid[i][j][1] = j;
- grid[i][j][2] = v;
- }
- }
-
- surfaces = interpolate_data(&grid[0][0][0]);
-
- mk_bspline(outfp, nurb_name, surfaces);
-
- wdb_close(outfp);
- bu_log("Terrain saved to 'terrain.g'\n");
-
- return 0;
-}
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
Copied: brlcad/trunk/src/proc-db/wavy.c (from rev 40637,
brlcad/trunk/src/proc-db/terrain.c)
===================================================================
--- brlcad/trunk/src/proc-db/wavy.c (rev 0)
+++ brlcad/trunk/src/proc-db/wavy.c 2010-09-25 02:02:58 UTC (rev 40684)
@@ -0,0 +1,128 @@
+/* T E R R A I N . C
+ * BRL-CAD
+ *
+ * Copyright (c) 1991-2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file terrain.c
+ *
+ * Create a random terrain spline model database. Future additions to
+ * this program would be to include random trees and objects to be
+ * inserted into the database.
+ *
+ */
+
+#include "common.h"
+
+#include <stdlib.h>
+#include <math.h>
+#include "bio.h"
+
+#include "bu.h"
+#include "vmath.h" /* BRL-CAD Vector macros */
+#include "nurb.h" /* BRL-CAD Spline data structures */
+#include "raytrace.h"
+#include "wdb.h"
+
+
+/* Interpoate the data using b-splines */
+struct face_g_snurb **
+interpolate_data(fastf_t *grid)
+{
+ struct face_g_snurb **surfs;
+ struct face_g_snurb *srf;
+ fastf_t rt_nurb_par_edge();
+
+ BU_GETSTRUCT(srf, face_g_snurb);
+
+ rt_nurb_sinterp(srf, 4, grid, 10, 10);
+ rt_nurb_kvnorm(&srf->u);
+ rt_nurb_kvnorm(&srf->v);
+
+ surfs = (struct face_g_snurb **)bu_calloc(2, sizeof(struct face_g_snurb
*), "surfaces");
+ surfs[0] = srf;
+ surfs[1] = NULL;
+
+ return surfs;
+}
+
+
+int
+main(int argc, char **argv)
+{
+ char *id_name = "terrain database";
+ char *nurb_name = "terrain";
+ int i, j;
+ fastf_t hscale;
+ struct rt_wdb *outfp;
+ fastf_t grid[10][10][3];
+ struct face_g_snurb **surfaces;
+
+ outfp = wdb_fopen("terrain.g");
+
+ hscale = 2.5;
+
+ while ((i=bu_getopt(argc, argv, "dh:")) != EOF) {
+ switch (i) {
+ case 'd':
+ rt_g.debug |= DEBUG_MEM | DEBUG_MEM_FULL;
+ break;
+ case 'h':
+ hscale = atof(bu_optarg);
+ break;
+ default:
+ bu_exit(1, "Usage: %s [-d]\n", *argv);
+ }
+ }
+
+ /* Create the database header record. this solid will consist of
+ * three surfaces a top surface, bottom surface, and the sides (so
+ * that it will be closed).
+ */
+
+ mk_id(outfp, id_name);
+
+ for (i = 0; i < 10; i++) {
+ for (j = 0; j < 10; j++) {
+ fastf_t v;
+
+ v = (hscale * drand48()) + 10.0;
+
+ grid[i][j][0] = i;
+ grid[i][j][1] = j;
+ grid[i][j][2] = v;
+ }
+ }
+
+ surfaces = interpolate_data(&grid[0][0][0]);
+
+ mk_bspline(outfp, nurb_name, surfaces);
+
+ wdb_close(outfp);
+ bu_log("Terrain saved to 'terrain.g'\n");
+
+ return 0;
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
