Text archives Help

---

Author: bigler
Date: Mon May  1 15:13:29 2006
New Revision: 1031

Added:
   trunk/Engine/Factory/
   trunk/Engine/Factory/CMakeLists.txt
   trunk/Engine/Factory/RegisterKnownComponents.cc
      - copied unchanged from r1020, trunk/Engine/Control/RTRT_register.cc
   trunk/Engine/Factory/RegisterKnownComponents.h
      - copied, changed from r1020, trunk/Engine/Control/RTRT_register.h
Removed:
   trunk/Engine/Control/RTRT_register.cc
   trunk/Engine/Control/RTRT_register.h
Modified:
   trunk/CMakeLists.txt
   trunk/Engine/CMakeLists.txt
   trunk/Engine/Control/CMakeLists.txt
   trunk/Engine/Control/RTRT.cc
   trunk/StandAlone/CMakeLists.txt
   trunk/SwigInterface/CMakeLists.txt
   trunk/fox/FManta/CMakeLists.txt
   trunk/fox/disco_demo/Engine/ImageTraversers/DiscoImageTraverser.cc
Log:

Pull out the registerKnownComponents into its own library to resolve
circular dependencies between UserInterface and Engine.

CMakeLists.txt

  Added Manta_Factory to MANTA_TARGET_LINK_LIBRARIES list.

Engine/CMakeLists.txt

  Removed Manta_UserInterface from Manta_Engine library dependency.

  Go into sub directory Factory.

Engine/Control/CMakeLists.txt
Engine/Control/RTRT_register.cc
Engine/Control/RTRT_register.h

  Removed RTRT_register.{h,cc}

Engine/Control/RTRT.cc

  Point to new location of registerKnownComponents().
  
Engine/Factory
Engine/Factory/CMakeLists.txt
Engine/Factory/RegisterKnownComponents.cc
Engine/Factory/RegisterKnownComponents.h

  Make a new library for registerKnownComponents().
  
StandAlone/CMakeLists.txt

  Use MANTA_TARGET_LINK_LIBRARIES instead of listing them explicitly.

SwigInterface/CMakeLists.txt
fox/FManta/CMakeLists.txt

  Added Manta_Factory to the library dependencies.

fox/disco_demo/Engine/ImageTraversers/DiscoImageTraverser.cc

  Updated to match new Fragment API (which_eye -> whichEye).


Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt        (original)
+++ trunk/CMakeLists.txt        Mon May  1 15:13:29 2006
@@ -218,6 +218,7 @@
 
 SET(MANTA_TARGET_LINK_LIBRARIES
   Manta_Engine
+  Manta_Factory
   Manta_UserInterface
   Manta_Model
   Manta_Image

Modified: trunk/Engine/CMakeLists.txt
==============================================================================
--- trunk/Engine/CMakeLists.txt (original)
+++ trunk/Engine/CMakeLists.txt Mon May  1 15:13:29 2006
@@ -22,12 +22,16 @@
              )
 
 
-TARGET_LINK_LIBRARIES(Manta_Engine Manta_UserInterface 
-                                   Manta_Model 
-                                   Manta_Image 
-                                   Manta_Interface 
-                                   Manta_Core 
-                                   SCIRun_Core)
+TARGET_LINK_LIBRARIES(Manta_Engine Manta_Model
+                                   Manta_Image
+                                   Manta_Interface
+                                   Manta_Core
+                                   SCIRun_Core
+                                   )
 
 TARGET_LINK_LIBRARIES(Manta_Engine ${OPENGL_LIBRARIES}
-                                   ${X11_LIBRARIES})
+                                   ${X11_LIBRARIES}
+                                   )
+
+# Build the factory library
+SUBDIRS(Factory)
\ No newline at end of file

Modified: trunk/Engine/Control/CMakeLists.txt
==============================================================================
--- trunk/Engine/Control/CMakeLists.txt (original)
+++ trunk/Engine/Control/CMakeLists.txt Mon May  1 15:13:29 2006
@@ -2,6 +2,4 @@
 SET (Manta_Control_SRCS
      Control/RTRT.h
      Control/RTRT.cc
-     Control/RTRT_register.cc
-     Control/RTRT_register.h
      )

Modified: trunk/Engine/Control/RTRT.cc
==============================================================================
--- trunk/Engine/Control/RTRT.cc        (original)
+++ trunk/Engine/Control/RTRT.cc        Mon May  1 15:13:29 2006
@@ -1,6 +1,6 @@
 
 #include <Engine/Control/RTRT.h>
-#include <Engine/Control/RTRT_register.h>
+#include <Engine/Factory/RegisterKnownComponents.h>
 #include <Core/Util/Args.h>
 #include <Interface/AmbientLight.h>
 #include <Interface/Background.h>

Added: trunk/Engine/Factory/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/Engine/Factory/CMakeLists.txt Mon May  1 15:13:29 2006
@@ -0,0 +1,17 @@
+SET (Manta_Factory_SRCS
+  RegisterKnownComponents.cc
+  RegisterKnownComponents.h
+  )
+
+ADD_LIBRARY (Manta_Factory
+  ${Manta_Factory_SRCS}
+  )
+
+TARGET_LINK_LIBRARIES(Manta_Factory
+  Manta_Engine
+  Manta_UserInterface
+  Manta_Model
+  Manta_Image
+  Manta_Interface
+  Manta_Core
+  SCIRun_Core)

Copied: trunk/Engine/Factory/RegisterKnownComponents.h (from r1020, 
trunk/Engine/Control/RTRT_register.h)
==============================================================================
--- trunk/Engine/Control/RTRT_register.h        (original)
+++ trunk/Engine/Factory/RegisterKnownComponents.h      Mon May  1 15:13:29 
2006
@@ -27,8 +27,8 @@
  DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef Manta_Engine_RTRT_register_h
-#define Manta_Engine_RTRT_register_h
+#ifndef Manta_Engine_Factory_RegisteryKnownComponents_h
+#define Manta_Engine_Factory_RegisteryKnownComponents_h
 
 namespace Manta {
 
@@ -38,7 +38,7 @@
        // Register all "known" components with the RTRTInterface.
        // ImageTraversers, PixelSamplers, other command line args should be 
added to
        // the RTRT_register.cc file.
-       void registerKnownComponents(MantaInterface* rtrt);
+       extern void registerKnownComponents(MantaInterface* rtrt);
 };
 
 #endif

Modified: trunk/StandAlone/CMakeLists.txt
==============================================================================
--- trunk/StandAlone/CMakeLists.txt     (original)
+++ trunk/StandAlone/CMakeLists.txt     Mon May  1 15:13:29 2006
@@ -1,13 +1,6 @@
 
 ADD_EXECUTABLE(manta manta.cc)
-TARGET_LINK_LIBRARIES(manta Manta_Engine
-                            Manta_UserInterface
-                            Manta_Model
-                            Manta_Image
-                            Manta_Interface
-                            Manta_Core
-                            Manta_Core_XUtils
-                            SCIRun_Core)
+TARGET_LINK_LIBRARIES(manta ${MANTA_TARGET_LINK_LIBRARIES})
 
  TARGET_LINK_LIBRARIES(manta ${CMAKE_THREAD_LIBS_INIT}
                              ${OPENGL_LIBRARIES}
@@ -20,13 +13,7 @@
                                   ${CMAKE_THREAD_LIBS_INIT})
 
 #ADD_EXECUTABLE(frust-test frust-test.cc)
-#TARGET_LINK_LIBRARIES(frust-test Manta_Engine
-#                                 Manta_UserInterface
-#                                 Manta_Model
-#                                 Manta_Image
-#                                 Manta_Interface
-#                                 Manta_Core
-#                                 SCIRun_Core
+#TARGET_LINK_LIBRARIES(frust-test ${MANTA_TARGET_LINK_LIBRARIES}
 #                                 ${CMAKE_THREAD_LIBS_INIT}
 #                                 )
 

Modified: trunk/SwigInterface/CMakeLists.txt
==============================================================================
--- trunk/SwigInterface/CMakeLists.txt  (original)
+++ trunk/SwigInterface/CMakeLists.txt  Mon May  1 15:13:29 2006
@@ -25,6 +25,7 @@
 SWIG_LINK_LIBRARIES(manta
   ${PYTHON_LIBRARIES}
   Manta_Engine
+  Manta_Factory
   Manta_UserInterface
   Manta_Model
   Manta_Image

Modified: trunk/fox/FManta/CMakeLists.txt
==============================================================================
--- trunk/fox/FManta/CMakeLists.txt     (original)
+++ trunk/fox/FManta/CMakeLists.txt     Mon May  1 15:13:29 2006
@@ -85,7 +85,8 @@
 
   # Specify all of the default libs
   SET(FMANTA_STATIC_LIBS
-    Manta_Engine 
+    Manta_Engine
+    Manta_Factory
     Manta_UserInterface 
     Manta_Model 
     Manta_Image 

Modified: trunk/fox/disco_demo/Engine/ImageTraversers/DiscoImageTraverser.cc
==============================================================================
--- trunk/fox/disco_demo/Engine/ImageTraversers/DiscoImageTraverser.cc  
(original)
+++ trunk/fox/disco_demo/Engine/ImageTraversers/DiscoImageTraverser.cc  Mon 
May  1 15:13:29 2006
@@ -278,7 +278,7 @@
             TilePacketElement &t = tile_packet.getElement( j );
 
             // Pixel coordinates.
-            fragment.which_eye[fragment_size] = 0;
+            fragment.whichEye[fragment_size] = 0;
             fragment.pixel[0][fragment_size] = t.tilex + xstart;
             fragment.pixel[1][fragment_size] = t.tiley + ystart;
 

---

• [MANTA] r1031 - in trunk: . Engine Engine/Control Engine/Factory StandAlone SwigInterface fox/FManta fox/disco_demo/Engine/ImageTraversers, bigler, 05/01/2006

---

Archive powered by MHonArc 2.6.16.