From 09ad8abf47d4d051390189e1427e0647917f5ea8 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 10 Jun 2025 16:19:20 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=90=EC=85=8B=20=EC=8D=B8=EB=84=A4?= =?UTF-8?q?=EC=9D=BC=20=EB=B9=84=EC=9C=A8=20=EC=88=98=EC=A0=95=20=EB=B0=8F?= =?UTF-8?q?=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EB=9D=BC=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/PRF_AssetLibraryItem.prefab | 2 +- Assets/Scenes/0.30.0.unity | 398 ++++++++++++------ .../RuntimePreviewGenerator.cs | 2 +- .../TriLibCore/Resources/TriLibSettings.asset | 6 +- .../Scripts/Studio/Managers/FBXFileManager.cs | 7 +- .../Studio/UI/Elements/UI_FolderPathItem.cs | 1 - ProjectSettings/TagManager.asset | 2 +- 7 files changed, 287 insertions(+), 131 deletions(-) diff --git a/Assets/Resources/Prefabs/UI/PRF_AssetLibraryItem.prefab b/Assets/Resources/Prefabs/UI/PRF_AssetLibraryItem.prefab index f0dd4eb8..24702a53 100644 --- a/Assets/Resources/Prefabs/UI/PRF_AssetLibraryItem.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_AssetLibraryItem.prefab @@ -1106,7 +1106,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 50} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5193183312611458682 CanvasRenderer: diff --git a/Assets/Scenes/0.30.0.unity b/Assets/Scenes/0.30.0.unity index 1918b651..e5f08f2d 100644 --- a/Assets/Scenes/0.30.0.unity +++ b/Assets/Scenes/0.30.0.unity @@ -2496,127 +2496,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} m_PrefabInstance: {fileID: 445006263} m_PrefabAsset: {fileID: 0} ---- !u!1 &481136642 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 481136644} - - component: {fileID: 481136643} - - component: {fileID: 481136645} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &481136643 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 481136642} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ForceVisible: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_LightUnit: 1 - m_LuxAtDistance: 1 - m_EnableSpotReflector: 1 ---- !u!4 &481136644 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 481136642} - serializedVersion: 2 - m_LocalRotation: {x: 0.6733953, y: 0.28435186, z: -0.316804, w: 0.6044154} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 96.18, y: 50.39, z: 0} ---- !u!114 &481136645 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 481136642} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 --- !u!1001 &514470625 PrefabInstance: m_ObjectHideFlags: 0 @@ -3273,6 +3152,39 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 68fe65091b9346d4d803044314a62d23, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &659421206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 659421207} + m_Layer: 0 + m_Name: Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &659421207 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659421206} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 847498817} + - {fileID: 2013432595} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &663673410 PrefabInstance: m_ObjectHideFlags: 0 @@ -4133,6 +4045,127 @@ MonoBehaviour: _name: Orbit _staticData: CanHaveMouseButtons: 1 +--- !u!1 &847498816 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 847498817} + - component: {fileID: 847498819} + - component: {fileID: 847498818} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &847498817 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 847498816} + serializedVersion: 2 + m_LocalRotation: {x: 0.6733953, y: 0.28435186, z: -0.316804, w: 0.6044154} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 659421207} + m_LocalEulerAnglesHint: {x: 96.18, y: 50.39, z: 0} +--- !u!114 &847498818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 847498816} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!108 &847498819 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 847498816} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 2047 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!224 &857466916 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 943011681277070845, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3} @@ -10708,6 +10741,127 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3924726146150549819, guid: 192ba749438045e4bb32753ffff354b1, type: 3} m_PrefabInstance: {fileID: 63933899} m_PrefabAsset: {fileID: 0} +--- !u!1 &2013432594 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2013432595} + - component: {fileID: 2013432597} + - component: {fileID: 2013432596} + m_Layer: 0 + m_Name: Thumbnail Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2013432595 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013432594} + serializedVersion: 2 + m_LocalRotation: {x: 0.6733953, y: 0.28435186, z: -0.316804, w: 0.6044154} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 659421207} + m_LocalEulerAnglesHint: {x: 96.18, y: 50.39, z: 0} +--- !u!114 &2013432596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013432594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!108 &2013432597 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013432594} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 2048 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!1 &2021424131 GameObject: m_ObjectHideFlags: 0 @@ -12745,5 +12899,5 @@ SceneRoots: - {fileID: 1093055756} - {fileID: 1981809316} - {fileID: 216528118} - - {fileID: 481136644} + - {fileID: 659421207} - {fileID: 1833346089} diff --git a/Assets/Scripts/ExternalAssets/RuntimePreviewGenerator/RuntimePreviewGenerator.cs b/Assets/Scripts/ExternalAssets/RuntimePreviewGenerator/RuntimePreviewGenerator.cs index d9608721..c693cb10 100644 --- a/Assets/Scripts/ExternalAssets/RuntimePreviewGenerator/RuntimePreviewGenerator.cs +++ b/Assets/Scripts/ExternalAssets/RuntimePreviewGenerator/RuntimePreviewGenerator.cs @@ -73,7 +73,7 @@ public static class RuntimePreviewGenerator } } - private const int PREVIEW_LAYER = 22; + private static int PREVIEW_LAYER => LayerMask.NameToLayer("ThumbnailObject"); private static Vector3 PREVIEW_POSITION = new Vector3( -250f, -250f, -250f ); private static Camera renderCamera;//모델을 렌더링 하는 카메라 diff --git a/Assets/Scripts/ExternalAssets/TriLib/TriLibCore/Resources/TriLibSettings.asset b/Assets/Scripts/ExternalAssets/TriLib/TriLibCore/Resources/TriLibSettings.asset index 56b5f929..ffdb3cf8 100644 --- a/Assets/Scripts/ExternalAssets/TriLib/TriLibCore/Resources/TriLibSettings.asset +++ b/Assets/Scripts/ExternalAssets/TriLib/TriLibCore/Resources/TriLibSettings.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: _dictionaryBoolKeys: - StandardMaterialMapper + - UniversalRPMaterialMapper - - - @@ -76,6 +77,5 @@ MonoBehaviour: - - - - - - _dictionaryBoolValues: 01000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - _settingsCount: 1 + _dictionaryBoolValues: 00010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + _settingsCount: 2 diff --git a/Assets/Scripts/Studio/Managers/FBXFileManager.cs b/Assets/Scripts/Studio/Managers/FBXFileManager.cs index 03c3ec8c..85a53b0f 100644 --- a/Assets/Scripts/Studio/Managers/FBXFileManager.cs +++ b/Assets/Scripts/Studio/Managers/FBXFileManager.cs @@ -76,7 +76,9 @@ namespace Studio.AssetTool obj.gameObject.SetActive(false); assetData.loadedObject = obj; assetData.OnLoadComplete(); - Texture2D thumbnail = RuntimePreviewGenerator.GenerateModelPreview(assetData.loadedObject.transform, 320, 200); + + RuntimePreviewGenerator.OrthographicMode = true; + Texture2D thumbnail = RuntimePreviewGenerator.GenerateModelPreview(assetData.loadedObject.transform, 320, 320); thumbnail = TextureUtil.MakeReadableTexture(thumbnail); assetData.thumbnail = thumbnail; OnLoadComplete(assetData); @@ -145,7 +147,8 @@ namespace Studio.AssetTool assetData.OnLoadComplete(); - Texture2D thumbnail = RuntimePreviewGenerator.GenerateModelPreview(assetData.loadedObject.transform, 320, 200); + RuntimePreviewGenerator.OrthographicMode = true; + Texture2D thumbnail = RuntimePreviewGenerator.GenerateModelPreview(assetData.loadedObject.transform, 320, 320); thumbnail = TextureUtil.MakeReadableTexture(thumbnail); assetData.thumbnail = thumbnail; OnLoadComplete(assetData); diff --git a/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs b/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs index 2dc895ab..6494a313 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs @@ -29,7 +29,6 @@ namespace Studio.UI return; onEndEditInputFieldURL?.Invoke(this); - Debug.Log("action " + onEndEditInputFieldURL.GetInvocationList().Length); } private void OnClickSelectedFolderButton() { diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a4f43de4..c40fd921 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -19,7 +19,7 @@ TagManager: - obstacle - objectSnap - TwinObject - - + - ThumbnailObject - - - -- 2.48.1.windows.1