[brlcad-commits] SF.net SVN: brlcad:[33671] brlcad/trunk/src/adrt/slave/slave.c
Revision: 33671 http://brlcad.svn.sourceforge.net/brlcad/?rev=33671&view=rev Author: erikgreenwald Date: 2009-02-04 22:05:43 + (Wed, 04 Feb 2009) Log Message: --- fix component view Modified Paths: -- brlcad/trunk/src/adrt/slave/slave.c Modified: brlcad/trunk/src/adrt/slave/slave.c === --- brlcad/trunk/src/adrt/slave/slave.c 2009-02-04 20:55:59 UTC (rev 33670) +++ brlcad/trunk/src/adrt/slave/slave.c 2009-02-04 22:05:43 UTC (rev 33671) @@ -117,6 +117,8 @@ char string[255]; uint32_t n, i, num; + ind = 1;/* ind is too far in for some reason, force it back to 1? */ + /* reset */ TCOPY(uint8_t, work->data, ind, &c, 0); ind += 1; 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:[33670]
Revision: 33670
http://brlcad.svn.sourceforge.net/brlcad/?rev=33670&view=rev
Author: davidloman
Date: 2009-02-04 20:55:59 + (Wed, 04 Feb 2009)
Log Message:
---
Small directory organization change. More work on the test for 'phase-0'
GeometryServer.
Added Paths:
---
rt^3/trunk/src/tests/java/
rt^3/trunk/src/tests/java/gsph0_Test.java
Removed Paths:
-
rt^3/trunk/src/tests/gsph0_Test.java
Property Changed:
rt^3/trunk/src/tests/
Property changes on: rt^3/trunk/src/tests
___
Added: svn:ignore
+ .project
.classpath
Copied: rt^3/trunk/src/tests/java/gsph0_Test.java (from rev 33661,
rt^3/trunk/src/tests/gsph0_Test.java)
===
--- rt^3/trunk/src/tests/java/gsph0_Test.java (rev 0)
+++ rt^3/trunk/src/tests/java/gsph0_Test.java 2009-02-04 20:55:59 UTC (rev
33670)
@@ -0,0 +1,130 @@
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.UUID;
+
+public class gsph0_Test
+{
+ public static void main(String[] args) {
+ Socket s;
+ DataInputStream dis;
+ DataOutputStream dos;
+ int i = 0;
+
+ try {
+ s = new Socket("128.63.32.72", 56789);
+ dis = new DataInputStream(s.getInputStream());
+ dos = new DataOutputStream(s.getOutputStream());
+
+ //test sending a msg
+ sendRemHostNameSET(dos);
+
+ while (++i < 20) {
+
+ //Wait till there is enough in the input stream
+ while(dis.available() < 4) {
+ System.out.println("Have: " +
dis.available() + " waiting for 4");
+ Thread.sleep(10L);
+ }
+
+ int msgLen = dis.readInt() - 4;
+
+ //Wait till there is enough in the input stream
+ while(dis.available() < msgLen) {
+ System.out.println("Have: " +
dis.available() + " waiting for " + msgLen);
+ Thread.sleep(10L);
+ }
+
+ System.out.println("Have: " + dis.available() +
", making msg:\n");
+
+
+ int msgType = dis.readInt();
+ System.out.println("\tmsgType=" + msgType +
"\t\t\tLEN=4");
+ System.out.println("\t\t" + dis.available() + "
remaining");
+
+ int msgUUIDlen = dis.readInt();
+ byte[] baMsgUUID = new byte[msgUUIDlen];
+ dis.read(baMsgUUID, 0, msgUUIDlen);
+ String msgUUID = new String(baMsgUUID);
+ System.out.println("\tMsgUUID='" + msgUUID +
"'\t LEN=" + msgUUIDlen);
+ System.out.println("\t\t" + dis.available() + "
remaining");
+
+ int reUUIDlen = dis.readInt();
+ byte[] baReUUID = new byte[reUUIDlen];
+ dis.read(baReUUID, 0, reUUIDlen);
+ String reUUID = new String(baReUUID);
+ System.out.println("\tReUUID= '" + reUUID +
"'\t LEN=" + reUUIDlen);
+ System.out.println("\t\t" + dis.available() + "
remaining");
+
+ byte by= dis.readByte();
+ System.out.println("\tErrorCode=" + by + "\t
LEN=1");
+ System.out.println("\t\t" + dis.available() + "
remaining");
+
+ System.out.println("Have: " + dis.available() +
" leftover.");
+ break;
+ }
+
+
+
+
+ s.close();
+
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (InterruptedExce
[brlcad-commits] SF.net SVN: brlcad:[33669]
Revision: 33669
http://brlcad.svn.sourceforge.net/brlcad/?rev=33669&view=rev
Author: davidloman
Date: 2009-02-04 20:54:48 + (Wed, 04 Feb 2009)
Log Message:
---
Minor adjustments, bugfixes and tweaks.
Modified Paths:
--
rt^3/trunk/src/GeometryService/Session.cxx
rt^3/trunk/src/GeometryService/netMsg/NetMsg.cxx
rt^3/trunk/src/io/DataStream.cxx
Modified: rt^3/trunk/src/GeometryService/Session.cxx
===
--- rt^3/trunk/src/GeometryService/Session.cxx 2009-02-04 20:14:47 UTC (rev
33668)
+++ rt^3/trunk/src/GeometryService/Session.cxx 2009-02-04 20:54:48 UTC (rev
33669)
@@ -72,6 +72,19 @@
std::cout << "\tNew data(" << bytesXferred << "): " << data_ << "\n";
std::cout << "\tNewMsgFlag=" << this->newMsgFlag << "\n";
+
+ //Do we have more than 4 bytes of data yet?
+ if (this->sessionBuffer->getBytesAvailToRead() < 4)
+ {
+ socket_.async_read_some(boost::asio::buffer(data_, max_length),
+ boost::bind(&Session::HandleRead, this,
+ boost::asio::placeholders::error,
+
boost::asio::placeholders::bytes_transferred));
+ std::cout << "\tReading More...\n\n";
+ return;
+ }
+
+
//Check to see if we are processing a new msg
if (this->newMsgFlag) {
@@ -93,7 +106,7 @@
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred));
this->newMsgFlag = false;
- std::cout << "\tReading More...\n";
+ std::cout << "\tReading More...\n\n";
return;
}
else
@@ -116,9 +129,13 @@
case 0: //RemHostNameSET
msg = new RemHostNameSetMsg(this->sessionBuffer);
+ msg->printMe();
+
retMsg = new RemHostNameSetFailMsg(5, msg->getReUUID(),
msg->getMsgUUID(), 42 );
this->SendMsg(retMsg);
-
+
+ delete retMsg;
+ delete msg;
break;
case 5: //RemHostNameSETFAIL
msg = new RemHostNameSetFailMsg(this->sessionBuffer);
@@ -163,9 +180,8 @@
}
- delete retMsg;
- delete msg;
+
}
else
{
@@ -185,13 +201,13 @@
msgLen = ds->readUByteArray(dataToSend, msgLen);
+ std::cout << "\nSending Msg: msgLen: " << msgLen << "\t ";
+ msg->printMe();
boost::asio::async_write(socket_,
- boost::asio::buffer(dataToSend, msgLen),
+ boost::asio::buffer(dataToSend, msgLen + 4),
boost::bind(&Session::HandleWrite, this,
boost::asio::placeholders::error));
-
-
delete ds;
}
Modified: rt^3/trunk/src/GeometryService/netMsg/NetMsg.cxx
===
--- rt^3/trunk/src/GeometryService/netMsg/NetMsg.cxx2009-02-04 20:14:47 UTC
(rev 33668)
+++ rt^3/trunk/src/GeometryService/netMsg/NetMsg.cxx2009-02-04 20:54:48 UTC
(rev 33669)
@@ -159,9 +159,9 @@
String NetMsg::toString()
{
std::stringstream Num;
- Num << "msgType: " << this->msgType << " \t";
- Num << "msgUUID: " << this->msgUUID << " \t";
- Num << "reUUID: " << this->reUUID;
+ Num << "msgType: '" << this->msgType << "' \t";
+ Num << "msgUUID: '" << this->msgUUID << "' \t";
+ Num << "reUUID: '" << this->reUUID << "'";
Num << "\n";
return Num.str();
}
Modified: rt^3/trunk/src/io/DataStream.cxx
===
--- rt^3/trunk/src/io/DataStream.cxx2009-02-04 20:14:47 UTC (rev 33668)
+++ rt^3/trunk/src/io/DataStream.cxx2009-02-04 20:54:48 UTC (rev 33669)
@@ -490,6 +490,8 @@
uInt availableBytes;
availableBytes = this->getBytesAvailToRead();
+ //std::cout << "\tRequested uByteArray Size: " << size << "\n";
+
//Check to see if there is enough room to perform a read of i bytes
if (availableBytes < size) {
std::cerr << "Warning: uByte[] length requested exceeds current ";
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:[33668] brlcad/trunk/regress/mged_test.sh
Revision: 33668 http://brlcad.svn.sourceforge.net/brlcad/?rev=33668&view=rev Author: starseeker Date: 2009-02-04 20:14:47 + (Wed, 04 Feb 2009) Log Message: --- Add view version of sca to testing Modified Paths: -- brlcad/trunk/regress/mged_test.sh Modified: brlcad/trunk/regress/mged_test.sh === --- brlcad/trunk/regress/mged_test.sh 2009-02-04 20:04:24 UTC (rev 33667) +++ brlcad/trunk/regress/mged_test.sh 2009-02-04 20:14:47 UTC (rev 33668) @@ -897,6 +897,18 @@ EOF # +# S C A +# +# Test sca command when viewing geometry + +cat > sca_view.mged_regress << EOF +size +sca 100 +size +EOF + + +# # S E D # cat > sed.mged_regress << EOF @@ -1154,6 +1166,7 @@ cat zoom.mged_regress >> mged.mged_regress cat set_perspective.mged_regress >> mged.mged_regress cat tra_view.mged_regress >> mged.mged_regress +cat sca_view.mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress @@ -1171,7 +1184,6 @@ cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress -cat .mged_regress >> mged.mged_regress 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:[33667] brlcad/trunk/src/adrt/librender/component.c
Revision: 33667
http://brlcad.svn.sourceforge.net/brlcad/?rev=33667&view=rev
Author: erikgreenwald
Date: 2009-02-04 20:04:24 + (Wed, 04 Feb 2009)
Log Message:
---
minor formatting and elimination of superfluous temporary variable
Modified Paths:
--
brlcad/trunk/src/adrt/librender/component.c
Modified: brlcad/trunk/src/adrt/librender/component.c
===
--- brlcad/trunk/src/adrt/librender/component.c 2009-02-04 19:53:25 UTC (rev
33666)
+++ brlcad/trunk/src/adrt/librender/component.c 2009-02-04 20:04:24 UTC (rev
33667)
@@ -28,34 +28,31 @@
#include
-void render_component_init(render_t *render) {
+void
+render_component_init(render_t *render) {
render->work = render_component_work;
render->free = render_component_free;
+return;
}
-
-void render_component_free(render_t *render) {
+void
+render_component_free(render_t *render) {
+return;
}
-
-static void* component_hit(tie_ray_t *ray, tie_id_t *id, tie_tri_t *tri, void
*ptr) {
+static void *
+component_hit(tie_ray_t *ray, tie_id_t *id, tie_tri_t *tri, void *ptr) {
adrt_mesh_t *mesh = (adrt_mesh_t *)(tri->ptr);
ray->depth++;
-if (mesh->flags & (ADRT_MESH_SELECT|ADRT_MESH_HIT))
- return(mesh);
-
-return(0);
+return (mesh->flags & (ADRT_MESH_SELECT|ADRT_MESH_HIT)) ? mesh : NULL;
}
-
void render_component_work(render_t *render, tie_t *tie, tie_ray_t *ray, TIE_3
*pixel) {
tie_id_t id;
adrt_mesh_t *mesh;
TIE_3 vec;
-tfloat angle;
-
if ((mesh = (adrt_mesh_t *)tie_work(tie, ray, &id, component_hit, NULL))) {
/* Flip normal to face ray origin (via dot product check) */
if (ray->dir.v[0] * id.norm.v[0] + ray->dir.v[1] * id.norm.v[1] +
ray->dir.v[2] * id.norm.v[2] > 0)
@@ -67,8 +64,7 @@
pixel->v[2] = mesh->flags & ADRT_MESH_SELECT ? 0.8 : 0.2;
VSUB2(vec.v, ray->pos.v, id.pos.v);
VUNITIZE(vec.v);
- angle = VDOT( vec.v, id.norm.v);
- VSCALE((*pixel).v, (*pixel).v, (angle*0.8));
+ VSCALE((*pixel).v, (*pixel).v, VDOT(vec.v, id.norm.v) * 0.8);
} else if (ray->depth) {
pixel->v[0] += 0.2;
pixel->v[1] += 0.2;
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:[33666] brlcad/trunk/regress/mged_test.sh
Revision: 33666 http://brlcad.svn.sourceforge.net/brlcad/?rev=33666&view=rev Author: starseeker Date: 2009-02-04 19:53:25 + (Wed, 04 Feb 2009) Log Message: --- Add a few more view commands Modified Paths: -- brlcad/trunk/regress/mged_test.sh Modified: brlcad/trunk/regress/mged_test.sh === --- brlcad/trunk/regress/mged_test.sh 2009-02-04 19:51:15 UTC (rev 33665) +++ brlcad/trunk/regress/mged_test.sh 2009-02-04 19:53:25 UTC (rev 33666) @@ -451,7 +451,17 @@ d keypoint.s EOF +# +# L O O K A T +# +cat > lookat.mged_regress << EOF +view quat +lookat 50 30 33 +view quat +EOF + + # # M A K E # @@ -901,6 +911,29 @@ EOF # +# S E T +# +# For the moment, testing the setting of perspective +# only (present on quick reference card). + +cat > set_perspective.mged_regress << EOF +set perspective +set perspective 3.3 +set perspective +set perspective -1 +set perspective +EOF + +# +# S I Z E +# +cat > size.mged_regress << EOF +size +size 122323 +size +EOF + +# # S T A T U S # cat > status.mged_regress << EOF @@ -939,6 +972,17 @@ EOF # +# T R A +# +# Test tra command when viewing geometry + +cat > tra_view.mged_regress << EOF +view center +tra -1000 2 3 +view center +EOF + +# # T R A N S L A T E # cat > translate.mged_regress << EOF @@ -1016,6 +1060,15 @@ xpush xpush_top.c EOF +# +# Z O O M +# +cat > zoom.mged_regress << EOF +size +zoom 30 +size +EOF + ## # # Test script assembly - assemble each of the individual @@ -1096,6 +1149,11 @@ cat ae.mged_regress >> mged.mged_regress cat center.mged_regress >> mged.mged_regress cat eye_pt.mged_regress >> mged.mged_regress +cat lookat.mged_regress >> mged.mged_regress +cat size.mged_regress >> mged.mged_regress +cat zoom.mged_regress >> mged.mged_regress +cat set_perspective.mged_regress >> mged.mged_regress +cat tra_view.mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress @@ -1114,11 +1172,6 @@ cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress -cat .mged_regress >> mged.mged_regress -cat .mged_regress >> mged.mged_regress -cat .mged_regress >> mged.mged_regress -cat .mged_regress >> mged.mged_regress -cat .mged_regress >> mged.mged_regress 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:[33665] brlcad/trunk/src/librtserver/rtserver.c
Revision: 33665
http://brlcad.svn.sourceforge.net/brlcad/?rev=33665&view=rev
Author: johnranderson
Date: 2009-02-04 19:51:15 + (Wed, 04 Feb 2009)
Log Message:
---
Modified to use the classes in jbrlcad
Modified Paths:
--
brlcad/trunk/src/librtserver/rtserver.c
Modified: brlcad/trunk/src/librtserver/rtserver.c
===
--- brlcad/trunk/src/librtserver/rtserver.c 2009-02-04 19:48:56 UTC (rev
33664)
+++ brlcad/trunk/src/librtserver/rtserver.c 2009-02-04 19:51:15 UTC (rev
33665)
@@ -1070,33 +1070,19 @@
int thread_count, queue_count;
int i;
-if ( len < 4 ) {
+if ( len < 2 ) {
bu_log( "wrong number of args\n" );
return( (jint) 1 );
}
-/* get number of queues specified by command line */
-jstring jobj=(jstring)(*env)->GetObjectArrayElement( env, args, 0 );
-char *str=(char *)(*env)->GetStringUTFChars(env, jobj, 0);
-queue_count = atoi( str );
-(*env)->ReleaseStringChars( env, jobj, (const jchar *)str);
-
-
-/* get number of threads from comamnd line */
-jobj=(jstring)(*env)->GetObjectArrayElement( env, args, 1 );
-str=(char *)(*env)->GetStringUTFChars(env, jobj, 0);
-thread_count = atoi( str );
-(*env)->ReleaseStringChars( env, jobj, (const jchar *)str);
-
-
/* get the aruments from the JAVA args object array */
-jfile_name = (jstring)(*env)->GetObjectArrayElement( env, args, 2 );
+jfile_name = (jstring)(*env)->GetObjectArrayElement( env, args, 0 );
file_name = (char *)(*env)->GetStringUTFChars(env, jfile_name, 0);
obj_list = (char **)bu_calloc( num_objects, sizeof( char *), "obj_list" );
jobj_name = (jstring *)bu_calloc( num_objects, sizeof( jstring ),
"jobj_name" );
for ( i=0; iGetObjectArrayElement( env, args, i+3 );
+ jobj_name[i] = (jstring)(*env)->GetObjectArrayElement( env, args, i+1 );
obj_list[i] = (char *)(*env)->GetStringUTFChars(env, jobj_name[i], 0);
}
@@ -1155,7 +1141,7 @@
max_pt = rts_geometry[sessionId]->rts_mdl_max;
/* get the BoundingBox class */
-if ( (boundingBox_class=(*env)->FindClass( env,
"mil/army/muves/sim/math/BoundingBox" ) ) == NULL ) {
+if ( (boundingBox_class=(*env)->FindClass( env,
"org/brlcad/numerics/BoundingBox" ) ) == NULL ) {
fprintf( stderr, "Failed to find BoundingBox class\n" );
(*env)->ExceptionDescribe(env);
return( (jobject)NULL );
@@ -1163,14 +1149,14 @@
/* get the BoundingBox constructor id */
if ( (boundingBox_constructor_id=(*env)->GetMethodID( env,
boundingBox_class, "",
-
"(Lmil/army/muves/sim/math/Point;Lmil/army/muves/sim/math/Point;)V" ) ) == NULL
) {
+
"(Lorg/brlcad/numerics/Point;Lorg/brlcad/numerics/Point;)V" ) ) == NULL ) {
fprintf( stderr, "Failed to find BoundingBox constructor method id\n" );
(*env)->ExceptionDescribe(env);
return( (jobject)NULL );
}
/* get the Point class */
-if ( (point_class=(*env)->FindClass( env, "mil/army/muves/sim/math/Point"
) ) == NULL ) {
+if ( (point_class=(*env)->FindClass( env, "org/brlcad/numerics/Point" ) )
== NULL ) {
fprintf( stderr, "Failed to find Point class\n" );
(*env)->ExceptionDescribe(env);
return( (jobject)NULL );
@@ -1405,33 +1391,33 @@
struct bu_vlb *vlb;
unsigned char buffer[SIZEOF_NETWORK_DOUBLE*3];
-if ( (rayClass=(*env)->FindClass( env, "mil/army/muves/sim/math/Ray" ) )
== NULL ) {
+if ( (rayClass=(*env)->FindClass( env, "org/brlcad/numerics/Ray" ) ) ==
NULL ) {
fprintf( stderr, "Failed to find Ray class\n" );
(*env)->ExceptionDescribe(env);
return( (jobject)NULL );
}
-fidStart = (*env)->GetFieldID( env, rayClass, "start",
"Lmil/army/muves/sim/math/Point;" );
+fidStart = (*env)->GetFieldID( env, rayClass, "start",
"Lorg/brlcad/numerics/Point;" );
if ( fidStart == 0 && (*env)->ExceptionOccurred(env) ) {
fprintf( stderr, "Exception thrown while getting fid of ray start
point\n" );
(*env)->ExceptionDescribe(env);
return( (jobject)NULL );
}
-fidDirection = (*env)->GetFieldID( env, rayClass, "direction",
"Lmil/army/muves/sim/math/Vector3;" );
+fidDirection = (*env)->GetFieldID( env, rayClass, "direction",
"Lorg/brlcad/numerics/Vector3;" );
if ( fidDirection == 0 && (*env)->ExceptionOccurred(env) ) {
fprintf( stderr, "Exception thrown while getting fid of ray direction
vector\n" );
(*env)->ExceptionDescribe(env);
return( (jobject)NULL );
}
-if ( (pointClass=(*env)->FindClass( env, "mil/army/muves/sim/math/Point" )
) == NULL ) {
+if ( (pointClass=(*env)->FindClass( env, "org/brlcad/numerics/Point" ) )
== NULL ) {
fprintf( stderr, "Failed to find
[brlcad-commits] SF.net SVN: brlcad:[33663] brlcad/trunk/src/adrt/librender/normal.c
Revision: 33663
http://brlcad.svn.sourceforge.net/brlcad/?rev=33663&view=rev
Author: erikgreenwald
Date: 2009-02-04 19:48:51 + (Wed, 04 Feb 2009)
Log Message:
---
use vmath
Modified Paths:
--
brlcad/trunk/src/adrt/librender/normal.c
Modified: brlcad/trunk/src/adrt/librender/normal.c
===
--- brlcad/trunk/src/adrt/librender/normal.c2009-02-04 19:30:49 UTC (rev
33662)
+++ brlcad/trunk/src/adrt/librender/normal.c2009-02-04 19:48:51 UTC (rev
33663)
@@ -27,30 +27,34 @@
#include
-void render_normal_init(render_t *render) {
+void
+render_normal_init(render_t *render) {
render->work = render_normal_work;
render->free = render_normal_free;
+return;
}
-void render_normal_free(render_t *render) {
+void
+render_normal_free(render_t *render) {
+return;
}
-static void* normal_hit(tie_ray_t *ray, tie_id_t *id, tie_tri_t *tri, void
*ptr) {
+static void *
+normal_hit(tie_ray_t *ray, tie_id_t *id, tie_tri_t *tri, void *ptr) {
return((adrt_mesh_t *)(tri->ptr));
}
-void render_normal_work(render_t *render, tie_t *tie, tie_ray_t *ray, TIE_3
*pixel) {
+void
+render_normal_work(render_t *render, tie_t *tie, tie_ray_t *ray, TIE_3 *pixel)
{
tie_id_t id;
-adrt_mesh_t*m;
+float one[3] = { 1, 1, 1 };
-if ((m = (adrt_mesh_t *)tie_work(tie, ray, &id, normal_hit, NULL))) {
- pixel->v[0] = (id.norm.v[0]+1) * 0.5;
- pixel->v[1] = (id.norm.v[1]+1) * 0.5;
- pixel->v[2] = (id.norm.v[2]+1) * 0.5;
-}
+if (tie_work(tie, ray, &id, normal_hit, NULL))
+ VADD2SCALE(pixel->v, id.norm.v, one, 0.5);
+return;
}
/*
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:[33664] brlcad/trunk/src/adrt/librender/phong.c
Revision: 33664
http://brlcad.svn.sourceforge.net/brlcad/?rev=33664&view=rev
Author: erikgreenwald
Date: 2009-02-04 19:48:56 + (Wed, 04 Feb 2009)
Log Message:
---
irrelevant structural changes
Modified Paths:
--
brlcad/trunk/src/adrt/librender/phong.c
Modified: brlcad/trunk/src/adrt/librender/phong.c
===
--- brlcad/trunk/src/adrt/librender/phong.c 2009-02-04 19:48:51 UTC (rev
33663)
+++ brlcad/trunk/src/adrt/librender/phong.c 2009-02-04 19:48:56 UTC (rev
33664)
@@ -21,40 +21,44 @@
*
*/
+#include
+
+#include "vmath.h"
+
#include "phong.h"
#include "hit.h"
#include "adrt_struct.h"
-#include
-
-void render_phong_init(render_t *render) {
+void
+render_phong_init(render_t *render) {
render->work = render_phong_work;
render->free = render_phong_free;
+return;
}
-
-void render_phong_free(render_t *render) {
+void
+render_phong_free(render_t *render) {
+return;
}
-
-void render_phong_work(render_t *render, tie_t *tie, tie_ray_t *ray, TIE_3
*pixel) {
+void
+render_phong_work(render_t *render, tie_t *tie, tie_ray_t *ray, TIE_3 *pixel) {
tie_id_t id;
adrt_mesh_t*mesh;
-TIE_3 vec;
-tfloat angle;
-if ((mesh = (adrt_mesh_t*)tie_work(tie, ray, &id, render_hit, NULL))) {
+if (mesh = (adrt_mesh_t*)tie_work(tie, ray, &id, render_hit, NULL)) {
+ TIE_3 vec;
+
*pixel = mesh->attributes->color;
+
if (mesh->texture)
mesh->texture->work(mesh->texture, mesh, ray, &id, pixel);
-} else {
- return;
+
+ VSUB2(vec.v, ray->pos.v, id.pos.v);
+ VUNITIZE(vec.v);
+ VSCALE((*pixel).v, (*pixel).v, VDOT( vec.v, id.norm.v));
}
-
-VSUB2(vec.v, ray->pos.v, id.pos.v);
-VUNITIZE(vec.v);
-angle = VDOT( vec.v, id.norm.v);
-VSCALE((*pixel).v, (*pixel).v, angle);
+return;
}
/*
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:[33662] brlcad/trunk/src/adrt/librender/cut.c
Revision: 33662
http://brlcad.svn.sourceforge.net/brlcad/?rev=33662&view=rev
Author: erikgreenwald
Date: 2009-02-04 19:30:49 + (Wed, 04 Feb 2009)
Log Message:
---
use vmath.h
Modified Paths:
--
brlcad/trunk/src/adrt/librender/cut.c
Modified: brlcad/trunk/src/adrt/librender/cut.c
===
--- brlcad/trunk/src/adrt/librender/cut.c 2009-02-04 18:50:01 UTC (rev
33661)
+++ brlcad/trunk/src/adrt/librender/cut.c 2009-02-04 19:30:49 UTC (rev
33662)
@@ -27,6 +27,7 @@
#include
#include "bu.h"
+#include "vmath.h"
#include "adrt.h"
#include "adrt_struct.h"
@@ -50,7 +51,6 @@
void render_cut_init(render_t *render, TIE_3 ray_pos, TIE_3 ray_dir) {
render_cut_t *d;
TIE_3 list[6], normal, up;
-tfloat plane[4];
render->work = render_cut_work;
render->free = render_cut_free;
@@ -68,47 +68,34 @@
tie_init(&d->tie, 2, TIE_KDTREE_FAST);
/* Calculate the normal to be used for the plane */
-up.v[0] = 0;
-up.v[1] = 0;
-up.v[2] = 1;
-
+VSET(up.v, 0, 0, 1);
VCROSS(normal.v, ray_dir.v, up.v);
VUNITIZE(normal.v);
/* Construct the plane */
-d->plane[0] = normal.v[0];
-d->plane[1] = normal.v[1];
-d->plane[2] = normal.v[2];
-plane[3] = VDOT( normal.v, ray_pos.v); /* up is really new ray_pos */
-d->plane[3] = -plane[3];
+VMOVE(d->plane, normal.v);
+d->plane[3] = -VDOT( normal.v, ray_pos.v); /* up is really new ray_pos */
/* Triangle 1 */
-list[0].v[0] = ray_pos.v[0];
-list[0].v[1] = ray_pos.v[1];
-list[0].v[2] = ray_pos.v[2] - THICKNESS;
+VMOVE(list[0].v, ray_pos.v);
+list[0].v[2] -= THICKNESS;
-list[1].v[0] = ray_pos.v[0] + LENGTH*ray_dir.v[0];
-list[1].v[1] = ray_pos.v[1] + LENGTH*ray_dir.v[1];
-list[1].v[2] = ray_pos.v[2] + LENGTH*ray_dir.v[2] - THICKNESS;
+VADD2SCALE(list[1].v, ray_pos.v, ray_dir.v, LENGTH);
+list[1].v[2] -= THICKNESS;
-list[2].v[0] = ray_pos.v[0] + LENGTH*ray_dir.v[0];
-list[2].v[1] = ray_pos.v[1] + LENGTH*ray_dir.v[1];
-list[2].v[2] = ray_pos.v[2] + LENGTH*ray_dir.v[2] + THICKNESS;
+VADD2SCALE(list[2].v, ray_pos.v, ray_dir.v, LENGTH);
+list[2].v[2] += THICKNESS;
/* Triangle 2 */
-list[3].v[0] = ray_pos.v[0];
-list[3].v[1] = ray_pos.v[1];
-list[3].v[2] = ray_pos.v[2] - THICKNESS;
+VMOVE(list[3].v, ray_pos.v);
+list[3].v[2] -= THICKNESS;
-list[4].v[0] = ray_pos.v[0] + LENGTH*ray_dir.v[0];
-list[4].v[1] = ray_pos.v[1] + LENGTH*ray_dir.v[1];
-list[4].v[2] = ray_pos.v[2] + LENGTH*ray_dir.v[2] + THICKNESS;
+VADD2SCALE(list[4].v, ray_pos.v, ray_dir.v, LENGTH);
+list[4].v[2] += THICKNESS;
+
+VMOVE(list[5].v, ray_pos.v);
+list[5].v[2] -= THICKNESS;
-list[5].v[0] = ray_pos.v[0];
-list[5].v[1] = ray_pos.v[1];
-list[5].v[2] = ray_pos.v[2] + THICKNESS;
-
-
tie_push(&d->tie, (TIE_3 **)&list, 2, NULL, 0);
tie_prep(&d->tie);
}
@@ -147,11 +134,9 @@
rd = (render_cut_t *)render->data;
-/* Draw Ballistic Arrow - Blue */
+/* Draw Arrow - Blue */
if (tie_work(&rd->tie, ray, &id, render_arrow_hit, NULL)) {
- pixel->v[0] = 0.0;
- pixel->v[1] = 0.0;
- pixel->v[2] = 1.0;
+ VSET(pixel->v, 0.0, 0.0, 1.0);
return;
}
@@ -170,7 +155,6 @@
* Ray = O + td
* t = -(Pn \xB7 R0 + D) / (Pn \xB7 Rd)
*/
-
t = (rd->plane[0]*ray->pos.v[0] + rd->plane[1]*ray->pos.v[1] +
rd->plane[2]*ray->pos.v[2] + rd->plane[3]) /
(rd->plane[0]*ray->dir.v[0] + rd->plane[1]*ray->dir.v[1] +
rd->plane[2]*ray->dir.v[2]);
@@ -178,15 +162,9 @@
if (t > 0)
return;
-ray->pos.v[0] += -t * ray->dir.v[0];
-ray->pos.v[1] += -t * ray->dir.v[1];
-ray->pos.v[2] += -t * ray->dir.v[2];
+VADD2SCALE(ray->pos.v, ray->pos.v, ray->dir.v, -t);
+HMOVE(hit.plane, rd->plane);
-hit.plane[0] = rd->plane[0];
-hit.plane[1] = rd->plane[1];
-hit.plane[2] = rd->plane[2];
-hit.plane[3] = rd->plane[3];
-
/* Render Geometry */
if (!tie_work(tie, ray, &id, render_cut_hit, &hit))
return;
@@ -196,15 +174,11 @@
* If the point after the splitting plane is an inhit, then just shade as
usual.
*/
-dot = VDOT( ray->dir.v, hit.id.norm.v);
-/* flip normal */
-dot = fabs(dot);
+/* flipped normal */
+dot = fabs(VDOT( ray->dir.v, hit.id.norm.v));
-
if (hit.mesh->flags & (ADRT_MESH_SELECT|ADRT_MESH_HIT)) {
- color.v[0] = hit.mesh->flags & ADRT_MESH_HIT ? 0.9 : 0.2;
- color.v[1] = 0.2;
- color.v[2] = hit.mesh->flags & ADRT_MESH_SELECT ? 0.9 : 0.2;
+ VSET(color.v, hit.mesh->flags & ADRT_MESH_HIT ? 0.9 : 0.2, 0.2,
hit.mesh->flags & ADRT_MESH_SELECT ? 0.9 : 0.2);
} else {
/* Mix actual color with white 4:1, shade 50% darker */
#if 0
@@ -232,9 +206,7 @@
}
#endif
-pixel->v[0] += 0.1;
-pixel-
[brlcad-commits] SF.net SVN: brlcad:[33661] rt^3/trunk/src/tests/gsph0_Test.java
Revision: 33661 http://brlcad.svn.sourceforge.net/brlcad/?rev=33661&view=rev Author: davidloman Date: 2009-02-04 18:50:01 + (Wed, 04 Feb 2009) Log Message: --- Adding groundwork for a simple cross language test. Added Paths: --- rt^3/trunk/src/tests/gsph0_Test.java Property changes on: rt^3/trunk/src/tests/gsph0_Test.java ___ Added: svn:mime-type + text/plain Added: svn:eol-style + native 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:[33660]
Revision: 33660
http://brlcad.svn.sourceforge.net/brlcad/?rev=33660&view=rev
Author: davidloman
Date: 2009-02-04 18:38:28 + (Wed, 04 Feb 2009)
Log Message:
---
More cleanup on DataStream, NetMsg & Subs, and GeometryService
Modified Paths:
--
rt^3/trunk/include/GeometryService/Session.h
rt^3/trunk/include/io/DataStream.h
rt^3/trunk/src/GeometryService/Session.cxx
rt^3/trunk/src/GeometryService/gsph0.cxx
rt^3/trunk/src/iBME/Makefile.am
rt^3/trunk/src/io/DataStream.cxx
rt^3/trunk/src/tests/DataStreamTest.cxx
Modified: rt^3/trunk/include/GeometryService/Session.h
===
--- rt^3/trunk/include/GeometryService/Session.h2009-02-04 18:37:55 UTC
(rev 33659)
+++ rt^3/trunk/include/GeometryService/Session.h2009-02-04 18:38:28 UTC
(rev 33660)
@@ -30,21 +30,41 @@
#if !defined(__SESSION_H__)
#define __SESSION_H__
+#include
#include
-#include "GeometryService/AbstractPortal.h"
+#include
+#include
#include "iBME/iBMECommon.h"
+#include "common/array.h"
+#include "io/DataStream.h"
+#include "GeometryService/netMsg/NetMsg.h"
+#include "GeometryService/netMsg/GeometryManifestMsg.h"
+#include "GeometryService/netMsg/GeometryReqMsg.h"
+#include "GeometryService/netMsg/RemHostNameSetMsg.h"
+#include "GeometryService/netMsg/RemHostNameSetFailMsg.h"
+
class Session
{
public:
- Session();
+ Session(boost::asio::io_service& io_service);
virtual ~Session();
+
+ boost::asio::ip::tcp::socket& Socket();
+ void Start();
+ void HandleRead(const boost::system::error_code& error, size_t bytesXferred);
+ void SendMsg(NetMsg* msg);
+ void HandleWrite(const boost::system::error_code& error);
+
private:
- AbstractPortal& portal();
- uInt accessLevel;
- String uName;
+ boost::asio::ip::tcp::socket socket_;
+ enum { max_length = 10240 };
+ uChar data_[max_length];
+ DataStream* sessionBuffer;
+ uInt targetLen;
+ bool newMsgFlag;
};
Modified: rt^3/trunk/include/io/DataStream.h
===
--- rt^3/trunk/include/io/DataStream.h 2009-02-04 18:37:55 UTC (rev 33659)
+++ rt^3/trunk/include/io/DataStream.h 2009-02-04 18:38:28 UTC (rev 33660)
@@ -68,8 +68,9 @@
uInt copyIn(const void *_data, uInt size = 0);
uInt clear(uByte fill = '\0', uInt size = 0);
+
+
friend DataStream& operator<<(DataStream &dest, DataStream source);
-
friend DataStream& operator<<(DataStream &b, Char c);
friend DataStream& operator<<(DataStream &b, uChar c);
friend DataStream& operator<<(DataStream &b, Short s);
@@ -82,6 +83,25 @@
friend DataStream& operator<<(DataStream &b, double d);
friend DataStream& operator<<(DataStream &b, std::string &s);
+ void writeDataStream(DataStream& source);
+ void writeDataStream(DataStream& source, uInt baSize);
+ void writeUByteArray(uByte ba[], uInt baSize);
+
+ void writeChar(const Char c);
+ void writeUChar(const uChar c);
+ void writeShort(const Short s);
+ void writeUShort(const uShort s);
+ void writeInt(const Int i);
+ void writeUInt(const uInt i);
+ // void writeLong(const Long l);
+ // void writeULong(const uLong l);
+ void writeFloat(const float f);
+ void writeDouble(const double d);
+ void writeString(const std::string s);
+
+
+
+
friend DataStream& operator>>(DataStream &b, Char &c);
friend DataStream& operator>>(DataStream &b, uChar &c);
friend DataStream& operator>>(DataStream &b, Short &s);
@@ -95,11 +115,29 @@
friend DataStream& operator>>(DataStream &b, std::string &s);
- uByte peakByte();
- uShort peakShort();
- uInt peakInt();
- //Need Long
- //Need uLong
+ uInt readUByteArray(uByte* b, uInt size);
+ Char readChar();
+ uChar readUChar();
+ Short readShort();
+ uShort readUShort();
+ Int readInt();
+ uInt readUInt();
+ //Long readLong();
+ //uLong readULong();
+ float readFloat();
+ double readDouble();
+ std::string readString();
+
+
+ uInt peakUByteArray(uByte* b, uInt size, uInt offset = 0);
+ Char peakChar();
+ uChar peakUChar();
+ Short peakShort();
+ uShort peakUShort();
+ Int peakInt();
+ uInt peakUInt();
+ //Long peakLong();
+ //uLong peakULong();
float peakFloat();
double peakDouble();
std::string peakString();
@@ -112,6 +150,7 @@
uInt getCurrentSize();
uInt getBytesFilled();
uInt getBytesRead();
+ uInt getBytesAvailToRead();
uByte* getData();
bool empty();
Modified: rt^3/trunk/src/GeometryService/Session.cxx
===
--- rt^3/trunk/src/GeometryService/Session.cxx 2009-02-04 18:37:55 UTC (rev
33659)
+++ rt^3/trunk/src/GeometryService/Session.cxx 2009-02-04 18:38:28 UTC (rev
33660)
@@ -29,14 +29,193 @@
#include "GeometryService/Session.h"
-Session::Session()
+using boost::asio::ip::tcp;
+
+Session::Session(boost::asio::io_service& io_service)
+ : socket_(io_service)
{
+ this->sessionBuff
[brlcad-commits] SF.net SVN: brlcad:[33659] brlcad/trunk/regress/mged_test.sh
Revision: 33659 http://brlcad.svn.sourceforge.net/brlcad/?rev=33659&view=rev Author: starseeker Date: 2009-02-04 18:37:55 + (Wed, 04 Feb 2009) Log Message: --- Add ae, center and eye_pt tests Modified Paths: -- brlcad/trunk/regress/mged_test.sh Modified: brlcad/trunk/regress/mged_test.sh === --- brlcad/trunk/regress/mged_test.sh 2009-02-04 18:32:37 UTC (rev 33658) +++ brlcad/trunk/regress/mged_test.sh 2009-02-04 18:37:55 UTC (rev 33659) @@ -67,6 +67,18 @@ Z EOF +# +# A E +# +cat > ae.mged_regress << EOF +ae 11 12.2 111 +view quat +view ypr +view aet +view center +view eye +view size +EOF # # A R B @@ -147,6 +159,15 @@ EOF # +# C E N T E R +# +cat > center.mged_regress << EOF +center +center 111 2 -300 +center +EOF + +# # C L O N E # @@ -288,6 +309,15 @@ EOF # +# E Y E _ P T +# +cat > eye_pt.mged_regress << EOF +eye_pt +eye_pt 100 100 100 +eye_pt +EOF + +# # E X T R U D E # cat > extrude.mged_regress << EOF @@ -1063,6 +1093,9 @@ cat view.mged_regress >> mged.mged_regress cat refresh.mged_regress >> mged.mged_regress cat autoview.mged_regress >> mged.mged_regress +cat ae.mged_regress >> mged.mged_regress +cat center.mged_regress >> mged.mged_regress +cat eye_pt.mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress @@ -1086,9 +1119,6 @@ cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress -cat .mged_regress >> mged.mged_regress -cat .mged_regress >> mged.mged_regress -cat .mged_regress >> mged.mged_regress 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:[33658] brlcad/trunk/src/adrt/slave/slave.c
Revision: 33658
http://brlcad.svn.sourceforge.net/brlcad/?rev=33658&view=rev
Author: erikgreenwald
Date: 2009-02-04 18:32:37 + (Wed, 04 Feb 2009)
Log Message:
---
fix up performance info (but leave disabled for now)
Modified Paths:
--
brlcad/trunk/src/adrt/slave/slave.c
Modified: brlcad/trunk/src/adrt/slave/slave.c
===
--- brlcad/trunk/src/adrt/slave/slave.c 2009-02-04 18:22:48 UTC (rev 33657)
+++ brlcad/trunk/src/adrt/slave/slave.c 2009-02-04 18:32:37 UTC (rev 33658)
@@ -383,10 +383,23 @@
}
#if 0
-gettimeofday(&tv, NULL);
-printf("[Work Units Completed: %.6d Rays: %.5d k/sec %lld]\r",
++adrt_slave_completed, (int)((tfloat)tie->rays_fired / (tfloat)(1000 *
(tv.tv_sec - adrt_slave_startsec + 1))), tie->rays_fired);
-fflush(stdout);
+{
+ struct timeval tv;
+ static int adrt_slave_completed = 0;
+ static time_t adrt_slave_startsec = 0;
+
+ if(adrt_slave_startsec == 0) adrt_slave_startsec = time(NULL);
+
+ gettimeofday(&tv, NULL);
+ printf("\t[Work Units Completed: %.6d Rays: %.5d k/sec %lld]\n",
+ ++adrt_slave_completed,
+ (int) ((tfloat) adrt_workspace_list[wid].tie.rays_fired /
(tfloat) (1000 * (tv.tv_sec - adrt_slave_startsec + 1))),
+ adrt_workspace_list[wid].tie.rays_fired);
+ fflush(stdout);
+}
#endif
+
+return;
}
void
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:[33657] brlcad/trunk/regress/mged_test.sh
Revision: 33657 http://brlcad.svn.sourceforge.net/brlcad/?rev=33657&view=rev Author: starseeker Date: 2009-02-04 18:22:48 + (Wed, 04 Feb 2009) Log Message: --- Add first tests of view commands Modified Paths: -- brlcad/trunk/regress/mged_test.sh Modified: brlcad/trunk/regress/mged_test.sh === --- brlcad/trunk/regress/mged_test.sh 2009-02-04 17:21:59 UTC (rev 33656) +++ brlcad/trunk/regress/mged_test.sh 2009-02-04 18:22:48 UTC (rev 33657) @@ -116,6 +116,23 @@ # +# A U T O V I E W +# +cat > autoview.mged_regress << EOF +Z +view center -1000 -1000 0 +view aet 34 23 2 +autoview +view quat +view ypr +view aet +view center +view eye +view size +EOF + + +# # B U I L D _ R E G I O N # # build_region requires a large number of target objects with the correct @@ -759,6 +776,14 @@ EOF # +# R E F R E S H +# +cat > refresh.mged_regress << EOF +refresh +EOF + + +# # R E J E C T # cat > reject.mged_regress << EOF @@ -916,6 +941,24 @@ EOF # +#V I E W +# +cat > view.mged_regress << EOF +view quat 0.413175911167 0.492403876506 0.586824088833 0.492403876506 +view ypr 10 1 2 +view aet 10 10 10 +view center 23 -2 0 +view eye 2 4 5 +view size 1 +view quat +view ypr +view aet +view center +view eye +view size +EOF + +# # W H O # # Test who with combinations @@ -982,6 +1025,7 @@ cat who.mged_regress >> mged.mged_regress cat draw.mged_regress >> mged.mged_regress cat erase.mged_regress >> mged.mged_regress +# need Z here # # EDITING COMMANDS @@ -1016,6 +1060,9 @@ # #VIEW COMMANDS # +cat view.mged_regress >> mged.mged_regress +cat refresh.mged_regress >> mged.mged_regress +cat autoview.mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress @@ -1025,10 +1072,31 @@ cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress +cat .mged_regress >> mged.mged_regress + + + + ## # # Run master script to generate log and .g file for diffing 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:[33656] brlcad/trunk/regress/mged_test.sh
Revision: 33656 http://brlcad.svn.sourceforge.net/brlcad/?rev=33656&view=rev Author: starseeker Date: 2009-02-04 17:21:59 + (Wed, 04 Feb 2009) Log Message: --- Fix couple minor issues in mged test script. Modified Paths: -- brlcad/trunk/regress/mged_test.sh Modified: brlcad/trunk/regress/mged_test.sh === --- brlcad/trunk/regress/mged_test.sh 2009-02-04 15:49:10 UTC (rev 33655) +++ brlcad/trunk/regress/mged_test.sh 2009-02-04 17:21:59 UTC (rev 33656) @@ -672,7 +672,7 @@ # # P E R M U T E # -cat > permute.mged_regres << EOF +cat > permute.mged_regress << EOF make permute.s arb8 Z e permute.s @@ -781,7 +781,8 @@ make rm_prim2.s sph comb rm_comb1.c u rm_prim1.s comb rm_comb2.c u rm_comb1.c u rm_prim2.s -rm rm_prim1.s rm_comb2.c +rm rm_comb2.c rm_prim2.s +rm rm_comb2.c rm_prim1.s EOF # 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:[33655] brlcad/trunk/src/tclscripts/mged
Revision: 33655
http://brlcad.svn.sourceforge.net/brlcad/?rev=33655&view=rev
Author: bob1961
Date: 2009-02-04 15:49:10 + (Wed, 04 Feb 2009)
Log Message:
---
This fixes a bug that was breaking the font preferences panel (i.e. it's init
routine was not getting called if a .mgedrc file was present).
Modified Paths:
--
brlcad/trunk/src/tclscripts/mged/font.tcl
brlcad/trunk/src/tclscripts/mged/openw.tcl
Modified: brlcad/trunk/src/tclscripts/mged/font.tcl
===
--- brlcad/trunk/src/tclscripts/mged/font.tcl 2009-02-04 15:41:00 UTC (rev
33654)
+++ brlcad/trunk/src/tclscripts/mged/font.tcl 2009-02-04 15:49:10 UTC (rev
33655)
@@ -95,6 +95,10 @@
}
}
+if ![info exists mged_default(font_init)] {
+set mged_default(font_init) ""
+}
+
if ![info exists font_scheme_data] {
set font_scheme_data { {fs_button_font button_font Buttons}
{fs_entry_font entry_font Entries}
Modified: brlcad/trunk/src/tclscripts/mged/openw.tcl
===
--- brlcad/trunk/src/tclscripts/mged/openw.tcl 2009-02-04 15:41:00 UTC (rev
33654)
+++ brlcad/trunk/src/tclscripts/mged/openw.tcl 2009-02-04 15:49:10 UTC (rev
33655)
@@ -152,7 +152,7 @@
set mged_gui(loadScriptDir) [pwd]
}
-if {![info exists mged_default(text_font)]} {
+if {![info exists mged_default(font_init)]} {
font_init
}
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:[33654] brlcad/trunk/src/adrt/libutil/
Revision: 33654 http://brlcad.svn.sourceforge.net/brlcad/?rev=33654&view=rev Author: erikgreenwald Date: 2009-02-04 15:41:00 + (Wed, 04 Feb 2009) Log Message: --- empty dir Removed Paths: - brlcad/trunk/src/adrt/libutil/ 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:[33653] brlcad/trunk/src/adrt/adrt.h
Revision: 33653
http://brlcad.svn.sourceforge.net/brlcad/?rev=33653&view=rev
Author: erikgreenwald
Date: 2009-02-04 15:08:41 + (Wed, 04 Feb 2009)
Log Message:
---
macro to turn network opcodes into human readable names
Modified Paths:
--
brlcad/trunk/src/adrt/adrt.h
Modified: brlcad/trunk/src/adrt/adrt.h
===
--- brlcad/trunk/src/adrt/adrt.h2009-02-04 13:45:17 UTC (rev 33652)
+++ brlcad/trunk/src/adrt/adrt.h2009-02-04 15:08:41 UTC (rev 33653)
@@ -44,16 +44,17 @@
ADRT_WORK_SHOTLINE,
ADRT_WORK_SPALL,
ADRT_WORK_SELECT,
-ADRT_WORK_MINMAX
+ADRT_WORK_MINMAX,
+ADRT_WORK_END
};
static char *adrt_work_table[40] = {
"ADRT_WORK_INIT",
-"ADRT_WORK_STATUS,",
-"ADRT_WORK_FRAME_ATTR,",
-"ADRT_WORK_FRAME,",
-"ADRT_WORK_SHOTLINE,",
-"ADRT_WORK_SPALL,",
-"ADRT_WORK_SELECT,",
+"ADRT_WORK_STATUS",
+"ADRT_WORK_FRAME_ATTR",
+"ADRT_WORK_FRAME",
+"ADRT_WORK_SHOTLINE",
+"ADRT_WORK_SPALL",
+"ADRT_WORK_SELECT",
"ADRT_WORK_MINMAX",
NULL};
@@ -70,7 +71,8 @@
ADRT_NETOP_WORK,
ADRT_NETOP_MESG,
ADRT_NETOP_QUIT,
-ADRT_NETOP_SHUTDOWN
+ADRT_NETOP_SHUTDOWN,
+ADRT_NETOP_END
};
static char *adrt_netop_table[40] = {
"ADRT_NETOP_NOP",
@@ -83,6 +85,13 @@
"ADRT_NETOP_SHUTDOWN",
NULL};
+/* fill in a human readable version of the adrt op (for debugging) */
+#define ADRT_MESSAGE_NAME(op) \
+(op >= ADRT_WORK_BASE && op <= ADRT_WORK_END) ?
adrt_work_table[op-ADRT_WORK_BASE] : \
+(op >= ADRT_NETOP_BASE && op <= ADRT_NETOP_END) ?
adrt_netop_table[op-ADRT_NETOP_BASE] : \
+"Unknown"
+
+
#define ADRT_VER_KEY 0
#define ADRT_VER_DETAIL"ADRT - Advanced Distributed Ray Tracer"
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:[33651]
Revision: 33651
http://brlcad.svn.sourceforge.net/brlcad/?rev=33651&view=rev
Author: davidloman
Date: 2009-02-04 13:25:23 + (Wed, 04 Feb 2009)
Log Message:
---
Updated NetMsg and subclasses to use DataStream. Updated netMsgSerialTest.
Modified Paths:
--
rt^3/trunk/include/GeometryService/netMsg/GeometryManifestMsg.h
rt^3/trunk/include/GeometryService/netMsg/GeometryReqMsg.h
rt^3/trunk/include/GeometryService/netMsg/NetMsg.h
rt^3/trunk/include/GeometryService/netMsg/RemHostNameSetFailMsg.h
rt^3/trunk/include/GeometryService/netMsg/RemHostNameSetMsg.h
rt^3/trunk/include/io/DataStream.h
rt^3/trunk/src/GeometryService/netMsg/GeometryManifestMsg.cxx
rt^3/trunk/src/GeometryService/netMsg/GeometryReqMsg.cxx
rt^3/trunk/src/GeometryService/netMsg/NetMsg.cxx
rt^3/trunk/src/GeometryService/netMsg/RemHostNameSetFailMsg.cxx
rt^3/trunk/src/GeometryService/netMsg/RemHostNameSetMsg.cxx
rt^3/trunk/src/io/DataStream.cxx
rt^3/trunk/src/tests/netMsgSerialTest.cxx
Modified: rt^3/trunk/include/GeometryService/netMsg/GeometryManifestMsg.h
===
--- rt^3/trunk/include/GeometryService/netMsg/GeometryManifestMsg.h
2009-02-03 21:45:43 UTC (rev 33650)
+++ rt^3/trunk/include/GeometryService/netMsg/GeometryManifestMsg.h
2009-02-04 13:25:23 UTC (rev 33651)
@@ -32,44 +32,41 @@
#include
#include "iBME/iBMECommon.h"
-#include "io/DataInputStream.h"
-#include "io/DataOutputStream.h"
-#include "io/ByteArrayOutputStream.h"
-#include "io/ByteArrayInputStream.h"
+#include "io/DataStream.h"
#include "GeometryService/netMsg/NetMsg.h"
class GeometryManifestMsg : public NetMsg
-{
+{
-public:
+public:
- //Constructor
- GeometryManifestMsg(uInt mType, UUID mUUID, UUID rUUID);
+ //Constructor
+ GeometryManifestMsg(uInt mType, UUID mUUID, UUID rUUID);
- //Deserializing Constructors
- GeometryManifestMsg(array* data);
- GeometryManifestMsg(DataInputStream* dis);
+ //Deserializing Constructors
+ GeometryManifestMsg(uByte data[], uInt len);
+ GeometryManifestMsg(DataStream* ds);
- //Destructor
- virtual ~GeometryManifestMsg();
+ //Destructor
+ virtual ~GeometryManifestMsg();
- virtual String toString();
+ virtual String toString();
- /*
- *Getters n Setters
- */
- uInt getNumOfItems();
+ /*
+ *Getters n Setters
+ */
+ uInt getNumOfItems();
- std::vector* getItemData();
+ std::vector* getItemData();
-private:
- std::vector itemData;
- virtual bool _deserialize(DataInputStream* dis);
- virtual bool _serialize(DataOutputStream* dos);
+private:
+ std::vector itemData;
+ virtual bool _deserialize(DataStream* ds);
+ virtual bool _serialize(DataStream* ds);
-};
+};
#endif // !defined(_GEOMETRYMANIFESTMSG_H_)
Modified: rt^3/trunk/include/GeometryService/netMsg/GeometryReqMsg.h
===
--- rt^3/trunk/include/GeometryService/netMsg/GeometryReqMsg.h 2009-02-03
21:45:43 UTC (rev 33650)
+++ rt^3/trunk/include/GeometryService/netMsg/GeometryReqMsg.h 2009-02-04
13:25:23 UTC (rev 33651)
@@ -31,10 +31,7 @@
#define _GEOMETRYREQMSG_H_
#include "iBME/iBMECommon.h"
-#include "io/DataInputStream.h"
-#include "io/DataOutputStream.h"
-#include "io/ByteArrayOutputStream.h"
-#include "io/ByteArrayInputStream.h"
+#include "io/DataStream.h"
#include "GeometryService/netMsg/NetMsg.h"
@@ -47,8 +44,8 @@
GeometryReqMsg(uInt mType, UUID mUUID, UUID rUUID, uByte v, String d);
//Deserializing Constructors
- GeometryReqMsg(array* data);
- GeometryReqMsg(DataInputStream* dis);
+ GeometryReqMsg(uByte data[], uInt len);
+ GeometryReqMsg(DataStream* ds);
//Destructor
virtual ~GeometryReqMsg();
@@ -68,8 +65,8 @@
private:
uByte reqType;
String data;
- virtual bool _deserialize(DataInputStream* dis);
- virtual bool _serialize(DataOutputStream* dos);
+ virtual bool _deserialize(DataStream* ds);
+ virtual bool _serialize(DataStream* ds);
};
Modified: rt^3/trunk/include/GeometryService/netMsg/NetMsg.h
===
--- rt^3/trunk/include/GeometryService/netMsg/NetMsg.h 2009-02-03 21:45:43 UTC
(rev 33650)
+++ rt^3/trunk/include/GeometryService/netMsg/NetMsg.h 2009-02-04 13:25:23 UTC
(rev 33651)
@@ -31,62 +31,59 @@
#define _NETMSG_H_
#include "iBME/iBMECommon.h"
-#include "io/DataInputStream.h"
-#include "io/DataOutputStream.h"
-#include "io/ByteArrayOutputStream.h"
-#include "io/ByteArrayInputStream.h"
+#include "io/DataStream.h"
-class NetMsg
-{
+class NetMsg
+{
-public:
+public:
- //Default Constructor
- NetMsg();
+ //Default Constructor
+ NetMsg();
- //HeaderOnly Constructor
- NetMsg(uInt mType, UUID mUUID,
