-
sparker
thiago
Manta Interactive Ray Tracer Development Mailing List
Text archives Help
- From: abhinav@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r555 - in branches/AFR/Engine: Control ImageTraversers
- Date: Sun, 18 Sep 2005 11:52:54 -0600 (MDT)
Author: abhinav
Date: Sun Sep 18 11:52:53 2005
New Revision: 555
Modified:
branches/AFR/Engine/Control/AFRPipeline.cc
branches/AFR/Engine/ImageTraversers/AFImageTraverser.h
branches/AFR/Engine/ImageTraversers/AFRImageTraverser.h
branches/AFR/Engine/ImageTraversers/GSTAFRImageTraverser.cc
branches/AFR/Engine/ImageTraversers/GSTAFRImageTraverser.h
Log:
fixed the bug where the display was missing.
just a matter of a double instead of an int :)
Modified: branches/AFR/Engine/Control/AFRPipeline.cc
==============================================================================
--- branches/AFR/Engine/Control/AFRPipeline.cc (original)
+++ branches/AFR/Engine/Control/AFRPipeline.cc Sun Sep 18 11:52:53 2005
@@ -299,7 +299,7 @@
// goto skipToRendering;
//}
- unsigned int inner_loop_time = currentImageTraverser->getInnerLoopTime();
+ double inner_loop_time = currentImageTraverser->getInnerLoopTime();
// Begin the outer rendering loop.
// This updates renderer state and then
@@ -406,7 +406,7 @@
// Image Display (Eventually reconstruction)
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-
+ //cout << "this is the outer loop" << endl;
for(ChannelListType::iterator iter = channels.begin(); iter !=
channels.end(); iter++){
Channel* channel = *iter;
@@ -448,11 +448,13 @@
/////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////
int inner_iterations = 0;
+ //cout << "looping: " << SCIRun::Time::currentSeconds()
+ // << ", inner_loop_time = " << inner_loop_time << endl;
for (double begin_time=SCIRun::Time::currentSeconds();
(SCIRun::Time::currentSeconds()-begin_time)<inner_loop_time;)
{
+ //cout << "inner loop, iter# " << inner_iterations << endl;
++inner_iterations;
-
for(int index = 0;index < static_cast<int>(channels.size());index++)
{
Channel* channel = channels[index];
@@ -463,7 +465,7 @@
currentRenderer, currentShadowAlgorithm,
channel->camera, scene);
- if(inner_iterations==1)
currentImageTraverser->write_Tile_and_Camera(myContext);
+ //if(inner_iterations==1)
currentImageTraverser->write_Tile_and_Camera(myContext);
///////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////
// Inner Loop: Pipeline Stage 1.
@@ -472,6 +474,7 @@
///////////////////////////////////////////////////////////////////////
if(currentImageTraverser->isMaster(myContext.proc))
{
+ //cout << "calling mastertask" << endl;
currentImageTraverser->masterTask( myContext, image );
image->setValid(true);
}
@@ -482,8 +485,9 @@
///////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////
{
+ //cout << "calling clienttask" << endl;
currentImageTraverser->clientTask( myContext, image );
-
+
//image->setValid(true);
}
}
Modified: branches/AFR/Engine/ImageTraversers/AFImageTraverser.h
==============================================================================
--- branches/AFR/Engine/ImageTraversers/AFImageTraverser.h (original)
+++ branches/AFR/Engine/ImageTraversers/AFImageTraverser.h Sun Sep 18
11:52:53 2005
@@ -44,8 +44,11 @@
virtual void setupFrame(const RenderContext& context)
{ /*Undefined for AFRPipeline.*/ };
virtual void renderImage(const RenderContext&
context, Image* image) { /*Undefined for AFRPipeline. */ };
- void renderChunk(const RenderContext& context, Image*
image, int xres, int yres);
- int renderCrossHair(const RenderContext& context, int
myID, Image *image, const int xres, const int yres, Sample *s, const int
sscount, bool endChunk=false);
+ void renderChunk(const RenderContext& context, Image*
image,
+ int xres, int yres);
+ int renderCrossHair(const RenderContext& context, int
myID,
+ Image *image, const int xres, const int yres,
+ Sample *s, const int sscount, bool endChunk=false);
// All AFImageTraversers are both master and client.
virtual bool isMaster( int id ) { return true; };
Modified: branches/AFR/Engine/ImageTraversers/AFRImageTraverser.h
==============================================================================
--- branches/AFR/Engine/ImageTraversers/AFRImageTraverser.h (original)
+++ branches/AFR/Engine/ImageTraversers/AFRImageTraverser.h Sun Sep 18
11:52:53 2005
@@ -43,24 +43,27 @@
virtual void setupFrame(const RenderContext& context)
{ /*Undefined for AFRPipeline.*/ };
virtual void renderImage(const RenderContext&
context, Image* image) { /*Undefined for AFRPipeline. */ };
-#if 0
- // Do these need to be part of the virtual interface?
- virtual void renderChunk(const RenderContext&
context, Image* image, int xres, int yres);
+ /* // Do these need to be part of the virtual interface?
+ virtual void renderChunk(const RenderContext&
context, Image* image,
+ int xres, int yres)=0;
virtual int renderCrossHair(const RenderContext&
context, int myID,
Image *image, const int xres, const int yres,
PartialSampleSet *sampleset, const int sscount,
- bool endChunk=false)=0;
-#endif
-
+ bool endChunk=false) { return 0;};
+ virtual int renderCrossHair(const RenderContext& context, int myID,
+ Image *image, const int xres, const int yres,
+ Sample *s, const int sscount, bool endChunk=false)
+ { return 0; };
+ */
// Master thread task.
virtual void masterTask(const RenderContext& context,
Image* image)=0;
// Sampler/Renderer task.
virtual void clientTask(const RenderContext& context,
Image* image)=0;
- virtual inline bool isMaster(int id)=0;
+ virtual bool isMaster(int id)=0;
// Update kdtree-cut.
- virtual void adjustTiles(int id, Timestamp
currenttime)=0;
+ // virtual void adjustTiles(int id, Timestamp
currenttime)=0;
virtual void createStatsWin()=0;
virtual void display_stats()=0;
virtual void toggleTileDisplayMode()=0;
@@ -84,4 +87,3 @@
};
#endif
-
Modified: branches/AFR/Engine/ImageTraversers/GSTAFRImageTraverser.cc
==============================================================================
--- branches/AFR/Engine/ImageTraversers/GSTAFRImageTraverser.cc (original)
+++ branches/AFR/Engine/ImageTraversers/GSTAFRImageTraverser.cc Sun Sep 18
11:52:53 2005
@@ -658,12 +658,12 @@
t,
re.hitPosition.x(),
re.hitPosition.y(), re.hitPosition.z(),
tempcol.r(), tempcol.g(),
tempcol.b() );
- /*cout << "setting: " << i%3 << ", "
- << newTempSampleSet[myID][f+i/3].sample[i%3].viewCoord[0] << ", "
- << newTempSampleSet[myID][f+i/3].sample[i%3].viewCoord[1] << ", "
- << newTempSampleSet[myID][f+i/3].timestamp << ", "
- << re.hitPosition.x() << ", " << re.hitPosition.y() << ", " <<
re.hitPosition.z() << ", "
- << tempcol.r() << ", " << tempcol.g() << ", " << tempcol.b() <<
endl;*/
+ //cout << "setting: " << i%3 << ", "
+ // << newTempSampleSet[myID][f+i/3].sample[i%3].viewCoord[0] << ",
"
+ // << newTempSampleSet[myID][f+i/3].sample[i%3].viewCoord[1] << ",
"
+ // << t << ", "
+ // << re.hitPosition.x() << ", " << re.hitPosition.y() << ", " <<
re.hitPosition.z() << ", "
+ // << tempcol.r() << ", " << tempcol.g() << ", " << tempcol.b() <<
endl;
/////////////////////////////////////////////////////////////////////////////
// Skip reconstruction and set the image pixel.
image->set((int)(newTempSampleSet[myID][f+i/3].sample[i%3].viewCoord[0]),
@@ -888,4 +888,3 @@
while(minError/maxError<MAX_MIN_RATIO && count<MAX_MERGE_SPLIT_LIMIT);
}
}
-
Modified: branches/AFR/Engine/ImageTraversers/GSTAFRImageTraverser.h
==============================================================================
--- branches/AFR/Engine/ImageTraversers/GSTAFRImageTraverser.h (original)
+++ branches/AFR/Engine/ImageTraversers/GSTAFRImageTraverser.h Sun Sep 18
11:52:53 2005
@@ -45,7 +45,8 @@
virtual void setupFrame(const RenderContext& context)
{ /*Undefined for AFRPipeline.*/ };
virtual void renderImage(const RenderContext&
context, Image* image) { /*Undefined for AFRPipeline. */ };
- void renderChunk(const RenderContext& context, Image*
image, int xres, int yres);
+ void renderChunk(const RenderContext& context, Image*
image,
+ int xres, int yres);
int renderCrossHair(const RenderContext& context, int
myID,
Image *image, const int xres, const int yres,
PartialSampleSet *sampleset, const int sscount,
@@ -56,7 +57,7 @@
// Sampler/Renderer task.
void clientTask(const RenderContext& context, Image*
image);
- inline bool isMaster(int id)
+ inline bool isMaster(int id)
{
return ((id%avgGroupSize)==0);
}
- [MANTA] r555 - in branches/AFR/Engine: Control ImageTraversers, abhinav, 09/18/2005
Archive powered by MHonArc 2.6.16.
