From 443becc338c5c68170dbbd8fb43c93e9f7bd4e55 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Fri, 5 Mar 2021 09:50:19 +0900 Subject: [PATCH 01/11] update hdrp template --- .../Assets/Scenes/samplescene.unity | 559 ++++++++---------- .../CHANGELOG.md | 16 + .../package.json | 6 +- .../Packages/manifest.json | 10 +- .../Packages/packages-lock.json | 65 +- .../PackageManagerSettings.asset | 4 +- .../ProjectSettings/ProjectVersion.txt | 4 +- 7 files changed, 312 insertions(+), 352 deletions(-) diff --git a/com.unity.template.renderstreaming-hd/Assets/Scenes/samplescene.unity b/com.unity.template.renderstreaming-hd/Assets/Scenes/samplescene.unity index f59b74bf2..765f799bc 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Scenes/samplescene.unity +++ b/com.unity.template.renderstreaming-hd/Assets/Scenes/samplescene.unity @@ -326,6 +326,7 @@ GameObject: - component: {fileID: 91174155} - component: {fileID: 91174156} - component: {fileID: 91174157} + - component: {fileID: 91174158} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -369,7 +370,7 @@ MonoBehaviour: m_GameObject: {fileID: 91174154} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -379,75 +380,35 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: A - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 100 - m_fontSizeBase: 100 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: A +--- !u!114 &91174158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91174154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5019608} + m_EffectDistance: {x: 3, y: -2} + m_UseGraphicAlpha: 1 --- !u!1 &94261772 GameObject: m_ObjectHideFlags: 0 @@ -459,6 +420,7 @@ GameObject: - component: {fileID: 94261773} - component: {fileID: 94261774} - component: {fileID: 94261775} + - component: {fileID: 94261776} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -502,7 +464,7 @@ MonoBehaviour: m_GameObject: {fileID: 94261772} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -512,75 +474,35 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: A - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 100 - m_fontSizeBase: 100 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: A +--- !u!114 &94261776 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94261772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5019608} + m_EffectDistance: {x: 3, y: -2} + m_UseGraphicAlpha: 1 --- !u!1 &168218571 GameObject: m_ObjectHideFlags: 0 @@ -1106,109 +1028,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &224697927 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59b6606ef2548734bb6d11b9d160bc7e, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 10 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - hdriSky: - m_OverrideState: 0 - m_Value: {fileID: 8900000, guid: 54a3a0570aebe8949bec4966f1376581, type: 3} - enableBackplate: - m_OverrideState: 0 - m_Value: 0 - backplateType: - m_OverrideState: 0 - m_Value: 0 - groundLevel: - m_OverrideState: 0 - m_Value: 0 - scale: - m_OverrideState: 0 - m_Value: {x: 32, y: 32} - projectionDistance: - m_OverrideState: 0 - m_Value: 16 - min: 0.0000001 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 100 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 --- !u!1001 &300715998 PrefabInstance: m_ObjectHideFlags: 0 @@ -1216,6 +1037,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1444734336} m_Modifications: + - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} propertyPath: m_LocalPosition.x value: 1.655252 @@ -1228,6 +1053,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 1.0033283 objectReference: {fileID: 0} + - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} propertyPath: m_LocalRotation.x value: -0 @@ -1240,14 +1069,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 114600619644317088, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} propertyPath: m_Version @@ -1292,9 +1113,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: a123fc0ac58cb774e8592c925f167e7c, type: 2} m_StaticLightingSkyUniqueID: 1 - m_SkySettings: {fileID: 224697927} - m_SkySettingsFromProfile: {fileID: -1658960478407648048, guid: a123fc0ac58cb774e8592c925f167e7c, - type: 2} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -1354,6 +1172,7 @@ GameObject: m_Component: - component: {fileID: 562683916} - component: {fileID: 562683915} + - component: {fileID: 562683917} m_Layer: 0 m_Name: RenderStreaming m_TagString: Untagged @@ -1373,8 +1192,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 045786cf504bd7347842d6948241cbd0, type: 3} m_Name: m_EditorClassIdentifier: - urlSignaling: http://localhost - signalingType: Unity.RenderStreaming.Signaling.HttpSignaling + urlSignaling: ws://localhost + signalingType: Unity.RenderStreaming.Signaling.WebSocketSignaling iceServers: - credential: credentialType: 0 @@ -1383,52 +1202,9 @@ MonoBehaviour: username: interval: 5 hardwareEncoderSupport: 1 - arrayButtonClickEvent: - - elementId: 1 - click: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2035111233} - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - elementId: 2 - click: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2035111233} - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - elementId: 3 - click: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1394380100} - m_MethodName: Play - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + handlers: + - {fileID: 562683917} + runOnAwake: 1 --- !u!4 &562683916 Transform: m_ObjectHideFlags: 0 @@ -1441,8 +1217,26 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &562683917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 562683914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2307e7ad91222841b562bebd81a69a0, type: 3} + m_Name: + m_EditorClassIdentifier: + streams: + - {fileID: 1297650286} + - {fileID: 1297650285} + - {fileID: 1297650288} + - {fileID: 1875731192} + - {fileID: 1875731193} --- !u!1 &581876909 GameObject: m_ObjectHideFlags: 0 @@ -1489,7 +1283,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &754093946 GameObject: @@ -1911,7 +1705,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1037846703} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.68701804} + m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.6870191} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} @@ -2367,6 +2161,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1444734336} m_Modifications: + - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -2379,6 +2177,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} propertyPath: m_LocalRotation.x value: -0 @@ -2391,14 +2193,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} --- !u!4 &1275443620 stripped @@ -2496,6 +2290,7 @@ GameObject: - component: {fileID: 1297650286} - component: {fileID: 1297650281} - component: {fileID: 1297650285} + - component: {fileID: 1297650288} m_Layer: 0 m_Name: Render Streaming Camera m_TagString: MainCamera @@ -2670,7 +2465,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 17.5, y: 109.65, z: 0} --- !u!114 &1297650285 MonoBehaviour: @@ -2697,6 +2492,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: streamingSize: {x: 1280, y: 720} + depth: 0 + antiAliasing: 1 --- !u!114 &1297650287 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2739,6 +2536,67 @@ MonoBehaviour: rotationLerpTime: 0.01 invertY: 0 uiController: {fileID: 754844279} + receiver: {fileID: 1297650288} +--- !u!114 &1297650288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297650280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5bf104a15f68aae49b67b198ea88131e, type: 3} + m_Name: + m_EditorClassIdentifier: + local: 0 + label: + arrayButtonClickEvent: + - elementId: 1 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2035111233} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - elementId: 2 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2035111233} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - elementId: 3 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1394380100} + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1394380099 GameObject: m_ObjectHideFlags: 0 @@ -2899,7 +2757,7 @@ Transform: - {fileID: 300715999} - {fileID: 405591765} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &1547029145 GameObject: @@ -2932,7 +2790,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!220 &1547029147 LightProbeGroup: @@ -3134,6 +2992,7 @@ GameObject: - component: {fileID: 1875731195} - component: {fileID: 1875731194} - component: {fileID: 1875731192} + - component: {fileID: 1875731193} m_Layer: 0 m_Name: Render Streaming Camera 2 m_TagString: MainCamera @@ -3154,6 +3013,68 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: streamingSize: {x: 1280, y: 720} + depth: 0 + antiAliasing: 1 +--- !u!114 &1875731193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1875731191} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5bf104a15f68aae49b67b198ea88131e, type: 3} + m_Name: + m_EditorClassIdentifier: + local: 0 + label: + arrayButtonClickEvent: + - elementId: 1 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2035111233} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - elementId: 2 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2035111233} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - elementId: 3 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1394380100} + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1875731194 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3300,6 +3221,7 @@ MonoBehaviour: rotationLerpTime: 0.01 invertY: 0 uiController: {fileID: 1992312012} + receiver: {fileID: 1875731193} --- !u!20 &1875731197 Camera: m_ObjectHideFlags: 0 @@ -3355,7 +3277,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 20.146002, y: 315.092, z: 0} --- !u!1 &1992312011 GameObject: @@ -3588,7 +3510,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 33.959003, y: 130, z: 90.00001} --- !u!114 &2035111237 MonoBehaviour: @@ -3700,6 +3622,7 @@ MonoBehaviour: showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &2059789766 GameObject: m_ObjectHideFlags: 0 @@ -3730,7 +3653,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2059789766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.5100737, y: 1.196, z: 1.176037} + m_LocalPosition: {x: 2.510078, y: 1.196, z: 1.1760391} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md index 0a02430e3..93db32256 100644 --- a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md @@ -4,6 +4,22 @@ All notable changes to the render streaming template package will be documented The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [3.0.0] - 2021-03-02 + +Version 3.0.0 has a big change in the package design. This mainly addresses moving scripts from the sample folder to Package Manager. + +### Added + +- Supported iOS platform. +- Added new samples. +- Added a documentation for samples. +- Added components (`InputSystemChannelSender`, `InputSystemChannelReceiver`, `WebBrowserInputChannelReceiver`, `SingleConnection` and `Broadcast`). + +### Changed + +- Moved scripts from the sample folder to Package Manager. +- Upgrading WebRTC package to `2.3.3-preview`. + ## [2.2.2] - 2020-12-15 ### Changed diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json index 67d7ccb24..dec670935 100644 --- a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.template.renderstreaming-hd", "displayName": "Render Streaming HDRP", - "version": "2.2.2-preview", + "version": "3.0.0-preview", "type": "template", "unity": "2019.4", "description": "This is HDRP sample scene project integrated with Unity Render Streaming technology.\n\nAlong with its signaling web server, you could play around the scene in any webrtc supported web browser.", "dependencies": { - "com.unity.renderstreaming": "2.2.2-preview", - "com.unity.render-pipelines.high-definition": "7.3.1" + "com.unity.renderstreaming": "3.0.1-preview", + "com.unity.render-pipelines.high-definition": "7.5.3" } } \ No newline at end of file diff --git a/com.unity.template.renderstreaming-hd/Packages/manifest.json b/com.unity.template.renderstreaming-hd/Packages/manifest.json index cd999ab50..a2844bc85 100644 --- a/com.unity.template.renderstreaming-hd/Packages/manifest.json +++ b/com.unity.template.renderstreaming-hd/Packages/manifest.json @@ -4,11 +4,11 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.code-analysis": "0.1.2-preview", "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.2", - "com.unity.inputsystem": "1.0.0", - "com.unity.render-pipelines.high-definition": "7.3.1", - "com.unity.renderstreaming": "2.2.2-preview", - "com.unity.test-framework": "1.1.18", + "com.unity.ide.vscode": "1.2.3", + "com.unity.inputsystem": "1.0.2", + "com.unity.render-pipelines.high-definition": "7.5.3", + "com.unity.renderstreaming": "3.0.1-preview", + "com.unity.test-framework": "1.1.22", "com.unity.textmeshpro": "2.1.1", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/com.unity.template.renderstreaming-hd/Packages/packages-lock.json b/com.unity.template.renderstreaming-hd/Packages/packages-lock.json index 87ecd49c9..1cb56ff2a 100644 --- a/com.unity.template.renderstreaming-hd/Packages/packages-lock.json +++ b/com.unity.template.renderstreaming-hd/Packages/packages-lock.json @@ -19,8 +19,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.ext.nunit": { + "com.unity.editorcoroutines": { "version": "1.0.0", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, @@ -36,65 +43,69 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.2", + "version": "1.2.3", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.0.0", + "version": "1.0.2", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "7.3.1", + "version": "7.5.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.high-definition": { - "version": "7.3.1", + "version": "7.5.3", "depth": 0, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "7.3.1", - "com.unity.shadergraph": "7.3.1", - "com.unity.visualeffectgraph": "7.3.1", - "com.unity.render-pipelines.high-definition-config": "7.3.1" + "com.unity.modules.video": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.render-pipelines.core": "7.5.3", + "com.unity.shadergraph": "7.5.3", + "com.unity.visualeffectgraph": "7.5.3", + "com.unity.render-pipelines.high-definition-config": "7.5.3" }, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.high-definition-config": { - "version": "7.3.1", + "version": "7.5.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "7.3.1" + "com.unity.render-pipelines.core": "7.5.3" }, "url": "https://packages.unity.com" }, "com.unity.renderstreaming": { - "version": "2.2.2-preview", + "version": "3.0.1-preview", "depth": 0, "source": "registry", "dependencies": { - "com.unity.webrtc": "2.2.1-preview", + "com.unity.webrtc": "2.3.3-preview", "com.unity.inputsystem": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "7.3.1", + "version": "7.5.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "7.3.1" + "com.unity.render-pipelines.core": "7.5.3" }, "url": "https://packages.unity.com" }, @@ -103,16 +114,16 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.unity.renderstreaming": "2.2.2-preview", - "com.unity.render-pipelines.high-definition": "7.3.1" + "com.unity.renderstreaming": "3.0.1-preview", + "com.unity.render-pipelines.high-definition": "7.5.3" } }, "com.unity.test-framework": { - "version": "1.1.18", + "version": "1.1.22", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.0", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, @@ -137,11 +148,21 @@ } }, "com.unity.visualeffectgraph": { - "version": "7.3.1", + "version": "7.5.3", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.shadergraph": "7.5.3" + }, + "url": "https://packages.unity.com" + }, + "com.unity.webrtc": { + "version": "2.3.3-preview", "depth": 1, "source": "registry", "dependencies": { - "com.unity.shadergraph": "7.3.1" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.editorcoroutines": "1.0.0" }, "url": "https://packages.unity.com" }, diff --git a/com.unity.template.renderstreaming-hd/ProjectSettings/PackageManagerSettings.asset b/com.unity.template.renderstreaming-hd/ProjectSettings/PackageManagerSettings.asset index 9418901fc..6920e3adb 100644 --- a/com.unity.template.renderstreaming-hd/ProjectSettings/PackageManagerSettings.asset +++ b/com.unity.template.renderstreaming-hd/ProjectSettings/PackageManagerSettings.asset @@ -9,9 +9,9 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 0} + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: - m_EditorClassIdentifier: UnityEditor:UnityEditor.PackageManager.UI:PackageManagerProjectSettings + m_EditorClassIdentifier: m_ScopedRegistriesSettingsExpanded: 1 oneTimeWarningShown: 0 m_Registries: diff --git a/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectVersion.txt b/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectVersion.txt index 66132d0e5..e8a0ab94d 100644 --- a/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectVersion.txt +++ b/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.13f1 -m_EditorVersionWithRevision: 2019.4.13f1 (518737b1de84) +m_EditorVersion: 2019.4.20f1 +m_EditorVersionWithRevision: 2019.4.20f1 (6dd1c08eedfa) From 5e6463e0e246ee1f7f04884308ee7b656c831c3f Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Fri, 5 Mar 2021 09:51:31 +0900 Subject: [PATCH 02/11] update rtx template --- .../Assets/Scenes/samplescene.unity | 567 ++++++++---------- .../CHANGELOG.md | 27 +- .../package.json | 16 +- .../CHANGELOG.md | 16 + .../package.json | 6 +- .../Packages/manifest.json | 10 +- .../Packages/packages-lock.json | 49 +- .../PackageManagerSettings.asset | 4 +- .../ProjectSettings/ProjectSettings.asset | 8 +- .../ProjectSettings/ProjectVersion.txt | 4 +- 10 files changed, 342 insertions(+), 365 deletions(-) diff --git a/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene.unity b/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene.unity index adb038411..71b782299 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene.unity +++ b/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 2035111234} - m_IndirectSpecularColor: {r: 131.19772, g: 162.48279, b: 214.93106, a: 1} + m_IndirectSpecularColor: {r: 111.97819, g: 143.23413, b: 195.03914, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -325,6 +325,7 @@ GameObject: m_Component: - component: {fileID: 91174155} - component: {fileID: 91174156} + - component: {fileID: 91174158} - component: {fileID: 91174157} m_Layer: 5 m_Name: Text @@ -369,7 +370,22 @@ MonoBehaviour: m_GameObject: {fileID: 91174154} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 3, y: -2} + m_UseGraphicAlpha: 1 +--- !u!114 &91174158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91174154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -379,75 +395,20 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: A - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 100 - m_fontSizeBase: 100 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: A --- !u!1 &168218571 GameObject: m_ObjectHideFlags: 0 @@ -478,7 +439,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168218571} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.019999983, y: 1.196, z: 1.8100429} + m_LocalPosition: {x: 0.019999983, y: 1.196, z: 1.8100433} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} @@ -973,7 +934,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &217780052 GameObject: @@ -1056,6 +1017,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1444734336} m_Modifications: + - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} propertyPath: m_LocalPosition.x value: 1.655252 @@ -1068,6 +1033,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 1.0033283 objectReference: {fileID: 0} + - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} propertyPath: m_LocalRotation.x value: -0 @@ -1080,14 +1049,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4206792678894742, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 114600619644317088, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} propertyPath: m_Version @@ -1132,9 +1093,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: a123fc0ac58cb774e8592c925f167e7c, type: 2} m_StaticLightingSkyUniqueID: 1 - m_SkySettings: {fileID: 394920672} - m_SkySettingsFromProfile: {fileID: -1658960478407648048, guid: a123fc0ac58cb774e8592c925f167e7c, - type: 2} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -1149,107 +1107,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &394920672 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59b6606ef2548734bb6d11b9d160bc7e, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 10 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - hdriSky: - m_OverrideState: 0 - m_Value: {fileID: 8900000, guid: 54a3a0570aebe8949bec4966f1376581, type: 3} - enableBackplate: - m_OverrideState: 0 - m_Value: 0 - backplateType: - m_OverrideState: 0 - m_Value: 0 - groundLevel: - m_OverrideState: 0 - m_Value: 0 - scale: - m_OverrideState: 0 - m_Value: {x: 32, y: 32} - projectionDistance: - m_OverrideState: 0 - m_Value: 16 - min: 0.0000001 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 100 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 --- !u!1 &405591764 GameObject: m_ObjectHideFlags: 0 @@ -1295,6 +1152,7 @@ GameObject: m_Component: - component: {fileID: 562683916} - component: {fileID: 562683915} + - component: {fileID: 562683917} m_Layer: 0 m_Name: RenderStreaming m_TagString: Untagged @@ -1314,8 +1172,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 045786cf504bd7347842d6948241cbd0, type: 3} m_Name: m_EditorClassIdentifier: - urlSignaling: http://localhost - signalingType: Unity.RenderStreaming.Signaling.HttpSignaling + urlSignaling: ws://localhost + signalingType: Unity.RenderStreaming.Signaling.WebSocketSignaling iceServers: - credential: credentialType: 0 @@ -1324,52 +1182,9 @@ MonoBehaviour: username: interval: 5 hardwareEncoderSupport: 1 - arrayButtonClickEvent: - - elementId: 1 - click: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2035111233} - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - elementId: 2 - click: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2035111233} - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - elementId: 3 - click: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1394380100} - m_MethodName: Play - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + handlers: + - {fileID: 562683917} + runOnAwake: 1 --- !u!4 &562683916 Transform: m_ObjectHideFlags: 0 @@ -1382,8 +1197,26 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &562683917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 562683914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2307e7ad91222841b562bebd81a69a0, type: 3} + m_Name: + m_EditorClassIdentifier: + streams: + - {fileID: 1297650286} + - {fileID: 1297650285} + - {fileID: 1297650288} + - {fileID: 1306216642} + - {fileID: 1306216647} --- !u!1 &581876909 GameObject: m_ObjectHideFlags: 0 @@ -1430,7 +1263,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &700336089 GameObject: @@ -1464,7 +1297,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf609b6c80ea492288c74dd8f26ae97, type: 3} m_Name: m_EditorClassIdentifier: - text: {fileID: 1324173304} + text: {fileID: 1324173305} canvasGroup: {fileID: 1339446596} pointer: {fileID: 217780053} transitionCurve: @@ -1678,7 +1511,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf609b6c80ea492288c74dd8f26ae97, type: 3} m_Name: m_EditorClassIdentifier: - text: {fileID: 91174157} + text: {fileID: 91174158} canvasGroup: {fileID: 918770242} pointer: {fileID: 754093947} transitionCurve: @@ -1904,7 +1737,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1037846703} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.6870103} + m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.6870104} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} @@ -2392,6 +2225,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1444734336} m_Modifications: + - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -2404,6 +2241,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} propertyPath: m_LocalRotation.x value: -0 @@ -2416,14 +2257,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4277498391999412, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca2a18daa91a3b04ca17d8b3c0c192d8, type: 3} --- !u!4 &1275443620 stripped @@ -2447,6 +2280,7 @@ GameObject: - component: {fileID: 1297650286} - component: {fileID: 1297650281} - component: {fileID: 1297650285} + - component: {fileID: 1297650288} m_Layer: 0 m_Name: Render Streaming Camera m_TagString: MainCamera @@ -2621,7 +2455,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 17.5, y: 109.65, z: 0} --- !u!114 &1297650285 MonoBehaviour: @@ -2648,6 +2482,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: streamingSize: {x: 1280, y: 720} + depth: 0 + antiAliasing: 1 --- !u!114 &1297650287 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2690,6 +2526,67 @@ MonoBehaviour: rotationLerpTime: 0.01 invertY: 0 uiController: {fileID: 754844279} + receiver: {fileID: 1297650288} +--- !u!114 &1297650288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297650280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5bf104a15f68aae49b67b198ea88131e, type: 3} + m_Name: + m_EditorClassIdentifier: + local: 0 + label: + arrayButtonClickEvent: + - elementId: 1 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2035111233} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - elementId: 2 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2035111233} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - elementId: 3 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1394380100} + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1306216641 GameObject: m_ObjectHideFlags: 0 @@ -2703,6 +2600,7 @@ GameObject: - component: {fileID: 1306216644} - component: {fileID: 1306216643} - component: {fileID: 1306216642} + - component: {fileID: 1306216647} m_Layer: 0 m_Name: Render Streaming Camera 2 m_TagString: MainCamera @@ -2723,6 +2621,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: streamingSize: {x: 1280, y: 720} + depth: 0 + antiAliasing: 1 --- !u!114 &1306216643 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2869,6 +2769,7 @@ MonoBehaviour: rotationLerpTime: 0.01 invertY: 0 uiController: {fileID: 700336090} + receiver: {fileID: 1306216647} --- !u!20 &1306216645 Camera: m_ObjectHideFlags: 0 @@ -2924,8 +2825,68 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 20.146, y: 315.092, z: 0} +--- !u!114 &1306216647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1306216641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5bf104a15f68aae49b67b198ea88131e, type: 3} + m_Name: + m_EditorClassIdentifier: + local: 0 + label: + arrayButtonClickEvent: + - elementId: 1 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2035111233} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - elementId: 2 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2035111233} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - elementId: 3 + click: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1394380100} + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1324173301 GameObject: m_ObjectHideFlags: 0 @@ -2936,6 +2897,7 @@ GameObject: m_Component: - component: {fileID: 1324173302} - component: {fileID: 1324173303} + - component: {fileID: 1324173305} - component: {fileID: 1324173304} m_Layer: 5 m_Name: Text @@ -2980,7 +2942,22 @@ MonoBehaviour: m_GameObject: {fileID: 1324173301} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 3, y: -2} + m_UseGraphicAlpha: 1 +--- !u!114 &1324173305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324173301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -2990,75 +2967,20 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: A - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 100 - m_fontSizeBase: 100 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: A --- !u!1 &1339446595 GameObject: m_ObjectHideFlags: 0 @@ -3307,7 +3229,7 @@ Transform: - {fileID: 300715999} - {fileID: 405591765} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &1547029145 GameObject: @@ -3340,7 +3262,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!220 &1547029147 LightProbeGroup: @@ -3808,7 +3730,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 33.959003, y: 130, z: 90.00001} --- !u!114 &2035111237 MonoBehaviour: @@ -3920,6 +3842,7 @@ MonoBehaviour: showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &2059789766 GameObject: m_ObjectHideFlags: 0 @@ -3950,7 +3873,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2059789766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.5100427, y: 1.196, z: 1.1760215} + m_LocalPosition: {x: 2.5100431, y: 1.196, z: 1.1760217} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md index 44b68bfe6..ab6ec5d78 100644 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md +++ b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md @@ -4,7 +4,32 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [7.3.1] - 2020-03-11 +## [7.5.3] - 2021-01-11 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + +## [7.5.2] - 2020-11-16 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + +## [7.5.1] - 2020-09-02 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + +## [7.4.1] - 2020-06-03 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + +## [7.4.0] - 2020-05-22 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + +## [7.3.0] - 2020-03-11 Version Updated The version number for this package has increased due to a version update of a related graphics package. diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json index 59427ede6..b93b4324a 100644 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json +++ b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json @@ -1,17 +1,19 @@ { "name": "com.unity.render-pipelines.high-definition-config", "description": "Configuration files for the High Definition Render Pipeline.", - "version": "7.3.1", - "unity": "2019.3", - "unityRelease": "2f1", + "version": "7.5.3", + "unity": "2019.4", + "unityRelease": "14f1", "displayName": "High Definition RP Config", "dependencies": { - "com.unity.render-pipelines.core": "7.3.1" + "com.unity.render-pipelines.core": "7.5.3" + }, + "upmCi": { + "footprint": "c1bed0d9d8bbff7c6c36211163fab3fc252a55c6" }, "repository": { - "footprint": "9e433f6fdca61b8ea6ab979d79fa7199650a0ccd", + "url": "https://github.com/Unity-Technologies/Graphics.git", "type": "git", - "url": "https://github.com/Unity-Technologies/ScriptableRenderPipeline.git", - "revision": "3e04a9da77f7658a9bec4a2a8de3a4a40b169865" + "revision": "ac3b5ff88a3e68b57911bd6e66fdf7bbc2090dac" } } diff --git a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md index 19d8ad133..8e001abc2 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md +++ b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md @@ -4,6 +4,22 @@ All notable changes to the render streaming template package will be documented The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [3.0.0] - 2021-03-02 + +Version 3.0.0 has a big change in the package design. This mainly addresses moving scripts from the sample folder to Package Manager. + +### Added + +- Supported iOS platform. +- Added new samples. +- Added a documentation for samples. +- Added components (`InputSystemChannelSender`, `InputSystemChannelReceiver`, `WebBrowserInputChannelReceiver`, `SingleConnection` and `Broadcast`). + +### Changed + +- Moved scripts from the sample folder to Package Manager. +- Upgrading WebRTC package to `2.3.3-preview`. + ## [2.2.2] - 2020-12-15 ### Changed diff --git a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json index f9bad85cf..8153a0684 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json +++ b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.template.renderstreaming-rtx", "displayName": "Render Streaming Raytracing", - "version": "2.2.2-preview", + "version": "3.0.0-preview", "type": "template", "unity": "2019.4", "description": "This is HDRP Raytracing sample scene project integrated with Unity Render Streaming technology.\n\nAlong with its signaling web server, you could play around the scene in any webrtc supported web browser.", "dependencies": { - "com.unity.renderstreaming": "2.2.2-preview", - "com.unity.render-pipelines.high-definition": "7.3.1" + "com.unity.renderstreaming": "3.0.1-preview", + "com.unity.render-pipelines.high-definition": "7.5.3" } } \ No newline at end of file diff --git a/com.unity.template.renderstreaming-rtx/Packages/manifest.json b/com.unity.template.renderstreaming-rtx/Packages/manifest.json index d5b7e5645..9828b2757 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/manifest.json +++ b/com.unity.template.renderstreaming-rtx/Packages/manifest.json @@ -4,12 +4,12 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.code-analysis": "0.1.2-preview", "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.2", - "com.unity.inputsystem": "1.0.0", - "com.unity.render-pipelines.high-definition": "7.3.1", + "com.unity.ide.vscode": "1.2.3", + "com.unity.inputsystem": "1.0.2", + "com.unity.render-pipelines.high-definition": "7.5.3", "com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config", - "com.unity.renderstreaming": "2.2.2-preview", - "com.unity.test-framework": "1.1.18", + "com.unity.renderstreaming": "3.0.1-preview", + "com.unity.test-framework": "1.1.22", "com.unity.textmeshpro": "2.1.1", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json b/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json index 8e296e25a..7f4eb807a 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json +++ b/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json @@ -27,7 +27,7 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.0", + "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, @@ -43,37 +43,41 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.2", + "version": "1.2.3", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.0.0", + "version": "1.0.2", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "7.3.1", + "version": "7.5.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.high-definition": { - "version": "7.3.1", + "version": "7.5.3", "depth": 0, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "7.3.1", - "com.unity.shadergraph": "7.3.1", - "com.unity.visualeffectgraph": "7.3.1", - "com.unity.render-pipelines.high-definition-config": "7.3.1" + "com.unity.modules.video": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.render-pipelines.core": "7.5.3", + "com.unity.shadergraph": "7.5.3", + "com.unity.visualeffectgraph": "7.5.3", + "com.unity.render-pipelines.high-definition-config": "7.5.3" }, "url": "https://packages.unity.com" }, @@ -82,25 +86,25 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.render-pipelines.core": "7.3.1" + "com.unity.render-pipelines.core": "7.5.3" } }, "com.unity.renderstreaming": { - "version": "2.2.2-preview", + "version": "3.0.1-preview", "depth": 0, "source": "registry", "dependencies": { - "com.unity.webrtc": "2.2.1-preview", + "com.unity.webrtc": "2.3.3-preview", "com.unity.inputsystem": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "7.3.1", + "version": "7.5.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "7.3.1" + "com.unity.render-pipelines.core": "7.5.3" }, "url": "https://packages.unity.com" }, @@ -109,16 +113,16 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.unity.renderstreaming": "2.2.2-preview", - "com.unity.render-pipelines.high-definition": "7.3.1" + "com.unity.renderstreaming": "3.0.1-preview", + "com.unity.render-pipelines.high-definition": "7.5.3" } }, "com.unity.test-framework": { - "version": "1.1.18", + "version": "1.1.22", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.0", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, @@ -143,19 +147,20 @@ } }, "com.unity.visualeffectgraph": { - "version": "7.3.1", + "version": "7.5.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.shadergraph": "7.3.1" + "com.unity.shadergraph": "7.5.3" }, "url": "https://packages.unity.com" }, "com.unity.webrtc": { - "version": "2.2.1-preview", + "version": "2.3.3-preview", "depth": 1, "source": "registry", "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", "com.unity.editorcoroutines": "1.0.0" }, "url": "https://packages.unity.com" diff --git a/com.unity.template.renderstreaming-rtx/ProjectSettings/PackageManagerSettings.asset b/com.unity.template.renderstreaming-rtx/ProjectSettings/PackageManagerSettings.asset index 9418901fc..6920e3adb 100644 --- a/com.unity.template.renderstreaming-rtx/ProjectSettings/PackageManagerSettings.asset +++ b/com.unity.template.renderstreaming-rtx/ProjectSettings/PackageManagerSettings.asset @@ -9,9 +9,9 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 0} + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: - m_EditorClassIdentifier: UnityEditor:UnityEditor.PackageManager.UI:PackageManagerProjectSettings + m_EditorClassIdentifier: m_ScopedRegistriesSettingsExpanded: 1 oneTimeWarningShown: 0 m_Registries: diff --git a/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectSettings.asset b/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectSettings.asset index 5421a30f1..d1f4d6f66 100644 --- a/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectSettings.asset +++ b/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectSettings.asset @@ -232,6 +232,7 @@ PlayerSettings: metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -495,6 +496,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -537,6 +539,8 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 @@ -560,7 +564,7 @@ PlayerSettings: webGLThreadsSupport: 0 webGLWasmStreaming: 0 scriptingDefineSymbols: - 1: ENABLE_RAYTRACING + 1: 4: UNITY_POST_PROCESSING_STACK_V2 7: UNITY_POST_PROCESSING_STACK_V2 13: UNITY_POST_PROCESSING_STACK_V2 @@ -584,6 +588,7 @@ PlayerSettings: additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -633,6 +638,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} diff --git a/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectVersion.txt b/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectVersion.txt index 66132d0e5..e8a0ab94d 100644 --- a/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectVersion.txt +++ b/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.13f1 -m_EditorVersionWithRevision: 2019.4.13f1 (518737b1de84) +m_EditorVersion: 2019.4.20f1 +m_EditorVersionWithRevision: 2019.4.20f1 (6dd1c08eedfa) From 339c9f78596b9139ce2a098603f727082ecda832 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Fri, 5 Mar 2021 10:17:23 +0900 Subject: [PATCH 03/11] fix rtx template --- .../Assets/RenderPipeline/HDRP/Scripts.meta | 8 ---- .../RenderPipeline/HDRP/Scripts/Editor.meta | 8 ---- .../Editor/HDRPInitialSetupPostProcessor.cs | 31 -------------- .../HDRPInitialSetupPostProcessor.cs.meta | 11 ----- .../HDRP/Scripts/HDRPRenderTextureBlitter.cs | 40 ------------------- .../Scripts/HDRPRenderTextureBlitter.cs.meta | 11 ----- .../RenderPipeline/{ => HDRP}/Settings.meta | 2 +- .../DefaultPostprocessingSettings.asset | 0 .../DefaultPostprocessingSettings.asset.meta | 0 .../Settings/DefaultRenderingSettings.asset | 0 .../DefaultRenderingSettings.asset.meta | 0 .../SampleScenePostProcessingSettings.asset | 0 ...mpleScenePostProcessingSettings.asset.meta | 0 .../SampleSceneSkyandFogSettings.asset | 0 .../SampleSceneSkyandFogSettings.asset.meta | 0 15 files changed, 1 insertion(+), 110 deletions(-) delete mode 100644 com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts.meta delete mode 100644 com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor.meta delete mode 100644 com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor/HDRPInitialSetupPostProcessor.cs delete mode 100644 com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor/HDRPInitialSetupPostProcessor.cs.meta delete mode 100644 com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/HDRPRenderTextureBlitter.cs delete mode 100644 com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/HDRPRenderTextureBlitter.cs.meta rename com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/{ => HDRP}/Settings.meta (77%) rename com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/{ => HDRP}/Settings/DefaultPostprocessingSettings.asset (100%) rename com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/{ => HDRP}/Settings/DefaultPostprocessingSettings.asset.meta (100%) rename com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/{ => HDRP}/Settings/DefaultRenderingSettings.asset (100%) rename com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/{ => HDRP}/Settings/DefaultRenderingSettings.asset.meta (100%) rename com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/{ => HDRP}/Settings/SampleScenePostProcessingSettings.asset (100%) rename com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/{ => HDRP}/Settings/SampleScenePostProcessingSettings.asset.meta (100%) rename com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/{ => HDRP}/Settings/SampleSceneSkyandFogSettings.asset (100%) rename com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/{ => HDRP}/Settings/SampleSceneSkyandFogSettings.asset.meta (100%) diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts.meta b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts.meta deleted file mode 100644 index 3ac745333..000000000 --- a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 694b0f08a1f33ef40b4882874f9c7e0e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor.meta b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor.meta deleted file mode 100644 index d79f40555..000000000 --- a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c756254de7aa52b40b2a419f90dc8f2e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor/HDRPInitialSetupPostProcessor.cs b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor/HDRPInitialSetupPostProcessor.cs deleted file mode 100644 index 3b7306636..000000000 --- a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor/HDRPInitialSetupPostProcessor.cs +++ /dev/null @@ -1,31 +0,0 @@ -using UnityEngine; //Debug -using UnityEditor; //AssetPostProcessor -using UnityEngine.Rendering; //GraphicsSettings -#if UNITY_2019_3_OR_NEWER -using UnityEngine.Rendering.HighDefinition; //HDRenderPipelineAsset -#else -using UnityEngine.Experimental.Rendering.HDPipeline; //HDRenderPipelineAsset -#endif - -public class HDRPPostProcessor : AssetPostprocessor -{ - static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, - string[] movedAssets, string[] movedFromAssetPaths) - { - if (null != GraphicsSettings.renderPipelineAsset) { - return; - } - - int numImportedAssets = importedAssets.Length; - for (int i=0;i< numImportedAssets; ++i) { - string curAssetPath = importedAssets[i]; - - if (curAssetPath == "Assets/RenderPipeline/HDRP/HDRenderPipelineAsset.asset") { - HDRenderPipelineAsset pipelineAsset = AssetDatabase.LoadAssetAtPath(curAssetPath); - GraphicsSettings.renderPipelineAsset = pipelineAsset; - - PlayerSettings.colorSpace = ColorSpace.Linear; - } - } - } -} diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor/HDRPInitialSetupPostProcessor.cs.meta b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor/HDRPInitialSetupPostProcessor.cs.meta deleted file mode 100644 index a299e3f09..000000000 --- a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/Editor/HDRPInitialSetupPostProcessor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 20855faa7e3098a45a7419d63413e91e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/HDRPRenderTextureBlitter.cs b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/HDRPRenderTextureBlitter.cs deleted file mode 100644 index a68fd35b8..000000000 --- a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/HDRPRenderTextureBlitter.cs +++ /dev/null @@ -1,40 +0,0 @@ -using UnityEngine; - -#if UNITY_2019_1 || UNITY_2019_2 //HDRP 5.x, 6.x -using UnityEngine.Experimental.Rendering.HDPipeline; -#else //HDRP 7.x and above -using UnityEngine.Rendering.HighDefinition; -#endif - -[RequireComponent(typeof(Camera), typeof(HDAdditionalCameraData))] -public class HDRPRenderTextureBlitter : MonoBehaviour -{ - [SerializeField] Camera m_rtCamera = null; - - Camera m_cam; - HDAdditionalCameraData m_hdData; - - private void OnEnable() { - m_cam = GetComponent(); - m_hdData = GetComponent(); - - //Render nothing - m_cam.clearFlags = CameraClearFlags.Nothing; - m_cam.cullingMask = 0; - m_hdData.fullscreenPassthrough = true; - m_hdData.customRender += BlitRenderStreamingRT; - } - -//--------------------------------------------------------------------------------------------------------------------- - - private void OnDisable() { - m_hdData.customRender -= BlitRenderStreamingRT; - } - -//--------------------------------------------------------------------------------------------------------------------- - public void BlitRenderStreamingRT(UnityEngine.Rendering.ScriptableRenderContext context, HDCamera cam) { - Graphics.Blit(m_rtCamera.targetTexture, (RenderTexture) null); - } - - -} diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/HDRPRenderTextureBlitter.cs.meta b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/HDRPRenderTextureBlitter.cs.meta deleted file mode 100644 index 53dd90022..000000000 --- a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Scripts/HDRPRenderTextureBlitter.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 88167b61ef2361446aefab18c3c7a843 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings.meta b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings.meta similarity index 77% rename from com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings.meta rename to com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings.meta index c64ba9f60..c99169721 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings.meta +++ b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dcdb1f94d436eb946b47392c2fe7730d +guid: b0943a5cbda694a988cb9a8d3a502249 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/DefaultPostprocessingSettings.asset b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/DefaultPostprocessingSettings.asset similarity index 100% rename from com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/DefaultPostprocessingSettings.asset rename to com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/DefaultPostprocessingSettings.asset diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/DefaultPostprocessingSettings.asset.meta b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/DefaultPostprocessingSettings.asset.meta similarity index 100% rename from com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/DefaultPostprocessingSettings.asset.meta rename to com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/DefaultPostprocessingSettings.asset.meta diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/DefaultRenderingSettings.asset b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/DefaultRenderingSettings.asset similarity index 100% rename from com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/DefaultRenderingSettings.asset rename to com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/DefaultRenderingSettings.asset diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/DefaultRenderingSettings.asset.meta b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/DefaultRenderingSettings.asset.meta similarity index 100% rename from com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/DefaultRenderingSettings.asset.meta rename to com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/DefaultRenderingSettings.asset.meta diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/SampleScenePostProcessingSettings.asset b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/SampleScenePostProcessingSettings.asset similarity index 100% rename from com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/SampleScenePostProcessingSettings.asset rename to com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/SampleScenePostProcessingSettings.asset diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/SampleScenePostProcessingSettings.asset.meta b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/SampleScenePostProcessingSettings.asset.meta similarity index 100% rename from com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/SampleScenePostProcessingSettings.asset.meta rename to com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/SampleScenePostProcessingSettings.asset.meta diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/SampleSceneSkyandFogSettings.asset b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/SampleSceneSkyandFogSettings.asset similarity index 100% rename from com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/SampleSceneSkyandFogSettings.asset rename to com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/SampleSceneSkyandFogSettings.asset diff --git a/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/SampleSceneSkyandFogSettings.asset.meta b/com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/SampleSceneSkyandFogSettings.asset.meta similarity index 100% rename from com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/Settings/SampleSceneSkyandFogSettings.asset.meta rename to com.unity.template.renderstreaming-rtx/Assets/RenderPipeline/HDRP/Settings/SampleSceneSkyandFogSettings.asset.meta From 6592db0dad6c292315d00aa3ff94ab8c115bd072 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Fri, 5 Mar 2021 10:17:41 +0900 Subject: [PATCH 04/11] add template package test --- .../Assets/Tests/Editor.meta | 2 +- .../RenderStreamingTemplateEditorTest.cs | 22 +++++++-------- .../RenderStreamingTemplateEditorTest.cs.meta | 2 +- .../Assets/Tests/Runtime.meta | 2 +- .../Tests/Runtime/RenderStreamingTest.cs | 2 +- .../Tests/Runtime/RenderStreamingTest.cs.meta | 2 +- .../Tests.meta | 8 ++++++ .../Tests/Editor.meta | 8 ++++++ .../RenderStreamingTemplateEditorTest.cs | 12 ++++++++ .../RenderStreamingTemplateEditorTest.cs.meta | 11 ++++++++ ...Package.RenderStreaming.EditorTests.asmdef | 22 +++++++++++++++ ...ge.RenderStreaming.EditorTests.asmdef.meta | 7 +++++ .../Tests/Runtime.meta | 8 ++++++ .../Tests/Runtime/RenderStreamingTest.cs | 12 ++++++++ .../Tests/Runtime/RenderStreamingTest.cs.meta | 11 ++++++++ ...ackage.RenderStreaming.RuntimeTests.asmdef | 28 +++++++++++++++++++ ...e.RenderStreaming.RuntimeTests.asmdef.meta | 7 +++++ .../Tests | 1 + .../Tests.meta | 8 ++++++ 19 files changed, 159 insertions(+), 16 deletions(-) create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests.meta create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor.meta create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/RenderStreamingTemplateEditorTest.cs create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/RenderStreamingTemplateEditorTest.cs.meta create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/Unity.TemplatePackage.RenderStreaming.EditorTests.asmdef create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/Unity.TemplatePackage.RenderStreaming.EditorTests.asmdef.meta create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime.meta create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/RenderStreamingTest.cs create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/RenderStreamingTest.cs.meta create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/Unity.TemplatePackage.RenderStreaming.RuntimeTests.asmdef create mode 100644 com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/Unity.TemplatePackage.RenderStreaming.RuntimeTests.asmdef.meta create mode 120000 com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/Tests create mode 100644 com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/Tests.meta diff --git a/com.unity.template.renderstreaming-hd/Assets/Tests/Editor.meta b/com.unity.template.renderstreaming-hd/Assets/Tests/Editor.meta index 2e8b06172..745c00020 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Tests/Editor.meta +++ b/com.unity.template.renderstreaming-hd/Assets/Tests/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38c8801665692b14fb724364c6ec8c6f +guid: 69ec9659a542749c2b626a9d78e9824c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/com.unity.template.renderstreaming-hd/Assets/Tests/Editor/RenderStreamingTemplateEditorTest.cs b/com.unity.template.renderstreaming-hd/Assets/Tests/Editor/RenderStreamingTemplateEditorTest.cs index 201baaf83..79ec44e5d 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Tests/Editor/RenderStreamingTemplateEditorTest.cs +++ b/com.unity.template.renderstreaming-hd/Assets/Tests/Editor/RenderStreamingTemplateEditorTest.cs @@ -1,12 +1,12 @@ -using NUnit.Framework; - -namespace Unity.RenderStreaming.Editor -{ - public class RenderStreamingTemplateEditorTest - { - [Test] - public void Test() - { - } - } +using NUnit.Framework; + +namespace Unity.RenderStreaming.Editor +{ + public class RenderStreamingTemplateEditorTest + { + [Test] + public void Test() + { + } + } } diff --git a/com.unity.template.renderstreaming-hd/Assets/Tests/Editor/RenderStreamingTemplateEditorTest.cs.meta b/com.unity.template.renderstreaming-hd/Assets/Tests/Editor/RenderStreamingTemplateEditorTest.cs.meta index 5bd981bba..1430c26b1 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Tests/Editor/RenderStreamingTemplateEditorTest.cs.meta +++ b/com.unity.template.renderstreaming-hd/Assets/Tests/Editor/RenderStreamingTemplateEditorTest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38e961ea05600444891936724fb77d57 +guid: 65468f77c6d6c4690a7cb8173f45a985 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime.meta b/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime.meta index 2036762a9..62266e202 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime.meta +++ b/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 25af854ea48aa4c23b44e2660ef2c19d +guid: fcd6e2652832d4947bd8468d3edc7bd3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime/RenderStreamingTest.cs b/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime/RenderStreamingTest.cs index d8a67de0b..5bbfbec0b 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime/RenderStreamingTest.cs +++ b/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime/RenderStreamingTest.cs @@ -1,4 +1,4 @@ -using NUnit.Framework; +using NUnit.Framework; namespace Unity.RenderStreaming { diff --git a/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime/RenderStreamingTest.cs.meta b/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime/RenderStreamingTest.cs.meta index 43d351f6e..0a8882611 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime/RenderStreamingTest.cs.meta +++ b/com.unity.template.renderstreaming-hd/Assets/Tests/Runtime/RenderStreamingTest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 47afa9dc02dda4559b9db79018fc609c +guid: d24cb52329a3f47fca8d8d0e1120e626 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests.meta b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests.meta new file mode 100644 index 000000000..a7e46ace8 --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8d7efba0e3e79480fa6b53a3a15aa1e6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor.meta b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor.meta new file mode 100644 index 000000000..2e8b06172 --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38c8801665692b14fb724364c6ec8c6f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/RenderStreamingTemplateEditorTest.cs b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/RenderStreamingTemplateEditorTest.cs new file mode 100644 index 000000000..79ec44e5d --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/RenderStreamingTemplateEditorTest.cs @@ -0,0 +1,12 @@ +using NUnit.Framework; + +namespace Unity.RenderStreaming.Editor +{ + public class RenderStreamingTemplateEditorTest + { + [Test] + public void Test() + { + } + } +} diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/RenderStreamingTemplateEditorTest.cs.meta b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/RenderStreamingTemplateEditorTest.cs.meta new file mode 100644 index 000000000..5bd981bba --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/RenderStreamingTemplateEditorTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 38e961ea05600444891936724fb77d57 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/Unity.TemplatePackage.RenderStreaming.EditorTests.asmdef b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/Unity.TemplatePackage.RenderStreaming.EditorTests.asmdef new file mode 100644 index 000000000..86e98118f --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/Unity.TemplatePackage.RenderStreaming.EditorTests.asmdef @@ -0,0 +1,22 @@ +{ + "name": "Unity.TemplatePackage.RenderStreaming.EditorTests", + "references": [ + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": true, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/Unity.TemplatePackage.RenderStreaming.EditorTests.asmdef.meta b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/Unity.TemplatePackage.RenderStreaming.EditorTests.asmdef.meta new file mode 100644 index 000000000..bc3a4a24a --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Editor/Unity.TemplatePackage.RenderStreaming.EditorTests.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5ad58aea2a0004cad822a8a21b9d62ac +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime.meta b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime.meta new file mode 100644 index 000000000..2036762a9 --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25af854ea48aa4c23b44e2660ef2c19d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/RenderStreamingTest.cs b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/RenderStreamingTest.cs new file mode 100644 index 000000000..5bbfbec0b --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/RenderStreamingTest.cs @@ -0,0 +1,12 @@ +using NUnit.Framework; + +namespace Unity.RenderStreaming +{ + public class RenderStreamingTest + { + [Test] + public void Test() + { + } + } +} diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/RenderStreamingTest.cs.meta b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/RenderStreamingTest.cs.meta new file mode 100644 index 000000000..43d351f6e --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/RenderStreamingTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 47afa9dc02dda4559b9db79018fc609c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/Unity.TemplatePackage.RenderStreaming.RuntimeTests.asmdef b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/Unity.TemplatePackage.RenderStreaming.RuntimeTests.asmdef new file mode 100644 index 000000000..089b86ba2 --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/Unity.TemplatePackage.RenderStreaming.RuntimeTests.asmdef @@ -0,0 +1,28 @@ +{ + "name": "Unity.TemplatePackage.RenderStreaming.RuntimeTests", + "references": [ + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3", + "GUID:40a5acf76f04c4c8ebb69605e4b0d5c7", + "GUID:f12aafacab75a87499e7e45c873ffab8", + "GUID:7e479a0c97f111c48b6a279fad867f28" + ], + "includePlatforms": [ + "Editor", + "LinuxStandalone64", + "macOSStandalone", + "WindowsStandalone64" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": true, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/Unity.TemplatePackage.RenderStreaming.RuntimeTests.asmdef.meta b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/Unity.TemplatePackage.RenderStreaming.RuntimeTests.asmdef.meta new file mode 100644 index 000000000..660b21f31 --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests/Runtime/Unity.TemplatePackage.RenderStreaming.RuntimeTests.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 279c80db0ff9d458582f827849b4ec15 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/Tests b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/Tests new file mode 120000 index 000000000..3ef4b4535 --- /dev/null +++ b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/Tests @@ -0,0 +1 @@ +../../../com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/Tests \ No newline at end of file diff --git a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/Tests.meta b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/Tests.meta new file mode 100644 index 000000000..b144bc66f --- /dev/null +++ b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/Tests.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5311458cc43164b4abe2d0f59b97e5da +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 33ee7fef9540f736989d0d4e42c668e57fefd932 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Fri, 5 Mar 2021 10:21:19 +0900 Subject: [PATCH 05/11] add prepack process --- .yamato/upm-ci-template.yml | 25 ++++++++++++++++++++++++- BuildScripts~/convert_symlinks.cmd | 9 +++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 BuildScripts~/convert_symlinks.cmd diff --git a/.yamato/upm-ci-template.yml b/.yamato/upm-ci-template.yml index d4de9343b..65270e726 100644 --- a/.yamato/upm-ci-template.yml +++ b/.yamato/upm-ci-template.yml @@ -3,6 +3,24 @@ --- {% for project in template_projects %} +prepack_{{ project.name }}: + name: Pre-Pack {{ project.packagename }} - Primed Artifacts + agent: + type: Unity::VM + image: package-ci/win10:stable + flavor: b1.large + commands: + - pip install unity-downloader-cli --index-url {{ intra_pypi_url }} --upgrade + - unity-downloader-cli -u 2019.4 -c editor -w --fast + - FOR /F "usebackq" %%i IN (`dir /B /S /AL {{ project.packagename }}`) DO (call "BuildScripts~\convert_symlinks.cmd" %%i) + - .Editor\Unity.exe -projectPath {{ project.packagename }} -batchmode -quit + artifacts: + primed: + paths: + - "{{ project.packagename }}/Library/Artifacts/**" + - "{{ project.packagename }}/Library/ArtifactDB" + - "{{ project.packagename }}/Library/SourceAssetDB" + pack_{{ project.name }}: name: Pack {{ project.packagename }} agent: @@ -11,8 +29,10 @@ pack_{{ project.name }}: flavor: b1.large commands: - npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }} - - find ./{{ project.packagename }} -type l -exec bash -c 'sh BuildScripts~/convert_symlinks.sh "$0"' {} \; + - find ./{{ project.packagename }} -type l -exec bash -c 'sh BuildScripts~/convert_symlinks.sh "$0"' {} \; - upm-ci template pack --project-path {{ project.packagename }} + dependencies: + - .yamato/upm-ci-template.yml#prepack_{{ project.name }} artifacts: packages: paths: @@ -29,6 +49,9 @@ test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam type: {{ platform.type }} image: {{ platform.image }} flavor: {{ platform.flavor}} + {% if project.name == "renderstreaming-rtx" %} + model: rtx2080 + {% endif %} commands: - npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }} - upm-ci template test -u {{ editor.version }} --project-path {{ project.packagename }} --platform {{ param.platform }} --backend {{ param.backend }} --extra-utr-arg="--timeout=3000" diff --git a/BuildScripts~/convert_symlinks.cmd b/BuildScripts~/convert_symlinks.cmd new file mode 100644 index 000000000..b815c0fb1 --- /dev/null +++ b/BuildScripts~/convert_symlinks.cmd @@ -0,0 +1,9 @@ +set ESCAPED_PATH=%1 +set TEMP_SYMLINK=%ESCAPED_PATH%Temp +echo +echo -------------------------------------------------------------------------- +echo Converting symlinks to copies: %1 +echo -------------------------------------------------------------------------- +move %ESCAPED_PATH% %TEMP_SYMLINK% +robocopy /MIR %TEMP_SYMLINK% %ESCAPED_PATH% +del /Q %TEMP_SYMLINK% \ No newline at end of file From b5942229d6804dd12c664538af15d48f411d4530 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Fri, 5 Mar 2021 11:05:14 +0900 Subject: [PATCH 06/11] skip convert symlink (meaning not run test about rtx template) --- .yamato/upm-ci-template.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.yamato/upm-ci-template.yml b/.yamato/upm-ci-template.yml index 65270e726..b840a234b 100644 --- a/.yamato/upm-ci-template.yml +++ b/.yamato/upm-ci-template.yml @@ -12,7 +12,8 @@ prepack_{{ project.name }}: commands: - pip install unity-downloader-cli --index-url {{ intra_pypi_url }} --upgrade - unity-downloader-cli -u 2019.4 -c editor -w --fast - - FOR /F "usebackq" %%i IN (`dir /B /S /AL {{ project.packagename }}`) DO (call "BuildScripts~\convert_symlinks.cmd" %%i) + # ToDO: windows vm can not use symbolic link + # - FOR /F "usebackq" %%i IN (`dir /B /S /AL {{ project.packagename }}`) DO (call "BuildScripts~\convert_symlinks.cmd" %%i) - .Editor\Unity.exe -projectPath {{ project.packagename }} -batchmode -quit artifacts: primed: From efff7cf68a2a26aa40651e9d63fb2587c304ec97 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Fri, 5 Mar 2021 15:01:06 +0900 Subject: [PATCH 07/11] update changelog --- .../CHANGELOG.md | 12 ++---------- .../CHANGELOG.md | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md index 93db32256..ec11ffd8e 100644 --- a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md @@ -6,19 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [3.0.0] - 2021-03-02 -Version 3.0.0 has a big change in the package design. This mainly addresses moving scripts from the sample folder to Package Manager. - -### Added - -- Supported iOS platform. -- Added new samples. -- Added a documentation for samples. -- Added components (`InputSystemChannelSender`, `InputSystemChannelReceiver`, `WebBrowserInputChannelReceiver`, `SingleConnection` and `Broadcast`). +Version 3.0.0 has a big change in the package design. This mainly addresses moving scripts from template to package. ### Changed -- Moved scripts from the sample folder to Package Manager. -- Upgrading WebRTC package to `2.3.3-preview`. +- Upgrading RenderStreaming package to `3.0.1-preview`. ## [2.2.2] - 2020-12-15 diff --git a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md index 8e001abc2..4b78b02c0 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md +++ b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md @@ -6,19 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [3.0.0] - 2021-03-02 -Version 3.0.0 has a big change in the package design. This mainly addresses moving scripts from the sample folder to Package Manager. - -### Added - -- Supported iOS platform. -- Added new samples. -- Added a documentation for samples. -- Added components (`InputSystemChannelSender`, `InputSystemChannelReceiver`, `WebBrowserInputChannelReceiver`, `SingleConnection` and `Broadcast`). +Version 3.0.0 has a big change in the package design. This mainly addresses moving scripts from template to package. ### Changed -- Moved scripts from the sample folder to Package Manager. -- Upgrading WebRTC package to `2.3.3-preview`. +- Upgrading RenderStreaming package to `3.0.1-preview`. ## [2.2.2] - 2020-12-15 From 0d853e8c116c7df1f243d3e1eeb26d784f9a6009 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Mon, 8 Mar 2021 09:04:44 +0900 Subject: [PATCH 08/11] fix review --- .yamato/upm-ci-template.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.yamato/upm-ci-template.yml b/.yamato/upm-ci-template.yml index b840a234b..ad12caa13 100644 --- a/.yamato/upm-ci-template.yml +++ b/.yamato/upm-ci-template.yml @@ -3,15 +3,17 @@ --- {% for project in template_projects %} -prepack_{{ project.name }}: - name: Pre-Pack {{ project.packagename }} - Primed Artifacts + +{% for editor in editors %} +prepack_{{ project.name }}_{{ editor.version }}: + name: Pre-Pack {{ project.packagename }} {{ editor.version }} - Primed Artifacts agent: type: Unity::VM image: package-ci/win10:stable flavor: b1.large commands: - pip install unity-downloader-cli --index-url {{ intra_pypi_url }} --upgrade - - unity-downloader-cli -u 2019.4 -c editor -w --fast + - unity-downloader-cli -u {{ editor.version }} -c editor -w --fast # ToDO: windows vm can not use symbolic link # - FOR /F "usebackq" %%i IN (`dir /B /S /AL {{ project.packagename }}`) DO (call "BuildScripts~\convert_symlinks.cmd" %%i) - .Editor\Unity.exe -projectPath {{ project.packagename }} -batchmode -quit @@ -22,25 +24,23 @@ prepack_{{ project.name }}: - "{{ project.packagename }}/Library/ArtifactDB" - "{{ project.packagename }}/Library/SourceAssetDB" -pack_{{ project.name }}: - name: Pack {{ project.packagename }} +pack_{{ project.name }}_{{ editor.version }}: + name: Pack {{ project.packagename }} {{ editor.version }} agent: type: Unity::VM - image: package-ci/ubuntu:stable + image: package-ci/ubuntu:stable flavor: b1.large commands: - npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }} - find ./{{ project.packagename }} -type l -exec bash -c 'sh BuildScripts~/convert_symlinks.sh "$0"' {} \; - upm-ci template pack --project-path {{ project.packagename }} dependencies: - - .yamato/upm-ci-template.yml#prepack_{{ project.name }} + - .yamato/upm-ci-template.yml#prepack_{{ project.name }}_{{ editor.version }} artifacts: packages: paths: - "upm-ci~/**/*" -{% for editor in editors %} - {% for platform in platforms %} {% if platform.name == "win" -%} {% for param in platform.test_params %} @@ -61,7 +61,7 @@ test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam paths: - "upm-ci~/test-results/**/*" dependencies: - - .yamato/upm-ci-template.yml#pack_{{ project.name }} + - .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }} - .yamato/upm-ci-webapp.yml#pack_{{ platform.name }} {% endfor %} {% else -%} @@ -81,7 +81,7 @@ test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam paths: - "upm-ci~/test-results/**/*" dependencies: - - .yamato/upm-ci-template.yml#pack_{{ project.name }} + - .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }} - .yamato/upm-ci-webapp.yml#pack_{{ platform.name }} {% endif -%} {% endfor %} @@ -129,8 +129,8 @@ publish_{{ project.name }}: - "upm-ci~/packages/*.tgz" - "upm-ci~/templates/*.tgz" dependencies: - - .yamato/upm-ci-template.yml#pack_{{ project.name }} {% for editor in editors %} + - .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }} - .yamato/upm-ci-template.yml#trigger_template_test_{{ project.name }}_{{ editor.version }} {% endfor %} @@ -156,8 +156,8 @@ publish_dryrun_{{ project.name }}: - "upm-ci~/packages/*.tgz" - "upm-ci~/templates/*.tgz" dependencies: - - .yamato/upm-ci-template.yml#pack_{{ project.name }} {% for editor in editors %} + - .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }} - .yamato/upm-ci-template.yml#trigger_template_test_{{ project.name }}_{{ editor.version }} {% endfor %} {% endfor %} \ No newline at end of file From 3e062d34908b4662a5d544504883d3c07b5f6982 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Mon, 8 Mar 2021 10:28:50 +0900 Subject: [PATCH 09/11] fix review --- com.unity.template.renderstreaming-hd/Packages/manifest.json | 1 - com.unity.template.renderstreaming-rtx/Packages/manifest.json | 1 - 2 files changed, 2 deletions(-) diff --git a/com.unity.template.renderstreaming-hd/Packages/manifest.json b/com.unity.template.renderstreaming-hd/Packages/manifest.json index a2844bc85..ce4323a27 100644 --- a/com.unity.template.renderstreaming-hd/Packages/manifest.json +++ b/com.unity.template.renderstreaming-hd/Packages/manifest.json @@ -5,7 +5,6 @@ "com.unity.code-analysis": "0.1.2-preview", "com.unity.ide.rider": "1.1.4", "com.unity.ide.vscode": "1.2.3", - "com.unity.inputsystem": "1.0.2", "com.unity.render-pipelines.high-definition": "7.5.3", "com.unity.renderstreaming": "3.0.1-preview", "com.unity.test-framework": "1.1.22", diff --git a/com.unity.template.renderstreaming-rtx/Packages/manifest.json b/com.unity.template.renderstreaming-rtx/Packages/manifest.json index 9828b2757..4072d89de 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/manifest.json +++ b/com.unity.template.renderstreaming-rtx/Packages/manifest.json @@ -5,7 +5,6 @@ "com.unity.code-analysis": "0.1.2-preview", "com.unity.ide.rider": "1.1.4", "com.unity.ide.vscode": "1.2.3", - "com.unity.inputsystem": "1.0.2", "com.unity.render-pipelines.high-definition": "7.5.3", "com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config", "com.unity.renderstreaming": "3.0.1-preview", From 5679dca89764f04ec04eba33de1aa97ece2e0b9a Mon Sep 17 00:00:00 2001 From: kazuki Date: Mon, 8 Mar 2021 11:41:31 +0900 Subject: [PATCH 10/11] [skip ci] fixed broken links --- .../Assets/Readme.asset | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/com.unity.template.renderstreaming-hd/Assets/Readme.asset b/com.unity.template.renderstreaming-hd/Assets/Readme.asset index 78ca87509..fbffdb1ce 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Readme.asset +++ b/com.unity.template.renderstreaming-hd/Assets/Readme.asset @@ -30,27 +30,27 @@ MonoBehaviour: - heading: text: To read more about Unity RenderStreaming please refer to the manual page. linkText: Unity Render Streaming (English) - url: https://github.com/Unity-Technologies/UnityRenderStreaming/blob/stable/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/Documentation~/index.md + url: https://docs.unity3d.com/Packages/com.unity.renderstreaming@3.0 - heading: text: "\u65E5\u672C\u8A9E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8" linkText: Unity Render Streaming (Japanese) - url: https://github.com/Unity-Technologies/UnityRenderStreaming/blob/stable/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/Documentation~/jp/index.md + url: https://docs.unity3d.com/ja/Packages/com.unity.renderstreaming@3.0 - heading: WebRTC Package - text: The Unity WebRTC package implements Unity Render Streaming technology and provides - C# WebRTC API for you to build WebRTC applications inside Unity. To read more - about it please refer to the manual page + text: The Unity WebRTC package implements Unity Render Streaming technology and + provides C# WebRTC API for you to build WebRTC applications inside Unity. To + read more about it please refer to the manual page linkText: WebRTC Package (English) - url: https://github.com/Unity-Technologies/com.unity.webrtc/blob/stable/Documentation~/index.md + url: https://docs.unity3d.com/Packages/com.unity.webrtc@2.3 - heading: text: "\u65E5\u672C\u8A9E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8" linkText: WebRTC Package (Japanese) - url: https://github.com/Unity-Technologies/com.unity.webrtc/blob/stable/Documentation~/jp/index.md + url: https://docs.unity3d.com/ja/Packages/com.unity.webrtc@2.3 - heading: text: This project uses the Package Manager to bring you the latest features Unity has to offer. Open the Package Manager from Windows > Package Manager and make sure you're using the most recent version of WebRTC package. To update - packages, select your desired package from the list on the left, and click the - Update to button in the bottom right corner. + packages, select your desired package from the list on the left, and click + the Update to button in the bottom right corner. linkText: url: loadedLayout: 1 From 1717b5dcdc9f28fc79b368762548ad7f61a20fc0 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Fri, 19 Mar 2021 16:54:00 +0900 Subject: [PATCH 11/11] [skip ci] filter ValidationSuiteRun --- .yamato/upm-ci-template.yml | 2 +- .../Packages/packages-lock.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/upm-ci-template.yml b/.yamato/upm-ci-template.yml index ad12caa13..278290885 100644 --- a/.yamato/upm-ci-template.yml +++ b/.yamato/upm-ci-template.yml @@ -55,7 +55,7 @@ test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam {% endif %} commands: - npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }} - - upm-ci template test -u {{ editor.version }} --project-path {{ project.packagename }} --platform {{ param.platform }} --backend {{ param.backend }} --extra-utr-arg="--timeout=3000" + - upm-ci template test -u {{ editor.version }} --project-path {{ project.packagename }} --platform {{ param.platform }} --backend {{ param.backend }} --extra-utr-arg="--timeout=3000 --testfilter=!ValidationSuiteRun" artifacts: logs: paths: diff --git a/com.unity.template.renderstreaming-hd/Packages/packages-lock.json b/com.unity.template.renderstreaming-hd/Packages/packages-lock.json index 1cb56ff2a..b1d3919e9 100644 --- a/com.unity.template.renderstreaming-hd/Packages/packages-lock.json +++ b/com.unity.template.renderstreaming-hd/Packages/packages-lock.json @@ -50,8 +50,8 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.0.2", - "depth": 0, + "version": "1.0.0", + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com"