Revision: 41587
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41587
Author: campbellbarton
Date: 2011-11-06 14:08:04 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
missing files from last commit
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/modifiers/intern/MOD_build.c
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2011-11-06
14:06:43 UTC (rev 41586)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2011-11-06
14:08:04 UTC (rev 41587)
@@ -619,13 +619,13 @@
return pow(rate, dist/width);
}
-static float psys_render_projected_area(ParticleSystem *psys, float *center,
float area, double vprate, float *viewport)
+static float psys_render_projected_area(ParticleSystem *psys, const float
center[3], float area, double vprate, float *viewport)
{
ParticleRenderData *data= psys->renderdata;
float co[4], view[3], ortho1[3], ortho2[3], w, dx, dy, radius;
/* transform to view space */
- VECCOPY(co, center);
+ copy_v3_v3(co, center);
co[3]= 1.0f;
mul_m4_v4(data->viewmat, co);
@@ -829,17 +829,17 @@
b= (origindex)? origindex[a]: a;
if(b != -1) {
- VECCOPY(co1, mvert[mf->v1].co);
- VECCOPY(co2, mvert[mf->v2].co);
- VECCOPY(co3, mvert[mf->v3].co);
+ copy_v3_v3(co1, mvert[mf->v1].co);
+ copy_v3_v3(co2, mvert[mf->v2].co);
+ copy_v3_v3(co3, mvert[mf->v3].co);
- VECADD(facecenter[b], facecenter[b], co1);
- VECADD(facecenter[b], facecenter[b], co2);
- VECADD(facecenter[b], facecenter[b], co3);
+ add_v3_v3(facecenter[b], co1);
+ add_v3_v3(facecenter[b], co2);
+ add_v3_v3(facecenter[b], co3);
if(mf->v4) {
- VECCOPY(co4, mvert[mf->v4].co);
- VECADD(facecenter[b], facecenter[b], co4);
+ copy_v3_v3(co4, mvert[mf->v4].co);
+ add_v3_v3(facecenter[b], co4);
facearea[b] += area_quad_v3(co1, co2, co3, co4);
facetotvert[b] += 4;
}
@@ -998,7 +998,7 @@
/************************************************/
/* Interpolation
*/
/************************************************/
-static float interpolate_particle_value(float v1, float v2, float v3, float
v4, float *w, int four)
+static float interpolate_particle_value(float v1, float v2, float v3, float
v4, const float w[4], int four)
{
float value;
@@ -1029,12 +1029,12 @@
if(dt>0.999f){
key_curve_position_weights(dt-0.001f, t, type);
interp_v3_v3v3v3v3(temp, keys[0].co,
keys[1].co, keys[2].co, keys[3].co, t);
- VECSUB(result->vel, result->co, temp);
+ sub_v3_v3v3(result->vel, result->co, temp);
}
else{
key_curve_position_weights(dt+0.001f, t, type);
interp_v3_v3v3v3v3(temp, keys[0].co,
keys[1].co, keys[2].co, keys[3].co, t);
- VECSUB(result->vel, temp, result->co);
+ sub_v3_v3v3(result->vel, temp, result->co);
}
}
}
@@ -1180,21 +1180,21 @@
}
static void edit_to_particle(ParticleKey *key, PTCacheEditKey *ekey)
{
- VECCOPY(key->co, ekey->co);
+ copy_v3_v3(key->co, ekey->co);
if(ekey->vel) {
- VECCOPY(key->vel, ekey->vel);
+ copy_v3_v3(key->vel, ekey->vel);
}
key->time = *(ekey->time);
}
static void hair_to_particle(ParticleKey *key, HairKey *hkey)
{
- VECCOPY(key->co, hkey->co);
+ copy_v3_v3(key->co, hkey->co);
key->time = hkey->time;
}
static void mvert_to_particle(ParticleKey *key, MVert *mvert, HairKey *hkey)
{
- VECCOPY(key->co, mvert->co);
+ copy_v3_v3(key->co, mvert->co);
key->time = hkey->time;
}
@@ -1473,13 +1473,13 @@
}
}
else {
- VECCOPY(orco, vec);
+ copy_v3_v3(orco, vec);
if(ornor && nor)
- VECCOPY(ornor, nor);
+ copy_v3_v3(ornor, nor);
}
}
}
-void psys_interpolate_uvs(MTFace *tface, int quad, float *w, float *uvco)
+void psys_interpolate_uvs(const MTFace *tface, int quad, const float w[4],
float uvco[2])
{
float v10= tface->uv[0][0];
float v11= tface->uv[0][1];
@@ -1502,7 +1502,7 @@
}
}
-void psys_interpolate_mcol(MCol *mcol, int quad, float *w, MCol *mc)
+void psys_interpolate_mcol(const MCol *mcol, int quad, const float w[4], MCol
*mc)
{
char *cp, *cp1, *cp2, *cp3, *cp4;
@@ -1527,7 +1527,7 @@
}
}
-static float psys_interpolate_value_from_verts(DerivedMesh *dm, short from,
int index, float *fw, float *values)
+static float psys_interpolate_value_from_verts(DerivedMesh *dm, short from,
int index, const float fw[4], const float *values)
{
if(values==0 || index==-1)
return 0.0;
@@ -1543,18 +1543,18 @@
}
}
- return 0.0;
+ return 0.0f;
}
/* conversion of pa->fw to origspace layer coordinates */
-static void psys_w_to_origspace(float *w, float *uv)
+static void psys_w_to_origspace(const float w[4], float uv[2])
{
uv[0]= w[1] + w[2];
uv[1]= w[2] + w[3];
}
/* conversion of pa->fw to weights in face from origspace */
-static void psys_origspace_to_w(OrigSpaceFace *osface, int quad, float *w,
float *neww)
+static void psys_origspace_to_w(OrigSpaceFace *osface, int quad, const float
w[4], float neww[4])
{
float v[4][3], co[3];
@@ -1567,17 +1567,17 @@
if(quad) {
v[3][0]= osface->uv[3][0]; v[3][1]= osface->uv[3][1]; v[3][2]=
0.0f;
- interp_weights_poly_v3( neww,v, 4, co);
+ interp_weights_poly_v3(neww, v, 4, co);
}
else {
- interp_weights_poly_v3( neww,v, 3, co);
+ interp_weights_poly_v3(neww, v, 3, co);
neww[3]= 0.0f;
}
}
/* find the derived mesh face for a particle, set the mf passed. this is slow
* and can be optimized but only for many lookups. returns the face index. */
-int psys_particle_dm_face_lookup(Object *ob, DerivedMesh *dm, int index, float
*fw, struct LinkNode *node)
+int psys_particle_dm_face_lookup(Object *ob, DerivedMesh *dm, int index, const
float fw[4], struct LinkNode *node)
{
Mesh *me= (Mesh*)ob->data;
MFace *mface;
@@ -1644,7 +1644,7 @@
return DMCACHE_NOTFOUND;
}
-static int psys_map_index_on_dm(DerivedMesh *dm, int from, int index, int
index_dmcache, float *fw, float UNUSED(foffset), int *mapindex, float *mapfw)
+static int psys_map_index_on_dm(DerivedMesh *dm, int from, int index, int
index_dmcache, const float fw[4], float UNUSED(foffset), int *mapindex, float
mapfw[4])
{
if(index < 0)
return 0;
@@ -1704,7 +1704,7 @@
}
/* interprets particle data to get a point on a mesh in object space */
-void psys_particle_on_dm(DerivedMesh *dm, int from, int index, int
index_dmcache, float *fw, float foffset, float *vec, float *nor, float *utan,
float *vtan, float *orco, float *ornor)
+void psys_particle_on_dm(DerivedMesh *dm, int from, int index, int
index_dmcache, const float fw[4], float foffset, float vec[3], float nor[3],
float utan[3], float vtan[3], float orco[3], float ornor[3])
{
float tmpnor[3], mapfw[4];
float (*orcodata)[3];
@@ -1732,7 +1732,7 @@
}
if(orco)
- VECCOPY(orco, orcodata[mapindex])
+ copy_v3_v3(orco, orcodata[mapindex]);
if(ornor) {
dm->getVertNo(dm,mapindex,nor);
@@ -1759,11 +1759,11 @@
if(from==PART_FROM_VOLUME) {
psys_interpolate_face(mvert,mface,mtface,orcodata,mapfw,vec,tmpnor,utan,vtan,orco,ornor);
if(nor)
- VECCOPY(nor,tmpnor);
+ copy_v3_v3(nor,tmpnor);
normalize_v3(tmpnor);
mul_v3_fl(tmpnor,-foffset);
- VECADD(vec,vec,tmpnor);
+ add_v3_v3(vec, tmpnor);
}
else
psys_interpolate_face(mvert,mface,mtface,orcodata,mapfw,vec,nor,utan,vtan,orco,ornor);
@@ -1805,22 +1805,22 @@
/* TODO */
float zerovec[3]={0.0f,0.0f,0.0f};
if(vec){
- VECCOPY(vec,zerovec);
+ copy_v3_v3(vec,zerovec);
}
if(nor){
- VECCOPY(nor,zerovec);
+ copy_v3_v3(nor,zerovec);
}
if(utan){
- VECCOPY(utan,zerovec);
+ copy_v3_v3(utan,zerovec);
}
if(vtan){
- VECCOPY(vtan,zerovec);
+ copy_v3_v3(vtan,zerovec);
}
if(orco){
- VECCOPY(orco,zerovec);
+ copy_v3_v3(orco,zerovec);
}
if(ornor){
- VECCOPY(ornor,zerovec);
+ copy_v3_v3(ornor,zerovec);
}
}
/************************************************/
@@ -1990,7 +1990,7 @@
}
else if(inp_z > 0.0f){
mul_v3_v3fl(state_co, z_vec,
(float)sin((float)M_PI/3.f));
- VECADDFAC(state_co,state_co,y_vec,-0.5f);
+ madd_v3_v3fl(state_co, y_vec, -0.5f);
mul_v3_fl(y_vec, -amplitude * (float)cos(t +
(float)M_PI/3.f));
mul_v3_fl(z_vec, amplitude/2.f * (float)cos(2.f*t +
(float)M_PI/6.f));
@@ -2088,7 +2088,7 @@
data = eff->guide_data + p;
- VECSUB(efd.vec_to_point, state.co, eff->guide_loc);
+ sub_v3_v3v3(efd.vec_to_point, state.co, eff->guide_loc);
copy_v3_v3(efd.nor, eff->guide_dir);
efd.distance = len_v3(efd.vec_to_point);
@@ -2142,7 +2142,7 @@
normalize_v3(guidedir);
- VECCOPY(vec_to_point, data->vec_to_point);
+ copy_v3_v3(vec_to_point, data->vec_to_point);
if(guidetime != 0.0f) {
/* curve direction */
@@ -2167,16 +2167,16 @@
}
}
par.co[0] = par.co[1] = par.co[2] = 0.0f;
- VECCOPY(key.co, vec_to_point);
+ copy_v3_v3(key.co, vec_to_point);
do_kink(&key, &par, 0, guidetime, pd->kink_freq,
pd->kink_shape, pd->kink_amp, 0.f, pd->kink, pd->kink_axis, 0, 0);
do_clump(&key, &par, guidetime, pd->clump_fac, pd->clump_pow,
1.0f);
- VECCOPY(vec_to_point, key.co);
+ copy_v3_v3(vec_to_point, key.co);
- VECADD(vec_to_point, vec_to_point, guidevec);
+ add_v3_v3(vec_to_point, guidevec);
- //VECSUB(pa_loc,pa_loc,pa_zero);
- VECADDFAC(effect, effect, vec_to_point, data->strength);
- VECADDFAC(veffect, veffect, guidedir, data->strength);
+ //sub_v3_v3v3(pa_loc,pa_loc,pa_zero);
+ madd_v3_v3fl(effect, vec_to_point, data->strength);
+ madd_v3_v3fl(veffect, guidedir, data->strength);
totstrength += data->strength;
if(pd->flag & PFIELD_GUIDE_PATH_WEIGHT)
@@ -2187,12 +2187,12 @@
if(totstrength > 1.0f)
mul_v3_fl(effect, 1.0f / totstrength);
CLAMP(totstrength, 0.0f, 1.0f);
- //VECADD(effect,effect,pa_zero);
+ //add_v3_v3(effect,pa_zero);
interp_v3_v3v3(state->co, state->co, effect, totstrength);
normalize_v3(veffect);
mul_v3_fl(veffect, len_v3(state->vel));
- VECCOPY(state->vel, veffect);
+ copy_v3_v3(state->vel, veffect);
return 1;
}
return 0;
@@ -2205,15 +2205,15 @@
if(thres != 0.0f)
if((float)fabs((float)(-1.5f+loc[0]+loc[1]+loc[2]))<1.5f*thres)
return;
- VECCOPY(rco,loc);
+ copy_v3_v3(rco,loc);
mul_v3_fl(rco,t);
rough[0]=-1.0f+2.0f*BLI_gTurbulence(size, rco[0], rco[1], rco[2],
2,0,2);
rough[1]=-1.0f+2.0f*BLI_gTurbulence(size, rco[1], rco[2], rco[0],
2,0,2);
rough[2]=-1.0f+2.0f*BLI_gTurbulence(size, rco[2], rco[0], rco[1],
2,0,2);
- VECADDFAC(state->co,state->co,mat[0],fac*rough[0]);
- VECADDFAC(state->co,state->co,mat[1],fac*rough[1]);
- VECADDFAC(state->co,state->co,mat[2],fac*rough[2]);
+ madd_v3_v3fl(state->co, mat[0], fac * rough[0]);
+ madd_v3_v3fl(state->co, mat[1], fac * rough[1]);
+ madd_v3_v3fl(state->co, mat[2], fac * rough[2]);
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
