Mercurial > hg > Members > kono > Cerium

changeset 204:3c632793eaf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author gongo@gendarme.cr.ie.u-ryukyu.ac.jp
date Mon, 26 Jan 2009 18:34:30 +0900
parents 5c6c9667ac61
children efb1df3176f4
files TaskManager/Test/test_render/task/CreateSpan.cpp TaskManager/Test/test_render/viewer.cpp
diffstat 2 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Test/test_render/task/CreateSpan.cpp	Mon Jan 26 18:30:35 2009 +0900
+++ b/TaskManager/Test/test_render/task/CreateSpan.cpp	Mon Jan 26 18:34:30 2009 +0900
@@ -168,6 +168,7 @@
     }
 
     return (scale > scale_max) ? scale_max : scale;
+    //return scale_max;
 }
 
 /**
@@ -384,8 +385,13 @@
 			     (int)(span->tex_width*tex_x_len),
 			     (int)(span->tex_height*tex_y_len), tex_scale_max);
 
+	//scale = (scale > tex_scale_max) ? tex_scale_max : 8;
+	
 	uint32 *tapestry = getTapestry(tex_width, tex_height, scale, tex_addr);
 
+	//printf("%p = getTapestry(%d, %d, %d, %p)\n", tapestry,
+	//tex_width, tex_height, scale, tex_addr);
+
 	span->tex_addr   = tapestry;
 	span->tex_width  = tex_width/scale;
 	span->tex_height = tex_height/scale;
@@ -492,10 +498,17 @@
 			  triPack->tex_info.scale_max, vMin, vMid, vMid10,
 			  (int)(vMax->y - vMin->y), vMax->tex_y - vMin->tex_y);
 	    half_triangle(spackList, charge_y_top, charge_y_end,
+#if 0
 			  pp->tri[0].tex_info.addr,
 			  pp->tri[0].tex_info.width,
 			  pp->tri[0].tex_info.height,
 			  pp->tri[0].tex_info.scale_max, vMax, vMid, vMid10,
+#else
+			  triPack->tex_info.addr,
+			  triPack->tex_info.width,
+			  triPack->tex_info.height,
+			  triPack->tex_info.scale_max, vMax, vMid, vMid10,
+#endif
 			  (int)(vMax->y - vMin->y), vMax->tex_y - vMin->tex_y);
 	}
 
--- a/TaskManager/Test/test_render/viewer.cpp	Mon Jan 26 18:30:35 2009 +0900
+++ b/TaskManager/Test/test_render/viewer.cpp	Mon Jan 26 18:34:30 2009 +0900
@@ -340,7 +340,7 @@
 		}
 #else
 		memset(&pixels[(startx-1)+this->width*(starty-1)],
-		       0xFF, (this->width)*sizeof(int)*rangey);
+		       0x00, (this->width)*sizeof(int)*rangey);
 		break;
 #endif
 	    }