First version of DetailsPanel rework

3D Model now is rendered to a texture to simplify layouting in DetailsPanel
Fixed bugs in ProjectionEffectBehaviour and DetailsPanelBehaviour caused by CanvasScaler
Added CanvasScaler to DisplayManager to easily access global canvas scale
This commit is contained in:
2018-09-19 18:26:56 +02:00
parent bd9a9150d9
commit 24319b51a2
10 changed files with 604 additions and 188 deletions

View File

@@ -247,21 +247,6 @@ Transform:
m_Father: {fileID: 1230455932}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!115 &658607817
MonoScript:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
serializedVersion: 4
m_Script:
m_DefaultReferences: {}
m_Icon: {fileID: 0}
m_ExecutionOrder: 0
m_ClassName: DefaultInitializationErrorHandlerPlaceHolder
m_Namespace:
m_AssemblyName: Vuforia.UnityExtensions
m_IsEditorScript: 0
--- !u!1 &1073945774
GameObject:
m_ObjectHideFlags: 0
@@ -382,7 +367,7 @@ Camera:
m_GameObject: {fileID: 1230455927}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 3
m_ClearFlags: 2
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
@@ -400,12 +385,12 @@ Camera:
serializedVersion: 2
m_Bits: 256
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetTexture: {fileID: 8400000, guid: 758df79ffe66c3c44b96f6ac5dce854f, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_AllowDynamicResolution: 1
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
@@ -581,7 +566,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1650865715}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 658607817}
m_Script: {fileID: 11500000, guid: c47f92041efbb4b429a4eafca855ebe3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1650865717