Revision: 23243
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23243
Author: genscher
Date: 2009-09-15 12:26:36 +0200 (Tue, 15 Sep 2009)
Log Message:
-----------
Smoke:
* Less verbose
* More OpenGL error messages (on blender -d)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-09-15
10:23:44 UTC (rev 23242)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-09-15
10:26:36 UTC (rev 23243)
@@ -167,7 +167,7 @@
// calc other res with max_res provided
VECSUB(size, max, min);
- printf("size: %f, %f, %f\n", size[0], size[1], size[2]);
+ // printf("size: %f, %f, %f\n", size[0], size[1], size[2]);
// prevent crash when initializing a plane as domain
if((size[0] < FLT_EPSILON) || (size[1] < FLT_EPSILON) ||
(size[2] < FLT_EPSILON))
@@ -212,7 +212,7 @@
}
}
- printf("smd->domain->dx: %f\n", smd->domain->dx);
+ // printf("smd->domain->dx: %f\n", smd->domain->dx);
// TODO: put in failsafe if res<=0 - dg
@@ -228,8 +228,8 @@
smd->domain->res_wt[1] = smd->domain->res[1] *
(smd->domain->amplify + 1);
smd->domain->res_wt[2] = smd->domain->res[2] *
(smd->domain->amplify + 1);
smd->domain->dx_wt = smd->domain->dx /
(smd->domain->amplify + 1);
- printf("smd->domain->amplify: %d\n",
smd->domain->amplify);
- printf("(smd->domain->flags & MOD_SMOKE_HIGHRES)\n");
+ // printf("smd->domain->amplify: %d\n",
smd->domain->amplify);
+ // printf("(smd->domain->flags & MOD_SMOKE_HIGHRES)\n");
}
if(!smd->domain->shadow)
@@ -240,7 +240,7 @@
if(smd->domain->wt)
{
smoke_initWaveletBlenderRNA(smd->domain->wt,
&(smd->domain->strength));
- printf("smoke_initWaveletBlenderRNA\n");
+ // printf("smoke_initWaveletBlenderRNA\n");
}
return 1;
}
@@ -624,7 +624,7 @@
smd->time = -1;
- printf("reset domain end\n");
+ // printf("reset domain end\n");
}
else if(smd->flow)
{
@@ -1111,7 +1111,7 @@
framenr = scene->r.cfra;
- printf("time: %d\n", scene->r.cfra);
+ // printf("time: %d\n", scene->r.cfra);
if(framenr == smd->time)
return;
@@ -1148,7 +1148,7 @@
/* try to read from cache */
cache_result = BKE_ptcache_read_cache(&pid, (float)framenr,
scene->r.frs_sec);
- printf("cache_result: %d\n", cache_result);
+ // printf("cache_result: %d\n", cache_result);
if(cache_result == PTCACHE_READ_EXACT)
{
Modified: trunk/blender/source/blender/editors/space_view3d/drawvolume.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawvolume.c
2009-09-15 10:23:44 UTC (rev 23242)
+++ trunk/blender/source/blender/editors/space_view3d/drawvolume.c
2009-09-15 10:26:36 UTC (rev 23243)
@@ -347,6 +347,8 @@
GPU_texture_bind(tex, 0);
if(tex_shadow)
GPU_texture_bind(tex_shadow, 1);
+ else
+ printf("No volume shadow\n");
if (!GLEW_ARB_texture_non_power_of_two) {
cor[0] = (float)res[0]/(float)larger_pow2(res[0]);
Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2009-09-15
10:23:44 UTC (rev 23242)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2009-09-15
10:26:36 UTC (rev 23243)
@@ -346,6 +346,8 @@
tex->number = 0;
glBindTexture(tex->target, tex->bindcode);
+ GPU_print_error("3D glBindTexture");
+
type = GL_FLOAT; // GL_UNSIGNED_BYTE
format = GL_RED;
internalformat = GL_INTENSITY;
@@ -355,16 +357,23 @@
glTexImage3D(tex->target, 0, internalformat, tex->w, tex->h,
tex->depth, 0, format, type, 0);
+ GPU_print_error("3D glTexImage3D");
+
if (fpixels) {
glTexSubImage3D(tex->target, 0, 0, 0, 0, w, h, depth, format,
type, fpixels);
+ GPU_print_error("3D glTexSubImage3D");
}
+
glTexParameterfv(GL_TEXTURE_3D, GL_TEXTURE_BORDER_COLOR, vfBorderColor);
+ GPU_print_error("3D GL_TEXTURE_BORDER_COLOR");
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ GPU_print_error("3D GL_LINEAR");
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_BORDER);
+ GPU_print_error("3D GL_CLAMP_TO_BORDER");
if (pixels)
MEM_freeN(pixels);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
