Changeset 2304 for GTP/trunk/App/Demos/Illum/pathmap/TexturedMaterial.cpp

Timestamp:

04/01/07 00:02:16 (17 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/pathmap/TexturedMaterial.cpp (modified) (2 diffs)

GTP/trunk/App/Demos/Illum/pathmap/TexturedMaterial.cpp

@@ -2 +2 @@
 #include "texturedmaterial.h"
 
-TexturedMaterial::TexturedMaterial(void* pdata, int pitch, int textureSize)
+TexturedMaterial::TexturedMaterial(void* pdata, int pitch, int textureWidth, int textureHeight)
 :Material(Vector::RGBLIGHTYELLOW, Vector::RGBLIGHTYELLOW, 4.0)
 {
-        this->pdata = new unsigned char[pitch * textureSize];
-        memcpy(this->pdata, pdata, pitch * textureSize);
+        this->pdata = new unsigned char[pitch * textureHeight];
+        memcpy(this->pdata, pdata, pitch * textureHeight);
         this->pitch = pitch;
-        this->imageSize = textureSize;
+        this->imageWidth = textureWidth;
+        this->imageHeight = textureHeight;
 }
 
@@ -21 +22 @@
         qp.x -= floor(qp.x);
         qp.y -= floor(qp.y);
-        unsigned int dataIndex = floor(fabsf(qp.x) * imageSize) * 4 +
-                floor(fabsf(1.0 - fabsf(qp.y)) * imageSize) * pitch;
-        if(dataIndex >= pitch * imageSize)
+        unsigned int dataIndex = floor(fabsf(qp.x) * imageWidth) * 4 +
+                floor(fabsf(1.0 - fabsf(qp.y)) * imageHeight) * pitch;
+        if(dataIndex >= pitch * imageHeight)
                 return Vector::RGBBLACK;
         return Vector(