[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45530] trunk/blender/source: code cleanup : float formatting was confusing in some cases - eg: (0., 0., 0.)
Campbell Barton
ideasman42 at gmail.com
Wed Apr 11 10:15:16 CEST 2012
Revision: 45530
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45530
Author: campbellbarton
Date: 2012-04-11 08:15:13 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
code cleanup: float formatting was confusing in some cases - eg: (0.,0.,0.)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_particle.h
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenlib/intern/math_base.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/bmesh/intern/bmesh_operator_api.h
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_tonemap.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_System.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
trunk/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
trunk/blender/source/gameengine/Ketsji/KX_RayCast.cpp
trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_TimeCategoryLogger.cpp
trunk/blender/source/gameengine/Ketsji/KX_TimeLogger.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
trunk/blender/source/gameengine/SceneGraph/SG_BBox.cpp
trunk/blender/source/gameengine/SceneGraph/SG_BBox.h
Modified: trunk/blender/source/blender/blenkernel/BKE_particle.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_particle.h 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/blenkernel/BKE_particle.h 2012-04-11 08:15:13 UTC (rev 45530)
@@ -64,7 +64,7 @@
#define LOOP_EXISTING_PARTICLES for(p=0, pa=psys->particles; p<psys->totpart; p++, pa++) if(!(pa->flag & PARS_UNEXIST))
#define LOOP_SHOWN_PARTICLES for(p=0, pa=psys->particles; p<psys->totpart; p++, pa++) if(!(pa->flag & (PARS_UNEXIST|PARS_NO_DISP)))
/* OpenMP: Can only advance one variable within loop definition. */
-#define LOOP_DYNAMIC_PARTICLES for(p=0; p<psys->totpart; p++ ) if((pa=psys->particles+p)->state.time > 0.f)
+#define LOOP_DYNAMIC_PARTICLES for(p=0; p<psys->totpart; p++ ) if((pa=psys->particles+p)->state.time > 0.0f)
#define PSYS_FRAND_COUNT 1024
#define PSYS_FRAND(seed) psys->frand[(seed) % PSYS_FRAND_COUNT]
Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -744,7 +744,7 @@
length = sqrtf(no[0] * no[0] + no[1] * no[1] + no[2] * no[2]);
if (length > EPSILON) {
- float invLength = 1.f/length;
+ float invLength = 1.0f / length;
no[0] *= invLength;
no[1] *= invLength;
Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -546,8 +546,8 @@
itasc->numstep = 4;
itasc->precision = 0.005f;
itasc->flag = ITASC_AUTO_STEP|ITASC_INITIAL_REITERATION;
- itasc->feedback = 20.f;
- itasc->maxvel = 50.f;
+ itasc->feedback = 20.0f;
+ itasc->maxvel = 50.0f;
itasc->solver = ITASC_SOLVER_SDLS;
itasc->dampmax = 0.5;
itasc->dampeps = 0.15;
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -847,8 +847,8 @@
ob->init_state=1;
ob->state=1;
/* ob->pad3 == Contact Processing Threshold */
- ob->m_contactProcessingThreshold = 1.;
- ob->obstacleRad = 1.;
+ ob->m_contactProcessingThreshold = 1.0f;
+ ob->obstacleRad = 1.0f;
/* NT fluid sim defaults */
ob->fluidsimSettings = NULL;
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -592,7 +592,7 @@
if (seq->seq1) {
/* XXX These resets should not be necessary, but users used to be able to
- * edit effect's length, leading to strange results. See #29190. */
+ * edit effect's length, leading to strange results. See [#29190] */
seq->startofs = seq->endofs = seq->startstill = seq->endstill = 0;
seq->start = seq->startdisp = MAX3(seq->seq1->startdisp, seq->seq2->startdisp, seq->seq3->startdisp);
seq->enddisp = MIN3(seq->seq1->enddisp, seq->seq2->enddisp, seq->seq3->enddisp);
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -134,7 +134,7 @@
struct DerivedMesh;
struct SmokeModifierData;
-#define TRI_UVOFFSET (1./4.)
+#define TRI_UVOFFSET (1.0 / 4.0)
/* forward declerations */
static void calcTriangleDivs(Object *ob, MVert *verts, int numverts, MFace *tris, int numfaces, int numtris, int **tridivs, float cell_len);
@@ -949,8 +949,8 @@
if (usqr>maxusqr) {
// cutoff at maxVelVal
for (int jj=0; jj<3; jj++) {
- if (objvel[jj]>0.) objvel[jj] = maxVelVal;
- if (objvel[jj]<0.) objvel[jj] = -maxVelVal;
+ if (objvel[jj] > 0.0) objvel[jj] = maxVelVal;
+ if (objvel[jj] < 0.0) objvel[jj] = -maxVelVal;
}
}
}
Modified: trunk/blender/source/blender/blenlib/intern/math_base.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_base.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/blenlib/intern/math_base.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -37,8 +37,8 @@
/* from python 3.1 pymath.c */
double copysign(double x, double y)
{
- /* use atan2 to distinguish -0. from 0. */
- if (y > 0. || (y == 0. && atan2(y, -1.) > 0.)) {
+ /* use atan2 to distinguish -0.0 from 0.0 */
+ if (y > 0.0 || (y == 0.0 && atan2(y, -1.0) > 0.0)) {
return fabs(x);
}
else {
Modified: trunk/blender/source/blender/blenlib/intern/noise.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/noise.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/blenlib/intern/noise.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -1002,11 +1002,11 @@
p[2] = point[2];
t = 0;
- for (freq = lofreq ; freq < hifreq ; freq *= 2.) {
+ for (freq = lofreq ; freq < hifreq ; freq *= 2.0) {
t += fabsf(noise3_perlin(p)) / freq;
- p[0] *= 2.;
- p[1] *= 2.;
- p[2] *= 2.;
+ p[0] *= 2.0f;
+ p[1] *= 2.0f;
+ p[2] *= 2.0f;
}
return t - 0.3; /* readjust to make mean value = 0.0 */
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -10778,7 +10778,7 @@
Object *ob;
World *wrld;
for (ob = main->object.first; ob; ob= ob->id.next) {
- ob->m_contactProcessingThreshold = 1.; //pad3 is used for m_contactProcessingThreshold
+ ob->m_contactProcessingThreshold = 1.0f; //pad3 is used for m_contactProcessingThreshold
if (ob->parent) {
/* check if top parent has compound shape set and if yes, set this object
to compound shaper as well (was the behavior before, now it's optional) */
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operator_api.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operator_api.h 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operator_api.h 2012-04-11 08:15:13 UTC (rev 45530)
@@ -90,7 +90,7 @@
BLI_INLINE void _bmo_elem_flag_toggle( BMesh *bm, BMFlagLayer *oflags, const short oflag);
/* slot type arrays are terminated by the last member
- * having a slot type of 0.*/
+ * having a slot type of 0 */
enum {
BMO_OP_SLOT_SENTINEL = 0,
BMO_OP_SLOT_BOOL = 1,
Modified: trunk/blender/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -196,9 +196,9 @@
gluQuadricDrawStyle(qobj, GLU_FILL);
/* need to translate drawing position, but must reset after too! */
- glTranslatef(co[0], co[1], 0.);
+ glTranslatef(co[0], co[1], 0.0);
gluDisk(qobj, 0.0, thickness, 32, 1);
- glTranslatef(-co[0], -co[1], 0.);
+ glTranslatef(-co[0], -co[1], 0.0);
gluDeleteQuadric(qobj);
}
Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/editors/screen/area.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -204,8 +204,8 @@
qobj = gluNewQuadric();
- glPushMatrix();
- glTranslatef(midx, midy, 0.);
+ glPushMatrix();
+ glTranslatef(midx, midy, 0.0);
/* outlined circle */
glEnable(GL_LINE_SMOOTH);
Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -1051,7 +1051,7 @@
/* Pulsing and frequency */
uiBlockBeginAlign(block);
uiDefIconButBitS(block, TOG, SENS_PULSE_REPEAT, 1, ICON_DOTSUP,
- (short)(x + 10 + 0. * (w-20)), (short)(y - 21), (short)(0.1 * (w-20)), 19,
+ (short)(x + 10 + 0.0 * (w - 20)), (short)(y - 21), (short)(0.1 * (w - 20)), 19,
&sens->pulse, 0.0, 0.0, 0, 0,
"Activate TRUE level triggering (pulse mode)");
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ -5624,7 +5624,7 @@
radius = size;
glTranslatef(cent, cent, cent);
glScalef(radius, size * 2.0f, radius);
- glRotatef(-90., 1.0, 0.0, 0.0);
+ glRotatef(-90.0, 1.0, 0.0, 0.0);
gluCylinder(qobj, 1.0, 0.0, 1.0, 8, 1);
glPopMatrix();
Modified: trunk/blender/source/blender/editors/space_view3d/drawvolume.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawvolume.c 2012-04-11 07:47:09 UTC (rev 45529)
+++ trunk/blender/source/blender/editors/space_view3d/drawvolume.c 2012-04-11 08:15:13 UTC (rev 45530)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list