Skip to content
Snippets Groups Projects

Add interpolation to hitbox viewer, tweak hitbox colors

Merged sphere requested to merge bbox-tweaks into bbox
All threads resolved!

This branch adds interpolation to hitboxes viewed with renderhitbox, so that they don't look distractingly choppy in motion. Using the cvar renderhitbox_interpolation, it can be disabled if desired.

Additionally, it groups blue sphere hitboxes together with rings, and also adds a couple of new colors for specific types of objects:

  • Added orange for MF_MISSILE|MF_PAIN
  • Added green for MF_PUSHABLE
  • Added magenta for MF_SPRING
Edited by sphere

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • added Enhancement label

  • sphere changed the description

    changed the description

  • sphere added 23 commits

    added 23 commits

    • 9bfc82a1 - Prevent comptime.* from failing compilation
    • a614865d - Make comptime.sh conform to POSIX and less redundant, among other improvements
    • b7711b2b - Pass argument list directly to functions that use them; quote arguments when used.
    • 9277870f - Merge branch 'cmake-develop-flag' into 'next'
    • ce5c41d7 - Merge branch 'the-one-cmake' into 'next'
    • b637df4c - removed a name from credits by request
    • e8a6026c - Merge branch 'circleci' into 'master'
    • bd2bfe46 - Merge branch 'master' into 'master'
    • c008dc4d - Merge branch 'master' into 'master'
    • dc02339c - Merge branch 'comptime-no-fail' into 'master'
    • 3b9ed3e8 - EV_DoFloor: Set dummy tag correctly for chained linedef executing
    • 937127e9 - Disable exit sectors in non-NiGHTS special stages because they interfere with the pits
    • 6bbb0325 - UDMF: Use string values for the sector "triggerer" field
    • e472c551 - Re-add P_ThingOnSpecial3DFloor for Lua backwards compatibility
    • a6599c17 - Change gamepad defaults for 2.2.11
    • c25cb573 - Merge branch 'specialstagepit-fix' into 'next'
    • 6055b149 - Merge branch 'udmf-triggerer' into 'next'
    • 02fa860c - Merge branch 'thingonspecial3dfloor' into 'next'
    • efca1ecc - Merge branch 'floormover-tag-fix' into 'next'
    • 337a94eb - Merge branch '2211-gamepaddefaults' into 'next'
    • 4f8d2fcd - fix ARM builds being completely broken
    • 70786081 - Merge GitHub PR #514 into next
    • cdae9633 - Merge branch 'next' into bbox-tweaks

    Compare with previous version

  • added Uncapped label

  • sphere added 160 commits

    added 160 commits

    • d764d68d - Turn dispoffset into a mobj field
    • f7b166da - Refresh sprite2s
    • c0a2d31a - Merge remote-tracking branch 'upstream/2210-release' into refresh-spr2
    • 3da9fb63 - Add plane scroller features to binary map format:
    • fe8485cc - Add flag to set wind/current/push/pull strength using X offset
    • cc3d4acd - Fix AppVeyor build failure
    • 049bfd7b - Minor code cleanup in P_ConvertBinaryLinedefTypes
    • 2714ac44 - reallow score chains from rolling
    • 373af010 - Add startswith and endswith, functions that compare the beginning or ending of a string
    • b1a86b0b - Disallow adding files with absolute path or traversing upward
    • 3bd3369f - Add fopenfile, alternative to fopen that does not ever open directories
    • 9761ab52 - FIL_ReadFileTag: use fopenfile
    • 76879299 - Restrict exec path to srb2 directories
    • 1b43cddd - Allow saving in modified games.
    • bcfe0da8 - Use old modded behavior when loading old files, instead of ignoring
    • 4a520e63 - Don't allow a gamedata named the same as the default time attack folder
    • a22fa1c4 - Compromise on cheats setting modified game
    • f082acbb - Don't allow Record Attack in cheated games
    • 947dbda0 - Use savemoddata for ultimate file check
    • d3ff5342 - Minor adjustments
    • 5103253e - Allow unlockable executors again
    • 969dc481 - Allow cosmetic add-ons mid-save
    • 256d9b5f - Uncap console opening/closing animation
    • 435e1f6e - Make con_height adjustable on the fly
    • 396db189 - Draw the input prompt while the console is moving
    • 9a7d1576 - Merge branch '22-exec-files-only' into 'public_next'
    • cf699f23 - Merge branch 'next' into public_next
    • 5cb13f9d - Bump SRB2VERSION and MODVERSION for 2.2.11 pre1
    • aac04b81 - Merge branch '22-safe-addfolder' into 'public_next'
    • df131ef1 - Bump SRB2VERSION and MODVERSION for 2.2.11 pre2
    • 4c72154d - Merge remote-tracking branch 'local-SRB2/next' into public_next
    • 9e191d07 - Bump SRB2VERSION and MODVERSION for 2.2.11 pre3
    • 30df486d - Update zones.pk3 hash for pre3 (oops)
    • ba2a4f06 - Merge branch 'next' into public_next
    • 449d2774 - Fixes Issue #912 (closed)
    • e909f8ec - Fixes Issue #711 (closed)
    • 52384053 - When attaching to a wall to do a climb, the second sidedef wasn't be handled properly.
    • bd89b97e - Fixes issue #704 (closed)
    • 7d53e464 - Fixes issue #568 (closed)
    • af146071 - Check for spindash ability and dashspeed being > 0 before indiscriminately setting roll animation.
    • 28f97dcd - Also fix #618 (closed) since it is highly related.
    • 20724ad7 - Also retain PF_CANCARRY
    • b64dac71 - Fix -Wnon-literal-null-conversion and -Wconstant-conversion warnings
    • 4a1e9972 - Merge branch 'next' into public_next
    • aba57612 - -Only print deprecated map effect warnings once on map load
    • 9a9a1618 - Disable floor splat slope interpolation
    • d58dad7f - Move emblem float option to args[1], since args[0] is already occupied for NiGHTS emblems
    • 283f7e89 - Linedef type 14 UDMF conversion: Don't fill stringargs[0] if toptexture is empty
    • 6e7ff697 - Re-add code that sets MF2_AMBUSH if MTF_AMBUSH is set, but only for binary maps
    • bb9e7045 - Fix wrong flag being checked in P_ProcessTeamBase
    • a32dc3da - Fix software vsync
    • 20bfa8d9 - Merge branch 'flagfix' into 'next'
    • 1dfb8ed4 - Merge branch 'issue912a' into 'next'
    • 7eabccbf - Merge branch 'issue568' into 'next'
    • c42ef9f1 - Fix IT and ctf flag sign interpolation
    • 89e7ef16 - Merge branch 'issue711' into 'next'
    • 51d32f87 - Merge branch 'deprecation-warnings' into 'next'
    • 684566eb - Merge branch 'emblem-fix' into 'next'
    • b4e1f2d4 - Merge branch 'udmf-defaults' into 'next'
    • 171f5ac2 - Merge branch 'ambush-fix' into 'next'
    • a308ad11 - Merge branch 'ctf-interpolation' into 'next'
    • 851ca92a - revert Eidolon's edits for testing the IT/CTF flag sign fixes, they were left in by mistake
    • b5c3b30f - Merge branch 'fix-wnon-literal-null-conversion-and-wconstant-conversion' into 'next'
    • 57148ef9 - Fix Explosion Ring explosion interpolation
    • a95f5ba7 - Merge branch 'next' into public_next
    • 3c7e8e9a - Merge branch 'explosion-interpolation' into 'next'
    • ac4d89e4 - Merge branch 'sw-vsync-fix' into 'next'
    • 404492cb - Merge branch 'floorspriteslope-interp-disable' into 'next'
    • 2a50626b - Initial commit
    • db4de0f5 - sdl/i_video.c: fix compile prior to SDL 2.0.18
    • e4878696 - exec: pass on com_flags
    • a39f69c9 - Reset com_flags at end of COM_BufExecute
    • 5d08bfd7 - Rename CV_NOLUA to CV_ALLOWLUA, opt IN to Lua mutability
    • 15e3d0e6 - Fix toggle command and add command being able to bypass Lua restriction
    • ff0f6e9b - Add CV_ALLOWLUA to a bunch of cvars
    • 0405df1a - Merge COM_SAFE with other COM flags
    • 8a6f2e56 - Add a flags parameter to COM_AddCommand
    • 49f1462f - Only let Lua run commands registered with COM_LUA
    • 07e44973 - Add COM_LUA to a bunch of commands
    • 62aef145 - Fix time functions not starting from zero
    • 0f9c5582 - Add basic rate limitation for Lua file access
    • 540c5d6c - Add flag to action 433 to force MFE_VERTICALFLIP
    • 498c9da8 - Don't attract bomb spheres with Attraction shield
    • 91ef59f7 - Fix tiny regression with special stage tally
    • 1470d099 - Update copyright year & credits
    • e82bb933 - Merge branch 'botchanges' into 'next'
    • 3f499178 - Merge branch 'forceverticalflipflag' into 'next'
    • 3c819384 - Merge branch 'io-limit' into 'next'
    • 9d6456c3 - Merge branch 'next' into public_next
    • 2e3963fd - Fix buffer overflow for setcontrol with 2 arguments
    • 8218ce0f - Fix use-after-free when Metal Sonic charges energy balls
    • 16ad23f0 - Fix flag mixup in P_GetOldFOFFlags()
    • 8b77af73 - Fix segfault when killing wall spike while it moves
    • 4c02bde4 - Fix crash during debug when escaping pterabyte
    • 1cd5e10a - Fix custom ambient sound mobjs not working
    • 846cf71e - F_StartTitleScreen: Make sure the level header for gamemap always exists
    • 8486bd08 - R_SkinUsable: Only check header of current map if one exists
    • b98af785 - Merge branch 'fofflags-bruh' into 'next'
    • cb849ca4 - Fix segfault when first mobj in overlaycap is removed
    • cf67ba1d - fixup! Fix segfault when killing wall spike while it moves
    • 4b6de096 - Define cv_addons_folder in dedicated
    • 9e8200c1 - Merge branch 'ambient-sound-fix' into 'next'
    • efee7508 - Merge branch 'mapheader-alloc-fix' into 'next'
    • 29582e45 - Merge branch 'ptera-escape-bad-state' into 'next'
    • d6375b1e - Merge branch 'fix-wallspike-segfault' into 'next'
    • 4f8625ef - Merge branch 'metal-sonic-use-after-free' into 'next'
    • 6258f14b - Merge branch 'setcontrol-buffer-overflow' into 'next'
    • 630c3241 - Merge branch 'dedicatedaddonsfolder' into 'public_next'
    • 2df3fb53 - Merge branch 'strong-lua-command-restrictions' into 'next'
    • 9499cb54 - Merge branch 'next' into public_next
    • 488f0fdf - bruh
    • c6159493 - Fix titlecard hook being inconsistent on map load
    • 930b1355 - Don't call P_ResetCamera when spawning a bot
    • 2e048ec6 - Merge branch 'titlecardticker' into 'next'
    • 57b0dfcf - Merge branch 'nobotcamerareset' into 'next'
    • e4f92cc6 - Always important
    • 3135cd37 - Merge branch 'next' into public_next
    • 072dd2ed - Fix segfault when removing source from ShouldDamage
    • ad412c97 - Fix segfault when damaging mobj with no painstate
    • e5a1fee7 - Adjust default look/turn axis for new SDL2 version
    • 6ff37b47 - Skip emerald bounce logic in Y_Ticker on dedicated
    • c2c43085 - If Lua disabled intermission emeralds, skip sounds
    • 2d315307 - A_PointyThink crash fix (patch from #827 (closed))
    • d6cafea5 - Don't force FLS to false after a pre-map cutscene
    • a78922d0 - Merge branch 'first-overlay-remove-fix' into 'next'
    • 5995c100 - Merge branch 'fix-remove-source-damage' into 'next'
    • f83f1a12 - Merge branch 'fix-mobj-damage-null-pain-state' into 'next'
    • eabfadfd - Merge branch 'dedicatedemeraldbounce' into 'next'
    • ccec7398 - Merge branch 'pointy-think-crash-fix' into 'next'
    • ae0afe03 - Merge branch 'precutfls' into 'next'
    • 62deaaad - Merge branch 'issue704' into 'next'
    • f1147618 - Merge branch 'next' into public_next
    • 03971f58 - Fix segfault when shields are removed after thinking
    • ed46dd08 - Prevent tmthing crash with P_SpawnParaloop in Lua
    • b99ecde7 - Fix [BOT] indicator color not being cleared
    • b487a715 - Fix light fades being unable to lower light levels
    • e086d574 - Merge branch 'next' into public_next
    • 2c689bae - 2.2.11
    • 6bb3ee22 - Fix segfault when going up steep slopes in rare cases
    • d4951f7c - Fix segfault when Crushstaceans hit a player with Armageddon shield
    • 2f98cd3b - Fix I_GetFreeMem
    • 7dc74fc3 - Fix declaration of I_GetFreeMem in src/dummy/i_system.c
    • b9c86a0f - Zone Builder config updates
    • e4933b3e - Merge branch 'allow-modified-saving' into 'next'
    • 55d96daa - Merge branch 'refresh-spr2' into 'next'
    • ce504d4e - Merge branch 'mobj-dispoffset' into 'next'
    • 777a1c6b - Merge branch 'plane-scroller-tweaks-again' into 'next'
    • cf0c5f90 - Merge branch 'midsave-addons' into 'next'
    • 1a0c9310 - Merge branch 'nobombsphereattract' into 'next'
    • cb3acbc7 - Merge branch 'fixlightleveldecrease' into 'next'
    • 89ce385f - Merge branch 'fix-null-standingslope' into 'next'
    • 5fe6138f - Merge branch 'fix-removed-shield-segfault' into 'next'
    • 19de187b - Merge branch 'fix-getfreemem' into 'next'
    • 1043a523 - Merge branch 'fix-crushclaw-armageddon-hit' into 'next'
    • 796c06e2 - Merge branch 'issue834' into 'next'
    • c37af2bf - Merge branch 'uncap-console' into 'next'
    • 38575f52 - Merge branch 'scoreattacked' into 'next'
    • 53e7e0dd - Add toggle for interpolating drawn hitboxes
    • d495f730 - Merge branch 'next' into bbox-tweaks
    • 0f53ec31 - Actually register hitbox interpolation cvar

    Compare with previous version

  • sphere marked this merge request as draft from cf67ba1d

    marked this merge request as draft from cf67ba1d

  • sphere marked this merge request as ready

    marked this merge request as ready

  • sphere changed the description

    changed the description

  • sphere added 1 commit

    added 1 commit

    • d18e6e34 - Add CV_SAVE to hitbox interpolation cvar

    Compare with previous version

  • Zwip-Zwap Zapony
  • sphere resolved all threads

    resolved all threads

  • sphere added 1 commit

    added 1 commit

    • ccd60bc0 - Swap registration order for hitbox rendering cvars

    Compare with previous version

  • sphere mentioned in commit 8c08eb16

    mentioned in commit 8c08eb16

  • merged

  • sphere changed milestone to %2.2.12

    changed milestone to %2.2.12

  • Please register or sign in to reply
    Loading