Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20563/libstage
Modified Files:
Tag: opengl
model_laser.cc stest.cc world.cc
Log Message:
working on ztest for raytracing
Index: stest.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/stest.cc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** stest.cc 22 Oct 2007 09:06:28 -0000 1.1.2.8
--- stest.cc 30 Oct 2007 01:22:44 -0000 1.1.2.9
***************
*** 71,76 ****
//assert(position);
! StgModelLaser* laser = (StgModelLaser*)world.GetModel(
"MyWorld:0.model:1.laser:0" );
! assert(laser);
// StgModelRanger* ranger = (StgModelRanger*)world.GetModel( rangername );
--- 71,79 ----
//assert(position);
! StgModelLaser* laser0 = (StgModelLaser*)world.GetModel(
"MyWorld:0.model:1.laser:0" );
! StgModelLaser* laser1 = (StgModelLaser*)world.GetModel(
"MyWorld:0.model:2.laser:0" );
! StgModelLaser* laser2 = (StgModelLaser*)world.GetModel(
"MyWorld:0.model:3.laser:0" );
! StgModelLaser* laser3 = (StgModelLaser*)world.GetModel(
"MyWorld:0.model:4.laser:0" );
! // assert(laser);
// StgModelRanger* ranger = (StgModelRanger*)world.GetModel( rangername );
***************
*** 79,83 ****
// // subscribe to the laser - starts it collecting data
// position->Subscribe();
! laser->Subscribe();
// ranger->Subscribe();
--- 82,89 ----
// // subscribe to the laser - starts it collecting data
// position->Subscribe();
! laser0->Subscribe();
! laser1->Subscribe();
! laser2->Subscribe();
! laser3->Subscribe();
// ranger->Subscribe();
Index: model_laser.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/model_laser.cc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** model_laser.cc 22 Oct 2007 09:06:28 -0000 1.1.2.6
--- model_laser.cc 30 Oct 2007 01:22:44 -0000 1.1.2.7
***************
*** 155,161 ****
if( (testblock->mod != finder) &&
(testblock->mod->LaserReturn() > 0 ) )
! return 0; // match!
! return 1; // no match
//return( (mod != hitmod) && (hitmod->LaserReturn() > 0) );
--- 155,161 ----
if( (testblock->mod != finder) &&
(testblock->mod->LaserReturn() > 0 ) )
! return TRUE; // match!
! return FALSE; // no match
//return( (mod != hitmod) && (hitmod->LaserReturn() > 0) );
Index: world.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/world.cc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** world.cc 30 Oct 2007 01:01:48 -0000 1.1.2.9
--- world.cc 30 Oct 2007 01:22:44 -0000 1.1.2.10
***************
*** 466,473 ****
StgBlock* block = (StgBlock*)list->data;
assert( block );
!
! // // if this block does not belong to the searching model and
! // // matches the predicate
! if( block && (block->mod != rti->finder) )// && (*rti->func)( block,
rti->arg ) )
{
// a hit!
--- 466,476 ----
StgBlock* block = (StgBlock*)list->data;
assert( block );
!
! // if this block does not belong to the searching model and it
! // matches the predicate and it's in the right z range
! if( block && (block->mod != rti->finder) &&
! (*rti->func)( block, rti->arg ) )//&&
! //z >= block->zmin &&
! // z < block->zmax )
{
// a hit!
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
