Changeset 72

Timestamp:

1.11.2009 12:35:25 (3 weeks ago)

Author:

blackhex

Message:

• Minor fix in SoTexture?2TileCache.

Location:

SoTerrain

Files:

• include/data/SbTexture2Tile.h (modified) (1 diff)
• include/data/SbTile.h (modified) (1 diff)
• include/gui/Makefile.in (deleted)
• src/data/SbTexture2Tile.cpp (modified) (5 diffs)
• src/data/SoTexture2TileCache.cpp (modified) (1 diff)
• src/test/SoDummyTileCacheUser.cpp (modified) (2 diffs)

SoTerrain/include/data/SbTexture2Tile.h

@@ -65 +65 @@
     /* Attributes. */
 
-    ///
+    /// Offset in X direction in the underlaying texture that coresponds to X
+    /// coordinate of the tile.
     int32_t offsetX;
 
-    ///
+    /// Offset in Y direction in the underlaying texture that coresponds to Y
+    /// coordinate of the tile.
     int32_t offsetY;
 
-    ///
+    /// Width of a line in the underlaying texture.
     int32_t lineWidth;
 
-    ///
+    /// Data of the underlaying texture.
     const unsigned char * data;
 };

SoTerrain/include/data/SbTile.h

@@ -77 +77 @@
 
     /* Attributes. */
-    ///
+    /// X coordinate of a left-down corner of the tile in heightmap coordinates.
     int32_t x;
 
-    ///
+    /// Y coordinate of a left-down corner of the tile in heightmap coordinates.
     int32_t y;
 
-    ///
+    /// Width of the tile in heightmap coordinates.
     int32_t width;
 
-    ///
+    /// Height of the tile in heightmap coordinates.
     int32_t height;
 
-    ///
+    /// Additional attributes that can be attached to tile.
     SbTileAttributes * attibutes;
 

SoTerrain/src/data/SbTexture2Tile.cpp

@@ -23 +23 @@
 ///////////////////////////////////////////////////////////////////////////////
 
+// Standard includes.
+#include <assert.h>
+
 // OpenGL includes.
 #if defined(__WIN32__) || defined(_WIN32)
@@ -40 +43 @@
   const int32_t width, const int32_t height, const int32_t _lineWidth, const
   unsigned char * _data):
-  SbTile(x + (width >> 1), y + (height >> 2), width, height),
-  offsetX(x), offsetY(y), lineWidth(_lineWidth), data(_data)
+  SbTile(_offsetX, _offsetY, width, height),
+  offsetX(_offsetX), offsetY(_offsetY), lineWidth(_lineWidth), data(_data)
 {
   // Nothing.
@@ -53 +56 @@
 unsigned char SbTexture2Tile::get(const int32_t x, const int32_t y) const
 {
+  assert(this->data);
   return this->data[((y + this->offsetY) * this->lineWidth) +
     (x + this->offsetX)];
@@ -59 +63 @@
 void SbTexture2Tile::GLRender()
 {
+  assert(this->data);
+
   // Render tile with quad strips.
-  for (int Y = this->y; Y < (this->y + this->height - 1); ++Y)
+  for (int Y = 0; Y < this->height; ++Y)
   {
     glBegin(GL_QUAD_STRIP);
-
-    // First two vertices of a quad strip.
-    glVertex3f(this->x, Y + 1, data[(Y + 1 + this->offsetY) * this->lineWidth
-      + this->x + this->offsetX] * 0.1f);
-    glVertex3f(this->x, Y, data[(Y + this->offsetY) * this->lineWidth +
-      + this->x + this->offsetX] * 0.1f);
-
-    // Other pairs of vertices in line.
-    for (int X = (this->x + 1); X < (this->x + this->width); ++X)
+    for (int X = 0; X <= this->width; ++X)
     {
-      glVertex3f(X, Y + 1, data[(Y + 1 + this->offsetY) * this->lineWidth + X
-        + this->offsetX] * 0.1f);
-      glVertex3f(X, Y, data[(Y + this->offsetY) * this->lineWidth + X
-        + this->offsetX] * 0.1f);
+      glVertex3f(this->x + X, this->y + Y + 1, data[(this->offsetY + Y + 1) *
+        this->lineWidth + this->offsetX + X] * 0.1f);
+      glVertex3f(this->x + X, this->y + Y, data[(this->offsetY + Y) *
+        this->lineWidth + this->offsetX + X] * 0.1f);
     }
     glEnd();
@@ -84 +82 @@
 SbBox3f SbTexture2Tile::computeBBox()
 {
-  SbBox3f bounds;
+  assert(this->data);
 
   // Compute bounds by iterating over all pixels of tile.
+  SbBox3f bounds;
   for (int Y = this->y; Y <= (this->y + this->height); ++Y)
   {

SoTerrain/src/data/SoTexture2TileCache.cpp

@@ -54 +54 @@
   queued)
 {
-  DEBUG_MSG(x << " " << y << " " << width << " " << height << " " << resolution);
-
   if (queued)
   {

SoTerrain/src/test/SoDummyTileCacheUser.cpp

@@ -85 +85 @@
   int32_t x_step = width >> 1;
   int32_t y_step = height >> 1;
-  DEBUG_MSG("frame");
   for (int32_t J = 0; J < 2; ++J)
   {
@@ -97 +96 @@
         y_step, x_step);
 
-      // Render tile.
+      // Render the tile.
       if (tile)
       {
-        for (int32_t tile_y = 0; tile_y < y_step; ++tile_y)
-        {
-          glBegin(GL_QUAD_STRIP);
-          for (int32_t tile_x = 0; tile_x <= x_step; ++tile_x)
-          {
-            unsigned char height = tile->get(tile_x, tile_y);
-            //glColor3ub(height, 0, 0);
-            glVertex3f(tile_offset_x + tile_x, tile_offset_y + tile_y, height *
-              0.1);
-            height = tile->get(tile_x, tile_y + 1);
-            //glColor3ub(height, 0, 0);
-            glVertex3f(tile_offset_x + tile_x, tile_offset_y + tile_y + 1,
-              height * 0.1);
-          }
-          glEnd();
-        }
+        tile->GLRender();
       }
     }