archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup: replace cos(M_PI / 4) and sin(M_PI / 4) with M_SQRT1_2 define

Browse Source 
also some minor style cleanup.
This commit is contained in:
Campbell Barton
2012-07-22 18:40:50 +00:00
parent ea229638a0
commit 76bea854b6
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/itasc/Armature.cpp
View File

@@ -319,7 +319,7 @@ int Armature::addConstraint(const std::string& segment_name, ConstraintCallback
return iConstraint; return iConstraint;
} }
} }
if (m_finalized) { if (m_finalized) {
if (_freeParam && _param) if (_freeParam && _param)
free(_param); free(_param);
return -1; return -1;

10
source/blender/blenkernel/intern/object.c
View File

@@ -1688,16 +1688,16 @@ static void ob_parcurve(Scene *scene, Object *ob, Object *par, float mat[][4])
if (cu->flag & CU_FOLLOW) { if (cu->flag & CU_FOLLOW) {
#if 0 #if 0
float x1, q[4]; float si, q[4];
vec_to_quat(quat, dir, ob->trackflag, ob->upflag); vec_to_quat(quat, dir, ob->trackflag, ob->upflag);
/* the tilt */ /* the tilt */
normalize_v3(dir); normalize_v3(dir);
q[0] = (float)cos(0.5 * vec[3]); q[0] = (float)cos(0.5 * vec[3]);
x1 = (float)sin(0.5 * vec[3]); si = (float)sin(0.5 * vec[3]);
q[1] = -x1 * dir[0]; q[1] = -si * dir[0];
q[2] = -x1 * dir[1]; q[2] = -si * dir[1];
q[3] = -x1 * dir[2]; q[3] = -si * dir[2];
mul_qt_qtqt(quat, q, quat); mul_qt_qtqt(quat, q, quat);
#else #else
quat_apply_track(quat, ob->trackflag, ob->upflag); quat_apply_track(quat, ob->trackflag, ob->upflag);

4
source/blender/editors/space_view3d/view3d_edit.c
View File

@@ -2873,7 +2873,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op)
break; break;
case RV3D_VIEW_BACK: case RV3D_VIEW_BACK:
axis_set_view(C, v3d, ar, 0.0, 0.0, -cosf(M_PI / 4.0), -cosf(M_PI / 4.0), axis_set_view(C, v3d, ar, 0.0, 0.0, -M_SQRT1_2, -M_SQRT1_2,
viewnum, nextperspo, align_active); viewnum, nextperspo, align_active);
break; break;
@@ -2888,7 +2888,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op)
break; break;
case RV3D_VIEW_FRONT: case RV3D_VIEW_FRONT:
axis_set_view(C, v3d, ar, cosf(M_PI / 4.0), -sinf(M_PI / 4.0), 0.0, 0.0, axis_set_view(C, v3d, ar, M_SQRT1_2, -M_SQRT1_2, 0.0, 0.0,
viewnum, nextperspo, align_active); viewnum, nextperspo, align_active);
break; break;

4
source/blender/editors/space_view3d/view3d_view.c
View File

@@ -1125,7 +1125,7 @@ int ED_view3d_lock(RegionView3D *rv3d)
break; break;
case RV3D_VIEW_BACK: case RV3D_VIEW_BACK:
QUATSET(rv3d->viewquat, 0.0, 0.0, -cosf(M_PI / 4.0), -cosf(M_PI / 4.0)); QUATSET(rv3d->viewquat, 0.0, 0.0, -M_SQRT1_2, -M_SQRT1_2);
break; break;
case RV3D_VIEW_LEFT: case RV3D_VIEW_LEFT:
@@ -1137,7 +1137,7 @@ int ED_view3d_lock(RegionView3D *rv3d)
break; break;
case RV3D_VIEW_FRONT: case RV3D_VIEW_FRONT:
QUATSET(rv3d->viewquat, (float)cos(M_PI / 4.0), -sinf(M_PI / 4.0), 0.0, 0.0); QUATSET(rv3d->viewquat, M_SQRT1_2, -M_SQRT1_2, 0.0, 0.0);
break; break;
case RV3D_VIEW_RIGHT: case RV3D_VIEW_RIGHT:

3
source/blender/python/generic/bpy_internal_import.c
View File

@@ -157,7 +157,8 @@ PyObject *bpy_text_import_name(const char *name, int *found)
} }
/* we know this cant be importable, the name is too long for blender! */ /* we know this cant be importable, the name is too long for blender! */
if (namelen >= (MAX_ID_NAME - 2) - 3) return NULL; if (namelen >= (MAX_ID_NAME - 2) - 3)
return NULL;
memcpy(txtname, name, namelen); memcpy(txtname, name, namelen);
memcpy(&txtname[namelen], ".py", 4); memcpy(&txtname[namelen], ".py", 4);