Skip to content

upgrade to 2.2 #21

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

Merged
asyasmi merged 7 commits into from
Jul 30, 2026
Merged

upgrade to 2.2 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4df88c2
added gitignore log
asyasmi Apr 21, 2026
c5b2710
updated to rc3 and fix for names issue
asyasmi Jul 14, 2026
6e0dca4
updated scene for simulator
asyasmi Jul 21, 2026
02a3595
upgraded to 2.2
asyasmi Jul 28, 2026
73bfd35
Merge pull request #20 from coherence/2.2.0
asyasmi Jul 28, 2026
440e409
updated project settings and slugs
asyasmi Jul 28, 2026
2244c51
Delete 2.2.rs.logs.txt
asyasmi Jul 29, 2026
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ ExportedObj/
*.opendb
*.VC.db

*.log

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
Expand Down
238 changes: 238 additions & 0 deletions Assets/9-Sliced.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,238 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &792170185805854058
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3618301581890830759}
- component: {fileID: 5045304821950319630}
- component: {fileID: 7762912490808243201}
m_Layer: 0
m_Name: 9-Sliced
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3618301581890830759
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 792170185805854058}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5045304821950319630
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 792170185805854058}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -5177388603050735206, guid: 8884154dfe85442a3a3578be807dbcdf,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 2
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &7762912490808243201
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 792170185805854058}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff62c046a053f416a8dc48ad6483a25e, type: 3}
m_Name:
m_EditorClassIdentifier:
OnAuthorityRequest:
m_PersistentCalls:
m_Calls: []
OnNetworkedInstantiation:
m_PersistentCalls:
m_Calls: []
OnBeforeNetworkedInstantiation:
m_PersistentCalls:
m_Calls: []
OnNetworkedDestruction:
m_PersistentCalls:
m_Calls: []
OnStateRemote:
m_PersistentCalls:
m_Calls: []
OnInputRemote:
m_PersistentCalls:
m_Calls: []
OnStateAuthority:
m_PersistentCalls:
m_Calls: []
OnInputAuthority:
m_PersistentCalls:
m_Calls: []
OnAuthorityRequestRejected:
m_PersistentCalls:
m_Calls: []
OnAuthTransferComplete:
m_PersistentCalls:
m_Calls: []
OnNetworkedParentChanged:
m_PersistentCalls:
m_Calls: []
OnInputSimulatorConnected:
m_PersistentCalls:
m_Calls: []
OnRigidbody2DPositionUpdate:
m_PersistentCalls:
m_Calls: []
OnRigidbody3DPositionUpdate:
m_PersistentCalls:
m_Calls: []
OnRigidbody2DRotationUpdate:
m_PersistentCalls:
m_Calls: []
OnRigidbody3DRotationUpdate:
m_PersistentCalls:
m_Calls: []
coherenceSyncConfig: {fileID: 11400000, guid: 66cbae6d1eebc4ed19aafb3a59b597c7,
type: 2}
archetype:
lodLevels:
- distance: 0
boundComponents:
- component: {fileID: 3618301581890830759}
lodStepsActive: 1
- component: {fileID: 5045304821950319630}
lodStepsActive: 1
GeneratesArchetypeDefinition: 0
interpolationLocation: 1
RigidbodyUpdateMode: 0
bakedScriptType: Coherence.Generated.CoherenceSync_be191a041747c4eaeafee21d0cdcc2f9,
Assembly-CSharp
isGlobal: 0
synchronizeParent: 1
approveAuthorityTransferRequests: 1
simulationType: 0
authorityTransferConfig: -1
orphanedBehavior: 0
lifetimeType: 0
uniquenessType: 0
replacementStrategy: 0
unsyncedNetworkEntityPriority: 0
preserveChildren: 0
bindings:
- rid: 464123148303597609
scenePrefabInstanceUUID:
coherenceUUID:
assetVersion:
coherenceTag:
componentActions: []
floatingOriginMode: 0
floatingOriginParentedMode: 1
synchronizationChannel: Default
references:
version: 2
RefIds:
- rid: -2
type: {class: , ns: , asm: }
- rid: 464123148303597609
type: {class: PositionBinding, ns: Coherence.Toolkit.Bindings.TransformBindings,
asm: Coherence.Toolkit}
data:
descriptor:
rid: 464123148303597610
routing: 0
syncMode: 0
isPredicted: 0
predictionMode: 0
guid: 9ba2b7305f854aadbbff8f6796ee38b5
archetypeData:
type: 7
minRange: 0
maxRange: 0
sampleRate: 20
floatCompression: 0
fields:
- type: 7
bits: 32
precision: 0.001
floatCompression: 0
unityComponent: {fileID: 3618301581890830759}
coherenceSync: {fileID: 7762912490808243201}
_interpolationSettings: {fileID: 11400000, guid: ae4419d1d9a8643709bf5f6b90c584a5,
type: 2}
- rid: 464123148303597610
type: {class: Descriptor, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
data:
name: position
monoAssemblyType: UnityEngine.Vector3, UnityEngine
required: 1
enforcesLODingWhenFieldsOverriden: 1
valueSyncCallbackName:
memberType: 64
parameterAssemblyTypes: []
ownerType:
assemblyQualifiedName: UnityEngine.Transform, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
defaultSyncMode: 0
CustomData:
rid: -2
bindingType:
assemblyQualifiedName: Coherence.Toolkit.Bindings.TransformBindings.PositionBinding,
Coherence.Toolkit, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
oldName:
oldParameterAssemblyTypes: []
methodCompatible: 0
defaultRouting: 0
4 changes: 2 additions & 2 deletions Assets/coherence/slugs.json.meta → Assets/9-Sliced.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion Assets/Art/Shaders/Stylized Water For URP/Scripts/Runtime/Reflections/PlanarReflections.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,16 @@ private void DoPlanarReflections(ScriptableRenderContext context, Camera camera)
var data = new PlanarReflectionSettingData();
data.Set();
BeginPlanarReflections?.Invoke(context, _reflectionCamera);
if (_reflectionCamera.WorldToViewportPoint(reflectionTarget.transform.position).z < 100000) UniversalRenderPipeline.RenderSingleCamera(context, _reflectionCamera);
if (_reflectionCamera.WorldToViewportPoint(reflectionTarget.transform.position).z < 100000)
{
// RenderSingleCamera is obsolete, but its suggested replacement (RenderPipeline.SubmitRenderRequest
// with UniversalRenderer.SingleCameraRequest) starts a new top-level pipeline pass and isn't meant
// to be called reentrantly from inside an active beginCameraRendering callback like this one.
// Keeping the obsolete call here is intentional until URP supports nested single-camera renders.
#pragma warning disable CS0618
UniversalRenderPipeline.RenderSingleCamera(context, _reflectionCamera);
#pragma warning restore CS0618
}
data.Restore();
Shader.SetGlobalTexture(_planarReflectionTextureId, _reflectionTexture);
}
Expand Down
4 changes: 2 additions & 2 deletions Assets/Art/Shaders/Stylized Water For URP/Scripts/UI/StylizedWaterAbout.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
<ui:Template name="Toolbar" src="project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterToolbar.uxml?fileID=9197481963319205126&amp;guid=cdd135d7c7a3ea04eae5cbdddf24d3ba&amp;type=3#StylizedWaterToolbar" />
<Style src="project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterAbout.uss?fileID=7433441132597879392&amp;guid=a80b232636f88314db8351b9a639862e&amp;type=3#StylizedWaterAbout" />
<ui:Template name="Toolbar" src="project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterToolbar.uxml?fileID=9197481963319205126&amp;guid=cdd135d7c7a3ea04eae5cbdddf24d3ba&amp;type=3#StylizedWaterToolbar" />
<Style src="project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterAbout.uss?fileID=7433441132597879392&amp;guid=a80b232636f88314db8351b9a639862e&amp;type=3#StylizedWaterAbout" />
<ui:Instance template="Toolbar" />
<ui:Label text="Stylized Water For URP" style="-unity-text-align: upper-center; margin-bottom: 10px; margin-top: 10px;" />
<ui:Label text="Version 1.2.0 (June 2022)" style="margin-bottom: 10px; margin-top: 10px; -unity-text-align: upper-center;" />
Expand Down
4 changes: 2 additions & 2 deletions Assets/Art/Shaders/Stylized Water For URP/Scripts/UI/StylizedWaterAcknowledgements.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
<ui:Template name="Toolbar" src="project://database/Assets/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterToolbar.uxml?fileID=9197481963319205126&amp;guid=cdd135d7c7a3ea04eae5cbdddf24d3ba&amp;type=3#StylizedWaterToolbar" />
<Style src="project://database/Assets/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterAcknowledgements.uss?fileID=7433441132597879392&amp;guid=d8fafcd14d9d04b188510ebd11258a47&amp;type=3#StylizedWaterAcknowledgements" />
<ui:Template name="Toolbar" src="project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterToolbar.uxml?fileID=9197481963319205126&amp;guid=cdd135d7c7a3ea04eae5cbdddf24d3ba&amp;type=3#StylizedWaterToolbar" />
<Style src="project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterAcknowledgements.uss?fileID=7433441132597879392&amp;guid=d8fafcd14d9d04b188510ebd11258a47&amp;type=3#StylizedWaterAcknowledgements" />
<ui:Instance template="Toolbar" />
<ui:Label text="Thank you to everyone who uses this asset.&#10;I appreciate you :)" class="acknowledgement" style="margin-top: 10px; margin-bottom: 10px; -unity-text-align: upper-center;" />
<ui:VisualElement style="flex-direction: row; justify-content: center;">
Expand Down
20 changes: 10 additions & 10 deletions Assets/Art/Shaders/Stylized Water For URP/Scripts/UI/StylizedWaterDetectIssues.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
<ui:Template name="StylizedWaterToolbar" src="project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterToolbar.uxml?fileID=9197481963319205126&amp;guid=cdd135d7c7a3ea04eae5cbdddf24d3ba&amp;type=3#StylizedWaterToolbar" />
<Style src="project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterDetectIssues.uss?fileID=7433441132597879392&amp;guid=f5fdb68fa20df4d708ee3112e2587483&amp;type=3#StylizedWaterDetectIssues" />
<ui:Template name="StylizedWaterToolbar" src="project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterToolbar.uxml?fileID=9197481963319205126&amp;guid=cdd135d7c7a3ea04eae5cbdddf24d3ba&amp;type=3#StylizedWaterToolbar" />
<Style src="project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/StylizedWaterDetectIssues.uss?fileID=7433441132597879392&amp;guid=f5fdb68fa20df4d708ee3112e2587483&amp;type=3#StylizedWaterDetectIssues" />
<ui:Instance template="StylizedWaterToolbar" name="StylizedWaterToolbar" />
<ui:VisualElement style="padding-left: 60px; padding-right: 0; justify-content: space-between; flex-direction: row;">
<ui:VisualElement name="Check Content" style="padding-left: 0; padding-right: 0; flex-direction: row; justify-content: flex-start; flex-grow: 1;">
Expand All @@ -27,14 +27,14 @@
</ui:VisualElement>
<ui:VisualElement name="Check Content" style="padding-left: 0; padding-right: 0; flex-direction: row; margin-left: 0; justify-content: flex-end;">
<ui:VisualElement class="check-column" style="padding-right: 0; align-items: flex-start;">
<ui:VisualElement name="Unity Version Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="URP Version Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Active Renderer Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Depth Texture Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Opaque Texture Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Graphics_API_Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Planar_Reflections_Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Shader_Variant_Limit_Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Unity Version Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="URP Version Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Active Renderer Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Depth Texture Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Opaque Texture Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Graphics_API_Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Planar_Reflections_Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
<ui:VisualElement name="Shader_Variant_Limit_Icon" class="check-icon" style="background-image: url(&apos;project://database/Assets/Art/Shaders/Stylized%20Water%20For%20URP/Scripts/UI/Icons/Neutral.png?fileID=2800000&amp;guid=06ae6920c59497e49b9c28eafdbf9d67&amp;type=3#Neutral&apos;);" />
</ui:VisualElement>
<ui:VisualElement class="check-column" style="align-items: flex-start; padding-right: 0; justify-content: flex-start;">
<ui:Button text="Fix" name="Unity Version Fix" class="fix-button" style="flex-shrink: 1; align-items: flex-start; border-left-width: 0; border-right-width: 0; border-bottom-width: 0; border-top-left-radius: 3px; border-top-right-radius: 3px;" />
Expand Down
Loading