Changeset 7496 in orxonox.OLD

Timestamp:

May 3, 2006, 12:51:13 AM (18 years ago)

Author:

patrick

Message:

resuming work on the hm

File:

• trunk/src/lib/graphics/importer/height_map.cc (modified) (2 diffs)

trunk/src/lib/graphics/importer/height_map.cc

@@ -272 +272 @@
     height += (float)(unsigned char)this->heightMapReference->heights[j + 1 + sampleRate + (i + 1)
                                                                       * this->heightMapReference->heightMap->w];
-    height +=  (float) (unsigned char) this->heightMapReference->heights[(j -1+ sampleRate   + (i+1)*(this->heightMapReference->heightMap->w ))];
-    height +=  (float)(unsigned char)this->heightMapReference->heights[(j +sampleRate+ (i+2)*(this->heightMapReference->heightMap->w ))];
-    height +=  (float)(unsigned char)this->heightMapReference->heights[(j+sampleRate + (i)*(this->heightMapReference->heightMap->w )) ];
-    height=height/5.0;
-    model->addVertex(scaleX*(this->heightMapReference->heightMap->h -i) + shiftX , ((double)(height)*scaleY) +shiftY ,scaleZ*(j) + shiftZ); // Top Right
-    model->addNormal(normalVectorField[i%this->heightMapReference->heightMap->h][j%this->heightMapReference->heightMap->w].y,normalVectorField[i%this->heightMapReference->heightMap->h][j%this->heightMapReference->heightMap->w].z,normalVectorField[i%this->heightMapReference->heightMap->h][j%this->heightMapReference->heightMap->w].x);
+    height += (float)(unsigned char)this->heightMapReference->heights[j - 1 + sampleRate + (i + 1) *
+                                                                      this->heightMapReference->heightMap->w];
+    height += (float)(unsigned char)this->heightMapReference->heights[j + sampleRate + (i + 2) *
+                                                                      this->heightMapReference->heightMap->w];
+    height +=  (float)(unsigned char)this->heightMapReference->heights[j + sampleRate + i * this->heightMapReference->heightMap->w];
+    height /= 5.0;
+    model->addVertex(scaleX*(this->heightMapReference->heightMap->h -i) + shiftX ,
+                     ((double)(height)*scaleY) +shiftY ,
+                     scaleZ*(j) + shiftZ); // Top Right
+    model->addNormal(normalVectorField[i%this->heightMapReference->heightMap->h][j%this->heightMapReference->heightMap->w].y,
+                     normalVectorField[i%this->heightMapReference->heightMap->h][j%this->heightMapReference->heightMap->w].z,
+                     normalVectorField[i%this->heightMapReference->heightMap->h][j%this->heightMapReference->heightMap->w].x);
     model->addTexCoor((float)j /(texRate), (float)(i %this->heightMapReference->heightMap->h)/(texRate));
-    model->addColor(r/255.0,g/255.0,b/255.0);
-
-  }
-
-
-
+    model->addColor(r/255.0f, g/255.0f, b/255.0f);
+  }
 
   // link Boarder Stripe
-  for(int j = j1-sampleRate  ; j < j2    ;  j += sampleRate)
-  {
-
+  for(int j = j1 - sampleRate; j < j2; j += sampleRate)
+  {
     model->addIndice(cnt);
-    model->addIndice(cnt  + (j2 -j1 +  sampleRate  )/ sampleRate );
+    model->addIndice(cnt + (j2 - j1 + sampleRate) / sampleRate );
     cnt++;
-
-  }
-
+  }
   cnt++;
 
+
   model->newStripe();
 
 
-
-
-
   cnt += (j2-j1)/ sampleRate;
-
   // link 2nd BoarderStripe
-  for(int j = j1-sampleRate  ; j < j2    ;  j += sampleRate)
-  {
-
+  for(int j = j1-sampleRate; j < j2;  j += sampleRate)
+  {
     model->addIndice(cnt);
-    model->addIndice(cnt  + (j2 -j1 +  sampleRate  )/ sampleRate );
+    model->addIndice(cnt + (j2 - j1 + sampleRate) / sampleRate);
     cnt++;
-
-  }
-
+  }
 
   SDL_UnlockSurface(this->heightMapReference->colorMap);
 
   model->finalize();
-
-
-
 
 // #undef heightMap
@@ -333 +323 @@
         #undef shiftZ
         #undef normalVectorField
-
 }