Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[Manta] Re: Re: r2300 - in trunk: Engine/Control Engine/LoadBalancers Image Interface include


Chronological Thread 
  • From: "Steven G. Parker" < >
  • To:
  • Cc: Boonthanome Nouanesengsy < >, Biagio Cosenza < >
  • Subject: [Manta] Re: Re: r2300 - in trunk: Engine/Control Engine/LoadBalancers Image Interface include
  • Date: Tue, 8 Jul 2008 16:12:46 -0600
Thanks Abe. If someone gets ambitious, make this a scene parameter (next to maxdepth) and just make sure it doesn't kill perf on the default scene.

Steve


On Jul 8, 2008, at 3:33 PM, Abe Stephens wrote:

Several people reported epsilon issues this afternoon so I decided to make T_EPSILON a build variable (MANTA_T_EPSILON, see below).

It is necessary to "svn update" and then reconfigure in ccmake to see these variables. The default values are the same as the hard coded header.

Abe

On Jul 8, 2008, at 3:26 PM, 

 wrote:

Author: abe
Date: Tue Jul  8 15:26:35 2008
New Revision: 2300

Added:
 trunk/include/Parameters.h.CMakeTemplate
    - copied, changed from r2282, trunk/Interface/Parameters.h
Removed:
 trunk/Interface/Parameters.h
Modified:
 trunk/Engine/Control/RTRT.h
 trunk/Engine/LoadBalancers/CyclicLoadBalancer.h
 trunk/Engine/LoadBalancers/SimpleLoadBalancer.h
 trunk/Image/SimpleImage.h
 trunk/Interface/RayPacket.h
 trunk/include/CMakeLists.txt
Log:

Moved the defines in Interface/Parameters.h (like T_EPSILON) to cached
CMake build variables. The header is autogenerated and placed in the
build/include/ directory (use #include <Parameters.h> instead of #include
<Interface/Parameters.h>).

Look for the variables in ccmake: i.e. MANTA_T_EPSILON in cmake is
T_EPSILON in the source code.

M    Image/SimpleImage.h
A    include/Parameters.h.CMakeTemplate
M    include/CMakeLists.txt
D    Interface/Parameters.h
M    Interface/RayPacket.h
M    Engine/Control/RTRT.h
M    Engine/LoadBalancers/CyclicLoadBalancer.h
M    Engine/LoadBalancers/SimpleLoadBalancer.h


Modified: trunk/Engine/Control/RTRT.h
= = = = = = = = = =====================================================================
--- trunk/Engine/Control/RTRT.h (original)
+++ trunk/Engine/Control/RTRT.h Tue Jul  8 15:26:35 2008
@@ -32,7 +32,7 @@
#include <Interface/MantaInterface.h>
#include <Interface/FrameState.h>
#include <Interface/Object.h>
-#include <Interface/Parameters.h>
+#include <Parameters.h>
#include <Core/Thread/AtomicCounter.h>
#include <Core/Thread/Barrier.h>
#include <Core/Thread/CrowdMonitor.h>

Modified: trunk/Engine/LoadBalancers/CyclicLoadBalancer.h
= = = = = = = = = =====================================================================
--- trunk/Engine/LoadBalancers/CyclicLoadBalancer.h     (original)
+++ trunk/Engine/LoadBalancers/CyclicLoadBalancer.h Tue Jul 8 15:26:35 2008
@@ -3,7 +3,7 @@
#define Manta_Engine_CyclicLoadBalancer_h

#include <Interface/LoadBalancer.h>
-#include <Interface/Parameters.h>
+#include <Parameters.h>
#include <Core/Thread/WorkQueue.h>
#include <string>
#include <vector>

Modified: trunk/Engine/LoadBalancers/SimpleLoadBalancer.h
= = = = = = = = = =====================================================================
--- trunk/Engine/LoadBalancers/SimpleLoadBalancer.h     (original)
+++ trunk/Engine/LoadBalancers/SimpleLoadBalancer.h Tue Jul 8 15:26:35 2008
@@ -3,7 +3,7 @@
#define Manta_Engine_SimpleLoadBalancer_h

#include <Interface/LoadBalancer.h>
-#include <Interface/Parameters.h>
+#include <Parameters.h>
#include <Core/Thread/WorkQueue.h>
#include <string>
#include <vector>

Modified: trunk/Image/SimpleImage.h
= = = = = = = = = =====================================================================
--- trunk/Image/SimpleImage.h   (original)
+++ trunk/Image/SimpleImage.h   Tue Jul  8 15:26:35 2008
@@ -33,7 +33,7 @@
#include <Core/Color/Color.h>
#include <Core/Exceptions/IllegalValue.h>
#include <Image/Pixel.h>
-#include <Interface/Parameters.h>
+#include <Parameters.h>
#include <string>
#include <vector>


Modified: trunk/Interface/RayPacket.h
= = = = = = = = = =====================================================================
--- trunk/Interface/RayPacket.h (original)
+++ trunk/Interface/RayPacket.h Tue Jul  8 15:26:35 2008
@@ -38,9 +38,9 @@
#include <Core/Util/Assert.h>
#include <Core/Util/Align.h>
#include <Core/Util/StaticCheck.h>
-#include <Interface/Parameters.h>
#include <Interface/Primitive.h>
#include <Interface/TexCoordMapper.h>
+#include <Parameters.h>
#include <RayPacketParameters.h>
#include <MantaSSE.h>


Modified: trunk/include/CMakeLists.txt
= = = = = = = = = =====================================================================
--- trunk/include/CMakeLists.txt        (original)
+++ trunk/include/CMakeLists.txt        Tue Jul  8 15:26:35 2008
@@ -155,3 +155,17 @@
 ${CMAKE_CURRENT_SOURCE_DIR}/MachineParameters.h.CmakeTemplate
 ${CMAKE_BINARY_DIR}/include/MachineParameters.h
 )
+
+ ###############################################################################
+## Configure Parameters.h formerly Interface/Parameters.h
+SET(MANTA_MAXCACHELINESIZE 128 CACHE STRING "CPU cache line size in bytes.")
+SET(MANTA_T_EPSILON 1.e-4 CACHE STRING "Epsilon parameter used for intersection.")
+SET(MANTA_DENORM_EPSILON 1.e-6 CACHE STRING "Epsilon parameter used for .")
+SET(MANTA_COLOR_EPSILON 1.e-4 CACHE STRING "Epsilon parameter used for .")
+SET(MANTA_MAXT 1.e19 CACHE STRING "Initial intersection t value")
+SET(MANTA_IMAGE_ROW_BYTES 32 CACHE STRING "Framebuffer row padding alignment.")
+
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/Parameters.h.CMakeTemplate
+  ${CMAKE_BINARY_DIR}/include/Parameters.h
+  )

Copied: trunk/include/Parameters.h.CMakeTemplate (from r2282, trunk/ Interface/Parameters.h)
= = = = = = = = = =====================================================================
--- trunk/Interface/Parameters.h        (original)
+++ trunk/include/Parameters.h.CMakeTemplate    Tue Jul  8 15:26:35 2008
@@ -29,11 +29,11 @@
#ifndef Manta_Interface_Parameters_h
#define Manta_Interface_Parameters_h

-#define MAXCACHELINESIZE 128
-#define T_EPSILON ((Real)1.e-4)
-#define DENOM_EPSILON ((Real)1.e-6)
-#define COLOR_EPSILON ((Real)1.e-4)
-#define MAXT ((Real)1.e19)
-#define IMAGE_ROW_BYTES 32
+#define MAXCACHELINESIZE ${MANTA_MAXCACHELINESIZE}
+#define T_EPSILON ((Real)${MANTA_T_EPSILON})
+#define DENOM_EPSILON ((Real)${MANTA_DENORM_EPSILON})
+#define COLOR_EPSILON ((Real)${MANTA_COLOR_EPSILON})
+#define MAXT ((Real)${MANTA_MAXT})
+#define IMAGE_ROW_BYTES ${MANTA_IMAGE_ROW_BYTES}

#endif


Archive powered by MHonArc 2.6.16.

Top of page