Text archives Help
- From: sparker@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1023 - in trunk: Engine/ImageTraversers Interface Model/Textures
- Date: Fri, 28 Apr 2006 23:46:48 -0600 (MDT)
Author: sparker
Date: Fri Apr 28 23:46:42 2006
New Revision: 1023
Modified:
trunk/Engine/ImageTraversers/FilteredImageTraverser.cc
trunk/Engine/ImageTraversers/HardTile.cc
trunk/Engine/ImageTraversers/TiledImageTraverser.cc
trunk/Interface/Fragment.h
trunk/Model/Textures/ImageTexture.h
Log:
Retire extra arguments to Fragment left over from compile
Modified: trunk/Engine/ImageTraversers/FilteredImageTraverser.cc
==============================================================================
--- trunk/Engine/ImageTraversers/FilteredImageTraverser.cc (original)
+++ trunk/Engine/ImageTraversers/FilteredImageTraverser.cc Fri Apr 28
23:46:42 2006
@@ -165,7 +165,7 @@
ASSERT( total_fragments < total_allocated );
Fragment &frag = fragment_array[total_fragments++];
- frag.setConsecutiveX( x, xend, y, 0, 999 );
+ frag.setConsecutiveX( x, xend, y, 0 );
}
}
@@ -182,7 +182,7 @@
ASSERT( total_fragments < total_allocated );
Fragment &frag = fragment_array[total_fragments++];
- frag.setConsecutiveX( x, xend, y, 1, 999 );
+ frag.setConsecutiveX( x, xend, y, 1);
}
}
}
Modified: trunk/Engine/ImageTraversers/HardTile.cc
==============================================================================
--- trunk/Engine/ImageTraversers/HardTile.cc (original)
+++ trunk/Engine/ImageTraversers/HardTile.cc Fri Apr 28 23:46:42 2006
@@ -133,7 +133,7 @@
int xnarf = x+Fragment::MaxSize;
if (xnarf > xend) xnarf = xend;
// Create a Fragment that is consecutive in X pixels
- Fragment frag(x, xnarf, y, 0, 999);
+ Fragment frag(x, xnarf, y, 0);
context.pixelSampler->renderFragment(context, frag);
image->set(frag);
}
Modified: trunk/Engine/ImageTraversers/TiledImageTraverser.cc
==============================================================================
--- trunk/Engine/ImageTraversers/TiledImageTraverser.cc (original)
+++ trunk/Engine/ImageTraversers/TiledImageTraverser.cc Fri Apr 28 23:46:42
2006
@@ -131,13 +131,13 @@
if (xnarf > xend) xnarf = xend;
// Create a Fragment that is consecutive in X pixels
- Fragment frag(x, xnarf, y, 0, 999);
+ Fragment frag(x, xnarf, y, 0);
context.pixelSampler->renderFragment(context, frag);
image->set(frag);
// Check to see if we need to render another copy in setero.
if(stereo){
- Fragment fragST(x, xnarf, y, 1, 999);
+ Fragment fragST(x, xnarf, y, 1);
context.pixelSampler->renderFragment(context, fragST);
image->set(fragST);
}
Modified: trunk/Interface/Fragment.h
==============================================================================
--- trunk/Interface/Fragment.h (original)
+++ trunk/Interface/Fragment.h Fri Apr 28 23:46:42 2006
@@ -45,9 +45,9 @@
{}
// Creates a "Scan-line" fragment.
- Fragment(int xstart, int xend, int y, int eye, int)
+ Fragment(int xstart, int xend, int y, int eye)
{
- setConsecutiveX(xstart, xend, y, eye, 999);
+ setConsecutiveX(xstart, xend, y, eye);
}
~Fragment() {}
@@ -67,7 +67,7 @@
which_eye[i] = eye;
}
- void setConsecutiveX(int xstart, int xend, int y, int eye, int) {
+ void setConsecutiveX(int xstart, int xend, int y, int eye) {
ASSERTRANGE(xend-xstart, 0, MaxSize+1);
int nx = xend-xstart;
for(int i=0; i< nx;i++){
Modified: trunk/Model/Textures/ImageTexture.h
==============================================================================
--- trunk/Model/Textures/ImageTexture.h (original)
+++ trunk/Model/Textures/ImageTexture.h Fri Apr 28 23:46:42 2006
@@ -215,7 +215,7 @@
for(int x = 0; x < xres; x+=Fragment::MaxSize) {
int end = x + Fragment::MaxSize;
if (end > xres) end = xres;
- Fragment fragment(x, end, y, 0, 999);
+ Fragment fragment(x, end, y, 0);
image->get(fragment);
for(int i = fragment.begin(); i < fragment.end(); i++) {
texture(x+i, y) = fragment.getColor(i);
- [MANTA] r1023 - in trunk: Engine/ImageTraversers Interface Model/Textures, sparker, 04/28/2006
Archive powered by MHonArc 2.6.16.