Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8885 in orxonox.OLD for branches/mountain_lake


Ignore:
Timestamp:
Jun 28, 2006, 6:32:49 PM (18 years ago)
Author:
stefalie
Message:

mountain_lake: …

Location:
branches/mountain_lake/src/world_entities/environments
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/mountain_lake/src/world_entities/environments/mapped_water.cc

    r8884 r8885  
    4040  if (root != NULL)
    4141    this->loadParams(root);
    42   this->newShineSize = this->shineSize;
    43 
    4442
    4543  /// initialization of the textures
     
    395393  //PRINTF(0)("counter %i/n", tempcounter);
    396394  tempcounter++;
    397 
    398 //   if(this->tempcounter == 100) {
    399 //     this->fadeWaterColor(1, 0, 0, 10);
    400 //
    401 //     PRINTF(0)("test waterchangecolor ");
    402 //     }
    403 //   tempcounter++;
    404 //
    405 //   if(this->newWaterColor != this->waterColor)
    406 //   {
    407 //     float dtime = this->colorFadeTime / dt;
    408 //     Vector temp = (this->newWaterColor - this->waterColor) * dtime + this->waterColor;
    409 //
    410 //     temp.debug();
    411 //
    412 //     this->colorFadeTime -= dt;
    413 //     this->resetWaterColor(temp.x, temp.y, temp.z);
    414 //   }
    415395}
    416396
  • branches/mountain_lake/src/world_entities/environments/mapped_water.h

    r8884 r8885  
    5353  void setWaterSize(float x, float z) { this->xWidth = x; this->zWidth = z; }
    5454  void setWaterAngle(float angle) { this->waterAngle = angle; }
    55   void setWaterColor(float r, float g, float b) { this->waterColor = Vector(r,g,b); this->newWaterColor = this->waterColor; }
     55  void setWaterColor(float r, float g, float b) { this->waterColor = Vector(r,g,b); }
    5656  void setWaterUV(float uv) { this->waterUV = uv; }
    5757  void setWaterFlow(float flow) { this->waterFlow = flow; };
    5858  void setNormalMapScale(float scale) { this->kNormalMapScale = scale; }
    59   void setShineSize(float shine) { this->shineSize = shine; }
     59  void setShineSize(float shine) { this->shineSize = shine; this->newShineSize = shine; }
    6060  void setShineStrength(float strength) { this->shineStrength = strength; }
    6161  void setReflStrength(float strength) { this->reflStrength = strength; }
     
    7676
    7777  // fade functions, hacky HACK
    78   void fadeWaterColor(float r, float g, float b, float time) {this->newWaterColor = Vector(r, g, b); this->colorFadeTime = time; }
     78  void fadeWaterColor(float r, float g, float b, float time) {  }
    7979  void fadeShineSize(float shine, float time) {this->newShineSize = shine; this->shineSizeFadeTime = time; }
    8080  void fadeLightPos(float x, float y, float z, float time);
     
    128128  bool                          bFadeShineSize;
    129129
    130   // skirmish HACK
    131   Vector              newWaterColor;          //!< used to fade the water color
    132   float               colorFadeTime;
    133130  int tempcounter;
    134131};
Note: See TracChangeset for help on using the changeset viewer.