mystical.unicat/monorepo - Change LFIZW6XIIEPON7ROE5CPKBNEHC7AMO2RSWI5ECF6C3RT2HCBRFSAC

Attempting to get Quake lightmap working - no go

Created by GPeTJGuaAryfKVDHpJLoiRAiv9jDq5aAapfNcWjYu16v on December 8, 2023

LFIZW6XIIEPON7ROE5CPKBNEHC7AMO2RSWI5ECF6C3RT2HCBRFSAC

Dependencies

In channels

main

Change contents

Replacement in tabula/test/test.c at line 8 [3.39]

B:BD[3.188] → [3.188:244]

int comp_int(const void *a, const void *b, void *ud) {

[3.188]

[3.244]

int comp_int(const void *a, const void *b, void *ud) {

Replacement in tabula/test/test.c at line 15 [3.39]

B:BD[3.368] → [3.368:3407]

#define TEST(...)                                                                                                                                              \
  do {                                                                                                                                                         \
    int items[] = {__VA_ARGS__};                                                                                                                               \
    printf("("); \
    for(int j = 0; j < sizeof(items) / sizeof(items[0]); j++) {                                                                                            \
      printf("%i ", items[j]);                                                                                                                             \
    }                                                                                                                                                      \
   printf(") -> (");                                                                                                                                          \
    tabula_qsort(items, sizeof(items[0]), (sizeof(items) / sizeof(items[0])), comp_int, NULL);                                                      \
    tests_run++;                                                                                                                                               \
    for(int j = 0; j < sizeof(items) / sizeof(items[0]); j++) {                                                                                            \
      printf("%i ", items[j]);                                                                                                                             \
    }                                                                                                                                                      \
    printf(")\n");                                                                                                                                          \
    for(int i = 1; i < sizeof(items) / sizeof(items[0]); i++) {                                                                                                \
      if(items[i - 1] > items[i]) {                                                                                                                            \
        tests_failed++;                                                                                                                                        \
        break;                                                                                                                                                 \
      }                                                                                                                                                        \
    }                                                                                                                                                          \

[3.368]

[3.3407]

#define TEST(...)                                                                                                      \
  do {                                                                                                                 \
    int items[] = {__VA_ARGS__};                                                                                       \
    printf("(");                                                                                                       \
    for(int j = 0; j < sizeof(items) / sizeof(items[0]); j++) {                                                        \
      printf("%i ", items[j]);                                                                                         \
    }                                                                                                                  \
    printf(") -> (");                                                                                                  \
    tabula_qsort(items, sizeof(items[0]), (sizeof(items) / sizeof(items[0])), comp_int, NULL);                         \
    tests_run++;                                                                                                       \
    for(int j = 0; j < sizeof(items) / sizeof(items[0]); j++) {                                                        \
      printf("%i ", items[j]);                                                                                         \
    }                                                                                                                  \
    printf(")\n");                                                                                                     \
    for(int i = 1; i < sizeof(items) / sizeof(items[0]); i++) {                                                        \
      if(items[i - 1] > items[i]) {                                                                                    \
        tests_failed++;                                                                                                \
        break;                                                                                                         \
      }                                                                                                                \
    }                                                                                                                  \

Replacement in tabula/include/tabula.h at line 1085 [3.4114]
B:BD[3.72066] → [3.72066:72101]
```
      if(q_ <= UINT32_MAX / 100) {
```
[3.72066]
[3.72101]
```
      if(q_ && q_ <= UINT32_MAX / 100) {
```
Replacement in tabula/include/tabula.h at line 1106 [3.4114]
B:BD[3.72562] → [3.72562:72597]
```
      if(q_ <= UINT64_MAX / 100) {
```
[3.72562]
[3.72597]
```
      if(q_ && q_ <= UINT64_MAX / 100) {
```
Deletion in quake2/ref_gl/gl_rsurf.c at line 299 [4.1211734]
B:BD[4.1224821] → [4.1224821:1224842]
```
    int smax, tmax;
```

Replacement in quake2/ref_gl/gl_rsurf.c at line 300 [4.1211734]

B:BD[4.1224843] → [4.1224843:1224923]

    smax = (surf->extents[0] >> 4) + 1;
    tmax = (surf->extents[1] >> 4) + 1;

[4.1224843]

[4.1224923]

    int smax = (surf->extents[0] >> 4) + 1;
    int tmax = (surf->extents[1] >> 4) + 1;

Deletion in quake2/ref_gl/gl_light.c at line 171 [4.1393042]
B:BD[4.1397523] → [4.1397523:1397529]
```
    ;
```

Insertion in quake2/ref_gl/gl_light.c at line 184 [4.1393042]

[4.1397791]

    int smax = (surf->extents[0] >> 4) + 1;
    int tmax = (surf->extents[1] >> 4) + 1;
    int size = smax * tmax;

Replacement in quake2/ref_gl/gl_light.c at line 196 [4.1393042]
B:BD[4.1397920] → [4.1397920:1397985]
```
      lightmap += 3 * (dt * ((surf->extents[0] >> 4) + 1) + ds);
```
[4.1397920]
[4.1397985]
```
      lightmap += 3 * (dt * smax + ds);
```

Replacement in quake2/ref_gl/gl_light.c at line 205 [4.1393042]

B:BD[4.1398387] → [4.1398387:1398474]

        lightmap += 3 * ((surf->extents[0] >> 4) + 1) * ((surf->extents[1] >> 4) + 1);

[4.1398387]

[4.1398474]

        lightmap += 3 * size;

Replacement in quake2/ref_gl/gl_light.c at line 211 [4.1393042]

B:BD[2.17545] → [2.17545:17634]

          lightmap += 3 * ((surf->extents[0] >> 4) + 1) * ((surf->extents[1] >> 4) + 1);

[2.17545]

[4.1398799]

          lightmap += 3 * size;

Replacement in quake2/ref_gl/gl_light.c at line 216 [4.1393042]

B:BD[2.17878] → [2.17878:17967]

          lightmap += 3 * ((surf->extents[0] >> 4) + 1) * ((surf->extents[1] >> 4) + 1);

[2.17878]

[4.1399124]

          lightmap += 3 * size;

Replacement in quake2/ref_gl/gl_light.c at line 221 [4.1393042]

B:BD[2.18219] → [2.18219:18308]

          lightmap += 3 * ((surf->extents[0] >> 4) + 1) * ((surf->extents[1] >> 4) + 1);

[2.18219]

[2.18308]

          lightmap += 3 * size;

Deletion in quake2/ref_gl/gl_light.c at line 396 [4.1393042]
B:BD[4.1403619] → [4.1403619:1403636]
```
    //int maps;
```

Deletion in quake2/ref_gl/gl_light.c at line 402 [4.1393042]

B:BD[4.1404002] → [4.1404002:1404153]


    //for(maps = 0; maps < MAXLIGHTMAPS && surf->styles[maps] != 255; maps++) {
    //  style = &r_newrefdef.lightstyles[surf->styles[maps]];
    //}

Deletion in quake2/ref_gl/gl_light.c at line 411 [4.1393042]
B:BD[2.18816] → [2.18816:18870]
```
  float newscale = model->old_lightmap ? 0.0f : 1.0f;
```
Replacement in quake2/ref_gl/gl_light.c at line 418 [4.1393042]
B:BD[4.1404514] → [4.1404514:1404549]
```
  if(nummaps == 1) {
    int maps;
```
[4.1404514]
[4.1404549]
```
  int maps;
```

Replacement in quake2/ref_gl/gl_light.c at line 420 [4.1393042]

B:BD[4.1404550] → [4.1404550:1404654]

    for(maps = 0; maps < MAXLIGHTMAPS && surf->styles[maps] != 255; maps++) {
      bl = _.blocklights;

[4.1404550]

[4.1404654]

  for(maps = 0; maps < MAXLIGHTMAPS && surf->styles[maps] != 255; maps++) {
    bl = _.blocklights;

Replacement in quake2/ref_gl/gl_light.c at line 423 [4.1393042]

B:BD[4.1404655] → [4.1404655:1404776]

      for(i = 0; i < 3; i++)
        scale[i] = gl_modulate->value * r_newrefdef.lightstyles[surf->styles[maps]].rgb[i];

[4.1404655]

[4.1404776]

    for(i = 0; i < 3; i++)
      scale[i] = gl_modulate->value * r_newrefdef.lightstyles[surf->styles[maps]].rgb[i];

Replacement in quake2/ref_gl/gl_light.c at line 426 [4.1393042]

B:BD[4.1404777] → [4.1404777:1404837]

      for(i = 0; i < size; i++) {
        struct SH1 color;

[4.1404777]

[4.1404837]

    for(i = 0; i < size; i++) {
      struct SH1 color;

Replacement in quake2/ref_gl/gl_light.c at line 429 [4.1393042]

B:BD[4.1404838] → [4.1404838:1405000]

        color.f[0] = lightmap_rgb0[i * 3 + 0] - 0.5f;
        color.f[4] = lightmap_rgb0[i * 3 + 1] - 0.5f;
        color.f[8] = lightmap_rgb0[i * 3 + 2] - 0.5f;

[4.1404838]

[4.1405000]

      color.f[0] = lightmap_rgb0[i * 3 + 0] - 0.5f;
      color.f[4] = lightmap_rgb0[i * 3 + 1] - 0.5f;
      color.f[8] = lightmap_rgb0[i * 3 + 2] - 0.5f;
      if(!model->old_lightmap) {

Replacement in quake2/ref_gl/gl_light.c at line 449 [4.1393042]

B:BD[4.1405716] → [2.19055:19346]

∅:D[2.19346] → [4.1405716:1405763]

B:BD[4.1405716] → [4.1405716:1405763]


        color.f[1] *= newscale;
        color.f[2] *= newscale;
        color.f[3] *= newscale;
        color.f[5] *= newscale;
        color.f[6] *= newscale;
        color.f[7] *= newscale;
        color.f[9] *= newscale;
        color.f[10] *= newscale;
        color.f[11] *= newscale;
        bl[i] = SH1_ColorScale(color, scale);

[4.1405716]

[4.1405763]

      } else {
        color.f[1] = 0.0f;
        color.f[2] = 0.0f;
        color.f[3] = 0.0f;
        color.f[5] = 0.0f;
        color.f[6] = 0.0f;
        color.f[7] = 0.0f;
        color.f[9] = 0.0f;
        color.f[10] = 0.0f;
        color.f[11] = 0.0f;

Deletion in quake2/ref_gl/gl_light.c at line 460 [4.1393042]

B:BD[4.1405771] → [4.1405771:1405803]

B:BD[4.1405803] → [2.19347:19521]

∅:D[2.19521] → [4.1405945:1406145]

B:BD[4.1405945] → [4.1405945:1406145]


      // skip to next lightmap
      lightmap_rgb0 += size * 3 * newstride;
      lightmap_r1 += size * 3 * newstride;
      lightmap_g1 += size * 3 * newstride;
      lightmap_b1 += size * 3 * newstride;
    }
  } else {
    int maps;
    memset(_.blocklights, 0, sizeof(_.blocklights[0]) * size);
    for(maps = 0; maps < MAXLIGHTMAPS && surf->styles[maps] != 255; maps++) {
      bl = _.blocklights;

Replacement in quake2/ref_gl/gl_light.c at line 461 [4.1393042]

B:BD[4.1406146] → [4.1406146:1407207]

B:BD[4.1407207] → [2.19522:19813]

∅:D[2.19813] → [4.1407207:1407254]

B:BD[4.1407207] → [4.1407207:1407254]

      for(i = 0; i < 3; i++)
        scale[i] = gl_modulate->value * r_newrefdef.lightstyles[surf->styles[maps]].rgb[i];
      for(i = 0; i < size; i++) {
        struct SH1 color;
        color.f[0] = lightmap_rgb0[i * 3 + 0] - 0.5f;
        color.f[4] = lightmap_rgb0[i * 3 + 1] - 0.5f;
        color.f[8] = lightmap_rgb0[i * 3 + 2] - 0.5f;
        color.f[1] = lightmap_r1[i * 3 + 0] - 0.5f;
        color.f[2] = lightmap_r1[i * 3 + 1] - 0.5f;
        color.f[3] = lightmap_r1[i * 3 + 2] - 0.5f;
        color.f[5] = lightmap_g1[i * 3 + 0] - 0.5f;
        color.f[6] = lightmap_g1[i * 3 + 1] - 0.5f;
        color.f[7] = lightmap_g1[i * 3 + 2] - 0.5f;
        color.f[9] = lightmap_b1[i * 3 + 0] - 0.5f;
        color.f[10] = lightmap_b1[i * 3 + 1] - 0.5f;
        color.f[11] = lightmap_b1[i * 3 + 2] - 0.5f;
        for(int component = 0; component < 3; component++) {
          for(int basis = 0; basis < 3; basis++) {
            color.f[component * 4 + basis + 1] -= 127.0f;
            color.f[component * 4 + basis + 1] *= 2;
          }
        }
        color.f[1] *= newscale;
        color.f[2] *= newscale;
        color.f[3] *= newscale;
        color.f[5] *= newscale;
        color.f[6] *= newscale;
        color.f[7] *= newscale;
        color.f[9] *= newscale;
        color.f[10] *= newscale;
        color.f[11] *= newscale;
        bl[i] = SH1_ColorScale(color, scale);

[4.1406146]

[4.1407254]

      color = SH1_ColorScale(color, scale);
      if(maps != 0) {
        bl[i] = SH1_Add(bl[i], color);
      } else {
        bl[i] = color;

Replacement in quake2/ref_gl/gl_light.c at line 471 [4.1393042]

B:BD[2.19859] → [2.19859:19982]

    lightmap_r1 += size * 3 * newstride;
    lightmap_g1 += size * 3 * newstride;
    lightmap_b1 += size * 3 * newstride;

[2.19859]

[4.1407431]

    if(!model->old_lightmap) {
      lightmap_r1 += size * 3 * newstride;
      lightmap_g1 += size * 3 * newstride;
      lightmap_b1 += size * 3 * newstride;
    }

Replacement in quake2/ref_gl/gl_light.c at line 484 [4.1393042]
B:BD[4.1407573] → [4.1407573:1407601]
```
  // stride -= (smax << 2);
```
[4.1407573]
[4.1407601]
```
  // stride -= (smax << 1);
```
Deletion in quake2/ref_gl/gl_light.c at line 492 [4.1393042]
B:BD[4.1407890] → [4.1407890:1407957]
```
        if(color.f[component * 4 + 0] > 255)
          assert(0);
```

Deletion in quake2/ref_gl/gl_light.c at line 495 [4.1393042]

B:BD[4.1408116] → [4.1408116:1408195]


          if(color.f[component * 4 + basis + 1] > 255)
            assert(0);

Attempting to get Quake lightmap working - no go

Dependencies

In channels

Change contents

Replacement in tabula/test/test.c at line 8 [3.39]

Replacement in tabula/test/test.c at line 15 [3.39]

Replacement in tabula/include/tabula.h at line 1085 [3.4114]

Replacement in tabula/include/tabula.h at line 1106 [3.4114]

Deletion in quake2/ref_gl/gl_rsurf.c at line 299 [4.1211734]

Replacement in quake2/ref_gl/gl_rsurf.c at line 300 [4.1211734]

Deletion in quake2/ref_gl/gl_light.c at line 171 [4.1393042]