[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34296] trunk/blender/source/blender/ modifiers/intern/MOD_fluidsim_util.c: speedup fluid file reading, seek past arrays rather then reading them & use fewer function calls to gzread ().
Campbell Barton
ideasman42 at gmail.com
Thu Jan 13 12:06:13 CET 2011
Revision: 34296
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34296
Author: campbellbarton
Date: 2011-01-13 11:06:12 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
speedup fluid file reading, seek past arrays rather then reading them & use fewer function calls to gzread().
also added missing MEM_freeN(), though it would only leak in exceptional cases.
Modified Paths:
--------------
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
Modified: trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c 2011-01-13 10:14:03 UTC (rev 34295)
+++ trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c 2011-01-13 11:06:12 UTC (rev 34296)
@@ -169,15 +169,15 @@
/* read .bobj.gz file into a fluidsimDerivedMesh struct */
DerivedMesh *fluidsim_read_obj(char *filename)
{
- int wri = 0,i,j;
- float wrf;
+ int wri = 0,i;
int gotBytes;
gzFile gzf;
int numverts = 0, numfaces = 0;
DerivedMesh *dm = NULL;
- MFace *mface;
- MVert *mvert;
- short *normals;
+ MFace *mf;
+ MVert *mv;
+ short *normals, *no_s;
+ float no[3];
// ------------------------------------------------
// get numverts + numfaces first
@@ -193,20 +193,15 @@
numverts = wri;
// skip verts
- for(i=0; i<numverts*3 && gotBytes; i++)
- {
- gotBytes = gzread(gzf, &wrf, sizeof( wrf ));
- }
+ gotBytes = gzseek(gzf, numverts * 3 * sizeof(float), SEEK_CUR) != -1;
+
// read number of normals
if(gotBytes)
gotBytes = gzread(gzf, &wri, sizeof(wri));
// skip normals
- for(i=0; i<numverts*3 && gotBytes; i++)
- {
- gotBytes = gzread(gzf, &wrf, sizeof( wrf ));
- }
+ gotBytes = gzseek(gzf, numverts * 3 * sizeof(float), SEEK_CUR) != -1;
/* get no. of triangles */
if(gotBytes)
@@ -237,17 +232,10 @@
gotBytes = gzread(gzf, &wri, sizeof(wri));
// read vertex position from file
- mvert = CDDM_get_verts(dm);
- for(i=0; i<numverts; i++)
- {
- MVert *mv = &mvert[i];
+ mv = CDDM_get_verts(dm);
- for(j=0; j<3; j++)
- {
- gotBytes = gzread(gzf, &wrf, sizeof( wrf ));
- mv->co[j] = wrf;
- }
- }
+ for(i=0; i<numverts; i++, mv++)
+ gotBytes = (gzread(gzf, mv->co, sizeof(float) * 3) == sizeof(float) * 3);
// should be the same as numverts
gotBytes = gzread(gzf, &wri, sizeof(wri));
@@ -269,10 +257,10 @@
}
// read normals from file (but don't save them yet)
- for(i=0; i<numverts*3; i++)
+ for(i=0, no_s= normals; i<numverts; i++, no_s += 3)
{
- gotBytes = gzread(gzf, &wrf, sizeof( wrf ));
- normals[i] = (short)(wrf*32767.0f);
+ gotBytes = gzread(gzf, no, sizeof(float) * 3);
+ normal_float_to_short_v3(no_s, no);
}
/* read no. of triangles */
@@ -283,20 +271,17 @@
if(dm)
dm->release(dm);
gzclose( gzf );
+ MEM_freeN(normals);
return NULL;
}
// read triangles from file
- mface = CDDM_get_faces(dm);
- for(i=0; i<numfaces; i++)
+ mf = CDDM_get_faces(dm);
+ for(i=0; i<numfaces; i++, mf++)
{
- int face[4];
- MFace *mf = &mface[i];
+ int face[3];
- gotBytes = gzread(gzf, &(face[0]), sizeof( face[0] ));
- gotBytes = gzread(gzf, &(face[1]), sizeof( face[1] ));
- gotBytes = gzread(gzf, &(face[2]), sizeof( face[2] ));
- face[3] = 0;
+ gotBytes = (gzread(gzf, face, sizeof(int) * 3) == sizeof(int) * 3);
// check if 3rd vertex has index 0 (not allowed in blender)
if(face[2])
@@ -311,7 +296,7 @@
mf->v2 = face[2];
mf->v3 = face[0];
}
- mf->v4 = face[3];
+ mf->v4 = 0;
test_index_face(mf, NULL, 0, 3);
}
More information about the Bf-blender-cvs
mailing list