Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4662/libstage
Modified Files:
canvas.cc gl.cc model.cc model_load.cc region.hh
Log Message:
resource transport demo
Index: gl.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/gl.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gl.cc 3 Mar 2008 06:02:26 -0000 1.3
--- gl.cc 3 Mar 2008 07:01:12 -0000 1.4
***************
*** 49,53 ****
{
snprintf( str, 16, "%d", (int)i );
! gl_draw_string( i, 0, 0.01, str );
}
--- 49,53 ----
{
snprintf( str, 16, "%d", (int)i );
! gl_draw_string( i, 0, 0.00, str );
}
***************
*** 55,59 ****
{
snprintf( str, 16, "%d", (int)i );
! gl_draw_string( 0, i, 0.01, str );
}
}
--- 55,59 ----
{
snprintf( str, 16, "%d", (int)i );
! gl_draw_string( 0, i, 0.00, str );
}
}
Index: region.hh
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/region.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** region.hh 20 Feb 2008 06:04:36 -0000 1.1
--- region.hh 3 Mar 2008 07:01:12 -0000 1.2
***************
*** 112,116 ****
{
glPushMatrix();
! glTranslatef( origin.x<<SRBITS, origin.y<<SRBITS,0 );
glColor3f( 1,0,0 );
--- 112,116 ----
{
glPushMatrix();
! glTranslatef( origin.x<<SRBITS, origin.y<<SRBITS,0);
glColor3f( 1,0,0 );
***************
*** 152,156 ****
{
glPushMatrix();
! glTranslatef( origin.x<<SRBITS, origin.y<<SRBITS,0 );
glRecti( 0,0, 1<<SRBITS, 1<<SRBITS );
glPopMatrix();
--- 152,156 ----
{
glPushMatrix();
! glTranslatef( origin.x<<SRBITS, origin.y<<SRBITS, 0 );
glRecti( 0,0, 1<<SRBITS, 1<<SRBITS );
glPopMatrix();
Index: canvas.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/canvas.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** canvas.cc 3 Mar 2008 06:02:26 -0000 1.11
--- canvas.cc 3 Mar 2008 07:01:12 -0000 1.12
***************
*** 404,408 ****
colorstack.Push( 0,0,0 ); // black
! gl_draw_string( -w()/2+4, -h()/2+4, 0, clockstr );
colorstack.Pop();
--- 404,408 ----
colorstack.Push( 0,0,0 ); // black
! gl_draw_string( -w()/2+4, -h()/2+4, 5, clockstr );
colorstack.Pop();
***************
*** 435,439 ****
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
glEnable(GL_POLYGON_OFFSET_FILL);
! glPolygonOffset(1.0, 1.0);
glScalef( 1.0/world->Resolution(), 1.0/world->Resolution(), 0 );
--- 435,439 ----
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
glEnable(GL_POLYGON_OFFSET_FILL);
! glPolygonOffset(2.0, 2.0);
glScalef( 1.0/world->Resolution(), 1.0/world->Resolution(), 0 );
***************
*** 508,512 ****
if( (stheta == 0) && (sphi == 0) )
! flags |= STG_SHOW_BLOCKS_2D;
((StgModel*)it->data)->Draw( flags );
--- 508,512 ----
if( (stheta == 0) && (sphi == 0) )
! flags |= STG_SHOW_BLOCKS_2D;
((StgModel*)it->data)->Draw( flags );
Index: model_load.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/model_load.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** model_load.cc 3 Mar 2008 06:02:26 -0000 1.8
--- model_load.cc 3 Mar 2008 07:01:12 -0000 1.9
***************
*** 203,207 ****
{
// add thin bounding blocks
! double epsilon = 0.001;
this->AddBlockRect(0,0, epsilon, height );
this->AddBlockRect(0,0, width, epsilon );
--- 203,207 ----
{
// add thin bounding blocks
! double epsilon = 0.01;
this->AddBlockRect(0,0, epsilon, height );
this->AddBlockRect(0,0, width, epsilon );
Index: model.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/model.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** model.cc 3 Mar 2008 06:02:26 -0000 1.9
--- model.cc 3 Mar 2008 07:01:12 -0000 1.10
***************
*** 1334,1338 ****
// TODO - control this properly, and maybe do it faster
! if( 0 )
if( (world->updates % 10 == 0) )
{
--- 1334,1338 ----
// TODO - control this properly, and maybe do it faster
! // if( 0 )
if( (world->updates % 10 == 0) )
{
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
