forked from bartvdbraak/blender
Cleanup: constify view3d/camera
This commit is contained in:
Campbell Barton
parent
6e50bdd870
commit
d28bfb5022
@ -109,23 +109,30 @@ typedef struct CameraParams {
|
||||
#define CAMERA_PARAM_ZOOM_INIT_PERSP 2.0f
|
||||
|
||||
void BKE_camera_params_init(CameraParams *params);
|
||||
void BKE_camera_params_from_object(CameraParams *params, struct Object *camera);
|
||||
void BKE_camera_params_from_view3d(CameraParams *params, struct View3D *v3d, struct RegionView3D *rv3d);
|
||||
void BKE_camera_params_from_object(CameraParams *params, const struct Object *camera);
|
||||
void BKE_camera_params_from_view3d(CameraParams *params, const struct View3D *v3d, const struct RegionView3D *rv3d);
|
||||
|
||||
void BKE_camera_params_compute_viewplane(CameraParams *params, int winx, int winy, float aspx, float aspy);
|
||||
void BKE_camera_params_compute_matrix(CameraParams *params);
|
||||
|
||||
/* Camera View Frame */
|
||||
|
||||
void BKE_camera_view_frame_ex(struct Scene *scene, struct Camera *camera, float drawsize, const bool do_clip, const float scale[3],
|
||||
float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3]);
|
||||
void BKE_camera_view_frame_ex(
|
||||
const struct Scene *scene, const struct Camera *camera,
|
||||
const float drawsize, const bool do_clip, const float scale[3],
|
||||
float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3]);
|
||||
void BKE_camera_view_frame(
|
||||
const struct Scene *scene, const struct Camera *camera,
|
||||
float r_vec[4][3]);
|
||||
|
||||
void BKE_camera_view_frame(struct Scene *scene, struct Camera *camera, float r_vec[4][3]);
|
||||
|
||||
bool BKE_camera_view_frame_fit_to_scene(struct Scene *scene, struct View3D *v3d, struct Object *camera_ob,
|
||||
float r_co[3], float *r_scale);
|
||||
bool BKE_camera_view_frame_fit_to_coords(struct Scene *scene, float (*cos)[3], int num_cos,
|
||||
struct Object *camera_ob, float r_co[3], float *r_scale);
|
||||
bool BKE_camera_view_frame_fit_to_scene(
|
||||
struct Scene *scene, struct View3D *v3d, struct Object *camera_ob,
|
||||
float r_co[3], float *r_scale);
|
||||
bool BKE_camera_view_frame_fit_to_coords(
|
||||
const struct Scene *scene,
|
||||
const float (*cos)[3], int num_cos,
|
||||
const struct Object *camera_ob,
|
||||
float r_co[3], float *r_scale);
|
||||
|
||||
void BKE_camera_to_gpu_dof(struct Object *camera, struct GPUFXSettings *r_fx_settings);
|
||||
|
||||
|
||||
@ -213,7 +213,7 @@ void BKE_camera_params_init(CameraParams *params)
|
||||
params->clipend = 100.0f;
|
||||
}
|
||||
|
||||
void BKE_camera_params_from_object(CameraParams *params, Object *ob)
|
||||
void BKE_camera_params_from_object(CameraParams *params, const Object *ob)
|
||||
{
|
||||
if (!ob)
|
||||
return;
|
||||
@ -255,7 +255,7 @@ void BKE_camera_params_from_object(CameraParams *params, Object *ob)
|
||||
}
|
||||
}
|
||||
|
||||
void BKE_camera_params_from_view3d(CameraParams *params, View3D *v3d, RegionView3D *rv3d)
|
||||
void BKE_camera_params_from_view3d(CameraParams *params, const View3D *v3d, const RegionView3D *rv3d)
|
||||
{
|
||||
/* common */
|
||||
params->lens = v3d->lens;
|
||||
@ -384,8 +384,10 @@ void BKE_camera_params_compute_matrix(CameraParams *params)
|
||||
|
||||
/***************************** Camera View Frame *****************************/
|
||||
|
||||
void BKE_camera_view_frame_ex(Scene *scene, Camera *camera, float drawsize, const bool do_clip, const float scale[3],
|
||||
float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3])
|
||||
void BKE_camera_view_frame_ex(
|
||||
const Scene *scene, const Camera *camera,
|
||||
const float drawsize, const bool 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;
|
||||
@ -456,7 +458,7 @@ void BKE_camera_view_frame_ex(Scene *scene, Camera *camera, float drawsize, cons
|
||||
r_vec[3][0] = r_shift[0] - facx; r_vec[3][1] = r_shift[1] + facy; r_vec[3][2] = depth;
|
||||
}
|
||||
|
||||
void BKE_camera_view_frame(Scene *scene, Camera *camera, float r_vec[4][3])
|
||||
void BKE_camera_view_frame(const Scene *scene, const Camera *camera, float r_vec[4][3])
|
||||
{
|
||||
float dummy_asp[2];
|
||||
float dummy_shift[2];
|
||||
@ -502,7 +504,9 @@ static void camera_to_frame_view_cb(const float co[3], void *user_data)
|
||||
data->tot++;
|
||||
}
|
||||
|
||||
static void camera_frame_fit_data_init(Scene *scene, Object *ob, CameraParams *params, CameraViewFrameData *data)
|
||||
static void camera_frame_fit_data_init(
|
||||
const Scene *scene, const Object *ob,
|
||||
CameraParams *params, CameraViewFrameData *data)
|
||||
{
|
||||
float camera_rotmat_transposed_inversed[4][4];
|
||||
unsigned int i;
|
||||
@ -521,7 +525,7 @@ static void camera_frame_fit_data_init(Scene *scene, Object *ob, CameraParams *p
|
||||
BKE_camera_params_compute_matrix(params);
|
||||
|
||||
/* initialize callback data */
|
||||
copy_m3_m4(data->camera_rotmat, ob->obmat);
|
||||
copy_m3_m4(data->camera_rotmat, (float (*)[4])ob->obmat);
|
||||
normalize_m3(data->camera_rotmat);
|
||||
/* To transform a plane which is in its homogeneous representation (4d vector),
|
||||
* we need the inverse of the transpose of the transform matrix... */
|
||||
@ -672,7 +676,8 @@ bool BKE_camera_view_frame_fit_to_scene(
|
||||
}
|
||||
|
||||
bool BKE_camera_view_frame_fit_to_coords(
|
||||
Scene *scene, float (*cos)[3], int num_cos, Object *camera_ob, float r_co[3], float *r_scale)
|
||||
const Scene *scene, const float (*cos)[3], int num_cos, const Object *camera_ob,
|
||||
float r_co[3], float *r_scale)
|
||||
{
|
||||
CameraParams params;
|
||||
CameraViewFrameData data_cb;
|
||||
|
||||
@ -725,8 +725,9 @@ static bool calc_curve_deform(Scene *scene, Object *par, float co[3],
|
||||
return false;
|
||||
}
|
||||
|
||||
void curve_deform_verts(Scene *scene, Object *cuOb, Object *target, DerivedMesh *dm, float (*vertexCos)[3],
|
||||
int numVerts, const char *vgroup, short defaxis)
|
||||
void curve_deform_verts(
|
||||
Scene *scene, Object *cuOb, Object *target, DerivedMesh *dm, float (*vertexCos)[3],
|
||||
int numVerts, const char *vgroup, short defaxis)
|
||||
{
|
||||
Curve *cu;
|
||||
int a;
|
||||
|
||||
@ -104,7 +104,7 @@ void ED_view3d_lastview_store(struct RegionView3D *rv3d);
|
||||
|
||||
/* Depth buffer */
|
||||
void ED_view3d_depth_update(struct ARegion *ar);
|
||||
float ED_view3d_depth_read_cached(struct ViewContext *vc, int x, int y);
|
||||
float ED_view3d_depth_read_cached(const struct ViewContext *vc, int x, int y);
|
||||
void ED_view3d_depth_tag_update(struct RegionView3D *rv3d);
|
||||
|
||||
/* Projection */
|
||||
@ -224,33 +224,38 @@ void ED_view3d_unproject(struct bglMats *mats, float out[3], const float x, cons
|
||||
/* end */
|
||||
|
||||
|
||||
void ED_view3d_dist_range_get(struct View3D *v3d,
|
||||
float r_dist_range[2]);
|
||||
bool ED_view3d_clip_range_get(struct View3D *v3d, struct RegionView3D *rv3d,
|
||||
float *r_clipsta, float *r_clipend, const bool use_ortho_factor);
|
||||
bool ED_view3d_viewplane_get(struct View3D *v3d, struct RegionView3D *rv3d, int winxi, int winyi,
|
||||
struct rctf *r_viewplane, float *r_clipsta, float *r_clipend, float *r_pixsize);
|
||||
void ED_view3d_dist_range_get(
|
||||
const struct View3D *v3d,
|
||||
float r_dist_range[2]);
|
||||
bool ED_view3d_clip_range_get(
|
||||
const struct View3D *v3d, const struct RegionView3D *rv3d,
|
||||
float *r_clipsta, float *r_clipend, const bool use_ortho_factor);
|
||||
bool ED_view3d_viewplane_get(
|
||||
const struct View3D *v3d, const struct RegionView3D *rv3d, int winxi, int winyi,
|
||||
struct rctf *r_viewplane, float *r_clipsta, float *r_clipend, float *r_pixsize);
|
||||
|
||||
void ED_view3d_polygon_offset(const struct RegionView3D *rv3d, const float dist);
|
||||
|
||||
void ED_view3d_calc_camera_border(struct Scene *scene, struct ARegion *ar,
|
||||
struct View3D *v3d, struct RegionView3D *rv3d,
|
||||
struct rctf *r_viewborder, const bool no_shift);
|
||||
void ED_view3d_calc_camera_border_size(struct Scene *scene, struct ARegion *ar,
|
||||
struct View3D *v3d, struct RegionView3D *rv3d,
|
||||
float r_size[2]);
|
||||
void ED_view3d_calc_camera_border(
|
||||
const struct Scene *scene, const struct ARegion *ar,
|
||||
const struct View3D *v3d, const struct RegionView3D *rv3d,
|
||||
struct rctf *r_viewborder, const bool no_shift);
|
||||
void ED_view3d_calc_camera_border_size(
|
||||
const struct Scene *scene, const struct ARegion *ar,
|
||||
const struct View3D *v3d, const struct RegionView3D *rv3d,
|
||||
float r_size[2]);
|
||||
bool ED_view3d_calc_render_border(struct Scene *scene, struct View3D *v3d,
|
||||
struct ARegion *ar, struct rcti *rect);
|
||||
|
||||
void ED_view3d_clipping_calc_from_boundbox(float clip[6][4], const struct BoundBox *clipbb, const bool is_flip);
|
||||
void ED_view3d_clipping_calc(struct BoundBox *bb, float planes[4][4], struct bglMats *mats, const struct rcti *rect);
|
||||
void ED_view3d_clipping_local(struct RegionView3D *rv3d, float mat[4][4]);
|
||||
bool ED_view3d_clipping_test(struct RegionView3D *rv3d, const float co[3], const bool is_local);
|
||||
bool ED_view3d_clipping_test(const struct RegionView3D *rv3d, const float co[3], const bool is_local);
|
||||
void ED_view3d_clipping_set(struct RegionView3D *rv3d);
|
||||
void ED_view3d_clipping_enable(void);
|
||||
void ED_view3d_clipping_disable(void);
|
||||
|
||||
float ED_view3d_pixel_size(struct RegionView3D *rv3d, const float co[3]);
|
||||
float ED_view3d_pixel_size(const struct RegionView3D *rv3d, const float co[3]);
|
||||
|
||||
float ED_view3d_radius_to_dist_persp(const float angle, const float radius);
|
||||
float ED_view3d_radius_to_dist_ortho(const float lens, const float radius);
|
||||
@ -334,15 +339,15 @@ char ED_view3d_lock_view_from_index(int index);
|
||||
char ED_view3d_axis_view_opposite(char view);
|
||||
bool ED_view3d_lock(struct RegionView3D *rv3d);
|
||||
|
||||
uint64_t ED_view3d_datamask(struct Scene *scene, struct View3D *v3d);
|
||||
uint64_t ED_view3d_screen_datamask(struct bScreen *screen);
|
||||
uint64_t ED_view3d_datamask(const struct Scene *scene, const struct View3D *v3d);
|
||||
uint64_t ED_view3d_screen_datamask(const struct bScreen *screen);
|
||||
|
||||
bool ED_view3d_view_lock_check(struct View3D *v3d, struct RegionView3D *rv3d);
|
||||
bool ED_view3d_view_lock_check(const struct View3D *v3d, const struct RegionView3D *rv3d);
|
||||
|
||||
bool ED_view3d_offset_lock_check(struct View3D *v3d, struct RegionView3D *rv3d);
|
||||
bool ED_view3d_offset_lock_check(const struct View3D *v3d, const struct RegionView3D *rv3d);
|
||||
|
||||
/* camera lock functions */
|
||||
bool ED_view3d_camera_lock_check(struct View3D *v3d, struct RegionView3D *rv3d);
|
||||
bool ED_view3d_camera_lock_check(const struct View3D *v3d, const struct RegionView3D *rv3d);
|
||||
/* copy the camera to the view before starting a view transformation */
|
||||
void ED_view3d_camera_lock_init_ex(struct View3D *v3d, struct RegionView3D *rv3d, const bool calc_dist);
|
||||
void ED_view3d_camera_lock_init(struct View3D *v3d, struct RegionView3D *rv3d);
|
||||
|
||||
@ -207,7 +207,7 @@ void ED_view3d_clipping_enable(void)
|
||||
}
|
||||
}
|
||||
|
||||
static bool view3d_clipping_test(const float co[3], float clip[6][4])
|
||||
static bool view3d_clipping_test(const float co[3], const float clip[6][4])
|
||||
{
|
||||
if (plane_point_side_v3(clip[0], co) > 0.0f)
|
||||
if (plane_point_side_v3(clip[1], co) > 0.0f)
|
||||
@ -220,7 +220,7 @@ static bool view3d_clipping_test(const float co[3], float clip[6][4])
|
||||
|
||||
/* for 'local' ED_view3d_clipping_local must run first
|
||||
* then all comparisons can be done in localspace */
|
||||
bool ED_view3d_clipping_test(RegionView3D *rv3d, const float co[3], const bool is_local)
|
||||
bool ED_view3d_clipping_test(const RegionView3D *rv3d, const float co[3], const bool is_local)
|
||||
{
|
||||
return view3d_clipping_test(co, is_local ? rv3d->clip_local : rv3d->clip);
|
||||
}
|
||||
@ -949,8 +949,9 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect)
|
||||
BLF_draw_default(offset, 0.5f * U.widget_unit, 0.0f, info, sizeof(info));
|
||||
}
|
||||
|
||||
static void view3d_camera_border(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d,
|
||||
rctf *r_viewborder, const bool no_shift, const bool no_zoom)
|
||||
static void view3d_camera_border(
|
||||
const Scene *scene, const ARegion *ar, const View3D *v3d, const RegionView3D *rv3d,
|
||||
rctf *r_viewborder, const bool no_shift, const bool no_zoom)
|
||||
{
|
||||
CameraParams params;
|
||||
rctf rect_view, rect_camera;
|
||||
@ -983,7 +984,9 @@ static void view3d_camera_border(Scene *scene, ARegion *ar, View3D *v3d, RegionV
|
||||
r_viewborder->ymax = ((rect_camera.ymax - rect_view.ymin) / BLI_rctf_size_y(&rect_view)) * ar->winy;
|
||||
}
|
||||
|
||||
void ED_view3d_calc_camera_border_size(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, float r_size[2])
|
||||
void ED_view3d_calc_camera_border_size(
|
||||
const Scene *scene, const ARegion *ar, const View3D *v3d, const RegionView3D *rv3d,
|
||||
float r_size[2])
|
||||
{
|
||||
rctf viewborder;
|
||||
|
||||
@ -992,8 +995,9 @@ void ED_view3d_calc_camera_border_size(Scene *scene, ARegion *ar, View3D *v3d, R
|
||||
r_size[1] = BLI_rctf_size_y(&viewborder);
|
||||
}
|
||||
|
||||
void ED_view3d_calc_camera_border(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d,
|
||||
rctf *r_viewborder, const bool no_shift)
|
||||
void ED_view3d_calc_camera_border(
|
||||
const Scene *scene, const ARegion *ar, const View3D *v3d, const RegionView3D *rv3d,
|
||||
rctf *r_viewborder, const bool no_shift)
|
||||
{
|
||||
view3d_camera_border(scene, ar, v3d, rv3d, r_viewborder, no_shift, false);
|
||||
}
|
||||
@ -2554,7 +2558,7 @@ static void gpu_update_lamps_shadows(Scene *scene, View3D *v3d)
|
||||
|
||||
/* *********************** customdata **************** */
|
||||
|
||||
CustomDataMask ED_view3d_datamask(Scene *scene, View3D *v3d)
|
||||
CustomDataMask ED_view3d_datamask(const Scene *scene, const View3D *v3d)
|
||||
{
|
||||
CustomDataMask mask = 0;
|
||||
|
||||
@ -2580,16 +2584,16 @@ CustomDataMask ED_view3d_datamask(Scene *scene, View3D *v3d)
|
||||
}
|
||||
|
||||
/* goes over all modes and view3d settings */
|
||||
CustomDataMask ED_view3d_screen_datamask(bScreen *screen)
|
||||
CustomDataMask ED_view3d_screen_datamask(const bScreen *screen)
|
||||
{
|
||||
Scene *scene = screen->scene;
|
||||
const Scene *scene = screen->scene;
|
||||
CustomDataMask mask = CD_MASK_BAREMESH;
|
||||
ScrArea *sa;
|
||||
const ScrArea *sa;
|
||||
|
||||
/* check if we need tfaces & mcols due to view mode */
|
||||
for (sa = screen->areabase.first; sa; sa = sa->next) {
|
||||
if (sa->spacetype == SPACE_VIEW3D) {
|
||||
mask |= ED_view3d_datamask(scene, (View3D *)sa->spacedata.first);
|
||||
mask |= ED_view3d_datamask(scene, sa->spacedata.first);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "view3d_intern.h" /* own include */
|
||||
|
||||
bool ED_view3d_offset_lock_check(struct View3D *v3d, struct RegionView3D *rv3d)
|
||||
bool ED_view3d_offset_lock_check(const View3D *v3d, const RegionView3D *rv3d)
|
||||
{
|
||||
return (rv3d->persp != RV3D_CAMOB) && (v3d->ob_centre_cursor || v3d->ob_centre);
|
||||
}
|
||||
@ -103,7 +103,7 @@ static bool view3d_operator_offset_lock_check(bContext *C, wmOperator *op)
|
||||
|
||||
/* ********************** view3d_edit: view manipulations ********************* */
|
||||
|
||||
bool ED_view3d_camera_lock_check(View3D *v3d, RegionView3D *rv3d)
|
||||
bool ED_view3d_camera_lock_check(const View3D *v3d, const RegionView3D *rv3d)
|
||||
{
|
||||
return ((v3d->camera) &&
|
||||
(v3d->camera->id.lib == NULL) &&
|
||||
|
||||
@ -208,7 +208,7 @@ void VIEW3D_OT_localview(struct wmOperatorType *ot);
|
||||
void VIEW3D_OT_game_start(struct wmOperatorType *ot);
|
||||
|
||||
|
||||
bool ED_view3d_boundbox_clip_ex(RegionView3D *rv3d, const struct BoundBox *bb, float obmat[4][4]);
|
||||
bool ED_view3d_boundbox_clip_ex(const RegionView3D *rv3d, const struct BoundBox *bb, float obmat[4][4]);
|
||||
bool ED_view3d_boundbox_clip(RegionView3D *rv3d, const struct BoundBox *bb);
|
||||
|
||||
void ED_view3d_smooth_view_ex(
|
||||
@ -225,8 +225,8 @@ void ED_view3d_smooth_view(
|
||||
const float *ofs, const float *quat, const float *dist, const float *lens,
|
||||
const int smooth_viewtx);
|
||||
|
||||
void view3d_winmatrix_set(ARegion *ar, View3D *v3d, const rctf *rect);
|
||||
void view3d_viewmatrix_set(Scene *scene, View3D *v3d, RegionView3D *rv3d);
|
||||
void view3d_winmatrix_set(ARegion *ar, const View3D *v3d, const rctf *rect);
|
||||
void view3d_viewmatrix_set(Scene *scene, const View3D *v3d, RegionView3D *rv3d);
|
||||
|
||||
void fly_modal_keymap(struct wmKeyConfig *keyconf);
|
||||
void walk_modal_keymap(struct wmKeyConfig *keyconf);
|
||||
|
||||
@ -688,7 +688,7 @@ static bool view3d_boundbox_clip_m4(const BoundBox *bb, float persmatob[4][4])
|
||||
return false;
|
||||
}
|
||||
|
||||
bool ED_view3d_boundbox_clip_ex(RegionView3D *rv3d, const BoundBox *bb, float obmat[4][4])
|
||||
bool ED_view3d_boundbox_clip_ex(const RegionView3D *rv3d, const BoundBox *bb, float obmat[4][4])
|
||||
{
|
||||
/* return 1: draw */
|
||||
|
||||
@ -697,7 +697,7 @@ bool ED_view3d_boundbox_clip_ex(RegionView3D *rv3d, const BoundBox *bb, float ob
|
||||
if (bb == NULL) return true;
|
||||
if (bb->flag & BOUNDBOX_DISABLED) return true;
|
||||
|
||||
mul_m4_m4m4(persmatob, rv3d->persmat, obmat);
|
||||
mul_m4_m4m4(persmatob, (float(*)[4])rv3d->persmat, obmat);
|
||||
|
||||
return view3d_boundbox_clip_m4(bb, persmatob);
|
||||
}
|
||||
@ -710,7 +710,7 @@ bool ED_view3d_boundbox_clip(RegionView3D *rv3d, const BoundBox *bb)
|
||||
return view3d_boundbox_clip_m4(bb, rv3d->persmatob);
|
||||
}
|
||||
|
||||
float ED_view3d_depth_read_cached(ViewContext *vc, int x, int y)
|
||||
float ED_view3d_depth_read_cached(const ViewContext *vc, int x, int y)
|
||||
{
|
||||
ViewDepths *vd = vc->rv3d->depths;
|
||||
|
||||
@ -729,16 +729,19 @@ void ED_view3d_depth_tag_update(RegionView3D *rv3d)
|
||||
rv3d->depths->damaged = true;
|
||||
}
|
||||
|
||||
void ED_view3d_dist_range_get(struct View3D *v3d,
|
||||
float r_dist_range[2])
|
||||
void ED_view3d_dist_range_get(
|
||||
const View3D *v3d,
|
||||
float r_dist_range[2])
|
||||
{
|
||||
r_dist_range[0] = v3d->grid * 0.001f;
|
||||
r_dist_range[1] = v3d->far * 10.0f;
|
||||
}
|
||||
|
||||
/* copies logic of get_view3d_viewplane(), keep in sync */
|
||||
bool ED_view3d_clip_range_get(View3D *v3d, RegionView3D *rv3d, float *r_clipsta, float *r_clipend,
|
||||
const bool use_ortho_factor)
|
||||
bool ED_view3d_clip_range_get(
|
||||
const View3D *v3d, const RegionView3D *rv3d,
|
||||
float *r_clipsta, float *r_clipend,
|
||||
const bool use_ortho_factor)
|
||||
{
|
||||
CameraParams params;
|
||||
|
||||
@ -758,8 +761,9 @@ bool ED_view3d_clip_range_get(View3D *v3d, RegionView3D *rv3d, float *r_clipsta,
|
||||
}
|
||||
|
||||
/* also exposed in previewrender.c */
|
||||
bool ED_view3d_viewplane_get(View3D *v3d, RegionView3D *rv3d, int winx, int winy,
|
||||
rctf *r_viewplane, float *r_clipsta, float *r_clipend, float *r_pixsize)
|
||||
bool ED_view3d_viewplane_get(
|
||||
const View3D *v3d, const RegionView3D *rv3d, int winx, int winy,
|
||||
rctf *r_viewplane, float *r_clipsta, float *r_clipend, float *r_pixsize)
|
||||
{
|
||||
CameraParams params;
|
||||
|
||||
@ -797,7 +801,7 @@ void ED_view3d_polygon_offset(const RegionView3D *rv3d, const float dist)
|
||||
/**
|
||||
* \param rect optional for picking (can be NULL).
|
||||
*/
|
||||
void view3d_winmatrix_set(ARegion *ar, View3D *v3d, const rctf *rect)
|
||||
void view3d_winmatrix_set(ARegion *ar, const View3D *v3d, const rctf *rect)
|
||||
{
|
||||
RegionView3D *rv3d = ar->regiondata;
|
||||
rctf viewplane;
|
||||
@ -917,7 +921,7 @@ bool ED_view3d_lock(RegionView3D *rv3d)
|
||||
}
|
||||
|
||||
/* don't set windows active in here, is used by renderwin too */
|
||||
void view3d_viewmatrix_set(Scene *scene, View3D *v3d, RegionView3D *rv3d)
|
||||
void view3d_viewmatrix_set(Scene *scene, const View3D *v3d, RegionView3D *rv3d)
|
||||
{
|
||||
if (rv3d->persp == RV3D_CAMOB) { /* obs/camera */
|
||||
if (v3d->camera) {
|
||||
@ -956,7 +960,7 @@ void view3d_viewmatrix_set(Scene *scene, View3D *v3d, RegionView3D *rv3d)
|
||||
}
|
||||
else if (v3d->ob_centre_cursor) {
|
||||
float vec[3];
|
||||
copy_v3_v3(vec, ED_view3d_cursor3d_get(scene, v3d));
|
||||
copy_v3_v3(vec, ED_view3d_cursor3d_get(scene, (View3D *)v3d));
|
||||
translate_m4(rv3d->viewmat, -vec[0], -vec[1], -vec[2]);
|
||||
use_lock_ofs = true;
|
||||
}
|
||||
@ -1708,9 +1712,9 @@ void VIEW3D_OT_game_start(wmOperatorType *ot)
|
||||
|
||||
/* ************************************** */
|
||||
|
||||
float ED_view3d_pixel_size(RegionView3D *rv3d, const float co[3])
|
||||
float ED_view3d_pixel_size(const RegionView3D *rv3d, const float co[3])
|
||||
{
|
||||
return mul_project_m4_v3_zfac(rv3d->persmat, co) * rv3d->pixsize * U.pixelsize;
|
||||
return mul_project_m4_v3_zfac((float(*)[4])rv3d->persmat, co) * rv3d->pixsize * U.pixelsize;
|
||||
}
|
||||
|
||||
float ED_view3d_radius_to_dist_persp(const float angle, const float radius)
|
||||
|
||||
@ -131,7 +131,7 @@ static void rna_Object_calc_matrix_camera(
|
||||
static void rna_Object_camera_fit_coords(
|
||||
Object *ob, Scene *scene, int num_cos, float *cos, float co_ret[3], float *scale_ret)
|
||||
{
|
||||
BKE_camera_view_frame_fit_to_coords(scene, (float (*)[3])cos, num_cos / 3, ob, co_ret, scale_ret);
|
||||
BKE_camera_view_frame_fit_to_coords(scene, (const float (*)[3])cos, num_cos / 3, ob, co_ret, scale_ret);
|
||||
}
|
||||
|
||||
/* copied from Mesh_getFromObject and adapted to RNA interface */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user