fiddlerwoaroof/crawl - Change BHG4L3FEW3UDCNBQ4GLEONTAKFIXTRFCLQ2BQ4YNPF3I6NRZXBGQC

Redid ray ordering a bit.

Fixed a bug when displaying rays (they were being offset by 1 on the X axis.)

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1033 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on March 13, 2007

BHG4L3FEW3UDCNBQ4GLEONTAKFIXTRFCLQ2BQ4YNPF3I6NRZXBGQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 1411 [4.16817]

[4.63877]

[5.26668]

bool complexity_lt( const std::pair<int,int>& lhs,
                    const std::pair<int,int>& rhs )
{
    return lhs.first * lhs.second < rhs.first * rhs.second;
}

Deletion in crawl-ref/source/view.cc at line 1427 [4.16817]
∅:D[5.26907] → [4.63983:63984]
B:BD[4.63983] → [4.63983:63984]
B:BD[4.63984] → [5.26908:26932]
```
    int xangle, yangle;
```

Replacement in crawl-ref/source/view.cc at line 1438 [4.16817]

B:BD[5.27418] → [3.329:387]

    for ( xangle = 1; xangle <= LOS_MAX_RANGE; ++xangle )

[5.27418]

[3.387]


    // Changing the order a bit. We want to order by the complexity
    // of the beam, which is log(x) + log(y) ~ xy.
    std::vector<std::pair<int,int> > xyangles;
    for ( int xangle = 1; xangle <= LOS_MAX_RANGE; ++xangle )
        for ( int yangle = 1; yangle <= LOS_MAX_RANGE; ++yangle )
            if ( gcd(xangle, yangle) == 1 )
                xyangles.push_back(std::pair<int,int>(xangle, yangle));
    std::sort( xyangles.begin(), xyangles.end(), complexity_lt );
    for ( unsigned int i = 0; i < xyangles.size(); ++i )

Replacement in crawl-ref/source/view.cc at line 1450 [4.16817]

B:BD[3.393] → [3.393:455]

        for ( yangle = 1; yangle <= LOS_MAX_RANGE; ++yangle )

[3.393]

[3.455]

        const int xangle = xyangles[i].first;
        const int yangle = xyangles[i].second;
        const double slope = ((double)(yangle)) / xangle;
        const double rslope = ((double)(xangle)) / yangle;
        for ( int intercept = 0; intercept <= yangle; ++intercept )

Replacement in crawl-ref/source/view.cc at line 1457 [4.16817]

∅:D[3.465] → [5.27543:27613]

B:BD[4.64389] → [5.27543:27613]

∅:D[5.27613] → [4.64511:64512]

B:BD[4.64511] → [4.64511:64512]

B:BD[4.64512] → [5.27614:27739]

B:BD[5.27739] → [3.466:552]

∅:D[3.552] → [5.27813:28333]

B:BD[5.27813] → [5.27813:28333]

∅:D[5.28333] → [4.65814:65828]

B:BD[4.65814] → [4.65814:65828]

            if ( gcd(xangle, yangle) != 1 )
                continue;
            const double slope = ((double)(yangle)) / xangle;
            const double rslope = ((double)(xangle)) / yangle;
            for ( int intercept = 0; intercept <= yangle; ++intercept )
            {
                double xstart = ((double)(intercept)) / yangle;
                if ( intercept == 0 )
                    xstart += EPSILON_VALUE / 10.0;
                if ( intercept == yangle )
                    xstart -= EPSILON_VALUE / 10.0;
                // y should be "about to change"            
                register_ray( xstart, 1.0 - EPSILON_VALUE / 10.0, slope );
                // also draw the identical ray in octant 2
                register_ray( 1.0 - EPSILON_VALUE / 10.0, xstart, rslope );
            }

[3.465]

[5.28334]

            double xstart = ((double)(intercept)) / yangle;
            if ( intercept == 0 )
                xstart += EPSILON_VALUE / 10.0;
            if ( intercept == yangle )
                xstart -= EPSILON_VALUE / 10.0;
            // y should be "about to change"            
            register_ray( xstart, 1.0 - EPSILON_VALUE / 10.0, slope );
            // also draw the identical ray in octant 2
            register_ray( 1.0 - EPSILON_VALUE / 10.0, xstart, rslope );

Replacement in crawl-ref/source/direct.cc at line 670 [4.3697945]

B:BD[2.4364] → [2.4364:4425]

                        gotoxy( grid2viewX(raycopy.x() + 1),

[2.4364]

[2.4425]

                        gotoxy( grid2viewX(raycopy.x()),