Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8920 in orxonox.OLD for branches/mountain_lake


Ignore:
Timestamp:
Jun 29, 2006, 7:11:48 PM (18 years ago)
Author:
stefalie
Message:

mountain_lake: waterColor works

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

    r8919 r8920  
    107107  this->bFadeRefraction = false;
    108108  this->bFadeWaterColor = false;
    109 
    110   this->tempcounter = 0;
    111109}
    112110
     
    673671    this->waterColorGFader->setInfinity(ANIM_INF_CONSTANT);
    674672
    675     this->waterColorGFader->addKeyFrame(this->waterColor.x, this->waterColorFadeTime, ANIM_LINEAR);
    676     this->waterColorGFader->addKeyFrame(this->newWaterColor.x, 0, ANIM_LINEAR);
     673    this->waterColorGFader->addKeyFrame(this->waterColor.y, this->waterColorFadeTime, ANIM_LINEAR);
     674    this->waterColorGFader->addKeyFrame(this->newWaterColor.y, 0, ANIM_LINEAR);
    677675
    678676    this->waterColorGFader->replay();
     
    681679    this->waterColorBFader->setInfinity(ANIM_INF_CONSTANT);
    682680
    683     this->waterColorBFader->addKeyFrame(this->waterColor.x, this->waterColorFadeTime, ANIM_LINEAR);
    684     this->waterColorBFader->addKeyFrame(this->newWaterColor.x, 0, ANIM_LINEAR);
     681    this->waterColorBFader->addKeyFrame(this->waterColor.z, this->waterColorFadeTime, ANIM_LINEAR);
     682    this->waterColorBFader->addKeyFrame(this->newWaterColor.z, 0, ANIM_LINEAR);
    685683
    686684    this->waterColorBFader->replay();
     
    688686    bFadeWaterColor = false;
    689687  }
    690 
    691   if(this->tempcounter == 100)
    692   {
    693     PRINTF(0)("\n\n\n\n\n\n///////////////////////test waterchangecolor/////////////////////\n\n\n\n\n\n");
    694     this->fadeWaterColor(1, 0, 1, 15);
    695   }
    696   //PRINTF(0)("counter %i/n", tempcounter);
    697   tempcounter++;
    698688}
    699689
  • branches/mountain_lake/src/world_entities/environments/mapped_water.h

    r8919 r8920  
    176176  float                     waterColorFadeTime;
    177177  bool                      bFadeWaterColor;
    178 
    179   int tempcounter;
    180178};
    181179
Note: See TracChangeset for help on using the changeset viewer.