Text archives Help
- From: "Solomon Boulos" <boulos@cs.utah.edu>
- To: manta@sci.utah.edu
- Subject: [Manta] r2188 - trunk/Engine/PixelSamplers
- Date: Sun, 13 Apr 2008 18:36:28 -0600 (MDT)
Author: boulos
Date: Sun Apr 13 18:36:27 2008
New Revision: 2188
Modified:
trunk/Engine/PixelSamplers/FastSampler.cc
trunk/Engine/PixelSamplers/SingleSampler.cc
Log:
Engine/PixelSamplers/FastSampler.cc
Engine/PixelSamplers/SingleSampler.cc
All PixelSamplers should setup the sample_generator properly.
Modified: trunk/Engine/PixelSamplers/FastSampler.cc
==============================================================================
--- trunk/Engine/PixelSamplers/FastSampler.cc (original)
+++ trunk/Engine/PixelSamplers/FastSampler.cc Sun Apr 13 18:36:27 2008
@@ -4,6 +4,7 @@
#include <Interface/Fragment.h>
#include <Interface/RayPacket.h>
#include <Interface/Renderer.h>
+#include <Interface/SampleGenerator.h>
using namespace Manta;
PixelSampler* FastSampler::create(const vector<string>& args)
@@ -23,6 +24,7 @@
{
channelInfo.resize(numChannels);
context.renderer->setupBegin(context, numChannels);
+ context.sample_generator->setupBegin(context, numChannels);
}
void FastSampler::setupDisplayChannel(SetupContext& context)
@@ -38,11 +40,13 @@
ci.xoffset = (-xres/(Real)2+(Real)0.5)*ci.xscale; // Offset to pixel center
ci.yoffset = (-yres/(Real)2+(Real)0.5)*ci.yscale;
context.renderer->setupDisplayChannel(context);
+ context.sample_generator->setupDisplayChannel(context);
}
void FastSampler::setupFrame(const RenderContext& context)
{
context.renderer->setupFrame(context);
+ context.sample_generator->setupFrame(context);
}
void FastSampler::renderFragment(const RenderContext& context,
Modified: trunk/Engine/PixelSamplers/SingleSampler.cc
==============================================================================
--- trunk/Engine/PixelSamplers/SingleSampler.cc (original)
+++ trunk/Engine/PixelSamplers/SingleSampler.cc Sun Apr 13 18:36:27 2008
@@ -25,6 +25,7 @@
{
channelInfo.resize(numChannels);
context.renderer->setupBegin(context, numChannels);
+ context.sample_generator->setupBegin(context, numChannels);
}
void SingleSampler::setupDisplayChannel(SetupContext& context)
@@ -39,11 +40,13 @@
ci.xoffset = (-ci.xres/(Real)2+(Real)0.5)*ci.xscale; // Offset to pixel
center
ci.yoffset = (-ci.yres/(Real)2+(Real)0.5)*ci.yscale;
context.renderer->setupDisplayChannel(context);
+ context.sample_generator->setupDisplayChannel(context);
}
void SingleSampler::setupFrame(const RenderContext& context)
{
context.renderer->setupFrame(context);
+ context.sample_generator->setupFrame(context);
}
void SingleSampler::renderFragment(const RenderContext& context,
- [Manta] r2188 - trunk/Engine/PixelSamplers, Solomon Boulos, 04/13/2008
Archive powered by MHonArc 2.6.16.