Skip to content

Fix: Floor Tiles Z Fighting #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 26, 2022
Merged

Fix: Floor Tiles Z Fighting #616

merged 1 commit into from
Apr 26, 2022

Conversation

jilfranco-unity
Copy link
Contributor

@jilfranco-unity jilfranco-unity commented Apr 13, 2022 •
edited
Loading

Fixed some z fighting on the floor in the transition and boss room areas caused by overlapping floor tiles between the two Transition Area and Boss Room sections of the dungeon. I also did a rebake of lighting since tiles were moved around. Noticed the issue during the playtest and it was a super quick fix, so no Jira ticket

I have some images below, with the lava turned off so you can see from the outlines where the pieces used to overlap

Before:
image
image
zfight

After:
image
image
nozfight

@jilfranco-unity
fixed some z fighting on the floor in the transition and boss room ar…
91dc16c 
…eas + a rebake of lighting since those tiles were affected
@jilfranco-unity jilfranco-unity added 2-Easy This PR is trivial and can be reviewed quickly 1-Needs Review PR needs attention from the assignee and reviewers labels Apr 13, 2022
@fernando-cortez fernando-cortez added 2-One More Review One review in, one to go and removed 1-Needs Review PR needs attention from the assignee and reviewers labels Apr 26, 2022
@pdeschain pdeschain added 3-Good to Merge and removed 2-One More Review One review in, one to go labels Apr 26, 2022
@jilfranco-unity jilfranco-unity merged commit 8ece56e into develop Apr 26, 2022
@jilfranco-unity jilfranco-unity deleted the fix/floor-z-fighting branch April 26, 2022 18:24
SamuelBellomo added a commit that referenced this pull request Apr 28, 2022
@SamuelBellomo
Merge branch 'develop' into feature/bump-2021
23ba989 
* develop:
  generated files as well
  tmp commit for merge
  feat: test utilities script including Playmode test helpers (#484)
  feat: bump to pre.8 and fix compile issues [MTT-3413] (#631)
  feat: client network transform move to samples [MTT-3406] (#629)
  feat: in-game message feed [MTT-2678] [MTT-2318] (#601)
  feat: networked message channel (#605)
  Fixed Z Fighting of Floor Tiles Near Edge of Main Boss Room (#616)
  fix: SceneBootstrapper detects and allows TestRunner launches (#483)
  removed feature to set all players unready in char select when a player leaves or joins (#625)
  removed setting disconnect reason to UserRequested on clients entering post-game (#626)
  Disallowing portait orientation for auto rotation (#627)
  chore: removing QoS (#623)

# Conflicts:
#	Assets/BossRoom/Material/Characters/Character_Shadow.mat
#	Assets/BossRoom/Material/Characters/Enemy_Eyes_sheet.mat
#	Assets/BossRoom/Material/Characters/Enemy_Mouth_sheet.mat
#	Assets/BossRoom/Material/Characters/Hero_Eyes_sheet.mat
#	Assets/BossRoom/Material/Characters/Hero_Mouth_sheet.mat
#	Assets/BossRoom/Material/Characters/Toon/Hair_Mage_Girl.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Boss.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Imp.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Mage_Boy.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Mage_Girl.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Rogue_Girl.mat
#	Assets/BossRoom/Material/Characters/Toon/Head_Tank_Boy.mat
#	Assets/BossRoom/Material/Characters/Toon/Torso_Archer.mat
#	Assets/BossRoom/Material/Characters/Toon/Torso_Mage_Boy.mat
#	Assets/BossRoom/Material/Characters/Toon/Torso_Tank.mat
#	Assets/BossRoom/Material/Characters/Toon/Weapons_Archer.mat
#	Assets/BossRoom/Material/Characters/Toon/Weapons_Mage.mat
#	Assets/BossRoom/Material/Dungeon/env_spiderweb.mat
#	Assets/BossRoom/Scenes/BossRoom.unity
#	Assets/BossRoom/Scenes/CharSelect.unity
#	Assets/BossRoom/Scenes/PostGame.unity
#	Assets/BossRoom/Scenes/Startup.unity
#	Assets/BossRoom/URP/UniversalRenderPipelineAsset.asset
#	Assets/BossRoom/URP/UniversalRenderPipelineAsset_Renderer.asset
#	Assets/BossRoom/VFX/Materials/FX_Crystal.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Flame.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Flash_01.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Glow_10.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Glow_12.mat
#	Assets/BossRoom/VFX/Materials/FX_M_GroundCrack_2.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Shockwave.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Slash_01.mat
#	Assets/BossRoom/VFX/Materials/FX_M_Slash_02.mat
#	Assets/BossRoom/VFX/Materials/FX_M_StylizeSmoke_2.mat
#	Assets/BossRoom/VFX/Materials/FX_M_TargetingSphere_InRange.mat
#	Assets/BossRoom/VFX/Materials/FX_M_TargetingSphere_OutOfRange.mat
#	Assets/BossRoom/VFX/Materials/FX_M_TorchFire.mat
#	Assets/BossRoom/VFX/Materials/FX_Slash_01.mat
#	Assets/BossRoom/VFX/Materials/FX_SmokeDissolve.mat
#	Assets/BossRoom/VFX/Materials/FX_SmokeDissolve_Additive.mat
#	Assets/BossRoom/VFX/Materials/FX_Star.mat
#	Assets/BossRoom/VFX/Materials/GroundClick.mat
#	Assets/BossRoom/VFX/Materials/M_Archer_arrow.mat
#	Assets/BossRoom/VFX/Materials/M_MotionFlash.mat
#	Assets/BossRoom/VFX/Materials/TargetReticuleFriendly.mat
#	Assets/BossRoom/VFX/Materials/TargetReticuleHostile.mat
#	Assets/BossRoom/VFX/Materials/fx_mat_Chest.mat
#	Assets/BossRoom/VFX/Materials/fx_mat_GlowLine.mat
#	Assets/BossRoom/VFX/Materials/fx_mat_GlowLine_2.mat
#	Assets/BossRoom/VFX/Materials/spawndoor.mat
#	Assets/UniversalRenderPipelineGlobalSettings.asset.meta
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/GraphicsSettings.asset
#	ProjectSettings/ProjectSettings.asset
#	ProjectSettings/ProjectVersion.txt
SamuelBellomo added a commit that referenced this pull request Apr 28, 2022
@SamuelBellomo
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dog…
9fad5c0 
…fooding

* feature/bump-2021:
  material update
  update with right package lock
  generated files as well
  tmp commit for merge
  feat: test utilities script including Playmode test helpers (#484)
  feat: bump to pre.8 and fix compile issues [MTT-3413] (#631)
  feat: client network transform move to samples [MTT-3406] (#629)
  feat: in-game message feed [MTT-2678] [MTT-2318] (#601)
  feat: networked message channel (#605)
  Fixed Z Fighting of Floor Tiles Near Edge of Main Boss Room (#616)
  fix: SceneBootstrapper detects and allows TestRunner launches (#483)
  removed feature to set all players unready in char select when a player leaves or joins (#625)
  removed setting disconnect reason to UserRequested on clients entering post-game (#626)
  Disallowing portait orientation for auto rotation (#627)
  chore: removing QoS (#623)

# Conflicts:
#	Assets/BossRoom/Scenes/Startup.unity
#	Packages/manifest.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pdeschain pdeschain pdeschain approved these changes

@fernando-cortez fernando-cortez fernando-cortez approved these changes

@SamuelBellomo SamuelBellomo Awaiting requested review from SamuelBellomo

Assignees

@SamuelBellomo SamuelBellomo

@fernando-cortez fernando-cortez

Labels
2-Easy This PR is trivial and can be reviewed quickly 3-Good to Merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jilfranco-unity @pdeschain @fernando-cortez @SamuelBellomo