Changeset 8918 in orxonox.OLD for branches/mountain_lake/src/world_entities/environments/mapped_water.cc

Timestamp:

Jun 29, 2006, 6:53:35 PM (18 years ago)

Author:

stefalie

Message:

mountain_lake: waterHeight fading works

File:

• branches/mountain_lake/src/world_entities/environments/mapped_water.cc (modified) (10 diffs)

branches/mountain_lake/src/world_entities/environments/mapped_water.cc

@@ -21 +21 @@
 #include "t_animation.h"
 #include "math.h"
-
 #include "glgui.h"
-
-
 #include "shell_command.h"
 
@@ -56 +53 @@
   this->calcVerts();
 
-  tempcounter = 0;
+  // init gui
   this->box = NULL;
 }
@@ -100 +97 @@
   this->move = 0;
   this->move2 = this->move * this->kNormalMapScale;
+
+  // initalize fading bools
+  this->bFadeWaterHeight = false;
+  this->bFadeWaterUV = false;
+  this->bFadeWaterFlow = false;
+  this->bFadeShineSize = false;
+  this->bFadeShineStrength = false;
+  this->bFadeReflStrength = false;
+  this->bFadeRefraction = false;
+
+  this->tempcounter = 0;
 }
 
@@ -323 +331 @@
       {
         OrxGui::GLGuiInputLine* waterColorText = new OrxGui::GLGuiInputLine();
-        waterColorText->setText("Color");
+        waterColorText->setText("WaterColor");
         waterColorBox->pack(waterColorText);
 
@@ -335 +343 @@
         OrxGui::GLGuiSlider* waterColorG = new OrxGui::GLGuiSlider();
         waterColorG->setRange(0, 1.0f);
-        waterColorR->setStep(0.1f);
+        waterColorG->setStep(0.1f);
         waterColorG->setValue(this->waterColor.y);
         waterColorG->connect(SIGNAL(waterColorG, valueChanged), this, SLOT(MappedWater, resetWaterColorG));
@@ -342 +350 @@
         OrxGui::GLGuiSlider* waterColorB = new OrxGui::GLGuiSlider();
         waterColorB->setRange(0, 1.0f);
-        waterColorR->setStep(0.1f);
+        waterColorB->setStep(0.1f);
         waterColorB->setValue(this->waterColor.z);
         waterColorB->connect(SIGNAL(waterColorB, valueChanged), this, SLOT(MappedWater, resetWaterColorB));
         waterColorBox->pack(waterColorB);
-
       }
       this->box->pack(waterColorBox);
@@ -440 +447 @@
       this->box->pack(refractionBox);
 
+      OrxGui::GLGuiBox* lightPosBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
+      {
+        OrxGui::GLGuiInputLine* lightPosText = new OrxGui::GLGuiInputLine();
+        lightPosText->setText("LightPos");
+        lightPosBox->pack(lightPosText);
+
+        OrxGui::GLGuiSlider* lightPosX = new OrxGui::GLGuiSlider();
+        lightPosX->setRange(-600, 600);
+        lightPosX->setValue(this->lightPos.x);
+        lightPosX->setStep(15);
+        lightPosX->connect(SIGNAL(lightPosX, valueChanged), this, SLOT(MappedWater, resetLightPosX));
+        lightPosBox->pack(lightPosX);
+
+        OrxGui::GLGuiSlider* lightPosY = new OrxGui::GLGuiSlider();
+        lightPosY->setRange(-600, 600);
+        lightPosY->setStep(15);
+        lightPosY->setValue(this->lightPos.y);
+        lightPosY->connect(SIGNAL(lightPosY, valueChanged), this, SLOT(MappedWater, resetLightPosY));
+        lightPosBox->pack(lightPosY);
+
+        OrxGui::GLGuiSlider* lightPosZ = new OrxGui::GLGuiSlider();
+        lightPosZ->setRange(-600, 600);
+        lightPosZ->setStep(15);
+        lightPosZ->setValue(this->lightPos.z);
+        lightPosZ->connect(SIGNAL(lightPosZ, valueChanged), this, SLOT(MappedWater, resetLightPosZ));
+        lightPosBox->pack(lightPosZ);
+      }
+      this->box->pack(lightPosBox);
+
+      OrxGui::GLGuiBox* waterHeightBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
+      {
+        OrxGui::GLGuiInputLine* waterHeightText = new OrxGui::GLGuiInputLine();
+        waterHeightText->setText("WaterHeight");
+        waterHeightBox->pack(waterHeightText);
+
+        OrxGui::GLGuiSlider* waterHeight = new OrxGui::GLGuiSlider();
+        waterHeight->setRange(-500, 500);
+        waterHeight->setValue(this->waterHeight);
+        waterHeight->setStep(10);
+        waterHeight->connect(SIGNAL(waterHeight, valueChanged), this, SLOT(MappedWater, setWaterHeight));
+        waterHeightBox->pack(waterHeight);
+      }
+      this->box->pack(waterHeightBox);
     }
+
     this->box->showAll();
     this->box->setAbsCoor2D(300, 40);
@@ -446 +497 @@
     OrxGui::GLGuiHandler::getInstance()->activateCursor();
   }
-
-
 }
 
@@ -598 +647 @@
   }
 
+  if(bFadeWaterHeight)
+  {
+    this->waterHeightFader = new tAnimation<MappedWater>(this, &MappedWater::setWaterHeight);
+    this->waterHeightFader->setInfinity(ANIM_INF_CONSTANT);
+
+    this->waterHeightFader->addKeyFrame(this->waterHeight, this->waterHeightFadeTime, ANIM_LINEAR);
+    this->waterHeightFader->addKeyFrame(this->newWaterHeight, 0, ANIM_LINEAR);
+
+    bFadeWaterHeight = false;
+    this->waterHeightFader->replay();
+  }
+
 
 //   if(this->tempcounter == 300)
@@ -604 +665 @@
 //     this->fadeWaterUV(1, 10);
 //   }
-//   if(this->tempcounter == 100)
-//   {
-//     PRINTF(0)("\n\n\n\n\n\n///////////////////////test waterchangecolor/////////////////////\n\n\n\n\n\n");
-//     this->fadeWaterFlow(1, 10);
-//   }
+  if(this->tempcounter == 100)
+  {
+    PRINTF(0)("\n\n\n\n\n\n///////////////////////test waterchangecolor/////////////////////\n\n\n\n\n\n");
+    this->fadeWaterHeight(0, 15);
+  }
   //PRINTF(0)("counter %i/n", tempcounter);
   tempcounter++;