Update of /cvsroot/playerstage/code/stage/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7987/src
Modified Files:
Tag: opengl
model.c
Log Message:
DOES NOT BUILD
Index: model.c
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/model.c,v
retrieving revision 1.153.2.6
retrieving revision 1.153.2.7
diff -C2 -d -r1.153.2.6 -r1.153.2.7
*** model.c 5 Jan 2007 04:30:10 -0000 1.153.2.6
--- model.c 5 Jan 2007 05:53:54 -0000 1.153.2.7
***************
*** 276,352 ****
// now shift the endpoint right until it's in correct sorted position
! while( ep->next && (ep->value < ep->next->value) )
! head = endpoint_right( head, ep );
return head;
}
- /* stg_endpoint_t* append_endpoint( stg_endpoint_t* head, stg_endpoint_t* ep
) */
- /* { */
- /* stg_endpoint_t* tail = head; */
-
- /* // run down to the end of the list */
- /* if( tail ) */
- /* { */
- /* while( tail->next ) */
- /* tail = tail->next; */
- /* tail->next = ep; */
- /* } */
-
- /* ep->prev = tail; */
- /* return head; */
- /* } */
-
-
-
- /* // add a polygon in world coordinates */
- /* stg_endpoint_t* world_polygon_register( stg_world_t* world, */
- /* stg_polygon_t* poly ) */
- /* { */
- /* // create the 6 endpoints that represent the global bounding box of */
- /* // this polygon */
- /* stg_endpoint_t* epts = calloc( sizeof(stg_endpoint_t), 6 ); */
-
- /* int i; */
- /* for( i=0; i<6; i++ ) */
- /* { */
- /* epts[i].type = i % 2; // 0 == STG_BEGIN, 1 == STG_END */
- /* epts[i].polygon = poly; */
- /* epts[i].value = poly->bounds[i]; */
- /* } */
-
- /* // add this model's endpoints to the world's lists */
- /* world->endpts.x = insert_endpoint( world->endpts.x, &epts[0] ); */
- /* world->endpts.x = insert_endpoint( world->endpts.x, &epts[1] ); */
- /* world->endpts.y = insert_endpoint( world->endpts.y, &epts[2] ); */
- /* world->endpts.y = insert_endpoint( world->endpts.y, &epts[3] ); */
- /* world->endpts.z = insert_endpoint( world->endpts.z, &epts[4] ); */
- /* world->endpts.z = insert_endpoint( world->endpts.z, &epts[5] ); */
-
- /* return epts; */
- /* } */
-
- /* void world_polygon_unregister( stg_world_t* world, */
- /* stg_polygon_t* poly ) */
- /* { */
- /* // TODO */
- /* } */
-
- /* // the polygon must have previously been registered */
- /* void world_polygon_update( stg_world_t* world, stg_polygon_t* polygon ) */
-
- /* { */
- /* // recalcuate the global bounding box of the polygon */
-
-
- /* bbox->x.min.value = xmin; */
- /* bbox->x.max.value = xmax; */
- /* bbox->y.min.value = ymin; */
- /* bbox->y.max.value = ymax; */
- /* bbox->z.min.value = zmin; */
- /* bbox->z.max.value = zmax; */
- /* } */
-
-
stg_model_t* stg_model_create( stg_world_t* world,
--- 276,285 ----
// now shift the endpoint right until it's in correct sorted position
! //while( ep->next && (ep->value < ep->next->value) )
! //head = endpoint_right( head, ep );
return head;
}
stg_model_t* stg_model_create( stg_world_t* world,
***************
*** 986,994 ****
// add this model's endpoints to the world's lists
stg_world_t* w = mod->world;
! ///w->endpts.x = insert_endpoint( w->endpts.x, &poly->epts[0] );
! w->endpts.x = prepend_endpoint( w->endpts.x, &poly->epts[0] );
!
!
! /* w->endpts.x = insert_endpoint( w->endpts.x, &poly->epts[1] ); */
/* w->endpts.y = insert_endpoint( w->endpts.y, &poly->epts[2] ); */
/* w->endpts.y = insert_endpoint( w->endpts.y, &poly->epts[3] ); */
--- 919,924 ----
// add this model's endpoints to the world's lists
stg_world_t* w = mod->world;
! w->endpts.x = insert_endpoint( w->endpts.x, &poly->epts[0] );
! /* w->endpts.x = insert_endpoint( w->endpts.x, &poly->epts[1] ); */
/* w->endpts.y = insert_endpoint( w->endpts.y, &poly->epts[2] ); */
/* w->endpts.y = insert_endpoint( w->endpts.y, &poly->epts[3] ); */
***************
*** 1014,1017 ****
--- 944,955 ----
g_array_remove_index_fast( mod->polys, 0 );
+
+ // remove the endpoints
+ //mod->world->endpts.x = g_list_remove( mod->world->endpts.x,
&p->epts[0] );
+ /* mod->world->endpts.x = g_list_remove( mod->world->endpts.x,
&p->epts[1] ); */
+ /* mod->world->endpts.y = g_list_remove( mod->world->endpts.y,
&p->epts[2] ); */
+ /* mod->world->endpts.y = g_list_remove( mod->world->endpts.y,
&p->epts[3] ); */
+ /* mod->world->endpts.z = g_list_remove( mod->world->endpts.z,
&p->epts[4] ); */
+ /* mod->world->endpts.z = g_list_remove( mod->world->endpts.z,
&p->epts[5] ); */
}
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
