added --host option

fixed up isLocal logic created scene_client1.csv to test multiple clients changed test.py to look for substring "Avatar" as parent
danx0r · Aug 17, 2009 · 2241cbd · 2241cbd
1 parent fdf2164
commit 2241cbd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/cppoh/src/main.cpp b/cppoh/src/main.cpp
@@ -61,11 +61,13 @@ using Transfer::TransferManager;
 OptionValue *cdnConfigFile;
 OptionValue *floatExcept;
 OptionValue *dbFile;
+OptionValue *host;
 InitializeGlobalOptions main_options("",
 //    simulationPlugins=new OptionValue("simulationPlugins","ogregraphics",OptionValueType<String>(),"List of plugins that handle simulation."),
     cdnConfigFile=new OptionValue("cdnConfig","cdn = ($import=cdn.txt)",OptionValueType<String>(),"CDN configuration."),
     floatExcept=new OptionValue("sigfpe","false",OptionValueType<bool>(),"Enable floating point exceptions"),
     dbFile=new OptionValue("db","scene.db",OptionValueType<String>(),"Persistence database"),
+    host=new OptionValue("host","localhost",OptionValueType<String>(),"space address"),
     NULL
 );
 
@@ -185,7 +187,7 @@ int main ( int argc,const char**argv ) {
 
     SpaceID mainSpace(UUID("12345678-1111-1111-1111-DEFA01759ACE",UUID::HumanReadable()));
     SpaceIDMap *spaceMap = new SpaceIDMap;
-    spaceMap->insert(mainSpace, Network::Address("127.0.0.1","5943"));
+    spaceMap->insert(mainSpace, Network::Address(host->as<String>(),"5943"));
 
     Persistence::ReadWriteHandler *database=Persistence::ReadWriteHandlerFactory::getSingleton()
         .getConstructor("sqlite")(String("--databasefile ")+dbFile->as<String>());

diff --git a/liboh/plugins/bullet/BulletSystem.cpp b/liboh/plugins/bullet/BulletSystem.cpp
@@ -49,7 +49,7 @@ using std::tr1::placeholders::_1;
 static int core_plugin_refcount = 0;
 
 #define DEBUG_OUTPUT2(x) x
-#define DEBUG_OUTPUT(x)
+#define DEBUG_OUTPUT(x) x
 
 SIRIKATA_PLUGIN_EXPORT_C void init() {
     using namespace Sirikata;
@@ -102,7 +102,7 @@ void BulletObj::meshChanged (const URI &newMesh) {
 }
 
 void BulletObj::setPhysical (const PhysicalParameters &pp) {
-    DEBUG_OUTPUT(cout << "dbm: setPhysical: " << this << " mode=" << pp.mode << " mesh: " << mMeshname << endl);
+    DEBUG_OUTPUT(cout << "dbm: setPhysical: " << this << " mode=" << pp.mode << " name: " << pp.name << " mesh: " << mMeshname << endl);
     mName = pp.name;
     mHull = pp.hull;
     colMask = pp.colMask;
@@ -135,6 +135,14 @@ void BulletObj::setPhysical (const PhysicalParameters &pp) {
         mShape = ShapeCharacter;
         break;
     }
+    if (mMeshptr) {
+        if (mDynamic && (!mMeshptr->isLocal()) ) {      /// for now, physics ignores dynamic objects on other hosts
+            DEBUG_OUTPUT(cout << "  dbm: debug setPhysical: disabling dynamic&non-local" << endl);
+            mActive = false;
+            mMeshptr->setLocationAuthority(0);
+            return;
+        }
+    }
     if (!(pp.mode==PhysicalParameters::Disabled)) {
         DEBUG_OUTPUT(cout << "  dbm: debug setPhysical: adding to bullet" << endl);
         positionOrientation po;
@@ -417,7 +425,7 @@ bool BulletSystem::tick() {
         delta = now-lasttime;
         if (delta.toSeconds() > 0.05) delta = delta.seconds(0.05);           /// avoid big time intervals, they are trubble
         lasttime = now;
-        if ((now-mStartTime) > Duration::seconds(10.0)) {
+        if ((now-mStartTime) > Duration::seconds(20.0)) {
             for (unsigned int i=0; i<objects.size(); i++) {
                 if (objects[i]->mActive) {
                     if (objects[i]->mMeshptr->getPosition() != objects[i]->getBulletState().p ||
@@ -695,7 +703,7 @@ BulletSystem::~BulletSystem() {
 
 void BulletSystem::createProxy(ProxyObjectPtr p) {
     ProxyMeshObjectPtr meshptr(tr1::dynamic_pointer_cast<ProxyMeshObject>(p));
-    if (meshptr && meshptr->isLocal()) {
+    if (meshptr) {
         DEBUG_OUTPUT(cout << "dbm: createProxy ptr:" << meshptr << " mesh: " << meshptr->getMesh() << endl;)
         objects.push_back(new BulletObj(this));     /// clean up memory!!!
         objects.back()->mMeshptr = meshptr;

diff --git a/liboh/scripts/ironpython/test.py b/liboh/scripts/ironpython/test.py
@@ -64,7 +64,7 @@ def sawAnotherObject(self,persistence,header,retstatus):
                     nameStruct.ParseFromString(field.data)
                     myName = nameStruct.value
         if DEBUG_OUTPUT: print "PY: Object",uuid,"has name",myName
-        if myName=="Avatar_01":
+        if myName[:6]=="Avatar":
             rws=pbPer.ReadWriteSet()
             se=rws.writes.add()
             se.field_name="Parent"

diff --git a/libspace/src/Space.cpp b/libspace/src/Space.cpp
@@ -81,7 +81,7 @@ Space::Space(const SpaceID&id):mID(id),mIO(Network::IOServiceFactory::makeIOServ
     String spaceServicesString;
     spaceServices.SerializeToString(&spaceServicesString);
     mObjectConnections=new ObjectConnections(Network::StreamListenerFactory::getSingleton().getDefaultConstructor()(mIO),
-                                             Network::Address("localhost",port)
+                                             Network::Address("0.0.0.0",port)
                                              //spaceServicesString
                                              );
     mObjectConnections->forwardMessagesTo(this);