Revision: 18529
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18529
Author: nicholasbishop
Date: 2009-01-15 22:07:44 +0100 (Thu, 15 Jan 2009)
Log Message:
-----------
Cleaning of the small part of sculpt still in blenkernel, more to come
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/BKE_sculpt.h
branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_sculpt.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_sculpt.h
2009-01-15 18:28:40 UTC (rev 18528)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_sculpt.h
2009-01-15 21:07:44 UTC (rev 18529)
@@ -30,8 +30,6 @@
#ifndef BKE_SCULPT_H
#define BKE_SCULPT_H
-struct MFace;
-struct MVert;
struct NumInput;
struct RadialControl;
struct Scene;
@@ -44,13 +42,6 @@
struct bglMats *mats;
- int multires;
- int totvert;
- int totface;
- struct MVert *mvert;
- struct MFace *mface;
- float *face_normals;
-
/* An array of lists; array is sized as
large as the number of verts in the mesh,
the list for each vert contains the index
Modified: branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-15 18:28:40 UTC (rev 18528)
+++ branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-15 21:07:44 UTC (rev 18529)
@@ -141,10 +141,17 @@
float flip;
int mouse[2];
- /* Truly temporary storage that isn't saved as a property */
+ /* The rest is temporary storage that isn't saved as a property */
+
int first_time; /* Beginning of stroke may do some things special */
- MVert *mvert; /* Can be either Mesh mverts or MultiresDM mverts */
- int totvert; /* Number of mverts */
+
+ /* Mesh data can either come directly from a Mesh, or from a MultiresDM
*/
+ int multires; /* Special handling for multires meshes */
+ MVert *mvert;
+ MFace *mface;
+ int totvert, totface;
+ float *face_normals;
+
float *layer_disps; /* Displacements for each vertex */
float (*mesh_store)[3]; /* Copy of the mesh vertices' locations */
short (*orig_norms)[3]; /* Copy of the mesh vertices' normals */
@@ -177,21 +184,22 @@
{
int i,j;
IndexNode *node= NULL;
+ StrokeCache *cache = ss->cache;
sculpt_vertexusers_free(ss);
/* For efficiency, use vertex_users_mem as a memory pool (may be larger
than necessary if mesh has triangles, but only one alloc is needed.)
*/
- ss->vertex_users= MEM_callocN(sizeof(ListBase) * ss->totvert,
"vertex_users");
- ss->vertex_users_size= ss->totvert;
- ss->vertex_users_mem= MEM_callocN(sizeof(IndexNode)*ss->totface*4,
"vertex_users_mem");
+ ss->vertex_users= MEM_callocN(sizeof(ListBase) * cache->totvert,
"vertex_users");
+ ss->vertex_users_size= cache->totvert;
+ ss->vertex_users_mem= MEM_callocN(sizeof(IndexNode)*cache->totface*4,
"vertex_users_mem");
node= ss->vertex_users_mem;
/* Find the users */
- for(i=0; i<ss->totface; ++i){
- for(j=0; j<(ss->mface[i].v4?4:3); ++j, ++node) {
+ for(i=0; i<cache->totface; ++i){
+ for(j=0; j<(cache->mface[i].v4?4:3); ++j, ++node) {
node->index=i;
- BLI_addtail(&ss->vertex_users[((unsigned
int*)(&ss->mface[i]))[j]], node);
+ BLI_addtail(&ss->vertex_users[((unsigned
int*)(&cache->mface[i]))[j]], node);
}
}
}
@@ -440,7 +448,7 @@
sculpt_axislock(sd, area_normal);
while(node){
- float *co= ss->mvert[node->Index].co;
+ float *co= ss->cache->mvert[node->Index].co;
const float val[3]=
{co[0]+area_normal[0]*node->Fade*ss->cache->scale[0],
co[1]+area_normal[1]*node->Fade*ss->cache->scale[1],
@@ -466,12 +474,12 @@
/* Don't modify corner vertices */
if(ncount==1) {
- VecCopyf(avg, ss->mvert[vert].co);
+ VecCopyf(avg, ss->cache->mvert[vert].co);
return;
}
while(node){
- f= &ss->mface[node->index];
+ f= &ss->cache->mface[node->index];
if(f->v4) {
skip= (f->v1==vert?2:
@@ -482,7 +490,7 @@
for(i=0; i<(f->v4?4:3); ++i) {
if(i != skip && (ncount!=2 ||
BLI_countlist(&ss->vertex_users[(&f->v1)[i]]) <= 2)) {
- VecAddf(avg, avg, ss->mvert[(&f->v1)[i]].co);
+ VecAddf(avg, avg,
ss->cache->mvert[(&f->v1)[i]].co);
++total;
}
}
@@ -493,7 +501,7 @@
if(total>0)
VecMulf(avg, 1.0f / total);
else
- VecCopyf(avg, ss->mvert[vert].co);
+ VecCopyf(avg, ss->cache->mvert[vert].co);
}
static void do_smooth_brush(SculptSession *ss, const ListBase* active_verts)
@@ -501,7 +509,7 @@
ActiveData *node= active_verts->first;
while(node){
- float *co= ss->mvert[node->Index].co;
+ float *co= ss->cache->mvert[node->Index].co;
float avg[3], val[3];
neighbor_average(ss, avg, node->Index);
@@ -519,7 +527,7 @@
ActiveData *node= active_verts->first;
while(node) {
- float *co= ss->mvert[node->Index].co;
+ float *co= ss->cache->mvert[node->Index].co;
const float val[3]=
{co[0]+(ss->cache->location[0]-co[0])*node->Fade,
co[1]+(ss->cache->location[1]-co[1])*node->Fade,
co[2]+(ss->cache->location[2]-co[2])*node->Fade};
@@ -538,7 +546,7 @@
sculpt_axislock(sd, grab_delta);
while(node) {
- float *co= ss->mvert[node->Index].co;
+ float *co= ss->cache->mvert[node->Index].co;
VecCopyf(add, grab_delta);
VecMulf(add, node->Fade);
@@ -563,7 +571,7 @@
if((bstr > 0 && *disp < bstr) ||
(bstr < 0 && *disp > bstr)) {
- float *co= ss->mvert[node->Index].co;
+ float *co= ss->cache->mvert[node->Index].co;
*disp+= node->Fade;
@@ -593,8 +601,8 @@
float add[3];
while(node) {
- float *co= ss->mvert[node->Index].co;
- short *no= ss->mvert[node->Index].no;
+ float *co= ss->cache->mvert[node->Index].co;
+ short *no= ss->cache->mvert[node->Index].no;
add[0]= no[0]/ 32767.0f;
add[1]= no[1]/ 32767.0f;
@@ -630,7 +638,7 @@
co[0] = co[1] = co[2] = 0.0f;
for(i = 0; i < FLATTEN_SAMPLE_SIZE; ++i)
- VecAddf(co, co, ss->mvert[outer[i]->Index].co);
+ VecAddf(co, co, ss->cache->mvert[outer[i]->Index].co);
VecMulf(co, 1.0f / FLATTEN_SAMPLE_SIZE);
}
@@ -645,7 +653,7 @@
calc_flatten_center(ss, node, cntr);
while(node){
- float *co= ss->mvert[node->Index].co;
+ float *co= ss->cache->mvert[node->Index].co;
float p1[3], sub1[3], sub2[3], intr[3], val[3];
/* Find the intersection between squash-plane and vertex (along
the area normal) */
@@ -853,7 +861,7 @@
BLI_addtail(&ss->damaged_rects, rn);
/* Update insides */
- for(i=0; i<ss->totvert; ++i) {
+ for(i=0; i<ss->cache->totvert; ++i) {
if(!ss->projverts[i].inside) {
if(ss->projverts[i].co[0] > rn->r.xmin &&
ss->projverts[i].co[1] > rn->r.ymin &&
ss->projverts[i].co[0] < rn->r.xmax &&
ss->projverts[i].co[1] < rn->r.ymax) {
@@ -915,11 +923,11 @@
/* Build a list of all vertices that are potentially within the brush's
area of influence. Only do this once for the grab brush. */
if((b->sculpt_tool != SCULPT_TOOL_GRAB) || cache->first_time) {
- for(i=0; i<ss->totvert; ++i) {
+ for(i=0; i<cache->totvert; ++i) {
/* Projverts.inside provides a rough bounding box */
- if(ss->multires || ss->projverts[i].inside) {
+ if(cache->multires || ss->projverts[i].inside) {
//vert= ss->vertexcosnos ?
&ss->vertexcosnos[i*6] : a->verts[i].co;
- vert= ss->mvert[i].co;
+ vert= cache->mvert[i].co;
av_dist= VecLenf(ss->cache->location, vert);
if(av_dist < cache->radius) {
adata=
(ActiveData*)MEM_mallocN(sizeof(ActiveData), "ActiveData");
@@ -967,7 +975,7 @@
}
/* Copy the modified vertices from mesh to the active key */
- if(keyblock && !ss->multires) {
+ if(keyblock && !cache->multires) {
float *co= keyblock->data;
if(co) {
if(b->sculpt_tool == SCULPT_TOOL_GRAB)
@@ -981,7 +989,7 @@
}
}
- if(ss->vertexcosnos && !ss->multires)
+ if(ss->vertexcosnos && !cache->multires)
BLI_freelistN(&active_verts);
else {
if(b->sculpt_tool != SCULPT_TOOL_GRAB)
@@ -1053,16 +1061,16 @@
while(face){
float *fn = NULL;
- if(ss->face_normals)
- fn = &ss->face_normals[face->index*3];
- add_face_normal(&norm, ss->mvert,
&ss->mface[face->index], fn);
+ if(ss->cache->face_normals)
+ fn = &ss->cache->face_normals[face->index*3];
+ add_face_normal(&norm, ss->cache->mvert,
&ss->cache->mface[face->index], fn);
face= face->next;
}
Normalize(&norm.x);
- ss->mvert[vert->Index].no[0]=norm.x*32767;
- ss->mvert[vert->Index].no[1]=norm.y*32767;
- ss->mvert[vert->Index].no[2]=norm.z*32767;
+ ss->cache->mvert[vert->Index].no[0]=norm.x*32767;
+ ss->cache->mvert[vert->Index].no[1]=norm.y*32767;
+ ss->cache->mvert[vert->Index].no[2]=norm.z*32767;
}
}
@@ -1081,7 +1089,7 @@
static void projverts_clear_inside(SculptSession *ss)
{
int i;
- for(i = 0; i < ss->totvert; ++i)
+ for(i = 0; i < ss->cache->totvert; ++i)
ss->projverts[i].inside = 0;
}
@@ -1210,25 +1218,25 @@
}
else if(b->sculpt_tool == SCULPT_TOOL_LAYER) {
/*if(!a->layer_disps)
- a->layer_disps= MEM_callocN(sizeof(float)*ss->totvert,"Layer
disps");*/
+ a->layer_disps=
MEM_callocN(sizeof(float)*cache->totvert,"Layer disps");*/
}
if(b->sculpt_tool == SCULPT_TOOL_LAYER || anchored) {
/*if(!a->mesh_store) {
- a->mesh_store= MEM_mallocN(sizeof(vec3f) * ss->totvert,
"Sculpt mesh store");
- for(i = 0; i < ss->totvert; ++i)
- VecCopyf(&a->mesh_store[i].x, ss->mvert[i].co);
+ a->mesh_store= MEM_mallocN(sizeof(vec3f) *
cache->totvert, "Sculpt mesh store");
+ for(i = 0; i < cache->totvert; ++i)
+ VecCopyf(&a->mesh_store[i].x,
cache->mvert[i].co);
}*/
/*if(anchored && a->layer_disps)
- memset(a->layer_disps, 0, sizeof(float) * ss->totvert);*/
+ memset(a->layer_disps, 0, sizeof(float) * cache->totvert);*/
/*if(anchored && !a->orig_norms) {
- a->orig_norms= MEM_mallocN(sizeof(short) * 3 *
ss->totvert, "Sculpt orig norm");
- for(i = 0; i < ss->totvert; ++i) {
- a->orig_norms[i][0] = ss->mvert[i].no[0];
- a->orig_norms[i][1] = ss->mvert[i].no[1];
- a->orig_norms[i][2] = ss->mvert[i].no[2];
+ a->orig_norms= MEM_mallocN(sizeof(short) * 3 *
cache->totvert, "Sculpt orig norm");
+ for(i = 0; i < cache->totvert; ++i) {
+ a->orig_norms[i][0] = cache->mvert[i].no[0];
+ a->orig_norms[i][1] = cache->mvert[i].no[1];
+ a->orig_norms[i][2] = cache->mvert[i].no[2];
}
}*/
}
@@ -1376,10 +1384,10 @@
unsigned i;
if(!ss->projverts)
- ss->projverts =
MEM_mallocN(sizeof(ProjVert)*ss->totvert,"ProjVerts");
+ ss->projverts =
MEM_mallocN(sizeof(ProjVert)*ss->cache->totvert,"ProjVerts");
- for(i=0; i<ss->totvert; ++i) {
- project(ss, ss->vertexcosnos ? &ss->vertexcosnos[i * 6] :
ss->mvert[i].co, ss->projverts[i].co);
+ for(i=0; i<ss->cache->totvert; ++i) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
