Code refactoring: split camera functions from object.c into new camera.c.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 5 Nov 2011 13:00:39 +0000 (13:00 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 5 Nov 2011 13:00:39 +0000 (13:00 +0000)
17 files changed:
source/blender/blenkernel/BKE_camera.h [new file with mode: 0644]
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/camera.c [new file with mode: 0644]
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/collada/DocumentImporter.cpp
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesrna/intern/rna_camera_api.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/nodes/composite/node_composite_util.h
source/blender/render/intern/source/initrender.c
source/blender/render/intern/source/pipeline.c

diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
new file mode 100644 (file)
index 0000000..d21c109
--- /dev/null
@@ -0,0 +1,71 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef BKE_CAMERA_H
+#define BKE_CAMERA_H
+
+/** \file BKE_camera.h
+ *  \ingroup bke
+ *  \brief Camera datablock and utility functions.
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct Camera;
+struct Object;
+struct RenderData;
+struct Scene;
+struct rctf;
+
+void *add_camera(const char *name);
+struct Camera *copy_camera(struct Camera *cam);
+void make_local_camera(struct Camera *cam);
+void free_camera(struct Camera *ca);
+
+float dof_camera(struct Object *ob);
+
+void object_camera_mode(struct RenderData *rd, struct Object *camera);
+void object_camera_intrinsics(struct Object *camera, struct Camera **cam_r, short *is_ortho, float *shiftx, float *shifty,
+                       float *clipsta, float *clipend, float *lens, float *sensor_x, float *sensor_y, short *sensor_fit);
+void object_camera_matrix(
+               struct RenderData *rd, struct Object *camera, int winx, int winy, short field_second,
+               float winmat[][4], struct rctf *viewplane, float *clipsta, float *clipend, float *lens,
+               float *sensor_x, float *sensor_y, short *sensor_fit, float *ycor,
+               float *viewdx, float *viewdy);
+
+void camera_view_frame_ex(struct Scene *scene, struct Camera *camera, float drawsize, const short do_clip, const float scale[3],
+                          float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3]);
+
+void camera_view_frame(struct Scene *scene, struct Camera *camera, float r_vec[4][3]);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
index c5a24c1..f9cd704 100644 (file)
@@ -74,16 +74,11 @@ void object_copy_proxy_drivers(struct Object *ob, struct Object *target);
 
 void unlink_object(struct Object *ob);
 int exist_object(struct Object *obtest);
-void *add_camera(const char *name);
-struct Camera *copy_camera(struct Camera *cam);
-void make_local_camera(struct Camera *cam);
-float dof_camera(struct Object *ob);
        
 void *add_lamp(const char *name);
 struct Lamp *copy_lamp(struct Lamp *la);
 struct Lamp *localize_lamp(struct Lamp *la);
 void make_local_lamp(struct Lamp *la);
-void free_camera(struct Camera *ca);
 void free_lamp(struct Lamp *la);
 
 struct Object *add_only_object(int type, const char *name);
@@ -138,20 +133,6 @@ struct KeyBlock *object_insert_shape_key(struct Scene *scene, struct Object *ob,
 
 int object_is_modified(struct Scene *scene, struct Object *ob);
 
-void object_camera_mode(struct RenderData *rd, struct Object *camera);
-void object_camera_intrinsics(struct Object *camera, struct Camera **cam_r, short *is_ortho, float *shiftx, float *shifty,
-                       float *clipsta, float *clipend, float *lens, float *sensor_x, float *sensor_y, short *sensor_fit);
-void object_camera_matrix(
-               struct RenderData *rd, struct Object *camera, int winx, int winy, short field_second,
-               float winmat[][4], struct rctf *viewplane, float *clipsta, float *clipend, float *lens,
-               float *sensor_x, float *sensor_y, short *sensor_fit, float *ycor,
-               float *viewdx, float *viewdy);
-
-void camera_view_frame_ex(struct Scene *scene, struct Camera *camera, float drawsize, const short do_clip, const float scale[3],
-                          float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3]);
-
-void camera_view_frame(struct Scene *scene, struct Camera *camera, float r_vec[4][3]);
-
 void object_relink(struct Object *ob);
 
 #ifdef __cplusplus
index 1b98dd9..ba6776e 100644 (file)
@@ -76,6 +76,7 @@ set(SRC
        intern/brush.c
        intern/bullet.c
        intern/bvhutils.c
+       intern/camera.c
        intern/cdderivedmesh.c
        intern/cloth.c
        intern/collision.c
@@ -160,6 +161,7 @@ set(SRC
        BKE_brush.h
        BKE_bullet.h
        BKE_bvhutils.h
+       BKE_camera.h
        BKE_cdderivedmesh.h
        BKE_cloth.h
        BKE_collision.h
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
new file mode 100644 (file)
index 0000000..74cc5a7
--- /dev/null
@@ -0,0 +1,394 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenkernel/intern/camera.c
+ *  \ingroup bke
+ */
+
+#include "DNA_camera_types.h"
+#include "DNA_lamp_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_animsys.h"
+#include "BKE_camera.h"
+#include "BKE_global.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
+
+void *add_camera(const char *name)
+{
+       Camera *cam;
+       
+       cam=  alloc_libblock(&G.main->camera, ID_CA, name);
+
+       cam->lens= 35.0f;
+       cam->sensor_x= 32.0f;
+       cam->sensor_y= 18.0f;
+       cam->clipsta= 0.1f;
+       cam->clipend= 100.0f;
+       cam->drawsize= 0.5f;
+       cam->ortho_scale= 6.0;
+       cam->flag |= CAM_SHOWPASSEPARTOUT;
+       cam->passepartalpha = 0.5f;
+       
+       return cam;
+}
+
+Camera *copy_camera(Camera *cam)
+{
+       Camera *camn;
+       
+       camn= copy_libblock(cam);
+       
+       return camn;
+}
+
+void make_local_camera(Camera *cam)
+{
+       Main *bmain= G.main;
+       Object *ob;
+       int is_local= FALSE, is_lib= FALSE;
+
+       /* - only lib users: do nothing
+        * - only local users: set flag
+        * - mixed: make copy
+        */
+       
+       if(cam->id.lib==NULL) return;
+       if(cam->id.us==1) {
+               id_clear_lib_data(bmain, &cam->id);
+               return;
+       }
+       
+       for(ob= bmain->object.first; ob && ELEM(0, is_lib, is_local); ob= ob->id.next) {
+               if(ob->data==cam) {
+                       if(ob->id.lib) is_lib= TRUE;
+                       else is_local= TRUE;
+               }
+       }
+       
+       if(is_local && is_lib == FALSE) {
+               id_clear_lib_data(bmain, &cam->id);
+       }
+       else if(is_local && is_lib) {
+               Camera *camn= copy_camera(cam);
+
+               camn->id.us= 0;
+
+               /* Remap paths of new ID using old library as base. */
+               BKE_id_lib_local_paths(bmain, &camn->id);
+
+               for(ob= bmain->object.first; ob; ob= ob->id.next) {
+                       if(ob->data == cam) {
+                               if(ob->id.lib==NULL) {
+                                       ob->data= camn;
+                                       camn->id.us++;
+                                       cam->id.us--;
+                               }
+                       }
+               }
+       }
+}
+
+/* get the camera's dof value, takes the dof object into account */
+float dof_camera(Object *ob)
+{
+       Camera *cam = (Camera *)ob->data; 
+       if (ob->type != OB_CAMERA)
+               return 0.0f;
+       if (cam->dof_ob) {      
+               /* too simple, better to return the distance on the view axis only
+                * return len_v3v3(ob->obmat[3], cam->dof_ob->obmat[3]); */
+               float mat[4][4], imat[4][4], obmat[4][4];
+               
+               copy_m4_m4(obmat, ob->obmat);
+               normalize_m4(obmat);
+               invert_m4_m4(imat, obmat);
+               mul_m4_m4m4(mat, cam->dof_ob->obmat, imat);
+               return (float)fabs(mat[3][2]);
+       }
+       return cam->YF_dofdist;
+}
+
+void free_camera(Camera *ca)
+{
+       BKE_free_animdata((ID *)ca);
+}
+
+void object_camera_mode(RenderData *rd, Object *camera)
+{
+       rd->mode &= ~(R_ORTHO|R_PANORAMA);
+       if(camera && camera->type==OB_CAMERA) {
+               Camera *cam= camera->data;
+               if(cam->type == CAM_ORTHO) rd->mode |= R_ORTHO;
+               if(cam->flag & CAM_PANORAMA) rd->mode |= R_PANORAMA;
+       }
+}
+
+void object_camera_intrinsics(Object *camera, Camera **cam_r, short *is_ortho, float *shiftx, float *shifty,
+                       float *clipsta, float *clipend, float *lens, float *sensor_x, float *sensor_y, short *sensor_fit)
+{
+       Camera *cam= NULL;
+
+       (*shiftx)= 0.0f;
+       (*shifty)= 0.0f;
+
+       (*sensor_x)= DEFAULT_SENSOR_WIDTH;
+       (*sensor_y)= DEFAULT_SENSOR_HEIGHT;
+       (*sensor_fit)= CAMERA_SENSOR_FIT_AUTO;
+
+       if(camera->type==OB_CAMERA) {
+               cam= camera->data;
+
+               if(cam->type == CAM_ORTHO) {
+                       *is_ortho= TRUE;
+               }
+
+               /* solve this too... all time depending stuff is in convertblender.c?
+                * Need to update the camera early because it's used for projection matrices
+                * and other stuff BEFORE the animation update loop is done
+                * */
+#if 0 // XXX old animation system
+               if(cam->ipo) {
+                       calc_ipo(cam->ipo, frame_to_float(re->scene, re->r.cfra));
+                       execute_ipo(&cam->id, cam->ipo);
+               }
+#endif // XXX old animation system
+               (*shiftx)=cam->shiftx;
+               (*shifty)=cam->shifty;
+               (*lens)= cam->lens;
+               (*sensor_x)= cam->sensor_x;
+               (*sensor_y)= cam->sensor_y;
+               (*clipsta)= cam->clipsta;
+               (*clipend)= cam->clipend;
+               (*sensor_fit)= cam->sensor_fit;
+       }
+       else if(camera->type==OB_LAMP) {
+               Lamp *la= camera->data;
+               float fac= cosf((float)M_PI*la->spotsize/360.0f);
+               float phi= acos(fac);
+
+               (*lens)= 16.0f*fac/sinf(phi);
+               if((*lens)==0.0f)
+                       (*lens)= 35.0f;
+               (*clipsta)= la->clipsta;
+               (*clipend)= la->clipend;
+       }
+       else {  /* envmap exception... */;
+               if((*lens)==0.0f) /* is this needed anymore? */
+                       (*lens)= 16.0f;
+
+               if((*clipsta)==0.0f || (*clipend)==0.0f) {
+                       (*clipsta)= 0.1f;
+                       (*clipend)= 1000.0f;
+               }
+       }
+
+       (*cam_r)= cam;
+}
+
+/* '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 *sensor_x, float *sensor_y, short *sensor_fit, float *ycor,
+               float *viewdx, float *viewdy)
+{
+       Camera *cam=NULL;
+       float pixsize;
+       float shiftx=0.0, shifty=0.0, winside, viewfac;
+       short is_ortho= FALSE;
+
+       /* question mark */
+       (*ycor)= rd->yasp / rd->xasp;
+       if(rd->mode & R_FIELDS)
+               (*ycor) *= 2.0f;
+
+       object_camera_intrinsics(camera, &cam, &is_ortho, &shiftx, &shifty, clipsta, clipend, lens, sensor_x, sensor_y, sensor_fit);
+
+       /* ortho only with camera available */
+       if(cam && is_ortho) {
+               if((*sensor_fit)==CAMERA_SENSOR_FIT_AUTO) {
+                       if(rd->xasp*winx >= rd->yasp*winy) viewfac= winx;
+                       else viewfac= (*ycor) * winy;
+               }
+               else if((*sensor_fit)==CAMERA_SENSOR_FIT_HOR) {
+                       viewfac= winx;
+               }
+               else { /* if((*sensor_fit)==CAMERA_SENSOR_FIT_VERT) { */
+                       viewfac= (*ycor) * winy;
+               }
+
+               /* ortho_scale == 1.0 means exact 1 to 1 mapping */
+               pixsize= cam->ortho_scale/viewfac;
+       }
+       else {
+               if((*sensor_fit)==CAMERA_SENSOR_FIT_AUTO) {
+                       if(rd->xasp*winx >= rd->yasp*winy)      viewfac= ((*lens) * winx) / (*sensor_x);
+                       else                                    viewfac= (*ycor) * ((*lens) * winy) / (*sensor_x);
+               }
+               else if((*sensor_fit)==CAMERA_SENSOR_FIT_HOR) {
+                       viewfac= ((*lens) * winx) / (*sensor_x);
+               }
+               else { /* if((*sensor_fit)==CAMERA_SENSOR_FIT_VERT) { */
+                       viewfac= ((*lens) * winy) / (*sensor_y);
+               }
+
+               pixsize= (*clipsta) / viewfac;
+       }
+
+       /* viewplane fully centered, zbuffer fills in jittered between -.5 and +.5 */
+       winside= MAX2(winx, winy);
+
+       if(cam) {
+               if(cam->sensor_fit==CAMERA_SENSOR_FIT_HOR)
+                       winside= winx;
+               else if(cam->sensor_fit==CAMERA_SENSOR_FIT_VERT)
+                       winside= winy;
+       }
+
+       viewplane->xmin= -0.5f*(float)winx + shiftx*winside;
+       viewplane->ymin= -0.5f*(*ycor)*(float)winy + shifty*winside;
+       viewplane->xmax=  0.5f*(float)winx + shiftx*winside;
+       viewplane->ymax=  0.5f*(*ycor)*(float)winy + shifty*winside;
+
+       if(field_second) {
+               if(rd->mode & R_ODDFIELD) {
+                       viewplane->ymin-= 0.5f * (*ycor);
+                       viewplane->ymax-= 0.5f * (*ycor);
+               }
+               else {
+                       viewplane->ymin+= 0.5f * (*ycor);
+                       viewplane->ymax+= 0.5f * (*ycor);
+               }
+       }
+       /* the window matrix is used for clipping, and not changed during OSA steps */
+       /* using an offset of +0.5 here would give clip errors on edges */
+       viewplane->xmin *= pixsize;
+       viewplane->xmax *= pixsize;
+       viewplane->ymin *= pixsize;
+       viewplane->ymax *= pixsize;
+
+       (*viewdx)= pixsize;
+       (*viewdy)= (*ycor) * pixsize;
+
+       if(is_ortho)
+               orthographic_m4(winmat, viewplane->xmin, viewplane->xmax, viewplane->ymin, viewplane->ymax, *clipsta, *clipend);
+       else
+               perspective_m4(winmat, viewplane->xmin, viewplane->xmax, viewplane->ymin, viewplane->ymax, *clipsta, *clipend);
+
+}
+
+void camera_view_frame_ex(Scene *scene, Camera *camera, float drawsize, const short do_clip, const float scale[3],
+                          float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3])
+{
+       float facx, facy;
+       float depth;
+
+       /* aspect correcton */
+       if (scene) {
+               float aspx= (float) scene->r.xsch*scene->r.xasp;
+               float aspy= (float) scene->r.ysch*scene->r.yasp;
+
+               if(camera->sensor_fit==CAMERA_SENSOR_FIT_AUTO) {
+                       if(aspx < aspy) {
+                               r_asp[0]= aspx / aspy;
+                               r_asp[1]= 1.0;
+                       }
+                       else {
+                               r_asp[0]= 1.0;
+                               r_asp[1]= aspy / aspx;
+                       }
+               }
+               else if(camera->sensor_fit==CAMERA_SENSOR_FIT_AUTO) {
+                       r_asp[0]= aspx / aspy;
+                       r_asp[1]= 1.0;
+               }
+               else {
+                       r_asp[0]= 1.0;
+                       r_asp[1]= aspy / aspx;
+               }
+       }
+       else {
+               r_asp[0]= 1.0f;
+               r_asp[1]= 1.0f;
+       }
+
+       if(camera->type==CAM_ORTHO) {
+               facx= 0.5f * camera->ortho_scale * r_asp[0] * scale[0];
+               facy= 0.5f * camera->ortho_scale * r_asp[1] * scale[1];
+               r_shift[0]= camera->shiftx * camera->ortho_scale * scale[0];
+               r_shift[1]= camera->shifty * camera->ortho_scale * scale[1];
+               depth= do_clip ? -((camera->clipsta * scale[2]) + 0.1f) : - drawsize * camera->ortho_scale * scale[2];
+
+               *r_drawsize= 0.5f * camera->ortho_scale;
+       }
+       else {
+               /* that way it's always visible - clipsta+0.1 */
+               float fac;
+               float half_sensor= 0.5f*((camera->sensor_fit==CAMERA_SENSOR_FIT_VERT) ? (camera->sensor_y) : (camera->sensor_x));
+
+               *r_drawsize= drawsize / ((scale[0] + scale[1] + scale[2]) / 3.0f);
+
+               if(do_clip) {
+                       /* fixed depth, variable size (avoids exceeding clipping range) */
+                       depth = -(camera->clipsta + 0.1f);
+                       fac = depth / (camera->lens/(-half_sensor) * scale[2]);
+               }
+               else {
+                       /* fixed size, variable depth (stays a reasonable size in the 3D view) */
+                       depth= *r_drawsize * camera->lens/(-half_sensor) * scale[2];
+                       fac= *r_drawsize;
+               }
+
+               facx= fac * r_asp[0] * scale[0];
+               facy= fac * r_asp[1] * scale[1];
+               r_shift[0]= camera->shiftx*fac*2 * scale[0];
+               r_shift[1]= camera->shifty*fac*2 * scale[1];
+       }
+
+       r_vec[0][0]= r_shift[0] + facx; r_vec[0][1]= r_shift[1] + facy; r_vec[0][2]= depth;
+       r_vec[1][0]= r_shift[0] + facx; r_vec[1][1]= r_shift[1] - facy; r_vec[1][2]= depth;
+       r_vec[2][0]= r_shift[0] - facx; r_vec[2][1]= r_shift[1] - facy; r_vec[2][2]= depth;
+       r_vec[3][0]= r_shift[0] - facx; r_vec[3][1]= r_shift[1] + facy; r_vec[3][2]= depth;
+}
+
+void camera_view_frame(Scene *scene, Camera *camera, float r_vec[4][3])
+{
+       float dummy_asp[2];
+       float dummy_shift[2];
+       float dummy_drawsize;
+       const float dummy_scale[3]= {1.0f, 1.0f, 1.0f};
+
+       camera_view_frame_ex(scene, camera, FALSE, 1.0, dummy_scale,
+                            dummy_asp, dummy_shift, &dummy_drawsize, r_vec);
+}
+
index 35b5073..36e2428 100644 (file)
@@ -77,6 +77,7 @@
 #include "BLI_bpath.h"
 
 #include "BKE_animsys.h"
+#include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
index b09d1ea..1ba06c0 100644 (file)
@@ -98,6 +98,7 @@
 #include "BKE_speaker.h"
 #include "BKE_softbody.h"
 #include "BKE_material.h"
+#include "BKE_camera.h"
 
 #include "LBM_fluidsim.h"
 
@@ -715,103 +716,6 @@ int exist_object(Object *obtest)
        return 0;
 }
 
-void *add_camera(const char *name)
-{
-       Camera *cam;
-       
-       cam=  alloc_libblock(&G.main->camera, ID_CA, name);
-
-       cam->lens= 35.0f;
-       cam->sensor_x= 32.0f;
-       cam->sensor_y= 18.0f;
-       cam->clipsta= 0.1f;
-       cam->clipend= 100.0f;
-       cam->drawsize= 0.5f;
-       cam->ortho_scale= 6.0;
-       cam->flag |= CAM_SHOWPASSEPARTOUT;
-       cam->passepartalpha = 0.5f;
-       
-       return cam;
-}
-
-Camera *copy_camera(Camera *cam)
-{
-       Camera *camn;
-       
-       camn= copy_libblock(cam);
-       
-       return camn;
-}
-
-
-
-void make_local_camera(Camera *cam)
-{
-       Main *bmain= G.main;
-       Object *ob;
-       int is_local= FALSE, is_lib= FALSE;
-
-       /* - only lib users: do nothing
-        * - only local users: set flag
-        * - mixed: make copy
-        */
-       
-       if(cam->id.lib==NULL) return;
-       if(cam->id.us==1) {
-               id_clear_lib_data(bmain, &cam->id);
-               return;
-       }
-       
-       for(ob= bmain->object.first; ob && ELEM(0, is_lib, is_local); ob= ob->id.next) {
-               if(ob->data==cam) {
-                       if(ob->id.lib) is_lib= TRUE;
-                       else is_local= TRUE;
-               }
-       }
-       
-       if(is_local && is_lib == FALSE) {
-               id_clear_lib_data(bmain, &cam->id);
-       }
-       else if(is_local && is_lib) {
-               Camera *camn= copy_camera(cam);
-
-               camn->id.us= 0;
-
-               /* Remap paths of new ID using old library as base. */
-               BKE_id_lib_local_paths(bmain, &camn->id);
-
-               for(ob= bmain->object.first; ob; ob= ob->id.next) {
-                       if(ob->data == cam) {
-                               if(ob->id.lib==NULL) {
-                                       ob->data= camn;
-                                       camn->id.us++;
-                                       cam->id.us--;
-                               }
-                       }
-               }
-       }
-}
-
-/* get the camera's dof value, takes the dof object into account */
-float dof_camera(Object *ob)
-{
-       Camera *cam = (Camera *)ob->data; 
-       if (ob->type != OB_CAMERA)
-               return 0.0f;
-       if (cam->dof_ob) {      
-               /* too simple, better to return the distance on the view axis only
-                * return len_v3v3(ob->obmat[3], cam->dof_ob->obmat[3]); */
-               float mat[4][4], imat[4][4], obmat[4][4];
-               
-               copy_m4_m4(obmat, ob->obmat);
-               normalize_m4(obmat);
-               invert_m4_m4(imat, obmat);
-               mul_m4_m4m4(mat, cam->dof_ob->obmat, imat);
-               return (float)fabs(mat[3][2]);
-       }
-       return cam->YF_dofdist;
-}
-
 void *add_lamp(const char *name)
 {
        Lamp *la;
@@ -966,11 +870,6 @@ void make_local_lamp(Lamp *la)
        }
 }
 
-void free_camera(Camera *ca)
-{
-       BKE_free_animdata((ID *)ca);
-}
-
 void free_lamp(Lamp *la)
 {
        MTex *mtex;
@@ -2942,255 +2841,6 @@ int object_insert_ptcache(Object *ob)
        return i;
 }
 
-void object_camera_mode(RenderData *rd, Object *camera)
-{
-       rd->mode &= ~(R_ORTHO|R_PANORAMA);
-       if(camera && camera->type==OB_CAMERA) {
-               Camera *cam= camera->data;
-               if(cam->type == CAM_ORTHO) rd->mode |= R_ORTHO;
-               if(cam->flag & CAM_PANORAMA) rd->mode |= R_PANORAMA;
-       }
-}
-
-void object_camera_intrinsics(Object *camera, Camera **cam_r, short *is_ortho, float *shiftx, float *shifty,
-                       float *clipsta, float *clipend, float *lens, float *sensor_x, float *sensor_y, short *sensor_fit)
-{
-       Camera *cam= NULL;
-
-       (*shiftx)= 0.0f;
-       (*shifty)= 0.0f;
-
-       (*sensor_x)= DEFAULT_SENSOR_WIDTH;
-       (*sensor_y)= DEFAULT_SENSOR_HEIGHT;
-       (*sensor_fit)= CAMERA_SENSOR_FIT_AUTO;
-
-       if(camera->type==OB_CAMERA) {
-               cam= camera->data;
-
-               if(cam->type == CAM_ORTHO) {
-                       *is_ortho= TRUE;
-               }
-
-               /* solve this too... all time depending stuff is in convertblender.c?
-                * Need to update the camera early because it's used for projection matrices
-                * and other stuff BEFORE the animation update loop is done
-                * */
-#if 0 // XXX old animation system
-               if(cam->ipo) {
-                       calc_ipo(cam->ipo, frame_to_float(re->scene, re->r.cfra));
-                       execute_ipo(&cam->id, cam->ipo);
-               }
-#endif // XXX old animation system
-               (*shiftx)=cam->shiftx;
-               (*shifty)=cam->shifty;
-               (*lens)= cam->lens;
-               (*sensor_x)= cam->sensor_x;
-               (*sensor_y)= cam->sensor_y;
-               (*clipsta)= cam->clipsta;
-               (*clipend)= cam->clipend;
-               (*sensor_fit)= cam->sensor_fit;
-       }
-       else if(camera->type==OB_LAMP) {
-               Lamp *la= camera->data;
-               float fac= cosf((float)M_PI*la->spotsize/360.0f);
-               float phi= acos(fac);
-
-               (*lens)= 16.0f*fac/sinf(phi);
-               if((*lens)==0.0f)
-                       (*lens)= 35.0f;
-               (*clipsta)= la->clipsta;
-               (*clipend)= la->clipend;
-       }
-       else {  /* envmap exception... */;
-               if((*lens)==0.0f) /* is this needed anymore? */
-                       (*lens)= 16.0f;
-
-               if((*clipsta)==0.0f || (*clipend)==0.0f) {
-                       (*clipsta)= 0.1f;
-                       (*clipend)= 1000.0f;
-               }
-       }
-
-       (*cam_r)= cam;
-}
-
-/* '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 *sensor_x, float *sensor_y, short *sensor_fit, float *ycor,
-               float *viewdx, float *viewdy)
-{
-       Camera *cam=NULL;
-       float pixsize;
-       float shiftx=0.0, shifty=0.0, winside, viewfac;
-       short is_ortho= FALSE;
-
-       /* question mark */
-       (*ycor)= rd->yasp / rd->xasp;
-       if(rd->mode & R_FIELDS)
-               (*ycor) *= 2.0f;
-
-       object_camera_intrinsics(camera, &cam, &is_ortho, &shiftx, &shifty, clipsta, clipend, lens, sensor_x, sensor_y, sensor_fit);
-
-       /* ortho only with camera available */
-       if(cam && is_ortho) {
-               if((*sensor_fit)==CAMERA_SENSOR_FIT_AUTO) {
-                       if(rd->xasp*winx >= rd->yasp*winy) viewfac= winx;
-                       else viewfac= (*ycor) * winy;
-               }
-               else if((*sensor_fit)==CAMERA_SENSOR_FIT_HOR) {
-                       viewfac= winx;
-               }
-               else { /* if((*sensor_fit)==CAMERA_SENSOR_FIT_VERT) { */
-                       viewfac= (*ycor) * winy;
-               }
-
-               /* ortho_scale == 1.0 means exact 1 to 1 mapping */
-               pixsize= cam->ortho_scale/viewfac;
-       }
-       else {
-               if((*sensor_fit)==CAMERA_SENSOR_FIT_AUTO) {
-                       if(rd->xasp*winx >= rd->yasp*winy)      viewfac= ((*lens) * winx) / (*sensor_x);
-                       else                                    viewfac= (*ycor) * ((*lens) * winy) / (*sensor_x);
-               }
-               else if((*sensor_fit)==CAMERA_SENSOR_FIT_HOR) {
-                       viewfac= ((*lens) * winx) / (*sensor_x);
-               }
-               else { /* if((*sensor_fit)==CAMERA_SENSOR_FIT_VERT) { */
-                       viewfac= ((*lens) * winy) / (*sensor_y);
-               }
-
-               pixsize= (*clipsta) / viewfac;
-       }
-
-       /* viewplane fully centered, zbuffer fills in jittered between -.5 and +.5 */
-       winside= MAX2(winx, winy);
-
-       if(cam) {
-               if(cam->sensor_fit==CAMERA_SENSOR_FIT_HOR)
-                       winside= winx;
-               else if(cam->sensor_fit==CAMERA_SENSOR_FIT_VERT)
-                       winside= winy;
-       }
-
-       viewplane->xmin= -0.5f*(float)winx + shiftx*winside;
-       viewplane->ymin= -0.5f*(*ycor)*(float)winy + shifty*winside;
-       viewplane->xmax=  0.5f*(float)winx + shiftx*winside;
-       viewplane->ymax=  0.5f*(*ycor)*(float)winy + shifty*winside;
-
-       if(field_second) {
-               if(rd->mode & R_ODDFIELD) {
-                       viewplane->ymin-= 0.5f * (*ycor);
-                       viewplane->ymax-= 0.5f * (*ycor);
-               }
-               else {
-                       viewplane->ymin+= 0.5f * (*ycor);
-                       viewplane->ymax+= 0.5f * (*ycor);
-               }
-       }
-       /* the window matrix is used for clipping, and not changed during OSA steps */
-       /* using an offset of +0.5 here would give clip errors on edges */
-       viewplane->xmin *= pixsize;
-       viewplane->xmax *= pixsize;
-       viewplane->ymin *= pixsize;
-       viewplane->ymax *= pixsize;
-
-       (*viewdx)= pixsize;
-       (*viewdy)= (*ycor) * pixsize;
-
-       if(is_ortho)
-               orthographic_m4(winmat, viewplane->xmin, viewplane->xmax, viewplane->ymin, viewplane->ymax, *clipsta, *clipend);
-       else
-               perspective_m4(winmat, viewplane->xmin, viewplane->xmax, viewplane->ymin, viewplane->ymax, *clipsta, *clipend);
-
-}
-
-void camera_view_frame_ex(Scene *scene, Camera *camera, float drawsize, const short do_clip, const float scale[3],
-                          float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3])
-{
-       float facx, facy;
-       float depth;
-
-       /* aspect correcton */
-       if (scene) {
-               float aspx= (float) scene->r.xsch*scene->r.xasp;
-               float aspy= (float) scene->r.ysch*scene->r.yasp;
-
-               if(camera->sensor_fit==CAMERA_SENSOR_FIT_AUTO) {
-                       if(aspx < aspy) {
-                               r_asp[0]= aspx / aspy;
-                               r_asp[1]= 1.0;
-                       }
-                       else {
-                               r_asp[0]= 1.0;
-                               r_asp[1]= aspy / aspx;
-                       }
-               }
-               else if(camera->sensor_fit==CAMERA_SENSOR_FIT_AUTO) {
-                       r_asp[0]= aspx / aspy;
-                       r_asp[1]= 1.0;
-               }
-               else {
-                       r_asp[0]= 1.0;
-                       r_asp[1]= aspy / aspx;
-               }
-       }
-       else {
-               r_asp[0]= 1.0f;
-               r_asp[1]= 1.0f;
-       }
-
-       if(camera->type==CAM_ORTHO) {
-               facx= 0.5f * camera->ortho_scale * r_asp[0] * scale[0];
-               facy= 0.5f * camera->ortho_scale * r_asp[1] * scale[1];
-               r_shift[0]= camera->shiftx * camera->ortho_scale * scale[0];
-               r_shift[1]= camera->shifty * camera->ortho_scale * scale[1];
-               depth= do_clip ? -((camera->clipsta * scale[2]) + 0.1f) : - drawsize * camera->ortho_scale * scale[2];
-
-               *r_drawsize= 0.5f * camera->ortho_scale;
-       }
-       else {
-               /* that way it's always visible - clipsta+0.1 */
-               float fac;
-               float half_sensor= 0.5f*((camera->sensor_fit==CAMERA_SENSOR_FIT_VERT) ? (camera->sensor_y) : (camera->sensor_x));
-
-               *r_drawsize= drawsize / ((scale[0] + scale[1] + scale[2]) / 3.0f);
-
-               if(do_clip) {
-                       /* fixed depth, variable size (avoids exceeding clipping range) */
-                       depth = -(camera->clipsta + 0.1f);
-                       fac = depth / (camera->lens/(-half_sensor) * scale[2]);
-               }
-               else {
-                       /* fixed size, variable depth (stays a reasonable size in the 3D view) */
-                       depth= *r_drawsize * camera->lens/(-half_sensor) * scale[2];
-                       fac= *r_drawsize;
-               }
-
-               facx= fac * r_asp[0] * scale[0];
-               facy= fac * r_asp[1] * scale[1];
-               r_shift[0]= camera->shiftx*fac*2 * scale[0];
-               r_shift[1]= camera->shifty*fac*2 * scale[1];
-       }
-
-       r_vec[0][0]= r_shift[0] + facx; r_vec[0][1]= r_shift[1] + facy; r_vec[0][2]= depth;
-       r_vec[1][0]= r_shift[0] + facx; r_vec[1][1]= r_shift[1] - facy; r_vec[1][2]= depth;
-       r_vec[2][0]= r_shift[0] - facx; r_vec[2][1]= r_shift[1] - facy; r_vec[2][2]= depth;
-       r_vec[3][0]= r_shift[0] - facx; r_vec[3][1]= r_shift[1] + facy; r_vec[3][2]= depth;
-}
-
-void camera_view_frame(Scene *scene, Camera *camera, float r_vec[4][3])
-{
-       float dummy_asp[2];
-       float dummy_shift[2];
-       float dummy_drawsize;
-       const float dummy_scale[3]= {1.0f, 1.0f, 1.0f};
-
-       camera_view_frame_ex(scene, camera, FALSE, 1.0, dummy_scale,
-                            dummy_asp, dummy_shift, &dummy_drawsize, r_vec);
-}
-
 #if 0
 static int pc_findindex(ListBase *listbase, int index)
 {
index 8cdb106..ec22dfa 100644 (file)
@@ -54,6 +54,7 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#include "BKE_camera.h"
 #include "BKE_main.h"
 #include "BKE_library.h"
 #include "BKE_texture.h"
index 7ff233f..1cafa9c 100644 (file)
@@ -54,6 +54,7 @@
 #include "BKE_anim.h"
 #include "BKE_animsys.h"
 #include "BKE_armature.h"
+#include "BKE_camera.h"
 #include "BKE_constraint.h"
 #include "BKE_context.h"
 #include "BKE_curve.h"
index 74da705..0a0eadd 100644 (file)
@@ -56,6 +56,7 @@
 #include "BKE_action.h"
 #include "BKE_animsys.h"
 #include "BKE_armature.h"
+#include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_constraint.h"
 #include "BKE_curve.h"
index 6b6003f..4507ad9 100644 (file)
@@ -65,6 +65,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
 
+#include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
index c455c10..987c398 100644 (file)
@@ -55,6 +55,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_anim.h"                  //for the where_on_path function
+#include "BKE_camera.h"
 #include "BKE_constraint.h" // for the get_constraint_target function
 #include "BKE_curve.h"
 #include "BKE_DerivedMesh.h"
index aa69e71..3095786 100644 (file)
@@ -51,6 +51,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_anim.h"
+#include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_customdata.h"
 #include "BKE_image.h"
index bf3db58..2af0524 100644 (file)
@@ -36,6 +36,8 @@
 #ifdef RNA_RUNTIME
 
 #include "DNA_scene_types.h"
+
+#include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_object.h"
 
index 1b80e33..83ce4d2 100644 (file)
@@ -43,6 +43,7 @@
 #ifdef RNA_RUNTIME
 
 #include "BKE_main.h"
+#include "BKE_camera.h"
 #include "BKE_curve.h"
 #include "BKE_mesh.h"
 #include "BKE_armature.h"
index 9ebca86..6da9b90 100644 (file)
@@ -57,6 +57,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_blender.h"
+#include "BKE_camera.h"
 #include "BKE_colortools.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
index f8e4ee8..7bd8dad 100644 (file)
@@ -53,6 +53,7 @@
 #include "DNA_scene_types.h"
 
 
+#include "BKE_camera.h"
 #include "BKE_global.h"
 #include "BKE_material.h"
 #include "BKE_object.h"
index de5d037..d4bd8f8 100644 (file)
@@ -48,6 +48,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BKE_animsys.h"       /* <------ should this be here?, needed for sequencer update */
+#include "BKE_camera.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_main.h"