Differences From Artifact [bc0b6a3e18]:
- File src/editing.m — part of check-in [932a90c261] at 2025-03-29 13:01:06 on branch trunk — Make more use of OFColor (user: js, size: 14241) [annotate] [blame] [check-ins using]
To Artifact [1510ae8332]:
- File
src/editing.m
— part of check-in
[75e920ae30]
at
2025-03-29 14:25:43
on branch trunk
— Switch from clang-format to manual formatting
clang-format does too many weird things. (user: js, size: 14172) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
16 17 18 19 20 21 22 | // invariant: all code assumes that these are kept inside MINBORD distance of // the edge of the map struct block sel = { 0, 0, 0, 0 }; OF_CONSTRUCTOR() { | | | | | | | | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | // invariant: all code assumes that these are kept inside MINBORD distance of // the edge of the map struct block sel = { 0, 0, 0, 0 }; OF_CONSTRUCTOR() { enqueueInit(^ { static const struct { OFString *name; int *storage; } vars[4] = { { @"selx", &sel.x }, { @"sely", &sel.y }, { @"selxs", &sel.xs }, { @"selys", &sel.ys } }; for (size_t i = 0; i < 4; i++) { Variable *variable = [Variable variableWithName: vars[i].name min: 0 max: 4096 storage: vars[i].storage function: NULL persisted: false]; Identifier.identifiers[vars[i].name] = variable; } }); } int selh = 0; bool selset = false; |
︙ | ︙ | |||
89 90 91 92 93 94 95 | projreset(); } Cube.sharedInstance.repeatsKeys = editmode; selset = false; editing = editmode; } | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | projreset(); } Cube.sharedInstance.repeatsKeys = editmode; selset = false; editing = editmode; } COMMAND(edittoggle, ARG_NONE, ^ { toggleedit(); }) void correctsel() // ensures above invariant { selset = !OUTBORD(sel.x, sel.y); |
︙ | ︙ | |||
133 134 135 136 137 138 139 | #define EDITSELMP \ if (noteditmode() || noselection() || multiplayer()) \ return; #define EDITMP \ if (noteditmode() || multiplayer()) \ return; | | | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | #define EDITSELMP \ if (noteditmode() || noselection() || multiplayer()) \ return; #define EDITMP \ if (noteditmode() || multiplayer()) \ return; COMMAND(select, ARG_4INT, (^ (int x, int y, int xs, int ys) { struct block s = { x, y, xs, ys }; sel = s; selh = 0; correctsel(); })) void |
︙ | ︙ | |||
217 218 219 220 221 222 223 | if (SOLID(s)) continue; float h1 = sheight(s, s, z); float h2 = sheight(s, SWS(s, 1, 0, ssize), z); float h3 = sheight(s, SWS(s, 1, 1, ssize), z); float h4 = sheight(s, SWS(s, 0, 1, ssize), z); if (s->tag) | | | | | | | | | | | | | | 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 | if (SOLID(s)) continue; float h1 = sheight(s, s, z); float h2 = sheight(s, SWS(s, 1, 0, ssize), z); float h3 = sheight(s, SWS(s, 1, 1, ssize), z); float h4 = sheight(s, SWS(s, 0, 1, ssize), z); if (s->tag) linestyle(GRIDW, [OFColor colorWithRed: 1.0f green: 0.25f blue: 0.25f alpha: 1.0f]); else if (s->type == FHF || s->type == CHF) linestyle(GRIDW, [OFColor colorWithRed: 0.5f green: 1.0f blue: 0.5f alpha: 1.0f]); else linestyle(GRIDW, OFColor.gray); struct block b = { ix, iy, 1, 1 }; box(&b, h1, h2, h3, h4); linestyle(GRID8, [OFColor colorWithRed: 0.25f green: 0.25f blue: 1.0f alpha: 1.0f]); if (!(ix & GRIDM)) line(ix, iy, h1, ix, iy + 1, h4); if (!(ix + 1 & GRIDM)) line(ix + 1, iy, h2, ix + 1, iy + 1, h3); if (!(iy & GRIDM)) line(ix, iy, h1, ix + 1, iy, h2); if (!(iy + 1 & GRIDM)) |
︙ | ︙ | |||
258 259 260 261 262 263 264 | sheight(s, SWS(s, 0, 1, ssize), z)); linestyle(GRIDS, OFColor.red); dot(cx, cy, ih); ch = (int)ih; } if (selset) { | | | | | | | | | | | | | 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 | sheight(s, SWS(s, 0, 1, ssize), z)); linestyle(GRIDS, OFColor.red); dot(cx, cy, ih); ch = (int)ih; } if (selset) { linestyle(GRIDS, [OFColor colorWithRed: 1.0f green: 0.25f blue: 0.25f alpha: 1.0f]); box(&sel, (float)selh, (float)selh, (float)selh, (float)selh); } } static OFMutableData *undos; // unlimited undo VARP(undomegs, 0, 1, 10); // bounded by n megs void pruneundos(int maxremain) // bound memory { int t = 0; for (ssize_t i = (ssize_t)undos.count - 1; i >= 0; i--) { struct block *undo = [undos mutableItemAtIndex: i]; t += undo->xs * undo->ys * sizeof(struct sqr); if (t > maxremain) { OFFreeMemory(undo); [undos removeItemAtIndex: i]; } } } void makeundo() { if (undos == nil) undos = [[OFMutableData alloc] initWithItemSize: sizeof(struct block *)]; struct block *copy = blockcopy(&sel); [undos addItem: ©]; pruneundos(undomegs << 20); } COMMAND(undo, ARG_NONE, ^ { EDITMP; if (undos.count == 0) { conoutf(@"nothing more to undo"); return; } struct block *p = undos.mutableLastItem; [undos removeLastItem]; blockpaste(p); OFFreeMemory(p); }) static struct block *copybuf = NULL; COMMAND(copy, ARG_NONE, ^ { EDITSELMP; if (copybuf) OFFreeMemory(copybuf); copybuf = blockcopy(&sel); }) COMMAND(paste, ARG_NONE, ^ { EDITMP; if (!copybuf) { conoutf(@"nothing to paste"); return; } sel.xs = copybuf->xs; sel.ys = copybuf->ys; |
︙ | ︙ | |||
397 398 399 400 401 402 403 | EDITSEL; bool isfloor = flr == 0; editheightxy(isfloor, amount, &sel); addmsg(1, 7, SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount); } | | | 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 | EDITSEL; bool isfloor = flr == 0; editheightxy(isfloor, amount, &sel); addmsg(1, 7, SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount); } COMMAND(editheight, ARG_2INT, ^ (int flr, int amount) { editheight(flr, amount); }) void edittexxy(int type, int t, const struct block *sel) { loopselxy(switch (type) { |
︙ | ︙ | |||
420 421 422 423 424 425 426 | break; case 3: s->utex = t; break; }); } | | | | 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 | break; case 3: s->utex = t; break; }); } COMMAND(edittex, ARG_2INT, ^ (int type, int dir) { EDITSEL; if (type < 0 || type > 3) return; if (type != lasttype) { tofronttex(); lasttype = type; } int atype = type == 3 ? 1 : type; int i = curedittex[atype]; i = i < 0 ? 0 : i + dir; curedittex[atype] = i = min(max(i, 0), 255); int t = lasttex = hdr.texlists[atype][i]; edittexxy(type, t, &sel); addmsg(1, 7, SV_EDITT, sel.x, sel.y, sel.xs, sel.ys, type, t); }) COMMAND(replace, ARG_NONE, (^ { EDITSELMP; for (int x = 0; x < ssize; x++) { for (int y = 0; y < ssize; y++) { struct sqr *s = S(x, y); switch (lasttype) { case 0: |
︙ | ︙ | |||
493 494 495 496 497 498 499 | return; } edittypexy(type, &sel); addmsg(1, 6, SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type); } | | | | | 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 | return; } edittypexy(type, &sel); addmsg(1, 6, SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type); } COMMAND(heightfield, ARG_1INT, ^ (int t) { edittype(t == 0 ? FHF : CHF); }) COMMAND(solid, ARG_1INT, ^ (int t) { edittype(t == 0 ? SPACE : SOLID); }) COMMAND(corner, ARG_NONE, ^ { edittype(CORNER); }) void editequalisexy(bool isfloor, const struct block *sel) { int low = 127, hi = -128; |
︙ | ︙ | |||
525 526 527 528 529 530 531 | else s->ceil = hi; if (s->floor >= s->ceil) s->floor = s->ceil - 1; }); } | | | | | | 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 | else s->ceil = hi; if (s->floor >= s->ceil) s->floor = s->ceil - 1; }); } COMMAND(equalize, ARG_1INT, ^ (int flr) { bool isfloor = (flr == 0); EDITSEL; editequalisexy(isfloor, &sel); addmsg(1, 6, SV_EDITE, sel.x, sel.y, sel.xs, sel.ys, isfloor); }) void setvdeltaxy(int delta, const struct block *sel) { loopselxy(s->vdelta = max(s->vdelta + delta, 0)); remipmore(sel, 0); } COMMAND(vdelta, ARG_1INT, ^ (int delta) { EDITSEL; setvdeltaxy(delta, &sel); addmsg(1, 6, SV_EDITD, sel.x, sel.y, sel.xs, sel.ys, delta); }) #define MAXARCHVERT 50 int archverts[MAXARCHVERT][MAXARCHVERT]; bool archvinit = false; COMMAND(archvertex, ARG_3INT, ^ (int span, int vert, int delta) { if (!archvinit) { archvinit = true; for (int s = 0; s < MAXARCHVERT; s++) for (int v = 0; v < MAXARCHVERT; v++) archverts[s][v] = 0; } if (span >= MAXARCHVERT || vert >= MAXARCHVERT || span < 0 || vert < 0) return; archverts[span][vert] = delta; }) COMMAND(arch, ARG_2INT, ^ (int sidedelta, int _a) { EDITSELMP; sel.xs++; sel.ys++; if (sel.xs > MAXARCHVERT) sel.xs = MAXARCHVERT; |
︙ | ︙ | |||
586 587 588 589 590 591 592 | ? (archverts[sel->xs - 1][x] + (y == 0 || y == sel->ys - 1 ? sidedelta : 0)) : (archverts[sel->ys - 1][y] + (x == 0 || x == sel->xs - 1 ? sidedelta : 0))); remipmore(sel, 0); }) | | | | 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | ? (archverts[sel->xs - 1][x] + (y == 0 || y == sel->ys - 1 ? sidedelta : 0)) : (archverts[sel->ys - 1][y] + (x == 0 || x == sel->xs - 1 ? sidedelta : 0))); remipmore(sel, 0); }) COMMAND(slope, ARG_2INT, ^ (int xd, int yd) { EDITSELMP; int off = 0; if (xd < 0) off -= xd * sel.xs; if (yd < 0) off -= yd * sel.ys; sel.xs++; sel.ys++; struct block *sel_ = &sel; // Ugly hack to make the macro work. struct block *sel = sel_; loopselxy(s->vdelta = xd * x + yd * y + off); remipmore(sel, 0); }) COMMAND(perlin, ARG_3INT, ^ (int scale, int seed, int psize) { EDITSELMP; sel.xs++; sel.ys++; makeundo(); |
︙ | ︙ | |||
635 636 637 638 639 640 641 | fullbright, 0, 0, 1, if (fullbright) { if (noteditmode()) return; for (int i = 0; i < mipsize; i++) world[i].r = world[i].g = world[i].b = 176; }); | | | | | | | | | 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 | fullbright, 0, 0, 1, if (fullbright) { if (noteditmode()) return; for (int i = 0; i < mipsize; i++) world[i].r = world[i].g = world[i].b = 176; }); COMMAND(edittag, ARG_1INT, ^ (int tag) { EDITSELMP; struct block *sel_ = &sel; // Ugly hack to make the macro work. struct block *sel = sel_; loopselxy(s->tag = tag); }) COMMAND(newent, ARG_5STR, ^ (OFString *what, OFString *a1, OFString *a2, OFString *a3, OFString *a4) { EDITSEL; newentity(sel.x, sel.y, (int)Player.player1.origin.z, what, [a1 cube_intValueWithBase: 0], [a2 cube_intValueWithBase: 0], [a3 cube_intValueWithBase: 0], [a4 cube_intValueWithBase: 0]); }) |