Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/editors/physics/particle_edit.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/physics/particle_edit.c')
-rw-r--r--source/blender/editors/physics/particle_edit.c106
1 files changed, 50 insertions, 56 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 1010c0efce4..ea6f9d4cebb 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -398,41 +398,41 @@ static void PE_set_view3d_data(bContext *C, PEData *data)
/*************************** selection utilities *******************************/
-static int key_test_depth(PEData *data, const float co[3], const int screen_co[2])
+static int key_test_depth(PEData *data, const float co[3])
{
View3D *v3d= data->vc.v3d;
double ux, uy, uz;
float depth;
+ short wco[3], x, y;
/* nothing to do */
if ((v3d->drawtype<=OB_WIRE) || (v3d->flag & V3D_ZBUF_SELECT)==0)
return 1;
- /* used to calculate here but all callers have the screen_co already, so pass as arg */
-#if 0
- if (ED_view3d_project_int_global(data->vc.ar, co, screen_co,
- V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_WIN) != V3D_PROJ_RET_OK)
- {
+ ED_view3d_project_short(data->vc.ar, co, wco);
+
+ if (wco[0] == IS_CLIPPED)
return 0;
- }
-#endif
gluProject(co[0], co[1], co[2], data->mats.modelview, data->mats.projection,
(GLint *)data->mats.viewport, &ux, &uy, &uz);
+ x=wco[0];
+ y=wco[1];
+
#if 0 /* works well but too slow on some systems [#23118] */
- screen_co[0] += (short)data->vc.ar->winrct.xmin;
- screen_co[1] += (short)data->vc.ar->winrct.ymin;
+ x+= (short)data->vc.ar->winrct.xmin;
+ y+= (short)data->vc.ar->winrct.ymin;
/* PE_set_view3d_data calls this. no need to call here */
/* view3d_validate_backbuf(&data->vc); */
- glReadPixels(screen_co[0], screen_co[1], 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
+ glReadPixels(x, y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
#else /* faster to use depths, these are calculated in PE_set_view3d_data */
{
ViewDepths *vd = data->vc.rv3d->depths;
assert(vd && vd->depths);
/* we know its not clipped */
- depth = vd->depths[screen_co[1] * vd->w + screen_co[0]];
+ depth= vd->depths[y * vd->w + x];
}
#endif
@@ -445,21 +445,21 @@ static int key_test_depth(PEData *data, const float co[3], const int screen_co[2
static int key_inside_circle(PEData *data, float rad, const float co[3], float *distance)
{
float dx, dy, dist;
- int screen_co[2];
+ int sco[2];
- /* TODO, should this check V3D_PROJ_TEST_CLIP_BB too? */
- if (ED_view3d_project_int_global(data->vc.ar, co, screen_co, V3D_PROJ_TEST_CLIP_WIN) != V3D_PROJ_RET_OK) {
+ ED_view3d_project_int(data->vc.ar, co, sco);
+
+ if (sco[0] == IS_CLIPPED)
return 0;
- }
-
- dx= data->mval[0] - screen_co[0];
- dy= data->mval[1] - screen_co[1];
+
+ dx= data->mval[0] - sco[0];
+ dy= data->mval[1] - sco[1];
dist= sqrt(dx*dx + dy*dy);
if (dist > rad)
return 0;
- if (key_test_depth(data, co, screen_co)) {
+ if (key_test_depth(data, co)) {
if (distance)
*distance=dist;
@@ -471,16 +471,17 @@ static int key_inside_circle(PEData *data, float rad, const float co[3], float *
static int key_inside_rect(PEData *data, const float co[3])
{
- int screen_co[2];
+ int sco[2];
+
+ ED_view3d_project_int(data->vc.ar, co, sco);
- if (ED_view3d_project_int_global(data->vc.ar, co, screen_co, V3D_PROJ_TEST_CLIP_WIN) != V3D_PROJ_RET_OK) {
+ if (sco[0] == IS_CLIPPED)
return 0;
- }
- if (screen_co[0] > data->rect->xmin && screen_co[0] < data->rect->xmax &&
- screen_co[1] > data->rect->ymin && screen_co[1] < data->rect->ymax)
+ if (sco[0] > data->rect->xmin && sco[0] < data->rect->xmax &&
+ sco[1] > data->rect->ymin && sco[1] < data->rect->ymax)
{
- return key_test_depth(data, co, screen_co);
+ return key_test_depth(data, co);
}
return 0;
@@ -1633,7 +1634,7 @@ int PE_circle_select(bContext *C, int selecting, const int mval[2], float rad)
/************************ lasso select operator ************************/
-int PE_lasso_select(bContext *C, const int mcords[][2], const short moves, short extend, short select)
+int PE_lasso_select(bContext *C, int mcords[][2], short moves, short extend, short select)
{
Scene *scene= CTX_data_scene(C);
Object *ob= CTX_data_active_object(C);
@@ -1644,7 +1645,7 @@ int PE_lasso_select(bContext *C, const int mcords[][2], const short moves, short
ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
POINT_P; KEY_K;
float co[3], mat[4][4]= MAT4_UNITY;
- int screen_co[2];
+ int vertco[2];
PEData data;
@@ -1665,9 +1666,9 @@ int PE_lasso_select(bContext *C, const int mcords[][2], const short moves, short
LOOP_KEYS {
copy_v3_v3(co, key->co);
mul_m4_v3(mat, co);
- if ((ED_view3d_project_int_global(ar, co, screen_co, V3D_PROJ_TEST_CLIP_WIN) == V3D_PROJ_RET_OK) &&
- BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], IS_CLIPPED) &&
- key_test_depth(&data, co, screen_co))
+ ED_view3d_project_int(ar, co, vertco);
+ if (BLI_lasso_is_point_inside(mcords, moves, vertco[0], vertco[1], IS_CLIPPED) &&
+ key_test_depth(&data, co))
{
if (select && !(key->flag & PEK_SELECT)) {
key->flag |= PEK_SELECT;
@@ -1685,9 +1686,9 @@ int PE_lasso_select(bContext *C, const int mcords[][2], const short moves, short
copy_v3_v3(co, key->co);
mul_m4_v3(mat, co);
- if ((ED_view3d_project_int_global(ar, co, screen_co, V3D_PROJ_TEST_CLIP_WIN) == V3D_PROJ_RET_OK) &&
- BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], IS_CLIPPED) &&
- key_test_depth(&data, co, screen_co))
+ ED_view3d_project_int(ar, co, vertco);
+ if (BLI_lasso_is_point_inside(mcords, moves, vertco[0], vertco[1], IS_CLIPPED) &&
+ key_test_depth(&data, co))
{
if (select && !(key->flag & PEK_SELECT)) {
key->flag |= PEK_SELECT;
@@ -2788,7 +2789,7 @@ static void brush_cut(PEData *data, int pa_index)
float rad2, cut_time= 1.0;
float x0, x1, v0, v1, o0, o1, xo0, xo1, d, dv;
int k, cut, keys= (int)pow(2.0, (double)pset->draw_step);
- int screen_co[2];
+ int vertco[2];
/* blunt scissors */
if (BLI_frand() > data->cutfac) return;
@@ -2797,15 +2798,13 @@ static void brush_cut(PEData *data, int pa_index)
if (edit->points[pa_index].flag & PEP_HIDE)
return;
- if (ED_view3d_project_int_global(ar, key->co, screen_co, V3D_PROJ_TEST_NOP) != V3D_PROJ_RET_OK)
- return;
-
rad2= data->rad * data->rad;
cut=0;
- x0 = (float)screen_co[0];
- x1 = (float)screen_co[1];
+ ED_view3d_project_int_noclip(ar, key->co, vertco);
+ x0= (float)vertco[0];
+ x1= (float)vertco[1];
o0= (float)data->mval[0];
o1= (float)data->mval[1];
@@ -2814,27 +2813,26 @@ static void brush_cut(PEData *data, int pa_index)
xo1= x1 - o1;
/* check if root is inside circle */
- if (xo0*xo0 + xo1*xo1 < rad2 && key_test_depth(data, key->co, screen_co)) {
+ if (xo0*xo0 + xo1*xo1 < rad2 && key_test_depth(data, key->co)) {
cut_time= -1.0f;
cut= 1;
}
else {
/* calculate path time closest to root that was inside the circle */
for (k=1, key++; k<=keys; k++, key++) {
+ ED_view3d_project_int_noclip(ar, key->co, vertco);
- if ((ED_view3d_project_int_global(ar, key->co, screen_co, V3D_PROJ_TEST_NOP) != V3D_PROJ_RET_OK) ||
- key_test_depth(data, key->co, screen_co) == 0)
- {
- x0 = (float)screen_co[0];
- x1 = (float)screen_co[1];
+ if (key_test_depth(data, key->co) == 0) {
+ x0= (float)vertco[0];
+ x1= (float)vertco[1];
xo0= x0 - o0;
xo1= x1 - o1;
continue;
}
- v0 = (float)screen_co[0] - x0;
- v1 = (float)screen_co[1] - x1;
+ v0= (float)vertco[0] - x0;
+ v1= (float)vertco[1] - x1;
dv= v0*v0 + v1*v1;
@@ -2859,8 +2857,8 @@ static void brush_cut(PEData *data, int pa_index)
}
}
- x0 = (float)screen_co[0];
- x1 = (float)screen_co[1];
+ x0= (float)vertco[0];
+ x1= (float)vertco[1];
xo0= x0 - o0;
xo1= x1 - o1;
@@ -3989,9 +3987,7 @@ void PE_undo_step(Scene *scene, int step)
}
else if (step==1) {
- if (edit->curundo==NULL || edit->curundo->prev==NULL) {
- /* pass */
- }
+ if (edit->curundo==NULL || edit->curundo->prev==NULL);
else {
if (G.debug & G_DEBUG) printf("undo %s\n", edit->curundo->name);
edit->curundo= edit->curundo->prev;
@@ -4001,9 +3997,7 @@ void PE_undo_step(Scene *scene, int step)
else {
/* curundo has to remain current situation! */
- if (edit->curundo==NULL || edit->curundo->next==NULL) {
- /* pass */
- }
+ if (edit->curundo==NULL || edit->curundo->next==NULL);
else {
get_PTCacheUndo(edit, edit->curundo->next);
edit->curundo= edit->curundo->next;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 13:36:46 +0300