summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Froehlich <Mathias.Froehlich@web.de>2011-02-01 14:01:22 +0100
committerMathias Froehlich <Mathias.Froehlich@web.de>2011-02-01 14:01:22 +0100
commitd7f2f7f61d5a24b08335df128b3a7ccbb044fb90 (patch)
tree03863df374e80ceb565992cf2328d921fda47b1d
parente81a42dd0301d1e14f9bd54d1eb4f1fda6475df4 (diff)
correct size
-rw-r--r--Main.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Main.cpp b/Main.cpp
index 2310d4f..a0af695 100644
--- a/Main.cpp
+++ b/Main.cpp
@@ -247,9 +247,9 @@ void precompute()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
// glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
- pixels = malloc(sizeof(float)*SKY_W*SKY_H);
+ pixels = malloc(sizeof(float)*3*SKY_W*SKY_H);
f = fopen("irradianceTexture.bin", "rb");
- fread(pixels, sizeof(float), SKY_W*SKY_H, f);
+ fread(pixels, sizeof(float), 3*SKY_W*SKY_H, f);
fclose(f);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB16F_ARB, SKY_W, SKY_H, 0, GL_RGB, GL_FLOAT, pixels);
free(pixels);
@@ -264,9 +264,9 @@ void precompute()
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
// glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
- pixels = malloc(sizeof(float)*RES_MU_S*RES_NU*RES_MU*RES_R);
+ pixels = malloc(sizeof(float)*3*RES_MU_S*RES_NU*RES_MU*RES_R);
f = fopen("inscatterTexture.bin", "rb");
- fread(pixels, sizeof(float), RES_MU_S*RES_NU*RES_MU*RES_R, f);
+ fread(pixels, sizeof(float), 3*RES_MU_S*RES_NU*RES_MU*RES_R, f);
fclose(f);
glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA16F_ARB, RES_MU_S * RES_NU, RES_MU, RES_R, 0, GL_RGB, GL_FLOAT, NULL);
free(pixels);
@@ -552,18 +552,18 @@ void precompute()
void* pixels;
FILE* f;
glBindTexture(GL_TEXTURE_2D, irradianceTexture);
- pixels = malloc(sizeof(float)*SKY_W*SKY_H);
+ pixels = malloc(sizeof(float)*3*SKY_W*SKY_H);
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_FLOAT, pixels);
f = fopen("irradianceTexture.bin", "wb");
- fwrite(pixels, sizeof(float), SKY_W*SKY_H, f);
+ fwrite(pixels, sizeof(float), 3*SKY_W*SKY_H, f);
fclose(f);
free(pixels);
glBindTexture(GL_TEXTURE_3D, inscatterTexture);
- pixels = malloc(sizeof(float)*RES_MU_S*RES_NU*RES_MU*RES_R);
+ pixels = malloc(sizeof(float)*3*RES_MU_S*RES_NU*RES_MU*RES_R);
glGetTexImage(GL_TEXTURE_3D, 0, GL_RGB, GL_FLOAT, pixels);
f = fopen("inscatterTexture.bin", "wb");
- fwrite(pixels, sizeof(float), RES_MU_S*RES_NU*RES_MU*RES_R, f);
+ fwrite(pixels, sizeof(float), 3*RES_MU_S*RES_NU*RES_MU*RES_R, f);
fclose(f);
free(pixels);
#endif