Text archives Help
- From: boulos@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1479 - in trunk: Engine/ImageTraversers UserInterface
- Date: Mon, 16 Jul 2007 17:45:04 -0600 (MDT)
Author: boulos
Date: Mon Jul 16 17:45:04 2007
New Revision: 1479
Modified:
trunk/Engine/ImageTraversers/DeadlineImageTraverser.h
trunk/UserInterface/XWindowUI.cc
Log:
Padding the Tile struct to 32-bytes to be more
cache friendly (128-bytes is too big though as it
requires too much memory)
Adding simple printout of how many procs we're using
when we change it through the XWindowUI (I was tired
of guessing/forgetting)
Modified: trunk/Engine/ImageTraversers/DeadlineImageTraverser.h
==============================================================================
--- trunk/Engine/ImageTraversers/DeadlineImageTraverser.h (original)
+++ trunk/Engine/ImageTraversers/DeadlineImageTraverser.h Mon Jul 16
17:45:04 2007
@@ -87,6 +87,7 @@
int yend;
float xmag;
float ymag;
+ int padding; // unfortunately we can't make these 128 bytes wide
};
SCIRun::Mutex qlock;
Tile* tiles;
Modified: trunk/UserInterface/XWindowUI.cc
==============================================================================
--- trunk/UserInterface/XWindowUI.cc (original)
+++ trunk/UserInterface/XWindowUI.cc Mon Jul 16 17:45:04 2007
@@ -72,7 +72,7 @@
path( 0 ),
timeView(0),
xlock("XWindowUI display lock"),
- xsema("XWindowUI semaphore", 0),
+ xsema("XWindowUI semaphore", 0),
quitting(false)
{
bool quit=false;
@@ -568,6 +568,7 @@
int newProcs = oldProcs+value;
if(newProcs < 1)
newProcs = 1;
+ cerr << "Setting number of processors to: " << newProcs << endl;
return newProcs;
}
};
@@ -851,7 +852,7 @@
RayPacketData data;
RayPacket rays( data, RayPacket::LinePacket, 0, numPixels, 0, 0 );
-
+
Real image_x = (2.0*mouse_x+1)/window->xres - 1.0;
Real image_y = 1.0 - (2.0*mouse_y+1)/window->yres;
for(int i = 0; i < numPixels; ++i) {
@@ -862,9 +863,9 @@
// TODO(bigler): shouldn't ConstantEye be set in the camera?
rays.setFlag( RayPacket::DebugPacket | RayPacket::ConstantEye );
- // Shoot the rays.
- Color color;
- rtrt_interface->shootOneRay( color, rays, image_x, image_y, channel );
+ // Shoot the rays.
+ Color color;
+ rtrt_interface->shootOneRay( color, rays, image_x, image_y, channel
);
for(int i = 0; i < numPixels; ++i) {
if (rays.wasHit(i)) {
@@ -873,7 +874,7 @@
std::cerr << "color : " << rays.getColor(i).toString() <<
"\n";
}
}
-
+
}
void XWindowUI::mouse_debug_ray(unsigned int state, unsigned int,
- [MANTA] r1479 - in trunk: Engine/ImageTraversers UserInterface, boulos, 07/16/2007
Archive powered by MHonArc 2.6.16.