griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

spelling cleanup: tesselate -> tessellate (last of these found)

Browse Source
This commit is contained in:
Campbell Barton
2012-03-20 22:56:26 +00:00
parent 6193c47c39
commit 303cecf139
20 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_DerivedMesh.h
View File

@@ -455,7 +455,7 @@ int DM_release(DerivedMesh *dm);
void DM_to_mesh(DerivedMesh *dm, struct Mesh *me, struct Object *ob);
struct BMEditMesh *DM_to_editbmesh(struct DerivedMesh *dm,
struct BMEditMesh *existing, int do_tesselate);
struct BMEditMesh *existing, int do_tessellate);
/* conversion to bmesh only */
void DM_to_bmesh_ex(struct DerivedMesh *dm, struct BMesh *bm);

2
source/blender/blenkernel/BKE_tessmesh.h
View File

@@ -85,7 +85,7 @@ typedef struct BMEditMesh {
#define BMESH_EM_UNDO_RECALC_TESSFACE_WORKAROUND
void BMEdit_RecalcTessellation(BMEditMesh *tm);
BMEditMesh *BMEdit_Create(BMesh *bm, int do_tesselate);
BMEditMesh *BMEdit_Create(BMesh *bm, int do_tessellate);
BMEditMesh *BMEdit_Copy(BMEditMesh *tm);
BMEditMesh *BMEdit_FromObject(struct Object *ob);
void BMEdit_Free(BMEditMesh *em);

12
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -384,8 +384,8 @@ void DM_ensure_tessface(DerivedMesh *dm)
}
}
/* Update tessface CD data from loop/poly ones. Needed when not retesselating after modstack evaluation. */
/* NOTE: Assumes dm has valid tesselated data! */
/* Update tessface CD data from loop/poly ones. Needed when not retessellating after modstack evaluation. */
/* NOTE: Assumes dm has valid tessellated data! */
void DM_update_tessface_data(DerivedMesh *dm)
{
MFace *mf = dm->getTessFaceArray(dm);
@@ -522,7 +522,7 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob)
}
}
/* yes, must be before _and_ after tesselate */
/* yes, must be before _and_ after tessellate */
mesh_update_customdata_pointers(&tmp, TRUE);
BKE_mesh_tessface_calc(&tmp);
@@ -1350,7 +1350,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
Mesh *me = ob->data;
ModifierData *firstmd, *md, *previewmd = NULL;
LinkNode *datamasks, *curr;
/* XXX Always copying POLYINDEX, else tesselated data are no more valid! */
/* XXX Always copying POLYINDEX, else tessellated data are no more valid! */
CustomDataMask mask, nextmask, append_mask = CD_MASK_POLYINDEX;
float (*deformedVerts)[3] = NULL;
DerivedMesh *dm=NULL, *orcodm, *clothorcodm, *finaldm;
@@ -1780,10 +1780,10 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
{
finaldm->recalcTessellation(finaldm);
}
/* Even if tesselation is not needed, some modifiers migh have modified CD layers
/* Even if tessellation is not needed, some modifiers migh have modified CD layers
* (like mloopcol or mloopuv), hence we have to update those. */
else if (finaldm->dirty & DM_DIRTY_TESS_CDLAYERS) {
/* A tesselation already exists, it should always have a CD_POLYINDEX. */
/* A tessellation already exists, it should always have a CD_POLYINDEX. */
BLI_assert(CustomData_has_layer(&finaldm->faceData, CD_POLYINDEX));
DM_update_tessface_data(finaldm);
}

2
source/blender/blenkernel/intern/bvhutils.c
View File

@@ -524,7 +524,7 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float
int numFaces= mesh->getNumTessFaces(mesh);
/* BMESH spesific check that we have tessfaces,
* we _could_ tesselate here but rather not - campbell
* we _could_ tessellate here but rather not - campbell
*
* this assert checks we have tessfaces,
* if not caller should use DM_ensure_tessface() */

38
source/blender/blenkernel/intern/displist.c
View File

@@ -686,10 +686,10 @@ void makeDispListMBall_forRender(Scene *scene, Object *ob, ListBase *dispbase)
object_deform_mball(ob, dispbase);
}
static ModifierData *curve_get_tesselate_point(Scene *scene, Object *ob, int forRender, int editmode)
static ModifierData *curve_get_tessellate_point(Scene *scene, Object *ob, int forRender, int editmode)
{
ModifierData *md = modifiers_getVirtualModifierList(ob);
ModifierData *preTesselatePoint;
ModifierData *pretessellatePoint;
int required_mode;
if(forRender) required_mode = eModifierMode_Render;
@@ -697,32 +697,32 @@ static ModifierData *curve_get_tesselate_point(Scene *scene, Object *ob, int for
if(editmode) required_mode |= eModifierMode_Editmode;
preTesselatePoint = NULL;
pretessellatePoint = NULL;
for (; md; md=md->next) {
ModifierTypeInfo *mti = modifierType_getInfo(md->type);
if (!modifier_isEnabled(scene, md, required_mode)) continue;
if (mti->type == eModifierTypeType_Constructive) return preTesselatePoint;
if (mti->type == eModifierTypeType_Constructive) return pretessellatePoint;
if (ELEM3(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) {
preTesselatePoint = md;
pretessellatePoint = md;
/* this modifiers are moving point of tessellation automatically
* (some of them even can't be applied on tessellated curve), set flag
* for incformation button in modifier's header */
md->mode |= eModifierMode_ApplyOnSpline;
} else if(md->mode&eModifierMode_ApplyOnSpline) {
preTesselatePoint = md;
pretessellatePoint = md;
}
}
return preTesselatePoint;
return pretessellatePoint;
}
static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, float (**originalVerts_r)[3], float (**deformedVerts_r)[3], int *numVerts_r)
{
ModifierData *md = modifiers_getVirtualModifierList(ob);
ModifierData *preTesselatePoint;
ModifierData *pretessellatePoint;
Curve *cu= ob->data;
ListBase *nurb= BKE_curve_nurbs(cu);
int numVerts = 0;
@@ -735,7 +735,7 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, fl
if(forRender) required_mode = eModifierMode_Render;
else required_mode = eModifierMode_Realtime;
preTesselatePoint = curve_get_tesselate_point(scene, ob, forRender, editmode);
pretessellatePoint = curve_get_tessellate_point(scene, ob, forRender, editmode);
if(editmode) required_mode |= eModifierMode_Editmode;
@@ -753,7 +753,7 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, fl
}
}
if (preTesselatePoint) {
if (pretessellatePoint) {
for (; md; md=md->next) {
ModifierTypeInfo *mti = modifierType_getInfo(md->type);
@@ -770,7 +770,7 @@ static void curve_calc_modifiers_pre(Scene *scene, Object *ob, int forRender, fl
mti->deformVerts(md, ob, NULL, deformedVerts, numVerts, forRender, editmode);
if (md==preTesselatePoint)
if (md==pretessellatePoint)
break;
}
}
@@ -826,7 +826,7 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
DerivedMesh **derivedFinal, int forRender, float (*originalVerts)[3], float (*deformedVerts)[3])
{
ModifierData *md = modifiers_getVirtualModifierList(ob);
ModifierData *preTesselatePoint;
ModifierData *pretessellatePoint;
Curve *cu= ob->data;
ListBase *nurb= BKE_curve_nurbs(cu);
int required_mode = 0, totvert = 0;
@@ -838,12 +838,12 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
if(forRender) required_mode = eModifierMode_Render;
else required_mode = eModifierMode_Realtime;
preTesselatePoint = curve_get_tesselate_point(scene, ob, forRender, editmode);
pretessellatePoint = curve_get_tessellate_point(scene, ob, forRender, editmode);
if(editmode) required_mode |= eModifierMode_Editmode;
if (preTesselatePoint) {
md = preTesselatePoint->next;
if (pretessellatePoint) {
md = pretessellatePoint->next;
}
if (derivedFinal && *derivedFinal) {
@@ -1037,7 +1037,7 @@ static void curve_calc_orcodm(Scene *scene, Object *ob, DerivedMesh *derivedFina
/* for displist-based objects */
ModifierData *md = modifiers_getVirtualModifierList(ob);
ModifierData *preTesselatePoint;
ModifierData *pretessellatePoint;
Curve *cu= ob->data;
int required_mode;
int editmode = (!forRender && cu->editnurb);
@@ -1046,12 +1046,12 @@ static void curve_calc_orcodm(Scene *scene, Object *ob, DerivedMesh *derivedFina
if(forRender) required_mode = eModifierMode_Render;
else required_mode = eModifierMode_Realtime;
preTesselatePoint = curve_get_tesselate_point(scene, ob, forRender, editmode);
pretessellatePoint = curve_get_tessellate_point(scene, ob, forRender, editmode);
if(editmode) required_mode |= eModifierMode_Editmode;
if (preTesselatePoint) {
md = preTesselatePoint->next;
if (pretessellatePoint) {
md = pretessellatePoint->next;
}
for (; md; md=md->next) {

4
source/blender/blenkernel/intern/editderivedmesh.c
View File

@@ -69,12 +69,12 @@
extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
BMEditMesh *BMEdit_Create(BMesh *bm, int do_tesselate)
BMEditMesh *BMEdit_Create(BMesh *bm, int do_tessellate)
{
BMEditMesh *tm = MEM_callocN(sizeof(BMEditMesh), __func__);
tm->bm = bm;
if (do_tesselate) {
if (do_tessellate) {
BMEdit_RecalcTessellation(tm);
}

6
source/blender/blenkernel/intern/modifiers_bmesh.c
View File

@@ -137,7 +137,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm)
/* converts a cddm to a BMEditMesh. if existing is non-NULL, the
* new geometry will be put in there.*/
BMEditMesh *DM_to_editbmesh(DerivedMesh *dm, BMEditMesh *existing, int do_tesselate)
BMEditMesh *DM_to_editbmesh(DerivedMesh *dm, BMEditMesh *existing, int do_tessellate)
{
BMEditMesh *em = existing;
BMesh *bm;
@@ -152,10 +152,10 @@ BMEditMesh *DM_to_editbmesh(DerivedMesh *dm, BMEditMesh *existing, int do_tessel
DM_to_bmesh_ex(dm, bm);
if (!em) {
em = BMEdit_Create(bm, do_tesselate);
em = BMEdit_Create(bm, do_tessellate);
}
else {
if (do_tesselate) {
if (do_tessellate) {
BMEdit_RecalcTessellation(em);
}
}

2
source/blender/blenkernel/intern/subsurf_ccg.c
View File

@@ -2931,7 +2931,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
ccgSubSurf_getNumFinalFaces(ss));
}
/* We absolutely need that layer, else it's no valid tesselated data! */
/* We absolutely need that layer, else it's no valid tessellated data! */
polyidx = CustomData_add_layer(&ccgdm->dm.faceData, CD_POLYINDEX, CD_CALLOC,
NULL, ccgSubSurf_getNumFinalFaces(ss));

2
source/blender/blenloader/intern/readfile.c
View File

@@ -3694,7 +3694,7 @@ static void lib_link_mesh(FileData *fd, Main *main)
}
/*
* Re-tesselate, even if the polys were just created from tessfaces, this
* Re-tessellate, even if the polys were just created from tessfaces, this
* is important because it:
* - fill the CD_POLYINDEX layer
* - gives consistency of tessface between loading from a file and

2
source/blender/bmesh/intern/bmesh_opdefines.c
View File

@@ -700,7 +700,7 @@ static BMOpDefine bmo_esubd_def = {
{BMO_OP_SLOT_INT, "quadcornertype"}, //quad corner type, see bmesh_operators.h
{BMO_OP_SLOT_BOOL, "gridfill"}, //fill in fully-selected faces with a grid
{BMO_OP_SLOT_BOOL, "singleedge"}, //tesselate the case of one edge selected in a quad or triangle
{BMO_OP_SLOT_BOOL, "singleedge"}, //tessellate the case of one edge selected in a quad or triangle
{0} /* null-terminating sentine */,
},

8
source/blender/python/mathutils/mathutils_geometry.c
View File

@@ -1023,8 +1023,8 @@ static PyObject *M_Geometry_interpolate_bezier(PyObject *UNUSED(self), PyObject
}
PyDoc_STRVAR(M_Geometry_tesselate_polygon_doc,
".. function:: tesselate_polygon(veclist_list)\n"
PyDoc_STRVAR(M_Geometry_tessellate_polygon_doc,
".. function:: tessellate_polygon(veclist_list)\n"
"\n"
" Takes a list of polylines (each point a vector) and returns the point indices for a polyline filled with triangles.\n"
"\n"
@@ -1032,7 +1032,7 @@ PyDoc_STRVAR(M_Geometry_tesselate_polygon_doc,
" :rtype: list\n"
);
/* PolyFill function, uses Blenders scanfill to fill multiple poly lines */
static PyObject *M_Geometry_tesselate_polygon(PyObject *UNUSED(self), PyObject *polyLineSeq)
static PyObject *M_Geometry_tessellate_polygon(PyObject *UNUSED(self), PyObject *polyLineSeq)
{
PyObject *tri_list; /*return this list of tri's */
PyObject *polyLine, *polyVec;
@@ -1280,7 +1280,7 @@ static PyMethodDef M_Geometry_methods[] = {
{"barycentric_transform", (PyCFunction) M_Geometry_barycentric_transform, METH_VARARGS, M_Geometry_barycentric_transform_doc},
#ifndef MATH_STANDALONE
{"interpolate_bezier", (PyCFunction) M_Geometry_interpolate_bezier, METH_VARARGS, M_Geometry_interpolate_bezier_doc},
{"tesselate_polygon", (PyCFunction) M_Geometry_tesselate_polygon, METH_O, M_Geometry_tesselate_polygon_doc},
{"tessellate_polygon", (PyCFunction) M_Geometry_tessellate_polygon, METH_O, M_Geometry_tessellate_polygon_doc},
{"box_pack_2d", (PyCFunction) M_Geometry_box_pack_2d, METH_O, M_Geometry_box_pack_2d_doc},
#endif
{NULL, NULL, 0, NULL}

4
source/gameengine/Ketsji/KX_Dome.cpp
View File

@@ -732,8 +732,8 @@ void KX_Dome::CreateMeshDome250(void)
m_radangle = m_angle * M_PI/180.0;//calculates the radians angle, used for flattening
/*
* verts_height is the exactly needed height of the cube faces (not always 1.0).
* When we want some horizontal information (e.g. for horizontal 220deg domes) we don't need to create and tesselate the whole cube.
* Therefore the lateral cube faces could be small, and the tesselate mesh would be completely used.
* When we want some horizontal information (e.g. for horizontal 220deg domes) we don't need to create and tessellate the whole cube.
* Therefore the lateral cube faces could be small, and the tessellate mesh would be completely used.
* (if we always worked with verts_height = 1.0, we would be discarding a lot of the calculated and tessellated geometry).
*
* So I came out with this formula:

2
source/gameengine/Ketsji/KX_Dome.h
View File

@@ -163,7 +163,7 @@ protected:
int m_numfaces; // 4 to 6 depending on the kind of dome image
int m_numimages; //numfaces +1 if we have warp mesh
short m_resolution; //resolution to tesselate the mesh
short m_resolution; //resolution to tessellate the mesh
short m_mode; // the mode (truncated, warped, panoramic,...)
short m_angle; //the angle of the fisheye
float m_radangle; //the angle of the fisheye in radians