fiddlerwoaroof/crawl - Change ICVDXXH2Z5MV7BLYVWQNLQSV63THIB4E6NVORIDBB7D6TBEHBXOAC

Cleanup of raycasting code.

Notably, the 3D bit arrays are now recognizable as such.

Also various formatting fixes, and removed some "unsigned"'s that were cluttering up the code.

Created by Robert Vollmert on October 10, 2009

ICVDXXH2Z5MV7BLYVWQNLQSV63THIB4E6NVORIDBB7D6TBEHBXOAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/los.cc at line 26 [5.26450]
B:BD[5.26846] → [5.26846:26898]
```
#define LOS_MAX_RANGE_X 9
#define LOS_MAX_RANGE_Y 9
```
Insertion in crawl-ref/source/los.cc at line 53 [5.26450]
[5.27579]
[4.3541]

Replacement in crawl-ref/source/los.cc at line 57 [5.26450]

B:BD[4.3717] → [4.3717:3754]

unsigned long* los_blockrays = NULL;

[4.3717]

[5.27639]

typedef FixedArray<unsigned long*, LOS_MAX_RANGE+1, LOS_MAX_RANGE+1> blockrays_t;
blockrays_t los_blockrays;

Replacement in crawl-ref/source/los.cc at line 70 [5.26450]

B:BD[5.27717] → [5.27717:27745]

    delete[] los_blockrays;

[5.27717]

[5.27745]

    for (int x = 0; x <= LOS_MAX_RANGE; x++)
        for (int y = 0; y <= LOS_MAX_RANGE; y++)
            delete[] los_blockrays[x][y];

Replacement in crawl-ref/source/los.cc at line 111 [5.26450]

B:BD[5.28512] → [5.28512:28577]

static bool _is_duplicate_ray( int len, int xpos[], int ypos[] )

[5.28512]

[5.28577]

static bool _is_duplicate_ray(int len, int xpos[], int ypos[])

Replacement in crawl-ref/source/los.cc at line 173 [5.26450]

B:BD[5.30130] → [5.30130:30191]

    int raynum, cellnum, curidx, testidx, testray, testcell;

[5.30130]

[5.30191]

    unsigned int raynum, testray;
    int cellnum, curidx, testidx, testcell;

Replacement in crawl-ref/source/los.cc at line 179 [5.26450]
B:BD[5.30277] → [5.30277:30332]
```
         raynum < static_cast<int>(raylengths.size());
```
[5.30277]
[5.30332]
```
         raynum < raylengths.size();
```

Replacement in crawl-ref/source/los.cc at line 252 [5.26450]

B:BD[5.32961] → [5.32961:33072]

    const unsigned int num_nondupe_rays  = nondupe_cellrays.size();
    const unsigned int num_nondupe_words =

[5.32961]

[5.33072]

    const int num_nondupe_rays  = nondupe_cellrays.size();
    const int num_nondupe_words =

Replacement in crawl-ref/source/los.cc at line 255 [5.26450]

B:BD[5.33126] → [5.33126:33261]

    const unsigned int num_cellrays = ray_coord_x.size();
    const unsigned int num_words = (num_cellrays + LONGSIZE - 1) / LONGSIZE;

[5.33126]

[5.33261]

    const int num_cellrays = ray_coord_x.size();
    const int num_words = (num_cellrays + LONGSIZE - 1) / LONGSIZE;
    blockrays_t full_los_blockrays;
    // allocate and initialize
    for (int x = 0; x <= LOS_MAX_RANGE; ++x)
        for (int y = 0; y <= LOS_MAX_RANGE; ++y)
        {
            full_los_blockrays[x][y] = new unsigned long[num_words];
            memset((void*)full_los_blockrays[x][y], 0, sizeof(unsigned long) * num_words);
            los_blockrays[x][y] = new unsigned long[num_nondupe_words];
            memset((void*)los_blockrays[x][y], 0, sizeof(unsigned long) * num_nondupe_words);
        }

Deletion in crawl-ref/source/los.cc at line 270 [5.26450]

B:BD[5.33336] → [5.33336:33649]

    unsigned long* full_los_blockrays;
    full_los_blockrays = new unsigned long[num_words * (LOS_MAX_RANGE_X+1) *
                                           (LOS_MAX_RANGE_Y+1)];
    memset((void*)full_los_blockrays, 0, sizeof(unsigned long) * num_words *
           (LOS_MAX_RANGE_X+1) * (LOS_MAX_RANGE_Y+1));

Deletion in crawl-ref/source/los.cc at line 272 [5.26450]
B:BD[5.33674] → [5.33674:33675]

Replacement in crawl-ref/source/los.cc at line 276 [5.26450]

B:BD[5.33804] → [5.33804:34074]

            // every cell blocks...
            unsigned long* const inptr = full_los_blockrays +
                (ray_coord_x[i + cur_offset] * (LOS_MAX_RANGE_Y + 1) +
                 ray_coord_y[i + cur_offset]) * num_words;
            // ...all following cellrays

[5.33804]

[5.34074]

            int x = ray_coord_x[cur_offset + i];
            int y = ray_coord_y[cur_offset + i];
            // every cell blocks all following cellrays

Replacement in crawl-ref/source/los.cc at line 280 [5.26450]
B:BD[5.34130] → [4.4149:4212]
∅:D[4.4212] → [5.34195:34196]
B:BD[5.34195] → [5.34195:34196]
```
                _set_bit_in_long_array(inptr, j + cur_offset);
```
[5.34130]
[5.34196]
```
                _set_bit_in_long_array(full_los_blockrays[x][y], cur_offset+j);
```

Deletion in crawl-ref/source/los.cc at line 288 [5.26450]

B:BD[5.34363] → [5.34363:34636]

    // allocate and clear memory
    los_blockrays = new unsigned long[num_nondupe_words * (LOS_MAX_RANGE_X+1) * (LOS_MAX_RANGE_Y + 1)];
    memset((void*)los_blockrays, 0, sizeof(unsigned long) * num_nondupe_words *
           (LOS_MAX_RANGE_X+1) * (LOS_MAX_RANGE_Y+1));

Replacement in crawl-ref/source/los.cc at line 291 [5.26450]
B:BD[5.34794] → [5.34794:34850]
```
    for (unsigned int i = 0; i < num_nondupe_rays; ++i)
```
[5.34794]
[5.34850]
```
    for (int i = 0; i < num_nondupe_rays; ++i)
```

Deletion in crawl-ref/source/los.cc at line 296 [5.26450]

B:BD[5.34990] → [5.34990:35381]

    unsigned long* oldptr = full_los_blockrays;
    unsigned long* newptr = los_blockrays;
    for (int x = 0; x <= LOS_MAX_RANGE_X; ++x)
        for (int y = 0; y <= LOS_MAX_RANGE_Y; ++y)
        {
            for (unsigned int i = 0; i < num_nondupe_rays; ++i)
                if (_get_bit_in_long_array(oldptr, nondupe_cellrays[i]))
                    _set_bit_in_long_array(newptr, i);

Replacement in crawl-ref/source/los.cc at line 297 [5.26450]

B:BD[5.35382] → [5.35382:35456]

            oldptr += num_words;
            newptr += num_nondupe_words;

[5.35382]

[5.35456]

    for (int x = 0; x <= LOS_MAX_RANGE; ++x)
        for (int y = 0; y <= LOS_MAX_RANGE; ++y)
        {
            for (int i = 0; i < num_nondupe_rays; ++i)
                if (_get_bit_in_long_array(full_los_blockrays[x][y],
                                           nondupe_cellrays[i]))
                    _set_bit_in_long_array(los_blockrays[x][y], i);

Replacement in crawl-ref/source/los.cc at line 307 [5.26450]

B:BD[5.35515] → [5.35515:35548]

    delete[] full_los_blockrays;

[5.35515]

[5.35548]

    for (int x = 0; x <= LOS_MAX_RANGE; ++x)
        for (int y = 0; y <= LOS_MAX_RANGE; ++y)
            delete[] full_los_blockrays[x][y];

Replacement in crawl-ref/source/los.cc at line 379 [5.26450]

B:BD[5.37654] → [5.37654:37724]

        for ( int intercept = 1; intercept <= 2*yangle; ++intercept )

[5.37654]

[5.37724]

        for (int intercept = 1; intercept <= 2*yangle; ++intercept )

Replacement in crawl-ref/source/los.cc at line 413 [5.26450]

B:BD[5.38661] → [3.3652:3726]

static int _cyclic_offset(unsigned int ui, int cycle_dir, int startpoint,

[5.38661]

[3.3726]

static int _cyclic_offset(int i, int cycle_dir, int startpoint,

Deletion in crawl-ref/source/los.cc at line 416 [5.26450]
B:BD[5.38780] → [5.38780:38807]
```
    const int i = (int)ui;
```

Replacement in crawl-ref/source/los.cc at line 500 [5.26450]

B:BD[5.41441] → [5.41441:41582]

        const int fullray = _cyclic_offset( fray, cycle_dir, ray.fullray_idx,
                                            fullrays.size() );

[5.41441]

[5.41582]

        const int fullray = _cyclic_offset(fray, cycle_dir, ray.fullray_idx,
                                           fullrays.size());

Replacement in crawl-ref/source/los.cc at line 745 [5.26450]

B:BD[5.51806] → [5.51806:51883]

    const unsigned int num_words = (num_cellrays + LONGSIZE - 1) / LONGSIZE;

[5.51806]

[5.51883]

    const int num_words = (num_cellrays + LONGSIZE - 1) / LONGSIZE;

Replacement in crawl-ref/source/los.cc at line 748 [5.26450]

B:BD[6.7531] → [6.7531:7671]

∅:D[6.7671] → [5.52039:52040]

B:BD[5.52039] → [5.52039:52040]

B:BD[5.52040] → [6.7672:7749]

    memset( (void*)dead_rays,  0, sizeof(unsigned long) * num_words);
    memset( (void*)smoke_rays, 0, sizeof(unsigned long) * num_words);
    // kill all blocked rays
    const unsigned long* inptr = los_blockrays;

[6.7531]

[5.52229]

    memset((void*)dead_rays,  0, sizeof(unsigned long) * num_words);
    memset((void*)smoke_rays, 0, sizeof(unsigned long) * num_words);

Replacement in crawl-ref/source/los.cc at line 751 [5.26450]

B:BD[5.52230] → [6.7750:7868]

    for (int x = 0; x <= LOS_MAX_RANGE_X; ++x)
        for (int y = 0; y <= LOS_MAX_RANGE_Y; ++y, inptr += num_words)

[5.52230]

[6.7868]

    for (int x = 0; x <= LOS_MAX_RANGE; ++x)
        for (int y = 0; y <= LOS_MAX_RANGE; ++y)

Replacement in crawl-ref/source/los.cc at line 763 [5.26450]

B:BD[6.8148] → [6.8148:8255]

                for (unsigned int i = 0; i < num_words; ++i)
                    dead_rays[i] |= inptr[i];

[6.8148]

[6.8255]

                for (int i = 0; i < num_words; ++i)
                    dead_rays[i] |= los_blockrays[x][y][i];

Replacement in crawl-ref/source/los.cc at line 768 [5.26450]

B:BD[6.8367] → [6.8367:8428]

                for (unsigned int i = 0; i < num_words; ++i)

[6.8367]

[5.53032]

                for (int i = 0; i < num_words; ++i)

Replacement in crawl-ref/source/los.cc at line 770 [5.26450]

B:BD[5.53050] → [6.8429:8541]

                    dead_rays[i]  |= (smoke_rays[i] & inptr[i]);
                    smoke_rays[i] |= inptr[i];

[5.53050]

[5.53220]

                    dead_rays[i]  |= (smoke_rays[i] & los_blockrays[x][y][i]);
                    smoke_rays[i] |= los_blockrays[x][y][i];

Replacement in crawl-ref/source/los.cc at line 779 [5.26450]

B:BD[5.53694] → [6.8621:8711]

    // ray calculation done, now work out which cells in this
    // quadrant are visible

[5.53694]

[6.8711]

    // Ray calculation done. Now work out which cells in this
    // quadrant are visible.

Replacement in crawl-ref/source/los.cc at line 782 [5.26450]

B:BD[6.8740] → [6.8740:8807]

    for (unsigned int wordloc = 0; wordloc < num_words; ++wordloc)

[6.8740]

[6.8807]

    for (int wordloc = 0; wordloc < num_words; ++wordloc)

Deletion in crawl-ref/source/los.cc at line 785 [5.26450]
B:BD[6.8871] → [6.8871:8920]
```
        // Note: the last word may be incomplete
```
Deletion in crawl-ref/source/los.cc at line 795 [5.26450]
∅:D[2.3583] → [5.54235:54253]
∅:D[6.9413] → [5.54235:54253]
B:BD[5.54235] → [5.54235:54253]
```
                {
```
Deletion in crawl-ref/source/los.cc at line 796 [5.26450]
∅:D[6.9466] → [5.54813:54831]
B:BD[5.54813] → [5.54813:54831]
```
                }
```
Deletion in crawl-ref/source/los.cc at line 815 [5.26450]
B:BD[6.9817] → [6.9817:9823]
```
    {
```
Deletion in crawl-ref/source/los.cc at line 816 [5.26450]
B:BD[6.9889] → [6.9889:9895]
```
    }
```

Replacement in crawl-ref/source/los.cc at line 850 [5.26450]

B:BD[5.55549] → [5.55549:55664]

bool see_grid( const env_show_grid &show,
               const coord_def &c,
               const coord_def &pos )

[5.55549]

[5.55664]

bool see_grid(const env_show_grid &show,
              const coord_def &c,
              const coord_def &pos)

Replacement in crawl-ref/source/los.cc at line 868 [5.26450]
B:BD[5.56013] → [5.56013:56049]
```
bool see_grid( const coord_def &p )
```
[5.56013]
[5.56049]
```
bool see_grid(const coord_def &p)
```
Replacement in crawl-ref/source/los.cc at line 877 [5.26450]
B:BD[5.56346] → [5.56346:56391]
```
bool see_grid_no_trans( const coord_def &p )
```
[5.56346]
[5.56391]
```
bool see_grid_no_trans(const coord_def &p)
```
Replacement in crawl-ref/source/los.cc at line 883 [5.26450]
B:BD[5.56512] → [5.56512:56559]
```
bool trans_wall_blocking( const coord_def &p )
```
[5.56512]
[5.56559]
```
bool trans_wall_blocking(const coord_def &p)
```
Deletion in crawl-ref/source/los.cc at line 887 [5.26450]
B:BD[5.56612] → [5.56612:56613]

Cleanup of raycasting code.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/los.cc at line 26 [5.26450]

Insertion in crawl-ref/source/los.cc at line 53 [5.26450]

Replacement in crawl-ref/source/los.cc at line 57 [5.26450]

Replacement in crawl-ref/source/los.cc at line 70 [5.26450]

Replacement in crawl-ref/source/los.cc at line 111 [5.26450]

Replacement in crawl-ref/source/los.cc at line 173 [5.26450]

Replacement in crawl-ref/source/los.cc at line 179 [5.26450]

Replacement in crawl-ref/source/los.cc at line 252 [5.26450]

Replacement in crawl-ref/source/los.cc at line 255 [5.26450]

Deletion in crawl-ref/source/los.cc at line 270 [5.26450]

Deletion in crawl-ref/source/los.cc at line 272 [5.26450]

Replacement in crawl-ref/source/los.cc at line 276 [5.26450]

Replacement in crawl-ref/source/los.cc at line 280 [5.26450]

Deletion in crawl-ref/source/los.cc at line 288 [5.26450]

Replacement in crawl-ref/source/los.cc at line 291 [5.26450]

Deletion in crawl-ref/source/los.cc at line 296 [5.26450]

Replacement in crawl-ref/source/los.cc at line 297 [5.26450]

Replacement in crawl-ref/source/los.cc at line 307 [5.26450]

Replacement in crawl-ref/source/los.cc at line 379 [5.26450]

Replacement in crawl-ref/source/los.cc at line 413 [5.26450]

Deletion in crawl-ref/source/los.cc at line 416 [5.26450]

Replacement in crawl-ref/source/los.cc at line 500 [5.26450]

Replacement in crawl-ref/source/los.cc at line 745 [5.26450]

Replacement in crawl-ref/source/los.cc at line 748 [5.26450]

Replacement in crawl-ref/source/los.cc at line 751 [5.26450]

Replacement in crawl-ref/source/los.cc at line 763 [5.26450]

Replacement in crawl-ref/source/los.cc at line 768 [5.26450]

Replacement in crawl-ref/source/los.cc at line 770 [5.26450]

Replacement in crawl-ref/source/los.cc at line 779 [5.26450]

Replacement in crawl-ref/source/los.cc at line 782 [5.26450]

Deletion in crawl-ref/source/los.cc at line 785 [5.26450]

Deletion in crawl-ref/source/los.cc at line 795 [5.26450]

Deletion in crawl-ref/source/los.cc at line 796 [5.26450]

Deletion in crawl-ref/source/los.cc at line 815 [5.26450]

Deletion in crawl-ref/source/los.cc at line 816 [5.26450]

Replacement in crawl-ref/source/los.cc at line 850 [5.26450]

Replacement in crawl-ref/source/los.cc at line 868 [5.26450]

Replacement in crawl-ref/source/los.cc at line 877 [5.26450]

Replacement in crawl-ref/source/los.cc at line 883 [5.26450]

Deletion in crawl-ref/source/los.cc at line 887 [5.26450]