Changeset 1960 for OpenSceneGraph/trunk/examples/osgcluster/osgcluster.cpp

Timestamp:

05/21/03 14:15:45 (10 years ago)

Author:

robert

Message:

Removed osg::GeoSet? for core osg lib and osgPlugin.

Commented out OpenDX plugin as its still based on GeoSet?.

Added support for loading and converting GeoSet? into the osgconv example.

Files:

• OpenSceneGraph/trunk/examples/osgcluster/osgcluster.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/examples/osgcluster/osgcluster.cpp

@@ -38 +38 @@
     
         CameraPacket():_masterKilled(false) 
-        {
-            _byte_order = 0x12345678;
-        }
+    {
+        _byte_order = 0x12345678;
+    }
         
         void setPacket(const osg::Matrix& matrix,const osg::FrameStamp* frameStamp)
@@ -57 +57 @@
         }
         
-        void checkByteOrder( void )
-        {
-            if( _byte_order == 0x78563412 )  // We're backwards
-            {
-                swapBytes( _byte_order );
-                swapBytes( _masterKilled );
-                for( int i = 0; i < 16; i++ )
-                    swapBytes( _matrix.ptr()[i] );
+    void checkByteOrder( void )
+    {
+        if( _byte_order == 0x78563412 )  // We're backwards
+        {
+            swapBytes( _byte_order );
+        swapBytes( _masterKilled );
+        for( int i = 0; i < 16; i++ )
+            swapBytes( _matrix.ptr()[i] );
                     
                 // umm.. we should byte swap _frameStamp too...
-            }
-        }
+        }
+    }
 
         
@@ -74 +74 @@
         const bool getMasterKilled() const { return _masterKilled; }
         
-        unsigned long   _byte_order;
+    unsigned long   _byte_order;
         bool            _masterKilled;
         osg::Matrix     _matrix;
@@ -171 +171 @@
     Broadcaster     bc;
     Receiver        rc;
-    
-    bc.setPort(socketNumber);
-    rc.setPort(socketNumber);
-
-    while( !viewer.done() )
+
+    bc.setPort(static_cast<short int>(socketNumber));
+    rc.setPort(static_cast<short int>(socketNumber));
+
+    bool masterKilled = false;
+
+    while( !viewer.done() && !masterKilled )
     {
         // wait for all cull and draw threads to complete.
@@ -198 +200 @@
 
                 bc.setBuffer(&cp, sizeof( CameraPacket ));
-                bc.sync();
+            bc.sync();
 
             }
@@ -207 +209 @@
 
                 rc.setBuffer(&cp, sizeof( CameraPacket ));
-                rc.sync();
-
-                cp.checkByteOrder();
+
+                rc.sync();
+    
+                cp.checkByteOrder();
 
                 osg::Matrix modelview;
@@ -218 +221 @@
                 if (cp.getMasterKilled()) 
                 {
-                    std::cout << "recieved master killed"<<std::endl;
+                    std::cout << "received master killed"<<std::endl;
                     // break out of while (!done) loop since we've now want to shut down.
-                    break;
+                    masterKilled = true;
                 }
             }
@@ -230 +233 @@
          
         // fire off the cull and draw traversals of the scene.
-        viewer.frame();
-        
-    }
-    
+        if(!masterKilled)
+            viewer.frame();
+        
+    }
+
     // wait for all cull and draw threads to complete before exit.
     viewer.sync();
@@ -246 +250 @@
 
         bc.setBuffer(&cp, sizeof( CameraPacket ));
-        bc.sync();
+        bc.sync();
 
         std::cout << "broadcasting death"<<std::endl;