-
sparker
thiago
Manta Interactive Ray Tracer Development Mailing List
Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r831 - in trunk/fox: . FManta dm_demo sc_demo
- Date: Fri, 6 Jan 2006 13:54:29 -0700 (MST)
Author: abe
Date: Fri Jan 6 13:54:27 2006
New Revision: 831
Added:
trunk/fox/FManta/
trunk/fox/FManta/CMakeLists.txt
trunk/fox/FManta/FMantaImageFrame.cc
- copied, changed from r829, trunk/fox/FMantaImageFrame.cc
trunk/fox/FManta/FMantaImageFrame.h
- copied, changed from r829, trunk/fox/FMantaImageFrame.h
trunk/fox/FManta/FMantaKdExplorer.cc
- copied, changed from r829, trunk/fox/FMantaKdExplorer.cc
trunk/fox/FManta/FMantaKdExplorer.h
- copied, changed from r829, trunk/fox/FMantaKdExplorer.h
trunk/fox/FManta/FMantaNavigator.cc
- copied unchanged from r829, trunk/fox/FMantaNavigator.cc
trunk/fox/FManta/FMantaNavigator.h
- copied unchanged from r829, trunk/fox/FMantaNavigator.h
trunk/fox/FManta/FMantaQuakeNav.cc
- copied, changed from r829, trunk/fox/FMantaQuakeNav.cc
trunk/fox/FManta/FMantaQuakeNav.h
- copied, changed from r829, trunk/fox/FMantaQuakeNav.h
trunk/fox/FManta/FMantaRecorder.cc
- copied, changed from r829, trunk/fox/FMantaRecorder.cc
trunk/fox/FManta/FMantaRecorder.h
- copied, changed from r829, trunk/fox/FMantaRecorder.h
trunk/fox/FManta/FMantaStereo.cc
- copied, changed from r829, trunk/fox/FMantaStereo.cc
trunk/fox/FManta/FMantaStereo.h
- copied, changed from r829, trunk/fox/FMantaStereo.h
trunk/fox/FManta/FMantaTrackballNav.cc
- copied, changed from r829, trunk/fox/FMantaTrackballNav.cc
trunk/fox/FManta/FMantaTrackballNav.h
- copied, changed from r829, trunk/fox/FMantaTrackballNav.h
trunk/fox/FManta/FMantaTransparent.cc
- copied, changed from r829, trunk/fox/FMantaTransparent.cc
trunk/fox/FManta/FMantaTransparent.h
- copied, changed from r829, trunk/fox/FMantaTransparent.h
trunk/fox/FManta/FMantaUniformNav.cc
- copied, changed from r829, trunk/fox/FMantaUniformNav.cc
trunk/fox/FManta/FMantaUniformNav.h
- copied, changed from r829, trunk/fox/FMantaUniformNav.h
trunk/fox/FManta/FMantaWidgets.cc
- copied, changed from r829, trunk/fox/FMantaWidgets.cc
trunk/fox/FManta/FMantaWidgets.h
- copied unchanged from r829, trunk/fox/FMantaWidgets.h
trunk/fox/FManta/FMantaWindow.cc
- copied, changed from r829, trunk/fox/FMantaWindow.cc
trunk/fox/FManta/FMantaWindow.h
- copied, changed from r829, trunk/fox/FMantaWindow.h
trunk/fox/dm_demo/
trunk/fox/dm_demo/CMakeLists.txt
trunk/fox/dm_demo/dm_demo.cc
- copied, changed from r829, trunk/fox/dm_demo.cc
trunk/fox/sc_demo/
trunk/fox/sc_demo/CMakeLists.txt
trunk/fox/sc_demo/MFStreamData.cc
- copied, changed from r829, trunk/fox/MFStreamData.cc
trunk/fox/sc_demo/MFStreamData.h
- copied, changed from r829, trunk/fox/MFStreamData.h
trunk/fox/sc_demo/MediaFusionApp.cc
- copied, changed from r829, trunk/fox/MediaFusionApp.cc
trunk/fox/sc_demo/MediaFusionApp.h
- copied unchanged from r829, trunk/fox/MediaFusionApp.h
trunk/fox/sc_demo/MediaFusionBridge.cc
- copied, changed from r829, trunk/fox/MediaFusionBridge.cc
trunk/fox/sc_demo/MediaFusionBridge.h
- copied, changed from r829, trunk/fox/MediaFusionBridge.h
trunk/fox/sc_demo/SHMImageDisplay.cc
- copied, changed from r829, trunk/fox/SHMImageDisplay.cc
trunk/fox/sc_demo/SHMImageDisplay.h
- copied, changed from r829, trunk/fox/SHMImageDisplay.h
trunk/fox/sc_demo/ShmSemaphore.cc
- copied, changed from r829, trunk/fox/ShmSemaphore.cc
trunk/fox/sc_demo/ShmSemaphore.h
- copied unchanged from r829, trunk/fox/ShmSemaphore.h
trunk/fox/sc_demo/mf_stream_test.cc
- copied, changed from r829, trunk/fox/mf_stream_test.cc
trunk/fox/sc_demo/sc_demo.cc
- copied, changed from r829, trunk/fox/sc_demo.cc
Removed:
trunk/fox/FMantaImageFrame.cc
trunk/fox/FMantaImageFrame.h
trunk/fox/FMantaKdExplorer.cc
trunk/fox/FMantaKdExplorer.h
trunk/fox/FMantaNavigator.cc
trunk/fox/FMantaNavigator.h
trunk/fox/FMantaQuakeNav.cc
trunk/fox/FMantaQuakeNav.h
trunk/fox/FMantaRecorder.cc
trunk/fox/FMantaRecorder.h
trunk/fox/FMantaStereo.cc
trunk/fox/FMantaStereo.h
trunk/fox/FMantaTrackballNav.cc
trunk/fox/FMantaTrackballNav.h
trunk/fox/FMantaTransparent.cc
trunk/fox/FMantaTransparent.h
trunk/fox/FMantaUniformNav.cc
trunk/fox/FMantaUniformNav.h
trunk/fox/FMantaWidgets.cc
trunk/fox/FMantaWidgets.h
trunk/fox/FMantaWindow.cc
trunk/fox/FMantaWindow.h
trunk/fox/MFStreamData.cc
trunk/fox/MFStreamData.h
trunk/fox/MediaFusionApp.cc
trunk/fox/MediaFusionApp.h
trunk/fox/MediaFusionBridge.cc
trunk/fox/MediaFusionBridge.h
trunk/fox/SHMImageDisplay.cc
trunk/fox/SHMImageDisplay.h
trunk/fox/ShmSemaphore.cc
trunk/fox/ShmSemaphore.h
trunk/fox/dm_demo.cc
trunk/fox/mf_stream_test.cc
trunk/fox/sc_demo.cc
Modified:
trunk/fox/CMakeLists.txt
Log:
Rearranged fox/ directory build.
Now all of the FManta* gui classes are compiled into a static library which
is linked against dm_demo and sc_demo.
Hopefully this will allow us to put demos with all of their special
dependencies in an location that is isolated from other shared code.
D fox/FMantaRecorder.cc
D fox/FMantaWindow.cc
D fox/FMantaQuakeNav.h
D fox/dm_demo.cc
D fox/MediaFusionApp.h
D fox/FMantaKdExplorer.cc
D fox/MFStreamData.cc
D fox/FMantaUniformNav.cc
D fox/FMantaUniformNav.h
D fox/MediaFusionBridge.cc
A fox/dm_demo
A fox/dm_demo/dm_demo.cc
A fox/dm_demo/CMakeLists.txt
D fox/SHMImageDisplay.h
A fox/FManta
A fox/FManta/FMantaTrackballNav.cc
A fox/FManta/FMantaRecorder.cc
A fox/FManta/FMantaWidgets.cc
A fox/FManta/FMantaTrackballNav.h
A fox/FManta/FMantaWindow.cc
A fox/FManta/FMantaRecorder.h
A fox/FManta/FMantaWidgets.h
A fox/FManta/FMantaWindow.h
A fox/FManta/FMantaQuakeNav.cc
A fox/FManta/FMantaQuakeNav.h
A fox/FManta/FMantaKdExplorer.cc
A fox/FManta/FMantaKdExplorer.h
A fox/FManta/FMantaUniformNav.cc
A fox/FManta/FMantaUniformNav.h
A fox/FManta/FMantaNavigator.cc
A fox/FManta/FMantaNavigator.h
A fox/FManta/FMantaImageFrame.cc
A fox/FManta/FMantaImageFrame.h
A fox/FManta/FMantaStereo.cc
A fox/FManta/FMantaTransparent.cc
A fox/FManta/CMakeLists.txt
A fox/FManta/FMantaStereo.h
A fox/FManta/FMantaTransparent.h
D fox/FMantaImageFrame.cc
A fox/sc_demo
A fox/sc_demo/ShmSemaphore.cc
A fox/sc_demo/mf_stream_test.cc
A fox/sc_demo/ShmSemaphore.h
A fox/sc_demo/MediaFusionBridge.cc
A fox/sc_demo/SHMImageDisplay.cc
A fox/sc_demo/MediaFusionBridge.h
A fox/sc_demo/SHMImageDisplay.h
A fox/sc_demo/MediaFusionApp.cc
A fox/sc_demo/MediaFusionApp.h
A fox/sc_demo/MFStreamData.cc
A fox/sc_demo/sc_demo.cc
A fox/sc_demo/CMakeLists.txt
A fox/sc_demo/MFStreamData.h
D fox/FMantaStereo.cc
M fox/CMakeLists.txt
D fox/FMantaTransparent.h
D fox/ShmSemaphore.cc
D fox/FMantaTrackballNav.cc
D fox/FMantaWidgets.cc
D fox/FMantaTrackballNav.h
D fox/ShmSemaphore.h
D fox/FMantaRecorder.h
D fox/FMantaWidgets.h
D fox/FMantaWindow.h
D fox/FMantaQuakeNav.cc
D fox/MediaFusionApp.cc
D fox/FMantaKdExplorer.h
D fox/sc_demo.cc
D fox/MFStreamData.h
D fox/mf_stream_test.cc
D fox/SHMImageDisplay.cc
D fox/FMantaNavigator.cc
D fox/MediaFusionBridge.h
D fox/FMantaNavigator.h
D fox/FMantaImageFrame.h
D fox/FMantaTransparent.cc
D fox/FMantaStereo.h
Modified: trunk/fox/CMakeLists.txt
==============================================================================
--- trunk/fox/CMakeLists.txt (original)
+++ trunk/fox/CMakeLists.txt Fri Jan 6 13:54:27 2006
@@ -1,178 +1,25 @@
-
-# Determine the version of fox to use. Case sensitive
-SET(FOX_STATIC FOX-1.5 CACHE STRING "Fox Library version string")
-
-# Search for the actual fox library.
-FIND_LIBRARY( FOUND_FOX_LIB NAMES ${FOX_STATIC}
- PATHS ${THIRD_PARTY_LIBRARY_PATH}
/usr/local/lib /usr/lib
- DOC "Fox library path" )
-
-# Seach for the fox include directory.
-STRING(TOLOWER ${FOX_STATIC} FOX_STATIC_LOWERCASE)
-FIND_PATH ( FOUND_FOX_INCLUDE fx.h
${THIRD_PARTY_INCLUDE_PATH}/${FOX_STATIC_LOWERCASE}
- DOC "Fox Include path" )
-
-
-# If both were found, include fox interface code.
-IF(FOUND_FOX_LIB AND FOUND_FOX_INCLUDE)
-
- INCLUDE_DIRECTORIES(${FOUND_FOX_INCLUDE})
-
- # LINK_DIRECTORIES (${FOUND_FOX_LIB})
-
- # Check to see if histx should be included.
- IF(HISTX_PATH)
- INCLUDE_DIRECTORIES(${HISTX_INCLUDE})
- LINK_DIRECTORIES (${HISTX_LIB} )
- ENDIF(HISTX_PATH)
-
- # ADD_LIBRARY(FManta
- SET(FMANTA_STATIC
- FMantaImageFrame.cc
- FMantaImageFrame.h
- FMantaWidgets.cc
- FMantaWidgets.h
- FMantaWindow.cc
- FMantaWindow.h
- FMantaNavigator.h
- FMantaQuakeNav.h
- FMantaQuakeNav.cc
- FMantaUniformNav.h
- FMantaUniformNav.cc
- FMantaTrackballNav.h
- FMantaTrackballNav.cc
- FMantaRecorder.h
- FMantaRecorder.cc
- FMantaStereo.h
- FMantaStereo.cc
- # FMantaTextureChooser.h
- # FMantaTextureChooser.cc
- # FMantaMaterialChooser.h
- # FMantaMaterialChooser.cc
- FMantaTransparent.h
- FMantaTransparent.cc
- FMantaKdExplorer.h
- FMantaKdExplorer.cc
- )
-
- # Determine other libraries to link with
- SET(FOX_X11_LIBRARIES m png)
-
- # Look for tiff and jpeg
- FIND_LIBRARY( FOUND_TIFF_LIB NAMES tiff PATHS /usr/lib /usr/local/lib DOC
"Only required if Fox linked w/ tiff")
- IF(FOUND_TIFF_LIB)
- SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES} tiff)
- ENDIF(FOUND_TIFF_LIB)
-
- FIND_LIBRARY( FOUND_JPEG_LIB NAMES jpeg PATHS /usr/lib /usr/local/lib DOC
"Only required if Fox linked w/ jpeg")
- IF(FOUND_JPEG_LIB)
- SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES} jpeg)
- ENDIF(FOUND_JPEG_LIB)
-
- # Append Xcursor if it is available.
- FIND_LIBRARY( FOUND_XCURSOR NAMES Xcursor PATHS /usr/X11R6/lib DOC "Only
required if Fox linked w/ Xcursor")
- IF(FOUND_XCURSOR)
- SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES}
- Xcursor)
- ENDIF(FOUND_XCURSOR)
-
- # Append Xrandr if it is available.
- FIND_LIBRARY( FOUND_XRANDR NAMES Xrandr PATHS /usr/X11R6/lib DOC "Only
required if Fox linked w/ Xrandr")
- IF(FOUND_XRANDR)
- SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES}
- Xrandr)
- ENDIF(FOUND_XRANDR)
-
- # Specify all of the default libs
- SET(OTHER_FOX_LIBS
- Manta_Engine
- Manta_UserInterface
- Manta_Model
- Manta_Image
- Manta_Interface
- Manta_Core
- SCIRun_Core
-
- ${FOUND_FOX_LIB}
- ${CMAKE_THREAD_LIBS_INIT}
- ${OPENGL_LIBRARIES}
- ${X11_LIBRARIES}
- ${FOX_X11_LIBRARIES})
-
- # Check to see if histx libs should be added
- IF(HISTX_PATH)
- SET(OTHER_FOX_LIBS
- ${OTHER_FOX_LIBS}
- ${HISTX_LINK}
- )
- ENDIF(HISTX_PATH)
-
- # Link against pthreads.
- SET(OTHER_FOX_LIBS
- ${OTHER_FOX_LIBS}
- pthread
- )
+###############################################################################
+##
+## Fox tool kit user interface for manta. This is an example of Manta
+## embedded into a separate program.
+## Abe Stephens
+##
+
+INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}/fox
+ ${FOUND_FOX_INCLUDE}
+ )
+
+# Static library.
+SUBDIRS(FManta)
+
+# Demo examples.
+SUBDIRS(
+ dm_demo
+ sc_demo
+ )
- ##########################################################
- # Add the dm_demo program
- ADD_EXECUTABLE(dm_demo dm_demo.cc
- ${FMANTA_STATIC})
-
- TARGET_LINK_LIBRARIES(dm_demo
- ${OTHER_FOX_LIBS})
-
- ##########################################################
- # Build the SC2005 Demo code?
- IF(SGI_LINUX)
- SET(BUILD_SC2005DEMO 0 CACHE BOOL "Build SC2005 Media Fusion Interface")
- IF(BUILD_SC2005DEMO)
-
- SET(FMANTA_STATIC ${FMANTA_STATIC}
- MediaFusionBridge.h
- MediaFusionBridge.cc
- MediaFusionApp.h
- MediaFusionApp.cc
- )
-
- SET(MF_STATIC
- MFStreamData.h
- MFStreamData.cc
- ShmSemaphore.h
- ShmSemaphore.cc
- SHMImageDisplay.h
- SHMImageDisplay.cc
- )
-
- # Demo front end to run in VNC window
- ADD_EXECUTABLE(sc_demo
- sc_demo.cc
- ${FMANTA_STATIC}
- ${MF_STATIC})
-
- TARGET_LINK_LIBRARIES(sc_demo
- ${OTHER_FOX_LIBS})
-
- # Test program.
- ADD_EXECUTABLE(mf_stream_test
- mf_stream_test.cc
- MediaFusionBridge.cc
- ${MF_STATIC}
- )
-
- TARGET_LINK_LIBRARIES(mf_stream_test Manta_Engine
- Manta_UserInterface
- Manta_Model
- Manta_Image
- Manta_Interface
- Manta_Core
- SCIRun_Core
- ${CMAKE_THREAD_LIBS_INIT}
- )
-
- ENDIF(BUILD_SC2005DEMO)
- ENDIF(SGI_LINUX)
-ENDIF(FOUND_FOX_LIB AND FOUND_FOX_INCLUDE)
Added: trunk/fox/FManta/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/fox/FManta/CMakeLists.txt Fri Jan 6 13:54:27 2006
@@ -0,0 +1,122 @@
+# Determine the version of fox to use. Case sensitive
+SET(FOX_STATIC FOX-1.5 CACHE STRING "Fox Library version string")
+
+# Search for the actual fox library.
+FIND_LIBRARY( FOUND_FOX_LIB NAMES ${FOX_STATIC}
+ PATHS ${THIRD_PARTY_LIBRARY_PATH}
/usr/local/lib /usr/lib
+ DOC "Fox library path" )
+
+# Seach for the fox include directory.
+STRING(TOLOWER ${FOX_STATIC} FOX_STATIC_LOWERCASE)
+FIND_PATH ( FOUND_FOX_INCLUDE fx.h
${THIRD_PARTY_INCLUDE_PATH}/${FOX_STATIC_LOWERCASE}
+ DOC "Fox Include path" )
+
+
+# If both were found, include fox interface code.
+IF(FOUND_FOX_LIB AND FOUND_FOX_INCLUDE)
+
+ INCLUDE_DIRECTORIES(${FOUND_FOX_INCLUDE})
+
+ # LINK_DIRECTORIES (${FOUND_FOX_LIB})
+
+ # Check to see if histx should be included.
+ IF(HISTX_PATH)
+ INCLUDE_DIRECTORIES(${HISTX_INCLUDE})
+ LINK_DIRECTORIES (${HISTX_LIB} )
+ ENDIF(HISTX_PATH)
+
+ # ADD_LIBRARY(FManta
+ SET(FMANTA_STATIC_SRC
+ FMantaImageFrame.cc
+ FMantaImageFrame.h
+ FMantaKdExplorer.cc
+ FMantaKdExplorer.h
+ FMantaNavigator.h
+ FMantaQuakeNav.cc
+ FMantaQuakeNav.h
+ FMantaRecorder.cc
+ FMantaRecorder.h
+ FMantaStereo.cc
+ FMantaStereo.h
+ FMantaTrackballNav.cc
+ FMantaTrackballNav.h
+ FMantaTransparent.cc
+ FMantaTransparent.h
+ FMantaUniformNav.cc
+ FMantaUniformNav.h
+ FMantaWidgets.cc
+ FMantaWidgets.h
+ FMantaWindow.cc
+ FMantaWindow.h
+ )
+
+ # Determine other libraries to link with
+ SET(FOX_X11_LIBRARIES m png)
+
+ # Look for tiff and jpeg
+ FIND_LIBRARY( FOUND_TIFF_LIB NAMES tiff PATHS /usr/lib /usr/local/lib DOC
"Only required if Fox linked w/ tiff")
+ IF(FOUND_TIFF_LIB)
+ SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES} tiff)
+ ENDIF(FOUND_TIFF_LIB)
+
+ FIND_LIBRARY( FOUND_JPEG_LIB NAMES jpeg PATHS /usr/lib /usr/local/lib DOC
"Only required if Fox linked w/ jpeg")
+ IF(FOUND_JPEG_LIB)
+ SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES} jpeg)
+ ENDIF(FOUND_JPEG_LIB)
+
+ # Append Xcursor if it is available.
+ FIND_LIBRARY( FOUND_XCURSOR NAMES Xcursor PATHS /usr/X11R6/lib DOC "Only
required if Fox linked w/ Xcursor")
+ IF(FOUND_XCURSOR)
+ SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES}
+ Xcursor)
+ ENDIF(FOUND_XCURSOR)
+
+ # Append Xrandr if it is available.
+ FIND_LIBRARY( FOUND_XRANDR NAMES Xrandr PATHS /usr/X11R6/lib DOC "Only
required if Fox linked w/ Xrandr")
+ IF(FOUND_XRANDR)
+ SET(FOX_X11_LIBRARIES ${FOX_X11_LIBRARIES}
+ Xrandr)
+ ENDIF(FOUND_XRANDR)
+
+ # Specify all of the default libs
+ SET(FMANTA_STATIC_LIBS
+ Manta_Engine
+ Manta_UserInterface
+ Manta_Model
+ Manta_Image
+ Manta_Interface
+ Manta_Core
+ SCIRun_Core
+
+ ${FOUND_FOX_LIB}
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${OPENGL_LIBRARIES}
+ ${X11_LIBRARIES}
+ ${FOX_X11_LIBRARIES})
+
+ # Check to see if histx libs should be added
+ IF(HISTX_PATH)
+ SET(FMANTA_STATIC_LIBS
+ ${FMANTA_STATIC_LIBS}
+ ${HISTX_LINK}
+ )
+ ENDIF(HISTX_PATH)
+
+ # Link against pthreads.
+ SET(FMANTA_STATIC_LIBS
+ ${FMANTA_STATIC_LIBS}
+ pthread
+ )
+
+
#############################################################################
+ # Create the static library.
+ ADD_LIBRARY(FManta_static STATIC
+ ${FMANTA_STATIC_SRC}
+ )
+
+ TARGET_LINK_LIBRARIES( FManta_static
+ ${FMANTA_STATIC_LIBS}
+ )
+
+ENDIF(FOUND_FOX_LIB AND FOUND_FOX_INCLUDE)
+
Copied: trunk/fox/FManta/FMantaImageFrame.cc (from r829,
trunk/fox/FMantaImageFrame.cc)
==============================================================================
--- trunk/fox/FMantaImageFrame.cc (original)
+++ trunk/fox/FManta/FMantaImageFrame.cc Fri Jan 6 13:54:27 2006
@@ -1,6 +1,7 @@
-#include <fox/FMantaImageFrame.h>
-#include <fox/MediaFusionApp.h>
+#include <FManta/FMantaImageFrame.h>
+
+// #include <sc_demo/MediaFusionApp.h>
#include <fxkeys.h>
@@ -26,6 +27,7 @@
FXMAPFUNC(SEL_MOTION, FMantaImageFrame::ID_IMAGE,
FMantaImageFrame::onMouseChange ),
FXMAPFUNC(SEL_KEYPRESS, FMantaImageFrame::ID_IMAGE,
FMantaImageFrame::onKeyPress ),
+#if 0
// Messages from Media Fusion
FXMAPFUNC(SEL_LEFTBUTTONRELEASE,
MediaFusionApp::ID_MEDIA_FUSION_APP, FMantaImageFrame::onMouseChange ),
FXMAPFUNC(SEL_LEFTBUTTONPRESS,
MediaFusionApp::ID_MEDIA_FUSION_APP, FMantaImageFrame::onMouseChange ),
@@ -37,6 +39,7 @@
FXMAPFUNC(SEL_MOUSEWHEEL,
MediaFusionApp::ID_MEDIA_FUSION_APP, FMantaImageFrame::onMouseWheel ),
FXMAPFUNC(SEL_MOTION,
MediaFusionApp::ID_MEDIA_FUSION_APP, FMantaImageFrame::onMouseChange ),
FXMAPFUNC(SEL_KEYPRESS, MediaFusionApp::ID_MEDIA_FUSION_APP,
FMantaImageFrame::onKeyPress ),
+#endif
};
FXIMPLEMENT(FMantaImageFrame,FXGLCanvas,FMantaImageFrameMap,ARRAYNUMBER(FMantaImageFrameMap));
Copied: trunk/fox/FManta/FMantaImageFrame.h (from r829,
trunk/fox/FMantaImageFrame.h)
==============================================================================
--- trunk/fox/FMantaImageFrame.h (original)
+++ trunk/fox/FManta/FMantaImageFrame.h Fri Jan 6 13:54:27 2006
@@ -7,7 +7,7 @@
#include <Interface/MantaInterface.h>
#include <Engine/Control/RTRT.h>
-#include <fox/FMantaQuakeNav.h>
+#include <FManta/FMantaQuakeNav.h>
namespace fox_manta {
Copied: trunk/fox/FManta/FMantaKdExplorer.cc (from r829,
trunk/fox/FMantaKdExplorer.cc)
==============================================================================
--- trunk/fox/FMantaKdExplorer.cc (original)
+++ trunk/fox/FManta/FMantaKdExplorer.cc Fri Jan 6 13:54:27 2006
@@ -1,6 +1,6 @@
-#include <fox/FMantaKdExplorer.h>
+#include <FManta/FMantaKdExplorer.h>
using namespace fox_manta;
Copied: trunk/fox/FManta/FMantaKdExplorer.h (from r829,
trunk/fox/FMantaKdExplorer.h)
==============================================================================
--- trunk/fox/FMantaKdExplorer.h (original)
+++ trunk/fox/FManta/FMantaKdExplorer.h Fri Jan 6 13:54:27 2006
@@ -2,7 +2,7 @@
#ifndef FMANTA_KDEXPLORERDIALOG__H
#define FMANTA_KDEXPLORERDIALOG__H
-#include <fox/FMantaWindow.h>
+#include <FManta/FMantaWindow.h>
using namespace FX;
using namespace fox_manta;
Copied: trunk/fox/FManta/FMantaQuakeNav.cc (from r829,
trunk/fox/FMantaQuakeNav.cc)
==============================================================================
--- trunk/fox/FMantaQuakeNav.cc (original)
+++ trunk/fox/FManta/FMantaQuakeNav.cc Fri Jan 6 13:54:27 2006
@@ -1,5 +1,5 @@
-#include <fox/FMantaQuakeNav.h>
+#include <FManta/FMantaQuakeNav.h>
#include <fxkeys.h>
#include <MantaTypes.h>
#include <Interface/Camera.h>
Copied: trunk/fox/FManta/FMantaQuakeNav.h (from r829,
trunk/fox/FMantaQuakeNav.h)
==============================================================================
--- trunk/fox/FMantaQuakeNav.h (original)
+++ trunk/fox/FManta/FMantaQuakeNav.h Fri Jan 6 13:54:27 2006
@@ -8,7 +8,7 @@
#include <Interface/Camera.h>
#include <Interface/MantaInterface.h>
-#include <fox/FMantaNavigator.h>
+#include <FManta/FMantaNavigator.h>
namespace fox_manta {
Copied: trunk/fox/FManta/FMantaRecorder.cc (from r829,
trunk/fox/FMantaRecorder.cc)
==============================================================================
--- trunk/fox/FMantaRecorder.cc (original)
+++ trunk/fox/FManta/FMantaRecorder.cc Fri Jan 6 13:54:27 2006
@@ -26,7 +26,7 @@
DEALINGS IN THE SOFTWARE.
*/
-#include <fox/FMantaRecorder.h>
+#include <FManta/FMantaRecorder.h>
#include <SCIRun/Core/Thread/Time.h>
Copied: trunk/fox/FManta/FMantaRecorder.h (from r829,
trunk/fox/FMantaRecorder.h)
==============================================================================
--- trunk/fox/FMantaRecorder.h (original)
+++ trunk/fox/FManta/FMantaRecorder.h Fri Jan 6 13:54:27 2006
@@ -29,11 +29,11 @@
#ifndef __FMANTARECORDER_H__
#define __FMANTARECORDER_H__
-#include <fox/FMantaWindow.h>
-#include <fox/FMantaUniformNav.h>
-#include <fox/FMantaQuakeNav.h>
-#include <fox/FMantaTrackballNav.h>
-#include <fox/FMantaWidgets.h>
+#include <FManta/FMantaWindow.h>
+#include <FManta/FMantaUniformNav.h>
+#include <FManta/FMantaQuakeNav.h>
+#include <FManta/FMantaTrackballNav.h>
+#include <FManta/FMantaWidgets.h>
// There appear to be some #define conflicts between the FX headers and the
ones below.
#include <Interface/MantaInterface.h>
Copied: trunk/fox/FManta/FMantaStereo.cc (from r829,
trunk/fox/FMantaStereo.cc)
==============================================================================
--- trunk/fox/FMantaStereo.cc (original)
+++ trunk/fox/FManta/FMantaStereo.cc Fri Jan 6 13:54:27 2006
@@ -31,7 +31,7 @@
#include <Model/Cameras/PinholeCamera.h>
-#include <fox/FMantaStereo.h>
+#include <FManta/FMantaStereo.h>
using namespace FX;
Copied: trunk/fox/FManta/FMantaStereo.h (from r829, trunk/fox/FMantaStereo.h)
==============================================================================
--- trunk/fox/FMantaStereo.h (original)
+++ trunk/fox/FManta/FMantaStereo.h Fri Jan 6 13:54:27 2006
@@ -30,11 +30,11 @@
#define __FMANTASTEREO_H__
-#include <fox/FMantaWindow.h>
-#include <fox/FMantaUniformNav.h>
-#include <fox/FMantaQuakeNav.h>
-#include <fox/FMantaTrackballNav.h>
-#include <fox/FMantaWidgets.h>
+#include <FManta/FMantaWindow.h>
+#include <FManta/FMantaUniformNav.h>
+#include <FManta/FMantaQuakeNav.h>
+#include <FManta/FMantaTrackballNav.h>
+#include <FManta/FMantaWidgets.h>
#include <Interface/MantaInterface.h>
Copied: trunk/fox/FManta/FMantaTrackballNav.cc (from r829,
trunk/fox/FMantaTrackballNav.cc)
==============================================================================
--- trunk/fox/FMantaTrackballNav.cc (original)
+++ trunk/fox/FManta/FMantaTrackballNav.cc Fri Jan 6 13:54:27 2006
@@ -1,4 +1,4 @@
-#include <fox/FMantaTrackballNav.h>
+#include <FManta/FMantaTrackballNav.h>
#include <fxkeys.h>
Copied: trunk/fox/FManta/FMantaTrackballNav.h (from r829,
trunk/fox/FMantaTrackballNav.h)
==============================================================================
--- trunk/fox/FMantaTrackballNav.h (original)
+++ trunk/fox/FManta/FMantaTrackballNav.h Fri Jan 6 13:54:27 2006
@@ -7,8 +7,8 @@
#include <Core/Math/MiscMath.h>
#include <Core/Math/Trig.h>
-#include <fox/FMantaNavigator.h>
-#include <fox/FMantaImageFrame.h>
+#include <FManta/FMantaNavigator.h>
+#include <FManta/FMantaImageFrame.h>
namespace fox_manta {
Copied: trunk/fox/FManta/FMantaTransparent.cc (from r829,
trunk/fox/FMantaTransparent.cc)
==============================================================================
--- trunk/fox/FMantaTransparent.cc (original)
+++ trunk/fox/FManta/FMantaTransparent.cc Fri Jan 6 13:54:27 2006
@@ -1,6 +1,6 @@
-#include <fox/FMantaTransparent.h>
+#include <FManta/FMantaTransparent.h>
using namespace fox_manta;
Copied: trunk/fox/FManta/FMantaTransparent.h (from r829,
trunk/fox/FMantaTransparent.h)
==============================================================================
--- trunk/fox/FMantaTransparent.h (original)
+++ trunk/fox/FManta/FMantaTransparent.h Fri Jan 6 13:54:27 2006
@@ -2,7 +2,7 @@
#ifndef FMANTA_TRANSPARENT__H
#define FMANTA_TRANSPARENT__H
-#include <fox/FMantaWindow.h>
+#include <FManta/FMantaWindow.h>
using namespace FX;
using namespace fox_manta;
Copied: trunk/fox/FManta/FMantaUniformNav.cc (from r829,
trunk/fox/FMantaUniformNav.cc)
==============================================================================
--- trunk/fox/FMantaUniformNav.cc (original)
+++ trunk/fox/FManta/FMantaUniformNav.cc Fri Jan 6 13:54:27 2006
@@ -1,4 +1,4 @@
-#include <fox/FMantaUniformNav.h>
+#include <FManta/FMantaUniformNav.h>
#include <fxkeys.h>
Copied: trunk/fox/FManta/FMantaUniformNav.h (from r829,
trunk/fox/FMantaUniformNav.h)
==============================================================================
--- trunk/fox/FMantaUniformNav.h (original)
+++ trunk/fox/FManta/FMantaUniformNav.h Fri Jan 6 13:54:27 2006
@@ -7,7 +7,7 @@
#include <Core/Math/MiscMath.h>
#include <Core/Math/Trig.h>
-#include <fox/FMantaNavigator.h>
+#include <FManta/FMantaNavigator.h>
namespace fox_manta {
Copied: trunk/fox/FManta/FMantaWidgets.cc (from r829,
trunk/fox/FMantaWidgets.cc)
==============================================================================
--- trunk/fox/FMantaWidgets.cc (original)
+++ trunk/fox/FManta/FMantaWidgets.cc Fri Jan 6 13:54:27 2006
@@ -1,5 +1,5 @@
-#include <fox/FMantaWidgets.h>
+#include <FManta/FMantaWidgets.h>
#include <Core/Color/Color.h>
Copied: trunk/fox/FManta/FMantaWindow.cc (from r829,
trunk/fox/FMantaWindow.cc)
==============================================================================
--- trunk/fox/FMantaWindow.cc (original)
+++ trunk/fox/FManta/FMantaWindow.cc Fri Jan 6 13:54:27 2006
@@ -1,7 +1,7 @@
-#include <fox/FMantaWindow.h>
-#include <fox/FMantaImageFrame.h>
+#include <FManta/FMantaWindow.h>
+#include <FManta/FMantaImageFrame.h>
#include <SCIRun/Core/Thread/Thread.h>
#include <Core/Exceptions/IllegalArgument.h>
Copied: trunk/fox/FManta/FMantaWindow.h (from r829, trunk/fox/FMantaWindow.h)
==============================================================================
--- trunk/fox/FMantaWindow.h (original)
+++ trunk/fox/FManta/FMantaWindow.h Fri Jan 6 13:54:27 2006
@@ -7,8 +7,8 @@
#include <Interface/MantaInterface.h>
#include <Engine/Display/GLXImageDisplay.h>
-#include <fox/FMantaImageFrame.h>
-#include <fox/FMantaRecorder.h>
+#include <FManta/FMantaImageFrame.h>
+#include <FManta/FMantaRecorder.h>
#include <UserInterface/CameraPathAutomator.h>
Added: trunk/fox/dm_demo/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/fox/dm_demo/CMakeLists.txt Fri Jan 6 13:54:27 2006
@@ -0,0 +1,8 @@
+
+
+
+ ##########################################################
+ # Add the dm_demo program
+ ADD_EXECUTABLE (dm_demo dm_demo.cc)
+ TARGET_LINK_LIBRARIES(dm_demo FManta_static)
+
Copied: trunk/fox/dm_demo/dm_demo.cc (from r829, trunk/fox/dm_demo.cc)
==============================================================================
--- trunk/fox/dm_demo.cc (original)
+++ trunk/fox/dm_demo/dm_demo.cc Fri Jan 6 13:54:27 2006
@@ -39,15 +39,15 @@
#include <Engine/Display/GLXImageDisplay.h>
#include <Model/Cameras/PinholeCamera.h>
-#include <fox/FMantaWindow.h>
-#include <fox/FMantaUniformNav.h>
-#include <fox/FMantaQuakeNav.h>
-#include <fox/FMantaTrackballNav.h>
-#include <fox/FMantaWidgets.h>
+#include <FManta/FMantaWindow.h>
+#include <FManta/FMantaUniformNav.h>
+#include <FManta/FMantaQuakeNav.h>
+#include <FManta/FMantaTrackballNav.h>
+#include <FManta/FMantaWidgets.h>
-#include <fox/FMantaStereo.h>
-#include <fox/FMantaTransparent.h>
-#include <fox/FMantaKdExplorer.h>
+#include <FManta/FMantaStereo.h>
+#include <FManta/FMantaTransparent.h>
+#include <FManta/FMantaKdExplorer.h>
// #include <histx/SingleSamplerCounter.h>
Added: trunk/fox/sc_demo/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/fox/sc_demo/CMakeLists.txt Fri Jan 6 13:54:27 2006
@@ -0,0 +1,55 @@
+
+
+##########################################################
+# Build the SC2005 Demo code?
+IF(SGI_LINUX)
+ SET(BUILD_SC2005DEMO 0 CACHE BOOL "Build SC2005 Media Fusion Interface")
+ IF(BUILD_SC2005DEMO)
+
+ SET(MF_STATIC_TEST
+ MFStreamData.cc
+ MFStreamData.h
+ SHMImageDisplay.cc
+ SHMImageDisplay.h
+ ShmSemaphore.cc
+ ShmSemaphore.h
+ )
+
+ SET(MF_STATIC
+ ${MF_STATIC_TEST}
+ MediaFusionApp.cc
+ MediaFusionApp.h
+ MediaFusionBridge.cc
+ MediaFusionBridge.h
+ )
+
+ #########################################################################
+ # Demo front end to run in VNC window
+ ADD_EXECUTABLE(sc_demo
+ sc_demo.cc
+ ${MF_STATIC})
+
+ TARGET_LINK_LIBRARIES(sc_demo
+ FManta_static
+ )
+
+ #########################################################################
+ # Test program.
+ ADD_EXECUTABLE(mf_stream_test
+ mf_stream_test.cc
+ MediaFusionBridge.cc
+ ${MF_STATIC_TEST}
+ )
+
+ TARGET_LINK_LIBRARIES(mf_stream_test Manta_Engine
+ Manta_UserInterface
+ Manta_Model
+ Manta_Image
+ Manta_Interface
+ Manta_Core
+ SCIRun_Core
+ ${CMAKE_THREAD_LIBS_INIT}
+ )
+
+ ENDIF(BUILD_SC2005DEMO)
+ENDIF(SGI_LINUX)
Copied: trunk/fox/sc_demo/MFStreamData.cc (from r829,
trunk/fox/MFStreamData.cc)
==============================================================================
--- trunk/fox/MFStreamData.cc (original)
+++ trunk/fox/sc_demo/MFStreamData.cc Fri Jan 6 13:54:27 2006
@@ -28,7 +28,7 @@
DEALINGS IN THE SOFTWARE.
*/
-#include <fox/MFStreamData.h>
+#include <sc_demo/MFStreamData.h>
#include <SCIRun/Core/Exceptions/ErrnoException.h>
#include <SCIRun/Core/Thread/Time.h>
Copied: trunk/fox/sc_demo/MFStreamData.h (from r829, trunk/fox/MFStreamData.h)
==============================================================================
--- trunk/fox/MFStreamData.h (original)
+++ trunk/fox/sc_demo/MFStreamData.h Fri Jan 6 13:54:27 2006
@@ -37,7 +37,8 @@
#define STRM_SHM_CREATE 0x1
#define STRM_SHM_ATTACH 0x0
-#include <fox/ShmSemaphore.h>
+#include <sc_demo/ShmSemaphore.h>
+
#include <Interface/Image.h>
namespace Manta {
Copied: trunk/fox/sc_demo/MediaFusionApp.cc (from r829,
trunk/fox/MediaFusionApp.cc)
==============================================================================
--- trunk/fox/MediaFusionApp.cc (original)
+++ trunk/fox/sc_demo/MediaFusionApp.cc Fri Jan 6 13:54:27 2006
@@ -1,6 +1,6 @@
-#include <fox/MediaFusionApp.h>
+#include <sc_demo/MediaFusionApp.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
Copied: trunk/fox/sc_demo/MediaFusionBridge.cc (from r829,
trunk/fox/MediaFusionBridge.cc)
==============================================================================
--- trunk/fox/MediaFusionBridge.cc (original)
+++ trunk/fox/sc_demo/MediaFusionBridge.cc Fri Jan 6 13:54:27 2006
@@ -26,7 +26,7 @@
DEALINGS IN THE SOFTWARE.
*/
-#include <fox/MediaFusionBridge.h>
+#include <sc_demo/MediaFusionBridge.h>
#include <SCIRun/Core/Thread/Time.h>
#include <SCIRun/Core/Exceptions/Exception.h>
Copied: trunk/fox/sc_demo/MediaFusionBridge.h (from r829,
trunk/fox/MediaFusionBridge.h)
==============================================================================
--- trunk/fox/MediaFusionBridge.h (original)
+++ trunk/fox/sc_demo/MediaFusionBridge.h Fri Jan 6 13:54:27 2006
@@ -27,7 +27,7 @@
*/
#include <X11/Xlib.h>
-#include <fox/MFStreamData.h>
+#include <sc_demo/MFStreamData.h>
#include <SCIRun/Core/Thread/Thread.h>
#include <SCIRun/Core/Thread/Runnable.h>
Copied: trunk/fox/sc_demo/SHMImageDisplay.cc (from r829,
trunk/fox/SHMImageDisplay.cc)
==============================================================================
--- trunk/fox/SHMImageDisplay.cc (original)
+++ trunk/fox/sc_demo/SHMImageDisplay.cc Fri Jan 6 13:54:27 2006
@@ -29,7 +29,7 @@
-#include <fox/SHMImageDisplay.h>
+#include <sc_demo/SHMImageDisplay.h>
#include <Image/SimpleImage.h>
#include <Image/Pixel.h>
Copied: trunk/fox/sc_demo/SHMImageDisplay.h (from r829,
trunk/fox/SHMImageDisplay.h)
==============================================================================
--- trunk/fox/SHMImageDisplay.h (original)
+++ trunk/fox/sc_demo/SHMImageDisplay.h Fri Jan 6 13:54:27 2006
@@ -35,7 +35,7 @@
#define Manta_Engine_SHMImageDisplay_h
#include <Interface/ImageDisplay.h>
-#include <fox/MFStreamData.h>
+#include <sc_demo/MFStreamData.h>
#include <vector>
#include <string>
Copied: trunk/fox/sc_demo/ShmSemaphore.cc (from r829,
trunk/fox/ShmSemaphore.cc)
==============================================================================
--- trunk/fox/ShmSemaphore.cc (original)
+++ trunk/fox/sc_demo/ShmSemaphore.cc Fri Jan 6 13:54:27 2006
@@ -29,7 +29,7 @@
#ifdef __ia64__
-#include <fox/ShmSemaphore.h>
+#include <sc_demo/ShmSemaphore.h>
#include <SCIRun/Core/Exceptions/ErrnoException.h>
Copied: trunk/fox/sc_demo/mf_stream_test.cc (from r829,
trunk/fox/mf_stream_test.cc)
==============================================================================
--- trunk/fox/mf_stream_test.cc (original)
+++ trunk/fox/sc_demo/mf_stream_test.cc Fri Jan 6 13:54:27 2006
@@ -11,8 +11,8 @@
#include <string>
#include <iostream>
-#include <fox/MFStreamData.h>
-#include <fox/MediaFusionBridge.h>
+#include <sc_demo/MFStreamData.h>
+#include <sc_demo/MediaFusionBridge.h>
#include <SCIRun/Core/Exceptions/Exception.h>
#include <SCIRun/Core/Exceptions/InternalError.h>
#include <SCIRun/Core/Exceptions/ErrnoException.h>
Copied: trunk/fox/sc_demo/sc_demo.cc (from r829, trunk/fox/sc_demo.cc)
==============================================================================
--- trunk/fox/sc_demo.cc (original)
+++ trunk/fox/sc_demo/sc_demo.cc Fri Jan 6 13:54:27 2006
@@ -38,18 +38,18 @@
#include <X11/Xlib.h>
#include <Engine/Display/GLXImageDisplay.h>
-#include <fox/SHMImageDisplay.h>
+#include <sc_demo/SHMImageDisplay.h>
#include <Model/Cameras/PinholeCamera.h>
#include <Model/Materials/Flat.h>
-#include <fox/FMantaWindow.h>
-#include <fox/FMantaUniformNav.h>
-#include <fox/FMantaQuakeNav.h>
-#include <fox/FMantaTrackballNav.h>
-#include <fox/FMantaWidgets.h>
-#include <fox/FMantaStereo.h>
+#include <FManta/FMantaWindow.h>
+#include <FManta/FMantaUniformNav.h>
+#include <FManta/FMantaQuakeNav.h>
+#include <FManta/FMantaTrackballNav.h>
+#include <FManta/FMantaWidgets.h>
+#include <FManta/FMantaStereo.h>
-#include <fox/MediaFusionBridge.h>
+#include <sc_demo/MediaFusionBridge.h>
// #include <histx/SingleSamplerCounter.h>
@@ -65,9 +65,9 @@
#include <Model/Groups/KDTree.h>
#include <Model/Groups/TransparentKDTree.h>
-#include <fox/FMantaTransparent.h>
+#include <FManta/FMantaTransparent.h>
-#include <fox/MediaFusionApp.h>
+#include <sc_demo/MediaFusionApp.h>
using namespace Manta::Kdtree;
- [MANTA] r831 - in trunk/fox: . FManta dm_demo sc_demo, abe, 01/06/2006
Archive powered by MHonArc 2.6.16.
