[brlcad-commits] SF.net SVN: brlcad:[33650] brlcad/trunk/src/mged/chgmodel.c
Revision: 33650 http://brlcad.svn.sourceforge.net/brlcad/?rev=33650&view=rev Author: bob1961 Date: 2009-02-03 21:45:43 + (Tue, 03 Feb 2009) Log Message: --- Fixed bug/typo in f_make (i.e. the problem was that things were set up to use av, but av was never used). Modified Paths: -- brlcad/trunk/src/mged/chgmodel.c Modified: brlcad/trunk/src/mged/chgmodel.c === --- brlcad/trunk/src/mged/chgmodel.c2009-02-03 21:06:17 UTC (rev 33649) +++ brlcad/trunk/src/mged/chgmodel.c2009-02-03 21:45:43 UTC (rev 33650) @@ -113,7 +113,7 @@ av[0] = "draw"; av[1] = argv[argc-2]; av[2] = NULL; - edit_com(argc, argv, 1, 1); + edit_com(2, av, 1, 1); } /* Convert to Tcl codes */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33649] brlcad/trunk/src
Revision: 33649
http://brlcad.svn.sourceforge.net/brlcad/?rev=33649&view=rev
Author: bob1961
Date: 2009-02-03 21:06:17 + (Tue, 03 Feb 2009)
Log Message:
---
Tweak the usage message and the message complaining about the missing density
data.
Modified Paths:
--
brlcad/trunk/src/gtools/g_qa.c
brlcad/trunk/src/libged/gqa.c
Modified: brlcad/trunk/src/gtools/g_qa.c
===
--- brlcad/trunk/src/gtools/g_qa.c 2009-02-03 20:38:14 UTC (rev 33648)
+++ brlcad/trunk/src/gtools/g_qa.c 2009-02-03 21:06:17 UTC (rev 33649)
@@ -36,7 +36,7 @@
#include "cmd.h"
#include "ged.h"
-static char usage[] = "Usage: %s [options] model object [object...]\n";
+static char usage[] = "Usage: %s [-A A|a|b|e|g|o|v|w] [-a az] [-d] [-e el] [-f
densityFile] [-g spacing|upper,lower|upper-lower] [-G] [-n nhits] [-N nviews]
[-p] [-P ncpus] [-r] [-S nsamples] [-t overlap_tol] [-U useair] [-u len_units
vol_units wt_units] [-v] [-V volume_tol] [-W weight_tol] model object
[object...]\n";
/*
* M A I N
Modified: brlcad/trunk/src/libged/gqa.c
===
--- brlcad/trunk/src/libged/gqa.c 2009-02-03 20:38:14 UTC (rev 33648)
+++ brlcad/trunk/src/libged/gqa.c 2009-02-03 21:06:17 UTC (rev 33649)
@@ -56,6 +56,7 @@
/* bu_getopt() options */
char *options = "A:a:de:f:g:Gn:N:pP:rS:s:t:U:u:vV:W:";
+char *options_str = "[-A A|a|b|e|g|o|v|w] [-a az] [-d] [-e el] [-f
densityFile] [-g spacing|upper,lower|upper-lower] [-G] [-n nhits] [-N nviews]
[-p] [-P ncpus] [-r] [-S nsamples] [-t overlap_tol] [-U useair] [-u len_units
vol_units wt_units] [-v] [-V volume_tol] [-W weight_tol]";
#define ANALYSIS_VOLUME 1
#define ANALYSIS_WEIGHT 2
@@ -813,7 +814,8 @@
dp = db_lookup(rtip->rti_dbip, "_DENSITIES", LOOKUP_QUIET);
if (dp == (struct directory *)NULL) {
- bu_vls_printf(&ged_current_gedp->ged_result_str, "No \"_DENSITIES\"
density table object in database\n");
+ bu_vls_printf(&ged_current_gedp->ged_result_str, "No \"_DENSITIES\"
density table object in database.");
+ bu_vls_printf(&ged_current_gedp->ged_result_str, " If you do not have
density data you can still get adjacent air, bounding box, exposed air, gaps,
volume or overlaps by using the -Aa, -Ab, -Ae, -Ag, -Av or -Ao options,
respectively.\n");
return BRLCAD_ERROR;
}
@@ -2069,7 +2071,7 @@
struct cstate state;
int start_objs; /* index in command line args where geom object list
starts */
struct region_pair *rp;
-static const char *usage = "[options] object [object ...]";
+static const char *usage = "object [object ...]";
GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
GED_CHECK_ARGC_GT_0(gedp, argc, BRLCAD_ERROR);
@@ -2079,7 +2081,7 @@
/* must be wanting help */
if (argc == 1) {
- bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
+ bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s %s", argv[0],
options_str, usage);
return BRLCAD_HELP;
}
@@ -2119,7 +2121,7 @@
arg_count = parse_args(argc, (char **)argv);
if (arg_count < 0 || (argc-arg_count) < 1) {
- bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
+ bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s %s", argv[0],
options_str, usage);
return BRLCAD_ERROR;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33648] brlcad/trunk/regress/mged_test.sh
Revision: 33648 http://brlcad.svn.sourceforge.net/brlcad/?rev=33648&view=rev Author: starseeker Date: 2009-02-03 20:38:14 + (Tue, 03 Feb 2009) Log Message: --- Add remainder of editing geometry commands from card, with the exception of eqn - need a way to select a face to work on that doesn't need the graphical menu. Modified Paths: -- brlcad/trunk/regress/mged_test.sh Modified: brlcad/trunk/regress/mged_test.sh === --- brlcad/trunk/regress/mged_test.sh 2009-02-03 19:24:23 UTC (rev 33647) +++ brlcad/trunk/regress/mged_test.sh 2009-02-03 20:38:14 UTC (rev 33648) @@ -101,7 +101,20 @@ l arced2.c EOF +# +#A R O T +# +cat > arot.mged_regress << EOF +make arot.s arb8 +Z +e arot.s +sed arot.s +arot 1 2 -9 60 +accept +Z +EOF + # # B U I L D _ R E G I O N # @@ -258,6 +271,19 @@ EOF # +# E X T R U D E +# +cat > extrude.mged_regress << EOF +make extrude.s arb8 +Z +e extrude.s +sed extrude.s +extrude 1234 100 +accept +Z +EOF + +# #F A C E D E F # cat > facedef.mged_regress << EOF @@ -615,6 +641,35 @@ EOF # +# O R O T +# +cat > orot.mged_regress << EOF +make orot.s arb8 +comb orot.c u orot.s +Z +e orot.c +oed / orot.c/orot.s +orot 11 -23 22 +accept +Z +EOF + +# +#O S C A L E +# +cat > oscale.mged_regress << EOF +make oscale.s eto +comb oscale.c u oscale.s +Z +e oscale.c +oed / oscale.c/oscale.s +oscale 15 +accept +Z +EOF + + +# # P E R M U T E # cat > permute.mged_regres << EOF @@ -671,6 +726,21 @@ EOF # +# Q O R O T +# +cat > qorot.mged_regress << EOF +make qorot.s arb8 +comb qorot.c u qorot.s +Z +e qorot.c +oed / qorot.c/qorot.s +qorot 2 2 3 10 2 3 40 +qorot -2 3 1 20 20 20 40 +accept +Z +EOF + +# #R # # Test commands for r command to build regions - because region building @@ -715,6 +785,52 @@ EOF # +# R O T +# +# Test rot command when editing a primitive +cat > rot_edit.mged_regress << EOF +make rot.s arb8 +Z +e rot.s +sed rot.s +rot 15 20 -12 +accept +Z +EOF + +# +# R O T O B J +# +cat > rotobj.mged_regress << EOF +make rotobj.s arb7 +comb rotobj.c u rotobj.s +Z +e rotobj.c +oed / rotobj.c/rotobj.s +rotobj -m 10 10 10 +rotobj -m 10 10 10 +rotobj -v 10 10 10 +rotobj -v 10 10 10 +accept +Z +EOF + +# +# S C A +# +# Test sca command when editing geometry + +cat > sca_edit.mged_regress << EOF +make sca.s arb8 +Z +e sca.s +sed sca.s +sca 10 +accept +Z +EOF + +# # S E D # cat > sed.mged_regress << EOF @@ -748,7 +864,9 @@ # # T R A # -cat > tra.mged_regress << EOF +# Test tra command when editing geometry + +cat > tra_edit.mged_regress << EOF make tra.s arb8 comb tra.c u tra.s Z @@ -880,21 +998,19 @@ cat xpush.mged_regress >> mged.mged_regress cat accept.mged_regress >> mged.mged_regress cat reject.mged_regress >> mged.mged_regress -cat tra.mged_regress >> mged.mged_regress +cat tra_edit.mged_regress >> mged.mged_regress cat facedef.mged_regress >> mged.mged_regress cat mirface.mged_regress >> mged.mged_regress cat permute.mged_regress >> mged.mged_regress cat translate.mged_regress >> mged.mged_regress - -cat sca.mged_regress >> mged.mged_regress +cat sca_edit.mged_regress >> mged.mged_regress cat oscale.mged_regress >> mged.mged_regress cat extrude.mged_regress >> mged.mged_regress -cat rot.mged_regress >> mged.mged_regress +cat rot_edit.mged_regress >> mged.mged_regress cat orot.mged_regress >> mged.mged_regress cat arot.mged_regress >> mged.mged_regress cat rotobj.mged_regress >> mged.mged_regress cat qorot.mged_regress >> mged.mged_regress -cat eqn.mged_regress >> mged.mged_regress # #VIEW COMMANDS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33647]
Revision: 33647 http://brlcad.svn.sourceforge.net/brlcad/?rev=33647&view=rev Author: davidloman Date: 2009-02-03 19:24:23 + (Tue, 03 Feb 2009) Log Message: --- Modified makefiles for DataStreamTest. Modified Paths: -- rt^3/trunk/src/GeometryEngine/Makefile.am rt^3/trunk/src/iBME/Makefile.am Modified: rt^3/trunk/src/GeometryEngine/Makefile.am === --- rt^3/trunk/src/GeometryEngine/Makefile.am 2009-02-03 19:11:26 UTC (rev 33646) +++ rt^3/trunk/src/GeometryEngine/Makefile.am 2009-02-03 19:24:23 UTC (rev 33647) @@ -16,6 +16,8 @@ SourceSvnLink.cxx \ DbObjectManager.cxx \ DbObjectManifest.cxx \ + ../io/DataStream.cxx \ + ../io/StreamEmptyException.cxx \ ../io/ByteArrayInputStream.cxx \ ../io/ByteArrayOutputStream.cxx \ ../io/DataInputStream.cxx \ Modified: rt^3/trunk/src/iBME/Makefile.am === --- rt^3/trunk/src/iBME/Makefile.am 2009-02-03 19:11:26 UTC (rev 33646) +++ rt^3/trunk/src/iBME/Makefile.am 2009-02-03 19:24:23 UTC (rev 33647) @@ -1,4 +1,4 @@ -bin_PROGRAMS = gsph0 streamSerialTests netMsgSerialTest +bin_PROGRAMS = gsph0 streamSerialTests netMsgSerialTest DataStreamTest @@ -10,8 +10,24 @@ +DataStreamTest_SOURCES = \ + ../tests/DataStreamTest.cxx +DataStreamTest_LDADD = \ + ../GeometryEngine/libge.la + + +netMsgSerialTest_SOURCES = \ + ../tests/netMsgSerialTest.cxx + +netMsgSerialTest_LDADD = \ + ../GeometryEngine/libge.la \ + ../GeometryService/libgs.la + + + + gsph0_SOURCES = \ ../GeometryService/gsph0.cxx @@ -21,10 +37,3 @@ gsph0_LDFLAGS = -L/home/dloman/lib/ -lboost_system-gcc41-mt-1_37 - -netMsgSerialTest_SOURCES = \ - ../tests/netMsgSerialTest.cxx - -netMsgSerialTest_LDADD = \ - ../GeometryEngine/libge.la \ - ../GeometryService/libgs.la This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33646]
Revision: 33646
http://brlcad.svn.sourceforge.net/brlcad/?rev=33646&view=rev
Author: davidloman
Date: 2009-02-03 19:11:26 + (Tue, 03 Feb 2009)
Log Message:
---
Combined DataInputStream, DataOutputStream, and ByteBag into a new class:
DataStream
Added Paths:
---
rt^3/trunk/include/io/DataStream.h
rt^3/trunk/src/io/DataStream.cxx
rt^3/trunk/src/tests/DataStreamTest.cxx
Added: rt^3/trunk/include/io/DataStream.h
===
--- rt^3/trunk/include/io/DataStream.h (rev 0)
+++ rt^3/trunk/include/io/DataStream.h 2009-02-03 19:11:26 UTC (rev 33646)
@@ -0,0 +1,132 @@
+/* D A T A S T R E A M . H
+ * BRL-CAD
+ *
+ * Copyright (c) 1997-2009 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library 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 library 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 DataStream.h
+ *
+ * Description - Combination of ByteBag, DataInputStream and DataOutputStream
+ *
+ *
+ * Author - David Loman
+ *
+ */
+#ifndef _DATASTREAM_H_
+#define _DATASTREAM_H_
+
+#include "iBME/iBMECommon.h"
+#include "io/IOException.h"
+#include
+
+
+const uInt DEFAULT_SIZE = 128;
+
+class DataStream {
+ private:
+ uInt currentSize;
+
+ uInt bytesFilled;
+ uInt bytesRead;
+
+ uByte *data;
+
+ uInt expand(uInt howMuch);
+ uInt shrink();
+
+ void setBytesRead(uInt v);
+
+
+ public:
+ DataStream();
+
+ /// constructor for specifying initial size
+ DataStream(uInt size);
+
+ /// constructor for specifying both initial size and data to fit
+ DataStream(void *_data, uInt size);
+
+/***
+ *
+ * DATA IO Functions
+ *
+ **/
+ uInt copyIn(const void *_data, uInt size = 0);
+ uInt clear(uByte fill = '\0', uInt size = 0);
+
+ friend DataStream& operator<<(DataStream &b, Char c);
+ friend DataStream& operator<<(DataStream &b, uChar c);
+ friend DataStream& operator<<(DataStream &b, Short s);
+ friend DataStream& operator<<(DataStream &b, uShort s);
+ friend DataStream& operator<<(DataStream &b, Int i);
+ friend DataStream& operator<<(DataStream &b, uInt i);
+ // friend DataStream& operator<<(DataStream &b, Long l);
+ // friend DataStream& operator<<(DataStream &b, uLong l);
+ friend DataStream& operator<<(DataStream &b, float f);
+ friend DataStream& operator<<(DataStream &b, double d);
+ friend DataStream& operator<<(DataStream &b, std::string &s);
+
+ friend DataStream& operator>>(DataStream &b, Char &c);
+ friend DataStream& operator>>(DataStream &b, uChar &c);
+ friend DataStream& operator>>(DataStream &b, Short &s);
+ friend DataStream& operator>>(DataStream &b, uShort &s);
+ friend DataStream& operator>>(DataStream &b, Int &i);
+ friend DataStream& operator>>(DataStream &b, uInt &i);
+ // friend DataStream& operator>>(DataStream &b, Long &l);
+ // friend DataStream& operator>>(DataStream &b, uLong &l);
+ friend DataStream& operator>>(DataStream &b, float &f);
+ friend DataStream& operator>>(DataStream &b, double &d);
+ friend DataStream& operator>>(DataStream &b, std::string &s);
+
+
+ uByte peakByte();
+ uShort peakShort();
+ uInt peakInt();
+ //Need Long
+ //Need uLong
+ float peakFloat();
+ double peakDouble();
+ std::string peakString();
+
+/***
+ *
+ * Getters n Setters
+ *
+ **/
+ uInt getCurrentSize();
+ uInt getBytesFilled();
+ uInt getBytesRead();
+ uByte* getData();
+
+ bool empty();
+ void reset();
+
+/***
+ *
+ * Utility Functions
+ *
+ **/
+ void nFerror(std::string mesg);
+ void Ferror(std::string mesg);
+ void toND(register uByte *out, register uByte *in, uInt n);
+ void fromND(register uByte *out, register uByte *in, uInt n);
+ void toNF(register uByte *out, register uByte *in, uInt n);
+ void fromNF(register uByte *out, register uByte *in, uInt n);
+
+};
+
+#endif /* _DATASTREAM_H_ */
Property changes on: rt^3/trunk/include/io/DataStream.h
___
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ "Revision Date Author"
Added: svn:eol-style
+ native
Added: rt^3/trunk/src/io/DataStream.cxx
[brlcad-commits] SF.net SVN: brlcad:[33645] jbrlcad/trunk/src/org/brlcad/numerics/ BoundingBox.java
Revision: 33645
http://brlcad.svn.sourceforge.net/brlcad/?rev=33645&view=rev
Author: johnranderson
Date: 2009-02-03 18:55:11 + (Tue, 03 Feb 2009)
Log Message:
---
renamed some variables that were hiding fields
Modified Paths:
--
jbrlcad/trunk/src/org/brlcad/numerics/BoundingBox.java
Modified: jbrlcad/trunk/src/org/brlcad/numerics/BoundingBox.java
===
--- jbrlcad/trunk/src/org/brlcad/numerics/BoundingBox.java 2009-02-03
17:42:59 UTC (rev 33644)
+++ jbrlcad/trunk/src/org/brlcad/numerics/BoundingBox.java 2009-02-03
18:55:11 UTC (rev 33645)
@@ -67,23 +67,23 @@
{
return false;
}
- Point min = bb.getMin();
- Point max = bb.getMax();
- if( min == null )
+ Point minOther = bb.getMin();
+ Point maxOther = bb.getMax();
+ if( minOther == null )
{
return false;
}
- if( min.getX() > this.max.getX() ||
- min.getY() > this.max.getY() ||
- min.getZ() > this.max.getZ() )
+ if( minOther.getX() > this.max.getX() ||
+ minOther.getY() > this.max.getY() ||
+ minOther.getZ() > this.max.getZ() )
{
return false;
}
- if( max.getX() < this.min.getX() ||
- max.getY() < this.min.getY() ||
- max.getZ() < this.min.getZ() )
+ if( maxOther.getX() < this.min.getX() ||
+ maxOther.getY() < this.min.getY() ||
+ maxOther.getZ() < this.min.getZ() )
{
return false;
}
@@ -193,14 +193,14 @@
{
if( this.min == null )
{
- Point min = bb.getMin();
- Point max = bb.getMax();
- if( min == null )
+ Point minOther = bb.getMin();
+ Point maxOther = bb.getMax();
+ if( minOther == null )
{
return;
}
- this.min = new Point( min );
- this.max = new Point( max );
+ this.min = new Point( minOther );
+ this.max = new Point( maxOther );
return;
}
Point bbMin = bb.getMin();
@@ -246,56 +246,56 @@
{
return;
}
- Point min = bb.getMin();
- Point max = bb.getMax();
- if( min == null )
+ Point minOther = bb.getMin();
+ Point maxOther = bb.getMax();
+ if( minOther == null )
{
this.min = null;
this.max = null;
return;
}
- if( min.getX() > this.max.getX() ||
- min.getY() > this.max.getY() ||
- min.getZ() > this.max.getZ() )
+ if( minOther.getX() > this.max.getX() ||
+ minOther.getY() > this.max.getY() ||
+ minOther.getZ() > this.max.getZ() )
{
this.min = null;
this.max = null;
return;
}
- if( max.getX() < this.min.getX() ||
- max.getY() < this.min.getY() ||
- max.getZ() < this.min.getZ() )
+ if( maxOther.getX() < this.min.getX() ||
+ maxOther.getY() < this.min.getY() ||
+ maxOther.getZ() < this.min.getZ() )
{
this.min = null;
this.max = null;
return;
}
- if( min.getX() > this.min.getX() )
+ if( minOther.getX() > this.min.getX() )
{
- this.min.setX( min.getX() );
+ this.min.setX( minOther.getX() );
}
- if( min.getY() > this.min.getY() )
+ if( minOther.getY() > this.min.getY() )
{
- this.min.setY( min.getY() );
+ this.min.setY( minOther.getY() );
}
- if( min.getZ() > this.min.getZ() )
+ if( minOther.getZ() > this.min.getZ() )
{
- this.min.setZ( min.getZ() );
+ this.min.setZ( minOther.getZ() );
}
- if( max.getX() < this.max.getX() )
+ if( maxO
[brlcad-commits] SF.net SVN: brlcad:[33644] jbrlcad/trunk
Revision: 33644
http://brlcad.svn.sourceforge.net/brlcad/?rev=33644&view=rev
Author: johnranderson
Date: 2009-02-03 17:42:59 + (Tue, 03 Feb 2009)
Log Message:
---
Updated to use jscience (instaed of jade)
Modified Paths:
--
jbrlcad/trunk/build.xml
jbrlcad/trunk/src/org/brlcad/numerics/Matrix.java
jbrlcad/trunk/src/org/brlcad/numerics/Quaternion.java
jbrlcad/trunk/src/org/brlcad/numerics/Vector3.java
Added Paths:
---
jbrlcad/trunk/lib/jscience.jar
Removed Paths:
-
jbrlcad/trunk/lib/jade.jar
Modified: jbrlcad/trunk/build.xml
===
--- jbrlcad/trunk/build.xml 2009-02-03 13:00:54 UTC (rev 33643)
+++ jbrlcad/trunk/build.xml 2009-02-03 17:42:59 UTC (rev 33644)
@@ -14,7 +14,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
Deleted: jbrlcad/trunk/lib/jade.jar
===
(Binary files differ)
Added: jbrlcad/trunk/lib/jscience.jar
===
(Binary files differ)
Property changes on: jbrlcad/trunk/lib/jscience.jar
___
Added: svn:mime-type
+ application/octet-stream
Modified: jbrlcad/trunk/src/org/brlcad/numerics/Matrix.java
===
--- jbrlcad/trunk/src/org/brlcad/numerics/Matrix.java 2009-02-03 13:00:54 UTC
(rev 33643)
+++ jbrlcad/trunk/src/org/brlcad/numerics/Matrix.java 2009-02-03 17:42:59 UTC
(rev 33644)
@@ -18,7 +18,9 @@
package org.brlcad.numerics;
import java.io.*;
-import jade.physics.Angle;
+import javax.measure.quantity.Angle;
+import javax.measure.unit.SI;
+import org.jscience.physics.amount.Amount;
/**
* Two dimensional Matrix
@@ -180,19 +182,19 @@
* @paramlocationthe location of the origin of the
transformed coordinate system
*
*/
- public Matrix( Angle yaw, Angle pitch, Angle roll, Point location )
+ public Matrix( Amount yaw, Amount pitch, Amount
roll, Point location )
{
rows = 4;
columns = 4;
mat = new double[rows][columns];
- double cosy = Math.cos( yaw.doubleValue() );
- double siny = Math.sin( yaw.doubleValue() );
- double cosp = Math.cos( pitch.doubleValue() );
- double sinp = Math.sin( pitch.doubleValue() );
- double cosr = Math.cos( roll.doubleValue() );
- double sinr = Math.sin( roll.doubleValue() );
+ double cosy = Math.cos( yaw.doubleValue(SI.RADIAN) );
+ double siny = Math.sin( yaw.doubleValue(SI.RADIAN) );
+ double cosp = Math.cos( pitch.doubleValue(SI.RADIAN) );
+ double sinp = Math.sin( pitch.doubleValue(SI.RADIAN) );
+ double cosr = Math.cos( roll.doubleValue(SI.RADIAN) );
+ double sinr = Math.sin( roll.doubleValue(SI.RADIAN) );
mat[0][0] = cosp * cosy;
mat[0][1] = -cosp * siny;
@@ -222,19 +224,19 @@
* @paramrollthe roll angle of the transformed
coordinate system
*
*/
- public Matrix( Angle yaw, Angle pitch, Angle roll )
+ public Matrix( Amount yaw, Amount pitch, Amount
roll )
{
rows = 4;
columns = 4;
mat = new double[rows][columns];
- double cosy = Math.cos( yaw.doubleValue() );
- double siny = Math.sin( yaw.doubleValue() );
- double cosp = Math.cos( pitch.doubleValue() );
- double sinp = Math.sin( pitch.doubleValue() );
- double cosr = Math.cos( roll.doubleValue() );
- double sinr = Math.sin( roll.doubleValue() );
+ double cosy = Math.cos( yaw.doubleValue(SI.RADIAN) );
+ double siny = Math.sin( yaw.doubleValue(SI.RADIAN) );
+ double cosp = Math.cos( pitch.doubleValue(SI.RADIAN) );
+ double sinp = Math.sin( pitch.doubleValue(SI.RADIAN) );
+ double cosr = Math.cos( roll.doubleValue(SI.RADIAN) );
+ double sinr = Math.sin( roll.doubleValue(SI.RADIAN) );
mat[0][0] = cosp * cosy;
mat[0][1] = -cosp * siny;
@@ -288,11 +290,11 @@
* @paramlocationthe location of the origin of the
transformed coordinate system
*
*/
- public static Matrix inverseYPR( Angle yaw, Angle pitch, Angle roll )
+ public static Matrix inverseYPR( Amount yaw, Amount
pitch, Amount roll )
{
- Matrix my = new Matrix( (Angle)yaw.negate(), A
[brlcad-commits] SF.net SVN: brlcad:[33643] brlcad/trunk/src/proc-db/spring.c
Revision: 33643 http://brlcad.svn.sourceforge.net/brlcad/?rev=33643&view=rev Author: starseeker Date: 2009-02-03 13:00:54 + (Tue, 03 Feb 2009) Log Message: --- Uh, yeah, didn't start this in 2008 (thanks Sean) Modified Paths: -- brlcad/trunk/src/proc-db/spring.c Modified: brlcad/trunk/src/proc-db/spring.c === --- brlcad/trunk/src/proc-db/spring.c 2009-02-03 05:25:17 UTC (rev 33642) +++ brlcad/trunk/src/proc-db/spring.c 2009-02-03 13:00:54 UTC (rev 33643) @@ -1,7 +1,7 @@ /* S P R I N G . C * BRL-CAD * - * Copyright (c) 2008-2009 United States Government as represented by + * Copyright (c) 2009 United States Government as represented by * the U.S. Army Research Laboratory. * * This library is free software; you can redistribute it and/or This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
