Subversion Repositories gelsvn

Rev

Rev 596 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 596 Rev 607
Line 364... Line 364...
364 
        Walker w = m.walker(*hid);
 364 
        Walker w = m.walker(*hid);
365 
        if(fun[w.vertex()] > fun[w.opp().vertex()])
 365 
        if(fun[w.vertex()] > fun[w.opp().vertex()])
366 
            hidvec.push_back(*hid);
 366 
            hidvec.push_back(*hid);
367 
    }
 367 
    }
368
368
369 
    for(int i = 0; i<hidvec.size(); ++i)
 369 
    for(size_t i = 0; i<hidvec.size(); ++i)
370 
    {
 370 
    {
371 
        Walker w = m.walker(hidvec[i]);
 371 
        Walker w = m.walker(hidvec[i]);
372
372
373 
        float b = (fun[w.vertex()]- vmin)/interval;
 373 
        float b = (fun[w.vertex()]- vmin)/interval;
374 
        float a = (fun[w.opp().vertex()] - vmin)/interval;
 374 
        float a = (fun[w.opp().vertex()] - vmin)/interval;
Line 519... Line 519...
519 
    for(VertexIDIterator vid = m.vertices_begin(); vid != m.vertices_end(); ++vid)
 519 
    for(VertexIDIterator vid = m.vertices_begin(); vid != m.vertices_end(); ++vid)
520 
        if(status[*vid]==0)
 520 
        if(status[*vid]==0)
521 
            vid_vec.push_back(*vid);
 521 
            vid_vec.push_back(*vid);
522
522
523 
    random_shuffle(vid_vec.begin(), vid_vec.end());
 523 
    random_shuffle(vid_vec.begin(), vid_vec.end());
524 
    for (int i=0; i<vid_vec.size(); ++i) {
 524 
    for (size_t i=0; i<vid_vec.size(); ++i) {
525 
        FaceID f = m.merge_one_ring(vid_vec[i]);
 525 
        FaceID f = m.merge_one_ring(vid_vec[i]);
526 
        if(f != InvalidFaceID)
 526 
        if(f != InvalidFaceID)
527 
            shortest_edge_triangulate_face(m, f, level_set_id_vertex);
 527 
            shortest_edge_triangulate_face(m, f, level_set_id_vertex);
528 
        else
 528 
        else
529 
            cout << "vertex not removed " << valency(m, vid_vec[i]) << endl;
529 
            cout << "vertex not removed " << valency(m, vid_vec[i]) << endl;
Line 592... Line 592...
592 
                )
 592 
                )
593 
               )
 593 
               )
594 
                hidvec.push_back(w.halfedge());
 594 
                hidvec.push_back(w.halfedge());
595 
        }
 595 
        }
596
596
597 
        for(int i=0;i<hidvec.size(); ++i)
 597 
        for(size_t i=0;i<hidvec.size(); ++i)
598 
        {
 598 
        {
599 
            Walker w = m.walker(hidvec[i]);
 599 
            Walker w = m.walker(hidvec[i]);
600 
            VertexID v = m.split_edge(hidvec[i]);
 600 
            VertexID v = m.split_edge(hidvec[i]);
601 
            level_set_id_vertex[v] = level_set_id[w.halfedge()];
 601 
            level_set_id_vertex[v] = level_set_id[w.halfedge()];
602 
            level_set_id[w.prev().halfedge()] = level_set_id[w.halfedge()];
 602 
            level_set_id[w.prev().halfedge()] = level_set_id[w.halfedge()];