Bretch's patch for 2D transform. Thanks
[blender.git] / source / blender / src / drawimage.c
index d7a7c53b74e12d5a83eeb87d0a502d4e38e1e29a..7897f95a197b6b74b6e3fb07a04414b8f24f6260 100644 (file)
@@ -44,6 +44,7 @@
 #endif   
 #include "MEM_guardedalloc.h"
 
+#include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
 #include "IMB_imbuf_types.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
+#include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_image.h"
+#include "BKE_DerivedMesh.h"
+#include "BKE_displist.h"
+#include "BKE_object.h"
 
 #include "BDR_editface.h"
-#include "BDR_editobject.h"
+#include "BDR_drawobject.h"
 #include "BDR_drawmesh.h"
 
-       
 #include "BIF_gl.h"
-#include "BIF_space.h"
-#include "BIF_screen.h"
 #include "BIF_mywindow.h"
 #include "BIF_drawimage.h"
 #include "BIF_resources.h"
 #include "BIF_interface.h"
 #include "BIF_editsima.h"
 #include "BIF_glutil.h"
+#include "BIF_space.h"
+#include "BIF_screen.h"
+#include "BIF_transform.h"
 
 #include "BSE_trans_types.h"
+#include "BSE_view.h"
 
 /* Modules used */
 #include "mydevice.h"
 #include "blendef.h"
 #include "butspace.h"  // event codes
 
-
 /**
  * Sets up the fields of the View2D member of the SpaceImage struct
  * This routine can be called in two modes:
@@ -181,7 +186,7 @@ void image_changed(SpaceImage *sima, int dotile)
        if(sima->mode==SI_TEXTURE) {
                
                if(G.f & G_FACESELECT) {
-                       me= get_mesh((G.scene->basact) ? (G.scene->basact->object) : 0);
+                       me= get_mesh(OBACT);
                        if(me && me->tface) {
                                tface= me->tface;
                                a= me->totface;
@@ -207,7 +212,8 @@ void image_changed(SpaceImage *sima, int dotile)
                                        }
                                        tface++;
                                }
-                               allqueue(REDRAWVIEW3D, 0);
+
+                               object_uvs_changed(OBACT);
                                allqueue(REDRAWBUTSEDIT, 0);
                        }
                }
@@ -219,7 +225,7 @@ void uvco_to_areaco(float *vec, short *mval)
 {
        float x, y;
 
-       mval[0]= 3200;
+       mval[0]= IS_CLIPPED;
        
        x= (vec[0] - G.v2d->cur.xmin)/(G.v2d->cur.xmax-G.v2d->cur.xmin);
        y= (vec[1] - G.v2d->cur.ymin)/(G.v2d->cur.ymax-G.v2d->cur.ymin);
@@ -232,11 +238,11 @@ void uvco_to_areaco(float *vec, short *mval)
        }
 }
 
-void uvco_to_areaco_noclip(float *vec, short *mval)
+void uvco_to_areaco_noclip(float *vec, int *mval)
 {
        float x, y;
 
-       mval[0]= 3200;
+       mval[0]= IS_CLIPPED;
        
        x= (vec[0] - G.v2d->cur.xmin)/(G.v2d->cur.xmax-G.v2d->cur.xmin);
        y= (vec[1] - G.v2d->cur.ymin)/(G.v2d->cur.ymax-G.v2d->cur.ymin);
@@ -265,14 +271,22 @@ void draw_tfaces(void)
                        glLoadIdentity();
                        
                        /* draw shadow mesh */
-                       if(G.sima->flag & SI_DRAWSHADOW){               
+                       if((G.sima->flag & SI_DRAWSHADOW) && !(G.obedit==OBACT)){
+                               int dmNeedsFree;
+                               DerivedMesh *dm = mesh_get_derived_final(OBACT, &dmNeedsFree);
+
+                               glColor3ub(112, 112, 112);
+                               if (dm->drawUVEdges) dm->drawUVEdges(dm);
+
+                               if (dmNeedsFree) dm->release(dm);
+                       }
+                       else if(G.sima->flag & SI_DRAWSHADOW){          
                                tface= me->tface;
                                mface= me->mface;
                                a= me->totface;                 
                                while(a--) {
-                                       if(tface->flag & TF_HIDE);
-                                       else if(mface->v3) {
-                                               cpack(0x707070);
+                                       if(!(tface->flag & TF_HIDE)) {
+                                               glColor3ub(112, 112, 112);
                                                glBegin(GL_LINE_LOOP);
                                                glVertex2fv(tface->uv[0]);
                                                glVertex2fv(tface->uv[1]);
@@ -295,7 +309,7 @@ void draw_tfaces(void)
                                mface= me->mface;
                                a= me->totface;                 
                                while(a--) {
-                                       if(mface->v3 && (tface->flag & TF_SELECT)) {
+                                       if(tface->flag & TF_SELECT) {
                                                if(!(~tface->flag & (TF_SEL1|TF_SEL2|TF_SEL3)) &&
                                                   (!mface->v4 || tface->flag & TF_SEL4))
                                                        glColor4ubv(col2);
@@ -320,7 +334,7 @@ void draw_tfaces(void)
                        mface= me->mface;
                        a= me->totface;
                        while(a--) {
-                               if(mface->v3 && (tface->flag & TF_SELECT) ) {
+                               if(tface->flag & TF_SELECT) {
                                        if(tface->flag & TF_ACTIVE){
                                                activetface= tface; 
                                                activemface= mface; 
@@ -407,7 +421,7 @@ void draw_tfaces(void)
                        mface= me->mface;
                        a= me->totface;
                        while(a--) {
-                               if(mface->v3  && (tface->flag & TF_SELECT) ) {
+                               if(tface->flag & TF_SELECT) {
                                        
                                        if(tface->flag & TF_SEL1); else bglVertex2fv(tface->uv[0]);
                                        if(tface->flag & TF_SEL2); else bglVertex2fv(tface->uv[1]);
@@ -431,7 +445,7 @@ void draw_tfaces(void)
                        mface= me->mface;
                        a= me->totface;
                        while(a--) {
-                               if(mface->v3  && (tface->flag & TF_SELECT) ) {
+                               if(tface->flag & TF_SELECT) {
                                        
                                        if(tface->unwrap & TF_PIN1) bglVertex2fv(tface->uv[0]);
                                        if(tface->unwrap & TF_PIN2) bglVertex2fv(tface->uv[1]);
@@ -454,7 +468,7 @@ void draw_tfaces(void)
                        mface= me->mface;
                        a= me->totface;
                        while(a--) {
-                               if(mface->v3  && (tface->flag & TF_SELECT) ) {
+                               if(tface->flag & TF_SELECT) {
                                        
                                        if(tface->flag & TF_SEL1) bglVertex2fv(tface->uv[0]);
                                        if(tface->flag & TF_SEL2) bglVertex2fv(tface->uv[1]);
@@ -494,12 +508,12 @@ static unsigned int *get_part_from_ibuf(ImBuf *ibuf, short startx, short starty,
        return rectmain;
 }
 
-static void draw_image_prop_circle(ImBuf *ibuf)
+static void draw_image_transform(ImBuf *ibuf)
 {
-       float aspx, aspy;
-       extern float prop_cent[3];
+       if(G.moving) {
+               float aspx, aspy, center[3];
 
-       if(G.moving && G.scene->proportional) {
+        BIF_drawConstraint();
 
                if(ibuf==0 || ibuf->rect==0 || ibuf->x==0 || ibuf->y==0) {
                        aspx= aspy= 1.0;
@@ -509,34 +523,38 @@ static void draw_image_prop_circle(ImBuf *ibuf)
                        aspy= 256.0/ibuf->y;
                }
 
+               BIF_getPropCenter(center);
+
                /* scale and translate the circle into place and draw it */
                glPushMatrix();
                glScalef(aspx, aspy, 1.0);
-               glTranslatef((1/aspx)*prop_cent[0] - prop_cent[0],
-                            (1/aspy)*prop_cent[1] - prop_cent[1], 0.0);
-               draw_prop_circle();
+               glTranslatef((1/aspx)*center[0] - center[0],
+                            (1/aspy)*center[1] - center[1], 0.0);
+
+               BIF_drawPropCircle();
+
                glPopMatrix();
        }
 }
 
 static void draw_image_view_icon(void)
 {
+       float xPos = 5.0;
+
        glEnable(GL_BLEND);
        glBlendFunc(GL_SRC_ALPHA,  GL_ONE_MINUS_SRC_ALPHA); 
        
-       glRasterPos2f(5.0, 5.0);
-
        if(G.sima->flag & SI_STICKYUVS) {
-               BIF_draw_icon(ICON_STICKY2_UVS);
-               glRasterPos2f(25.0, 5.0);
+               BIF_draw_icon(xPos, 5.0, ICON_STICKY2_UVS);
+               xPos = 25.0;
        }
        else if(G.sima->flag & SI_LOCALSTICKY) {
-               BIF_draw_icon(ICON_STICKY_UVS);
-               glRasterPos2f(25.0, 5.0);
+               BIF_draw_icon(xPos, 5.0, ICON_STICKY_UVS);
+               xPos = 25.0;
        }
 
        if(G.sima->flag & SI_SELACTFACE) {
-                       BIF_draw_icon(ICON_DRAW_UVFACES);
+               BIF_draw_icon(xPos, 5.0, ICON_DRAW_UVFACES);
        }
        
        glBlendFunc(GL_ONE,  GL_ZERO); 
@@ -554,7 +572,7 @@ static void image_editvertex_buts(uiBlock *block)
        static float ocent[2];
        float cent[2]= {0.0, 0.0};
        int imx, imy;
-       int i, nactive= 0;
+       int i, nactive= 0, step, digits;
        Mesh *me;
        
        if( is_uv_tface_editing_allowed_silent()==0 ) return;
@@ -570,7 +588,7 @@ static void image_editvertex_buts(uiBlock *block)
                MFace *mf= &((MFace*) me->mface)[i];
                TFace *tf= &((TFace*) me->tface)[i];
                
-               if (!mf->v3 || !(tf->flag & TF_SELECT))
+               if (!(tf->flag & TF_SELECT))
                        continue;
                
                if (tf->flag & TF_SEL1) {
@@ -597,38 +615,52 @@ static void image_editvertex_buts(uiBlock *block)
                
        if(block) {     // do the buttons
                if (nactive) {
-                       ocent[0]= (cent[0]*imx)/nactive;
-                       ocent[1]= (cent[1]*imy)/nactive;
+                       ocent[0]= cent[0]/nactive;
+                       ocent[1]= cent[1]/nactive;
+                       if (G.sima->flag & SI_COORDFLOATS) {
+                               step= 1;
+                               digits= 3;
+                       }
+                       else {
+                               ocent[0] *= imx;
+                               ocent[1] *= imy;
+                               step= 100;
+                               digits= 2;
+                       }
                        
                        uiDefBut(block, LABEL, 0, "UV Vertex:",10,55,302,19,0,0,0,0,0,"");
+                       uiBlockBeginAlign(block);
                        if(nactive==1) {
-                               uiBlockBeginAlign(block);
-                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Vertex X:",       10, 35, 290, 19, &ocent[0], -10*imx, 10.0*imx, 100, 0, "");
-                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Vertex Y:",       10, 15, 290, 19, &ocent[1], -10*imy, 10.0*imy, 100, 0, "");
-                               uiBlockEndAlign(block);
+                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Vertex X:",       10, 35, 290, 19, &ocent[0], -10*imx, 10.0*imx, step, digits, "");
+                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Vertex Y:",       10, 15, 290, 19, &ocent[1], -10*imy, 10.0*imy, step, digits, "");
                        }
                        else {
-                               uiBlockBeginAlign(block);
-                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Median X:",       10, 35, 290, 19, &ocent[0], -10*imx, 10.0*imx, 100, 0, "");
-                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Median Y:",       10, 15, 290, 19, &ocent[1], -10*imy, 10.0*imy, 100, 0, "");
-                               uiBlockEndAlign(block);
+                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Median X:",       10, 35, 290, 19, &ocent[0], -10*imx, 10.0*imx, step, digits, "");
+                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Median Y:",       10, 15, 290, 19, &ocent[1], -10*imy, 10.0*imy, step, digits, "");
                        }
+                       uiBlockEndAlign(block);
                }
        }
        else {  // apply event
                float delta[2];
                
-               cent[0]= (cent[0]*imx)/nactive;
-               cent[1]= (cent[1]*imy)/nactive;
+               cent[0]= cent[0]/nactive;
+               cent[1]= cent[1]/nactive;
                        
-               delta[0]= (ocent[0]-cent[0])/imx;
-               delta[1]= (ocent[1]-cent[1])/imy;
+               if (G.sima->flag & SI_COORDFLOATS) {
+                       delta[0]= ocent[0]-cent[0];
+                       delta[1]= ocent[1]-cent[1];
+               }
+               else {
+                       delta[0]= ocent[0]/imx - cent[0];
+                       delta[1]= ocent[1]/imy - cent[1];
+               }
 
                for (i=0; i<me->totface; i++) {
                        MFace *mf= &((MFace*) me->mface)[i];
                        TFace *tf= &((TFace*) me->tface)[i];
                
-                       if (!mf->v3 || !(tf->flag & TF_SELECT))
+                       if (!(tf->flag & TF_SELECT))
                                continue;
                
                        if (tf->flag & TF_SEL1) {
@@ -714,14 +746,14 @@ static void image_panel_properties(short cntrl)   // IMAGE_HANDLER_PROPERTIES
                uiDefBut(block, LABEL, B_NOP, str,              10,180,300,19, 0, 0, 0, 0, 0, "");
 
                uiBlockBeginAlign(block);
-               uiDefButS(block, TOG|BIT|1, B_TWINANIM, "Anim", 10,150,140,19, &G.sima->image->tpageflag, 0, 0, 0, 0, "Toggles use of animated texture");
+               uiDefButBitS(block, TOG, IMA_TWINANIM, B_TWINANIM, "Anim", 10,150,140,19, &G.sima->image->tpageflag, 0, 0, 0, 0, "Toggles use of animated texture");
                uiDefButS(block, NUM, B_TWINANIM, "Start:",             10,130,140,19, &G.sima->image->twsta, 0.0, 128.0, 0, 0, "Displays the start frame of an animated texture");
                uiDefButS(block, NUM, B_TWINANIM, "End:",               10,110,140,19, &G.sima->image->twend, 0.0, 128.0, 0, 0, "Displays the end frame of an animated texture");
                uiDefButS(block, NUM, B_NOP, "Speed",                           10,90,140,19, &G.sima->image->animspeed, 1.0, 100.0, 0, 0, "Displays Speed of the animation in frames per second");
                uiBlockEndAlign(block);
 
                uiBlockBeginAlign(block);
-               uiDefButS(block, TOG|BIT|0, B_SIMAGEDRAW1, "Tiles",     160,150,140,19, &G.sima->image->tpageflag, 0, 0, 0, 0, "Toggles use of tilemode for faces");
+               uiDefButBitS(block, TOG, IMA_TILES, B_SIMAGEDRAW1, "Tiles",     160,150,140,19, &G.sima->image->tpageflag, 0, 0, 0, 0, "Toggles use of tilemode for faces");
                uiDefButS(block, NUM, B_SIMAGEDRAW, "X:",               160,130,70,19, &G.sima->image->xrep, 1.0, 16.0, 0, 0, "Sets the degree of repetition in the X direction");
                uiDefButS(block, NUM, B_SIMAGEDRAW, "Y:",               230,130,70,19, &G.sima->image->yrep, 1.0, 16.0, 0, 0, "Sets the degree of repetition in the Y direction");
                uiBlockBeginAlign(block);
@@ -750,7 +782,6 @@ static void image_panel_paint(short cntrl)  // IMAGE_HANDLER_PROPERTIES
        uiDefButF(block, NUM, B_NOP, "Size ",   180+12+24,140,80,20, &Gvp.size, 2.0, 64.0, 0, 0, "The size of the brush");
 }
 
-
 static void image_blockhandlers(ScrArea *sa)
 {
        SpaceImage *sima= sa->spacedata.first;
@@ -785,6 +816,15 @@ void drawimagespace(ScrArea *sa, void *spacedata)
        int x1, y1;
        short sx, sy, dx, dy;
        
+               /* If derived data is used then make sure that object
+                * is up-to-date... might not be the case because updates
+                * are normally done in drawview and could get here before
+                * drawing a View3D.
+                */
+       if (!G.obedit && OBACT && (G.sima->flag&SI_DRAWSHADOW)) {
+               object_handle_update(OBACT);
+       }
+
        BIF_GetThemeColor3fv(TH_BACK, col);
        glClearColor(col[0], col[1], col[2], 0.0);
        glClear(GL_COLOR_BUFFER_BIT);
@@ -795,10 +835,10 @@ void drawimagespace(ScrArea *sa, void *spacedata)
        what_image(G.sima);
        
        if(G.sima->image) {
-       
                if(G.sima->image->ibuf==0) {
                        load_image(G.sima->image, IB_rect, G.sce, G.scene->r.cfra);
                }       
+               tag_image_time(G.sima->image);
                ibuf= G.sima->image->ibuf;
        }
        
@@ -884,7 +924,7 @@ void drawimagespace(ScrArea *sa, void *spacedata)
                calc_image_view(G.sima, 'f');   /* float */
        }
 
-       draw_image_prop_circle(ibuf);
+       draw_image_transform(ibuf);
 
        myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);
        draw_image_view_icon();
@@ -1058,7 +1098,7 @@ void image_viewcentre(void)
        
        if(size<=0.01) size= 0.01;
 
-       G.sima->zoom= 1.0/size;
+       G.sima->zoom= 0.7/size;
 
        calc_image_view(G.sima, 'p');