Text archives Help

---

Author: abe
Date: Thu Aug 18 15:49:23 2005
New Revision: 478

Modified:
   branches/itanium2/Engine/Control/RTRT.cc
   branches/itanium2/fox/CMakeLists.txt
   branches/itanium2/fox/FMantaWindow.cc
   branches/itanium2/fox/FMantaWindow.h
Log:


Fixed problem where the user would switch to a frameless renderer from the 
gui 
but the main rtrt loop wouldn't setup the frameless renderer before using it.
M    fox/FMantaWindow.cc
M    fox/FMantaWindow.h
M    Engine/Control/RTRT.cc

Added cmake directives to exclude lib's that don't exist on fisher.
M    fox/CMakeLists.txt

Modified: branches/itanium2/Engine/Control/RTRT.cc
==============================================================================
--- branches/itanium2/Engine/Control/RTRT.cc    (original)
+++ branches/itanium2/Engine/Control/RTRT.cc    Thu Aug 18 15:49:23 2005
@@ -766,6 +766,11 @@
   if(iter == imageTraversers.end())
     return false;
   currentImageTraverser = (*iter->second)(args);
+
+  // Setup the pipeline again so that the traverser's
+  // setup display channel will be called.
+  pipelineNeedsSetup = true;
+
   return true;
 }
 

Modified: branches/itanium2/fox/CMakeLists.txt
==============================================================================
--- branches/itanium2/fox/CMakeLists.txt        (original)
+++ branches/itanium2/fox/CMakeLists.txt        Thu Aug 18 15:49:23 2005
@@ -44,13 +44,31 @@
                                   Manta_Core 
                                   SCIRun_Core)
 
+
+
+
+  SET(FOX_X11_LIBRARIES m)
+
+  # Append Xcursor if it is available.
+  FIND_LIBRARY( FOUND_XCURSOR NAME Xcursor PATH /usr/X11R6/lib )    
+  IF(FOUND_XCURSOR)
+    SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES}
+                          Xcursor)
+  ENDIF(FOUND_XCURSOR)
+
+ 
+  # Append Xrandr if it is available.
+  FIND_LIBRARY( FOUND_XCURSOR NAME Xrandr PATH /usr/X11R6/lib )    
+  IF(FOUND_XRANDR)
+    SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES}
+                          Xrandr)
+  ENDIF(FOUND_XRANDR)
+
   TARGET_LINK_LIBRARIES(dm_demo ${FOX_STATIC}
                                 ${CMAKE_THREAD_LIBS_INIT}
                                 ${OPENGL_LIBRARIES} 
                                 ${X11_LIBRARIES} 
-                                -lm
-                                -lXcursor
-                                -lXrandr)
+                                ${FOX_X11_LIBRARIES})
   IF(HISTX_PATH)
     TARGET_LINK_LIBRARIES(dm_demo Manta_histx
                                     ${HISTX_LINK} )

Modified: branches/itanium2/fox/FMantaWindow.cc
==============================================================================
--- branches/itanium2/fox/FMantaWindow.cc       (original)
+++ branches/itanium2/fox/FMantaWindow.cc       Thu Aug 18 15:49:23 2005
@@ -54,6 +54,7 @@
        FXMAPFUNC(SEL_COMMAND, FMantaWindow::ID_TEXT_SAMPLER,    
FMantaWindow::onPixelSamplerText ),
 
        // Traversers
+  FXMAPFUNC(SEL_COMMAND, FMantaWindow::ID_FRAMELESS_TRAVERSER,       
FMantaWindow::onTraverser ),
        FXMAPFUNC(SEL_COMMAND, FMantaWindow::ID_TEXT_TRAVERSER,  
FMantaWindow::onTraverserText ),
 
        // Cutting planes.
@@ -108,6 +109,7 @@
        
        // Traverser Menu.
        traverser_menu = new FXMenuPane( this );
+  new FXMenuCommand( traverser_menu, "Frameless", 0, this, 
ID_FRAMELESS_TRAVERSER );
        new FXMenuCommand( traverser_menu, "Enter Text...", 0, this,  
ID_TEXT_TRAVERSER );
        new FXMenuTitle( menu_bar, "Traversers", 0, traverser_menu );
 
@@ -360,6 +362,21 @@
                        
Callback::create(this,&FMantaWindow::mantaPixelSampler,string(description.text())));
        }
 
+       return 1;
+}
+
+long FMantaWindow::onTraverser( FXObject *sender, FXSelector key, void *data 
) {
+       
+       // Determine which shadow algorithm to use.
+       int id = FXSELID( key );
+               
+       switch (id) {
+               case ID_FRAMELESS_TRAVERSER:
+                       manta_interface->addTransaction("Image Traverser.",
+                               
Callback::create(this,&FMantaWindow::mantaTraverser,string("frameless")));
+                       break;
+       }
+       
        return 1;
 }
 

Modified: branches/itanium2/fox/FMantaWindow.h
==============================================================================
--- branches/itanium2/fox/FMantaWindow.h        (original)
+++ branches/itanium2/fox/FMantaWindow.h        Thu Aug 18 15:49:23 2005
@@ -97,6 +97,7 @@
                        ID_TEXT_SAMPLER,    // User wants to enter a 
description manually.
                        
                        // Image traverser options.
+      ID_FRAMELESS_TRAVERSER,
                        ID_TEXT_TRAVERSER,
                        
                        // Cutting planes.
@@ -141,6 +142,7 @@
                long onShadowAlgorithmText( FXObject *sender, FXSelector key, 
void *data );
                long onPixelSampler   ( FXObject *sender, FXSelector key, 
void *data );
                long onPixelSamplerText( FXObject *sender, FXSelector key, 
void *data );
+               long onTraverser      ( FXObject *sender, FXSelector key, 
void *data );
                long onTraverserText  ( FXObject *sender, FXSelector key, 
void *data );
                long onAddCuttingPlane( FXObject *sender, FXSelector key, 
void *data );
                long onExtraOptions   ( FXObject *sender, FXSelector key, 
void *data );
@@ -180,4 +182,4 @@
        };
 };
 
-#endif
\ No newline at end of file
+#endif

---

• [MANTA] r478 - in branches/itanium2: Engine/Control fox, abe, 08/18/2005

---

Archive powered by MHonArc 2.6.16.