changeset 92:663bc2a213f5

*** empty log message ***
author gongo
date Thu, 28 Feb 2008 10:45:40 +0900
parents 4d6bd3c0d90b
children dd33ec2e51b9
files TaskManager/Test/simple_render/Makefile TaskManager/Test/simple_render/polygon.cpp TaskManager/Test/simple_render/task/create_pp.cpp TaskManager/Test/simple_render/task/create_sgp.cpp TaskManager/Test/simple_render/task/create_span.cpp TaskManager/Test/simple_render/task/update_sgp.cpp TaskManager/Test/simple_render/viewer.cpp TaskManager/kernel/schedule/SchedTask.cc
diffstat 8 files changed, 228 insertions(+), 216 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Test/simple_render/Makefile	Wed Feb 27 21:19:13 2008 +0900
+++ b/TaskManager/Test/simple_render/Makefile	Thu Feb 28 10:45:40 2008 +0900
@@ -8,7 +8,7 @@
 TASK_OBJS = $(TASK_SRCS:.cpp=.o)
 
 CC      = g++
-CFLAGS  = -g -Wall -DDEBUG
+CFLAGS  = -g -O9 -Wall -DDEBUG
 INCLUDE = -I../../../include/TaskManager -I.
 
 EXTRA_CFLAGS = `sdl-config --cflags` `xml2-config --cflags`\
--- a/TaskManager/Test/simple_render/polygon.cpp	Wed Feb 27 21:19:13 2008 +0900
+++ b/TaskManager/Test/simple_render/polygon.cpp	Thu Feb 28 10:45:40 2008 +0900
@@ -352,54 +352,45 @@
     }
 }
 
-
-void
-Polygon::draw(SPANPACK *sp)
+void Polygon::draw(SPANPACK *sp)
 {
-    for(int n = 0; n < sp->info.size; n++)
-    {
-	int end = sp->span[n].length_x;
+    SPAN_PTR span;
+
+    for (int n = 0; n < sp->info.size; n++) {
+	span = &sp->span[n];
+
+	//int x = span->x;
+	//int y = span->y;
+	float z = span->start_z;
+	int end = span->length_x;
+	float zpos = span->end_z;
+	float tex1 = span->tex_x1;
+	float tex2 = span->tex_x2;
+	float tey1 = span->tex_y1;
+	float tey2 = span->tex_y2;
 	Uint32 rgb;
-	float tex1 = sp->span[n].tex_x1;
-	float tex2= sp->span[n].tex_x2;
-	float tey1 = sp->span[n].tex_y1;
-	float tey2= sp->span[n].tex_y2;
 	int tex_xpos;
 	int tex_ypos;
 	int tex_zpos;
-	int x = sp->span[n].x;
-	int y = sp->span[n].y;
-	float z = sp->span[n].start_z;
-	float zpos = sp->span[n].end_z;
-	float tex_x,tex_y,tex_z;
+	float tex_x, tex_y, tex_z;
       
-	if(end == 1) {
-	    //printf("end == 1\n");
-	    //printf("tex_x:%f tex_y:%f\n",tex1,tex2);
-	    //if(tex1 > 1) tex1 = 1;
-	    //if(tey1 > 1) tey1 = 1;
-	    tex_xpos = (int)((sp->span[n].tex_height-1) * tex1);
-	    tex_ypos = (int)((sp->span[n].tex_width-1) * tey1);
+	if (end == 1) {
+	    tex_xpos = (int)((span->tex_height-1) * tex1);
+	    tex_ypos = (int)((span->tex_width-1) * tey1);
 	    tex_zpos = (int)z;
-	    //printf("tex_xpos:%d tex_ypos:%d\n",tex_xpos,tex_ypos);
-	    //printf("image->h:%d tex_x:%f\n",(int)sp->span[n].tex_height,tex1);
-	    rgb = get_rgb(tex_xpos,tex_ypos);
-	    viewer->write_pixel(x,y,zpos,rgb);
-	}else {
-	    //printf("end != 1\n");
-	    for(int j = 0; j < end; j++) {
+	    rgb = get_rgb(tex_xpos, tex_ypos);
+	    viewer->write_pixel(span->x, span->y, zpos, rgb);
+	} else {
+	    for (int j = 0; j < end; j++) {
 		tex_x = tex1*(end-1-j)/(end-1) + tex2*j/(end-1);
 		tex_y = tey1*(end-1-j)/(end-1) + tey2*j/(end-1);
 		tex_z = z*(end-1-j)/(end-1) + zpos*j/(end-1);
-		if(tex_x > 1) tex_x = 1;
-		if(tex_y > 1) tex_y = 1;
-		tex_xpos = (int)((sp->span[n].tex_height-1) * tex_x);
-		tex_ypos = (int)((sp->span[n].tex_width-1) * tex_y);
-		//printf("tex_xpos:%d tex_ypos:%d\n",tex_xpos,tex_ypos);
-		//printf("z:%f zpos:%f tex_z:%f\n",z,zpos,tex_z);
-		//printf("tex_x:%f tex_y:%f\n",tex_x,tex_y);
+		if (tex_x > 1) tex_x = 1;
+		if (tex_y > 1) tex_y = 1;
+		tex_xpos = (int)((span->tex_height-1) * tex_x);
+		tex_ypos = (int)((span->tex_width-1) * tex_y);
 		rgb = get_rgb(tex_xpos,tex_ypos);
-		viewer->write_pixel(j+x,y,tex_z,rgb);
+		viewer->write_pixel(j + span->x, span->y, tex_z, rgb);
 	    }
 	}
     }
@@ -411,7 +402,8 @@
     SPANPACK_PTR spanPack;
     SPAN_PTR span;
 
-    for (int i = 0; i < ss->length; i++) {
+    //for (int i = 0; i < ss->length; i++) {
+    for (int i = 0; i < 10; i++) {
 	spanPack = &ss->spp[i];
 
 	for(int n = 0; n < spanPack->info.size; n++) {
--- a/TaskManager/Test/simple_render/task/create_pp.cpp	Wed Feb 27 21:19:13 2008 +0900
+++ b/TaskManager/Test/simple_render/task/create_pp.cpp	Thu Feb 28 10:45:40 2008 +0900
@@ -11,14 +11,13 @@
 {
     float xyz1[4],xyz2[4],xyz3[4];
 
-    __debug("[%s] sgp = 0x%x, pp = 0x%x\n", __FUNCTION__,
-	    (unsigned int)sgp,(unsigned int)pp);
+    __debug("[%s]\n", __FUNCTION__);
 
     for (int i = 0; i < sgp->info.size; i++) {
 	SceneGraphNodePtr node = &sgp->node[i];
     
-	int n,nt,pt;
-	for(n=0,nt=0,pt=0; n<node->size*3; n+=9,nt+=6,pt++) {
+	int n, nt , pt;
+	for (n = 0, nt = 0, pt = 0; n < node->size*3; n+=9, nt+=6, pt++) {
 	    xyz1[0] = node->vertex[n];
 	    xyz1[1] = node->vertex[n+1];
 	    xyz1[2] = node->vertex[n+2]*-1;
@@ -54,7 +53,7 @@
 	    pp->tri[pt].ver3.tex_x = node->texture[nt+4];
 	    pp->tri[pt].ver3.tex_y = node->texture[nt+4+1];
 
-	    //pp->tri[pt].tex_addr = node->tex_addr;
+	    pp->tri[pt].tex_addr = node->tex_addr;
 	    pp->tri[pt].tex_width = node->tex_width;
 	    pp->tri[pt].tex_height = node->tex_height;
 
--- a/TaskManager/Test/simple_render/task/create_sgp.cpp	Wed Feb 27 21:19:13 2008 +0900
+++ b/TaskManager/Test/simple_render/task/create_sgp.cpp	Thu Feb 28 10:45:40 2008 +0900
@@ -1,4 +1,4 @@
-//#include <iostream>
+#include <iostream>
 #include "scene_graph_pack.h"
 #include "polygon.h"
 using namespace std;
@@ -45,6 +45,10 @@
 	node->interaction = 0;
 	node->pn = nnpn;
 
+	//node->tex_addr = t->texture_image->pixels;
+	node->tex_width = t->texture_image->w;
+	node->tex_height = t->texture_image->h;
+
 	if(t->child != NULL)
 	{
 	    nnpn = i;
--- a/TaskManager/Test/simple_render/task/create_span.cpp	Wed Feb 27 21:19:13 2008 +0900
+++ b/TaskManager/Test/simple_render/task/create_span.cpp	Thu Feb 28 10:45:40 2008 +0900
@@ -5,199 +5,215 @@
 
 
 static float calc(float f1, float f2,int i, float base){
-  float ans;
-  ans = f1/f2*i + base;
-  return ans;
+    float ans;
+    ans = f1/f2*i + base;
+    return ans;
 }
 
 
 static VertexPack *vMid1(VertexPack *vMid1,VertexPack *vMin, VertexPack *vMid, VertexPack *vMax) {
-  float d,d1;
-  d = (int)vMax->y-(int)vMin->y;
-  d1 = (int)vMid->y - (int)vMin->y;
-  vMid1->tex_x  = calc(vMax->tex_x - vMin->tex_x, d, (int)d1 , vMin->tex_x
-		       );
-  vMid1->tex_y  = calc(vMax->tex_y - vMin->tex_y, d, (int)d1 , vMin->tex_y
-		       );
-  vMid1->x      = calc(vMax->x - vMin->x, d, (int)d1 , vMin->x);
-  vMid1->y      = vMid->y;
-  vMid1->z      = calc(vMax->z - vMin->z, d, (int)d1 , vMin->z);
-  //printf("x:%f y:%f z:%f tex_x:%f tex_y:%f\n",vMid1->x,vMid1->y,vMid1->z,vMid1->tex_x, vMid1->tex_y);
-  return vMid1;
+    float d,d1;
+    d = (int)vMax->y-(int)vMin->y;
+    d1 = (int)vMid->y - (int)vMin->y;
+    vMid1->tex_x  = calc(vMax->tex_x - vMin->tex_x, d, (int)d1 , vMin->tex_x
+	);
+    vMid1->tex_y  = calc(vMax->tex_y - vMin->tex_y, d, (int)d1 , vMin->tex_y
+	);
+    vMid1->x      = calc(vMax->x - vMin->x, d, (int)d1 , vMin->x);
+    vMid1->y      = vMid->y;
+    vMid1->z      = calc(vMax->z - vMin->z, d, (int)d1 , vMin->z);
+    //printf("x:%f y:%f z:%f tex_x:%f tex_y:%f\n",vMid1->x,vMid1->y,vMid1->z,vMid1->tex_x, vMid1->tex_y);
+    return vMid1;
 }
 
 void half_triangle(SPUSPANLIST *ssl, long *tex_addr, long tex_width, long tex_height, VertexPack *vMin, VertexPack *vMid, VertexPack *vMid1) {
 //void half_triangle(SPANPACK *sp, long *tex_addr, long tex_width, long tex_height, VertexPack *vMin, VertexPack *vMid, VertexPack *vMid1) {
-  float tmp_z,tmp_tex1, tmp_tex2 ,tmp_tey1,tmp_tey2;
-  float tmp_xpos,tmp_end,tmp_zpos;
-  int i;
-  //int j;
-  float div_y;
-  float start_z,end_z;
-  float start_tex_x,end_tex_x,start_tex_y,end_tex_y;
-  int x,y,length;
-  int k =0;
-  int l = 1;
-  int start_y = (int)vMid->y;
-  int end_y   = (int)vMin->y; 
+    float tmp_z,tmp_tex1, tmp_tex2 ,tmp_tey1,tmp_tey2;
+    float tmp_xpos,tmp_end,tmp_zpos;
+    int i;
+    //int j;
+    float div_y;
+    float start_z,end_z;
+    float start_tex_x,end_tex_x,start_tex_y,end_tex_y;
+    int x,y,length;
+    int k =0;
+    int l = 1;
+    int start_y = (int)vMid->y;
+    int end_y   = (int)vMin->y; 
         
-  if (start_y<end_y) { 
-    int i; i=end_y; end_y=start_y; start_y = i;
-    k = 1;
-    l = -1;
-  }
+    if (start_y<end_y) { 
+	int i; i=end_y; end_y=start_y; start_y = i;
+	k = 1;
+	l = -1;
+    }
 
-  div_y = start_y - end_y;  // > 0
-
-  //cout << "div_y : " << div_y+1 << endl;
+    div_y = start_y - end_y;  // > 0
 
-  for(i = k; i < div_y+1; i++) {
-    tmp_xpos = calc(vMid1->x - vMin->x ,div_y, i, vMin->x);
-    tmp_end =  calc(vMid->x  - vMin->x ,div_y, i, vMin->x); 
-    tmp_z =    calc(vMid1->z - vMin->z ,div_y, i, vMin->z);
-    tmp_zpos = calc(vMid->z  - vMin->z ,div_y, i, vMin->z);
-    //printf("x:%f end:%f z:%f zpos:%f\n",tmp_xpos,tmp_end,tmp_z,tmp_zpos);
+    //cout << "div_y : " << div_y+1 << endl;
 
-    tmp_tex1 =((i/(div_y)) * vMid1->tex_x) + \
-      ( ((div_y - i)/(div_y)) * vMin->tex_x); 
-    tmp_tex2 =( (i/(div_y)) * vMid->tex_x) + \
-      ( ((div_y - i)/(div_y)) * vMin->tex_x); 
+    for(i = k; i < div_y+1; i++) {
+	tmp_xpos = calc(vMid1->x - vMin->x ,div_y, i, vMin->x);
+	tmp_end =  calc(vMid->x  - vMin->x ,div_y, i, vMin->x); 
+	tmp_z =    calc(vMid1->z - vMin->z ,div_y, i, vMin->z);
+	tmp_zpos = calc(vMid->z  - vMin->z ,div_y, i, vMin->z);
+	//printf("x:%f end:%f z:%f zpos:%f\n",tmp_xpos,tmp_end,tmp_z,tmp_zpos);
 
-    tmp_tey1 =( (i/(div_y)) * vMid1->tex_y) + \
-      ( ((div_y - i)/(div_y)) * vMin->tex_y); 
-    tmp_tey2 =( (i/(div_y)) * vMid->tex_y) + \
-      ( ((div_y - i)/(div_y)) * vMin->tex_y); 
-    if(tmp_xpos > tmp_end) {
-      x = (int)tmp_end;
-      y = (int)vMin->y + i*l;
-      length = (int)(tmp_xpos)-(int)(tmp_end)+1;
-      start_z = tmp_zpos;
-      end_z = tmp_z;
-      start_tex_x = tmp_tex2;
-      end_tex_x = tmp_tex1;
-      start_tex_y = tmp_tey2;
-      end_tex_y = tmp_tey1;
-    } else {
-      x = (int)tmp_xpos;
-      y = (int)vMin->y + i*l;
-      length = (int)(tmp_end)-(int)(tmp_xpos)+1;
-      start_z = tmp_z;
-      end_z = tmp_zpos;
-      start_tex_x = tmp_tex1;
-      end_tex_x = tmp_tex2;
-      start_tex_y = tmp_tey1;
-      end_tex_y = tmp_tey2;
-    }
-    //printf("x:%d y:%d end:%d z:%f zpos:%f\n",x,y,length,start_z , end_z);
-    //printf("start_tex_x:%f end_tex_x:%f start_tex_y:%f end_tex_y:%fn",start_tex_x,end_tex_x,start_tex_y,end_tex_y);
+	tmp_tex1 =((i/(div_y)) * vMid1->tex_x) +	\
+	    ( ((div_y - i)/(div_y)) * vMin->tex_x); 
+	tmp_tex2 =( (i/(div_y)) * vMid->tex_x) +	\
+	    ( ((div_y - i)/(div_y)) * vMin->tex_x); 
+    
+	tmp_tey1 =( (i/(div_y)) * vMid1->tex_y) +	\
+	    ( ((div_y - i)/(div_y)) * vMin->tex_y); 
+	tmp_tey2 =( (i/(div_y)) * vMid->tex_y) +	\
+	    ( ((div_y - i)/(div_y)) * vMin->tex_y); 
+	if (tmp_xpos > tmp_end) {
+	    x = (int)tmp_end;
+	    y = (int)vMin->y + i*l;
+	    length = (int)(tmp_xpos)-(int)(tmp_end)+1;
+	    start_z = tmp_zpos;
+	    end_z = tmp_z;
+	    start_tex_x = tmp_tex2;
+	    end_tex_x = tmp_tex1;
+	    start_tex_y = tmp_tey2;
+	    end_tex_y = tmp_tey1;
+	} else {
+	    x = (int)tmp_xpos;
+	    y = (int)vMin->y + i*l;
+	    length = (int)(tmp_end)-(int)(tmp_xpos)+1;
+	    start_z = tmp_z;
+	    end_z = tmp_zpos;
+	    start_tex_x = tmp_tex1;
+	    end_tex_x = tmp_tex2;
+	    start_tex_y = tmp_tey1;
+	    end_tex_y = tmp_tey2;
+	}
+	//printf("x:%d y:%d end:%d z:%f zpos:%f\n",x,y,length,start_z , end_z);
+	//printf("start_tex_x:%f end_tex_x:%f start_tex_y:%f end_tex_y:%fn",start_tex_x,end_tex_x,start_tex_y,end_tex_y);
+
+	//add(tex_addr,tex_width,tex_height,x,y,length,start_z,end_z,start_tex_x,end_tex_x,start_tex_y,end_tex_y);
+
+	//y += 540;   // window_height = 1080  (1080/2 = 540)
+	y += 240;   // window_height = 480  (480/2 = 240)
+
+	int line_set = y/8;
 
-    //add(tex_addr,tex_width,tex_height,x,y,length,start_z,end_z,start_tex_x,end_tex_x,start_tex_y,end_tex_y);
-
-    //y += 540;   // window_height = 1080  (1080/2 = 540)
-    y += 240;   // window_height = 480  (480/2 = 240)
-
-    int line_set = y/8;
+	//y -= 540;   // window_height = 1080  (1080/2 = 540)
+	y -= 240;   // window_height = 480  (480/2 = 240)
 
-    //y -= 540;   // window_height = 1080  (1080/2 = 540)
-    y -= 240;   // window_height = 480  (480/2 = 240)
-
-    int spu_no = line_set%6;
+	int spu_no = line_set%6;
    
-    int spp_no = line_set/6;
-    int span_no = ssl->ss[spu_no].spp[spp_no].info.size;
+	int spp_no = line_set/6;
+	int span_no = ssl->ss[spu_no].spp[spp_no].info.size;
 
-    ssl->ss[spu_no].spp[spp_no].span[span_no].tex_addr = tex_addr;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].tex_width = tex_width;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].tex_height = tex_height;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].x = x;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].y = y;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].length_x = length;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].start_z = start_z;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].end_z = end_z;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].tex_x1 = start_tex_x;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].tex_x2 = end_tex_x;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].tex_y1 = start_tex_y;
-    ssl->ss[spu_no].spp[spp_no].span[span_no].tex_y2 = end_tex_y;
+#if 0 
+	ssl->ss[spu_no].spp[spp_no].span[span_no].tex_addr = tex_addr;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].tex_width = tex_width;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].tex_height = tex_height;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].x = x;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].y = y;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].length_x = length;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].start_z = start_z;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].end_z = end_z;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].tex_x1 = start_tex_x;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].tex_x2 = end_tex_x;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].tex_y1 = start_tex_y;
+	ssl->ss[spu_no].spp[spp_no].span[span_no].tex_y2 = end_tex_y;
+#else // 配列アクセスを無くしたつもり
+	SPAN_PTR span = &ssl->ss[spu_no].spp[spp_no].span[span_no];
 
-    ssl->ss[spu_no].spp[spp_no].info.size++;
-  }
+	span->tex_addr   = tex_addr;
+	span->tex_width  = tex_width;
+	span->tex_height = tex_height;
+	span->x          = x;
+	span->y          = y;
+	span->length_x   = length;
+	span->start_z    = start_z;
+	span->end_z      = end_z;
+	span->tex_x1     = start_tex_x;
+	span->tex_x2     = end_tex_x;
+	span->tex_y1     = start_tex_y;
+	span->tex_y2     = end_tex_y;
+#endif
+	ssl->ss[spu_no].spp[spp_no].info.size++;
+    }
 }
 
 
 int create_span(void *rbuf,void *wbuf) {
-  //POLYGONPACK *polygon = (POLYGONPACK*)rbuf;
-  PolygonPack *polygon = (PolygonPack*)rbuf;
-  //SPANPACK *sp = (SPANPACK*)wbuf;
-  //SPANPACKLIST *spl = (SPANPACKLIST*)wbuf;
-  //SPANPACKLIST *spl = polygon->spl;
-  SPUSPANLIST *ssl = polygon->ssl;
-  VertexPack *vMin, *vMid, *vMax, *vMid10;
-  VertexPack ver;
-  vMid10 = &ver;
+    //POLYGONPACK *polygon = (POLYGONPACK*)rbuf;
+    PolygonPack *polygon = (PolygonPack*)rbuf;
+    //SPANPACK *sp = (SPANPACK*)wbuf;
+    //SPANPACKLIST *spl = (SPANPACKLIST*)wbuf;
+    //SPANPACKLIST *spl = polygon->spl;
+    SPUSPANLIST *ssl = polygon->ssl;
+    VertexPack *vMin, *vMid, *vMax, *vMid10;
+    VertexPack ver;
+    vMid10 = &ver;
 
-  //cout << "create_span:spl->size = " << spl->size << endl;
-  //cout << "create_span:spl->dline[0].span = " << spl->dline[0].span << endl;
+    //cout << "create_span:spl->size = " << spl->size << endl;
+    //cout << "create_span:spl->dline[0].span = " << spl->dline[0].span << endl;
 
-  //for(int i=0; i<spl->size; i++)
-  for(int i=0; i<6; i++)  // 6 = number of SPU
+    //for(int i=0; i<spl->size; i++)
+    for(int i=0; i<6; i++)  // 6 = number of SPU
     {
-      ssl->ss[i].length = 0;
-      //for(int t=0; t<10; t++)   // window_height = 1080  ( 1080/8/6 = 22.5 )
-      for(int t=0; t<10; t++)    // window_height = 480  (480/8/6 = 10)
+	ssl->ss[i].length = 0;
+	//for(int t=0; t<10; t++)   // window_height = 1080  ( 1080/8/6 = 22.5 )
+	for(int t=0; t<10; t++)    // window_height = 480  (480/8/6 = 10)
 	{
-	  ssl->ss[i].spp[t].info.size = 0;
+	    ssl->ss[i].spp[t].info.size = 0;
 	}
     }
 
-  //sp->info.size = 0;
+    //sp->info.size = 0;
 
-  //cout << sizeof(SPANPACK) << endl;
-  //cout << "polygon size : " << polygon->info.size << endl;
-
-  for(int a=0; a<polygon->info.size; a++) {
-    //cout << "a = " << a << endl;
+    //cout << sizeof(SPANPACK) << endl;
     //cout << "polygon size : " << polygon->info.size << endl;
-    if(polygon->tri[a].ver1.y <= polygon->tri[a].ver2.y) {
-      if(polygon->tri[a].ver2.y <= polygon->tri[a].ver3.y) {
-	vMin = &polygon->tri[a].ver1;
-	vMid = &polygon->tri[a].ver2;
-	vMax = &polygon->tri[a].ver3;
-      } else if(polygon->tri[a].ver3.y <= polygon->tri[a].ver1.y) {
-	vMin = &polygon->tri[a].ver3;
-	vMid = &polygon->tri[a].ver1;
-	vMax = &polygon->tri[a].ver2;
-      } else {
-	vMin = &polygon->tri[a].ver1;
-	vMid = &polygon->tri[a].ver3;
-	vMax = &polygon->tri[a].ver2;
-      }
-    } else {
-      if(polygon->tri[a].ver1.y <= polygon->tri[a].ver3.y) {
-	vMin = &polygon->tri[a].ver2;
-	vMid = &polygon->tri[a].ver1;
-	vMax = &polygon->tri[a].ver3;
-      } else if(polygon->tri[a].ver3.y <= polygon->tri[a].ver2.y) {
-	vMin = &polygon->tri[a].ver3;
-	vMid = &polygon->tri[a].ver2;
-	vMax = &polygon->tri[a].ver1;
-      } else {
-	vMin = &polygon->tri[a].ver2;
-	vMid = &polygon->tri[a].ver3;
-	vMax = &polygon->tri[a].ver1;
-      }
+
+    for(int a = 0; a < polygon->info.size; a++) {
+	//cout << "a = " << a << endl;
+	//cout << "polygon size : " << polygon->info.size << endl;
+	if (polygon->tri[a].ver1.y <= polygon->tri[a].ver2.y) {
+	    if (polygon->tri[a].ver2.y <= polygon->tri[a].ver3.y) {
+		vMin = &polygon->tri[a].ver1;
+		vMid = &polygon->tri[a].ver2;
+		vMax = &polygon->tri[a].ver3;
+	    } else if (polygon->tri[a].ver3.y <= polygon->tri[a].ver1.y) {
+		vMin = &polygon->tri[a].ver3;
+		vMid = &polygon->tri[a].ver1;
+		vMax = &polygon->tri[a].ver2;
+	    } else {
+		vMin = &polygon->tri[a].ver1;
+		vMid = &polygon->tri[a].ver3;
+		vMax = &polygon->tri[a].ver2;
+	    }
+	} else {
+	    if (polygon->tri[a].ver1.y <= polygon->tri[a].ver3.y) {
+		vMin = &polygon->tri[a].ver2;
+		vMid = &polygon->tri[a].ver1;
+		vMax = &polygon->tri[a].ver3;
+	    } else if (polygon->tri[a].ver3.y <= polygon->tri[a].ver2.y) {
+		vMin = &polygon->tri[a].ver3;
+		vMid = &polygon->tri[a].ver2;
+		vMax = &polygon->tri[a].ver1;
+	    } else {
+		vMin = &polygon->tri[a].ver2;
+		vMid = &polygon->tri[a].ver3;
+		vMax = &polygon->tri[a].ver1;
+	    }
+	}
+
+	//cout << vMid->y << endl;
+	//cout << vMin->y << endl;
+
+	vMid1(vMid10,vMin,vMid,vMax);
+
+	half_triangle(ssl,polygon->tri[a].tex_addr,polygon->tri[a].tex_width,polygon->tri[a].tex_height,vMin,vMid,vMid10);
+	half_triangle(ssl,polygon->tri[0].tex_addr,polygon->tri[0].tex_width,polygon->tri[0].tex_height,vMax,vMid,vMid10);
+	//printf("x:%d y:%d end:%d z:%f zpos:%f\n",sp->span[0].x,sp->span[0].y,sp->span[0].length_x,sp->span[0].start_z , sp->span[0].end_z);
     }
-
-    //cout << vMid->y << endl;
-    //cout << vMin->y << endl;
-
-    vMid1(vMid10,vMin,vMid,vMax);
+    //printf("create_span  x:%d y:%d end:%d z:%f zpos:%f\n",sp->span[0].x,sp->span[0].y,sp->span[0].length_x,sp->span[0].start_z , sp->span[0].end_z);
+    return 0;
 
-    half_triangle(ssl,polygon->tri[a].tex_addr,polygon->tri[a].tex_width,polygon->tri[a].tex_height,vMin,vMid,vMid10);
-    half_triangle(ssl,polygon->tri[0].tex_addr,polygon->tri[0].tex_width,polygon->tri[0].tex_height,vMax,vMid,vMid10);
-    //printf("x:%d y:%d end:%d z:%f zpos:%f\n",sp->span[0].x,sp->span[0].y,sp->span[0].length_x,sp->span[0].start_z , sp->span[0].end_z);
-  }
-  //printf("create_span  x:%d y:%d end:%d z:%f zpos:%f\n",sp->span[0].x,sp->span[0].y,sp->span[0].length_x,sp->span[0].start_z , sp->span[0].end_z);
-  return 0;
-
-  //return sizeof(SPANPACKLIST);
+    //return sizeof(SPANPACKLIST);
 }
--- a/TaskManager/Test/simple_render/task/update_sgp.cpp	Wed Feb 27 21:19:13 2008 +0900
+++ b/TaskManager/Test/simple_render/task/update_sgp.cpp	Thu Feb 28 10:45:40 2008 +0900
@@ -45,6 +45,6 @@
     // それはユーザ側で in/out になるように書かせるもの?
     memcpy(_sgp, sgp, sizeof(SceneGraphPack));
   
-    //return sizeof(SceneGraphPack);
-    return 0;
+    return sizeof(SceneGraphPack);
+    //return 0;
 }
--- a/TaskManager/Test/simple_render/viewer.cpp	Wed Feb 27 21:19:13 2008 +0900
+++ b/TaskManager/Test/simple_render/viewer.cpp	Thu Feb 28 10:45:40 2008 +0900
@@ -343,8 +343,8 @@
 	= manager->create_task(fd_create_pp, sizeof(SceneGraphPack),
 			       (uint32)sgp, (uint32)pp, NULL);
     task_create_sp 
- 	= manager->create_task(fd_create_sp, sizeof(SceneGraphPack),
-			       (uint32)pp, (uint32)ssl, NULL);
+ 	= manager->create_task(fd_create_sp, sizeof(PolygonPack),
+			       (uint32)pp, 0, NULL);
 #endif
 
 #if 0
@@ -381,8 +381,8 @@
  */
 
 //#define DRAW_POLYGON
-#define DRAW_SPANPACK
-//#define DRAW_SPUSPAN
+//#define DRAW_SPANPACK
+#define DRAW_SPUSPAN
 void
 Viewer::run_draw(void)
 {
@@ -419,6 +419,7 @@
     polygon->draw(&ssl->ss[5]);
 #  endif
 #endif
+
     SDL_BlitSurface(bitmap, NULL, screen, NULL);
     SDL_UpdateRect(screen, 0, 0, 0, 0);    
 
--- a/TaskManager/kernel/schedule/SchedTask.cc	Wed Feb 27 21:19:13 2008 +0900
+++ b/TaskManager/kernel/schedule/SchedTask.cc	Thu Feb 28 10:45:40 2008 +0900
@@ -47,9 +47,9 @@
     // 最初から void* じゃなくて 関数ポインタ としていれるべきか?
     int (*func)(void*, void*)
 	= (int (*)(void*,void*))TaskManager::get_address(task->command);
-    //task->in_size = func(readbuf, writebuf);
-    task->in_size = func((void*)task->in_addr, (void*)task->out_addr);
-    //connector->dma_store(writebuf, task->out_addr, task->in_size, DMA_WRITE);
+    task->in_size = func(readbuf, writebuf);
+    //task->in_size = func((void*)task->in_addr, (void*)task->out_addr);
+    connector->dma_store(writebuf, task->out_addr, task->in_size, DMA_WRITE);
 }
 
 void