From 74c51e70726cfee6774fc0f7b8da340a69352613 Mon Sep 17 00:00:00 2001 From: hecomi Date: Sat, 29 Dec 2018 00:05:06 +0900 Subject: [PATCH] tweak script name. --- .../Examples/Scenes/Buffer.unity | 164 +++++++++++++++++- .../Examples/Scenes/Raycast.unity | 100 +++++------ .../{RaycastTest.cs => RaycastExample.cs} | 3 +- ...astTest.cs.meta => RaycastExample.cs.meta} | 0 4 files changed, 212 insertions(+), 55 deletions(-) rename Assets/uDesktopDuplication/Examples/Scripts/{RaycastTest.cs => RaycastExample.cs} (90%) rename Assets/uDesktopDuplication/Examples/Scripts/{RaycastTest.cs.meta => RaycastExample.cs.meta} (100%) diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Buffer.unity b/Assets/uDesktopDuplication/Examples/Scenes/Buffer.unity index 53304b8..a01e759 100644 --- a/Assets/uDesktopDuplication/Examples/Scenes/Buffer.unity +++ b/Assets/uDesktopDuplication/Examples/Scenes/Buffer.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -190,6 +190,82 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &24328793 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 114000012274256594, guid: de6f36e446e5e8a48bf61fe198985bb4, + type: 2} + m_PrefabInternal: {fileID: 930860461} + m_Script: {fileID: 11500000, guid: bb54a34570e4747429b1c5b66c69d356, type: 3} +--- !u!1001 &86016649 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalPosition.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114000012274256594, guid: de6f36e446e5e8a48bf61fe198985bb4, + type: 2} + propertyPath: invertX_ + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114000012274256594, guid: de6f36e446e5e8a48bf61fe198985bb4, + type: 2} + propertyPath: useClip_ + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 23000011974915108, guid: de6f36e446e5e8a48bf61fe198985bb4, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c181d333a7bee7a44b94c0f4e02c4bd4, type: 2} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalScale.x + value: 0.96 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalScale.y + value: 0.54 + objectReference: {fileID: 0} + - target: {fileID: 1000012642892690, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_Name + value: Monitor Board Dst + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 114000012274256594, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + m_SourcePrefab: {fileID: 100100000, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + m_IsPrefabAsset: 0 --- !u!1 &423308485 GameObject: m_ObjectHideFlags: 0 @@ -256,3 +332,89 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &930860461 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalPosition.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114000012274256594, guid: de6f36e446e5e8a48bf61fe198985bb4, + type: 2} + propertyPath: invertX_ + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114000012274256594, guid: de6f36e446e5e8a48bf61fe198985bb4, + type: 2} + propertyPath: useClip_ + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 23000011974915108, guid: de6f36e446e5e8a48bf61fe198985bb4, + type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c181d333a7bee7a44b94c0f4e02c4bd4, type: 2} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalScale.x + value: 0.96 + objectReference: {fileID: 0} + - target: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_LocalScale.y + value: 0.54 + objectReference: {fileID: 0} + - target: {fileID: 1000012642892690, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + propertyPath: m_Name + value: Monitor Board Src + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2} + m_IsPrefabAsset: 0 +--- !u!1 &1159532891 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1000012642892690, guid: de6f36e446e5e8a48bf61fe198985bb4, + type: 2} + m_PrefabInternal: {fileID: 86016649} +--- !u!114 &1159532892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1159532891} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bbc456c8248acd46976392616f32f8c, type: 3} + m_Name: + m_EditorClassIdentifier: + uddTexture: {fileID: 24328793} diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Raycast.unity b/Assets/uDesktopDuplication/Examples/Scenes/Raycast.unity index 83a56e2..d5ebec9 100644 --- a/Assets/uDesktopDuplication/Examples/Scenes/Raycast.unity +++ b/Assets/uDesktopDuplication/Examples/Scenes/Raycast.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,7 +38,8 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -54,11 +55,10 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 0 @@ -77,15 +77,18 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 0 --- !u!196 &4 @@ -107,13 +110,15 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &79264388 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 79264393} - component: {fileID: 79264392} @@ -130,34 +135,38 @@ GameObject: --- !u!81 &79264389 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 79264388} m_Enabled: 1 --- !u!124 &79264390 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 79264388} m_Enabled: 1 --- !u!92 &79264391 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 79264388} m_Enabled: 1 --- !u!20 &79264392 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 79264388} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -179,15 +188,15 @@ Camera: m_TargetEye: 3 m_HDR: 0 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &79264393 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 79264388} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -200,9 +209,9 @@ Transform: --- !u!1 &400296148 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 400296150} - component: {fileID: 400296149} @@ -218,7 +227,7 @@ GameObject: --- !u!114 &400296149 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 400296148} m_Enabled: 1 @@ -237,7 +246,7 @@ MonoBehaviour: --- !u!4 &400296150 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 400296148} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -250,7 +259,7 @@ Transform: --- !u!114 &400296151 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 400296148} m_Enabled: 1 @@ -267,7 +276,7 @@ MonoBehaviour: --- !u!114 &400296152 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 400296148} m_Enabled: 0 @@ -288,9 +297,9 @@ MonoBehaviour: --- !u!1 &1070915829 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1070915830} m_Layer: 0 @@ -303,7 +312,7 @@ GameObject: --- !u!4 &1070915830 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1070915829} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -316,14 +325,14 @@ Transform: --- !u!1 &1470035821 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1470035823} - component: {fileID: 1470035822} m_Layer: 0 - m_Name: Ray Tester + m_Name: Ray m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -332,7 +341,7 @@ GameObject: --- !u!114 &1470035822 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1470035821} m_Enabled: 1 @@ -345,7 +354,7 @@ MonoBehaviour: --- !u!4 &1470035823 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1470035821} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -360,9 +369,9 @@ Transform: --- !u!1 &1738296145 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1738296147} - component: {fileID: 1738296146} @@ -376,7 +385,7 @@ GameObject: --- !u!108 &1738296146 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1738296145} m_Enabled: 1 @@ -403,22 +412,9 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_Lightmapping: 4 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 - m_FalloffTable: - m_Table[0]: 0 - m_Table[1]: 0 - m_Table[2]: 0 - m_Table[3]: 0 - m_Table[4]: 0 - m_Table[5]: 0 - m_Table[6]: 0 - m_Table[7]: 0 - m_Table[8]: 0 - m_Table[9]: 0 - m_Table[10]: 0 - m_Table[11]: 0 - m_Table[12]: 0 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_ShadowRadius: 0 @@ -426,7 +422,7 @@ Light: --- !u!4 &1738296147 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1738296145} m_LocalRotation: {x: 0.40821794, y: -0.23456973, z: 0.109381676, w: 0.87542605} @@ -439,9 +435,9 @@ Transform: --- !u!1 &1976533530 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + serializedVersion: 6 m_Component: - component: {fileID: 1976533531} m_Layer: 0 @@ -454,7 +450,7 @@ GameObject: --- !u!4 &1976533531 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1976533530} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} diff --git a/Assets/uDesktopDuplication/Examples/Scripts/RaycastTest.cs b/Assets/uDesktopDuplication/Examples/Scripts/RaycastExample.cs similarity index 90% rename from Assets/uDesktopDuplication/Examples/Scripts/RaycastTest.cs rename to Assets/uDesktopDuplication/Examples/Scripts/RaycastExample.cs index f15fd3b..e296231 100644 --- a/Assets/uDesktopDuplication/Examples/Scripts/RaycastTest.cs +++ b/Assets/uDesktopDuplication/Examples/Scripts/RaycastExample.cs @@ -1,7 +1,6 @@ using UnityEngine; -using System.Collections; -public class RaycastTest : MonoBehaviour +public class RaycastExample : MonoBehaviour { public Transform from; public Transform to; diff --git a/Assets/uDesktopDuplication/Examples/Scripts/RaycastTest.cs.meta b/Assets/uDesktopDuplication/Examples/Scripts/RaycastExample.cs.meta similarity index 100% rename from Assets/uDesktopDuplication/Examples/Scripts/RaycastTest.cs.meta rename to Assets/uDesktopDuplication/Examples/Scripts/RaycastExample.cs.meta