Changeset 9235 in orxonox.OLD for trunk/src/world_entities/environments

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

Location:

trunk/src/world_entities/environments

Files:

• mapped_water.cc (modified) (6 diffs)
• model_entity.cc (modified) (3 diffs)

trunk/src/world_entities/environments/mapped_water.cc

@@ -337 +337 @@
 {
   // it's not too nice, but it works fine
-  PRINTF(0)("\nMappedWater XML Code:\n<MappedWater>\n  <waterpos>%f, %f, %f</waterpos>\n  <watersize>%f, %f</watersize>\n  <wateruv>%f</wateruv>\n  <waterflow>%f</waterflow>\n  <lightpos>%f, %f, %f</lightpos>\n  <waterangle>%f</waterangle>\n  <normalmapscale>%f</normalmapscale>\n  <shinesize>%f</waterpos>\n  <shinestrength>%f</shinestrength>\n  <reflstrength>%f</reflstrength>\n  <refraction>%f</refraction>\n  <watercolor>%f, %f, %f</watercolor>\n</MappedWater>\n", this->waterVerts[0], this->waterHeight, this->waterVerts[1], this->xWidth, this->zWidth, this->waterUV, this->waterFlow, this->lightPos.x, this->lightPos.y, this->lightPos.z, this->waterAngle, this->kNormalMapScale, this->shineSize, this->shineStrength, this->reflStrength, this->refraction, this->waterColor.x, this->waterColor.y, this->waterColor.z);
+  PRINT(0)("\nMappedWater XML Code:\n<MappedWater>\n");
+
+  PRINT(0)("  <waterpos>%f, %f, %f</waterpos>\n", this->waterVerts[0], this->waterHeight, this->waterVerts[1]);
+  PRINT(0)("  <watersize>%f, %f</watersize>\n", this->xWidth, this->zWidth);
+  PRINT(0)("  <wateruv>%f</wateruv>\n", this->waterUV);
+  PRINT(0)("  <waterflow>%f</waterflow>\n", this->waterFlow);
+  PRINT(0)("  <lightpos>%f, %f, %f</lightpos>\n", this->lightPos.x, this->lightPos.y, this->lightPos.z);
+  PRINT(0)("  <waterangle>%f</waterangle>\n", this->waterAngle);
+  PRINT(0)("  <normalmapscale>%f</normalmapscale>\n", this->kNormalMapScale);
+  PRINT(0)("  <shinesize>%f</shinesize>\n", this->shineSize);
+  PRINT(0)("  <shinestrength>%f</shinestrength>\n", this->shineStrength);
+  PRINT(0)("  <reflstrength>%f</reflstrength>\n", this->reflStrength);
+  PRINT(0)("  <refraction>%f</refraction>\n", this->refraction);
+  PRINT(0)("  <watercolor>%f, %f, %f</watercolor>\n", this->waterColor.x, this->waterColor.y, this->waterColor.z);
+
+  PRINT(0)("</MappedWater>\n");
 }
 
@@ -475 +490 @@
 
         OrxGui::GLGuiSlider* lightPosX = new OrxGui::GLGuiSlider();
-        lightPosX->setRange(-600, 600);
+        lightPosX->setRange(-4000, 4000);
         lightPosX->setValue(this->lightPos.x);
         lightPosX->setStep(15);
@@ -482 +497 @@
 
         OrxGui::GLGuiSlider* lightPosY = new OrxGui::GLGuiSlider();
-        lightPosY->setRange(-600, 600);
+        lightPosY->setRange(-4000, 4000);
         lightPosY->setStep(15);
         lightPosY->setValue(this->lightPos.y);
@@ -489 +504 @@
 
         OrxGui::GLGuiSlider* lightPosZ = new OrxGui::GLGuiSlider();
-        lightPosZ->setRange(-600, 600);
+        lightPosZ->setRange(-4000, 4000);
         lightPosZ->setStep(15);
         lightPosZ->setValue(this->lightPos.z);
@@ -504 +519 @@
 
         OrxGui::GLGuiSlider* waterHeight = new OrxGui::GLGuiSlider();
-        waterHeight->setRange(-500, 500);
+        waterHeight->setRange(100, 370);
         waterHeight->setValue(this->waterHeight);
-        waterHeight->setStep(10);
+        waterHeight->setStep(4);
         waterHeight->connect(SIGNAL(waterHeight, valueChanged), this, SLOT(MappedWater, setWaterHeight));
         waterHeightBox->pack(waterHeight);
@@ -547 +562 @@
   glDisable(GL_BLEND);
 
+  // TODO change texture coords, so water doesnt look distorted when xWidth != zWidth
   glBegin(GL_QUADS);
   // The back left vertice for the water

trunk/src/world_entities/environments/model_entity.cc

@@ -32 +32 @@
 {
   this->setClassID(CL_MODEL_ENTITY, "ModelEntity");
-  this->toList(OM_ENVIRON_NOTICK);
+  this->toList(OM_ENVIRON);
 
   this->speed = NULL;
@@ -71 +71 @@
 void ModelEntity::setMomentum (float angle, float x, float y, float z)
 {
+  Vector v(x,y,z);
+  v.debug();
+  v.normalize();
+  v.debug();
+
   if (this->momentum == NULL)
     this->momentum = new Quaternion;
-  *this->momentum = Quaternion(angle, Vector(x, y, z));
+  *this->momentum = Quaternion(angle, v);
+
+  this->momentum->debug();
 }
 
@@ -82 +89 @@
 
   if (this->momentum != NULL)
-    this->shiftDir(*this->momentum * dt);
+  {
+    this->shiftDir((*this->momentum * dt ).getNormalized());
+    //this->getAbsDir().debug();
+  }
 }