kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-02 06:19:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stickers: added lazy placement preview

Browse source
This commit is contained in:
NotAKidoS 2024-09-06 00:57:39 -05:00
parent d409bf1743
commit 9433779641
6 changed files with 157 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Stickers/Main.cs
View file

@ -1,4 +1,6 @@
using ABI_RC.Core.Player;
using ABI_RC.Core;
using ABI_RC.Core.Player;
using ABI_RC.Core.Savior;
using ABI_RC.Systems.InputManagement;
using MelonLoader;
using NAK.Stickers.Integrations;
@ -35,11 +37,19 @@ public class StickerMod : MelonMod
if (StickerSystem.Instance == null)
return;
if (StickerSystem.Instance.IsInStickerMode
&& Input.mouseScrollDelta.y != 0f
if (!MetaPort.Instance.isUsingVr
&& StickerSystem.Instance.IsInStickerMode)
{
if (Input.mouseScrollDelta.y != 0f
&& Cursor.lockState == CursorLockMode.Locked // prevent scrolling while in menus
&& !CVRInputManager.Instance.zoom) // prevent scrolling while using scroll zoom
{
StickerSystem.Instance.SelectedStickerSlot += (int)Input.mouseScrollDelta.y;
}
StickerSystem.Instance.PlaceStickerFromControllerRay(PlayerSetup.Instance.activeCam.transform, CVRHand.Left, true);
}
StickerSystem.Instance.UpdateStickerPreview(); // flashy flash
if (!ModSettings.Entry_UsePlaceBinding.Value)
return;

2
Stickers/Patches.cs
View file

@ -26,6 +26,8 @@ internal static class ControllerRayPatches
if (!StickerSystem.Instance.IsInStickerMode)
return;
StickerSystem.Instance.PlaceStickerFromControllerRay(__instance.rayDirectionTransform, __instance.hand, true); // preview
if (__instance._gripDown) StickerSystem.Instance.IsInStickerMode = false;
if (__instance._hitUIInternal || !__instance._interactDown)
return;

102
Stickers/Stickers/StickerData.cs
View file

@ -16,7 +16,6 @@ namespace NAK.Stickers
private Vector3 _lastPlacedPosition = Vector3.zero;
private readonly DecalType _decal;
private readonly DecalSpawner[] _decalSpawners;
private readonly Guid[] _textureHashes;
@ -27,7 +26,6 @@ namespace NAK.Stickers
{
PlayerId = playerId;
_decal = ScriptableObject.CreateInstance<DecalType>();
_decalSpawners = new DecalSpawner[decalSpawnersCount];
_materials = new Material[decalSpawnersCount];
_textureHashes = new Guid[decalSpawnersCount];
@ -35,14 +33,14 @@ namespace NAK.Stickers
for (int i = 0; i < decalSpawnersCount; i++)
{
_materials[i] = new Material(StickerMod.DecalSimpleShader);
_decal.decalSettings = new DecalSpawner.InitData
DecalSpawner.InitData decalSettings = new()
{
material = _materials[i],
useShaderReplacement = false,
inheritMaterialProperties = false,
inheritMaterialPropertyBlock = false,
};
_decalSpawners[i] = DecalManager.GetSpawner(_decal.decalSettings, 4096, 1024);
_decalSpawners[i] = DecalManager.GetSpawner(decalSettings, 4096, 1024);
}
_audioSource = new GameObject("StickerAudioSource").AddComponent<AudioSource>();
@ -54,7 +52,21 @@ namespace NAK.Stickers
_audioSource.maxDistance = 5f;
_audioSource.minDistance = 1f;
_audioSource.outputAudioMixerGroup = RootLogic.Instance.propSfx; // props are close enough to stickers
if (PlayerId == StickerSystem.PlayerLocalId) Object.DontDestroyOnLoad(_audioSource.gameObject); // keep audio source through world transitions
// this is a hack so judge and fuck off lol
if (PlayerId == StickerSystem.PlayerLocalId)
{
Object.DontDestroyOnLoad(_audioSource.gameObject); // keep audio source through world transitions
_previewMaterial = new Material(StickerMod.DecalSimpleShader);
_previewDecalSpawner = DecalManager.GetSpawner(new DecalSpawner.InitData
{
material = _previewMaterial, // default material
useShaderReplacement = false,
inheritMaterialProperties = false,
inheritMaterialPropertyBlock = false,
}, 4096, 1024);
}
}
public Guid GetTextureHash(int spawnerIndex = 0)
@ -97,9 +109,13 @@ namespace NAK.Stickers
Material material = _materials[spawnerIndex];
// Destroy the previous texture to avoid memory leaks
// destroy the previous texture to avoid memory leaks
if (material.mainTexture != null) Object.Destroy(material.mainTexture);
material.mainTexture = texture;
// update the preview as well i guess cause lame
if (_previewMaterial != null && _previewSpawnerIndex != spawnerIndex)
_previewMaterial.mainTexture = texture;
}
public void Place(RaycastHit hit, Vector3 forwardDirection, Vector3 upDirection, int spawnerIndex = 0)
@ -167,7 +183,14 @@ namespace NAK.Stickers
Object.Destroy(_materials[i]);
}
Object.Destroy(_decal);
if (_audioSource != null) Object.Destroy(_audioSource.gameObject);
if (_previewDecalSpawner != null) // local player only
{
_previewDecalSpawner.Release();
_previewDecalSpawner.staticGroups.Clear();
_previewDecalSpawner.movableGroups.Clear();
Object.Destroy(_previewMaterial);
}
}
public void PlayAudio()
@ -201,5 +224,70 @@ namespace NAK.Stickers
material.color = color;
}
}
#region Sticker Preview
private const float FLASH_FREQUENCY = 2f;
private readonly DecalSpawner _previewDecalSpawner;
private readonly Material _previewMaterial;
private int _previewSpawnerIndex = -1;
private float _flashTime;
public void PlacePreview(RaycastHit hit, Vector3 forwardDirection, Vector3 upDirection, int spawnerIndex = 0)
{
if (spawnerIndex < 0 || spawnerIndex >= _decalSpawners.Length)
{
StickerMod.Logger.Warning("Invalid spawner index for preview!");
return;
}
if (_previewDecalSpawner == null)
return; // uh fuck
// clear previous
ClearPreview();
// place at hit pos
Transform rootObject = null;
GameObject hitGO = hit.transform.gameObject;
if (hitGO.scene.buildIndex == 4 || hitGO.TryGetComponent(out Animator _) || hitGO.GetComponentInParent<Rigidbody>() != null)
rootObject = hitGO.transform;
Vector3 position = hit.point;
_previewDecalSpawner.AddDecal(position,
Quaternion.LookRotation(forwardDirection, upDirection),
hitGO,
DECAL_SIZE, DECAL_SIZE, 1f, 1f, 0f,
rootObject);
}
public void UpdatePreview(int spawnerIndex)
{
if (_previewSpawnerIndex != spawnerIndex)
{
_previewSpawnerIndex = spawnerIndex; // update the preview image
_previewMaterial.mainTexture = _materials[spawnerIndex].mainTexture;
}
_flashTime += Time.deltaTime;
float baseAlpha = (Mathf.Sin(_flashTime * 2f * Mathf.PI / FLASH_FREQUENCY) + 1f) / 2f;
float alpha = Mathf.Lerp(0.5f, 0.8f, baseAlpha); // 50% to 80% alpha
Color color = _previewMaterial.color;
color.a = alpha;
_previewMaterial.color = color;
}
public void ClearPreview()
{
if (_previewDecalSpawner == null)
return;
_previewDecalSpawner.Release();
_previewDecalSpawner.staticGroups.Clear();
_previewDecalSpawner.movableGroups.Clear();
}
#endregion Sticker Preview
}
}

11
Stickers/Stickers/StickerSystem.Main.cs
View file

@ -83,11 +83,18 @@ public partial class StickerSystem
set
{
_isInStickerMode = value;
if (_isInStickerMode) CohtmlHud.Instance.SelectPropToSpawn(
if (_isInStickerMode)
{
CohtmlHud.Instance.SelectPropToSpawn(
StickerCache.GetCohtmlResourcesPath(SelectedStickerName),
Path.GetFileNameWithoutExtension(SelectedStickerName),
"Sticker selected for stickering:");
else CohtmlHud.Instance.ClearPropToSpawn();
}
else
{
CohtmlHud.Instance.ClearPropToSpawn();
ClearStickerPreview();
}
}
}

35
Stickers/Stickers/StickerSystem.StickerLifecycle.cs
View file

@ -20,7 +20,7 @@ public partial class StickerSystem
return stickerData;
}
public void PlaceStickerFromControllerRay(Transform transform, CVRHand hand = CVRHand.Left)
public void PlaceStickerFromControllerRay(Transform transform, CVRHand hand = CVRHand.Left, bool isPreview = false)
{
Vector3 controllerForward = transform.forward;
Vector3 controllerUp = transform.up;
@ -37,6 +37,12 @@ public partial class StickerSystem
? Vector3.Slerp(controllerUp, playerUp, 0.99f)
: controllerUp;
if (isPreview)
{
PlaceStickerPreview(transform.position, controllerForward, targetUp);
return;
}
if (!PlaceStickerSelf(transform.position, transform.forward, targetUp))
return;
@ -53,7 +59,7 @@ public partial class StickerSystem
return true;
}
private bool AttemptPlaceSticker(string playerId, Vector3 position, Vector3 forward, Vector3 up, bool alignWithNormal = true, int stickerSlot = 0)
private bool AttemptPlaceSticker(string playerId, Vector3 position, Vector3 forward, Vector3 up, bool alignWithNormal = true, int stickerSlot = 0, bool isPreview = false)
{
StickerData stickerData = GetOrCreateStickerData(playerId);
if (Time.time - stickerData.LastPlacedTime < StickerCooldown)
@ -69,6 +75,12 @@ public partial class StickerSystem
if (hit.transform.gameObject.name.StartsWith("[NoSticker]"))
return false;
if (isPreview)
{
stickerData.PlacePreview(hit, alignWithNormal ? -hit.normal : forward, up, stickerSlot);
return true;
}
stickerData.Place(hit, alignWithNormal ? -hit.normal : forward, up, stickerSlot);
stickerData.PlayAudio();
return true;
@ -155,5 +167,24 @@ public partial class StickerSystem
_playerStickers[PlayerLocalId] = localStickerData;
}
public void PlaceStickerPreview(Vector3 position, Vector3 forward, Vector3 up)
{
AttemptPlaceSticker(PlayerLocalId, position, forward, up, true, SelectedStickerSlot, true);
}
public void UpdateStickerPreview()
{
if (!IsInStickerMode) return;
StickerData localStickerData = GetOrCreateStickerData(PlayerLocalId);
localStickerData.UpdatePreview(SelectedStickerSlot);
}
public void ClearStickerPreview()
{
StickerData localStickerData = GetOrCreateStickerData(PlayerLocalId);
localStickerData.ClearPreview();
}
#endregion Sticker Lifecycle
}