Revision: 46591
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46591
Author: campbellbarton
Date: 2012-05-12 22:13:38 +0000 (Sat, 12 May 2012)
Log Message:
-----------
code cleanup: minor improvements to float/vector usage.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenlib/BLI_graph.h
trunk/blender/source/blender/blenlib/intern/graph.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/mesh/editmesh_bvh.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/render/intern/source/zbuf.c
Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2012-05-12
22:00:32 UTC (rev 46590)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2012-05-12
22:13:38 UTC (rev 46591)
@@ -777,7 +777,7 @@
{
return (float *) ((byte *) _face_getIFCoEdge(f, e, f_ed_idx, lvl, eX,
eY, levels, dataSize) + normalDataOffset);
}
-static void _face_calcIFNo(CCGFace *f, int lvl, int S, int x, int y, float
*no, int levels, int dataSize)
+static void _face_calcIFNo(CCGFace *f, int lvl, int S, int x, int y, float
no[3], int levels, int dataSize)
{
float *a = _face_getIFCo(f, lvl, S, x + 0, y + 0, levels, dataSize);
float *b = _face_getIFCo(f, lvl, S, x + 1, y + 0, levels, dataSize);
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2012-05-12
22:00:32 UTC (rev 46590)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2012-05-12
22:13:38 UTC (rev 46591)
@@ -2541,7 +2541,7 @@
}
/************** Bounding box ********************/
-int minmax_armature(Object *ob, float min[3], float max[3])
+static int minmax_armature(Object *ob, float min[3], float max[3])
{
bPoseChannel *pchan;
@@ -2554,7 +2554,7 @@
return (ob->pose->chanbase.first != NULL);
}
-void boundbox_armature(Object *ob, float *loc, float *size)
+static void boundbox_armature(Object *ob, float loc[3], float size[3])
{
BoundBox *bb;
float min[3], max[3];
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-05-12
22:00:32 UTC (rev 46590)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-05-12
22:13:38 UTC (rev 46591)
@@ -961,7 +961,7 @@
}
}
-static void vectomat(float *vec, float *target_up, short axis, short upflag,
short flags, float m[][3])
+static void vectomat(const float vec[3], const float target_up[3], short axis,
short upflag, short flags, float m[][3])
{
float n[3];
float u[3]; /* vector specifying the up axis */
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-12
22:00:32 UTC (rev 46590)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-12
22:13:38 UTC (rev 46591)
@@ -588,7 +588,7 @@
}
}
-void BKE_nurb_minmax(Nurb *nu, float *min, float *max)
+void BKE_nurb_minmax(Nurb *nu, float min[3], float max[3])
{
BezTriple *bezt;
BPoint *bp;
@@ -1166,19 +1166,23 @@
}
}
-static void forward_diff_bezier_cotangent(float *p0, float *p1, float *p2,
float *p3, float *p, int it, int stride)
+static void forward_diff_bezier_cotangent(const float p0[3], const float
p1[3], const float p2[3], const float p3[3],
+ float p[3], int it, int stride)
{
/* note that these are not purpendicular to the curve
* they need to be rotated for this,
*
- * This could also be optimized like forward_diff_bezier */
+ * This could also be optimized like BKE_curve_forward_diff_bezier */
int a;
for (a = 0; a <= it; a++) {
float t = (float)a / (float)it;
int i;
for (i = 0; i < 3; i++) {
- p[i] = (-6 * t + 6) * p0[i] + (18 * t - 12) * p1[i] +
(-18 * t + 6) * p2[i] + (6 * t) * p3[i];
+ p[i] = (-6.0f * t + 6.0f) * p0[i] +
+ ( 18.0f * t - 12.0f) * p1[i] +
+ (-18.0f * t + 6.0f) * p2[i] +
+ ( 6.0f * t) * p3[i];
}
normalize_v3(p);
p = (float *)(((char *)p) + stride);
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-05-12 22:00:32 UTC (rev 46590)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-05-12 22:13:38 UTC (rev 46591)
@@ -424,7 +424,7 @@
return surface->data->total_points;
}
-static void blendColors(float t_color[3], float t_alpha, float s_color[3],
float s_alpha, float result[4])
+static void blendColors(const float t_color[3], float t_alpha, const float
s_color[3], float s_alpha, float result[4])
{
int i;
float i_alpha = 1.0f - s_alpha;
@@ -2842,7 +2842,8 @@
* timescale : value used to adjust time dependand
* operations when using substeps
*/
-static void dynamicPaint_mixPaintColors(DynamicPaintSurface *surface, int
index, int paintFlags, float *paintColor, float *paintAlpha, float
*paintWetness, float *timescale)
+static void dynamicPaint_mixPaintColors(DynamicPaintSurface *surface, int
index, int paintFlags,
+ const float paintColor[3], float
*paintAlpha, float *paintWetness, float *timescale)
{
PaintPoint *pPoint = &((PaintPoint *)surface->data->type_data)[index];
Modified: trunk/blender/source/blender/blenlib/BLI_graph.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_graph.h 2012-05-12 22:00:32 UTC
(rev 46590)
+++ trunk/blender/source/blender/blenlib/BLI_graph.h 2012-05-12 22:13:38 UTC
(rev 46591)
@@ -155,7 +155,7 @@
void BLI_replaceNode(BGraph *graph, BNode *node_src, BNode *node_replaced);
void BLI_replaceNodeInArc(BGraph *graph, BArc *arc, BNode *node_src, BNode
*node_replaced);
void BLI_removeDoubleNodes(BGraph *graph, float limit);
-BNode *BLI_FindNodeByPosition(BGraph *graph, float *p, float limit);
+BNode *BLI_FindNodeByPosition(BGraph *graph, const float p[3], const float
limit);
BArc *BLI_findConnectedArc(BGraph *graph, BArc *arc, BNode *v);
Modified: trunk/blender/source/blender/blenlib/intern/graph.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/graph.c 2012-05-12 22:00:32 UTC
(rev 46590)
+++ trunk/blender/source/blender/blenlib/intern/graph.c 2012-05-12 22:13:38 UTC
(rev 46591)
@@ -249,7 +249,7 @@
}
-BNode *BLI_FindNodeByPosition(BGraph *graph, float *p, float limit)
+BNode *BLI_FindNodeByPosition(BGraph *graph, const float p[3], const float
limit)
{
BNode *closest_node = NULL, *node;
float min_distance = 0.0f;
Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-05-12
22:00:32 UTC (rev 46590)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-05-12
22:13:38 UTC (rev 46591)
@@ -195,7 +195,7 @@
* the bevel operation as a whole based on the relationship between v1 and v2
* (won't necessarily be a vec from v1->co to v2->co, though it probably will
be);
* the return value is -1 for failure, 0 if we used vert co's, and 1 if we
used transform origins */
-static int BME_bevel_get_vec(float *vec, BMVert *v1, BMVert *v2,
BME_TransData_Head *td)
+static int BME_bevel_get_vec(float vec[3], BMVert *v1, BMVert *v2,
BME_TransData_Head *td)
{
BME_TransData *vtd1, *vtd2;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_bvh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_bvh.c 2012-05-12
22:00:32 UTC (rev 46590)
+++ trunk/blender/source/blender/editors/mesh/editmesh_bvh.c 2012-05-12
22:13:38 UTC (rev 46591)
@@ -201,12 +201,13 @@
}
/* taken from bvhutils.c */
-static float ray_tri_intersection(const BVHTreeRay *ray, const float
UNUSED(m_dist), float *v0,
- float *v1, float *v2, float *uv, float
UNUSED(e))
+static float ray_tri_intersection(const BVHTreeRay *ray, const float
UNUSED(m_dist),
+ const float v0[3], const float v1[3], const
float v2[3],
+ float r_uv[2], float UNUSED(e))
{
float dist;
- if (isect_ray_tri_v3((float *)ray->origin, (float *)ray->direction, v0,
v1, v2, &dist, uv)) {
+ if (isect_ray_tri_v3((float *)ray->origin, (float *)ray->direction, v0,
v1, v2, &dist, r_uv)) {
return dist;
}
@@ -343,7 +344,7 @@
/* UNUSED */
#if 0
-static short winding(float *v1, float *v2, float *v3)
+static short winding(const float v1[3], const float v2[3], const float v3[3])
/* is v3 to the right of (v1 - v2) ? With exception: v3 == v1 || v3 == v2 */
{
double inp;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2012-05-12 22:00:32 UTC (rev 46590)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2012-05-12 22:13:38 UTC (rev 46591)
@@ -3769,7 +3769,7 @@
BLI_linklist_prepend_arena(smearPixels_f, (void *)projPixel,
smearArena);
}
-static void do_projectpaint_draw(ProjPaintState *ps, ProjPixel *projPixel,
float *rgba, float alpha, float mask)
+static void do_projectpaint_draw(ProjPaintState *ps, ProjPixel *projPixel,
const float rgba[4], float alpha, float mask)
{
unsigned char rgba_ub[4];
@@ -3793,7 +3793,7 @@
}
}
-static void do_projectpaint_draw_f(ProjPaintState *ps, ProjPixel *projPixel,
float *rgba, float alpha, float mask, int use_color_correction)
+static void do_projectpaint_draw_f(ProjPaintState *ps, ProjPixel *projPixel,
float rgba[4], float alpha, float mask, int use_color_correction)
{
if (ps->is_texbrush) {
/* rgba already holds a texture result here from higher level
function */
@@ -4190,9 +4190,10 @@
/* Image Paint Operations */
-static void imapaint_ibuf_get_set_rgb(ImBuf *ibuf, int x, int y, short torus,
short set, float *rgb)
+/* keep these functions in sync */
+static void imapaint_ibuf_rgb_get(ImBuf *ibuf, int x, int y, const short
is_torus, float r_rgb[3])
{
- if (torus) {
+ if (is_torus) {
x %= ibuf->x;
if (x < 0) x += ibuf->x;
y %= ibuf->y;
@@ -4201,24 +4202,30 @@
if (ibuf->rect_float) {
float *rrgbf = ibuf->rect_float + (ibuf->x * y + x) * 4;
-
- if (set) {
- IMAPAINT_FLOAT_RGB_COPY(rrgbf, rgb);
- }
- else {
- IMAPAINT_FLOAT_RGB_COPY(rgb, rrgbf);
- }
+ IMAPAINT_FLOAT_RGB_COPY(r_rgb, rrgbf);
}
else {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
