[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11485] trunk/blender/source/blender: Little code cleanup.
Joshua Leung
aligorith at gmail.com
Sun Aug 5 11:21:29 CEST 2007
Revision: 11485
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11485
Author: aligorith
Date: 2007-08-05 11:21:29 +0200 (Sun, 05 Aug 2007)
Log Message:
-----------
Little code cleanup.
bsystem_time was being called with an extra variable, which was useless. Most of the places that called it, were passing NULL for that variable anyway.
I've also cleaned up that function a bit, but the underlying problems with that part of the code still exist (EVIL GLOBALS that are exported for frame_to_float), for mblur and fields rendering features. That remains for another time.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_object.h
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/python/api2_2x/Effect.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/src/drawobject.c
trunk/blender/source/blender/src/editconstraint.c
trunk/blender/source/blender/src/editkey.c
Modified: trunk/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_object.h 2007-08-05 05:28:02 UTC (rev 11484)
+++ trunk/blender/source/blender/blenkernel/BKE_object.h 2007-08-05 09:21:29 UTC (rev 11485)
@@ -81,7 +81,7 @@
void set_field_offs(float field);
void disable_speed_curve(int val);
-float bsystem_time(struct Object *ob, struct Object *par, float cfra, float ofs);
+float bsystem_time(struct Object *ob, float cfra, float ofs);
void object_to_mat3(struct Object *ob, float mat[][3]);
void object_to_mat4(struct Object *ob, float mat[][4]);
Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2007-08-05 05:28:02 UTC (rev 11484)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2007-08-05 09:21:29 UTC (rev 11485)
@@ -1111,7 +1111,7 @@
if(cu->path) {
/* Find the position on the path */
- ctime= bsystem_time(ob, parent, scene_cfra, 0.0);
+ ctime= bsystem_time(ob, scene_cfra, 0.0);
if(calc_ipo_spec(cu->ipo, CU_SPEED, &ctime)==0) {
/* correct for actions not starting on zero */
@@ -1133,7 +1133,7 @@
}
frametime = (striptime * actlength) + strip->actstart;
- frametime= bsystem_time(ob, 0, frametime, 0.0);
+ frametime= bsystem_time(ob, frametime, 0.0);
if(blocktype==ID_AR) {
extract_pose_from_action (tpose, strip->act, frametime);
@@ -1184,7 +1184,7 @@
frametime = actlength * (strip->repeat-(int)strip->repeat);
if(frametime<=0.000001f) frametime= actlength; /* rounding errors... */
- frametime= bsystem_time(ob, 0, frametime+strip->actstart, 0.0);
+ frametime= bsystem_time(ob, frametime+strip->actstart, 0.0);
if(blocktype==ID_AR)
extract_pose_from_action (tpose, strip->act, frametime);
@@ -1267,7 +1267,7 @@
cframe= get_action_frame(ob, cframe);
- extract_pose_from_action (ob->pose, ob->action, bsystem_time(ob, 0, cframe, 0.0));
+ extract_pose_from_action (ob->pose, ob->action, bsystem_time(ob, cframe, 0.0));
}
else if(ob->nlastrips.first) {
do_nla(ob, ID_AR);
@@ -1288,9 +1288,9 @@
cframe= get_action_frame(ob, cframe);
- extract_ipochannels_from_action(&tchanbase, &ob->id, ob->action, "Object", bsystem_time(ob, 0, cframe, 0.0));
+ extract_ipochannels_from_action(&tchanbase, &ob->id, ob->action, "Object", bsystem_time(ob, cframe, 0.0));
if(key)
- extract_ipochannels_from_action(&tchanbase, &key->id, ob->action, "Shape", bsystem_time(ob, 0, cframe, 0.0));
+ extract_ipochannels_from_action(&tchanbase, &key->id, ob->action, "Shape", bsystem_time(ob, cframe, 0.0));
if(tchanbase.first) {
execute_ipochannels(&tchanbase);
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2007-08-05 05:28:02 UTC (rev 11484)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2007-08-05 09:21:29 UTC (rev 11485)
@@ -582,7 +582,7 @@
if(pa==NULL) return;
}
- ctime= bsystem_time(par, 0, (float)G.scene->r.cfra, 0.0);
+ ctime= bsystem_time(par, (float)G.scene->r.cfra, 0.0);
lay= G.scene->lay;
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2007-08-05 05:28:02 UTC (rev 11484)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2007-08-05 09:21:29 UTC (rev 11485)
@@ -1922,7 +1922,7 @@
Bone *bone;
bPoseChannel *pchan;
float imat[4][4];
- float ctime= bsystem_time(ob, NULL, (float)G.scene->r.cfra, 0.0); /* not accurate... */
+ float ctime= bsystem_time(ob, (float)G.scene->r.cfra, 0.0); /* not accurate... */
arm = get_armature(ob);
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2007-08-05 05:28:02 UTC (rev 11484)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2007-08-05 09:21:29 UTC (rev 11485)
@@ -1454,7 +1454,7 @@
if (cu->path==NULL || cu->path->data==NULL) /* only happens on reload file, but violates depsgraph still... fix! */
makeDispListCurveTypes(data->tar, 0);
if (cu->path && cu->path->data) {
- curvetime= bsystem_time(data->tar, data->tar->parent, (float)ctime, 0.0) - data->offset;
+ curvetime= bsystem_time(data->tar, (float)ctime, 0.0) - data->offset;
if (calc_ipo_spec(cu->ipo, CU_SPEED, &curvetime)==0) {
curvetime /= cu->pathlen;
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2007-08-05 05:28:02 UTC (rev 11484)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2007-08-05 09:21:29 UTC (rev 11485)
@@ -2000,7 +2000,7 @@
/* do not set ob->ctime here: for example when parent in invisible layer */
- ctime= bsystem_time(ob, 0, (float) G.scene->r.cfra, 0.0);
+ ctime= bsystem_time(ob, (float) G.scene->r.cfra, 0.0);
calc_ipo(ob->ipo, ctime);
Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c 2007-08-05 05:28:02 UTC (rev 11484)
+++ trunk/blender/source/blender/blenkernel/intern/key.c 2007-08-05 09:21:29 UTC (rev 11485)
@@ -1025,7 +1025,7 @@
for(a=0; a<me->totvert; a+=step, cfra+= delta) {
- ctime= bsystem_time(0, 0, cfra, 0.0);
+ ctime= bsystem_time(0, cfra, 0.0);
if(calc_ipo_spec(me->key->ipo, KEY_SPEED, &ctime)==0) {
ctime /= 100.0;
CLAMP(ctime, 0.0, 1.0);
@@ -1060,7 +1060,7 @@
}
}
else {
- ctime= bsystem_time(ob, 0, G.scene->r.cfra, 0.0);
+ ctime= bsystem_time(ob, G.scene->r.cfra, 0.0);
if(calc_ipo_spec(me->key->ipo, KEY_SPEED, &ctime)==0) {
ctime /= 100.0;
@@ -1180,7 +1180,7 @@
for(a=0; a<tot; a+=step, cfra+= delta) {
- ctime= bsystem_time(0, 0, cfra, 0.0);
+ ctime= bsystem_time(0, cfra, 0.0);
if(calc_ipo_spec(cu->key->ipo, KEY_SPEED, &ctime)==0) {
ctime /= 100.0;
CLAMP(ctime, 0.0, 1.0);
@@ -1202,7 +1202,7 @@
}
else {
- ctime= bsystem_time(NULL, 0, (float)G.scene->r.cfra, 0.0);
+ ctime= bsystem_time(NULL, (float)G.scene->r.cfra, 0.0);
if(cu->key->type==KEY_RELATIVE) {
do_rel_cu_key(cu, ctime);
@@ -1244,7 +1244,7 @@
for(a=0; a<tot; a++, cfra+= delta) {
- ctime= bsystem_time(0, 0, cfra, 0.0);
+ ctime= bsystem_time(0, cfra, 0.0);
if(calc_ipo_spec(lt->key->ipo, KEY_SPEED, &ctime)==0) {
ctime /= 100.0;
CLAMP(ctime, 0.0, 1.0);
@@ -1261,7 +1261,7 @@
}
}
else {
- ctime= bsystem_time(NULL, 0, (float)G.scene->r.cfra, 0.0);
+ ctime= bsystem_time(NULL, (float)G.scene->r.cfra, 0.0);
if(lt->key->type==KEY_RELATIVE) {
KeyBlock *kb;
@@ -1342,7 +1342,7 @@
if(ob->ipoflag & OB_ACTION_KEY)
do_all_object_actions(ob);
else {
- calc_ipo(key->ipo, bsystem_time(ob, 0, G.scene->r.cfra, 0.0));
+ calc_ipo(key->ipo, bsystem_time(ob, G.scene->r.cfra, 0.0));
execute_ipo((ID *)key, key->ipo);
}
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2007-08-05 05:28:02 UTC (rev 11484)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2007-08-05 09:21:29 UTC (rev 11485)
@@ -383,7 +383,7 @@
for(i = 0; i < maxFaces; ++i) faceMap[i] = i;
if (ob) {
- frac = bsystem_time(ob, 0, (float)G.scene->r.cfra,
+ frac = bsystem_time(ob, (float)G.scene->r.cfra,
bmd->start - 1.0f) / bmd->length;
} else {
frac = G.scene->r.cfra - bmd->start / bmd->length;
@@ -4330,7 +4330,7 @@
MVert *mvert = NULL;
MDeformVert *dvert = NULL;
int defgrp_index;
- float ctime = bsystem_time(ob, 0, (float)G.scene->r.cfra, 0.0);
+ float ctime = bsystem_time(ob, (float)G.scene->r.cfra, 0.0);
float minfac =
(float)(1.0 / exp(wmd->width * wmd->narrow * wmd->width * wmd->narrow));
float lifefac = wmd->height;
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2007-08-05 05:28:02 UTC (rev 11484)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2007-08-05 09:21:29 UTC (rev 11485)
@@ -1132,20 +1132,23 @@
}
/* ob can be NULL */
-float bsystem_time(Object *ob, Object *par, float cfra, float ofs)
+float bsystem_time(Object *ob, float cfra, float ofs)
{
/* returns float ( see frame_to_float in ipo.c) */
-
+
+ /* bluroffs and fieldoffs are ugly globals that are set by render */
cfra+= bluroffs+fieldoffs;
/* global time */
cfra*= G.scene->r.framelen;
- if(no_speed_curve==0) if(ob && ob->ipo) cfra= calc_ipo_time(ob->ipo, cfra);
-
- /* ofset frames */
- if(ob && (ob->ipoflag & OB_OFFS_PARENT)) {
- if((ob->partype & PARSLOW)==0) cfra-= ob->sf;
+ if (ob) {
+ if (no_speed_curve==0 && ob->ipo)
+ cfra= calc_ipo_time(ob->ipo, cfra);
+
+ /* ofset frames */
+ if ((ob->ipoflag & OB_OFFS_PARENT) && (ob->partype & PARSLOW)==0)
+ cfra-= ob->sf;
}
cfra-= ofs;
@@ -1236,7 +1239,7 @@
}
/* catch exceptions: curve paths used as a duplicator */
else if(enable_cu_speed) {
- ctime= bsystem_time(ob, par, (float)G.scene->r.cfra, 0.0);
+ ctime= bsystem_time(ob, (float)G.scene->r.cfra, 0.0);
if(calc_ipo_spec(cu->ipo, CU_SPEED, &ctime)==0) {
ctime /= cu->pathlen;
@@ -1488,7 +1491,7 @@
if(ob==NULL) return;
/* this is needed to be able to grab objects with ipos, otherwise it always freezes them */
- stime= bsystem_time(ob, 0, ctime, 0.0);
+ stime= bsystem_time(ob, ctime, 0.0);
if(stime != ob->ctime) {
ob->ctime= stime;
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list