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

arg fish effect and other shaders #52

Merged
merged 59 commits into from
Dec 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
9d08843
base screen space effect
w1n7er87 Nov 1, 2023
53f33d0
backup before shader graph install
w1n7er87 Nov 2, 2023
2ccf157
reorg
w1n7er87 Nov 2, 2023
ba6c21c
uuh back to manual shader writing for now i guess
w1n7er87 Nov 2, 2023
d3165b4
where am i ?
w1n7er87 Nov 3, 2023
391e973
Revert "where am i ?"
w1n7er87 Nov 3, 2023
626a6ba
so back
w1n7er87 Nov 4, 2023
db886b7
English lesson + some changes
w1n7er87 Nov 4, 2023
c1938ce
somewhat useable
w1n7er87 Nov 4, 2023
b1105b9
Merge branch 'main' into uuh
w1n7er87 Nov 4, 2023
7788f54
uuh
w1n7er87 Nov 5, 2023
80c60fc
some improvements and fixes
w1n7er87 Nov 6, 2023
4018491
new effect, shader refactor and some changes
w1n7er87 Nov 6, 2023
ab82823
Merge remote-tracking branch 'upstream/main' into uuh
w1n7er87 Nov 6, 2023
96bc26d
buh
w1n7er87 Nov 6, 2023
50dcbd9
huge refactor
w1n7er87 Nov 7, 2023
d50260c
depth clipping and some changes
w1n7er87 Nov 9, 2023
cd9cf8c
Merge remote-tracking branch 'upstream/main' into uuh
w1n7er87 Nov 9, 2023
d3c9e6d
better (?) instancing
w1n7er87 Nov 9, 2023
c77d648
1 material instance per object instance
w1n7er87 Nov 10, 2023
6e984a2
add pass IDs
w1n7er87 Nov 10, 2023
350411f
new effect and some changes
w1n7er87 Nov 10, 2023
960c26c
effect similar to that among us one
w1n7er87 Nov 11, 2023
dbf5f1a
image overlay and some small additions
w1n7er87 Nov 11, 2023
fbf1572
all the mess
w1n7er87 Nov 17, 2023
daac77f
last fix
w1n7er87 Nov 18, 2023
c5b91df
Merge branch 'main' into uuh
w1n7er87 Nov 23, 2023
e931316
Update Tri-Inspector
w1n7er87 Nov 23, 2023
a6ebc96
disable on-object effect if above water
w1n7er87 Nov 23, 2023
c9351ba
rename
w1n7er87 Nov 25, 2023
64ef15c
custom property block, I guess? + renamings
w1n7er87 Nov 25, 2023
135b21e
small things
w1n7er87 Nov 26, 2023
e446294
property refactor, ARG vram usage fix
w1n7er87 Nov 26, 2023
ca6b66d
<summary> xdx
w1n7er87 Nov 28, 2023
64171e0
moving files
w1n7er87 Nov 28, 2023
2d639a1
registering
w1n7er87 Nov 28, 2023
09e3cab
Merge branch 'main' into uuh
w1n7er87 Nov 28, 2023
3cf9b1a
Add namespace to T2DArray
Alexejhero Nov 29, 2023
a5ad9eb
Merge branch 'main' into pr/52
Alexejhero Nov 29, 2023
4bda49d
addressing issues
w1n7er87 Nov 29, 2023
f45560c
texture 2d array as an asset
w1n7er87 Nov 29, 2023
2bda7b4
little thing
w1n7er87 Dec 3, 2023
942be54
removed some lines
w1n7er87 Dec 8, 2023
a8f8a3b
removed more lines
w1n7er87 Dec 9, 2023
83728fa
added image position for image overlay
w1n7er87 Dec 10, 2023
ab3bf07
added some lines back
w1n7er87 Dec 10, 2023
de3ca63
small fix
w1n7er87 Dec 10, 2023
3be5ffa
cosmetics
w1n7er87 Dec 10, 2023
0c96f80
Merge branch 'main' into pr/52
Alexejhero Dec 12, 2023
9f5fd9e
Add missing component on hiyorifish
Alexejhero Dec 12, 2023
5753da2
Merge branch 'uuh' of https://github.com/w1n7er87/Neurosama-Subnautic…
Alexejhero Dec 12, 2023
8b32915
:classic: πŸ¦† Alex changing a bunch of stuff for no reason
Alexejhero Dec 12, 2023
e45331d
fix assets build
Alexejhero Dec 12, 2023
54f420a
small post-Alex
w1n7er87 Dec 12, 2023
bd53fa3
Update T2DArray.cs
w1n7er87 Dec 13, 2023
ced1633
Update Registry.asset
w1n7er87 Dec 13, 2023
51161b5
renamed MatPassID
w1n7er87 Dec 14, 2023
51e15ef
fix substract blending and preview size
w1n7er87 Dec 14, 2023
3b85966
Merge branch 'main' into uuh
Alexejhero Dec 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion SCHIZO/ConsoleCommands/RegisterConsoleCommandsAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Linq;
using System.Reflection;
using JetBrains.Annotations;
using Nautilus.Commands;
using Nautilus.Handlers;

namespace SCHIZO.ConsoleCommands;
Expand Down
12 changes: 6 additions & 6 deletions SCHIZO/Creatures/Ermfish/ErmStack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,19 +140,19 @@ public static void Disconnect(ErmStack node, bool plugSide = true)
public bool Connect(ErmStack node, bool nodeIsPlug) => nodeIsPlug ? Connect(node, this) : Connect(this, node);
public void Disconnect(bool plugSide = true) => Disconnect(this, plugSide);

public bool ShouldAttach(Carryable _, CarryCreature socket)
public bool ShouldAttach(Carryable _, CarryCreature attachSocket)
{
ErmStack socketStack = socket.GetComponent<ErmStack>();
ErmStack socketStack = attachSocket.GetComponent<ErmStack>();
if (!socketStack) return true;

return socketStack.head != head && socketStack.tail != tail
&& !socketStack.nextPlug;
}

public void OnConnected(Carryable plug, CarryCreature socket)
public void OnConnected(Carryable connectedPlug, CarryCreature connectedSocket)
{
// only called on the plug side - so we update the socket from the plug
ErmStack socketStack = socket.GetComponent<ErmStack>();
ErmStack socketStack = connectedSocket.GetComponent<ErmStack>();
if (!socketStack) return;

socketStack.nextPlug = this;
Expand All @@ -162,10 +162,10 @@ public void OnConnected(Carryable plug, CarryCreature socket)
socketStack.WalkToHead().ForEach(s => s.tail = tail);
}

public void OnDisconnected(Carryable plug, CarryCreature socket)
public void OnDisconnected(Carryable disconnectedPlug, CarryCreature disconnectedSocket)
{
// only called on the plug side - so we update the socket from the plug
ErmStack socketStack = socket.GetComponent<ErmStack>();
ErmStack socketStack = disconnectedSocket.GetComponent<ErmStack>();
if (!socketStack) return;

socketStack.nextPlug = null;
Expand Down
2 changes: 1 addition & 1 deletion SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public override void OnTouch(Collider collider)

GameObject target = GetTarget(collider);

if (global::CreatureData.GetCreatureType(gameObject) == global::CreatureData.GetCreatureType(target)) return;
if (CreatureData.GetCreatureType(gameObject) == CreatureData.GetCreatureType(target)) return;
if (GetComponentsInParent<IOnMeleeAttack>().Any(handler => handler.HandleMeleeAttack(target))) return;

Player player = target.GetComponent<Player>();
Expand Down
1 change: 0 additions & 1 deletion SCHIZO/Creatures/UnityCreaturePrefab.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Diagnostics.CodeAnalysis;
using ECCLibrary;
using Nautilus.Handlers;
using SCHIZO.Helpers;
using SCHIZO.Items;
using UnityEngine;
using UWE;
Expand Down
4 changes: 2 additions & 2 deletions SCHIZO/DataStructures/SavedRandomList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public sealed class SavedRandomList<T> : IEnumerable<T>
{
private record struct IdentifiableItem(string Identifier, T Value);

private class PlayerPrefsManager(string key) : RandomList<IdentifiableItem>.IInitialStateModifier
private class PlayerPrefsManager(string playerPrefsPrefix) : RandomList<IdentifiableItem>.IInitialStateModifier
{
private record struct RegistryKey(string Value);

Expand Down Expand Up @@ -46,7 +46,7 @@ public void Reset()
}
}

private RegistryKey KeyOf(string identifier) => new($"SCHIZO_RandomList_{key}_{identifier}");
private RegistryKey KeyOf(string identifier) => new($"SCHIZO_RandomList_{playerPrefsPrefix}_{identifier}");

private static bool Contains(RegistryKey key) => PlayerPrefs.HasKey(key.Value);

Expand Down
1 change: 0 additions & 1 deletion SCHIZO/Helpers/StaticHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using HarmonyLib;
using TriInspector;

namespace SCHIZO.Helpers;
Expand Down
2 changes: 1 addition & 1 deletion SCHIZO/Items/ClonePrefab.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ public abstract class ClonePrefab : UnityPrefab
protected readonly TechType clonedTechType;

[SetsRequiredMembers]
protected ClonePrefab(ModItem item, TechType cloned) : base(item)
// ReSharper disable once ConvertToPrimaryConstructor
protected ClonePrefab(ModItem item, TechType cloned) : base(item)
{
clonedTechType = cloned;
}
Expand Down
2 changes: 1 addition & 1 deletion SCHIZO/Items/Components/MiddleClickAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void IPrefabInit.PrefabInit(GameObject prefab)

private string Validate(TechType techType)
{
if (target?.GetType() is not { } type)
if (target!?.GetType() is not { } type)
return $"{nameof(target)} is required and was not provided";

MethodInfo methodInfo = type.GetMethod(method);
Expand Down
1 change: 0 additions & 1 deletion SCHIZO/Items/Data/Crafting/Recipe.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Collections.Generic;
using System.Linq;
using Nautilus.Crafting;

Expand Down
2 changes: 1 addition & 1 deletion SCHIZO/Items/Gymbag/Gymbag.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
ο»Ώusing System.Diagnostics.CodeAnalysis;
using Nautilus.Handlers;
using SCHIZO.Helpers;
using UnityEngine;

namespace SCHIZO.Items.Gymbag;
Expand All @@ -15,6 +14,7 @@ public sealed class Gymbag : ClonePrefab
#endif

[SetsRequiredMembers]
// ReSharper disable once ConvertToPrimaryConstructor
public Gymbag(ModItem modItem) : base(modItem, CLONE_TARGET)
{
}
Expand Down
3 changes: 1 addition & 2 deletions SCHIZO/Items/UnityPrefab.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using SCHIZO.Helpers;
using SCHIZO.Items.Data;
using SCHIZO.Registering;
using SCHIZO.Sounds;
using SCHIZO.Spawns;
using UnityEngine;
using Object = UnityEngine.Object;
Expand All @@ -34,8 +33,8 @@ static UnityPrefab()
protected PrefabInfo PrefabInfo => ModItem.PrefabInfo;

[SetsRequiredMembers]
public UnityPrefab(ModItem item) : base(item)
// ReSharper disable once ConvertToPrimaryConstructor
public UnityPrefab(ModItem item) : base(item)
{
ModItem = item;
}
Expand Down
1 change: 0 additions & 1 deletion SCHIZO/Jukebox/CustomJukeboxDisk.BelowZero.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Text;
using FMODUnity;
using Nautilus.Handlers;
using Nautilus.Utility;
using SCHIZO.Sounds;
Expand Down
4 changes: 1 addition & 3 deletions SCHIZO/Loading/BZErmsharkLoadingIcon.BelowZero.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public static implicit operator BZAnimation(FrameAnimation anim)
private int originalCols;

private RectTransform rectTransform;
private RectTransform rectParent;

private Vector2 originalSpriteDimensions => new(originalTexture.width / originalCols, originalTexture.height / originalRows);
private Vector2 ourSpriteDimensions => new(texture.width / columns, texture.height / rows);
Expand All @@ -47,10 +46,9 @@ private void Awake()
Destroy(this);
return;
}
/// indices correspond to <see cref="uGUI_SceneLoading.State"/>
// indices correspond to <see cref="uGUI_SceneLoading.State"/>
ourAnimations = [idle, moving, stopping];
rectTransform = loadingScreen.pengling.rectTransform;
rectParent = (RectTransform) rectTransform.parent;

originalAnimations = loadingScreen.animations;
originalTexture = loadingScreen.pengling.mainTexture;
Expand Down
2 changes: 0 additions & 2 deletions SCHIZO/Plugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
using BepInEx;
using BepInEx.Logging;
using ECCLibrary;
using FMOD;
using FMODUnity;
using HarmonyLib;
using SCHIZO.ConsoleCommands;
using SCHIZO.Helpers;
Expand Down
3 changes: 2 additions & 1 deletion SCHIZO/Resources/AssetBundles/Assets.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace SCHIZO.Resources;

public static class Assets
{
private const int _rnd = 540950466;
private const int _rnd = 1806208691;

private static readonly UnityEngine.AssetBundle _a = ResourceManager.GetAssetBundle("assets");

Expand All @@ -25,4 +25,5 @@ public static class Assets
public static SCHIZO.Options.Bool.ToggleModOption Mod_Options_DisableAllSounds = _a.LoadAsset<SCHIZO.Options.Bool.ToggleModOption>("Assets/Mod/Options/Disable all sounds.asset");
public static SCHIZO.Options.Bool.ToggleModOption Mod_Options_EnableAutomaticEvents = _a.LoadAsset<SCHIZO.Options.Bool.ToggleModOption>("Assets/Mod/Options/Enable automatic events.asset");
public static SCHIZO.Registering.ModRegistry Mod_Registry = _a.LoadAsset<SCHIZO.Registering.ModRegistry>("Assets/Mod/Registry.asset");
public static UnityEngine.Material Mod_VFX_ARGCensor_ARGcensorMat = _a.LoadAsset<UnityEngine.Material>("Assets/Mod/VFX/ARG Censor/ARGcensor_mat.mat");
}
Binary file modified SCHIZO/Resources/AssetBundles/assets
Binary file not shown.
1 change: 1 addition & 0 deletions SCHIZO/SCHIZO.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<Folder Include="TriInspector" />
<Folder Include="TriInspector/Attributes" />
<Folder Include="Utilities" />
<Folder Include="VFX" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion SCHIZO/Twitch/TwitchIntegration.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using Nautilus.Commands;
using SCHIZO.ConsoleCommands;
Expand Down
Loading