Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3243
Modified Files:
world.cc
Log Message:
tweaks only
Index: world.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/world.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** world.cc 1 Feb 2008 03:11:02 -0000 1.4
--- world.cc 2 Feb 2008 00:51:10 -0000 1.5
***************
*** 56,63 ****
const stg_msec_t STG_DEFAULT_WORLD_INTERVAL_SIM = 100; ///< duration of sim
timestep
- // TODO: fix the quadtree code so we don't need a world size
- //const stg_meters_t STG_DEFAULT_WORLD_WIDTH = 20.0;
- //const stg_meters_t STG_DEFAULT_WORLD_HEIGHT = 20.0;
-
// static data members
unsigned int StgWorld::next_id = 0;
--- 56,59 ----
***************
*** 260,265 ****
}
- // todo: get rid of width and height
-
StgWorld::StgWorld( void )
{
--- 256,259 ----
***************
*** 268,273 ****
STG_DEFAULT_WORLD_INTERVAL_REAL,
STG_DEFAULT_WORLD_PPM );
- //STG_DEFAULT_WORLD_WIDTH,
- //STG_DEFAULT_WORLD_HEIGHT );
}
--- 262,265 ----
***************
*** 276,281 ****
stg_msec_t interval_real,
double ppm )
- //double width,
- //double height )
{
Initialize( token, interval_sim, interval_real, ppm );//, width, height );
--- 268,271 ----
***************
*** 286,291 ****
stg_msec_t interval_real,
double ppm )
- //double width,
- //double height )
{
if( ! Stg::InitDone() )
--- 276,279 ----
***************
*** 314,317 ****
--- 302,306 ----
this->interval_sim = (stg_usec_t)thousand * interval_sim;
this->interval_real = (stg_usec_t)thousand * interval_real;
+ this->ppm = ppm; // this is the raytrace resolution
this->real_time_start = RealTimeNow();
***************
*** 320,327 ****
this->update_list = NULL;
this->velocity_list = NULL;
-
- // this->width = width;
- //this->height = height;
- this->ppm = ppm; // this is the finest resolution of the matrix
this->superregions = g_hash_table_new( (GHashFunc)PointIntHash,
--- 309,312 ----
***************
*** 437,446 ****
1.0 / wf->ReadFloat( entity, "resolution", this->ppm );
- // this->width =
- // wf->ReadTupleFloat( entity, "size", 0, this->width );
-
- // this->height =
- // wf->ReadTupleFloat( entity, "size", 1, this->height );
-
this->paused =
wf->ReadInt( entity, "paused", this->paused );
--- 422,425 ----
***************
*** 662,667 ****
// find the global integer bitmap address of the ray
- //int32_t x = (int32_t)((pose.x+width/2.0)*ppm);
- //int32_t y = (int32_t)((pose.y+height/2.0)*ppm);
int32_t x = (int32_t)(pose.x*ppm);
int32_t y = (int32_t)(pose.y*ppm);
--- 641,644 ----
***************
*** 722,728 ****
sr = (SuperRegion*)g_hash_table_lookup( superregions, (void*)&sup );
lastsup = sup; // remember these coords
-
- //puts( "LOOKED UP SR" );
-
}
--- 699,702 ----
-------------------------------------------------------------------------
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
