Revision: 26249
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26249
Author: blendix
Date: 2010-01-25 15:47:32 +0100 (Mon, 25 Jan 2010)
Log Message:
-----------
Show Cone option for spot lamps, to visualize which objects are being affected.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_data_lamp.py
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/makesdna/DNA_lamp_types.h
trunk/blender/source/blender/makesrna/intern/rna_camera.c
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
Modified: trunk/blender/release/scripts/ui/properties_data_lamp.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_lamp.py 2010-01-25 14:19:12 UTC (rev 26248)
+++ trunk/blender/release/scripts/ui/properties_data_lamp.py 2010-01-25 14:47:32 UTC (rev 26249)
@@ -352,6 +352,7 @@
sub.prop(lamp, "spot_size", text="Size")
sub.prop(lamp, "spot_blend", text="Blend", slider=True)
col.prop(lamp, "square")
+ col.prop(lamp, "show_cone")
if wide_ui:
col = split.column()
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2010-01-25 14:19:12 UTC (rev 26248)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2010-01-25 14:47:32 UTC (rev 26249)
@@ -765,18 +765,89 @@
return;
}
-static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob)
+static void draw_spot_cone(Lamp *la, float x, float z)
{
- Lamp *la;
+ float vec[3];
+
+ z= fabs(z);
+
+ glBegin(GL_TRIANGLE_FAN);
+ glVertex3f(0.0f, 0.0f, -x);
+
+ if(la->mode & LA_SQUARE) {
+ vec[0]= z;
+ vec[1]= z;
+ vec[2]= 0.0;
+
+ glVertex3fv(vec);
+ vec[1]= -z;
+ glVertex3fv(vec);
+ vec[0]= -z;
+ glVertex3fv(vec);
+ vec[1]= z;
+ glVertex3fv(vec);
+ }
+ else {
+ float angle;
+ int a;
+
+ for(a=0; a<33; a++) {
+ angle= a*M_PI*2/(33-1);
+ glVertex3f(z*cos(angle), z*sin(angle), 0);
+ }
+ }
+
+ glEnd();
+}
+
+static void draw_transp_spot_volume(Lamp *la, float x, float z)
+{
+ glEnable(GL_CULL_FACE);
+ glEnable(GL_BLEND);
+ glDepthMask(0);
+
+ /* draw backside darkening */
+ glCullFace(GL_FRONT);
+
+ glBlendFunc(GL_ZERO, GL_SRC_ALPHA);
+ glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
+
+ draw_spot_cone(la, x, z);
+
+ /* draw front side lightening */
+ glCullFace(GL_BACK);
+
+ glBlendFunc(GL_ONE, GL_ONE);
+ glColor4f(0.2f, 0.2f, 0.2f, 1.0f);
+
+ draw_spot_cone(la, x, z);
+
+ /* restore state */
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glDisable(GL_BLEND);
+ glDepthMask(1);
+ glDisable(GL_CULL_FACE);
+ glCullFace(GL_BACK);
+}
+
+static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int dt, int flag)
+{
+ Object *ob= base->object;
+ Lamp *la= ob->data;
float vec[3], lvec[3], vvec[3], circrad, x,y,z;
float pixsize, lampsize;
float imat[4][4], curcol[4];
char col[4];
+ int drawcone= (dt>OB_WIRE && !(G.f & G_PICKSEL) && la->type == LA_SPOT && (la->mode & LA_SHOW_CONE));
if(G.f & G_RENDER_SHADOW)
return;
- la= ob->data;
+ if(drawcone && !v3d->transp) {
+ /* in this case we need to draw delayed */
+ add_view3d_after(v3d, base, V3D_TRANSP, flag);
+ return;
+ }
/* we first draw only the screen aligned & fixed scale stuff */
glPushMatrix();
@@ -888,12 +959,8 @@
y = cos( M_PI*la->spotsize/360.0 );
spotvolume(lvec, vvec, y);
x = -la->dist;
- lvec[0] *= x ;
- lvec[1] *= x ;
- lvec[2] *= x;
- vvec[0] *= x ;
- vvec[1] *= x ;
- vvec[2] *= x;
+ mul_v3_fl(lvec, x);
+ mul_v3_fl(vvec, x);
/* draw the angled sides of the cone */
glBegin(GL_LINE_STRIP);
@@ -932,7 +999,9 @@
if (spotblcirc != 0 && spotblcirc != fabs(z))
circ(0.0, 0.0, spotblcirc);
}
-
+
+ if(drawcone)
+ draw_transp_spot_volume(la, x, z);
}
else if ELEM(la->type, LA_HEMI, LA_SUN) {
@@ -5516,7 +5585,7 @@
drawaxes(ob->empty_drawsize, flag, ob->empty_drawtype);
break;
case OB_LAMP:
- drawlamp(scene, v3d, rv3d, ob);
+ drawlamp(scene, v3d, rv3d, base, dt, flag);
if(dtx || (base->flag & SELECT)) wmMultMatrix(ob->obmat);
break;
case OB_CAMERA:
Modified: trunk/blender/source/blender/makesdna/DNA_lamp_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_lamp_types.h 2010-01-25 14:19:12 UTC (rev 26248)
+++ trunk/blender/source/blender/makesdna/DNA_lamp_types.h 2010-01-25 14:47:32 UTC (rev 26249)
@@ -145,6 +145,7 @@
#define LA_YF_SOFT 16384
#define LA_LAYER_SHADOW 32768
#define LA_SHAD_TEX (1<<16)
+#define LA_SHOW_CONE (1<<17)
/* layer_shadow */
#define LA_LAYER_SHADOW_BOTH 0
Modified: trunk/blender/source/blender/makesrna/intern/rna_camera.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_camera.c 2010-01-25 14:19:12 UTC (rev 26248)
+++ trunk/blender/source/blender/makesrna/intern/rna_camera.c 2010-01-25 14:47:32 UTC (rev 26249)
@@ -79,7 +79,6 @@
prop= RNA_def_property(srna, "passepartout_alpha", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "passepartalpha");
- RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Passepartout Alpha", "Opacity (alpha) of the darkened overlay in Camera view.");
RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
Modified: trunk/blender/source/blender/makesrna/intern/rna_lamp.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_lamp.c 2010-01-25 14:19:12 UTC (rev 26248)
+++ trunk/blender/source/blender/makesrna/intern/rna_lamp.c 2010-01-25 14:47:32 UTC (rev 26249)
@@ -646,6 +646,11 @@
RNA_def_property_ui_text(prop, "Spot Size", "Angle of the spotlight beam in degrees.");
RNA_def_property_update(prop, 0, "rna_Lamp_draw_update");
+ prop= RNA_def_property(srna, "show_cone", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "mode", LA_SHOW_CONE);
+ RNA_def_property_ui_text(prop, "Show Cone", "Draw transparent cone in 3D view to visualize which objects are contained in it.");
+ RNA_def_property_update(prop, 0, "rna_Lamp_draw_update");
+
prop= RNA_def_property(srna, "shadow_buffer_clip_start", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "clipsta");
RNA_def_property_range(prop, 0.0f, 9999.0f);