Skip to content
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.

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

Update tbshotgun mdls with skinfamillies/lods, add pbr materials #796

Merged
merged 7 commits into from
Jul 29, 2024

Conversation

CozyMerc
Copy link
Contributor

@CozyMerc CozyMerc commented Feb 28, 2024

  • Both ptpov and w_ models now have proper skinfamillies resembling average r2 weapon setup (default/skin31/prime 0-6)
  • added lod0-lod3 models to the w_ model
  • removed references textures and models referencing weapons which were used as base for tb.
  • rpak is now only 1024x for tb, shell is 512x.
  • rpak now fully supports r2 pbr
  • rpak now contains newly created skin31 material + dummy materials for prime skins 1-6 to prevent missing texture issues
  • Replaced missing audio events with already existing sounds:
	format
	{old event}
	{new event}
	open
	{ event AE_CL_PLAYSOUND 4 "SG_Twin_B.Reload_Open" } 
 	{ event AE_CL_PLAYSOUND 3 "wpn_softball_reload_start_mech_fr05_1p" } 
        eject
	{ event AE_CL_PLAYSOUND 8 "SG_Twin_B.Reload_Eject" } 
	{ event AE_CL_PLAYSOUND 0 "Weapon_Sidewinder_Reload_1_1P" } 
	load shell
	{ event AE_CL_PLAYSOUND 20 "SG_Twin_B.Reload_InsertMag" } 
	{ event AE_CL_PLAYSOUND 8 "Weapon_Mastiff_Reload_LoadShell" } 
	close
	{ event AE_CL_PLAYSOUND 19 "SG_Twin_B.Reload_Close" }
	{ event AE_CL_PLAYSOUND 28 "Weapon_RE45_Reload_MagInsert" } 
	draw
	{ event AE_CL_PLAYSOUND 0 "SG_twinB.Draw" }
	{ event AE_CL_PLAYSOUND 0 "Weapon_R101_Equip" } 
	holster
	{ event AE_CL_PLAYSOUND 0 "SG_twinB.Holster" }
	{ event AE_CL_PLAYSOUND 0 "Weapon_R101_UnEquip" } 

blender_kjX6TDLkRd

…r +skin31 support

- Both ptpov and w_ models now have proper skinfamillies resembling average r2 weapon setup (default/skin31/prime 0-6)
- Replaced missing audio events with already existing sounds:

//	open
//	{ event AE_CL_PLAYSOUND 4 "SG_Twin_B.Reload_Open" }
//
// 	{ event AE_CL_PLAYSOUND 3 "wpn_softball_reload_start_mech_fr05_1p" }
//
//	eject
//	{ event AE_CL_PLAYSOUND 8 "SG_Twin_B.Reload_Eject" }
//
// 	{ event AE_CL_PLAYSOUND 0 "Weapon_Sidewinder_Reload_1_1P" }
//
//	load shell
//	{ event AE_CL_PLAYSOUND 20 "SG_Twin_B.Reload_InsertMag" }
//
//	{ event AE_CL_PLAYSOUND 8 "Weapon_Mastiff_Reload_LoadShell" }
//
//	close
//	{ event AE_CL_PLAYSOUND 19 "SG_Twin_B.Reload_Close" }
//
//	{ event AE_CL_PLAYSOUND 28 "Weapon_RE45_Reload_MagInsert" }
//
//	draw
//	{ event AE_CL_PLAYSOUND 0 "SG_twinB.Draw" }
//
//	{ event AE_CL_PLAYSOUND 0 "Weapon_R101_Equip" }
//
//	holster
//	{ event AE_CL_PLAYSOUND 0 "SG_twinB.Holster" }
//
//	{ event AE_CL_PLAYSOUND 0 "Weapon_R101_UnEquip" }
//

- removed references textures and models referencing weapons which were used as base for tb.
- rpak is now only 1024x for tb, shell is 512x.
- rpak now contains newly created skin31 material + dummy materials for prime skins 1-6 to prevent missing texture issues
@GeckoEidechse GeckoEidechse added needs testing Changes from the PR still need to be tested needs code review Changes from PR still need to be reviewed in code feedback wanted Feedback is wanted whether the changes by this PR are desired labels Feb 28, 2024
- UVs in certain spots were wonky, and made lod changes very distracting
- lod positions were changed from [10,30,50] to [25,30,50] to minimize pop-in from 0-1, especially visible in thirdperson.
all lod changes were done with maxed model quality.
@CozyMerc
Copy link
Contributor Author

CozyMerc commented Feb 28, 2024

Since I used lod positions from wingman, db started looking wonky when swapping lods. Mostly in third person.

I tested the lod25 pos in PMs and it works perfectly, the lod still swaps in tpp @110fov w/o zoom, but as soon as you ads with any weapon it swaps to lod0.

tldr: corrected uvs and made sure lod swaps are seamless.
NorthstarLauncher_astESSsk9Z
https://youtu.be/8m4CPCPeKds

@GeckoEidechse
Copy link
Member

@EM4Volts

@EM4Volts
Copy link
Contributor

Looks fine ingame, didnt realize there were actual sound events for the db ingame, even fitting the reload perfectly. Guess respawn had the model done and just gave it to nexon then :/

But yeah pr is fine lovin the pbr :)

@GeckoEidechse GeckoEidechse added READY TO MERGE This mergeable right now and removed needs testing Changes from the PR still need to be tested feedback wanted Feedback is wanted whether the changes by this PR are desired labels Jun 29, 2024
Copy link
Contributor

@EM4Volts EM4Volts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally, (as said before, but didnt realize where the review button is)

Works. Xoxo

@GeckoEidechse GeckoEidechse removed the needs code review Changes from PR still need to be reviewed in code label Jul 6, 2024
@GeckoEidechse GeckoEidechse changed the title Update tbshotgun mdls with skinfamillies/lods , add pbr materials Update tbshotgun mdls with skinfamillies/lods, add pbr materials Jul 6, 2024
Copy link
Member

@GeckoEidechse GeckoEidechse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Signing off based on previous review done by @EM4Volts who added the twin-barrel shotgun initially

@GeckoEidechse
Copy link
Member

Putting this in the next feature release, consider this essentially merged :P

@GeckoEidechse GeckoEidechse merged commit d130ab7 into R2Northstar:main Jul 29, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
READY TO MERGE This mergeable right now
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants