Skip to content

Commit 52f806c

Browse files
committed
Improved View logic + re-arrange core files + more unit tests
1 parent 49d4e18 commit 52f806c

File tree

217 files changed

+3485
-1928
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+3485
-1928
lines changed

PhaseJumpPro/Assets/Examples/Matrix2D Examples/Checkers Example/Prefabs/ck-square-dark-prefab.prefab

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,25 @@ BoxCollider2D:
124124
m_Enabled: 1
125125
m_Density: 1
126126
m_Material: {fileID: 0}
127+
m_IncludeLayers:
128+
serializedVersion: 2
129+
m_Bits: 0
130+
m_ExcludeLayers:
131+
serializedVersion: 2
132+
m_Bits: 0
133+
m_LayerOverridePriority: 0
134+
m_ForceSendLayers:
135+
serializedVersion: 2
136+
m_Bits: 4294967295
137+
m_ForceReceiveLayers:
138+
serializedVersion: 2
139+
m_Bits: 4294967295
140+
m_ContactCaptureLayers:
141+
serializedVersion: 2
142+
m_Bits: 4294967295
143+
m_CallbackLayers:
144+
serializedVersion: 2
145+
m_Bits: 4294967295
127146
m_IsTrigger: 1
128147
m_UsedByEffector: 0
129148
m_UsedByComposite: 0

PhaseJumpPro/Assets/Examples/Matrix2D Examples/Life Example/Scripts/ELFMatrixView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected ELFSimAgent AgentAt(Vector2Int location)
100100
return null;
101101
}
102102

103-
public override void OnPointerClickEvent(PointerClickUIEvent _event)
103+
public override void OnPointerClickEvent(PointerClickUIEvent<LocalPosition> _event)
104104
{
105105
var localPressPosition = _event.pressPosition;
106106
var cellHit = LocationAtLocalPosition(localPressPosition.Position);

PhaseJumpPro/Assets/Examples/Matrix2D Examples/Mine Sweeper Example/Scripts/EMSBoardView.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected void PopulateBoard()
9898
ClearTilesAt(emptyCells[0]);
9999
}
100100

101-
public override void OnPointerClickEvent(PointerClickUIEvent _event)
101+
public override void OnPointerClickEvent(PointerClickUIEvent<LocalPosition> _event)
102102
{
103103
var localPressPosition = _event.pressPosition;
104104
var cellHit = LocationAtLocalPosition(localPressPosition.Position);
@@ -108,9 +108,9 @@ public override void OnPointerClickEvent(PointerClickUIEvent _event)
108108
var cellGameObject = WorldNodeAt(cellHit.value);
109109
var hitTile = cellGameObject.GetComponent<EMSTile>();
110110

111-
switch (_event.button)
111+
switch (_event.Button)
112112
{
113-
case PointerClickUIEvent.InputButton.Left:
113+
case PointerInputButton.Left:
114114
{
115115
switch (core.State)
116116
{
@@ -130,7 +130,7 @@ public override void OnPointerClickEvent(PointerClickUIEvent _event)
130130
}
131131
break;
132132
}
133-
case PointerClickUIEvent.InputButton.Right:
133+
case PointerInputButton.Right:
134134
{
135135
switch (hitTile.type)
136136
{

PhaseJumpPro/Assets/Examples/Misc Examples/Emitter3D Example/example-emitter3D.mat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 5
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -22,6 +22,8 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: example-emitter3D
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
2527
m_ValidKeywords:
2628
- _EMISSION
2729
- _SPECULAR_SETUP
@@ -33,6 +35,7 @@ Material:
3335
stringTagMap:
3436
RenderType: Opaque
3537
disabledShaderPasses: []
38+
m_LockedProperties:
3639
m_SavedProperties:
3740
serializedVersion: 3
3841
m_TexEnvs:

PhaseJumpPro/Assets/Settings/Renderer2D.asset

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
debugShaders:
1616
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
17+
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
1718
m_RendererFeatures: []
1819
m_RendererFeatureMap:
1920
m_UseNativeRenderPass: 0
@@ -44,7 +45,9 @@ MonoBehaviour:
4445
m_ShapeLightVolumeShader: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, type: 3}
4546
m_PointLightShader: {fileID: 4800000, guid: e35a31e1679aeff489e202f5cc4853d5, type: 3}
4647
m_PointLightVolumeShader: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, type: 3}
47-
m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
48+
m_CoreBlitShader: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
49+
m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
50+
m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
4851
m_SamplingShader: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
4952
m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3}
5053
m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3}

PhaseJumpPro/Assets/Settings/UniversalRP.asset

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
1313
m_Name: UniversalRP
1414
m_EditorClassIdentifier:
15-
k_AssetVersion: 9
16-
k_AssetPreviousVersion: 9
15+
k_AssetVersion: 11
16+
k_AssetPreviousVersion: 11
1717
m_RendererType: 1
1818
m_RendererData: {fileID: 0}
1919
m_RendererDataList:
@@ -24,13 +24,16 @@ MonoBehaviour:
2424
m_RequireOpaqueTexture: 0
2525
m_OpaqueDownsampling: 1
2626
m_SupportsTerrainHoles: 1
27-
m_StoreActionsOptimization: 0
2827
m_SupportsHDR: 1
28+
m_HDRColorBufferPrecision: 0
2929
m_MSAA: 1
3030
m_RenderScale: 1
3131
m_UpscalingFilter: 0
3232
m_FsrOverrideSharpness: 0
3333
m_FsrSharpness: 0.92
34+
m_EnableLODCrossFade: 1
35+
m_LODCrossFadeDitheringType: 1
36+
m_ShEvalMode: 0
3437
m_MainLightRenderingMode: 1
3538
m_MainLightShadowsSupported: 1
3639
m_MainLightShadowmapResolution: 2048
@@ -55,13 +58,17 @@ MonoBehaviour:
5558
m_SoftShadowsSupported: 0
5659
m_ConservativeEnclosingSphere: 0
5760
m_NumIterationsEnclosingSphere: 64
61+
m_SoftShadowQuality: 2
5862
m_AdditionalLightsCookieResolution: 2048
5963
m_AdditionalLightsCookieFormat: 3
6064
m_UseSRPBatcher: 1
6165
m_SupportsDynamicBatching: 0
6266
m_MixedLightingSupported: 1
67+
m_SupportsLightCookies: 1
6368
m_SupportsLightLayers: 0
6469
m_DebugLevel: 0
70+
m_StoreActionsOptimization: 0
71+
m_EnableRenderGraph: 0
6572
m_UseAdaptivePerformance: 1
6673
m_ColorGradingMode: 0
6774
m_ColorGradingLutSize: 32
@@ -71,6 +78,33 @@ MonoBehaviour:
7178
m_LocalShadowsAtlasResolution: 256
7279
m_MaxPixelLights: 0
7380
m_ShadowAtlasResolution: 256
74-
m_ShaderVariantLogLevel: 0
7581
m_VolumeFrameworkUpdateMode: 0
82+
m_Textures:
83+
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
84+
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
85+
m_PrefilteringModeMainLightShadows: 1
86+
m_PrefilteringModeAdditionalLight: 4
87+
m_PrefilteringModeAdditionalLightShadows: 1
88+
m_PrefilterXRKeywords: 0
89+
m_PrefilteringModeForwardPlus: 1
90+
m_PrefilteringModeDeferredRendering: 1
91+
m_PrefilteringModeScreenSpaceOcclusion: 1
92+
m_PrefilterDebugKeywords: 0
93+
m_PrefilterWriteRenderingLayers: 0
94+
m_PrefilterHDROutput: 0
95+
m_PrefilterSSAODepthNormals: 0
96+
m_PrefilterSSAOSourceDepthLow: 0
97+
m_PrefilterSSAOSourceDepthMedium: 0
98+
m_PrefilterSSAOSourceDepthHigh: 0
99+
m_PrefilterSSAOInterleaved: 0
100+
m_PrefilterSSAOBlueNoise: 0
101+
m_PrefilterSSAOSampleCountLow: 0
102+
m_PrefilterSSAOSampleCountMedium: 0
103+
m_PrefilterSSAOSampleCountHigh: 0
104+
m_PrefilterDBufferMRT1: 0
105+
m_PrefilterDBufferMRT2: 0
106+
m_PrefilterDBufferMRT3: 0
107+
m_PrefilterScreenCoord: 0
108+
m_PrefilterNativeRenderPass: 0
109+
m_ShaderVariantLogLevel: 0
76110
m_ShadowCascades: 0

PhaseJumpPro/Assets/UniversalRenderPipelineGlobalSettings.asset

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,17 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3}
1313
m_Name: UniversalRenderPipelineGlobalSettings
1414
m_EditorClassIdentifier:
15-
k_AssetVersion: 2
15+
k_AssetVersion: 3
16+
m_RenderingLayerNames:
17+
- Light Layer default
18+
- Light Layer 1
19+
- Light Layer 2
20+
- Light Layer 3
21+
- Light Layer 4
22+
- Light Layer 5
23+
- Light Layer 6
24+
- Light Layer 7
25+
m_ValidRenderingLayers: 255
1626
lightLayerName0: Light Layer default
1727
lightLayerName1: Light Layer 1
1828
lightLayerName2: Light Layer 2
@@ -24,4 +34,8 @@ MonoBehaviour:
2434
m_StripDebugVariants: 1
2535
m_StripUnusedPostProcessingVariants: 0
2636
m_StripUnusedVariants: 1
37+
m_StripUnusedLODCrossFadeVariants: 1
38+
m_StripScreenCoordOverrideVariants: 1
2739
supportRuntimeDebugDisplay: 0
40+
m_ShaderVariantLogLevel: 0
41+
m_ExportShaderVariants: 1

PhaseJumpPro/Assets/phasejumppro/Animation/SomeAnimation.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ public abstract class SomeAnimation : WorldComponent
1515
{
1616
public MeshMaterialType meshMaterialType = MeshMaterialType.Copy;
1717

18-
private MultiRenderer multiRenderer;
18+
private RendererTool rendererTool;
1919

20-
protected MultiRenderer MultiRenderer
20+
protected RendererTool MultiRenderer
2121
{
2222
get
2323
{
24-
if (null == multiRenderer)
24+
if (null == rendererTool)
2525
{
26-
multiRenderer = new(gameObject);
27-
multiRenderer.meshMaterialType = meshMaterialType;
26+
rendererTool = new(gameObject);
27+
rendererTool.meshMaterialType = meshMaterialType;
2828
}
29-
return multiRenderer;
29+
return rendererTool;
3030
}
3131
}
3232
}

PhaseJumpPro/Assets/phasejumppro/Core/AnyFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* RATING: 5 stars
33
* Abstract
4-
* CODE REVIEW: 1/14/23
4+
* CODE REVIEW: 6/8/23
55
* PORTED TO: C++
66
*/
77
namespace PJ

PhaseJumpPro/Assets/phasejumppro/Interface/SomeEventHandler.cs renamed to PhaseJumpPro/Assets/phasejumppro/Core/Components/SomeEventHandler.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22
using UnityEngine;
33
using PJ;
44

5+
/*
6+
RATING: 5 stars
7+
Simple type
8+
CODE REVIEW: 6/10/23
9+
*/
510
namespace PJ
611
{
712
/// <summary>
8-
/// Responds to events (similar to SomeListener)
13+
/// A component that listens to events
914
/// </summary>
1015
public abstract class SomeEventHandler : WorldComponent, SomeListener
1116
{

0 commit comments

Comments
 (0)