Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29545/libstage
Modified Files:
Makefile Makefile.am canvas.cc model.cc world.cc
Log Message:
fixed bug in automake script
Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile 1 Feb 2008 03:11:01 -0000 1.4
--- Makefile 12 Feb 2008 02:53:53 -0000 1.5
***************
*** 39,45 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! build_triplet = i386-apple-darwin9.1.0
! host_triplet = i386-apple-darwin9.1.0
! target_triplet = i386-apple-darwin9.1.0
bin_PROGRAMS = stest$(EXEEXT)
subdir = libstage
--- 39,45 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
! build_triplet = i386-apple-darwin9.2.0
! host_triplet = i386-apple-darwin9.2.0
! target_triplet = i386-apple-darwin9.2.0
bin_PROGRAMS = stest$(EXEEXT)
subdir = libstage
***************
*** 65,69 ****
LTLIBRARIES = $(lib_LTLIBRARIES)
libstage_la_DEPENDENCIES =
! am_libstage_la_OBJECTS = ancestor.lo block.lo blockgrid.lo canvas.lo \
glcolorstack.lo model.lo model_callbacks.lo model_fiducial.lo \
model_laser.lo model_load.lo model_position.lo model_ranger.lo \
--- 65,69 ----
LTLIBRARIES = $(lib_LTLIBRARIES)
libstage_la_DEPENDENCIES =
! am_libstage_la_OBJECTS = ancestor.lo block.lo canvas.lo \
glcolorstack.lo model.lo model_callbacks.lo model_fiducial.lo \
model_laser.lo model_load.lo model_position.lo model_ranger.lo \
***************
*** 186,193 ****
am__untar = tar -xf -
bindir = ${exec_prefix}/bin
! build = i386-apple-darwin9.1.0
build_alias =
build_cpu = i386
! build_os = darwin9.1.0
build_vendor = apple
builddir = .
--- 186,193 ----
am__untar = tar -xf -
bindir = ${exec_prefix}/bin
! build = i386-apple-darwin9.2.0
build_alias =
build_cpu = i386
! build_os = darwin9.2.0
build_vendor = apple
builddir = .
***************
*** 198,205 ****
exec_prefix = ${prefix}
have_pkg_config = yes
! host = i386-apple-darwin9.1.0
host_alias =
host_cpu = i386
! host_os = darwin9.1.0
host_vendor = apple
htmldir = ${docdir}
--- 198,205 ----
exec_prefix = ${prefix}
have_pkg_config = yes
! host = i386-apple-darwin9.2.0
host_alias =
host_cpu = i386
! host_os = darwin9.2.0
host_vendor = apple
htmldir = ${docdir}
***************
*** 222,229 ****
srcdir = .
sysconfdir = ${prefix}/etc
! target = i386-apple-darwin9.1.0
target_alias =
target_cpu = i386
! target_os = darwin9.1.0
target_vendor = apple
top_builddir = ..
--- 222,229 ----
srcdir = .
sysconfdir = ${prefix}/etc
! target = i386-apple-darwin9.2.0
target_alias =
target_cpu = i386
! target_os = darwin9.2.0
target_vendor = apple
top_builddir = ..
***************
*** 248,252 ****
ancestor.cc \
block.cc \
- blockgrid.cc \
canvas.cc \
colors.h \
--- 248,251 ----
***************
*** 379,383 ****
include ./$(DEPDIR)/ancestor.Plo
include ./$(DEPDIR)/block.Plo
- include ./$(DEPDIR)/blockgrid.Plo
include ./$(DEPDIR)/canvas.Plo
include ./$(DEPDIR)/glcolorstack.Plo
--- 378,381 ----
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am 15 Jan 2008 01:16:49 -0000 1.2
--- Makefile.am 12 Feb 2008 02:53:53 -0000 1.3
***************
*** 24,28 ****
ancestor.cc \
block.cc \
- blockgrid.cc \
canvas.cc \
colors.h \
--- 24,27 ----
Index: world.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/world.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** world.cc 2 Feb 2008 00:51:10 -0000 1.5
--- world.cc 12 Feb 2008 02:53:53 -0000 1.6
***************
*** 55,58 ****
--- 55,61 ----
const stg_msec_t STG_DEFAULT_WORLD_INTERVAL_REAL = 100; ///< real time
between updates
const stg_msec_t STG_DEFAULT_WORLD_INTERVAL_SIM = 100; ///< duration of sim
timestep
+ const uint32_t RBITS = 6; // regions contain (2^RBITS)^2 pixels
+ const uint32_t SBITS = 5; // superregions contain (2^SBITS)^2 regions
+ const uint32_t SRBITS = RBITS+SBITS;
// static data members
***************
*** 60,66 ****
bool StgWorld::quit_all = false;
- const uint32_t RBITS = 6;
- const uint32_t SBITS = 4;
- const uint32_t SRBITS = RBITS+SBITS;
static guint PointIntHash( stg_point_int_t* pt )
--- 63,66 ----
***************
*** 113,126 ****
block->RecordRenderPoint( &cell->list, cell->list, &this->count, count2
);
count++;
! }
!
! // UNUSED
! // // remove a block from a region cell specified in REGION coordinates
! // void RemoveBlock( StgBlock* block, int32_t x, int32_t y )
! // {
! // stg_cell_t* cell = GetCell( x, y );
! // cell->list = g_slist_remove( cell->list, block );
! // count--;
! // }
};
--- 113,117 ----
block->RecordRenderPoint( &cell->list, cell->list, &this->count, count2
);
count++;
! }
};
***************
*** 174,188 ****
}
! // UNUSED
! // remove a block from a cell specified in superregion coordinates
! // void RemoveBlock( StgBlock* block, int32_t x, int32_t y )
! // {
! // GetRegion( x>>RBITS, y>>RBITS )
! // ->RemoveBlock( block,
! // x - ((x>>RBITS)<<RBITS),
! // y - ((y>>RBITS)<<RBITS) );
! // count--;
! // }
!
static void Draw_cb( gpointer dummykey,
SuperRegion* sr,
--- 165,169 ----
}
! // callback wrapper for Draw()
static void Draw_cb( gpointer dummykey,
SuperRegion* sr,
***************
*** 312,316 ****
this->superregions = g_hash_table_new( (GHashFunc)PointIntHash,
(GEqualFunc)PointIntEqual );
! this->CreateSuperRegion( 0, 0 );
this->total_subs = 0;
--- 293,298 ----
this->superregions = g_hash_table_new( (GHashFunc)PointIntHash,
(GEqualFunc)PointIntEqual );
!
! //this->CreateSuperRegion( -2, -2 );
this->total_subs = 0;
Index: model.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/model.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** model.cc 15 Jan 2008 01:16:49 -0000 1.2
--- model.cc 12 Feb 2008 02:53:53 -0000 1.3
***************
*** 106,130 ****
// basic model
! #define STG_DEFAULT_MOD_BLOBRETURN true
! #define STG_DEFAULT_MOD_BOUNDARY false
! #define STG_DEFAULT_MOD_COLOR (0xFFFF0000) // red
! #define STG_DEFAULT_MOD_ENERGY_CAPACITY 1000.0
! #define STG_DEFAULT_MOD_ENERGY_CHARGEENABLE 1
! #define STG_DEFAULT_MOD_ENERGY_GIVERATE 0.0
! #define STG_DEFAULT_MOD_ENERGY_PROBERANGE 0.0
! #define STG_DEFAULT_MOD_ENERGY_TRICKLERATE 0.1
! #define STG_DEFAULT_MOD_GEOM_SIZEX 0.10 // 1m square by default
! #define STG_DEFAULT_MOD_GEOM_SIZEY 0.10
! #define STG_DEFAULT_MOD_GEOM_SIZEZ 0.10
! #define STG_DEFAULT_MOD_GRID false
! #define STG_DEFAULT_MOD_GRIPPERRETURN false
! #define STG_DEFAULT_MOD_LASERRETURN LaserVisible
! #define STG_DEFAULT_MOD_MAP_RESOLUTION 0.1
! #define STG_DEFAULT_MOD_MASK (STG_MOVE_TRANS | STG_MOVE_ROT)
! #define STG_DEFAULT_MOD_MASS 10.0 // kg
! #define STG_DEFAULT_MOD_NOSE false
! #define STG_DEFAULT_MOD_OBSTACLERETURN true
! #define STG_DEFAULT_MOD_OUTLINE true
! #define STG_DEFAULT_MOD_RANGERRETURN true
// constructor
--- 106,130 ----
// basic model
! const bool STG_DEFAULT_MOD_BLOBRETURN = true;
! const bool STG_DEFAULT_MOD_BOUNDARY = false;
! const stg_color_t STG_DEFAULT_MOD_COLOR = (0xFFFF0000); // solid red
! const stg_joules_t STG_DEFAULT_MOD_ENERGY_CAPACITY = 1000.0;
! const bool STG_DEFAULT_MOD_ENERGY_CHARGEENABLE = true;
! const stg_watts_t STG_DEFAULT_MOD_ENERGY_GIVERATE = 0.0;
! const stg_meters_t STG_DEFAULT_MOD_ENERGY_PROBERANGE = 0.0;
! const stg_watts_t STG_DEFAULT_MOD_ENERGY_TRICKLERATE = 0.1;
! const stg_meters_t STG_DEFAULT_MOD_GEOM_SIZEX = 0.10;
! const stg_meters_t STG_DEFAULT_MOD_GEOM_SIZEY = 0.10;
! const stg_meters_t STG_DEFAULT_MOD_GEOM_SIZEZ = 0.10;
! const bool STG_DEFAULT_MOD_GRID = false;
! const bool STG_DEFAULT_MOD_GRIPPERRETURN = false;
! const stg_laser_return_t STG_DEFAULT_MOD_LASERRETURN = LaserVisible;
! const stg_meters_t STG_DEFAULT_MOD_MAP_RESOLUTION = 0.1;
! const stg_movemask_t STG_DEFAULT_MOD_MASK = (STG_MOVE_TRANS | STG_MOVE_ROT);
! const stg_kg_t STG_DEFAULT_MOD_MASS = 10.0;
! const bool STG_DEFAULT_MOD_NOSE = false;
! const bool STG_DEFAULT_MOD_OBSTACLERETURN = true;
! const bool STG_DEFAULT_MOD_OUTLINE = true;
! const bool STG_DEFAULT_MOD_RANGERRETURN = true;
// constructor
***************
*** 814,818 ****
LISTMETHOD( this->blocks, StgBlock*, Draw );
}
! else
//if( this->say_string )
--- 814,818 ----
LISTMETHOD( this->blocks, StgBlock*, Draw );
}
! //else
//if( this->say_string )
***************
*** 873,878 ****
double sp = 1.0;
! int nx = (int) ceil((dx/2.0) / sp);
! int ny = (int) ceil((dy/2.0) / sp);
if( nx == 0 ) nx = 1.0;
--- 873,878 ----
double sp = 1.0;
! int nx = (int) ceil((dx/2.0) / sp );
! int ny = (int) ceil((dy/2.0) / sp );
if( nx == 0 ) nx = 1.0;
***************
*** 894,898 ****
glVertex2f( -nx, ny );
! char str[16];
int i;
for (i = -nx+1; i < nx; i++)
--- 894,898 ----
glVertex2f( -nx, ny );
!
int i;
for (i = -nx+1; i < nx; i++)
***************
*** 900,917 ****
glVertex2f( i * sp, - dy/2 );
glVertex2f( i * sp, + dy/2 );
- snprintf( str, 16, "%d", (int)i );
- //gl_draw( str, -0.2 + (nx + i * sp), -0.2 , 1 );
}
-
for (i = -ny+1; i < ny; i++)
{
glVertex2f( - dx/2, i * sp );
glVertex2f( + dx/2, i * sp );
- snprintf( str, 16, "%d", (int)i );
- //gl_draw( str, -0.2, -0.2 + (ny + i * sp) , 1 );
}
glEnd();
PopColor();
}
--- 900,929 ----
glVertex2f( i * sp, - dy/2 );
glVertex2f( i * sp, + dy/2 );
}
for (i = -ny+1; i < ny; i++)
{
glVertex2f( - dx/2, i * sp );
glVertex2f( + dx/2, i * sp );
}
glEnd();
+ PushColor( 0,0,0,0.3);
+
+ char str[16];
+
+ for (i = -nx+1; i < nx; i++)
+ {
+ snprintf( str, 16, "%d", (int)i );
+ gl_draw_string( -dx/2.0 + -0.2 + (nx + i * sp), -0.2 , 0.01, str );
+ }
+
+ for (i = -ny+1; i < ny; i++)
+ {
+ snprintf( str, 16, "%d", (int)i );
+ gl_draw_string( -0.2, -dy/2.0 + -0.2 + (ny + i * sp) , 0.01, str );
+ }
+
+ PopColor();
PopColor();
}
Index: canvas.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/canvas.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** canvas.cc 1 Feb 2008 03:16:43 -0000 1.5
--- canvas.cc 12 Feb 2008 02:53:53 -0000 1.6
***************
*** 31,35 ****
rotating = false;
! showflags = STG_SHOW_CLOCK | STG_SHOW_BLOCKS | STG_SHOW_GRID;
// start the timer that causes regular redraws
--- 31,35 ----
rotating = false;
! showflags = STG_SHOW_CLOCK | STG_SHOW_BLOCKS | STG_SHOW_GRID |
STG_SHOW_DATA;
// start the timer that causes regular redraws
-------------------------------------------------------------------------
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
