Revision: 7570
http://playerstage.svn.sourceforge.net/playerstage/?rev=7570&view=rev
Author: rtv
Date: 2009-04-02 01:04:09 +0000 (Thu, 02 Apr 2009)
Log Message:
-----------
added missing initializer in powerpack
Modified Paths:
--------------
code/stage/trunk/libstage/powerpack.cc
code/stage/trunk/libstage/stage.hh
code/stage/trunk/libstage/world.cc
Modified: code/stage/trunk/libstage/powerpack.cc
===================================================================
--- code/stage/trunk/libstage/powerpack.cc 2009-04-02 00:06:20 UTC (rev
7569)
+++ code/stage/trunk/libstage/powerpack.cc 2009-04-02 01:04:09 UTC (rev
7570)
@@ -14,11 +14,7 @@
stg_joules_t PowerPack::global_input = 0.0;
stg_joules_t PowerPack::global_capacity = 0.0;
stg_joules_t PowerPack::global_dissipated = 0.0;
-stg_watts_t PowerPack::global_power = 0.0;
-stg_watts_t PowerPack::global_power_smoothed = 0.0;
-double PowerPack::global_smoothing_constant = 0.05;
-
PowerPack::PowerPack( Model* mod ) :
event_vis( 32,32,1.0 ),
output_vis( 0,100,200,40, 1200, stg_color_pack(1,0,0,0),
stg_color_pack(0,0,0,0.5), "energy output", "energy_input" ),
@@ -26,7 +22,8 @@
mod( mod),
stored( 0.0 ),
capacity( 0.0 ),
- charging( false )
+ charging( false ),
+ dissipated( 0.0 )
{
// tell the world about this new pp
mod->world->AddPowerPack( this );
Modified: code/stage/trunk/libstage/stage.hh
===================================================================
--- code/stage/trunk/libstage/stage.hh 2009-04-02 00:06:20 UTC (rev 7569)
+++ code/stage/trunk/libstage/stage.hh 2009-04-02 01:04:09 UTC (rev 7570)
@@ -1511,9 +1511,6 @@
static stg_joules_t global_capacity;
static stg_joules_t global_dissipated;
static stg_joules_t global_input;
- static stg_watts_t global_power;
- static stg_watts_t global_power_smoothed;
- static double global_smoothing_constant;
public:
PowerPack( Model* mod );
Modified: code/stage/trunk/libstage/world.cc
===================================================================
--- code/stage/trunk/libstage/world.cc 2009-04-02 00:06:20 UTC (rev 7569)
+++ code/stage/trunk/libstage/world.cc 2009-04-02 01:04:09 UTC (rev 7570)
@@ -542,7 +542,7 @@
for( uint32_t s=0; s < sample_count; s++ )
{
- raypose.a = s * fov / (double)sample_count) - starta;
+ raypose.a = (s * fov / (double)sample_count) - starta;
samples[s] = Raytrace( raypose, range, func, model, arg, ztest );
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
