Smoke:

* Enable cache for high res + new preview
* Bugfix for smoke banding (in cooperation with N_T)

Hint: Work-in-progress regarding collision objects so can be broken, didn't test

Hint2: jahka enabled a general particle panel but 
* bake button doesn't work
* step is not supported for cloth
* several other things there ;)

3 files changed, 101 insertions, 8 deletions

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 20cab3b8aeb..7ed029f3eaf 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5310,13 +5310,60 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	}
 
 	/* draw code for smoke */
+	if((md = modifiers_findByType(ob, eModifierType_Smoke)))
 	{
-		md = modifiers_findByType(ob, eModifierType_Smoke);
-		if (md) {
-			SmokeModifierData *smd = (SmokeModifierData *)md;
-			if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain && smd->domain->fluid) {
-				GPU_create_smoke(smd);
-				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res);
+		SmokeModifierData *smd = (SmokeModifierData *)md;
+
+		// draw collision objects
+		if((smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll)
+		{
+			/*SmokeCollSettings *scs = smd->coll;
+			if(scs->points)
+			{
+				size_t i;
+
+				wmLoadMatrix(rv3d->viewmat);
+
+				if(col || (ob->flag & SELECT)) cpack(0xFFFFFF);	
+				glDepthMask(GL_FALSE);
+				glEnable(GL_BLEND);
+				
+
+				// glPointSize(3.0);
+				bglBegin(GL_POINTS);
+
+				for(i = 0; i < scs->numpoints; i++)
+				{
+					bglVertex3fv(&scs->points[3*i]);
+				}
+
+				bglEnd();
+				glPointSize(1.0);
+
+				wmMultMatrix(ob->obmat);
+				glDisable(GL_BLEND);
+				glDepthMask(GL_TRUE);
+				if(col) cpack(col);
+				
+			}
+			*/
+		}
+
+		// only draw domains
+		if(smd->domain && smd->domain->fluid)
+		{
+			if(!smd->domain->wt || !(smd->domain->viewsettings & MOD_SMOKE_VIEW_SHOWBIG))
+			{
+				smd->domain->tex = NULL;
+				GPU_create_smoke(smd, 0);
+				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res, smd->domain->dx, smd->domain->tex_shadow);
+				GPU_free_smoke(smd);
+			}
+			else if(smd->domain->wt || (smd->domain->viewsettings & MOD_SMOKE_VIEW_SHOWBIG))
+			{
+				smd->domain->tex = NULL;
+				GPU_create_smoke(smd, 1);
+				draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->res_wt, smd->domain->dx_wt, smd->domain->tex_shadow);
 				GPU_free_smoke(smd);
 			}
 		}
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 342acfe92b3..c8eda10566c 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -191,7 +191,7 @@ static int larger_pow2(int n)
 	return n*2;
 }
 
-void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture *tex, int res[3])
+void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture *tex, int res[3], float dx, GPUTexture *tex_shadow)
 {
 	Object *ob = base->object;
 	RegionView3D *rv3d= ar->regiondata;
@@ -204,6 +204,27 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 	float cor[3] = {1.,1.,1.};
 	int gl_depth = 0, gl_blend = 0;
 
+	/* Fragment program to calculate the 3dview of smoke */
+	/* using 2 textures, density and shadow */
+	const char *text = "!!ARBfp1.0\n"
+					"PARAM dx = program.local[0];\n"
+					"PARAM darkness = program.local[1];\n"
+					"PARAM f = {1.442695041, 1.442695041, 1.442695041, 0.01};\n"
+					"TEMP temp, shadow, value;\n"
+					"TEX temp, fragment.texcoord[0], texture[0], 3D;\n"
+					"TEX shadow, fragment.texcoord[0], texture[1], 3D;\n"
+					"MUL value, temp, darkness;\n"
+					"MUL value, value, dx;\n"
+					"MUL value, value, f;\n"
+					"EX2 temp, -value.r;\n"
+					"SUB temp.a, 1.0, temp.r;\n"
+					"MUL temp.r, temp.r, shadow.r;\n"
+					"MUL temp.g, temp.g, shadow.r;\n"
+					"MUL temp.b, temp.b, shadow.r;\n"
+					"MOV result.color, temp;\n"
+					"END\n";
+	unsigned int prog;
+
 	glGetBooleanv(GL_BLEND, (GLboolean *)&gl_blend);
 	glGetBooleanv(GL_DEPTH_TEST, (GLboolean *)&gl_depth);
 
@@ -234,7 +255,23 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 		}
 	}
 
+	if(GLEW_ARB_fragment_program)
+	{
+		glGenProgramsARB(1, &prog);
+		glEnable(GL_FRAGMENT_PROGRAM_ARB);
+
+		glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, prog);
+		glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, (GLsizei)strlen(text), text);
+
+		// cell spacing
+		glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, 0, dx, dx, dx, 1.0);
+		// custom parameter for smoke style (higher = thicker)
+		glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, 1, 7.0, 7.0, 7.0, 1.0);
+	}
+
 	GPU_texture_bind(tex, 0);
+	if(tex_shadow)
+		GPU_texture_bind(tex_shadow, 1);
 
 	if (!GLEW_ARB_texture_non_power_of_two) {
 		cor[0] = (float)res[0]/(float)larger_pow2(res[0]);
@@ -289,8 +326,17 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 		n++;
 	}
 
+	if(tex_shadow)
+		GPU_texture_unbind(tex_shadow);
 	GPU_texture_unbind(tex);
 
+	if(GLEW_ARB_fragment_program)
+	{
+		glDisable(GL_FRAGMENT_PROGRAM_ARB);
+		glDeleteProgramsARB(1, &prog);
+	}
+
+
 	MEM_freeN(points);
 
 	if(!gl_blend)
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index e5e85cf9d16..00b0b5c4fd1 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -157,7 +157,7 @@ ARegion *view3d_has_buttons_region(ScrArea *sa);
 ARegion *view3d_has_tools_region(ScrArea *sa);
 
 /* draw_volume.c */
-void draw_volume(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct Base *base, struct GPUTexture *tex, int res[3]);
+void draw_volume(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct Base *base, struct GPUTexture *tex, int res[3], float dx, struct GPUTexture *tex_shadow);
 
 
 #endif /* ED_VIEW3D_INTERN_H */