Merging r40265 through r40492 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / intern / object.c
index c2b561b122a167dc3902efd9965ff1223bc1ff64..57c47bb63e1c03b8b83bcaa43662d3817709fe52 100644 (file)
@@ -418,7 +418,7 @@ void unlink_object(Object *ob)
                                                for (ct= targets.first; ct; ct= ct->next) {
                                                        if (ct->tar == ob) {
                                                                ct->tar = NULL;
-                                                               strcpy(ct->subtarget, "");
+                                                               ct->subtarget[0]= '\0';
                                                                obt->recalc |= OB_RECALC_DATA;
                                                        }
                                                }
@@ -448,7 +448,7 @@ void unlink_object(Object *ob)
                                for (ct= targets.first; ct; ct= ct->next) {
                                        if (ct->tar == ob) {
                                                ct->tar = NULL;
-                                               strcpy(ct->subtarget, "");
+                                               ct->subtarget[0]= '\0';
                                                obt->recalc |= OB_RECALC_DATA;
                                        }
                                }
@@ -726,6 +726,7 @@ void *add_camera(const char *name)
        cam=  alloc_libblock(&G.main->camera, ID_CA, name);
 
        cam->lens= 35.0f;
+       cam->sensor_x = 32.f;
        cam->clipsta= 0.1f;
        cam->clipend= 100.0f;
        cam->drawsize= 0.5f;
@@ -2190,6 +2191,39 @@ void where_is_object_time(Scene *scene, Object *ob, float ctime)
        else                                                    ob->transflag &= ~OB_NEG_SCALE;
 }
 
+/* get object transformation matrix without recalculating dependencies and
+   constraints -- assume dependencies are already solved by depsgraph.
+   no changes to object and it's parent would be done.
+   used for bundles orientation in 3d space relative to parented blender camera */
+void where_is_object_mat(Scene *scene, Object *ob, float obmat[4][4])
+{
+       float *fp1, *fp2, slowmat[4][4] = MAT4_UNITY;
+       float fac1, fac2;
+       int a;
+
+       if(ob->parent) {
+               Object *par= ob->parent;
+
+               solve_parenting(scene, ob, par, obmat, slowmat, 1);
+
+               if(ob->partype & PARSLOW) {
+                       // include framerate
+                       fac1= ( 1.0f / (1.0f + (float)fabs(give_timeoffset(ob))) );
+                       if(fac1 >= 1.0f) return;
+                       fac2= 1.0f-fac1;
+
+                       fp1= obmat[0];
+                       fp2= slowmat[0];
+                       for(a=0; a<16; a++, fp1++, fp2++) {
+                               fp1[0]= fac1*fp1[0] + fac2*fp2[0];
+                       }
+               }
+       }
+       else {
+               object_to_mat4(ob, obmat);
+       }
+}
+
 static void solve_parenting (Scene *scene, Object *ob, Object *par, float obmat[][4], float slowmat[][4], int simul)
 {
        float totmat[4][4];
@@ -2350,7 +2384,7 @@ BoundBox *unit_boundbox(void)
        BoundBox *bb;
        float min[3] = {-1.0f,-1.0f,-1.0f}, max[3] = {-1.0f,-1.0f,-1.0f};
 
-       bb= MEM_callocN(sizeof(BoundBox), "bb");
+       bb= MEM_callocN(sizeof(BoundBox), "OB-BoundBox");
        boundbox_set_from_min_max(bb, min, max);
        
        return bb;
@@ -2947,7 +2981,7 @@ void object_camera_mode(RenderData *rd, Object *camera)
 /* 'lens' may be set for envmap only */
 void object_camera_matrix(
                RenderData *rd, Object *camera, int winx, int winy, short field_second,
-               float winmat[][4], rctf *viewplane, float *clipsta, float *clipend, float *lens, float *ycor,
+               float winmat[][4], rctf *viewplane, float *clipsta, float *clipend, float *lens, float *sensor_x, float *ycor,
                float *viewdx, float *viewdy
 ) {
        Camera *cam=NULL;
@@ -2980,6 +3014,7 @@ void object_camera_matrix(
                shiftx=cam->shiftx;
                shifty=cam->shifty;
                (*lens)= cam->lens;
+               (*sensor_x)= cam->sensor_x;
                (*clipsta)= cam->clipsta;
                (*clipend)= cam->clipend;
        }
@@ -2995,7 +3030,7 @@ void object_camera_matrix(
                (*clipend)= la->clipend;
        }
        else {  /* envmap exception... */;
-               if((*lens)==0.0f)
+               if((*lens)==0.0f) /* is this needed anymore? */
                        (*lens)= 16.0f;
 
                if((*clipsta)==0.0f || (*clipend)==0.0f) {
@@ -3016,8 +3051,8 @@ void object_camera_matrix(
                pixsize= cam->ortho_scale/viewfac;
        }
        else {
-               if(rd->xasp*winx >= rd->yasp*winy)      viewfac= ((*lens) * winx)/32.0f;
-               else                                                            viewfac= (*ycor) * ((*lens) * winy)/32.0f;
+               if(rd->xasp*winx >= rd->yasp*winy)      viewfac= ((*lens) * winx) / (*sensor_x);
+               else                                    viewfac= (*ycor) * ((*lens) * winy) / (*sensor_x);
                pixsize= (*clipsta) / viewfac;
        }