Changeset 575

Timestamp:

03/07/07 16:02:22 (2 years ago)

Author:

allenb

Message:

Patch from Patrick Hartling to fix unresolved symbols in Cluster code.

Files:

• trunk/Source/Base/Network/Base/OSGConnectionType.cpp (modified) (1 diff)
• trunk/Source/System/Cluster/Base/OSGRemoteAspect.h (modified) (2 diffs)
• trunk/Source/System/Cluster/Server/OSGClusterServer.cpp (modified) (4 diffs)

trunk/Source/Base/Network/Base/OSGConnectionType.cpp

@@ -87 +87 @@
-}
-
+ConnectionType::ConnectionType(const ConnectionType &source) :
+    _name(source._name),
+    _createGroup(source._createGroup),
+    _createPoint(source._createPoint)
+{
+}
+
-/*-------------------------------------------------------------------------*/
-/*                             Destructor                                  */

trunk/Source/System/Cluster/Base/OSGRemoteAspect.h

@@ -147 +147 @@
-    static void subFieldFilter   (UInt32    typeId,
-                                  BitVector mask   );
-
+
-    static void restoreChangeList(ChangeList *tocl);
-    static void storeChangeList  (ChangeList *cl  );
+#endif
-    static UInt32 getStoreSize   (void            );
-
@@ -269 +270 @@
-OSG_END_NAMESPACE
-
-:
+
-
-#endif /* _REMOTEASPECT_H_ */

trunk/Source/System/Cluster/Server/OSGClusterServer.cpp

@@ -248 +248 @@
-}
-
+#ifdef OSG_OLD_RENDER_ACTION
+
-/*! sync with client and render scenegraph
- */
@@ -257 +259 @@
-    doSwap  (      );
-}
+
+#endif
+
+#ifdef OSG_CLEANED_RENDERACTION
+
+/*! sync with client and render scenegraph
+ */
+
+void ClusterServer::render(RenderTraversalActionBase *action)
+{
+    doSync  (false );
+    doRender(action);
+    doSwap  (      );
+}
+
+#endif
-
-/*! Synchronize all field containers with the client and call 
@@ -335 +353 @@
-}
-
+#ifdef OSG_OLD_RENDER_ACTION
+
-/*! render server window
- */
@@ -355 +375 @@
-    _clusterWindow->serverRender(_window, _serverId, action);
-}
+
+#endif
+
+#ifdef OSG_CLEANED_RENDERACTION
+
+/*! render server window
+ */
+
+void ClusterServer::doRender(RenderTraversalActionBase *action)
+{
+    OSG::IndentFileOutStream outFileStream("/tmp/cluster.osg");
+
+    if(outFileStream)
+    {
+        std::cerr << "STARTING PRINTOUT:" << std::endl;
+
+        OSG::OSGWriter writer(outFileStream, 4);
+
+        writer.write(_clusterWindow);
+
+        outFileStream.close();
+    } 
+
+    _clusterWindow->serverRender(_window, _serverId, action);
+}
+
+#endif
-
-/*! swap server window