Changeset 9

Timestamp:

11/06/07 12:50:23

Author:

robert

Message:

From Colin Dunlop, port to Windows

Files:

• trunk/src/Cluster.h (modified) (1 diff)
• trunk/src/SlideShowConstructor.cpp (modified) (2 diffs)
• trunk/src/present3D.cpp (modified) (7 diffs)

trunk/src/Cluster.h

@@ -21 +21 @@
-#if !defined(WIN32) || defined(__CYGWIN__)
-    #include <netinet/in.h>
+#else
+    #include "winsock.h"
-#endif
-

trunk/src/SlideShowConstructor.cpp

@@ -37 +37 @@
-
-#include <sstream>
+#include <algorithm>
-
-#include "AnimationMaterial.h"
@@ -633 +634 @@
-    if (imageStream)
-    {
-   
+    
-    
-        osg::notify(osg::INFO)<<"Reading video "<<imageStream->getFileName()<<std::endl; 

trunk/src/present3D.cpp

@@ -14 +14 @@
-#include <osg/CameraNode>
-#include <osg/Texture2D>
+#include <osg/Notify>
-
-
@@ -154 +155 @@
-
-
-
+P3D
-{
-    VIEWER,
@@ -188 +189 @@
-    arguments.getApplicationUsage()->addCommandLineOption("--html <filename>","Print out slides to a series of html & image files.");
-    arguments.getApplicationUsage()->addCommandLineOption("--loop","Switch on looping of presentation.");
-
+
+
+
+
+
+
+
+
+
-
-#ifdef USE_SDL
@@ -357 +366 @@
-    }
-
-ApplicationType a
+P3DApplicationType P3DA
-
-    str = getenv("PRESENT3D_TYPE");
-    if (str)
-    {
-a
-a
-a
+P3DA
+P3DA
+P3DA
-    }
-        
-a
-a
-a
+P3DA
+P3DA
+P3DA
-    
-    while (arguments.read("--version"))
-    {
-        std::string appTypeName = "invalid";
-a
+P3DA
-        {
-            case(VIEWER): appTypeName = "viewer"; break;
@@ -568 +577 @@
-#endif
-
-a
+P3DA
-            {
-                // take camera zero as the guide.
@@ -589 +598 @@
-                bc.sync();
-            }
-a
+P3DA
-            {
-                rc.setBuffer(scratchPad._startPtr, scratchPad._numBytes);
@@ -616 +625 @@
-            viewer.updateTraversal();
-
-a
+P3DA
-            {
-                osg::Matrix modelview;