Text archives Help
- From: cgribble@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1562 - in trunk: DynLT scenes
- Date: Thu, 26 Jul 2007 13:59:40 -0600 (MDT)
Author: cgribble
Date: Thu Jul 26 13:59:39 2007
New Revision: 1562
Modified:
trunk/DynLT/DynLTWorker.cc
trunk/scenes/dynlt.cc
Log:
Set depth on ambient/global shading packets
Modified: trunk/DynLT/DynLTWorker.cc
==============================================================================
--- trunk/DynLT/DynLTWorker.cc (original)
+++ trunk/DynLT/DynLTWorker.cc Thu Jul 26 13:59:39 2007
@@ -220,7 +220,7 @@
}
RayPacketData raydata;
- RayPacket rays(raydata, RayPacket::UnknownShape, 0, size, 0, 0);
+ RayPacket rays(raydata, RayPacket::UnknownShape, 0, size, 1, 0);
// Fill in the ray origins and directions at sample points
for (int i=rays.begin(); i<rays.end(); ++i) {
@@ -412,6 +412,7 @@
// Iteratively trace the ray packet
for (unsigned int d=0; d<max_depth; ++d) {
// Reset ray packet flags
+ rays.setDepth(d+1);
rays.setAllFlags(0);
rays.setFlag(RayPacket::HaveHitPositions | RayPacket::HaveNormals |
RayPacket::HaveUnitNormals);
Modified: trunk/scenes/dynlt.cc
==============================================================================
--- trunk/scenes/dynlt.cc (original)
+++ trunk/scenes/dynlt.cc Thu Jul 26 13:59:39 2007
@@ -244,6 +244,7 @@
bg=new EnvMapBackground(env_fname);
else
bg=new ConstantBackground(Color(RGB(0, 0, 0)));
+
if (static_threads) {
// Static thread scheduling --> create DynLTWorker threads
DynLTContext* dpltctx=new DynLTContext(context.manta_interface,
@@ -267,7 +268,7 @@
DynLTContext* dpltctx=new DynLTContext(context.manta_interface,
queue, scene, ngroups, nsamples,
max_depth, dilate, bg, runtime,
- minproc, maxproc , kd, ka );
+ minproc, maxproc, kd, ka );
DynLTWorker* worker=new DynLTWorker(dpltctx, 0);
context.manta_interface->registerParallelPreRenderCallback(Callback::create(worker,
&DynLTWorker::timedRun));
- [MANTA] r1562 - in trunk: DynLT scenes, cgribble, 07/26/2007
Archive powered by MHonArc 2.6.16.