Modem teleport effect altered to hopefully prevent texture blockiness.

2025-12-11 22:46:55 -05:00 · 2025-12-11 22:46:55 -05:00 · c13f73903b
commit c13f73903b
parent 6ed24ffb01
7 changed files with 263 additions and 1222 deletions
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@ -149,6 +149,7 @@
    <None Include="Assets\TextMesh Pro\Sprites\EmojiOne Attribution.txt" />
    <None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap-Custom-Atlas.shader" />
    <None Include="Assets\TextMesh Pro\Shaders\TMP_SDF.shader" />
+    <None Include="Assets\Shaders\UVGlow.shader" />
    <None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile SSD.shader" />
    <None Include="Assets\TextMesh Pro\Resources\LineBreaking Leading Characters.txt" />
    <None Include="Assets\TextMesh Pro\Shaders\TMPro_Properties.cginc" />
--- a/Assets/Animations/Modem/No
+++ b/Assets/Animations/Modem/No
@ -37,7 +37,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: {x: 1, y: 1, z: 0.005}
+        value: {x: 1, y: 1, z: 1}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@ -208,7 +208,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: 0.005
+        value: 1
        inSlope: 0
        outSlope: 0
        tangentMode: 136
--- a/Assets/Animations/Modem/Teleport
+++ b/Assets/Animations/Modem/Teleport
@ -64,7 +64,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: {x: 1, y: 1, z: 0.005}
+        value: {x: 1, y: 1, z: 1}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: Infinity, y: Infinity, z: Infinity}
        tangentMode: 0
@ -93,14 +93,14 @@ AnimationClip:
        time: 2.6166666
        value: {x: 1.35, y: 1.35, z: 1}
        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: Infinity, y: Infinity, z: Infinity}
+        outSlope: {x: Infinity, y: Infinity, z: 0}
        tangentMode: 0
        weightedMode: 0
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 5
-        value: {x: 1, y: 1, z: 0.005}
+        value: {x: 1, y: 1, z: 1}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@ -111,7 +111,46 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    path: SM_StaticEffect
-  m_FloatCurves: []
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.5
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 5
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_StaticEffect
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
  m_PPtrCurves: []
  m_SampleRate: 60
  m_WrapMode: 0
@ -138,6 +177,15 @@ AnimationClip:
      isPPtrCurve: 0
      isIntCurve: 0
      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 1930323159
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
    pptrCurveMapping: []
  m_AnimationClipSettings:
    serializedVersion: 2
@ -166,7 +214,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: 0.005
+        value: 1
        inSlope: 0
        outSlope: Infinity
        tangentMode: 97
@ -200,15 +248,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 5
-        value: 0.005
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -457,6 +496,45 @@ AnimationClip:
    classID: 4
    script: {fileID: 0}
    flags: 8
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.5
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 5
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: SM_StaticEffect
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
  m_EulerEditorCurves: []
  m_HasGenericRootTransform: 0
  m_HasMotionFloatCurves: 0
--- a/Assets/Prefabs/Modem.prefab
+++ b/Assets/Prefabs/Modem.prefab
@ -15,7 +15,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &6417972481979237589
 Transform:
  m_ObjectHideFlags: 0
@ -134,7 +134,6 @@ MonoBehaviour:
    SerializationNodes: []
  _udonSharpBackingUdonBehaviour: {fileID: 932720169245821887}
  _ModemActivationObject: {fileID: 497488136702045868}
-  _ModemTeleportEffect: {fileID: 5032756485913580084}
  _ModemDestination: {fileID: 0}
  _AudioManager: {fileID: 0}
  _ModemAnimator: {fileID: 0}
@ -251,19 +250,13 @@ PrefabInstance:
    - target: {fileID: 919132149155446097, guid: 21f939804f0f9c742b2f0205797b740b,
        type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 21f939804f0f9c742b2f0205797b740b, type: 3}
--- !u!1 &5032756485913580084 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 21f939804f0f9c742b2f0205797b740b,
-    type: 3}
-  m_PrefabInstance: {fileID: 5266564533062807397}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &5664439777900644494 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
--- a/Assets/Scenes/witwics.unity
+++ b/Assets/Scenes/witwics.unity
--- a/Assets/UdonSharp/Modem/Modem.asset
+++ b/Assets/UdonSharp/Modem/Modem.asset
@ -44,7 +44,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 12
-      Data: 9
+      Data: 8
    - Name: 
      Entry: 7
      Data: 
@ -236,70 +236,16 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _ModemTeleportEffect
+      Data: _ModemDestination
    - Name: $v
      Entry: 7
      Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
-    - Name: <Name>k__BackingField
-      Entry: 1
-      Data: _ModemTeleportEffect
-    - Name: <UserType>k__BackingField
-      Entry: 9
-      Data: 12
-    - Name: <SystemType>k__BackingField
-      Entry: 9
-      Data: 12
-    - Name: <SyncMode>k__BackingField
-      Entry: 7
-      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
-    - Name: 
-      Entry: 6
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <IsSerialized>k__BackingField
-      Entry: 5
-      Data: true
-    - Name: _fieldAttributes
-      Entry: 7
-      Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 1
-    - Name: 
-      Entry: 7
-      Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 
-    - Name: $k
-      Entry: 1
-      Data: _ModemDestination
-    - Name: $v
-      Entry: 7
-      Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _ModemDestination
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 19|System.RuntimeType, mscorlib
+      Data: 16|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: Modem, Assembly-CSharp
@ -308,7 +254,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 7
-      Data: 20|System.RuntimeType, mscorlib
+      Data: 17|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: VRC.Udon.UdonBehaviour, VRC.Udon
@ -329,13 +275,13 @@ MonoBehaviour:
      Data: true
    - Name: _fieldAttributes
      Entry: 7
-      Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 22|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule
    - Name: 
      Entry: 8
      Data: 
@ -359,13 +305,13 @@ MonoBehaviour:
      Data: _AudioManager
    - Name: $v
      Entry: 7
-      Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _AudioManager
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 24|System.RuntimeType, mscorlib
+      Data: 21|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: AudioManager, Assembly-CSharp
@ -374,7 +320,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 20
+      Data: 17
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -389,13 +335,13 @@ MonoBehaviour:
      Data: true
    - Name: _fieldAttributes
      Entry: 7
-      Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 2
    - Name: 
      Entry: 7
-      Data: 26|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
+      Data: 23|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
    - Name: height
      Entry: 4
      Data: 8
@ -404,7 +350,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 7
-      Data: 27|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 24|UnityEngine.SerializeField, UnityEngine.CoreModule
    - Name: 
      Entry: 8
      Data: 
@ -428,13 +374,13 @@ MonoBehaviour:
      Data: _ModemAnimator
    - Name: $v
      Entry: 7
-      Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _ModemAnimator
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 29|System.RuntimeType, mscorlib
+      Data: 26|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: UnityEngine.Animator, UnityEngine.AnimationModule
@ -443,7 +389,61 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 29
+      Data: 26
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 6
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: true
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 7
+      Data: 28|UnityEngine.SerializeField, UnityEngine.CoreModule
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: _ModemDestinationAnimator
+    - Name: $v
+      Entry: 7
+      Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _ModemDestinationAnimator
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 26
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 26
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -485,70 +485,16 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _ModemDestinationAnimator
+      Data: _EnteredPlayers
    - Name: $v
      Entry: 7
      Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
-    - Name: <Name>k__BackingField
-      Entry: 1
-      Data: _ModemDestinationAnimator
-    - Name: <UserType>k__BackingField
-      Entry: 9
-      Data: 29
-    - Name: <SystemType>k__BackingField
-      Entry: 9
-      Data: 29
-    - Name: <SyncMode>k__BackingField
-      Entry: 7
-      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
-    - Name: 
-      Entry: 6
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <IsSerialized>k__BackingField
-      Entry: 5
-      Data: true
-    - Name: _fieldAttributes
-      Entry: 7
-      Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 1
-    - Name: 
-      Entry: 7
-      Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 
-    - Name: $k
-      Entry: 1
-      Data: _EnteredPlayers
-    - Name: $v
-      Entry: 7
-      Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _EnteredPlayers
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 36|System.RuntimeType, mscorlib
+      Data: 33|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: System.String[], mscorlib
@ -557,7 +503,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 36
+      Data: 33
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -572,13 +518,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 38|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 35|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
--- a/Assets/UdonSharp/Modem/Modem.cs
+++ b/Assets/UdonSharp/Modem/Modem.cs
@ -13,7 +13,6 @@ public class Modem : UdonSharpBehaviour
 	[UdonSynced, FieldChangeCallback(nameof(BeginTeleport))] private bool _BeginTeleport = false;

 	[SerializeField] private GameObject _ModemActivationObject;
-	[SerializeField] private GameObject _ModemTeleportEffect;
 	[SerializeField] private Modem _ModemDestination;

 	[Space]
@ -139,7 +138,6 @@ public class Modem : UdonSharpBehaviour
 		{
 			_ActivateModem = value;
 			_ModemActivationObject.SetActive(_ActivateModem);
-			_ModemTeleportEffect.SetActive(_ActivateModem);
 		}
 		get => _ActivateModem;
 	}