Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[MANTA] r386 - in branches/itanium2: . Core Engine/Control Engine/Display Engine/IdleModes Engine/ImageTraversers Engine/LoadBalancers Engine/PixelSamplers Engine/Renderers Image Interface SCIRun/Core glfw


Chronological Thread 
  • From: abe@sci.utah.edu
  • To: manta@sci.utah.edu
  • Subject: [MANTA] r386 - in branches/itanium2: . Core Engine/Control Engine/Display Engine/IdleModes Engine/ImageTraversers Engine/LoadBalancers Engine/PixelSamplers Engine/Renderers Image Interface SCIRun/Core glfw
  • Date: Wed, 15 Jun 2005 20:17:12 -0600 (MDT)

Author: abe
Date: Wed Jun 15 20:17:06 2005
New Revision: 386

Added:
   branches/itanium2/manta-commands.txt
Modified:
   branches/itanium2/CMakeLists.txt
   branches/itanium2/Core/CMakeLists.txt
   branches/itanium2/Engine/Control/CMakeLists.txt
   branches/itanium2/Engine/Display/CMakeLists.txt
   branches/itanium2/Engine/IdleModes/CMakeLists.txt
   branches/itanium2/Engine/ImageTraversers/CMakeLists.txt
   branches/itanium2/Engine/LoadBalancers/CMakeLists.txt
   branches/itanium2/Engine/PixelSamplers/CMakeLists.txt
   branches/itanium2/Engine/Renderers/CMakeLists.txt
   branches/itanium2/Image/CMakeLists.txt
   branches/itanium2/Image/SimpleImage_templates.cc
   branches/itanium2/Interface/CMakeLists.txt
   branches/itanium2/SCIRun/Core/CMakeLists.txt
   branches/itanium2/glfw/CMakeLists.txt
Log:

Added header files to many CMakeLists.txt files. 

CMake will add these headers to the build files in XCode. This doesn't effect 
the makefile builds. 


M    Image/CMakeLists.txt
M    Image/SimpleImage_templates.cc
M    Core/CMakeLists.txt
M    glfw/CMakeLists.txt
M    Interface/CMakeLists.txt
M    SCIRun/Core/CMakeLists.txt
M    Engine/Control/CMakeLists.txt
M    Engine/ImageTraversers/CMakeLists.txt
M    Engine/Display/CMakeLists.txt
M    Engine/IdleModes/CMakeLists.txt
M    Engine/PixelSamplers/CMakeLists.txt
M    Engine/Renderers/CMakeLists.txt
M    Engine/LoadBalancers/CMakeLists.txt
M    CMakeLists.txt
A    manta-commands.txt


Modified: branches/itanium2/CMakeLists.txt
==============================================================================
--- branches/itanium2/CMakeLists.txt    (original)
+++ branches/itanium2/CMakeLists.txt    Wed Jun 15 20:17:06 2005
@@ -54,8 +54,12 @@
 # Check to see whether the optional glfw/ directory should be included.
 SET(BUILD_GLFW 0 CACHE BOOL "Build glfw frontend.")  
 IF(BUILD_GLFW)
-  SUBDIRS(fox)
+  SUBDIRS(glfw)
 ENDIF(BUILD_GLFW)
 
-
+# Check to see whether the optional fox/ directory should be included.
+SET(BUILD_FOX 0 CACHE BOOL "Build fox frontend.")
+IF(BUILD_FOX)
+  SUBDIRS(fox)
+ENDIF(BUILD_FOX)
 

Modified: branches/itanium2/Core/CMakeLists.txt
==============================================================================
--- branches/itanium2/Core/CMakeLists.txt       (original)
+++ branches/itanium2/Core/CMakeLists.txt       Wed Jun 15 20:17:06 2005
@@ -2,7 +2,9 @@
 SET (CORE_SOURCES)
 SET (CORE_SOURCES ${CORE_SOURCES}
      Color/ColorDB.h
-     Color/ColorDB.cc)
+     Color/ColorDB.cc
+     Color/RGBColor.h
+     Color/ColorSpace.h)
 SET (CORE_SOURCES ${CORE_SOURCES}
      Geometry/PointVector.h
      Geometry/PointVector.cc
@@ -19,7 +21,8 @@
      Math/MT_RNG.h
      Math/MT_RNG.cc
      Math/Noise.h
-     Math/Noise.cc)
+     Math/Noise.cc
+     Math/ipow.h)
 SET (CORE_SOURCES ${CORE_SOURCES}
      Util/Args.h
      Util/Args.cc)

Modified: branches/itanium2/Engine/Control/CMakeLists.txt
==============================================================================
--- branches/itanium2/Engine/Control/CMakeLists.txt     (original)
+++ branches/itanium2/Engine/Control/CMakeLists.txt     Wed Jun 15 20:17:06 
2005
@@ -1,6 +1,8 @@
 
 SET (Manta_Control_SRCS
+     Control/RTRT.h
      Control/RTRT.cc
      Control/RTRT_register.cc
+     Control/Worker.h
      Control/Worker.cc
      )

Modified: branches/itanium2/Engine/Display/CMakeLists.txt
==============================================================================
--- branches/itanium2/Engine/Display/CMakeLists.txt     (original)
+++ branches/itanium2/Engine/Display/CMakeLists.txt     Wed Jun 15 20:17:06 
2005
@@ -1,7 +1,13 @@
 
 SET (Manta_Display_SRCS
+     Display/NullDisplay.h
      Display/NullDisplay.cc
+     Display/OpenGLDisplay.h
      Display/OpenGLDisplay.cc
-     Display/FileDisplay.cc
+     Display/XHelper.h
      Display/XHelper.cc
+     Display/FileDisplay.h
+     Display/FileDisplay.cc
+     Display/GLXImageDisplay.h
+     Display/GLXImageDisplay.cc
      )

Modified: branches/itanium2/Engine/IdleModes/CMakeLists.txt
==============================================================================
--- branches/itanium2/Engine/IdleModes/CMakeLists.txt   (original)
+++ branches/itanium2/Engine/IdleModes/CMakeLists.txt   Wed Jun 15 20:17:06 
2005
@@ -1,4 +1,5 @@
 
 SET (Manta_IdleModes_SRCS
+     IdleModes/ZoomIdleMode.h
      IdleModes/ZoomIdleMode.cc
      )

Modified: branches/itanium2/Engine/ImageTraversers/CMakeLists.txt
==============================================================================
--- branches/itanium2/Engine/ImageTraversers/CMakeLists.txt     (original)
+++ branches/itanium2/Engine/ImageTraversers/CMakeLists.txt     Wed Jun 15 
20:17:06 2005
@@ -1,6 +1,9 @@
 
 SET (Manta_ImageTraversers_SRCS
+     ImageTraversers/NullImageTraverser.h
      ImageTraversers/NullImageTraverser.cc
+     ImageTraversers/TiledImageTraverser.h
      ImageTraversers/TiledImageTraverser.cc
+     ImageTraversers/FramelessImageTraverser.h
      ImageTraversers/FramelessImageTraverser.cc
      )

Modified: branches/itanium2/Engine/LoadBalancers/CMakeLists.txt
==============================================================================
--- branches/itanium2/Engine/LoadBalancers/CMakeLists.txt       (original)
+++ branches/itanium2/Engine/LoadBalancers/CMakeLists.txt       Wed Jun 15 
20:17:06 2005
@@ -1,6 +1,9 @@
 
 SET (Manta_LoadBalancers_SRCS
+     LoadBalancers/CyclicLoadBalancer.h
      LoadBalancers/CyclicLoadBalancer.cc
+     LoadBalancers/SimpleLoadBalancer.h
      LoadBalancers/SimpleLoadBalancer.cc
+     LoadBalancers/WQLoadBalancer.h
      LoadBalancers/WQLoadBalancer.cc
      )

Modified: branches/itanium2/Engine/PixelSamplers/CMakeLists.txt
==============================================================================
--- branches/itanium2/Engine/PixelSamplers/CMakeLists.txt       (original)
+++ branches/itanium2/Engine/PixelSamplers/CMakeLists.txt       Wed Jun 15 
20:17:06 2005
@@ -1,12 +1,20 @@
 
 SET (Manta_PixelSamplers_SRCS
+     PixelSamplers/HammersleySampler.h
      PixelSamplers/HammersleySampler.cc
+     PixelSamplers/InterLeaveSampler.h
      PixelSamplers/InterLeaveSampler.cc
+     PixelSamplers/JitterSampler.h
      PixelSamplers/JitterSampler.cc
+     PixelSamplers/MultiJitterSampler.h
      PixelSamplers/MultiJitterSampler.cc
+     PixelSamplers/NullSampler.h
      PixelSamplers/NullSampler.cc
+     PixelSamplers/NRooksSampler.h
      PixelSamplers/NRooksSampler.cc
      PixelSamplers/RampSampler.cc
+     PixelSamplers/Sample.h
      PixelSamplers/Sample.cc
+     PixelSamplers/SingleSampler.h
      PixelSamplers/SingleSampler.cc
      )

Modified: branches/itanium2/Engine/Renderers/CMakeLists.txt
==============================================================================
--- branches/itanium2/Engine/Renderers/CMakeLists.txt   (original)
+++ branches/itanium2/Engine/Renderers/CMakeLists.txt   Wed Jun 15 20:17:06 
2005
@@ -1,6 +1,9 @@
 
 SET (Manta_Renderers_SRCS
+     Renderers/Moire.h
      Renderers/Moire.cc
+     Renderers/NullRenderer.h
      Renderers/NullRenderer.cc
+     Renderers/Raytracer.h
      Renderers/Raytracer.cc
      )

Modified: branches/itanium2/Image/CMakeLists.txt
==============================================================================
--- branches/itanium2/Image/CMakeLists.txt      (original)
+++ branches/itanium2/Image/CMakeLists.txt      Wed Jun 15 20:17:06 2005
@@ -1,3 +1,13 @@
 
-ADD_LIBRARY (Manta_Image NullImage.cc TGAFile.cc)
+
+ADD_LIBRARY (Manta_Image 
+             NullImage.cc
+             NullImage.h
+             Pixel.h
+             SimpleImage.h
+             SimpleImage_templates.cc
+             TGAFile.h
+             TGAFile.cc  )
+
+
 TARGET_LINK_LIBRARIES(Manta_Image Manta_Interface SCIRun_Core)

Modified: branches/itanium2/Image/SimpleImage_templates.cc
==============================================================================
--- branches/itanium2/Image/SimpleImage_templates.cc    (original)
+++ branches/itanium2/Image/SimpleImage_templates.cc    Wed Jun 15 20:17:06 
2005
@@ -1,5 +1,5 @@
-#include <Packages/manta/Image/SimpleImage.h>
-#include <Packages/manta/Image/Pixel.h>
+#include <Image/SimpleImage.h>
+#include <Image/Pixel.h>
 
 using namespace Manta;
 

Modified: branches/itanium2/Interface/CMakeLists.txt
==============================================================================
--- branches/itanium2/Interface/CMakeLists.txt  (original)
+++ branches/itanium2/Interface/CMakeLists.txt  Wed Jun 15 20:17:06 2005
@@ -6,6 +6,7 @@
         Background.cc
         Camera.h
         Camera.cc
+        Context.h
         Fragment.h
         HitInfo.h
         IdleMode.h
@@ -45,6 +46,7 @@
         Transaction.cc
         UserInterface.h
         UserInterface.cc
+        XWindow.h
         )
 
 TARGET_LINK_LIBRARIES(Manta_Interface SCIRun_Core)

Modified: branches/itanium2/SCIRun/Core/CMakeLists.txt
==============================================================================
--- branches/itanium2/SCIRun/Core/CMakeLists.txt        (original)
+++ branches/itanium2/SCIRun/Core/CMakeLists.txt        Wed Jun 15 20:17:06 
2005
@@ -23,19 +23,43 @@
      )
 
 SET (SCIRUN_SOURCES ${SCIRUN_SOURCES}
-     Thread/CleanupManager.h
-     Thread/CleanupManager.cc
-     Thread/Runnable.h
-     Thread/Runnable.cc
-     Thread/Thread.h 
-     Thread/Thread.cc
-     Thread/ThreadError.h
-     Thread/ThreadError.cc
-     Thread/ThreadGroup.h
-     Thread/ThreadGroup.cc
-     Thread/WorkQueue.h
-     Thread/WorkQueue.cc
-     Thread/Time.h
+
+    Thread/AtomicCounter.h
+    Thread/Barrier.h
+    Thread/CleanupManager.h
+    Thread/CleanupManager.cc
+    Thread/ConditionVariable.h
+    Thread/CrowdMonitor.h
+    Thread/FutureValue.h
+    Thread/Guard.h
+    Thread/Mailbox.h
+    Thread/Mutex.h
+    Thread/MutexPool.h
+    Thread/MutexPool.cc
+    Thread/Parallel.h
+    Thread/Parallel1.h
+    Thread/Parallel2.h
+    Thread/Parallel3.h
+    Thread/ParallelBase.h
+    Thread/ParallelBase.cc
+    Thread/RecursiveMutex.h
+    Thread/Reducer.h
+    Thread/Runnable.h
+    Thread/Runnable.cc
+    Thread/Semaphore.h
+    Thread/SimpleReducer.h
+    Thread/SimpleReducer.cc
+    Thread/Thread.h
+    Thread/Thread.cc
+    Thread/ThreadError.h
+    Thread/ThreadError.cc
+    Thread/ThreadGroup.h
+    Thread/ThreadGroup.cc
+    Thread/ThreadPool.h
+    Thread/Time.h
+    Thread/WorkQueue.h
+    Thread/WorkQueue.cc
+
      
      )
 

Modified: branches/itanium2/glfw/CMakeLists.txt
==============================================================================
--- branches/itanium2/glfw/CMakeLists.txt       (original)
+++ branches/itanium2/glfw/CMakeLists.txt       Wed Jun 15 20:17:06 2005
@@ -9,7 +9,9 @@
 
   INCLUDE_DIRECTORIES(${GLFW_INCLUDE})
 
-  ADD_EXECUTABLE(glfw_manta glfw_manta.cc)
+  ADD_EXECUTABLE(glfw_manta glfw_manta.cc
+                            GlfwImageDisplay.h
+                            GlfwImageDisplay.cc)
 
   TARGET_LINK_LIBRARIES(glfw_manta Manta_Engine 
                                    Manta_UserInterface 

Added: branches/itanium2/manta-commands.txt
==============================================================================
--- (empty file)
+++ branches/itanium2/manta-commands.txt        Wed Jun 15 20:17:06 2005
@@ -0,0 +1,8 @@
+# Cockpit Cross section.
+dplace -c 1-61 bin/manta -np 60 -scene "lib/libscene_boeing777.so( -file 
/dev/shm/Boeing777.v3c1 -np 32 -cutting default )" -camera "pinhole( -eye 
312.31 -315.671 199.735  -lookat 280.305 98.0706 184.652  -up 0.0256952 
-0.337005 0.941152  -fov 60 )"
+
+# Top View Zoomed out.
+dplace -c 1-61 bin/manta -np 60 -scene "lib/libscene_boeing777.so( -file 
/dev/shm/Boeing777.v3c1 )" -camera "pinhole( -eye 1821.5 -29.356 2323.27  
-lookat 1446.55 13.6745 -591.948  -up -0.323033 -0.85584 0.403966  -fov 60 )"
+
+# Nose from outside.
+dplace -c 1-61 bin/manta -np 60 -scene "lib/libscene_boeing777.so( -file 
/dev/shm/Boeing777.v3c1 -np 32 )" -camera "pinhole( -eye 104.567 -27.7932 
239.894  -lookat 964.189 -144.363 202.981  -up -0.329093 0.0449434 0.943228  
-fov 51.217 )"
\ No newline at end of file




  • [MANTA] r386 - in branches/itanium2: . Core Engine/Control Engine/Display Engine/IdleModes Engine/ImageTraversers Engine/LoadBalancers Engine/PixelSamplers Engine/Renderers Image Interface SCIRun/Core glfw, abe, 06/15/2005

Archive powered by MHonArc 2.6.16.

Top of page