[Bf-blender-cvs] [2f737c4f475] master: DNA: rename near/far -> clip_start/clip_end
Campbell Barton
noreply at git.blender.org
Sat Feb 16 02:29:49 CET 2019
Commit: 2f737c4f475a5625f9140b84ffd55435ca2fd805
Author: Campbell Barton
Date: Sat Feb 16 12:21:44 2019 +1100
Branches: master
https://developer.blender.org/rB2f737c4f475a5625f9140b84ffd55435ca2fd805
DNA: rename near/far -> clip_start/clip_end
Rename for Camera, View3D (also CameraParams & Render not DNA)
===================================================================
M source/blender/alembic/intern/abc_camera.cc
M source/blender/blenkernel/BKE_camera.h
M source/blender/blenkernel/intern/camera.c
M source/blender/blenlib/BLI_winstuff.h
M source/blender/collada/CameraExporter.cpp
M source/blender/collada/DocumentImporter.cpp
M source/blender/draw/engines/eevee/eevee_depth_of_field.c
M source/blender/draw/engines/eevee/eevee_lookdev.c
M source/blender/draw/engines/workbench/workbench_effect_dof.c
M source/blender/draw/modes/object_mode.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/space_image/image_draw.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_project.c
M source/blender/editors/space_view3d/view3d_utils.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_constraints.c
M source/blender/editors/transform/transform_generics.c
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M source/blender/makesdna/DNA_camera_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/makesrna/intern/rna_camera.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/intern/include/render_types.h
M source/blender/render/intern/source/initrender.c
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/source/blender/alembic/intern/abc_camera.cc b/source/blender/alembic/intern/abc_camera.cc
index 5ca0c36eefe..b1ba3f92fc7 100644
--- a/source/blender/alembic/intern/abc_camera.cc
+++ b/source/blender/alembic/intern/abc_camera.cc
@@ -73,8 +73,8 @@ void AbcCameraWriter::do_write()
m_camera_sample.setVerticalAperture(apperture_y);
m_camera_sample.setHorizontalFilmOffset(apperture_x * cam->shiftx);
m_camera_sample.setVerticalFilmOffset(apperture_y * cam->shifty * film_aspect);
- m_camera_sample.setNearClippingPlane(cam->clipsta);
- m_camera_sample.setFarClippingPlane(cam->clipend);
+ m_camera_sample.setNearClippingPlane(cam->clip_start);
+ m_camera_sample.setFarClippingPlane(cam->clip_end);
if (cam->dof_ob) {
Imath::V3f v(m_object->loc[0] - cam->dof_ob->loc[0],
@@ -159,8 +159,8 @@ void AbcCameraReader::readObjectData(Main *bmain, const ISampleSelector &sample_
bcam->sensor_y = apperture_y * 10;
bcam->shiftx = h_film_offset / apperture_x;
bcam->shifty = v_film_offset / apperture_y / film_aspect;
- bcam->clipsta = max_ff(0.1f, static_cast<float>(cam_sample.getNearClippingPlane()));
- bcam->clipend = static_cast<float>(cam_sample.getFarClippingPlane());
+ bcam->clip_start = max_ff(0.1f, static_cast<float>(cam_sample.getNearClippingPlane()));
+ bcam->clip_end = static_cast<float>(cam_sample.getFarClippingPlane());
bcam->gpu_dof.focus_distance = static_cast<float>(cam_sample.getFocusDistance());
bcam->gpu_dof.fstop = static_cast<float>(cam_sample.getFStop());
diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
index 40a81625ecf..29d7b5ae6e2 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -80,8 +80,8 @@ typedef struct CameraParams {
int sensor_fit;
/* clipping */
- float clipsta;
- float clipend;
+ float clip_start;
+ float clip_end;
/* computed viewplane */
float ycor;
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index e11a0b327ba..81ec6e7ba95 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -58,8 +58,8 @@ void BKE_camera_init(Camera *cam)
cam->lens = 50.0f;
cam->sensor_x = DEFAULT_SENSOR_WIDTH;
cam->sensor_y = DEFAULT_SENSOR_HEIGHT;
- cam->clipsta = 0.1f;
- cam->clipend = 1000.0f;
+ cam->clip_start = 0.1f;
+ cam->clip_end = 1000.0f;
cam->drawsize = 1.0f;
cam->ortho_scale = 6.0;
cam->flag |= CAM_SHOWPASSEPARTOUT;
@@ -171,8 +171,8 @@ void BKE_camera_params_init(CameraParams *params)
params->zoom = 1.0f;
/* fallback for non camera objects */
- params->clipsta = 0.1f;
- params->clipend = 100.0f;
+ params->clip_start = 0.1f;
+ params->clip_end = 100.0f;
}
void BKE_camera_params_from_object(CameraParams *params, const Object *ob)
@@ -196,8 +196,8 @@ void BKE_camera_params_from_object(CameraParams *params, const Object *ob)
params->sensor_y = cam->sensor_y;
params->sensor_fit = cam->sensor_fit;
- params->clipsta = cam->clipsta;
- params->clipend = cam->clipend;
+ params->clip_start = cam->clip_start;
+ params->clip_end = cam->clip_end;
}
else if (ob->type == OB_LAMP) {
/* lamp object */
@@ -206,8 +206,8 @@ void BKE_camera_params_from_object(CameraParams *params, const Object *ob)
if (params->lens == 0.0f)
params->lens = 35.0f;
- params->clipsta = la->clipsta;
- params->clipend = la->clipend;
+ params->clip_start = la->clipsta;
+ params->clip_end = la->clipend;
}
else {
params->lens = 35.0f;
@@ -218,8 +218,8 @@ void BKE_camera_params_from_view3d(CameraParams *params, Depsgraph *depsgraph, c
{
/* common */
params->lens = v3d->lens;
- params->clipsta = v3d->near;
- params->clipend = v3d->far;
+ params->clip_start = v3d->clip_start;
+ params->clip_end = v3d->clip_end;
if (rv3d->persp == RV3D_CAMOB) {
/* camera view */
@@ -239,8 +239,8 @@ void BKE_camera_params_from_view3d(CameraParams *params, Depsgraph *depsgraph, c
else if (rv3d->persp == RV3D_ORTHO) {
/* orthographic view */
float sensor_size = BKE_camera_sensor_size(params->sensor_fit, params->sensor_x, params->sensor_y);
- params->clipend *= 0.5f; // otherwise too extreme low zbuffer quality
- params->clipsta = -params->clipend;
+ params->clip_end *= 0.5f; // otherwise too extreme low zbuffer quality
+ params->clip_start = -params->clip_start;
params->is_ortho = true;
/* make sure any changes to this match ED_view3d_radius_to_dist_ortho() */
@@ -269,7 +269,7 @@ void BKE_camera_params_compute_viewplane(CameraParams *params, int winx, int win
else {
/* perspective camera */
sensor_size = BKE_camera_sensor_size(params->sensor_fit, params->sensor_x, params->sensor_y);
- pixsize = (sensor_size * params->clipsta) / params->lens;
+ pixsize = (sensor_size * params->clip_start) / params->lens;
}
/* determine sensor fit */
@@ -323,10 +323,10 @@ void BKE_camera_params_compute_matrix(CameraParams *params)
/* compute projection matrix */
if (params->is_ortho)
orthographic_m4(params->winmat, viewplane.xmin, viewplane.xmax,
- viewplane.ymin, viewplane.ymax, params->clipsta, params->clipend);
+ viewplane.ymin, viewplane.ymax, params->clip_start, params->clip_end);
else
perspective_m4(params->winmat, viewplane.xmin, viewplane.xmax,
- viewplane.ymin, viewplane.ymax, params->clipsta, params->clipend);
+ viewplane.ymin, viewplane.ymax, params->clip_start, params->clip_end);
}
/***************************** Camera View Frame *****************************/
@@ -364,12 +364,12 @@ void BKE_camera_view_frame_ex(
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 * scale[2];
+ depth = do_clip ? -((camera->clip_start * scale[2]) + 0.1f) : -drawsize * scale[2];
*r_drawsize = 0.5f * camera->ortho_scale;
}
else {
- /* that way it's always visible - clipsta+0.1 */
+ /* that way it's always visible - clip_start+0.1 */
float fac, scale_x, scale_y;
float half_sensor = 0.5f * ((camera->sensor_fit == CAMERA_SENSOR_FIT_VERT) ?
(camera->sensor_y) : (camera->sensor_x));
@@ -379,7 +379,7 @@ void BKE_camera_view_frame_ex(
/* fixed depth, variable size (avoids exceeding clipping range) */
/* r_drawsize shouldn't be used in this case, set to dummy value */
*r_drawsize = 1.0f;
- depth = -(camera->clipsta + 0.1f) * scale[2];
+ depth = -(camera->clip_start + 0.1f) * scale[2];
fac = depth / (camera->lens / (-half_sensor));
scale_x = scale[0] / scale[2];
scale_y = scale[1] / scale[2];
@@ -536,7 +536,7 @@ static bool camera_frame_fit_calc_from_data(
zero_v3(r_co);
madd_v3_v3fl(r_co, cam_axis_x, (dists[2] - dists[0]) * 0.5f + params->shiftx * scale_diff);
madd_v3_v3fl(r_co, cam_axis_y, (dists[1] - dists[3]) * 0.5f + params->shifty * scale_diff);
- madd_v3_v3fl(r_co, cam_axis_z, -(data->dist_to_cam - 1.0f - params->clipsta));
+ madd_v3_v3fl(r_co, cam_axis_z, -(data->dist_to_cam - 1.0f - params->clip_start));
return true;
}
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index ebb49919ce6..314aaaf4fdc 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -50,9 +50,6 @@
#undef rct1
#undef rct2
-#define near clipsta
-#define far clipend
-
#undef small
// These definitions are also in BLI_math for simplicity
diff --git a/source/blender/collada/CameraExporter.cpp b/source/blender/collada/CameraExporter.cpp
index 8a327e01651..b83f6a456ba 100644
--- a/source/blender/collada/CameraExporter.cpp
+++ b/source/blender/collada/CameraExporter.cpp
@@ -66,8 +66,8 @@ void CamerasExporter::operator()(Object *ob, Scene *sce)
COLLADASW::PerspectiveOptic persp(mSW);
persp.setXFov(RAD2DEGF(focallength_to_fov(cam->lens, cam->sensor_x)), "xfov");
persp.setAspectRatio((float)(sce->r.xsch) / (float)(sce->r.ysch), false, "aspect_ratio");
- persp.setZFar(cam->clipend, false, "zfar");
- persp.setZNear(cam->clipsta, false, "znear");
+ persp.setZFar(cam->clip_end, false, "zfar");
+ persp.setZNear(cam->clip_start, false, "znear");
COLLADASW::Camera ccam(mSW, &persp, cam_id, cam_name);
exportBlenderProfile(ccam, cam);
addCamera(ccam);
@@ -80,8 +80,8 @@ void CamerasExporter::operator()(Object *ob, Scene *sce)
COLLADASW::OrthographicOptic ortho(mSW);
ortho.setXMag(cam->ortho_scale / 2, "xmag");
ortho.setAspectRatio((float)(sce->r.xsch) / (float)(sce->r.ysch), false, "aspect_ratio");
- ortho.setZFar(cam->clipend, false, "zfar");
- ortho.setZNear(cam->clipsta, false, "znear");
+ ortho.setZFar(cam->clip_end, false, "zfar");
+ ortho.setZNear(cam->clip_start, false, "znear");
COLLADASW::Camera ccam(mSW, &ortho, cam_id, cam_name);
exportBlenderProfile(ccam, cam);
addCamera(ccam);
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index a6a87cb7f32..057a321f03d 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -838,8 +838,8 @@ bool DocumentImporter::writeCamera(const COLLADAFW::Camera *camera)
et->setData("shifty",&(cam->shifty));
et->setData("dof_distance",&(cam->dof_distance));
}
- cam->clipsta = camera->getNearClippingPlane().getValue();
- cam->clipend = camera->getFarClippingPlane().getValue();
+ cam->clip_start = camera->getNearClippingPlane().getValue();
+ cam->clip_end = camera->getFarClippingPlane().getValue();
COLLADAFW::Camera::CameraType type = camera->getCameraType();
switch (type) {
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index 880885a1efb..d693e9cbd08 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -89,8 +89,8 @@ int EEVEE_depth_of_field_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *v
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list