fiddlerwoaroof/crawl - Change QNDI5MFPHZZXZOJFF2IELF2LIHWVY2HGFRCJWYEFN4WL4ICYZUYQC

Replace quadrants by signs.

Created by Robert Vollmert on October 14, 2009

QNDI5MFPHZZXZOJFF2IELF2LIHWVY2HGFRCJWYEFN4WL4ICYZUYQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/ray.h at line 9 [4.47173]
B:BD[4.47508] → [4.47508:47509]
B:BD[4.47509] → [5.2946:3045]
```
// quadrant
enum quad_type
{
    QUAD_SE = 0,
    QUAD_SW = 1,
    QUAD_NW = 2,
    QUAD_NE = 3
};
```
Replacement in crawl-ref/source/ray.h at line 24 [4.47173]
B:BD[4.47586] → [5.3195:3219]
```
    quad_type quadrant;
```
[4.47586]
[6.3018]
```
    int quadx;
    int quady;
```

Replacement in crawl-ref/source/ray.h at line 30 [4.47173]

B:BD[7.3014] → [5.3220:3285]

            quad_type quadrant = QUAD_SE, int fullray_idx = -1);

[7.3014]

[8.2945]

            int quadx = 1, int quady = 1, int fullray_idx = -1);

Replacement in crawl-ref/source/ray.h at line 49 [4.47173]
∅:D[9.2957] → [5.3447:3477]
B:BD[4.48202] → [5.3447:3477]
```
    adv_type raw_advance_0();
```
[9.2957]
[10.2971]
```
    adv_type raw_advance_pos();
```

Replacement in crawl-ref/source/ray.cc at line 21 [11.3349]

B:BD[11.5912] → [5.3508:3579]

∅:D[5.3579] → [7.3192:3258]

B:BD[7.3192] → [7.3192:3258]

ray_def::ray_def(double ax, double ay, double s, quad_type q, int idx)
    : accx(ax), accy(ay), slope(s), quadrant(q), fullray_idx(idx)

[11.5912]

[8.3097]

ray_def::ray_def(double ax, double ay, double s, int qx, int qy, int idx)
    : accx(ax), accy(ay), slope(s), quadx(qx), quady(qy), fullray_idx(idx)

Deletion in crawl-ref/source/ray.cc at line 86 [11.3349]

B:BD[11.7134] → [5.3580:3613]

∅:D[5.3613] → [11.7225:7231]

B:BD[11.7225] → [11.7225:7231]

B:BD[11.7231] → [5.3614:3849]

∅:D[5.3849] → [11.7290:7297]

B:BD[11.7290] → [11.7290:7297]

    quad_type bouncequad[4][3] =
    {
    //    ADV_X    ADV_Y    ADV_XY
        { QUAD_SW, QUAD_NE, QUAD_NW }, // QUAD_SE
        { QUAD_SE, QUAD_NW, QUAD_NE }, // QUAD_SW
        { QUAD_NE, QUAD_SW, QUAD_SE }, // QUAD_NW
        { QUAD_NW, QUAD_SE, QUAD_SW }  // QUAD_NE
    };

Replacement in crawl-ref/source/ray.cc at line 96 [11.3349]

B:BD[12.3541] → [5.3885:3961]

∅:D[5.3961] → [11.7723:7777]

B:BD[11.7723] → [11.7723:7777]

        quadrant = bouncequad[quadrant][ADV_XY];
    else if (rc != ADV_XY)
        quadrant = bouncequad[quadrant][rc];
    else

[12.3541]

[11.7777]

    {
        quadx = -quadx;
        quady = -quady;
    }
    else if (rc == ADV_X)
        quadx = -quadx;
    else if (rc == ADV_Y)
        quady = -quady;
    else // rc == ADV_XY

Replacement in crawl-ref/source/ray.cc at line 108 [11.3349]

∅:D[5.3998] → [11.7873:7922]

B:BD[11.7873] → [11.7873:7922]

            quadrant = bouncequad[quadrant][rc];

[5.3998]

[5.3999]

        {
            quadx = -quadx;
            quady = -quady;
        }

Replacement in crawl-ref/source/ray.cc at line 113 [11.3349]
B:BD[5.4027] → [5.4027:4079]
```
            quadrant = bouncequad[quadrant][ADV_Y];
```
[5.4027]
[11.8000]
```
            quady = -quady;
```
Replacement in crawl-ref/source/ray.cc at line 115 [11.3349]
B:BD[11.8013] → [5.4080:4132]
```
            quadrant = bouncequad[quadrant][ADV_X];
```
[11.8013]
[11.8061]
```
            quadx = -quadx;
```

Replacement in crawl-ref/source/ray.cc at line 124 [11.3349]

B:BD[11.8209] → [11.8209:8215]

B:BD[11.8215] → [5.4133:4189]

∅:D[5.4189] → [11.8259:8333]

B:BD[11.8259] → [11.8259:8333]

    {
        if (quadrant == QUAD_NW || quadrant == QUAD_NE)
            return (90.0);
        else
            return (270.0);
    }

[11.8209]

[11.8333]

        return (quadx < 0 ? 90.0 : 270.0);

Replacement in crawl-ref/source/ray.cc at line 126 [11.3349]

B:BD[11.8369] → [11.8369:8375]

B:BD[11.8375] → [5.4190:4246]

∅:D[5.4246] → [11.8419:8493]

B:BD[11.8419] → [11.8419:8493]

B:BD[11.8493] → [5.4247:4308]

    {
        if (quadrant == QUAD_SE || quadrant == QUAD_NE)
            return (0.0);
        else
            return (180.0);
    }
    double deg = atan(slope) * 180.0 / M_PI; // 0 < deg < 90

[11.8369]

[11.8538]

        return (quady > 0 ? 0.0  : 180.0);

Replacement in crawl-ref/source/ray.cc at line 128 [11.3349]
B:BD[11.8539] → [11.8539:8567]
B:BD[11.8567] → [5.4309:4327]
∅:D[5.4327] → [11.8579:8609]
B:BD[11.8579] → [11.8579:8609]
B:BD[11.8609] → [5.4328:4346]
∅:D[5.4346] → [11.8622:8652]
B:BD[11.8622] → [11.8622:8652]
B:BD[11.8652] → [5.4347:4365]
∅:D[5.4365] → [11.8665:8695]
B:BD[11.8665] → [11.8665:8695]
B:BD[11.8695] → [5.4366:4397]
∅:D[5.4397] → [11.8708:8736]
B:BD[11.8708] → [11.8708:8736]
```
    switch (quadrant)
    {
    case QUAD_SE:
        return (360.0 - deg);
    case QUAD_SW:
        return (180.0 + deg);
    case QUAD_NW:
        return (180.0 - deg);
    case QUAD_NE:
    default:
        return (deg);
    }
```
[11.8539]
[11.8795]
```
    // 0 < deg < 90
    double deg = atan(slope) * 180.0 / M_PI;
    if (quadx < 0)
        deg = 180.0 - deg;
    if (quady < 0)
        deg = 360.0 - deg;
    return (deg);
```
Deletion in crawl-ref/source/ray.cc at line 143 [11.3349]
B:BD[11.8929] → [11.8929:8975]
```
    double _slope = tan(deg / 180.0 * M_PI);
```
Replacement in crawl-ref/source/ray.cc at line 144 [11.3349]
B:BD[11.8976] → [11.8976:9008]
```
    if (double_is_zero(_slope))
```
[11.8976]
[11.9008]
```
    if (deg > 180.0)
```

Replacement in crawl-ref/source/ray.cc at line 146 [11.3349]

B:BD[11.9014] → [11.9014:9075]

B:BD[11.9075] → [5.4398:4430]

∅:D[5.4430] → [11.9115:9128]

B:BD[11.9115] → [11.9115:9128]

B:BD[11.9128] → [5.4431:4463]

        slope = 0.0;
        if (deg < 90.0 || deg > 270.0)
            quadrant = QUAD_SE;
        else
            quadrant = QUAD_SW;

[11.9014]

[11.9167]

        quady = -1;
        deg = 360 - deg;

Replacement in crawl-ref/source/ray.cc at line 149 [11.3349]
B:BD[11.9173] → [11.9173:9198]
```
    else if (_slope > 0)
```
[11.9173]
[11.9198]
```
    if (deg > 90.0)
```

Replacement in crawl-ref/source/ray.cc at line 151 [11.3349]

B:BD[11.9204] → [11.9204:9271]

B:BD[11.9271] → [5.4464:4496]

∅:D[5.4496] → [11.9297:9310]

B:BD[11.9297] → [11.9297:9310]

B:BD[11.9310] → [5.4497:4529]

∅:D[5.4529] → [11.9336:9420]

B:BD[11.9336] → [11.9336:9420]

B:BD[11.9420] → [5.4530:4562]

∅:D[5.4562] → [11.9446:9459]

B:BD[11.9446] → [11.9446:9459]

B:BD[11.9459] → [5.4563:4595]

        slope = _slope;
        if (deg >= 180.0 && deg <= 270.0)
            quadrant = QUAD_SW;
        else
            quadrant = QUAD_NE;
    }
    else
    {
        slope = -_slope;
        if (deg >= 90 && deg <= 180)
            quadrant = QUAD_NW;
        else
            quadrant = QUAD_SE;

[11.9204]

[11.9485]

        quadx = -1;
        deg = 180 - deg;

Insertion in crawl-ref/source/ray.cc at line 155 [11.3349]

[11.9492]

    slope = tan(deg / 180.0 * M_PI);
    if (double_is_zero(slope))
        slope = 0.0;

Replacement in crawl-ref/source/ray.cc at line 164 [11.3349]
B:BD[11.9569] → [5.4596:4668]
∅:D[5.4668] → [11.9611:9650]
B:BD[11.9611] → [11.9611:9650]
```
    quad_type opp_quadrant[4] = { QUAD_NW, QUAD_NE, QUAD_SE, QUAD_SW };
    quadrant = opp_quadrant[quadrant];
```
[11.9569]
[11.9650]
```
    quadx = -quadx; quady= -quady;
```
Replacement in crawl-ref/source/ray.cc at line 166 [11.3349]
B:BD[11.9670] → [11.9670:9709]
```
    quadrant = opp_quadrant[quadrant];
```
[11.9670]
[11.9709]
```
    quadx = -quadx; quady= -quady;
```
Replacement in crawl-ref/source/ray.cc at line 204 [11.3349]
B:BD[11.10619] → [13.2979:3011]
```
// Advance a ray in quadrant 0.
```
[11.10619]
[13.3011]
```
// Advance a ray in the positive quadrant.
```
Replacement in crawl-ref/source/ray.cc at line 208 [11.3349]
B:BD[13.3135] → [5.4966:5000]
```
adv_type ray_def::raw_advance_0()
```
[13.3135]
[13.3171]
```
adv_type ray_def::raw_advance_pos()
```

Replacement in crawl-ref/source/ray.cc at line 271 [11.3349]

B:BD[10.3023] → [10.3023:3127]

 * Mirror ray into quadrant 0 or back.
 * this.quadrant itself is not touched (used for the flip back).

[10.3023]

[10.3127]

 * Mirror ray into positive quadrant or back.
 * this.quad{x,y} are not touched (used for the flip back).

Replacement in crawl-ref/source/ray.cc at line 276 [11.3349]

B:BD[10.3154] → [10.3154:3224]

B:BD[10.3224] → [3.3021:3119]

    int signx[] = {1, -1, -1,  1};
    int signy[] = {1,  1, -1, -1};
    accx = 0.5 + signx[quadrant] * (accx - 0.5);
    accy = 0.5 + signy[quadrant] * (accy - 0.5);

[10.3154]

[10.3282]

    accx = 0.5 + quadx * (accx - 0.5);
    accy = 0.5 + quady * (accy - 0.5);

Replacement in crawl-ref/source/ray.cc at line 284 [11.3349]
B:BD[10.3298] → [10.3298:3324]
```
    rc = raw_advance_0();
```
[10.3298]
[10.3324]
```
    rc = raw_advance_pos();
```
Replacement in crawl-ref/source/los.cc at line 147 [11.26450]
B:BD[9.3469] → [9.3469:3518]
```
        : ray_def(ax, ay, s, QUAD_SE), length(0)
```
[9.3469]
[11.28660]
```
        : ray_def(ax, ay, s), length(0)
```
Replacement in crawl-ref/source/los.cc at line 161 [11.26450]
B:BD[11.28753] → [9.3866:3900]
```
            copy.raw_advance_0();
```
[11.28753]
[9.3900]
```
            copy.raw_advance_pos();
```
Replacement in crawl-ref/source/los.cc at line 458 [11.26450]
B:BD[11.38353] → [11.38353:38385]
B:BD[11.38385] → [5.5328:5360]
∅:D[5.5360] → [11.38411:38447]
B:BD[11.38411] → [11.38411:38447]
B:BD[11.38447] → [5.5361:5393]
∅:D[5.5393] → [11.38473:38508]
B:BD[11.38473] → [11.38473:38508]
B:BD[11.38508] → [5.5394:5426]
∅:D[5.5426] → [11.38534:38570]
B:BD[11.38534] → [11.38534:38570]
B:BD[11.38570] → [5.5427:5459]
∅:D[5.5459] → [11.38596:38658]
B:BD[11.38596] → [11.38596:38658]
```
    if ( tx >= sx && ty >= sy )
        ray.quadrant = QUAD_SE;
    else if ( tx < sx && ty >= sy )
        ray.quadrant = QUAD_SW;
    else if ( tx < sx && ty < sy )
        ray.quadrant = QUAD_NW;
    else if ( tx >= sx && ty < sy )
        ray.quadrant = QUAD_NE;
    else
        mpr("Bad ray quadrant!", MSGCH_DIAGNOSTICS);
```
[11.38353]
[11.38658]
```
    ray.quadx = tx >= sx ? 1 : -1;
    ray.quady = ty >= sy ? 1 : -1;
```
Insertion in crawl-ref/source/los.cc at line 684 [11.26450]
[2.4180]
[2.4180]
```
    if (target == source)
        return false;
```
Replacement in crawl-ref/source/los.cc at line 705 [11.26450]
B:BD[2.4698] → [2.4698:4726]
```
    ray.quadrant = QUAD_SE;
```
[2.4698]
[2.4726]
```
    ray.quadx = 1;
    ray.quady = 1;
```
Deletion in crawl-ref/source/los.cc at line 873 [11.26450]
B:BD[14.9784] → [14.9784:9785]

Replace quadrants by signs.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/ray.h at line 9 [4.47173]

Replacement in crawl-ref/source/ray.h at line 24 [4.47173]

Replacement in crawl-ref/source/ray.h at line 30 [4.47173]

Replacement in crawl-ref/source/ray.h at line 49 [4.47173]

Replacement in crawl-ref/source/ray.cc at line 21 [11.3349]

Deletion in crawl-ref/source/ray.cc at line 86 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 96 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 108 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 113 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 115 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 124 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 126 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 128 [11.3349]

Deletion in crawl-ref/source/ray.cc at line 143 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 144 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 146 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 149 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 151 [11.3349]

Insertion in crawl-ref/source/ray.cc at line 155 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 164 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 166 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 204 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 208 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 271 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 276 [11.3349]

Replacement in crawl-ref/source/ray.cc at line 284 [11.3349]

Replacement in crawl-ref/source/los.cc at line 147 [11.26450]

Replacement in crawl-ref/source/los.cc at line 161 [11.26450]

Replacement in crawl-ref/source/los.cc at line 458 [11.26450]

Insertion in crawl-ref/source/los.cc at line 684 [11.26450]

Replacement in crawl-ref/source/los.cc at line 705 [11.26450]

Deletion in crawl-ref/source/los.cc at line 873 [11.26450]