From 997dea15ee3ea5364aa0a4fe9107e5abce90bb33 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Mon, 18 Jan 2021 18:43:45 +0800 Subject: [PATCH 01/26] Update Unity version --- Packages/manifest.json | 2 +- Packages/packages-lock.json | 8 ++++---- ProjectSettings/ProjectVersion.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 846065552..c1e9c8be2 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,7 +2,7 @@ "dependencies": { "com.unity.burst": "1.4.1", "com.unity.entities": "0.16.0-preview.21", - "com.unity.ide.visualstudio": "2.0.3", + "com.unity.ide.visualstudio": "2.0.5", "com.unity.nuget.newtonsoft-json": "2.0.0", "com.unity.performance.profile-analyzer": "1.0.3", "com.unity.ugui": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d8d9efb2a..cc57f300b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -90,14 +90,14 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.0", + "version": "1.0.5", "depth": 3, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.3", + "version": "2.0.5", "depth": 0, "source": "registry", "dependencies": {}, @@ -197,11 +197,11 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.18", + "version": "1.1.19", "depth": 2, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.0", + "com.unity.ext.nunit": "1.0.5", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 654823e0f..a328ffde0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.0b11 -m_EditorVersionWithRevision: 2020.2.0b11 (c499c2bf2e80) +m_EditorVersion: 2020.2.1f1 +m_EditorVersionWithRevision: 2020.2.1f1 (270dd8c3da1c) From 3e82a59af3413891f9882f8456c87f63b04f8b97 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Mon, 18 Jan 2021 19:01:21 +0800 Subject: [PATCH 02/26] Added node package --- .gitignore | 1 + Packages/com.chisel.node/package.json | 23 ++++++++++++++++++++++ Packages/com.chisel.node/package.json.meta | 7 +++++++ Packages/manifest.json | 1 + Packages/packages-lock.json | 17 ++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 Packages/com.chisel.node/package.json create mode 100644 Packages/com.chisel.node/package.json.meta diff --git a/.gitignore b/.gitignore index 32853bc60..7fd35bbaf 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ UserSettings/EditorUserSettings.asset /Assets/Experiments.meta /UserSettings +.vsconfig diff --git a/Packages/com.chisel.node/package.json b/Packages/com.chisel.node/package.json new file mode 100644 index 000000000..b8db21974 --- /dev/null +++ b/Packages/com.chisel.node/package.json @@ -0,0 +1,23 @@ +{ + "description": "The Chisel Node Generator", + "displayName": "Chisel Node Generator", + "name": "com.chisel.node", + "keywords": [ + "level design", + "world building", + "CSG", + "BSP", + "Boolean", + "node", + "procedural" + ], + "unity": "2020.2", + "version": "0.0.1-preview", + "dependencies": { + "com.chisel.core": "0.0.1-preview", + "com.chisel.components": "0.0.1-preview", + "com.github.siccity.xnode": "1.8.0" + }, + "type": "tool", + "hideInEditor": false +} \ No newline at end of file diff --git a/Packages/com.chisel.node/package.json.meta b/Packages/com.chisel.node/package.json.meta new file mode 100644 index 000000000..83b1b6b91 --- /dev/null +++ b/Packages/com.chisel.node/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0b3095444052df94792235db782adf9c +PackageManifestImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index c1e9c8be2..95ef2aa8e 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.github.siccity.xnode": "https://github.com/siccity/xNode.git", "com.unity.burst": "1.4.1", "com.unity.entities": "0.16.0-preview.21", "com.unity.ide.visualstudio": "2.0.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index cc57f300b..5c1c28258 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -45,6 +45,23 @@ "com.chisel.components": "0.0.1-preview" } }, + "com.chisel.node": { + "version": "file:com.chisel.node", + "depth": 0, + "source": "embedded", + "dependencies": { + "com.chisel.core": "0.0.1-preview", + "com.chisel.components": "0.0.1-preview", + "com.github.siccity.xnode": "1.8.0" + } + }, + "com.github.siccity.xnode": { + "version": "https://github.com/siccity/xNode.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "6b893fd5a4e48d0bb45c07741cc827a1aa86797b" + }, "com.scene.handle.extensions": { "version": "file:com.scene.handle.extensions", "depth": 0, From 43ed05525b903f1d753e06723fc083347ff3bc88 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Tue, 19 Jan 2021 12:31:31 +0800 Subject: [PATCH 03/26] Added ChiselGraph and ChiselGraphInstance --- Assets/ChiselNodes.meta | 8 + Assets/ChiselNodes/New Chisel Graph.asset | 35 + .../ChiselNodes/New Chisel Graph.asset.meta | 8 + Assets/ChiselNodes/NodeTest.unity | 3862 +++++++++++++++++ Assets/ChiselNodes/NodeTest.unity.meta | 7 + .../Base/ChiselGeneratorComponent.cs | 1 + Packages/com.chisel.node/Chisel.meta | 8 + .../com.chisel.node/Chisel/ChiselGraph.cs | 12 + .../Chisel/ChiselGraph.cs.meta | 11 + .../Chisel/ChiselGraphInstance.cs | 11 + .../Chisel/ChiselGraphInstance.cs.meta | 11 + .../com.chisel.node/Chisel/ChiselNode.asmdef | 18 + .../Chisel/ChiselNode.asmdef.meta | 7 + Packages/com.chisel.node/Chisel/Editor.meta | 8 + .../Editor/ChiselGraphInstanceEditor.cs | 23 + .../Editor/ChiselGraphInstanceEditor.cs.meta | 11 + .../Chisel/Editor/ChiselNodeEditor.asmdef | 18 + .../Editor/ChiselNodeEditor.asmdef.meta | 7 + Packages/com.chisel.node/Chisel/Nodes.meta | 8 + .../Chisel/Nodes/ChiselBoxNode.cs | 16 + .../Chisel/Nodes/ChiselBoxNode.cs.meta | 11 + .../Chisel/Nodes/ChiselNode.cs | 25 + .../Chisel/Nodes/ChiselNode.cs.meta | 11 + 23 files changed, 4137 insertions(+) create mode 100644 Assets/ChiselNodes.meta create mode 100644 Assets/ChiselNodes/New Chisel Graph.asset create mode 100644 Assets/ChiselNodes/New Chisel Graph.asset.meta create mode 100644 Assets/ChiselNodes/NodeTest.unity create mode 100644 Assets/ChiselNodes/NodeTest.unity.meta create mode 100644 Packages/com.chisel.node/Chisel.meta create mode 100644 Packages/com.chisel.node/Chisel/ChiselGraph.cs create mode 100644 Packages/com.chisel.node/Chisel/ChiselGraph.cs.meta create mode 100644 Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs create mode 100644 Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs.meta create mode 100644 Packages/com.chisel.node/Chisel/ChiselNode.asmdef create mode 100644 Packages/com.chisel.node/Chisel/ChiselNode.asmdef.meta create mode 100644 Packages/com.chisel.node/Chisel/Editor.meta create mode 100644 Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs create mode 100644 Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs.meta create mode 100644 Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef create mode 100644 Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef.meta create mode 100644 Packages/com.chisel.node/Chisel/Nodes.meta create mode 100644 Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs create mode 100644 Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs.meta create mode 100644 Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs create mode 100644 Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs.meta diff --git a/Assets/ChiselNodes.meta b/Assets/ChiselNodes.meta new file mode 100644 index 000000000..87219c6dd --- /dev/null +++ b/Assets/ChiselNodes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2fd02e29cafcce4ebc64a5f69728abe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset new file mode 100644 index 000000000..daae892ca --- /dev/null +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7909353669299017541 +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: d678cf2bf10f3bf4f8d68ae693a7a7a3, type: 3} + m_Name: Chisel Box + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: -136, y: -40} + ports: + keys: [] + values: [] +--- !u!114 &11400000 +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: 1719bdb460489264dbc2eda6f3845f03, type: 3} + m_Name: New Chisel Graph + m_EditorClassIdentifier: + nodes: + - {fileID: -7909353669299017541} + active: {fileID: 0} + instance: {fileID: 0} diff --git a/Assets/ChiselNodes/New Chisel Graph.asset.meta b/Assets/ChiselNodes/New Chisel Graph.asset.meta new file mode 100644 index 000000000..224e71347 --- /dev/null +++ b/Assets/ChiselNodes/New Chisel Graph.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7554a9f6d7403e34597bef241745c03e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity new file mode 100644 index 000000000..7063ed3de --- /dev/null +++ b/Assets/ChiselNodes/NodeTest.unity @@ -0,0 +1,3862 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &30283944 +GameObject: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 30283945} + - component: {fileID: 30283947} + - component: {fileID: 30283946} + m_Layer: 0 + m_Name: "\u2039[debug-CastShadows]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &30283945 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 30283944} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &30283946 +MeshRenderer: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 30283944} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 53340697a84d92643a339913177ceeb1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 0 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &30283947 +MeshFilter: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 30283944} + m_Mesh: {fileID: 1378885073} +--- !u!1 &33383802 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 33383803} + - component: {fileID: 33383805} + - component: {fileID: 33383804} + m_Layer: 0 + m_Name: "\u2039[generated-CastShadows]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &33383803 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33383802} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &33383804 +MeshRenderer: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33383802} + m_Enabled: 0 + m_CastShadows: 3 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 2 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 0 + m_ReceiveGI: 2 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &33383805 +MeshFilter: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33383802} + m_Mesh: {fileID: 1777405532} +--- !u!43 &69493321 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[debug-Discarded]\u203A" + serializedVersion: 10 + m_SubMeshes: [] + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!43 &164276715 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[debug-ReceiveShadows]\u203A" + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: -0.002699986} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 6666a6bf0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bf6666e63f0000803f6666a63f0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000006666a6bf000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf000000006666a63f000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000006666a6bf000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003ff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f6666a6bf000000bf1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf00000000000000006666a6bf0000003f1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f6666a6bf000000bff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000006666a63f0000003f1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f6666a63f000000bff2b000bf0000803f000000000000000000000000000000000000803f000080bf00000000000000006666a63f0000003ff2b000bf0000803f000000000000000000000080000000000000803f000080bf000000000000803f6666a63f000000bf1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f000000006666a6bf000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000006666a6bf0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003f1b9efe3e00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f6666a6bf000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: -0.002699986} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &283560757 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 283560758} + - component: {fileID: 283560760} + - component: {fileID: 283560759} + m_Layer: 0 + m_Name: "\u2039[generated-Renderable|ReceiveShadows]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &283560758 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 283560757} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &283560759 +MeshRenderer: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 283560757} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 2 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &283560760 +MeshFilter: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 283560757} + m_Mesh: {fileID: 1497873584} +--- !u!43 &337028953 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[debug-Culled]\u203A" + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 0 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 0 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &352119801 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 352119802} + m_Layer: 0 + m_Name: "\u2039[generated]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &352119802 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 352119801} + 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_Children: + - {fileID: 1658714171} + - {fileID: 426374966} + - {fileID: 33383803} + - {fileID: 962769118} + - {fileID: 283560758} + - {fileID: 1994922928} + - {fileID: 1703547412} + - {fileID: 30283945} + - {fileID: 1163184883} + - {fileID: 2018435911} + - {fileID: 1116557895} + - {fileID: 650786228} + m_Father: {fileID: 763721119} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &358445131 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[generated-Renderable|CastShadows]\u203A" + serializedVersion: 10 + m_SubMeshes: [] + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &426374965 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 426374966} + - component: {fileID: 426374968} + - component: {fileID: 426374967} + m_Layer: 0 + m_Name: "\u2039[generated-Renderable]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &426374966 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426374965} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &426374967 +MeshRenderer: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426374965} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 2 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &426374968 +MeshFilter: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426374965} + m_Mesh: {fileID: 1887553485} +--- !u!1 &459191710 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 459191713} + - component: {fileID: 459191712} + - component: {fileID: 459191711} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &459191711 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459191710} + m_Enabled: 1 +--- !u!20 &459191712 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459191710} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &459191713 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459191710} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &650786225 +GameObject: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 650786228} + - component: {fileID: 650786227} + - component: {fileID: 650786226} + m_Layer: 0 + m_Name: "\u2039[debug-Culled]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &650786226 +MeshRenderer: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650786225} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 0 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &650786227 +MeshFilter: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650786225} + m_Mesh: {fileID: 337028953} +--- !u!4 &650786228 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650786225} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &763721116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 763721119} + - component: {fileID: 763721118} + - component: {fileID: 763721117} + m_Layer: 0 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &763721117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 763721116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7112759bb6d84f45890aef9caadedbe, type: 3} + m_Name: + m_EditorClassIdentifier: + graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} +--- !u!114 &763721118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 763721116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 042d680e77b8739488b044eb2f546854, type: 3} + m_Name: + m_EditorClassIdentifier: + CreateRenderComponents: 1 + CreateColliderComponents: 1 + AutoRebuildUVs: 1 + VertexChannelMask: 14 + colliderSettings: + isTrigger: 0 + convex: 0 + renderSettings: + lightProbeProxyVolumeOverride: {fileID: 0} + probeAnchor: {fileID: 0} + motionVectorGenerationMode: 1 + reflectionProbeUsage: 1 + lightProbeUsage: 1 + allowOcclusionWhenDynamic: 1 + renderingLayerMask: 4294967295 + receiveGI: 2 + lightmapParameters: {fileID: 1993817710} + importantGI: 0 + optimizeUVs: 0 + ignoreNormalsForChartDetection: 0 + autoUVMaxDistance: 0.5 + autoUVMaxAngle: 89 + minimumChartSize: 4 + stitchLightmapSeams: 0 + scaleInLightmap: 1 + uvGenerationSettings: + angleError: 0.08 + areaError: 0.15 + hardAngle: 88 + packMarginPixels: 1 + generated: + generatedDataContainer: {fileID: 352119801} + colliderContainer: {fileID: 1658714170} + colliders: + - surfaceParameter: 3198 + sharedMesh: {fileID: 1803941809} + meshCollider: {fileID: 1658714172} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + geometryHashValue: 0 + renderables: + - invalid: 1 + query: 0 + container: {fileID: 0} + sharedMesh: {fileID: 0} + partialMesh: {fileID: 0} + meshFilter: {fileID: 0} + meshRenderer: {fileID: 0} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 0 + - invalid: 0 + query: 1 + container: {fileID: 426374965} + sharedMesh: {fileID: 1887553485} + partialMesh: {fileID: 0} + meshFilter: {fileID: 426374968} + meshRenderer: {fileID: 426374967} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 0 + - invalid: 0 + query: 2 + container: {fileID: 33383802} + sharedMesh: {fileID: 1777405532} + partialMesh: {fileID: 0} + meshFilter: {fileID: 33383805} + meshRenderer: {fileID: 33383804} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 0 + - invalid: 0 + query: 3 + container: {fileID: 962769117} + sharedMesh: {fileID: 358445131} + partialMesh: {fileID: 0} + meshFilter: {fileID: 962769120} + meshRenderer: {fileID: 962769119} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 0 + - invalid: 1 + query: 0 + container: {fileID: 0} + sharedMesh: {fileID: 0} + partialMesh: {fileID: 0} + meshFilter: {fileID: 0} + meshRenderer: {fileID: 0} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 0 + - invalid: 0 + query: 5 + container: {fileID: 283560757} + sharedMesh: {fileID: 1497873584} + partialMesh: {fileID: 0} + meshFilter: {fileID: 283560760} + meshRenderer: {fileID: 283560759} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 0 + - invalid: 1 + query: 0 + container: {fileID: 0} + sharedMesh: {fileID: 0} + partialMesh: {fileID: 0} + meshFilter: {fileID: 0} + meshRenderer: {fileID: 0} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 0 + - invalid: 0 + query: 7 + container: {fileID: 1994922927} + sharedMesh: {fileID: 1438308655} + partialMesh: {fileID: 0} + meshFilter: {fileID: 1994922930} + meshRenderer: {fileID: 1994922929} + renderMaterials: + - {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + triangleBrushes: 010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 0 + meshRenderers: + - {fileID: 426374967} + - {fileID: 33383804} + - {fileID: 962769119} + - {fileID: 283560759} + - {fileID: 1994922929} + debugHelpers: + - invalid: 0 + query: 0 + container: {fileID: 1703547411} + sharedMesh: {fileID: 69493321} + partialMesh: {fileID: 0} + meshFilter: {fileID: 1703547414} + meshRenderer: {fileID: 1703547413} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 1 + - invalid: 0 + query: 3 + container: {fileID: 30283944} + sharedMesh: {fileID: 1378885073} + partialMesh: {fileID: 0} + meshFilter: {fileID: 30283947} + meshRenderer: {fileID: 30283946} + renderMaterials: + - {fileID: 2100000, guid: 53340697a84d92643a339913177ceeb1, type: 2} + triangleBrushes: 010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 1 + - invalid: 0 + query: 2 + container: {fileID: 1163184882} + sharedMesh: {fileID: 1447655678} + partialMesh: {fileID: 0} + meshFilter: {fileID: 1163184885} + meshRenderer: {fileID: 1163184884} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 1 + - invalid: 0 + query: 5 + container: {fileID: 2018435910} + sharedMesh: {fileID: 164276715} + partialMesh: {fileID: 0} + meshFilter: {fileID: 2018435913} + meshRenderer: {fileID: 2018435912} + renderMaterials: + - {fileID: 2100000, guid: d9918ebea62f9b54cb883f09f89983ac, type: 2} + triangleBrushes: 010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 1 + - invalid: 0 + query: 8 + container: {fileID: 1116557894} + sharedMesh: {fileID: 957983955} + partialMesh: {fileID: 0} + meshFilter: {fileID: 1116557897} + meshRenderer: {fileID: 1116557896} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 1 + - invalid: 0 + query: 8388608 + container: {fileID: 650786225} + sharedMesh: {fileID: 337028953} + partialMesh: {fileID: 0} + meshFilter: {fileID: 650786227} + meshRenderer: {fileID: 650786226} + renderMaterials: [] + triangleBrushes: + geometryHashValue: 0 + surfaceHashValue: 0 + debugHelperRenderer: 1 + debugMeshRenderers: + - {fileID: 1703547413} + - {fileID: 1703547413} + - {fileID: 1703547413} + - {fileID: 1703547413} + - {fileID: 1703547413} + - {fileID: 1703547413} + visibilityState: 1 + needVisibilityMeshUpdate: 0 +--- !u!4 &763721119 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 763721116} + 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_Children: + - {fileID: 352119802} + - {fileID: 1357061026} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &957983955 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[debug-Collidable]\u203A" + serializedVersion: 10 + m_SubMeshes: [] + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &962769117 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 962769118} + - component: {fileID: 962769120} + - component: {fileID: 962769119} + m_Layer: 0 + m_Name: "\u2039[generated-Renderable|CastShadows]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &962769118 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962769117} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &962769119 +MeshRenderer: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962769117} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 2 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &962769120 +MeshFilter: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962769117} + m_Mesh: {fileID: 358445131} +--- !u!1 &1116557894 +GameObject: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1116557895} + - component: {fileID: 1116557897} + - component: {fileID: 1116557896} + m_Layer: 0 + m_Name: "\u2039[debug-Collidable]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1116557895 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116557894} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1116557896 +MeshRenderer: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116557894} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 0 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1116557897 +MeshFilter: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116557894} + m_Mesh: {fileID: 957983955} +--- !u!1 &1163184882 +GameObject: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1163184883} + - component: {fileID: 1163184885} + - component: {fileID: 1163184884} + m_Layer: 0 + m_Name: "\u2039[debug-ShadowOnly]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1163184883 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163184882} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1163184884 +MeshRenderer: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163184882} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 0 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1163184885 +MeshFilter: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163184882} + m_Mesh: {fileID: 1447655678} +--- !u!1 &1301432430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1301432432} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1301432432 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301432430} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.731713, y: -4.5369163, z: -1.2444327} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1357061025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1357061026} + - component: {fileID: 1357061027} + m_Layer: 0 + m_Name: Box + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1357061026 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357061025} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0027} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 763721119} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1357061027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357061025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61ab2008f3a53ec49b577d5d4c48b8ea, type: 3} + m_Name: + m_EditorClassIdentifier: + operation: 0 + brushContainerAsset: {fileID: 1412248516} + localTransformation: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: -0.0027 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + pivotOffset: {x: 0, y: 0, z: 0} + definition: + bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + surfaceDefinition: + surfaces: + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} +--- !u!43 &1378885073 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[debug-CastShadows]\u203A" + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: -0.002699986} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 6666a6bf0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bf6666e63f0000803f6666a63f0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000006666a6bf000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf000000006666a63f000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000006666a6bf000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003ff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f6666a6bf000000bf1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf00000000000000006666a6bf0000003f1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f6666a6bf000000bff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000006666a63f0000003f1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f6666a63f000000bff2b000bf0000803f000000000000000000000000000000000000803f000080bf00000000000000006666a63f0000003ff2b000bf0000803f000000000000000000000080000000000000803f000080bf000000000000803f6666a63f000000bf1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f000000006666a6bf000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000006666a6bf0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003f1b9efe3e00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f6666a6bf000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: -0.002699986} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!114 &1412248516 +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: 7de3455a6626d0b47b27866cd6b0f381, type: 3} + m_Name: Generated Box + m_EditorClassIdentifier: + brushContainer: + brushMeshes: + - version: 1 + vertices: + - x: -1.3 + y: 0.5 + z: -0.5 + - x: 1.3 + y: 0.5 + z: -0.5 + - x: 1.3 + y: 0.5 + z: 0.5 + - x: -1.3 + y: 0.5 + z: 0.5 + - x: -1.3 + y: -0.5 + z: -0.5 + - x: 1.3 + y: -0.5 + z: -0.5 + - x: 1.3 + y: -0.5 + z: 0.5 + - x: -1.3 + y: -0.5 + z: 0.5 + halfEdges: + - vertexIndex: 0 + twinIndex: 17 + - vertexIndex: 3 + twinIndex: 8 + - vertexIndex: 2 + twinIndex: 20 + - vertexIndex: 1 + twinIndex: 13 + - vertexIndex: 4 + twinIndex: 10 + - vertexIndex: 5 + twinIndex: 19 + - vertexIndex: 6 + twinIndex: 15 + - vertexIndex: 7 + twinIndex: 22 + - vertexIndex: 0 + twinIndex: 1 + - vertexIndex: 4 + twinIndex: 16 + - vertexIndex: 7 + twinIndex: 4 + - vertexIndex: 3 + twinIndex: 21 + - vertexIndex: 1 + twinIndex: 18 + - vertexIndex: 2 + twinIndex: 3 + - vertexIndex: 6 + twinIndex: 23 + - vertexIndex: 5 + twinIndex: 6 + - vertexIndex: 0 + twinIndex: 9 + - vertexIndex: 1 + twinIndex: 0 + - vertexIndex: 5 + twinIndex: 12 + - vertexIndex: 4 + twinIndex: 5 + - vertexIndex: 3 + twinIndex: 2 + - vertexIndex: 7 + twinIndex: 11 + - vertexIndex: 6 + twinIndex: 7 + - vertexIndex: 2 + twinIndex: 14 + halfEdgePolygonIndices: 000000000000000000000000000000000100000001000000010000000100000002000000020000000200000002000000030000000300000003000000030000000400000004000000040000000400000005000000050000000500000005000000 + polygons: + - firstEdge: 0 + edgeCount: 4 + surfaceID: 0 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 4 + edgeCount: 4 + surfaceID: 1 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 8 + edgeCount: 4 + surfaceID: 2 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 12 + edgeCount: 4 + surfaceID: 3 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 16 + edgeCount: 4 + surfaceID: 4 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 20 + edgeCount: 4 + surfaceID: 5 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + planes: + - x: 0 + y: 1 + z: 0 + w: -0.5 + - x: 0 + y: -1 + z: 0 + w: -0.5 + - x: -1 + y: 0 + z: 0 + w: -1.3 + - x: 1 + y: 0 + z: 0 + w: -1.3 + - x: 0 + y: 0 + z: -1 + w: -0.5 + - x: 0 + y: 0 + z: 1 + w: -0.5 + operations: 00 + owner: {fileID: 1357061027} +--- !u!43 &1438308655 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[generated-Renderable|CastShadows|ReceiveShadows]\u203A" + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: -0.002699986} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 6666a6bf0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bf6666e63f0000803f6666a63f0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000006666a6bf000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf000000006666a63f000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000006666a6bf000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003ff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f6666a6bf000000bf1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf00000000000000006666a6bf0000003f1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f6666a6bf000000bff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000006666a63f0000003f1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f6666a63f000000bff2b000bf0000803f000000000000000000000000000000000000803f000080bf00000000000000006666a63f0000003ff2b000bf0000803f000000000000000000000080000000000000803f000080bf000000000000803f6666a63f000000bf1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f000000006666a6bf000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000006666a6bf0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003f1b9efe3e00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f6666a6bf000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: -0.002699986} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!43 &1447655678 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[debug-ShadowOnly]\u203A" + serializedVersion: 10 + m_SubMeshes: [] + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!43 &1497873584 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[generated-Renderable|ReceiveShadows]\u203A" + serializedVersion: 10 + m_SubMeshes: [] + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &1658714170 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1658714171} + - component: {fileID: 1658714172} + m_Layer: 0 + m_Name: "\u2039[generated-Collider]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1658714171 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658714170} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1658714172 +MeshCollider: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658714170} + m_Material: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 1803941809} +--- !u!1 &1703547411 +GameObject: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1703547412} + - component: {fileID: 1703547414} + - component: {fileID: 1703547413} + m_Layer: 0 + m_Name: "\u2039[debug-Discarded]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1703547412 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1703547411} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1703547413 +MeshRenderer: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1703547411} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 0 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1703547414 +MeshFilter: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1703547411} + m_Mesh: {fileID: 69493321} +--- !u!43 &1777405532 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[generated-CastShadows]\u203A" + serializedVersion: 10 + m_SubMeshes: [] + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &1792416794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1792416796} + - component: {fileID: 1792416795} + 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 &1792416795 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1792416794} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, 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: 4 + 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_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1792416796 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1792416794} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!43 &1803941809 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[generated-Collider]\u203A" + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: -0.002699986} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 288 + _typelessdata: 6666a6bf0000003ff2b000bf6666a63f0000003f1b9efe3e6666a63f0000003ff2b000bf6666a6bf0000003f1b9efe3e6666a6bf000000bf1b9efe3e6666a63f000000bff2b000bf6666a63f000000bf1b9efe3e6666a6bf000000bff2b000bf6666a6bf0000003ff2b000bf6666a6bf000000bf1b9efe3e6666a6bf0000003f1b9efe3e6666a6bf000000bff2b000bf6666a63f0000003f1b9efe3e6666a63f000000bff2b000bf6666a63f0000003ff2b000bf6666a63f000000bf1b9efe3e6666a6bf000000bff2b000bf6666a63f0000003ff2b000bf6666a63f000000bff2b000bf6666a6bf0000003ff2b000bf6666a6bf0000003f1b9efe3e6666a63f000000bf1b9efe3e6666a63f0000003f1b9efe3e6666a6bf000000bf1b9efe3e + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: -0.002699986} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!43 &1887553485 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[generated-Renderable]\u203A" + serializedVersion: 10 + m_SubMeshes: [] + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1113 &1993817710 +LightmapParameters: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 3 + resolution: 1 + clusterResolution: 0.5 + irradianceBudget: 128 + irradianceQuality: 8192 + backFaceTolerance: 0.9 + isTransparent: 0 + modellingTolerance: 0.01 + systemTag: -1 + edgeStitching: 1 + blurRadius: 2 + directLightQuality: 64 + antiAliasingSamples: 8 + pushoff: 0.0001 + bakedLightmapTag: -1 + limitLightmapCount: 0 + maxLightmapCount: 1 + AOQuality: 256 + AOAntiAliasingSamples: 16 +--- !u!1 &1994922927 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1994922928} + - component: {fileID: 1994922930} + - component: {fileID: 1994922929} + m_Layer: 0 + m_Name: "\u2039[generated-Renderable|CastShadows|ReceiveShadows]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1994922928 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994922927} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1994922929 +MeshRenderer: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994922927} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 2 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1994922930 +MeshFilter: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994922927} + m_Mesh: {fileID: 1438308655} +--- !u!1 &2018435910 +GameObject: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2018435911} + - component: {fileID: 2018435913} + - component: {fileID: 2018435912} + m_Layer: 0 + m_Name: "\u2039[debug-ReceiveShadows]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2018435911 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2018435910} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2018435912 +MeshRenderer: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2018435910} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d9918ebea62f9b54cb883f09f89983ac, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 0 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2018435913 +MeshFilter: + m_ObjectHideFlags: 24 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2018435910} + m_Mesh: {fileID: 164276715} diff --git a/Assets/ChiselNodes/NodeTest.unity.meta b/Assets/ChiselNodes/NodeTest.unity.meta new file mode 100644 index 000000000..1af9ecd3d --- /dev/null +++ b/Assets/ChiselNodes/NodeTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 12b016ce46949cb49a761a52620c0ed7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.components/Chisel/Components/API.public/Components/Base/ChiselGeneratorComponent.cs b/Packages/com.chisel.components/Chisel/Components/API.public/Components/Base/ChiselGeneratorComponent.cs index bd2b92310..dc1f75aeb 100644 --- a/Packages/com.chisel.components/Chisel/Components/API.public/Components/Base/ChiselGeneratorComponent.cs +++ b/Packages/com.chisel.components/Chisel/Components/API.public/Components/Base/ChiselGeneratorComponent.cs @@ -868,6 +868,7 @@ public virtual void UpdateGenerator() finally { Profiler.EndSample(); } Profiler.BeginSample("UpdateGeneratorInternal"); + print("UpdateGeneratorInternal"); try { UpdateGeneratorInternal(); } finally { Profiler.EndSample(); } diff --git a/Packages/com.chisel.node/Chisel.meta b/Packages/com.chisel.node/Chisel.meta new file mode 100644 index 000000000..c508373b4 --- /dev/null +++ b/Packages/com.chisel.node/Chisel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8bf28b9065500af4bb7dd2d687478a89 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.node/Chisel/ChiselGraph.cs new file mode 100644 index 000000000..2fb721a0f --- /dev/null +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs @@ -0,0 +1,12 @@ +using UnityEngine; +using XNode; + +namespace Chisel.Nodes +{ + [CreateAssetMenu(fileName = "New Chisel Graph", menuName = "Chisel Graph")] + public class ChiselGraph : NodeGraph + { + public ChiselNode active; + public ChiselGraphInstance instance; + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs.meta b/Packages/com.chisel.node/Chisel/ChiselGraph.cs.meta new file mode 100644 index 000000000..4478f5d4c --- /dev/null +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1719bdb460489264dbc2eda6f3845f03 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs new file mode 100644 index 000000000..df8415399 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Chisel.Nodes +{ + public class ChiselGraphInstance : MonoBehaviour + { + public ChiselGraph graph; + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs.meta b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs.meta new file mode 100644 index 000000000..9c517bb14 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b7112759bb6d84f45890aef9caadedbe +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/ChiselNode.asmdef b/Packages/com.chisel.node/Chisel/ChiselNode.asmdef new file mode 100644 index 000000000..56d354011 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/ChiselNode.asmdef @@ -0,0 +1,18 @@ +{ + "name": "ChiselNode", + "rootNamespace": "", + "references": [ + "GUID:642cde28f6a094d458a26f9a4533c056", + "GUID:c5c65302a7823bb47a9cb6d9c848b0da", + "GUID:b8e24fd1eb19b4226afebb2810e3c19b" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/ChiselNode.asmdef.meta b/Packages/com.chisel.node/Chisel/ChiselNode.asmdef.meta new file mode 100644 index 000000000..b4f9283e4 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/ChiselNode.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cf37be73cdb56984ba3a7eb55f849524 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Editor.meta b/Packages/com.chisel.node/Chisel/Editor.meta new file mode 100644 index 000000000..af14d25a0 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a68ea512d942f054eab2d508ab2a60af +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs new file mode 100644 index 000000000..820a639fb --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs @@ -0,0 +1,23 @@ +using UnityEditor; +using UnityEngine; +using XNodeEditor; + +namespace Chisel.Nodes +{ + [CustomEditor(typeof(ChiselGraphInstance))] + public class ChiselGraphInstanceEditor : Editor + { + public override void OnInspectorGUI() + { + DrawDefaultInspector(); + + if (GUILayout.Button("Edit", GUI.skin.GetStyle("button"))) + { + var instance = target as ChiselGraphInstance; + instance.graph.instance = instance; + + NodeEditorWindow.Open(instance.graph); + } + } + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs.meta b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs.meta new file mode 100644 index 000000000..8f80a627d --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9ddacdfd4e9b8a24cb1f43a9529d9207 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef b/Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef new file mode 100644 index 000000000..3f5ae756e --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef @@ -0,0 +1,18 @@ +{ + "name": "ChiselNodeEditor", + "rootNamespace": "", + "references": [ + "GUID:cf37be73cdb56984ba3a7eb55f849524", + "GUID:002c1bbed08fa44d282ef34fd5edb138", + "GUID:b8e24fd1eb19b4226afebb2810e3c19b" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef.meta b/Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef.meta new file mode 100644 index 000000000..5dd119f7b --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2284d3c846df78e4f8c73c7abd2e93e8 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Nodes.meta b/Packages/com.chisel.node/Chisel/Nodes.meta new file mode 100644 index 000000000..2431ed492 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dda854b83e60b6f439214f6cf8fa84ff +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs b/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs new file mode 100644 index 000000000..8a324e1e6 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Chisel.Nodes +{ + public class ChiselBoxNode : ChiselNode + { + public override bool led => throw new System.NotImplementedException(); + + protected override void OnInputChanged() + { + throw new System.NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs.meta b/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs.meta new file mode 100644 index 000000000..4e78c8754 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d678cf2bf10f3bf4f8d68ae693a7a7a3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs b/Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs new file mode 100644 index 000000000..4f2ece8fa --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs @@ -0,0 +1,25 @@ +using System; +using UnityEngine; +using XNode; + +namespace Chisel.Nodes +{ + public abstract class ChiselNode : Node + { + public Action onStateChange; + public abstract bool led { get; } + + public void SetActive() + { + var chiselGraph = graph as ChiselGraph; + chiselGraph.active = this; + } + + protected abstract void OnInputChanged(); + + public override void OnCreateConnection(NodePort from, NodePort to) + { + OnInputChanged(); + } + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs.meta b/Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs.meta new file mode 100644 index 000000000..f7b99edfd --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c4e28557c06515d42877d78439189667 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 1ef1a6ba7adbcdd4fb84af46a4208d327a1e9ba7 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Tue, 19 Jan 2021 12:54:39 +0800 Subject: [PATCH 04/26] Added ChiselGraphNode editor --- Assets/ChiselNodes/New Chisel Graph.asset | 22 +++++++++++++-- .../com.chisel.node/Chisel/ChiselGraph.cs | 2 +- .../{ChiselNode.asmdef => ChiselNodes.asmdef} | 0 ...de.asmdef.meta => ChiselNodes.asmdef.meta} | 0 .../Chisel/Editor/ChiselGraphNodeEditor.cs | 28 +++++++++++++++++++ .../Editor/ChiselGraphNodeEditor.cs.meta | 11 ++++++++ ...Editor.asmdef => ChiselNodesEditor.asmdef} | 0 ...def.meta => ChiselNodesEditor.asmdef.meta} | 0 .../Chisel/Nodes/ChiselBoxNode.cs | 8 ++---- .../{ChiselNode.cs => ChiselGraphNode.cs} | 13 ++++++--- ...elNode.cs.meta => ChiselGraphNode.cs.meta} | 0 11 files changed, 72 insertions(+), 12 deletions(-) rename Packages/com.chisel.node/Chisel/{ChiselNode.asmdef => ChiselNodes.asmdef} (100%) rename Packages/com.chisel.node/Chisel/{ChiselNode.asmdef.meta => ChiselNodes.asmdef.meta} (100%) create mode 100644 Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs create mode 100644 Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs.meta rename Packages/com.chisel.node/Chisel/Editor/{ChiselNodeEditor.asmdef => ChiselNodesEditor.asmdef} (100%) rename Packages/com.chisel.node/Chisel/Editor/{ChiselNodeEditor.asmdef.meta => ChiselNodesEditor.asmdef.meta} (100%) rename Packages/com.chisel.node/Chisel/Nodes/{ChiselNode.cs => ChiselGraphNode.cs} (58%) rename Packages/com.chisel.node/Chisel/Nodes/{ChiselNode.cs.meta => ChiselGraphNode.cs.meta} (100%) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index daae892ca..cde0d9be1 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -13,7 +13,24 @@ MonoBehaviour: m_Name: Chisel Box m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -136, y: -40} + position: {x: -216, y: -72} + ports: + keys: [] + values: [] +--- !u!114 &-7307979638694703134 +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: d678cf2bf10f3bf4f8d68ae693a7a7a3, type: 3} + m_Name: Chisel Box + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: 72, y: -40} ports: keys: [] values: [] @@ -31,5 +48,6 @@ MonoBehaviour: m_EditorClassIdentifier: nodes: - {fileID: -7909353669299017541} - active: {fileID: 0} + - {fileID: -7307979638694703134} + active: {fileID: -7909353669299017541} instance: {fileID: 0} diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.node/Chisel/ChiselGraph.cs index 2fb721a0f..34750c30e 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs @@ -6,7 +6,7 @@ namespace Chisel.Nodes [CreateAssetMenu(fileName = "New Chisel Graph", menuName = "Chisel Graph")] public class ChiselGraph : NodeGraph { - public ChiselNode active; + public ChiselGraphNode active; public ChiselGraphInstance instance; } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/ChiselNode.asmdef b/Packages/com.chisel.node/Chisel/ChiselNodes.asmdef similarity index 100% rename from Packages/com.chisel.node/Chisel/ChiselNode.asmdef rename to Packages/com.chisel.node/Chisel/ChiselNodes.asmdef diff --git a/Packages/com.chisel.node/Chisel/ChiselNode.asmdef.meta b/Packages/com.chisel.node/Chisel/ChiselNodes.asmdef.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/ChiselNode.asmdef.meta rename to Packages/com.chisel.node/Chisel/ChiselNodes.asmdef.meta diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs new file mode 100644 index 000000000..aed55ed7c --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs @@ -0,0 +1,28 @@ +using UnityEngine; +using XNodeEditor; + +namespace Chisel.Nodes +{ + [CustomNodeEditor(typeof(ChiselGraphNode))] + public class ChiselGraphNodeEditor : NodeEditor + { + public override void OnHeaderGUI() + { + GUI.color = Color.white; + var node = target as ChiselGraphNode; + var graph = node.graph as ChiselGraph; + if (graph.active == node) GUI.color = Color.cyan; + + string title = target.name; + GUILayout.Label(title, NodeEditorResources.styles.nodeHeader, GUILayout.Height(30)); + GUI.color = Color.white; + } + + public override void OnBodyGUI() + { + base.OnBodyGUI(); + var node = target as ChiselGraphNode; + if (GUILayout.Button("Preview")) node.SetActive(); + } + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs.meta b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs.meta new file mode 100644 index 000000000..454dad91c --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9c199822f5be71549884fd3e0324d313 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef b/Packages/com.chisel.node/Chisel/Editor/ChiselNodesEditor.asmdef similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef rename to Packages/com.chisel.node/Chisel/Editor/ChiselNodesEditor.asmdef diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef.meta b/Packages/com.chisel.node/Chisel/Editor/ChiselNodesEditor.asmdef.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/ChiselNodeEditor.asmdef.meta rename to Packages/com.chisel.node/Chisel/Editor/ChiselNodesEditor.asmdef.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs b/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs index 8a324e1e6..e0fd5acce 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs @@ -4,13 +4,11 @@ namespace Chisel.Nodes { - public class ChiselBoxNode : ChiselNode + public class ChiselBoxNode : ChiselGraphNode { - public override bool led => throw new System.NotImplementedException(); - - protected override void OnInputChanged() + protected override void Generate() { - throw new System.NotImplementedException(); + Debug.Log("generate box"); } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs similarity index 58% rename from Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs rename to Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs index 4f2ece8fa..c49164544 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs @@ -4,10 +4,12 @@ namespace Chisel.Nodes { - public abstract class ChiselNode : Node + public abstract class ChiselGraphNode : Node { + [Input] public Generation enter; + [Output] public Generation exit; + public Action onStateChange; - public abstract bool led { get; } public void SetActive() { @@ -15,11 +17,14 @@ public void SetActive() chiselGraph.active = this; } - protected abstract void OnInputChanged(); + protected abstract void Generate(); public override void OnCreateConnection(NodePort from, NodePort to) { - OnInputChanged(); + Generate(); } + + [Serializable] + public class Generation { } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs.meta b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/ChiselNode.cs.meta rename to Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs.meta From 6dab7d5efec6bc24b866d0b3269518eae8091117 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Tue, 19 Jan 2021 17:55:11 +0800 Subject: [PATCH 05/26] WIP --- Assets/ChiselNodes/New Chisel Graph.asset | 84 +- Assets/ChiselNodes/NodeTest.unity | 1619 ++++++++++++----- Assets/ChiselNodes/Test.cs | 25 + Assets/ChiselNodes/Test.cs.meta | 11 + .../Base/ChiselGeneratorComponent.cs | 1 - .../Containers/ChiselGeneratedObjects.cs | 3 + .../Managed/CSGManager.Internal.cs | 1 + .../Chisel/ChiselGraphInstance.cs | 45 + .../com.chisel.node/Chisel/ChiselNodes.asmdef | 1 + .../Nodes/{ChiselBoxNode.cs => BoxNode.cs} | 2 +- ...{ChiselBoxNode.cs.meta => BoxNode.cs.meta} | 0 .../Chisel/Nodes/ChiselGraphNode.cs | 29 +- .../Chisel/Nodes/CompositeNode.cs | 16 + .../Chisel/Nodes/CompositeNode.cs.meta | 11 + Packages/com.chisel.node/package.json | 4 +- 15 files changed, 1421 insertions(+), 431 deletions(-) create mode 100644 Assets/ChiselNodes/Test.cs create mode 100644 Assets/ChiselNodes/Test.cs.meta rename Packages/com.chisel.node/Chisel/Nodes/{ChiselBoxNode.cs => BoxNode.cs} (81%) rename Packages/com.chisel.node/Chisel/Nodes/{ChiselBoxNode.cs.meta => BoxNode.cs.meta} (100%) create mode 100644 Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs create mode 100644 Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs.meta diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index cde0d9be1..b9c1ee66a 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7909353669299017541 +--- !u!114 &-5955115620694431845 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9,15 +9,48 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d678cf2bf10f3bf4f8d68ae693a7a7a3, type: 3} - m_Name: Chisel Box + m_Script: {fileID: 11500000, guid: 19f9840a1e94116468e933114f7167e2, type: 3} + m_Name: Composite m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -216, y: -72} + position: {x: 40, y: -136} ports: - keys: [] - values: [] ---- !u!114 &-7307979638694703134 + keys: + - child + - child2 + - parent + values: + - _fieldName: child + _node: {fileID: -5955115620694431845} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSGTree, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: parent + node: {fileID: -2987355259691116483} + reroutePoints: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: child2 + _node: {fileID: -5955115620694431845} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSGTree, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: parent + _node: {fileID: -5955115620694431845} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSGTree, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 +--- !u!114 &-2987355259691116483 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -27,13 +60,36 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d678cf2bf10f3bf4f8d68ae693a7a7a3, type: 3} - m_Name: Chisel Box + m_Name: Box m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: 72, y: -40} + position: {x: -280, y: -136} ports: - keys: [] - values: [] + keys: + - parent + - child + values: + - _fieldName: parent + _node: {fileID: -2987355259691116483} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSGTree, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: child + node: {fileID: -5955115620694431845} + reroutePoints: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: child + _node: {fileID: -2987355259691116483} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSGTree, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -47,7 +103,7 @@ MonoBehaviour: m_Name: New Chisel Graph m_EditorClassIdentifier: nodes: - - {fileID: -7909353669299017541} - - {fileID: -7307979638694703134} - active: {fileID: -7909353669299017541} + - {fileID: -2987355259691116483} + - {fileID: -5955115620694431845} + active: {fileID: 0} instance: {fileID: 0} diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index 7063ed3de..89e05af50 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -285,6 +285,170 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 33383802} m_Mesh: {fileID: 1777405532} +--- !u!43 &34038324 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[generated-Collider]\u203A" + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 180 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 96 + localAABB: + m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 96 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 5c8f023f0000003f0d711cbf3d0a47400000003fe61dc73e3d0a47400000003f0d711cbf5c8f023f0000003fe61dc73eb81e7540d066153e6a2bf6beb81e75404ca65abfda8abdbfb81e7540d066153eda8abdbfb81e75404ca65abf6a2bf6bea4709d3fd066153eda8abdbfa4709d3f000000bf0d711cbfa4709d3fd066153e0d711cbfa4709d3f4ca65abfda8abdbfa4709d3f4ca65abf6a2bf6bea4709d3f000000bf6a2bf6bea4709d3f4ca65abf6a2bf6beb81e75404ca65abfda8abdbfb81e75404ca65abf6a2bf6bea4709d3f4ca65abfda8abdbfa4709d3fd066153eda8abdbf3d0a4740d066153e0d711cbfb81e7540d066153eda8abdbfb81e7540d066153e6a2bf6be3d0a4740d066153e6a2bf6bea4709d3fd066153e0d711cbfec51b83fd066153ee09c893fae4781404ca65abfe09c893fae478140d066153ee09c893fec51b83f4ca65abfe09c893fec51b83f4ca65abf08ce993d3d0a4740000000bf0ace993dae4781404ca65abf08ce993dae478140d066153e08ce993d3d0a4740d066153e0ace993dec51b83f000000bf0ace993dae478140d066153ee09c893fae4781404ca65abf08ce993dae478140d066153e08ce993dae4781404ca65abfe09c893fec51b83f000000bfe61dc73eec51b83f000000bf0ace993dec51b83f4ca65abf08ce993dec51b83f4ca65abfe09c893fec51b83fd066153ee09c893fec51b83fd066153ee61dc73eec51b83f4ca65abfe09c893fae4781404ca65abf08ce993dae4781404ca65abfe09c893fec51b83f4ca65abf08ce993d3d0a4740d066153ee61dc73eec51b83fd066153ee61dc73eec51b83fd066153ee09c893fae478140d066153ee09c893fae478140d066153e08ce993d3d0a4740d066153e0ace993d5c8f023f0000003fe61dc73eec51b83fd066153ee61dc73e3d0a47400000003fe61dc73e3d0a4740d066153ee61dc73e5c8f023f000000bfe61dc73eec51b83f000000bfe61dc73e5c8f023f000000bf0d711cbfa4709d3fd066153e0d711cbfa4709d3f000000bf0d711cbf5c8f023f0000003f0d711cbf3d0a47400000003f0d711cbf3d0a4740d066153e0d711cbf3d0a47400000003fe61dc73e3d0a4740d066153e0ace993d3d0a47400000003f0d711cbf3d0a4740d066153e6a2bf6be3d0a4740d066153e0d711cbf3d0a4740000000bf6a2bf6be3d0a4740000000bf0ace993d3d0a4740d066153ee61dc73e5c8f023f0000003f0d711cbf5c8f023f000000bfe61dc73e5c8f023f0000003fe61dc73e5c8f023f000000bf0d711cbf5c8f023f000000bfe61dc73eec51b83f000000bf0ace993dec51b83f000000bfe61dc73ea4709d3f000000bf6a2bf6be3d0a4740000000bf6a2bf6be3d0a4740000000bf0ace993d5c8f023f000000bf0d711cbfa4709d3f000000bf0d711cbfa4709d3f4ca65abfda8abdbfb81e7540d066153eda8abdbfb81e75404ca65abfda8abdbfa4709d3fd066153eda8abdbf3d0a4740000000bf6a2bf6bea4709d3f000000bf6a2bf6bea4709d3f4ca65abf6a2bf6beb81e75404ca65abf6a2bf6beb81e7540d066153e6a2bf6be3d0a4740d066153e6a2bf6be + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!43 &69493321 Mesh: m_ObjectHideFlags: 0 @@ -450,14 +614,14 @@ Mesh: m_SubMeshes: - serializedVersion: 2 firstByte: 0 - indexCount: 36 + indexCount: 180 topology: 0 baseVertex: 0 firstVertex: 0 - vertexCount: 24 + vertexCount: 96 localAABB: - m_Center: {x: 0, y: 0, z: -0.002699986} - m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} m_Shapes: vertices: [] shapes: [] @@ -474,10 +638,10 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 m_VertexData: serializedVersion: 3 - m_VertexCount: 24 + m_VertexCount: 96 m_Channels: - stream: 0 offset: 0 @@ -535,8 +699,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 1152 - _typelessdata: 6666a6bf0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bf6666e63f0000803f6666a63f0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000006666a6bf000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf000000006666a63f000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000006666a6bf000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003ff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f6666a6bf000000bf1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf00000000000000006666a6bf0000003f1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f6666a6bf000000bff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000006666a63f0000003f1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f6666a63f000000bff2b000bf0000803f000000000000000000000000000000000000803f000080bf00000000000000006666a63f0000003ff2b000bf0000803f000000000000000000000080000000000000803f000080bf000000000000803f6666a63f000000bf1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f000000006666a6bf000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000006666a6bf0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003f1b9efe3e00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f6666a6bf000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000 + m_DataSize: 4608 + _typelessdata: 5c8f023f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3d0a47400000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003d0a47400000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f5c8f023f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000b81e7540d066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81e75404ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81e7540d066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81e75404ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000a4709d3fd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803fa4709d3f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53ea4709d3fd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803fa4709d3f4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000a4709d3f4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf0000000000000000a4709d3f000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53ea4709d3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81e75404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81e75404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000a4709d3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3fa4709d3fd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3d0a4740d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd606d053eb81e7540d066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3fb81e7540d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003d0a4740d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd00000000a4709d3fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053eec51b83fd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fae4781404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803fec51b83f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000003d0a4740000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f984cb53eae4781404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000ae478140d066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3d0a4740d066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f0000803fec51b83f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf984cb53eae478140d066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fae4781404ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000ae478140d066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fae4781404ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000ec51b83f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53eec51b83f000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53eec51b83f4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000ec51b83f4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000ec51b83fd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803fec51b83fd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803fec51b83f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000ae4781404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fae4781404ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f3d0a4740d066153ee61dc73e000000000000803f00000000000080bf0000000068a28932000080bfc01e053ecdaa2f3fec51b83fd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3fec51b83fd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f00000000ae478140d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153e08ce993d000000000000803f00000000000080bf0000000068a28932000080bfcccc4cbfffff7f3f3d0a4740d066153e0ace993d000000000000803f00000000000080bf0000000068a28932000080bfc01e053effff7f3f5c8f023f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803fec51b83fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213fb459253f3d0a47400000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3d0a4740d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f5c8f023f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000ec51b83f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213f000000005c8f023f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf00000000a4709d3fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233eb459253fa4709d3f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233e000000005c8f023f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3d0a47400000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3d0a4740d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3d0a47400000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3d0a4740d066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3d0a47400000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3d0a4740d066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3d0a4740d066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3d0a4740000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003d0a4740000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003d0a4740d066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f5c8f023f0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f5c8f023f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f023f0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f5c8f023f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000005c8f023f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000ec51b83f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bfa870bd3e64aaa03eec51b83f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bfa870bd3e00000000a4709d3f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf10d7233ea8a45e3f3d0a4740000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3d0a4740000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e5c8f023f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803fa4709d3f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf10d7233e0000803fa4709d3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000b81e7540d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803fb81e75404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000a4709d3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3d0a4740000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd984cb53ea4709d3f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53ea4709d3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000b81e75404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81e7540d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3d0a4740d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd0000803f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -590,8 +754,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0, y: 0, z: -0.002699986} - m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -603,6 +767,49 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &166783097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 166783099} + - component: {fileID: 166783098} + m_Layer: 0 + m_Name: Test + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &166783098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 166783097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 96a015f314869d9429110036c3241d1c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &166783099 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 166783097} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &283560757 GameObject: m_ObjectHideFlags: 8 @@ -692,17 +899,7 @@ Mesh: m_PrefabAsset: {fileID: 0} m_Name: "\u2039[debug-Culled]\u203A" serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 0 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 0 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} + m_SubMeshes: [] m_Shapes: vertices: [] shapes: [] @@ -716,9 +913,9 @@ Mesh: m_Data: m_MeshCompression: 0 m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 m_IndexBuffer: m_VertexData: serializedVersion: 3 @@ -727,23 +924,23 @@ Mesh: - stream: 0 offset: 0 format: 0 - dimension: 0 + dimension: 3 - stream: 0 - offset: 0 + offset: 12 format: 0 - dimension: 0 + dimension: 3 - stream: 0 - offset: 0 + offset: 24 format: 0 - dimension: 0 + dimension: 4 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 - offset: 0 + offset: 40 format: 0 - dimension: 0 + dimension: 2 - stream: 0 offset: 0 format: 0 @@ -1208,6 +1405,52 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &479267782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 479267784} + - component: {fileID: 479267783} + m_Layer: 0 + m_Name: ChiselGraphInstance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &479267783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479267782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7112759bb6d84f45890aef9caadedbe, type: 3} + m_Name: + m_EditorClassIdentifier: + graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} + meshFilter: {fileID: 0} + meshRenderer: {fileID: 0} +--- !u!4 &479267784 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479267782} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &650786225 GameObject: m_ObjectHideFlags: 24 @@ -1289,7 +1532,7 @@ Transform: m_Father: {fileID: 352119802} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &763721116 +--- !u!1 &757814502 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1297,29 +1540,150 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 763721119} - - component: {fileID: 763721118} - - component: {fileID: 763721117} + - component: {fileID: 757814503} + - component: {fileID: 757814504} m_Layer: 0 - m_Name: Model + m_Name: Box (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &763721117 +--- !u!4 &757814503 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 757814502} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.74, y: -0.3541, z: 0.5751} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1726353266} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &757814504 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 763721116} + m_GameObject: {fileID: 757814502} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b7112759bb6d84f45890aef9caadedbe, type: 3} + m_Script: {fileID: 11500000, guid: 61ab2008f3a53ec49b577d5d4c48b8ea, type: 3} m_Name: m_EditorClassIdentifier: - graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} + operation: 0 + brushContainerAsset: {fileID: 1380108403} + localTransformation: + e00: 1 + e01: 0 + e02: 0 + e03: 2.74 + e10: 0 + e11: 1 + e12: 0 + e13: -0.3541 + e20: 0 + e21: 0 + e22: 1 + e23: 0.5751 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + pivotOffset: {x: 0, y: 0, z: 0} + definition: + bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + surfaceDefinition: + surfaces: + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} +--- !u!1 &763721116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 763721119} + - component: {fileID: 763721118} + m_Layer: 0 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!114 &763721118 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1333,7 +1697,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: CreateRenderComponents: 1 - CreateColliderComponents: 1 + CreateColliderComponents: 0 AutoRebuildUVs: 1 VertexChannelMask: 14 colliderSettings: @@ -1345,7 +1709,7 @@ MonoBehaviour: motionVectorGenerationMode: 1 reflectionProbeUsage: 1 lightProbeUsage: 1 - allowOcclusionWhenDynamic: 1 + allowOcclusionWhenDynamic: 0 renderingLayerMask: 4294967295 receiveGI: 2 lightmapParameters: {fileID: 1993817710} @@ -1367,7 +1731,7 @@ MonoBehaviour: colliderContainer: {fileID: 1658714170} colliders: - surfaceParameter: 3198 - sharedMesh: {fileID: 1803941809} + sharedMesh: {fileID: 34038324} meshCollider: {fileID: 1658714172} physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} geometryHashValue: 0 @@ -1465,7 +1829,7 @@ MonoBehaviour: meshRenderer: {fileID: 1994922929} renderMaterials: - {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} - triangleBrushes: 010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + triangleBrushes: 030000000300000001000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000010000000100000001000000010000000100000001000000 geometryHashValue: 0 surfaceHashValue: 0 debugHelperRenderer: 0 @@ -1497,7 +1861,7 @@ MonoBehaviour: meshRenderer: {fileID: 30283946} renderMaterials: - {fileID: 2100000, guid: 53340697a84d92643a339913177ceeb1, type: 2} - triangleBrushes: 010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + triangleBrushes: 030000000300000001000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000010000000100000001000000010000000100000001000000 geometryHashValue: 0 surfaceHashValue: 0 debugHelperRenderer: 1 @@ -1522,7 +1886,7 @@ MonoBehaviour: meshRenderer: {fileID: 2018435912} renderMaterials: - {fileID: 2100000, guid: d9918ebea62f9b54cb883f09f89983ac, type: 2} - triangleBrushes: 010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + triangleBrushes: 030000000300000001000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000030000000300000003000000010000000100000001000000010000000100000001000000 geometryHashValue: 0 surfaceHashValue: 0 debugHelperRenderer: 1 @@ -1567,11 +1931,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 763721116} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0.04, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 352119802} - - {fileID: 1357061026} + - {fileID: 1726353266} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2027,11 +2391,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357061025} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0027} + m_LocalPosition: {x: 0.57, y: 0, z: -0.1111} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 763721119} - m_RootOrder: 1 + m_Father: {fileID: 1726353266} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1357061027 MonoBehaviour: @@ -2051,7 +2415,7 @@ MonoBehaviour: e00: 1 e01: 0 e02: 0 - e03: 0 + e03: 1.5699999 e10: 0 e11: 1 e12: 0 @@ -2059,7 +2423,7 @@ MonoBehaviour: e20: 0 e21: 0 e22: 1 - e23: -0.0027 + e23: -0.1111 e30: 0 e31: 0 e32: 0 @@ -2067,7 +2431,7 @@ MonoBehaviour: pivotOffset: {x: 0, y: 0, z: 0} definition: bounds: - m_Center: {x: 0, y: 0, z: 0} + m_Center: {x: 0.24, y: 0, z: 0} m_Extent: {x: 1.3, y: 0.5, z: 0.5} surfaceDefinition: surfaces: @@ -2148,14 +2512,14 @@ Mesh: m_SubMeshes: - serializedVersion: 2 firstByte: 0 - indexCount: 36 + indexCount: 180 topology: 0 baseVertex: 0 firstVertex: 0 - vertexCount: 24 + vertexCount: 96 localAABB: - m_Center: {x: 0, y: 0, z: -0.002699986} - m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} m_Shapes: vertices: [] shapes: [] @@ -2172,10 +2536,10 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 m_VertexData: serializedVersion: 3 - m_VertexCount: 24 + m_VertexCount: 96 m_Channels: - stream: 0 offset: 0 @@ -2233,8 +2597,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 1152 - _typelessdata: 6666a6bf0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bf6666e63f0000803f6666a63f0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000006666a6bf000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf000000006666a63f000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000006666a6bf000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003ff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f6666a6bf000000bf1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf00000000000000006666a6bf0000003f1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f6666a6bf000000bff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000006666a63f0000003f1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f6666a63f000000bff2b000bf0000803f000000000000000000000000000000000000803f000080bf00000000000000006666a63f0000003ff2b000bf0000803f000000000000000000000080000000000000803f000080bf000000000000803f6666a63f000000bf1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f000000006666a6bf000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000006666a6bf0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003f1b9efe3e00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f6666a6bf000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000 + m_DataSize: 4608 + _typelessdata: 5c8f023f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3d0a47400000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003d0a47400000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f5c8f023f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000b81e7540d066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81e75404ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81e7540d066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81e75404ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000a4709d3fd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803fa4709d3f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53ea4709d3fd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803fa4709d3f4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000a4709d3f4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf0000000000000000a4709d3f000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53ea4709d3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81e75404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81e75404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000a4709d3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3fa4709d3fd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3d0a4740d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd606d053eb81e7540d066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3fb81e7540d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003d0a4740d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd00000000a4709d3fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053eec51b83fd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fae4781404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803fec51b83f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000003d0a4740000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f984cb53eae4781404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000ae478140d066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3d0a4740d066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f0000803fec51b83f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf984cb53eae478140d066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fae4781404ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000ae478140d066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fae4781404ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000ec51b83f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53eec51b83f000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53eec51b83f4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000ec51b83f4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000ec51b83fd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803fec51b83fd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803fec51b83f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000ae4781404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fae4781404ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f3d0a4740d066153ee61dc73e000000000000803f00000000000080bf0000000068a28932000080bfc01e053ecdaa2f3fec51b83fd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3fec51b83fd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f00000000ae478140d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153e08ce993d000000000000803f00000000000080bf0000000068a28932000080bfcccc4cbfffff7f3f3d0a4740d066153e0ace993d000000000000803f00000000000080bf0000000068a28932000080bfc01e053effff7f3f5c8f023f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803fec51b83fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213fb459253f3d0a47400000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3d0a4740d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f5c8f023f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000ec51b83f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213f000000005c8f023f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf00000000a4709d3fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233eb459253fa4709d3f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233e000000005c8f023f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3d0a47400000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3d0a4740d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3d0a47400000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3d0a4740d066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3d0a47400000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3d0a4740d066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3d0a4740d066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3d0a4740000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003d0a4740000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003d0a4740d066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f5c8f023f0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f5c8f023f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f023f0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f5c8f023f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000005c8f023f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000ec51b83f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bfa870bd3e64aaa03eec51b83f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bfa870bd3e00000000a4709d3f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf10d7233ea8a45e3f3d0a4740000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3d0a4740000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e5c8f023f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803fa4709d3f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf10d7233e0000803fa4709d3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000b81e7540d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803fb81e75404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000a4709d3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3d0a4740000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd984cb53ea4709d3f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53ea4709d3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000b81e75404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81e7540d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3d0a4740d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd0000803f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -2288,8 +2652,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0, y: 0, z: -0.002699986} - m_Extent: {x: 1.3, y: 0.5, z: 0.5} + m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -2301,7 +2665,7 @@ Mesh: offset: 0 size: 0 path: ---- !u!114 &1412248516 +--- !u!114 &1380108403 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2311,7 +2675,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7de3455a6626d0b47b27866cd6b0f381, type: 3} - m_Name: Generated Box + m_Name: Generated Box(Clone) m_EditorClassIdentifier: brushContainer: brushMeshes: @@ -2508,180 +2872,234 @@ MonoBehaviour: z: 1 w: -0.5 operations: 00 - owner: {fileID: 1357061027} ---- !u!43 &1438308655 -Mesh: + owner: {fileID: 757814504} +--- !u!114 &1412248516 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u2039[generated-Renderable|CastShadows|ReceiveShadows]\u203A" - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: -0.002699986} - m_Extent: {x: 1.3, y: 0.5, z: 0.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 6666a6bf0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bf6666e63f0000803f6666a63f0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000006666a6bf000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf000000006666a63f000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000006666a6bf000000bff2b000bf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003ff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f6666a6bf000000bf1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf00000000000000006666a6bf0000003f1b9efe3e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f6666a6bf000000bff2b000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000006666a63f0000003f1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f6666a63f000000bff2b000bf0000803f000000000000000000000000000000000000803f000080bf00000000000000006666a63f0000003ff2b000bf0000803f000000000000000000000080000000000000803f000080bf000000000000803f6666a63f000000bf1b9efe3e0000803f000000000000000000000000000000000000803f000080bf0000803f000000006666a6bf000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000006666a63f0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f6666a63f000000bff2b000bf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000006666a6bf0000003ff2b000bf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f6666a6bf0000003f1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803f6666a63f000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf000000006666a63f0000003f1b9efe3e00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f6666a6bf000000bf1b9efe3e00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: -0.002699986} - m_Extent: {x: 1.3, y: 0.5, z: 0.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: ---- !u!43 &1447655678 + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7de3455a6626d0b47b27866cd6b0f381, type: 3} + m_Name: Generated Box + m_EditorClassIdentifier: + brushContainer: + brushMeshes: + - version: 1 + vertices: + - x: -1.06 + y: 0.5 + z: -0.5 + - x: 1.54 + y: 0.5 + z: -0.5 + - x: 1.54 + y: 0.5 + z: 0.5 + - x: -1.06 + y: 0.5 + z: 0.5 + - x: -1.06 + y: -0.5 + z: -0.5 + - x: 1.54 + y: -0.5 + z: -0.5 + - x: 1.54 + y: -0.5 + z: 0.5 + - x: -1.06 + y: -0.5 + z: 0.5 + halfEdges: + - vertexIndex: 0 + twinIndex: 17 + - vertexIndex: 3 + twinIndex: 8 + - vertexIndex: 2 + twinIndex: 20 + - vertexIndex: 1 + twinIndex: 13 + - vertexIndex: 4 + twinIndex: 10 + - vertexIndex: 5 + twinIndex: 19 + - vertexIndex: 6 + twinIndex: 15 + - vertexIndex: 7 + twinIndex: 22 + - vertexIndex: 0 + twinIndex: 1 + - vertexIndex: 4 + twinIndex: 16 + - vertexIndex: 7 + twinIndex: 4 + - vertexIndex: 3 + twinIndex: 21 + - vertexIndex: 1 + twinIndex: 18 + - vertexIndex: 2 + twinIndex: 3 + - vertexIndex: 6 + twinIndex: 23 + - vertexIndex: 5 + twinIndex: 6 + - vertexIndex: 0 + twinIndex: 9 + - vertexIndex: 1 + twinIndex: 0 + - vertexIndex: 5 + twinIndex: 12 + - vertexIndex: 4 + twinIndex: 5 + - vertexIndex: 3 + twinIndex: 2 + - vertexIndex: 7 + twinIndex: 11 + - vertexIndex: 6 + twinIndex: 7 + - vertexIndex: 2 + twinIndex: 14 + halfEdgePolygonIndices: 000000000000000000000000000000000100000001000000010000000100000002000000020000000200000002000000030000000300000003000000030000000400000004000000040000000400000005000000050000000500000005000000 + polygons: + - firstEdge: 0 + edgeCount: 4 + surfaceID: 0 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 4 + edgeCount: 4 + surfaceID: 1 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 8 + edgeCount: 4 + surfaceID: 2 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 12 + edgeCount: 4 + surfaceID: 3 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 16 + edgeCount: 4 + surfaceID: 4 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 20 + edgeCount: 4 + surfaceID: 5 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + planes: + - x: 0 + y: 1 + z: 0 + w: -0.5 + - x: 0 + y: -1 + z: 0 + w: -0.5 + - x: -1 + y: 0 + z: 0 + w: -1.06 + - x: 1 + y: 0 + z: 0 + w: -1.54 + - x: 0 + y: 0 + z: -1 + w: -0.5 + - x: 0 + y: 0 + z: 1 + w: -0.5 + operations: 00 + owner: {fileID: 1357061027} +--- !u!43 &1438308655 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u2039[debug-ShadowOnly]\u203A" + m_Name: "\u2039[generated-Renderable|CastShadows|ReceiveShadows]\u203A" serializedVersion: 10 - m_SubMeshes: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 180 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 96 + localAABB: + m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} m_Shapes: vertices: [] shapes: [] @@ -2698,10 +3116,10 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 m_VertexData: serializedVersion: 3 - m_VertexCount: 0 + m_VertexCount: 96 m_Channels: - stream: 0 offset: 0 @@ -2759,8 +3177,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 0 - _typelessdata: + m_DataSize: 4608 + _typelessdata: 5c8f023f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3d0a47400000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003d0a47400000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f5c8f023f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000b81e7540d066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81e75404ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81e7540d066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81e75404ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000a4709d3fd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803fa4709d3f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53ea4709d3fd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803fa4709d3f4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000a4709d3f4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf0000000000000000a4709d3f000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53ea4709d3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81e75404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81e75404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000a4709d3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3fa4709d3fd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3d0a4740d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd606d053eb81e7540d066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3fb81e7540d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003d0a4740d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd00000000a4709d3fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053eec51b83fd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fae4781404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803fec51b83f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000003d0a4740000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f984cb53eae4781404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000ae478140d066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3d0a4740d066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f0000803fec51b83f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf984cb53eae478140d066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fae4781404ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000ae478140d066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fae4781404ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000ec51b83f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53eec51b83f000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53eec51b83f4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000ec51b83f4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000ec51b83fd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803fec51b83fd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803fec51b83f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000ae4781404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fae4781404ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f3d0a4740d066153ee61dc73e000000000000803f00000000000080bf0000000068a28932000080bfc01e053ecdaa2f3fec51b83fd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3fec51b83fd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f00000000ae478140d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153e08ce993d000000000000803f00000000000080bf0000000068a28932000080bfcccc4cbfffff7f3f3d0a4740d066153e0ace993d000000000000803f00000000000080bf0000000068a28932000080bfc01e053effff7f3f5c8f023f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803fec51b83fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213fb459253f3d0a47400000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3d0a4740d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f5c8f023f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000ec51b83f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213f000000005c8f023f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf00000000a4709d3fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233eb459253fa4709d3f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233e000000005c8f023f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3d0a47400000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3d0a4740d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3d0a47400000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3d0a4740d066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3d0a47400000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3d0a4740d066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3d0a4740d066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3d0a4740000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003d0a4740000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003d0a4740d066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f5c8f023f0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f5c8f023f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f023f0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f5c8f023f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000005c8f023f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000ec51b83f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bfa870bd3e64aaa03eec51b83f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bfa870bd3e00000000a4709d3f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf10d7233ea8a45e3f3d0a4740000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3d0a4740000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e5c8f023f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803fa4709d3f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf10d7233e0000803fa4709d3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000b81e7540d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803fb81e75404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000a4709d3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3d0a4740000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd984cb53ea4709d3f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53ea4709d3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000b81e75404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81e7540d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3d0a4740d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd0000803f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -2814,8 +3232,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} + m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -2827,13 +3245,13 @@ Mesh: offset: 0 size: 0 path: ---- !u!43 &1497873584 +--- !u!43 &1447655678 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u2039[generated-Renderable|ReceiveShadows]\u203A" + m_Name: "\u2039[debug-ShadowOnly]\u203A" serializedVersion: 10 m_SubMeshes: [] m_Shapes: @@ -2981,20 +3399,174 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &1658714170 -GameObject: - m_ObjectHideFlags: 8 +--- !u!43 &1497873584 +Mesh: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1658714171} - - component: {fileID: 1658714172} - m_Layer: 0 - m_Name: "\u2039[generated-Collider]\u203A" - m_TagString: Untagged - m_Icon: {fileID: 0} + m_Name: "\u2039[generated-Renderable|ReceiveShadows]\u203A" + serializedVersion: 10 + m_SubMeshes: [] + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &1658714170 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1658714171} + - component: {fileID: 1658714172} + m_Layer: 0 + m_Name: "\u2039[generated-Collider]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 @@ -3025,7 +3597,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1803941809} + m_Mesh: {fileID: 34038324} --- !u!1 &1703547411 GameObject: m_ObjectHideFlags: 24 @@ -3107,6 +3679,54 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703547411} m_Mesh: {fileID: 69493321} +--- !u!1 &1726353265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1726353266} + - component: {fileID: 1726353267} + m_Layer: 0 + m_Name: Composite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1726353266 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726353265} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1357061026} + - {fileID: 757814503} + - {fileID: 1854065756} + m_Father: {fileID: 763721119} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1726353267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726353265} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad92ed0616a48114bb30c433f3704866, type: 3} + m_Name: + m_EditorClassIdentifier: + passThrough: 0 + operation: 0 --- !u!43 &1777405532 Mesh: m_ObjectHideFlags: 0 @@ -3354,170 +3974,349 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!43 &1803941809 -Mesh: +--- !u!114 &1842939438 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u2039[generated-Collider]\u203A" - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: -0.002699986} - m_Extent: {x: 1.3, y: 0.5, z: 0.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 288 - _typelessdata: 6666a6bf0000003ff2b000bf6666a63f0000003f1b9efe3e6666a63f0000003ff2b000bf6666a6bf0000003f1b9efe3e6666a6bf000000bf1b9efe3e6666a63f000000bff2b000bf6666a63f000000bf1b9efe3e6666a6bf000000bff2b000bf6666a6bf0000003ff2b000bf6666a6bf000000bf1b9efe3e6666a6bf0000003f1b9efe3e6666a6bf000000bff2b000bf6666a63f0000003f1b9efe3e6666a63f000000bff2b000bf6666a63f0000003ff2b000bf6666a63f000000bf1b9efe3e6666a6bf000000bff2b000bf6666a63f0000003ff2b000bf6666a63f000000bff2b000bf6666a6bf0000003ff2b000bf6666a6bf0000003f1b9efe3e6666a63f000000bf1b9efe3e6666a63f0000003f1b9efe3e6666a6bf000000bf1b9efe3e - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: -0.002699986} - m_Extent: {x: 1.3, y: 0.5, z: 0.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7de3455a6626d0b47b27866cd6b0f381, type: 3} + m_Name: Generated Box(Clone)(Clone) + m_EditorClassIdentifier: + brushContainer: + brushMeshes: + - version: 1 + vertices: + - x: -1.3 + y: 0.5 + z: -0.5 + - x: 1.3 + y: 0.5 + z: -0.5 + - x: 1.3 + y: 0.5 + z: 0.5 + - x: -1.3 + y: 0.5 + z: 0.5 + - x: -1.3 + y: -0.5 + z: -0.5 + - x: 1.3 + y: -0.5 + z: -0.5 + - x: 1.3 + y: -0.5 + z: 0.5 + - x: -1.3 + y: -0.5 + z: 0.5 + halfEdges: + - vertexIndex: 0 + twinIndex: 17 + - vertexIndex: 3 + twinIndex: 8 + - vertexIndex: 2 + twinIndex: 20 + - vertexIndex: 1 + twinIndex: 13 + - vertexIndex: 4 + twinIndex: 10 + - vertexIndex: 5 + twinIndex: 19 + - vertexIndex: 6 + twinIndex: 15 + - vertexIndex: 7 + twinIndex: 22 + - vertexIndex: 0 + twinIndex: 1 + - vertexIndex: 4 + twinIndex: 16 + - vertexIndex: 7 + twinIndex: 4 + - vertexIndex: 3 + twinIndex: 21 + - vertexIndex: 1 + twinIndex: 18 + - vertexIndex: 2 + twinIndex: 3 + - vertexIndex: 6 + twinIndex: 23 + - vertexIndex: 5 + twinIndex: 6 + - vertexIndex: 0 + twinIndex: 9 + - vertexIndex: 1 + twinIndex: 0 + - vertexIndex: 5 + twinIndex: 12 + - vertexIndex: 4 + twinIndex: 5 + - vertexIndex: 3 + twinIndex: 2 + - vertexIndex: 7 + twinIndex: 11 + - vertexIndex: 6 + twinIndex: 7 + - vertexIndex: 2 + twinIndex: 14 + halfEdgePolygonIndices: 000000000000000000000000000000000100000001000000010000000100000002000000020000000200000002000000030000000300000003000000030000000400000004000000040000000400000005000000050000000500000005000000 + polygons: + - firstEdge: 0 + edgeCount: 4 + surfaceID: 0 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 4 + edgeCount: 4 + surfaceID: 1 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 8 + edgeCount: 4 + surfaceID: 2 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 12 + edgeCount: 4 + surfaceID: 3 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 16 + edgeCount: 4 + surfaceID: 4 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - firstEdge: 20 + edgeCount: 4 + surfaceID: 5 + surface: + brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + planes: + - x: 0 + y: 1 + z: 0 + w: -0.5 + - x: 0 + y: -1 + z: 0 + w: -0.5 + - x: -1 + y: 0 + z: 0 + w: -1.3 + - x: 1 + y: 0 + z: 0 + w: -1.3 + - x: 0 + y: 0 + z: -1 + w: -0.5 + - x: 0 + y: 0 + z: 1 + w: -0.5 + operations: 00 + owner: {fileID: 1854065757} +--- !u!1 &1854065755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1854065756} + - component: {fileID: 1854065757} + m_Layer: 0 + m_Name: Box (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1854065756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854065755} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.53, y: -0.3541, z: -0.9808} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1726353266} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1854065757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854065755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61ab2008f3a53ec49b577d5d4c48b8ea, type: 3} + m_Name: + m_EditorClassIdentifier: + operation: 0 + brushContainerAsset: {fileID: 1842939438} + localTransformation: + e00: 1 + e01: 0 + e02: 0 + e03: 2.53 + e10: 0 + e11: 1 + e12: 0 + e13: -0.3541 + e20: 0 + e21: 0 + e22: 1 + e23: -0.9808 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + pivotOffset: {x: 0, y: 0, z: 0} + definition: + bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1.3, y: 0.5, z: 0.5} + surfaceDefinition: + surfaces: + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} + - brushMaterial: + layerUsage: 15 + renderMaterial: {fileID: 2100000, guid: ca37785d773692b47bd7339c9dd802ce, type: 2} + physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} + surfaceDescription: + smoothingGroup: + value: 0 + surfaceFlags: 0 + UV0: + U: {x: 1, y: 0, z: 0, w: 0.5} + V: {x: 0, y: 1, z: 0, w: 0.5} --- !u!43 &1887553485 Mesh: m_ObjectHideFlags: 0 diff --git a/Assets/ChiselNodes/Test.cs b/Assets/ChiselNodes/Test.cs new file mode 100644 index 000000000..15a5d1c26 --- /dev/null +++ b/Assets/ChiselNodes/Test.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Chisel.Core +{ + public class Test : MonoBehaviour + { + // Start is called before the first frame update + void Start() + { + var allNodes = CSGManager.AllTreeNodes; + print(allNodes.Length); + + foreach (var node in allNodes) + print(node); + } + + // Update is called once per frame + void Update() + { + + } + } +} \ No newline at end of file diff --git a/Assets/ChiselNodes/Test.cs.meta b/Assets/ChiselNodes/Test.cs.meta new file mode 100644 index 000000000..0c8176ea7 --- /dev/null +++ b/Assets/ChiselNodes/Test.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 96a015f314869d9429110036c3241d1c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.components/Chisel/Components/API.public/Components/Base/ChiselGeneratorComponent.cs b/Packages/com.chisel.components/Chisel/Components/API.public/Components/Base/ChiselGeneratorComponent.cs index dc1f75aeb..bd2b92310 100644 --- a/Packages/com.chisel.components/Chisel/Components/API.public/Components/Base/ChiselGeneratorComponent.cs +++ b/Packages/com.chisel.components/Chisel/Components/API.public/Components/Base/ChiselGeneratorComponent.cs @@ -868,7 +868,6 @@ public virtual void UpdateGenerator() finally { Profiler.EndSample(); } Profiler.BeginSample("UpdateGeneratorInternal"); - print("UpdateGeneratorInternal"); try { UpdateGeneratorInternal(); } finally { Profiler.EndSample(); } diff --git a/Packages/com.chisel.components/Chisel/Components/API.public/Components/Containers/ChiselGeneratedObjects.cs b/Packages/com.chisel.components/Chisel/Components/API.public/Components/Containers/ChiselGeneratedObjects.cs index ec0b8b66a..5765ca641 100644 --- a/Packages/com.chisel.components/Chisel/Components/API.public/Components/Containers/ChiselGeneratedObjects.cs +++ b/Packages/com.chisel.components/Chisel/Components/API.public/Components/Containers/ChiselGeneratedObjects.cs @@ -597,6 +597,9 @@ public int FinishMeshUpdates(ChiselModel model, GameObject parentGameObject, } } + Debug.Log(foundMeshes.Count); + Debug.Log(meshDataArray.Length); + Profiler.BeginSample("ApplyAndDisposeWritableMeshData"); Mesh.ApplyAndDisposeWritableMeshData(meshDataArray, foundMeshes, UnityEngine.Rendering.MeshUpdateFlags.DontRecalculateBounds); diff --git a/Packages/com.chisel.core/Chisel/Core/API.private/Managed/CSGManager.Internal.cs b/Packages/com.chisel.core/Chisel/Core/API.private/Managed/CSGManager.Internal.cs index 0d3df5d2a..4efd0d6b5 100644 --- a/Packages/com.chisel.core/Chisel/Core/API.private/Managed/CSGManager.Internal.cs +++ b/Packages/com.chisel.core/Chisel/Core/API.private/Managed/CSGManager.Internal.cs @@ -458,6 +458,7 @@ static bool SetDirtyWithFlag(Int32 nodeID, NodeStatusFlags brushNodeFlags = Node { if (!AssertNodeIDValid(nodeID)) return false; + switch (nodeFlags[nodeID - 1].nodeType) { case CSGNodeType.Brush: { return SetBrushDirtyWithFlag(nodeID, brushNodeFlags); } diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs index df8415399..5798e3db2 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -1,5 +1,9 @@ +using Chisel.Core; +using System; using System.Collections; using System.Collections.Generic; +using Unity.Collections; +using Unity.Jobs; using UnityEngine; namespace Chisel.Nodes @@ -7,5 +11,46 @@ namespace Chisel.Nodes public class ChiselGraphInstance : MonoBehaviour { public ChiselGraph graph; + public MeshFilter meshFilter; + public MeshRenderer meshRenderer; + + CSGTree tree; + + void CreateTree() + { + tree = CSGTree.Create(GetInstanceID()); + var brush = new CSGTreeBrush(); + var brushContainer = new ChiselBrushContainer(); + var box = new ChiselBoxDefinition(); + + BrushMeshFactory.GenerateBox(ref brushContainer, ref box); + brush.BrushMesh = BrushMeshInstance.Create(brushContainer.brushMeshes[0]); + tree.Add(brush); + } + + void UpdateMesh() + { + CSGManager.Flush(finishMeshUpdates); + } + + List foundMeshes = new List(); + + int finishMeshUpdates(CSGTree tree, + ref VertexBufferContents vertexBufferContents, + Mesh.MeshDataArray meshDataArray, + NativeList colliderMeshUpdates, + NativeList debugHelperMeshes, + NativeList renderMeshes, + JobHandle dependencies) + { + meshFilter = gameObject.AddComponent(); + meshRenderer = gameObject.AddComponent(); + + + + var foundMeshCount = foundMeshes.Count; + foundMeshes.Clear(); + return foundMeshCount; + } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/ChiselNodes.asmdef b/Packages/com.chisel.node/Chisel/ChiselNodes.asmdef index 56d354011..e66c68934 100644 --- a/Packages/com.chisel.node/Chisel/ChiselNodes.asmdef +++ b/Packages/com.chisel.node/Chisel/ChiselNodes.asmdef @@ -2,6 +2,7 @@ "name": "ChiselNode", "rootNamespace": "", "references": [ + "GUID:e0cd26848372d4e5c891c569017e11f1", "GUID:642cde28f6a094d458a26f9a4533c056", "GUID:c5c65302a7823bb47a9cb6d9c848b0da", "GUID:b8e24fd1eb19b4226afebb2810e3c19b" diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs similarity index 81% rename from Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs rename to Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs index e0fd5acce..6970253ca 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs @@ -4,7 +4,7 @@ namespace Chisel.Nodes { - public class ChiselBoxNode : ChiselGraphNode + public class BoxNode : ChiselGraphNode { protected override void Generate() { diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs.meta b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/ChiselBoxNode.cs.meta rename to Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs index c49164544..809df24b4 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs @@ -6,8 +6,8 @@ namespace Chisel.Nodes { public abstract class ChiselGraphNode : Node { - [Input] public Generation enter; - [Output] public Generation exit; + [Input] public CSGTree child; + [Output] public CSGTree parent; public Action onStateChange; @@ -25,6 +25,29 @@ public override void OnCreateConnection(NodePort from, NodePort to) } [Serializable] - public class Generation { } + public class CSGTree { } + } + + public abstract class ChiselGraphGeneratorNode : Node + { + [Output] public CSGTree parent; + + public Action onStateChange; + + public void SetActive() + { + var chiselGraph = graph as ChiselGraph; + //chiselGraph.active = this; + } + + protected abstract void Generate(); + + public override void OnCreateConnection(NodePort from, NodePort to) + { + Generate(); + } + + [Serializable] + public class CSGTree { } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs b/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs new file mode 100644 index 000000000..3aa665d17 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Chisel.Nodes +{ + public class CompositeNode : ChiselGraphNode + { + [Input] public CSGTree child2; + + protected override void Generate() + { + Debug.Log("generate box"); + } + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs.meta b/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs.meta new file mode 100644 index 000000000..3b751fe43 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 19f9840a1e94116468e933114f7167e2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/package.json b/Packages/com.chisel.node/package.json index b8db21974..26abf7177 100644 --- a/Packages/com.chisel.node/package.json +++ b/Packages/com.chisel.node/package.json @@ -1,6 +1,6 @@ { - "description": "The Chisel Node Generator", - "displayName": "Chisel Node Generator", + "description": "The Chisel Node Graph", + "displayName": "Chisel Node Graph", "name": "com.chisel.node", "keywords": [ "level design", From 697fefd863843ce085533acfe5c3aed52f24b83f Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Tue, 19 Jan 2021 18:00:33 +0800 Subject: [PATCH 06/26] WIP --- Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs index 5798e3db2..2a7289b4c 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -16,6 +16,11 @@ public class ChiselGraphInstance : MonoBehaviour CSGTree tree; + void Start() + { + CreateTree(); + } + void CreateTree() { tree = CSGTree.Create(GetInstanceID()); @@ -24,6 +29,9 @@ void CreateTree() var box = new ChiselBoxDefinition(); BrushMeshFactory.GenerateBox(ref brushContainer, ref box); + + Debug.Log(brushContainer.brushMeshes.Length); + brush.BrushMesh = BrushMeshInstance.Create(brushContainer.brushMeshes[0]); tree.Add(brush); } From 2cbf7c9a607aaca38808c921273fd51e05c83e97 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Tue, 19 Jan 2021 22:30:06 +0800 Subject: [PATCH 07/26] First working cube --- Assets/ChiselNodes/NodeTest.unity | 782 +++++++++++------- .../Chisel/Core/API.public/CSGManager.cs | 3 +- .../com.chisel.node/Chisel/ChiselGraph.cs | 5 + .../Chisel/ChiselGraphInstance.cs | 47 +- .../Editor/ChiselGraphInstanceEditor.cs | 12 + 5 files changed, 525 insertions(+), 324 deletions(-) diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index 89e05af50..6f81fd8b9 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -246,7 +246,7 @@ MeshRenderer: m_Enabled: 0 m_CastShadows: 3 m_ReceiveShadows: 0 - m_DynamicOccludee: 1 + m_DynamicOccludee: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -285,170 +285,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 33383802} m_Mesh: {fileID: 1777405532} ---- !u!43 &34038324 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: "\u2039[generated-Collider]\u203A" - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 180 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 96 - localAABB: - m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 96 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 5c8f023f0000003f0d711cbf3d0a47400000003fe61dc73e3d0a47400000003f0d711cbf5c8f023f0000003fe61dc73eb81e7540d066153e6a2bf6beb81e75404ca65abfda8abdbfb81e7540d066153eda8abdbfb81e75404ca65abf6a2bf6bea4709d3fd066153eda8abdbfa4709d3f000000bf0d711cbfa4709d3fd066153e0d711cbfa4709d3f4ca65abfda8abdbfa4709d3f4ca65abf6a2bf6bea4709d3f000000bf6a2bf6bea4709d3f4ca65abf6a2bf6beb81e75404ca65abfda8abdbfb81e75404ca65abf6a2bf6bea4709d3f4ca65abfda8abdbfa4709d3fd066153eda8abdbf3d0a4740d066153e0d711cbfb81e7540d066153eda8abdbfb81e7540d066153e6a2bf6be3d0a4740d066153e6a2bf6bea4709d3fd066153e0d711cbfec51b83fd066153ee09c893fae4781404ca65abfe09c893fae478140d066153ee09c893fec51b83f4ca65abfe09c893fec51b83f4ca65abf08ce993d3d0a4740000000bf0ace993dae4781404ca65abf08ce993dae478140d066153e08ce993d3d0a4740d066153e0ace993dec51b83f000000bf0ace993dae478140d066153ee09c893fae4781404ca65abf08ce993dae478140d066153e08ce993dae4781404ca65abfe09c893fec51b83f000000bfe61dc73eec51b83f000000bf0ace993dec51b83f4ca65abf08ce993dec51b83f4ca65abfe09c893fec51b83fd066153ee09c893fec51b83fd066153ee61dc73eec51b83f4ca65abfe09c893fae4781404ca65abf08ce993dae4781404ca65abfe09c893fec51b83f4ca65abf08ce993d3d0a4740d066153ee61dc73eec51b83fd066153ee61dc73eec51b83fd066153ee09c893fae478140d066153ee09c893fae478140d066153e08ce993d3d0a4740d066153e0ace993d5c8f023f0000003fe61dc73eec51b83fd066153ee61dc73e3d0a47400000003fe61dc73e3d0a4740d066153ee61dc73e5c8f023f000000bfe61dc73eec51b83f000000bfe61dc73e5c8f023f000000bf0d711cbfa4709d3fd066153e0d711cbfa4709d3f000000bf0d711cbf5c8f023f0000003f0d711cbf3d0a47400000003f0d711cbf3d0a4740d066153e0d711cbf3d0a47400000003fe61dc73e3d0a4740d066153e0ace993d3d0a47400000003f0d711cbf3d0a4740d066153e6a2bf6be3d0a4740d066153e0d711cbf3d0a4740000000bf6a2bf6be3d0a4740000000bf0ace993d3d0a4740d066153ee61dc73e5c8f023f0000003f0d711cbf5c8f023f000000bfe61dc73e5c8f023f0000003fe61dc73e5c8f023f000000bf0d711cbf5c8f023f000000bfe61dc73eec51b83f000000bf0ace993dec51b83f000000bfe61dc73ea4709d3f000000bf6a2bf6be3d0a4740000000bf6a2bf6be3d0a4740000000bf0ace993d5c8f023f000000bf0d711cbfa4709d3f000000bf0d711cbfa4709d3f4ca65abfda8abdbfb81e7540d066153eda8abdbfb81e75404ca65abfda8abdbfa4709d3fd066153eda8abdbf3d0a4740000000bf6a2bf6bea4709d3f000000bf6a2bf6bea4709d3f4ca65abf6a2bf6beb81e75404ca65abf6a2bf6beb81e7540d066153e6a2bf6be3d0a4740d066153e6a2bf6be - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!43 &69493321 Mesh: m_ObjectHideFlags: 0 @@ -767,49 +603,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &166783097 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 166783099} - - component: {fileID: 166783098} - m_Layer: 0 - m_Name: Test - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &166783098 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 166783097} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 96a015f314869d9429110036c3241d1c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &166783099 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 166783097} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &283560757 GameObject: m_ObjectHideFlags: 8 @@ -852,7 +645,7 @@ MeshRenderer: m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 1 - m_DynamicOccludee: 1 + m_DynamicOccludee: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1283,7 +1076,7 @@ MeshRenderer: m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 - m_DynamicOccludee: 1 + m_DynamicOccludee: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1415,6 +1208,8 @@ GameObject: m_Component: - component: {fileID: 479267784} - component: {fileID: 479267783} + - component: {fileID: 479267786} + - component: {fileID: 479267785} m_Layer: 0 m_Name: ChiselGraphInstance m_TagString: Untagged @@ -1435,8 +1230,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} - meshFilter: {fileID: 0} - meshRenderer: {fileID: 0} + meshFilter: {fileID: 479267786} + meshRenderer: {fileID: 479267785} --- !u!4 &479267784 Transform: m_ObjectHideFlags: 0 @@ -1451,6 +1246,55 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &479267785 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479267782} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &479267786 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479267782} + m_Mesh: {fileID: 1330330518} --- !u!1 &650786225 GameObject: m_ObjectHideFlags: 24 @@ -1683,7 +1527,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &763721118 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1730,8 +1574,8 @@ MonoBehaviour: generatedDataContainer: {fileID: 352119801} colliderContainer: {fileID: 1658714170} colliders: - - surfaceParameter: 3198 - sharedMesh: {fileID: 34038324} + - surfaceParameter: 3200 + sharedMesh: {fileID: 1036007948} meshCollider: {fileID: 1658714172} physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} geometryHashValue: 0 @@ -1922,7 +1766,7 @@ MonoBehaviour: - {fileID: 1703547413} - {fileID: 1703547413} visibilityState: 1 - needVisibilityMeshUpdate: 0 + needVisibilityMeshUpdate: 1 --- !u!4 &763721119 Transform: m_ObjectHideFlags: 0 @@ -1967,28 +1811,273 @@ Mesh: m_IndexBuffer: m_VertexData: serializedVersion: 3 - m_VertexCount: 0 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &962769117 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 962769118} + - component: {fileID: 962769120} + - component: {fileID: 962769119} + m_Layer: 0 + m_Name: "\u2039[generated-Renderable|CastShadows]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &962769118 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962769117} + 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_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &962769119 +MeshRenderer: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962769117} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 2 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &962769120 +MeshFilter: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 962769117} + m_Mesh: {fileID: 358445131} +--- !u!43 &1036007948 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[generated-Collider]\u203A" + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 180 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 96 + localAABB: + m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 96 m_Channels: - stream: 0 offset: 0 format: 0 dimension: 3 - stream: 0 - offset: 12 + offset: 0 format: 0 - dimension: 3 + dimension: 0 - stream: 0 - offset: 24 + offset: 0 format: 0 - dimension: 4 + dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 - offset: 40 + offset: 0 format: 0 - dimension: 2 + dimension: 0 - stream: 0 offset: 0 format: 0 @@ -2025,8 +2114,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 0 - _typelessdata: + m_DataSize: 1152 + _typelessdata: 5c8f023f0000003f0d711cbf3d0a47400000003fe61dc73e3d0a47400000003f0d711cbf5c8f023f0000003fe61dc73eb81e7540d066153e6a2bf6beb81e75404ca65abfda8abdbfb81e7540d066153eda8abdbfb81e75404ca65abf6a2bf6bea4709d3fd066153eda8abdbfa4709d3f000000bf0d711cbfa4709d3fd066153e0d711cbfa4709d3f4ca65abfda8abdbfa4709d3f4ca65abf6a2bf6bea4709d3f000000bf6a2bf6bea4709d3f4ca65abf6a2bf6beb81e75404ca65abfda8abdbfb81e75404ca65abf6a2bf6bea4709d3f4ca65abfda8abdbfa4709d3fd066153eda8abdbf3d0a4740d066153e0d711cbfb81e7540d066153eda8abdbfb81e7540d066153e6a2bf6be3d0a4740d066153e6a2bf6bea4709d3fd066153e0d711cbfec51b83fd066153ee09c893fae4781404ca65abfe09c893fae478140d066153ee09c893fec51b83f4ca65abfe09c893fec51b83f4ca65abf08ce993d3d0a4740000000bf0ace993dae4781404ca65abf08ce993dae478140d066153e08ce993d3d0a4740d066153e0ace993dec51b83f000000bf0ace993dae478140d066153ee09c893fae4781404ca65abf08ce993dae478140d066153e08ce993dae4781404ca65abfe09c893fec51b83f000000bfe61dc73eec51b83f000000bf0ace993dec51b83f4ca65abf08ce993dec51b83f4ca65abfe09c893fec51b83fd066153ee09c893fec51b83fd066153ee61dc73eec51b83f4ca65abfe09c893fae4781404ca65abf08ce993dae4781404ca65abfe09c893fec51b83f4ca65abf08ce993d3d0a4740d066153ee61dc73eec51b83fd066153ee61dc73eec51b83fd066153ee09c893fae478140d066153ee09c893fae478140d066153e08ce993d3d0a4740d066153e0ace993d5c8f023f0000003fe61dc73eec51b83fd066153ee61dc73e3d0a47400000003fe61dc73e3d0a4740d066153ee61dc73e5c8f023f000000bfe61dc73eec51b83f000000bfe61dc73e5c8f023f000000bf0d711cbfa4709d3fd066153e0d711cbfa4709d3f000000bf0d711cbf5c8f023f0000003f0d711cbf3d0a47400000003f0d711cbf3d0a4740d066153e0d711cbf3d0a47400000003fe61dc73e3d0a4740d066153e0ace993d3d0a47400000003f0d711cbf3d0a4740d066153e6a2bf6be3d0a4740d066153e0d711cbf3d0a4740000000bf6a2bf6be3d0a4740000000bf0ace993d3d0a4740d066153ee61dc73e5c8f023f0000003f0d711cbf5c8f023f000000bfe61dc73e5c8f023f0000003fe61dc73e5c8f023f000000bf0d711cbf5c8f023f000000bfe61dc73eec51b83f000000bf0ace993dec51b83f000000bfe61dc73ea4709d3f000000bf6a2bf6be3d0a4740000000bf6a2bf6be3d0a4740000000bf0ace993d5c8f023f000000bf0d711cbfa4709d3f000000bf0d711cbfa4709d3f4ca65abfda8abdbfb81e7540d066153eda8abdbfb81e75404ca65abfda8abdbfa4709d3fd066153eda8abdbf3d0a4740000000bf6a2bf6bea4709d3f000000bf6a2bf6bea4709d3f4ca65abf6a2bf6beb81e75404ca65abf6a2bf6beb81e7540d066153e6a2bf6be3d0a4740d066153e6a2bf6be m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -2080,8 +2169,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} + m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -2093,87 +2182,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &962769117 -GameObject: - m_ObjectHideFlags: 8 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 962769118} - - component: {fileID: 962769120} - - component: {fileID: 962769119} - m_Layer: 0 - m_Name: "\u2039[generated-Renderable|CastShadows]\u203A" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &962769118 -Transform: - m_ObjectHideFlags: 8 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 962769117} - 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_Children: [] - m_Father: {fileID: 352119802} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &962769119 -MeshRenderer: - m_ObjectHideFlags: 8 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 962769117} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 4294967295 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 2 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &962769120 -MeshFilter: - m_ObjectHideFlags: 8 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 962769117} - m_Mesh: {fileID: 358445131} --- !u!1 &1116557894 GameObject: m_ObjectHideFlags: 24 @@ -2366,6 +2374,160 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1330330518 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: [] + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1357061025 GameObject: m_ObjectHideFlags: 0 @@ -3597,7 +3759,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 34038324} + m_Mesh: {fileID: 1036007948} --- !u!1 &1703547411 GameObject: m_ObjectHideFlags: 24 @@ -4539,7 +4701,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 - m_DynamicOccludee: 1 + m_DynamicOccludee: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Packages/com.chisel.core/Chisel/Core/API.public/CSGManager.cs b/Packages/com.chisel.core/Chisel/Core/API.public/CSGManager.cs index c07689460..1a56df2dd 100644 --- a/Packages/com.chisel.core/Chisel/Core/API.public/CSGManager.cs +++ b/Packages/com.chisel.core/Chisel/Core/API.public/CSGManager.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Unity.Collections; using Unity.Jobs; +using UnityEngine; namespace Chisel.Core { @@ -20,7 +21,7 @@ public static partial class CSGManager /// Updates all pending changes to all s. /// True if any s have been updated, false if no changes have been found. - public static bool Flush (FinishMeshUpdate finishMeshUpdates) { if (!UpdateAllTreeMeshes(finishMeshUpdates, out JobHandle handle)) return false; handle.Complete(); return true; } + public static bool Flush (FinishMeshUpdate finishMeshUpdates) { if (!UpdateAllTreeMeshes(finishMeshUpdates, out JobHandle handle)) return false; handle.Complete(); return true; } /// Destroy all s contained in . diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.node/Chisel/ChiselGraph.cs index 34750c30e..356596572 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs @@ -8,5 +8,10 @@ public class ChiselGraph : NodeGraph { public ChiselGraphNode active; public ChiselGraphInstance instance; + + public void SetActiveNode(ChiselGraphNode node) + { + + } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs index 2a7289b4c..508aa9be3 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -15,25 +15,29 @@ public class ChiselGraphInstance : MonoBehaviour public MeshRenderer meshRenderer; CSGTree tree; + List meshes; void Start() { + meshes = new List(); CreateTree(); } - void CreateTree() + public void CreateTree() { tree = CSGTree.Create(GetInstanceID()); - var brush = new CSGTreeBrush(); - var brushContainer = new ChiselBrushContainer(); var box = new ChiselBoxDefinition(); + box.min = -Vector3.one; + box.max = Vector3.one; + var brushContainer = new ChiselBrushContainer(); BrushMeshFactory.GenerateBox(ref brushContainer, ref box); - Debug.Log(brushContainer.brushMeshes.Length); - - brush.BrushMesh = BrushMeshInstance.Create(brushContainer.brushMeshes[0]); + var instance = BrushMeshInstance.Create(brushContainer.brushMeshes[0]); + var brush = CSGTreeBrush.Create(0, instance); tree.Add(brush); + + UpdateMesh(); } void UpdateMesh() @@ -41,8 +45,6 @@ void UpdateMesh() CSGManager.Flush(finishMeshUpdates); } - List foundMeshes = new List(); - int finishMeshUpdates(CSGTree tree, ref VertexBufferContents vertexBufferContents, Mesh.MeshDataArray meshDataArray, @@ -51,14 +53,33 @@ int finishMeshUpdates(CSGTree tree, NativeList renderMeshes, JobHandle dependencies) { - meshFilter = gameObject.AddComponent(); - meshRenderer = gameObject.AddComponent(); + print(meshDataArray.Length); + meshes = new List(); + for (int i = 0; i < meshDataArray.Length; i++) + { + var mesh = new Mesh(); + meshes.Add(mesh); + } + Mesh.ApplyAndDisposeWritableMeshData(meshDataArray, meshes); - var foundMeshCount = foundMeshes.Count; - foundMeshes.Clear(); - return foundMeshCount; + for (int i = 0; i < meshDataArray.Length; i++) + { + var mesh = meshes[i]; + mesh.RecalculateNormals(); + mesh.RecalculateBounds(); + } + + meshFilter.mesh = meshes[1]; + + return 1; + } + + public void Rebuild() + { + CSGManager.Clear(); + ChiselBrushMaterialManager.Reset(); } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs index 820a639fb..260c2bdc7 100644 --- a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs @@ -18,6 +18,18 @@ public override void OnInspectorGUI() NodeEditorWindow.Open(instance.graph); } + + if (GUILayout.Button("Create Tree", GUI.skin.GetStyle("button"))) + { + var instance = target as ChiselGraphInstance; + instance.CreateTree(); + } + + if (GUILayout.Button("Rebuild", GUI.skin.GetStyle("button"))) + { + var instance = target as ChiselGraphInstance; + instance.Rebuild(); + } } } } \ No newline at end of file From 031360086b71f0917098cf72c3020e1d37f43431 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Tue, 19 Jan 2021 23:57:16 +0800 Subject: [PATCH 08/26] Implemented BoxNode --- Assets/ChiselNodes/New Chisel Graph.asset | 89 +++-- Assets/ChiselNodes/NodeTest.unity | 323 +++++++++--------- .../com.chisel.node/Chisel/ChiselGraph.cs | 12 + .../Chisel/ChiselGraphInstance.cs | 53 ++- .../Editor/ChiselGraphInstanceEditor.cs | 2 +- .../com.chisel.node/Chisel/Nodes/BoxNode.cs | 28 +- .../Chisel/Nodes/ChiselGraphNode.cs | 39 +-- .../Chisel/Nodes/CompositeNode.cs | 28 +- 8 files changed, 304 insertions(+), 270 deletions(-) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index b9c1ee66a..5631fa4ac 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -22,11 +22,11 @@ MonoBehaviour: values: - _fieldName: child _node: {fileID: -5955115620694431845} - _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSGTree, ChiselNode, Version=0.0.0.0, + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: - fieldName: parent - node: {fileID: -2987355259691116483} + node: {fileID: 0} reroutePoints: [] _direction: 0 _connectionType: 0 @@ -34,7 +34,7 @@ MonoBehaviour: _dynamic: 0 - _fieldName: child2 _node: {fileID: -5955115620694431845} - _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSGTree, ChiselNode, Version=0.0.0.0, + _typeQualifiedName: Chisel.Nodes.ChiselGraph, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: [] _direction: 0 @@ -43,14 +43,33 @@ MonoBehaviour: _dynamic: 0 - _fieldName: parent _node: {fileID: -5955115620694431845} - _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSGTree, ChiselNode, Version=0.0.0.0, + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: [] _direction: 1 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 ---- !u!114 &-2987355259691116483 + child: {} + parent: {} + child2: {fileID: 0} +--- !u!114 &11400000 +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: 1719bdb460489264dbc2eda6f3845f03, type: 3} + m_Name: New Chisel Graph + m_EditorClassIdentifier: + nodes: + - {fileID: 3873916941957806223} + active: {fileID: 3873916941957806223} + instance: {fileID: 0} +--- !u!114 &3873916941957806223 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -63,47 +82,49 @@ MonoBehaviour: m_Name: Box m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -280, y: -136} + position: {x: -264, y: 88} ports: keys: - - parent + - center + - size - child + - parent values: - - _fieldName: parent - _node: {fileID: -2987355259691116483} - _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSGTree, ChiselNode, Version=0.0.0.0, + - _fieldName: center + _node: {fileID: 3873916941957806223} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: - - fieldName: child - node: {fileID: -5955115620694431845} - reroutePoints: [] - _direction: 1 + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: size + _node: {fileID: 3873916941957806223} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - _fieldName: child - _node: {fileID: -2987355259691116483} - _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSGTree, ChiselNode, Version=0.0.0.0, + _node: {fileID: 3873916941957806223} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: [] _direction: 0 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 ---- !u!114 &11400000 -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: 1719bdb460489264dbc2eda6f3845f03, type: 3} - m_Name: New Chisel Graph - m_EditorClassIdentifier: - nodes: - - {fileID: -2987355259691116483} - - {fileID: -5955115620694431845} - active: {fileID: 0} - instance: {fileID: 0} + - _fieldName: parent + _node: {fileID: 3873916941957806223} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + center: {x: -0.51, y: 0, z: -0.73} + size: {x: 4.14, y: 2.86, z: 3.25} diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index 6f81fd8b9..7c7753aa2 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -603,6 +603,170 @@ Mesh: offset: 0 size: 0 path: +--- !u!43 &235143458 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: -0.51, y: 0, z: -0.73} + m_Extent: {x: 2.07, y: 1.43, z: 1.625} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001200000013000000140000001500000016000000140000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: b81e25c03d0ab73f52b816c0000000000000803f00000000000080bf0000000000000000000080bfb81e454052b8364014aec73f3d0ab73fb81e653f000000000000803f00000000000080bf0000000000000000000080bf14ae87bf703dcabe14aec73f3d0ab73f52b816c0000000000000803f00000000000080bf0000000000000000000080bf14ae87bf52b83640b81e25c03d0ab73fb81e653f000000000000803f00000000000080bf0000000000000000000080bfb81e4540703dcabeb81e25c03d0ab7bfb81e653f00000000000080bf000000000000803f0000000000000000000080bfb81e05c0703dcabe14aec73f3d0ab7bf52b816c000000000000080bf000000000000803f0000000000000000000080bf0ad7034052b8364014aec73f3d0ab7bfb81e653f00000000000080bf000000000000803f0000000000000000000080bf0ad70340703dcabeb81e25c03d0ab7bf52b816c000000000000080bf000000000000803f0000000000000000000080bfb81e05c052b83640b81e25c03d0ab73f52b816c0000080bf00000000000000000000000000000000000080bf000080bf52b836403d0af73fb81e25c03d0ab7bfb81e653f000080bf00000000000000000000000000000000000080bf000080bf703dcabe7a146ebfb81e25c03d0ab73fb81e653f000080bf00000000000000000000000000000000000080bf000080bf703dcabe3d0af73fb81e25c03d0ab7bf52b816c0000080bf00000000000000000000000000000000000080bf000080bf52b836407a146ebf14aec73f3d0ab73fb81e653f0000803f000000000000000000000000000000000000803f000080bf5c8fb23f3d0af73f14aec73f3d0ab7bf52b816c00000803f000000000000000000000000000000000000803f000080bfa470edbf7a146ebf14aec73f3d0ab73f52b816c00000803f000000000000000000000080000000000000803f000080bfa470edbf3d0af73f14aec73f3d0ab7bfb81e653f0000803f000000000000000000000000000000000000803f000080bf5c8fb23f7a146ebf14aec73f3d0ab7bf52b816c00000000000000000000080bf0000803f0000000000000000000080bf0ad703407a146ebfb81e25c03d0ab7bf52b816c00000000000000000000080bf0000803f0000000000000000000080bfb81e05c07a146ebfb81e25c03d0ab73f52b816c00000000000000000000080bf0000803f0000000000000000000080bfb81e05c03d0af73f14aec73f3d0ab73f52b816c00000000000000000000080bf0000803f0000000000000000000080bf0ad703403d0af73f14aec73f3d0ab73fb81e653f00000000000000000000803f000080bf0000000000000000000080bf14ae87bf3d0af73fb81e25c03d0ab73fb81e653f00000000000000000000803f000080bf0000000000000000000080bfb81e45403d0af73fb81e25c03d0ab7bfb81e653f00000000000000000000803f000080bf0000000000000000000080bfb81e45407a146ebf14aec73f3d0ab7bfb81e653f00000000000000000000803f000080bf0000000000000000000080bf14ae87bf7a146ebf + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: -0.51, y: 0, z: -0.73} + m_Extent: {x: 2.07, y: 1.43, z: 1.625} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &283560757 GameObject: m_ObjectHideFlags: 8 @@ -1232,6 +1396,7 @@ MonoBehaviour: graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} meshFilter: {fileID: 479267786} meshRenderer: {fileID: 479267785} + isDirty: 0 --- !u!4 &479267784 Transform: m_ObjectHideFlags: 0 @@ -1240,7 +1405,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 479267782} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.055} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1294,7 +1459,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 479267782} - m_Mesh: {fileID: 1330330518} + m_Mesh: {fileID: 235143458} --- !u!1 &650786225 GameObject: m_ObjectHideFlags: 24 @@ -2374,160 +2539,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &1330330518 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: [] - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: - m_VertexData: - serializedVersion: 3 - m_VertexCount: 0 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 0 - _typelessdata: - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1357061025 GameObject: m_ObjectHideFlags: 0 diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.node/Chisel/ChiselGraph.cs index 356596572..8fbb71b27 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs @@ -1,3 +1,4 @@ +using Chisel.Core; using UnityEngine; using XNode; @@ -11,7 +12,18 @@ public class ChiselGraph : NodeGraph public void SetActiveNode(ChiselGraphNode node) { + UpdateCSG(); + } + public void UpdateCSG() + { + if (instance != null) + instance.isDirty = true; + } + + public void CollectTreeNode(CSGTree tree) + { + tree.Add(active.GetNode()); } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs index 508aa9be3..a76ebc184 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -1,6 +1,4 @@ using Chisel.Core; -using System; -using System.Collections; using System.Collections.Generic; using Unity.Collections; using Unity.Jobs; @@ -8,11 +6,13 @@ namespace Chisel.Nodes { + [ExecuteInEditMode] public class ChiselGraphInstance : MonoBehaviour { public ChiselGraph graph; public MeshFilter meshFilter; public MeshRenderer meshRenderer; + public bool isDirty; CSGTree tree; List meshes; @@ -20,28 +20,23 @@ public class ChiselGraphInstance : MonoBehaviour void Start() { meshes = new List(); - CreateTree(); + UpdateCSG(); } - public void CreateTree() + void Update() { - tree = CSGTree.Create(GetInstanceID()); - var box = new ChiselBoxDefinition(); - box.min = -Vector3.one; - box.max = Vector3.one; - - var brushContainer = new ChiselBrushContainer(); - BrushMeshFactory.GenerateBox(ref brushContainer, ref box); - - var instance = BrushMeshInstance.Create(brushContainer.brushMeshes[0]); - var brush = CSGTreeBrush.Create(0, instance); - tree.Add(brush); - - UpdateMesh(); + if (isDirty) + UpdateCSG(); } - void UpdateMesh() + public void UpdateCSG() { + isDirty = false; + if (!tree.Valid) + tree = CSGTree.Create(GetInstanceID()); + else + tree.Clear(); + graph.CollectTreeNode(tree); CSGManager.Flush(finishMeshUpdates); } @@ -53,24 +48,20 @@ int finishMeshUpdates(CSGTree tree, NativeList renderMeshes, JobHandle dependencies) { + dependencies.Complete(); - print(meshDataArray.Length); - - meshes = new List(); - for (int i = 0; i < meshDataArray.Length; i++) + if (meshes == null || meshes.Count != meshDataArray.Length) { - var mesh = new Mesh(); - meshes.Add(mesh); + Debug.Log("new mesh"); + meshes = new List(); + for (int i = 0; i < meshDataArray.Length; i++) + meshes.Add(new Mesh()); } - Mesh.ApplyAndDisposeWritableMeshData(meshDataArray, meshes); - for (int i = 0; i < meshDataArray.Length; i++) - { - var mesh = meshes[i]; - mesh.RecalculateNormals(); - mesh.RecalculateBounds(); - } + Mesh.ApplyAndDisposeWritableMeshData(meshDataArray, meshes); + meshes[0].RecalculateNormals(); + meshes[1].RecalculateBounds(); meshFilter.mesh = meshes[1]; return 1; diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs index 260c2bdc7..de3ab5c48 100644 --- a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs @@ -22,7 +22,7 @@ public override void OnInspectorGUI() if (GUILayout.Button("Create Tree", GUI.skin.GetStyle("button"))) { var instance = target as ChiselGraphInstance; - instance.CreateTree(); + instance.UpdateCSG(); } if (GUILayout.Button("Rebuild", GUI.skin.GetStyle("button"))) diff --git a/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs index 6970253ca..da9216199 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs @@ -1,14 +1,34 @@ -using System.Collections; -using System.Collections.Generic; +using Chisel.Core; using UnityEngine; namespace Chisel.Nodes { public class BoxNode : ChiselGraphNode { - protected override void Generate() + [Input] public Vector3 center; + [Input] public Vector3 size = Vector3.one; + + CSGTreeNode treeNode; + + public override CSGTreeNode GetNode() + { + var box = new ChiselBoxDefinition(); + box.center = center; + box.size = size; + + var brushContainer = new ChiselBrushContainer(); + BrushMeshFactory.GenerateBox(ref brushContainer, ref box); + + var instance = BrushMeshInstance.Create(brushContainer.brushMeshes[0]); + treeNode = CSGTreeBrush.Create(0, instance); + + return treeNode; + } + + void OnValidate() { - Debug.Log("generate box"); + treeNode.SetDirty(); + chiselGraph.UpdateCSG(); } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs index 809df24b4..89eeb8a25 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs @@ -1,53 +1,32 @@ using System; using UnityEngine; using XNode; +using Chisel.Core; namespace Chisel.Nodes { public abstract class ChiselGraphNode : Node { - [Input] public CSGTree child; - [Output] public CSGTree parent; + [Input] public CSG child; + [Output] public CSG parent; public Action onStateChange; + public ChiselGraph chiselGraph => graph as ChiselGraph; public void SetActive() { - var chiselGraph = graph as ChiselGraph; + var chiselGraph = graph as Nodes.ChiselGraph; chiselGraph.active = this; } - protected abstract void Generate(); + public abstract CSGTreeNode GetNode(); - public override void OnCreateConnection(NodePort from, NodePort to) + void OnValidate() { - Generate(); + chiselGraph.UpdateCSG(); } [Serializable] - public class CSGTree { } - } - - public abstract class ChiselGraphGeneratorNode : Node - { - [Output] public CSGTree parent; - - public Action onStateChange; - - public void SetActive() - { - var chiselGraph = graph as ChiselGraph; - //chiselGraph.active = this; - } - - protected abstract void Generate(); - - public override void OnCreateConnection(NodePort from, NodePort to) - { - Generate(); - } - - [Serializable] - public class CSGTree { } + public class CSG { } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs b/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs index 3aa665d17..79d58da04 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs @@ -1,16 +1,16 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +//using System.Collections; +//using System.Collections.Generic; +//using UnityEngine; -namespace Chisel.Nodes -{ - public class CompositeNode : ChiselGraphNode - { - [Input] public CSGTree child2; +//namespace Chisel.Nodes +//{ +// public class CompositeNode : ChiselGraphNode +// { +// [Input] public ChiselGraph child2; - protected override void Generate() - { - Debug.Log("generate box"); - } - } -} \ No newline at end of file +// public override CSGTreeNode GetNode() +// { +// Debug.Log("generate box"); +// } +// } +//} \ No newline at end of file From 5dc4fe73aba2301b7c09fd79e851dc113871929a Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Wed, 20 Jan 2021 00:22:31 +0800 Subject: [PATCH 09/26] Implemented CSG operation --- Assets/ChiselNodes/New Chisel Graph.asset | 82 ++++- Assets/ChiselNodes/NodeTest.unity | 330 +++++++++--------- .../com.chisel.node/Chisel/ChiselGraph.cs | 5 +- .../Chisel/ChiselGraphInstance.cs | 6 +- .../com.chisel.node/Chisel/Nodes/BoxNode.cs | 5 +- .../Chisel/Nodes/ChiselGraphNode.cs | 26 +- 6 files changed, 273 insertions(+), 181 deletions(-) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 5631fa4ac..94df4ecde 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -53,6 +53,69 @@ MonoBehaviour: child: {} parent: {} child2: {fileID: 0} +--- !u!114 &-3665420030514838893 +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: d678cf2bf10f3bf4f8d68ae693a7a7a3, type: 3} + m_Name: Box + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: 88, y: 216} + ports: + keys: + - center + - size + - children + - parent + values: + - _fieldName: center + _node: {fileID: -3665420030514838893} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: size + _node: {fileID: -3665420030514838893} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: children + _node: {fileID: -3665420030514838893} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: parent + node: {fileID: 3873916941957806223} + reroutePoints: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: parent + _node: {fileID: -3665420030514838893} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + operation: 1 + center: {x: 0, y: 0.25, z: 0} + size: {x: 1.33, y: 0.52, z: 1} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -67,7 +130,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodes: - {fileID: 3873916941957806223} - active: {fileID: 3873916941957806223} + - {fileID: -3665420030514838893} + active: {fileID: -3665420030514838893} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: @@ -82,12 +146,12 @@ MonoBehaviour: m_Name: Box m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -264, y: 88} + position: {x: -296, y: 88} ports: keys: - center - size - - child + - children - parent values: - _fieldName: center @@ -108,7 +172,7 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: child + - _fieldName: children _node: {fileID: 3873916941957806223} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -121,10 +185,14 @@ MonoBehaviour: _node: {fileID: 3873916941957806223} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: [] + connections: + - fieldName: children + node: {fileID: -3665420030514838893} + reroutePoints: [] _direction: 1 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - center: {x: -0.51, y: 0, z: -0.73} - size: {x: 4.14, y: 2.86, z: 3.25} + operation: 0 + center: {x: 0, y: 0, z: 0} + size: {x: 2, y: 0.5, z: 2} diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index 7c7753aa2..36e2ae0f9 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -603,170 +603,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!43 &235143458 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: -0.51, y: 0, z: -0.73} - m_Extent: {x: 2.07, y: 1.43, z: 1.625} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001200000013000000140000001500000016000000140000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: b81e25c03d0ab73f52b816c0000000000000803f00000000000080bf0000000000000000000080bfb81e454052b8364014aec73f3d0ab73fb81e653f000000000000803f00000000000080bf0000000000000000000080bf14ae87bf703dcabe14aec73f3d0ab73f52b816c0000000000000803f00000000000080bf0000000000000000000080bf14ae87bf52b83640b81e25c03d0ab73fb81e653f000000000000803f00000000000080bf0000000000000000000080bfb81e4540703dcabeb81e25c03d0ab7bfb81e653f00000000000080bf000000000000803f0000000000000000000080bfb81e05c0703dcabe14aec73f3d0ab7bf52b816c000000000000080bf000000000000803f0000000000000000000080bf0ad7034052b8364014aec73f3d0ab7bfb81e653f00000000000080bf000000000000803f0000000000000000000080bf0ad70340703dcabeb81e25c03d0ab7bf52b816c000000000000080bf000000000000803f0000000000000000000080bfb81e05c052b83640b81e25c03d0ab73f52b816c0000080bf00000000000000000000000000000000000080bf000080bf52b836403d0af73fb81e25c03d0ab7bfb81e653f000080bf00000000000000000000000000000000000080bf000080bf703dcabe7a146ebfb81e25c03d0ab73fb81e653f000080bf00000000000000000000000000000000000080bf000080bf703dcabe3d0af73fb81e25c03d0ab7bf52b816c0000080bf00000000000000000000000000000000000080bf000080bf52b836407a146ebf14aec73f3d0ab73fb81e653f0000803f000000000000000000000000000000000000803f000080bf5c8fb23f3d0af73f14aec73f3d0ab7bf52b816c00000803f000000000000000000000000000000000000803f000080bfa470edbf7a146ebf14aec73f3d0ab73f52b816c00000803f000000000000000000000080000000000000803f000080bfa470edbf3d0af73f14aec73f3d0ab7bfb81e653f0000803f000000000000000000000000000000000000803f000080bf5c8fb23f7a146ebf14aec73f3d0ab7bf52b816c00000000000000000000080bf0000803f0000000000000000000080bf0ad703407a146ebfb81e25c03d0ab7bf52b816c00000000000000000000080bf0000803f0000000000000000000080bfb81e05c07a146ebfb81e25c03d0ab73f52b816c00000000000000000000080bf0000803f0000000000000000000080bfb81e05c03d0af73f14aec73f3d0ab73f52b816c00000000000000000000080bf0000803f0000000000000000000080bf0ad703403d0af73f14aec73f3d0ab73fb81e653f00000000000000000000803f000080bf0000000000000000000080bf14ae87bf3d0af73fb81e25c03d0ab73fb81e653f00000000000000000000803f000080bf0000000000000000000080bfb81e45403d0af73fb81e25c03d0ab7bfb81e653f00000000000000000000803f000080bf0000000000000000000080bfb81e45407a146ebf14aec73f3d0ab7bfb81e653f00000000000000000000803f000080bf0000000000000000000080bf14ae87bf7a146ebf - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: -0.51, y: 0, z: -0.73} - m_Extent: {x: 2.07, y: 1.43, z: 1.625} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &283560757 GameObject: m_ObjectHideFlags: 8 @@ -1459,7 +1295,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 479267782} - m_Mesh: {fileID: 235143458} + m_Mesh: {fileID: 1482171580} --- !u!1 &650786225 GameObject: m_ObjectHideFlags: 24 @@ -3572,6 +3408,170 @@ Mesh: offset: 0 size: 0 path: +--- !u!43 &1482171580 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 84 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 48 + localAABB: + m_Center: {x: -1.06, y: 0.6, z: -0.73} + m_Extent: {x: 4.435, y: 1.005, z: 1.625} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 000000000100000002000000000000000300000001000000040000000500000006000000050000000700000006000000070000000800000006000000070000000900000008000000040000000a000000050000000a0000000b000000050000000c0000000d0000000e0000000c0000000f0000000d0000001000000011000000120000001000000013000000110000001400000015000000160000001400000017000000150000001500000017000000180000001900000015000000180000001a00000019000000180000001a0000001b000000190000001c0000001d0000001e0000001c0000001f0000001d00000020000000210000002200000021000000230000002200000024000000250000002600000025000000270000002600000028000000290000002a0000002b000000280000002a0000002c0000002d0000002e0000002f0000002c0000002e000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 48 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 2304 + _typelessdata: 0ad7afc0a470cd3f52b816c0000000000000803f00000000000080bf0000000000000000000080bf0ad7bf4052b8364000005840a470cd3fb81e653f000000000000803f00000000000080bf0000000000000000000080bf000038c0703dcabe00005840a470cd3f52b816c0000000000000803f00000000000080bf0000000000000000000080bf000038c052b836400ad7afc0a470cd3fb81e653f000000000000803f00000000000080bf0000000000000000000080bf0ad7bf40703dcabe0ad7afc0285ccfbeb81e653f00000000000080bf000000000000803f0000000000000000000080bf0ad79fc0703dcabeae4719c0285ccfbef6283c3f00000000000080bf000000000000803f0000000000000000000080bf5c8ff2bfd8a370be00005840285ccfbeb81e653f00000000000080bf000000000000803f0000000000000000000080bf00007840703dcabe0000b03f285ccfbef6283c3f00000000000080bf000000000000803f0000000000000000000080bf0000f03fd8a370be00005840285ccfbe52b816c000000000000080bf000000000000803f0000000000000000000080bf0000784052b836400000b03f285ccfbe52b816c000000000000080bf000000000000803f0000000000000000000080bf0000f03f52b836400ad7afc0285ccfbe52b816c000000000000080bf000000000000803f0000000000000000000080bf0ad79fc052b83640ae4719c0285ccfbe52b816c000000000000080bf000000000000803f0000000000000000000080bf5c8ff2bf52b836400ad7afc0a470cd3f52b816c0000080bf00000000000000000000000000000000000080bf000080bf52b8364052b806400ad7afc0285ccfbeb81e653f000080bf00000000000000000000000000000000000080bf000080bf703dcabe608fc23d0ad7afc0a470cd3fb81e653f000080bf00000000000000000000000000000000000080bf000080bf703dcabe52b806400ad7afc0285ccfbe52b816c0000080bf00000000000000000000000000000000000080bf000080bf52b83640608fc23d00005840a470cd3fb81e653f0000803f000000000000000000000000000000000000803f000080bf5c8fb23f52b8064000005840285ccfbe52b816c00000803f000000000000000000000000000000000000803f000080bfa470edbf608fc23d00005840a470cd3f52b816c00000803f000000000000000000000080000000000000803f000080bfa470edbf52b8064000005840285ccfbeb81e653f0000803f000000000000000000000000000000000000803f000080bf5c8fb23f608fc23d0ad7afc0285ccfbe52b816c00000000000000000000080bf0000803f0000000000000000000080bf0ad79fc0608fc23dae4719c00000903f52b816c00000000000000000000080bf0000803f0000000000000000000080bf5c8ff2bf0000d03fae4719c0285ccfbe52b816c00000000000000000000080bf0000803f0000000000000000000080bf5c8ff2bf608fc23d0ad7afc0a470cd3f52b816c00000000000000000000080bf0000803f0000000000000000000080bf0ad79fc052b8064000005840a470cd3f52b816c00000000000000000000080bf0000803f0000000000000000000080bf0000784052b806400000b03f0000903f52b816c00000000000000000000080bf0000803f0000000000000000000080bf0000f03f0000d03f00005840285ccfbe52b816c00000000000000000000080bf0000803f0000000000000000000080bf00007840608fc23d0000b03f285ccfbe52b816c00000000000000000000080bf0000803f0000000000000000000080bf0000f03f608fc23d0ad7afc0a470cd3fb81e653f00000000000000000000803f000080bf0000000000000000000080bf0ad7bf4052b8064000005840285ccfbeb81e653f00000000000000000000803f000080bf0000000000000000000080bf000038c0608fc23d00005840a470cd3fb81e653f00000000000000000000803f000080bf0000000000000080000080bf000038c052b806400ad7afc0285ccfbeb81e653f00000000000000000000803f000080bf0000000000000000000080bf0ad7bf40608fc23d0000b03f0000903ff6283c3f00000080000080bf00000080000080bf00000000000000000000803f000060bfd8a370beae4719c00000903ff6283c3f00000080000080bf00000080000080bf00000000000000000000803fae473940d8a370be0000b03f0000903f52b816c000000080000080bf00000080000080bf00000000000000000000803f000060bf52b83640ae4719c00000903f52b816c000000080000080bf00000080000080bf00000000000000000000803fae47394052b83640ae4719c0285ccfbef6283c3f0000803f00000080000000800000000000000000000080bf0000803fd8a370be608fc23dae4719c0285ccfbe52b816c00000803f00000080000000800000000000000000000080bf0000803f52b83640608fc23dae4719c00000903ff6283c3f0000803f00000080000000800000000000000000000080bf0000803fd8a370be0000d03fae4719c00000903f52b816c00000803f00000080000000800000000000000000000080bf0000803f52b836400000d03f0000b03f285ccfbe52b816c0000080bf000000800000008000000000000000000000803f0000803fa470edbf608fc23d0000b03f285ccfbef6283c3f000080bf000000800000008000000000000000000000803f0000803f7b149e3f608fc23d0000b03f0000903ff6283c3f000080bf000000800000008000000000000000000000803f0000803f7b149e3f0000d03f0000b03f0000903f52b816c0000080bf000000800000008000000000000000000000803f0000803fa470edbf0000d03f0000b03f285ccfbef6283c3f0000008000000080000080bf000080bf00000000000000000000803f000060bf608fc23dae4719c0285ccfbef6283c3f0000008000000080000080bf000080bf00000000000000000000803fae473940608fc23dae4719c00000903ff6283c3f0000008000000080000080bf000080bf00000000000000000000803fae4739400000d03f0000b03f0000903ff6283c3f0000008000000080000080bf000080bf00000000000000000000803f000060bf0000d03f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: -1.06, y: 0.6, z: -0.73} + m_Extent: {x: 4.435, y: 1.005, z: 1.625} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!43 &1497873584 Mesh: m_ObjectHideFlags: 0 diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.node/Chisel/ChiselGraph.cs index 8fbb71b27..26a77eb97 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs @@ -12,18 +12,19 @@ public class ChiselGraph : NodeGraph public void SetActiveNode(ChiselGraphNode node) { + active = node; UpdateCSG(); } public void UpdateCSG() { if (instance != null) - instance.isDirty = true; + instance.IsDirty = true; } public void CollectTreeNode(CSGTree tree) { - tree.Add(active.GetNode()); + active.ParseNode(tree); } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs index a76ebc184..9156d73bf 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -12,7 +12,7 @@ public class ChiselGraphInstance : MonoBehaviour public ChiselGraph graph; public MeshFilter meshFilter; public MeshRenderer meshRenderer; - public bool isDirty; + public bool IsDirty { get; set; } CSGTree tree; List meshes; @@ -25,13 +25,13 @@ void Start() void Update() { - if (isDirty) + if (IsDirty) UpdateCSG(); } public void UpdateCSG() { - isDirty = false; + IsDirty = false; if (!tree.Valid) tree = CSGTree.Create(GetInstanceID()); else diff --git a/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs index da9216199..95eb5103b 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs @@ -22,12 +22,15 @@ public override CSGTreeNode GetNode() var instance = BrushMeshInstance.Create(brushContainer.brushMeshes[0]); treeNode = CSGTreeBrush.Create(0, instance); + treeNode.Operation = operation; + return treeNode; } void OnValidate() { - treeNode.SetDirty(); + if (treeNode.Valid) + treeNode.SetDirty(); chiselGraph.UpdateCSG(); } } diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs index 89eeb8a25..7cf30db12 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs @@ -7,20 +7,40 @@ namespace Chisel.Nodes { public abstract class ChiselGraphNode : Node { - [Input] public CSG child; + [Input] public CSG children; [Output] public CSG parent; public Action onStateChange; public ChiselGraph chiselGraph => graph as ChiselGraph; + public CSGOperationType operation = CSGOperationType.Additive; + public void SetActive() { - var chiselGraph = graph as Nodes.ChiselGraph; - chiselGraph.active = this; + chiselGraph.SetActiveNode(this); } public abstract CSGTreeNode GetNode(); + public void ParseNode(CSGTree tree) + { + var childrenPort = GetInputPort("children"); + if (childrenPort.IsConnected) + { + var chiselNode = childrenPort.Connection.node as ChiselGraphNode; + chiselNode.ParseNode(tree); + } + + var node = GetNode(); + node.Operation = operation; + tree.Add(node); + } + + public override object GetValue(NodePort port) + { + return null; + } + void OnValidate() { chiselGraph.UpdateCSG(); From 5da06c91c6778ab845c3045a8a139bbaeec2d823 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Wed, 20 Jan 2021 00:30:25 +0800 Subject: [PATCH 10/26] Cleaned up --- Assets/ChiselNodes/New Chisel Graph.asset | 73 ++++++++++++++++++- Assets/ChiselNodes/NodeTest.unity | 21 +++--- .../Containers/ChiselGeneratedObjects.cs | 2 - .../Chisel/Core/API.public/CSGManager.cs | 1 - .../Chisel/Editor/ChiselGraphNodeEditor.cs | 8 +- 5 files changed, 86 insertions(+), 19 deletions(-) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 94df4ecde..b5a464417 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -108,14 +108,17 @@ MonoBehaviour: _node: {fileID: -3665420030514838893} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: [] + connections: + - fieldName: children + node: {fileID: 6654120812992344769} + reroutePoints: [] _direction: 1 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 operation: 1 center: {x: 0, y: 0.25, z: 0} - size: {x: 1.33, y: 0.52, z: 1} + size: {x: 1.4, y: 0.7, z: 1} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -131,7 +134,8 @@ MonoBehaviour: nodes: - {fileID: 3873916941957806223} - {fileID: -3665420030514838893} - active: {fileID: -3665420030514838893} + - {fileID: 6654120812992344769} + active: {fileID: 6654120812992344769} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: @@ -196,3 +200,66 @@ MonoBehaviour: operation: 0 center: {x: 0, y: 0, z: 0} size: {x: 2, y: 0.5, z: 2} +--- !u!114 &6654120812992344769 +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: d678cf2bf10f3bf4f8d68ae693a7a7a3, type: 3} + m_Name: Box + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: 408, y: 120} + ports: + keys: + - center + - size + - children + - parent + values: + - _fieldName: center + _node: {fileID: 6654120812992344769} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: size + _node: {fileID: 6654120812992344769} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: children + _node: {fileID: 6654120812992344769} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: parent + node: {fileID: -3665420030514838893} + reroutePoints: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: parent + _node: {fileID: 6654120812992344769} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + operation: 0 + center: {x: 0, y: -0.31, z: 0} + size: {x: 0.79, y: 1.02, z: 0.52} diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index 36e2ae0f9..f39d903a8 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -1232,7 +1232,6 @@ MonoBehaviour: graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} meshFilter: {fileID: 479267786} meshRenderer: {fileID: 479267785} - isDirty: 0 --- !u!4 &479267784 Transform: m_ObjectHideFlags: 0 @@ -3419,14 +3418,14 @@ Mesh: m_SubMeshes: - serializedVersion: 2 firstByte: 0 - indexCount: 84 + indexCount: 180 topology: 0 baseVertex: 0 firstVertex: 0 - vertexCount: 48 + vertexCount: 96 localAABB: - m_Center: {x: -1.06, y: 0.6, z: -0.73} - m_Extent: {x: 4.435, y: 1.005, z: 1.625} + m_Center: {x: 0, y: -0.285, z: 0} + m_Extent: {x: 1, y: 0.53499997, z: 1} m_Shapes: vertices: [] shapes: [] @@ -3443,10 +3442,10 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 000000000100000002000000000000000300000001000000040000000500000006000000050000000700000006000000070000000800000006000000070000000900000008000000040000000a000000050000000a0000000b000000050000000c0000000d0000000e0000000c0000000f0000000d0000001000000011000000120000001000000013000000110000001400000015000000160000001400000017000000150000001500000017000000180000001900000015000000180000001a00000019000000180000001a0000001b000000190000001c0000001d0000001e0000001c0000001f0000001d00000020000000210000002200000021000000230000002200000024000000250000002600000025000000270000002600000028000000290000002a0000002b000000280000002a0000002c0000002d0000002e0000002f0000002c0000002e000000 + m_IndexBuffer: 00000000010000000200000001000000030000000200000003000000040000000200000003000000050000000400000005000000060000000400000006000000070000000400000007000000060000000100000000000000070000000100000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d00000010000000110000001200000010000000130000001100000014000000150000001600000014000000170000001500000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001f0000001d00000020000000210000002200000023000000200000002200000024000000250000002600000027000000240000002600000028000000290000002a000000280000002b000000290000002c0000002d0000002e0000002c0000002f0000002d0000003000000031000000320000003300000030000000320000003400000035000000360000003700000034000000360000003700000038000000340000003700000039000000380000003a00000038000000390000003a000000390000003b000000350000003a0000003b000000350000003b000000360000003c0000003d0000003e0000003c0000003f0000003d00000040000000410000004200000040000000430000004100000044000000450000004600000044000000470000004500000048000000490000004a000000480000004b000000490000004c0000004d0000004e0000004d0000004f0000004e0000004f0000004d000000500000004d00000051000000500000005000000051000000520000005300000050000000520000004c00000053000000520000004c0000004e0000005300000054000000550000005600000057000000540000005600000058000000590000005a000000580000005b000000590000005c0000005d0000005e0000005c0000005f0000005d000000 m_VertexData: serializedVersion: 3 - m_VertexCount: 48 + m_VertexCount: 96 m_Channels: - stream: 0 offset: 0 @@ -3504,8 +3503,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 2304 - _typelessdata: 0ad7afc0a470cd3f52b816c0000000000000803f00000000000080bf0000000000000000000080bf0ad7bf4052b8364000005840a470cd3fb81e653f000000000000803f00000000000080bf0000000000000000000080bf000038c0703dcabe00005840a470cd3f52b816c0000000000000803f00000000000080bf0000000000000000000080bf000038c052b836400ad7afc0a470cd3fb81e653f000000000000803f00000000000080bf0000000000000000000080bf0ad7bf40703dcabe0ad7afc0285ccfbeb81e653f00000000000080bf000000000000803f0000000000000000000080bf0ad79fc0703dcabeae4719c0285ccfbef6283c3f00000000000080bf000000000000803f0000000000000000000080bf5c8ff2bfd8a370be00005840285ccfbeb81e653f00000000000080bf000000000000803f0000000000000000000080bf00007840703dcabe0000b03f285ccfbef6283c3f00000000000080bf000000000000803f0000000000000000000080bf0000f03fd8a370be00005840285ccfbe52b816c000000000000080bf000000000000803f0000000000000000000080bf0000784052b836400000b03f285ccfbe52b816c000000000000080bf000000000000803f0000000000000000000080bf0000f03f52b836400ad7afc0285ccfbe52b816c000000000000080bf000000000000803f0000000000000000000080bf0ad79fc052b83640ae4719c0285ccfbe52b816c000000000000080bf000000000000803f0000000000000000000080bf5c8ff2bf52b836400ad7afc0a470cd3f52b816c0000080bf00000000000000000000000000000000000080bf000080bf52b8364052b806400ad7afc0285ccfbeb81e653f000080bf00000000000000000000000000000000000080bf000080bf703dcabe608fc23d0ad7afc0a470cd3fb81e653f000080bf00000000000000000000000000000000000080bf000080bf703dcabe52b806400ad7afc0285ccfbe52b816c0000080bf00000000000000000000000000000000000080bf000080bf52b83640608fc23d00005840a470cd3fb81e653f0000803f000000000000000000000000000000000000803f000080bf5c8fb23f52b8064000005840285ccfbe52b816c00000803f000000000000000000000000000000000000803f000080bfa470edbf608fc23d00005840a470cd3f52b816c00000803f000000000000000000000080000000000000803f000080bfa470edbf52b8064000005840285ccfbeb81e653f0000803f000000000000000000000000000000000000803f000080bf5c8fb23f608fc23d0ad7afc0285ccfbe52b816c00000000000000000000080bf0000803f0000000000000000000080bf0ad79fc0608fc23dae4719c00000903f52b816c00000000000000000000080bf0000803f0000000000000000000080bf5c8ff2bf0000d03fae4719c0285ccfbe52b816c00000000000000000000080bf0000803f0000000000000000000080bf5c8ff2bf608fc23d0ad7afc0a470cd3f52b816c00000000000000000000080bf0000803f0000000000000000000080bf0ad79fc052b8064000005840a470cd3f52b816c00000000000000000000080bf0000803f0000000000000000000080bf0000784052b806400000b03f0000903f52b816c00000000000000000000080bf0000803f0000000000000000000080bf0000f03f0000d03f00005840285ccfbe52b816c00000000000000000000080bf0000803f0000000000000000000080bf00007840608fc23d0000b03f285ccfbe52b816c00000000000000000000080bf0000803f0000000000000000000080bf0000f03f608fc23d0ad7afc0a470cd3fb81e653f00000000000000000000803f000080bf0000000000000000000080bf0ad7bf4052b8064000005840285ccfbeb81e653f00000000000000000000803f000080bf0000000000000000000080bf000038c0608fc23d00005840a470cd3fb81e653f00000000000000000000803f000080bf0000000000000080000080bf000038c052b806400ad7afc0285ccfbeb81e653f00000000000000000000803f000080bf0000000000000000000080bf0ad7bf40608fc23d0000b03f0000903ff6283c3f00000080000080bf00000080000080bf00000000000000000000803f000060bfd8a370beae4719c00000903ff6283c3f00000080000080bf00000080000080bf00000000000000000000803fae473940d8a370be0000b03f0000903f52b816c000000080000080bf00000080000080bf00000000000000000000803f000060bf52b83640ae4719c00000903f52b816c000000080000080bf00000080000080bf00000000000000000000803fae47394052b83640ae4719c0285ccfbef6283c3f0000803f00000080000000800000000000000000000080bf0000803fd8a370be608fc23dae4719c0285ccfbe52b816c00000803f00000080000000800000000000000000000080bf0000803f52b83640608fc23dae4719c00000903ff6283c3f0000803f00000080000000800000000000000000000080bf0000803fd8a370be0000d03fae4719c00000903f52b816c00000803f00000080000000800000000000000000000080bf0000803f52b836400000d03f0000b03f285ccfbe52b816c0000080bf000000800000008000000000000000000000803f0000803fa470edbf608fc23d0000b03f285ccfbef6283c3f000080bf000000800000008000000000000000000000803f0000803f7b149e3f608fc23d0000b03f0000903ff6283c3f000080bf000000800000008000000000000000000000803f0000803f7b149e3f0000d03f0000b03f0000903f52b816c0000080bf000000800000008000000000000000000000803f0000803fa470edbf0000d03f0000b03f285ccfbef6283c3f0000008000000080000080bf000080bf00000000000000000000803f000060bf608fc23dae4719c0285ccfbef6283c3f0000008000000080000080bf000080bf00000000000000000000803fae473940608fc23dae4719c00000903ff6283c3f0000008000000080000080bf000080bf00000000000000000000803fae4739400000d03f0000b03f0000903ff6283c3f0000008000000080000080bf000080bf00000000000000000000803f000060bf0000d03f + m_DataSize: 4608 + _typelessdata: 000080bf0000803e000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f333333bf0000803e000000bf000000000000803f00000000000080bf0000000000000000000080bf9a99993f0000803f0000803f0000803e000080bf000000000000803f00000000000080bf0000008000000000000080bf000000bf0000c03f3333333f0000803e000000bf000000000000803f00000000000080bf0000000000000000000080bfcccc4cbe0000803f0000803f0000803e0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bf3333333f0000803e0000003f000000000000803f00000000000080bf0000000000000000000080bfcccc4cbe00000000333333bf0000803e0000003f000000000000803f00000000000080bf0000000000000000000080bf9a99993f00000000000080bf0000803e0000803f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000bf713dca3e000080beb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f0000803e713dca3e85eb51bfb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753e0ad7a3be713dca3e000080beb81e85be0000803f000000000000000000000080000000000000803f000080bf90c2753e0000803e713dca3e85eb51bfb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f0ad7a3be713dca3ecccc4c3eb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f3333333f713dca3eccccccbdb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753ecdcccc3e713dca3ecccc4c3eb81e85be0000803f000000000000000000000080000000000000803f000080bf90c2753e3333333f713dca3eccccccbdb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423fcdcccc3e713dcabe000080beb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f0000803e713dcabe85eb51bfb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e0ad7a3be713dcabe000080beb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e0000803e713dcabe85eb51bfb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f0ad7a3be713dcabecccc4c3eb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f3333333f713dcabeccccccbdb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753ecdcccc3e713dcabecccc4c3eb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e3333333f713dcabeccccccbdb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423fcdcccc3e713dcabe85eb51bfb81e853e00000000000080bf000000000000803f0000000000000000000080bf3c0ad73d90c2753e713dca3e85eb51bfb81e85be00000000000080bf000000000000803f0000000000000000000080bfb81e653f5c8f423f713dca3e85eb51bfb81e853e00000000000080bf000000000000803f0000000000000000000080bfb81e653f90c2753e713dcabe85eb51bfb81e85be00000000000080bf000000000000803f0000000000000000000080bf3c0ad73d5c8f423f713dcabecccc4c3eb81e85be000000000000803f00000000000080bf0000000000000000000080bfb81e653f5c8f423f713dca3ecccc4c3eb81e853e000000000000803f00000000000080bf0000000000000000000080bf3c0ad73d90c2753e713dca3ecccc4c3eb81e85be000000000000803f00000000000080bf0000000000000000000080bf3c0ad73d5c8f423f713dcabecccc4c3eb81e853e000000000000803f00000000000080bf0000000000000000000080bfb81e653f90c2753e3333333fccccccbd0000003f0000008000000080000080bf000080bf00000000000000000000803fcccc4cbecdcccc3e333333bfccccccbd0000003f0000008000000080000080bf000080bf00000000000000000000803f9a99993fcdcccc3e333333bf0000803e0000003f0000008000000080000080bf000080bf00000000000000000000803f9a99993f0000403f3333333f0000803e0000003f0000008000000080000080bf000080bf00000000000000000000803fcccc4cbe0000403f3333333f0000803e000000bf00000080000000800000803f0000803f00000000000000000000803f9a99993f0000403f333333bf0000803e000000bf00000080000000800000803f0000803f00000000000000000000803fcccc4cbe0000403f333333bfccccccbd000000bf00000080000000800000803f0000803f00000000000000000000803fcccc4cbecdcccc3e3333333fccccccbd000000bf00000080000000800000803f0000803f00000000000000000000803f9a99993fcdcccc3e713dcabe85eb51bfb81e85be0000000000000000000080bf0000803f0000000000000000000080bf3c0ad73d0ad7a3be713dca3e000080beb81e85be0000000000000000000080bf0000803f0000000000000000000080bfb81e653f0000803e713dca3e85eb51bfb81e85be0000000000000000000080bf0000803f0000000000000000000080bfb81e653f0ad7a3be713dcabe000080beb81e85be0000000000000000000080bf0000803f0000000000000000000080bf3c0ad73d0000803e713dcabeccccccbdb81e85be0000000000000000000080bf0000803f0000000000000000000080bf3c0ad73dcdcccc3e713dca3ecccc4c3eb81e85be0000000000000000000080bf0000803f0000000000000000000080bfb81e653f3333333f713dca3eccccccbdb81e85be0000000000000000000080bf0000803f0000000000000000000080bfb81e653fcdcccc3e713dcabecccc4c3eb81e85be0000000000000000000080bf0000803f0000000000000000000080bf3c0ad73d3333333f3333333fccccccbd000000bf000080bf000000800000008000000000000000000000803f0000803f00000000cdcccc3e3333333fccccccbd0000003f000080bf000000800000008000000000000000000000803f0000803f0000803fcdcccc3e3333333f0000803e0000003f000080bf000000800000008000000000000000000000803f0000803f0000803f0000403f3333333f0000803e000000bf000080bf000000800000008000000000000000000000803f0000803f000000000000403f713dca3eccccccbdb81e85be000000800000803f000000800000803f00000000000000000000803fb81e653f5c8f423f713dca3eccccccbdb81e853e000000800000803f000000800000803f00000000000000000000803fb81e653f90c2753e3333333fccccccbd0000003f000000800000803f000000800000803f00000000000000000000803f9a99993f000000003333333fccccccbd000000bf000000800000803f000000800000803f00000080000000000000803f9a99993f0000803f713dcabeccccccbdb81e85be000000800000803f000000800000803f000000004e051f260000803f3c0ad73d5c8f423f333333bfccccccbd000000bf000000800000803f000000800000803f00000000000000000000803fcccc4cbe0000803f713dcabeccccccbdb81e853e000000800000803f000000800000803f00000080000000000000803f3c0ad73d90c2753e333333bfccccccbd0000003f000000800000803f000000800000803f00000000000000000000803fcccc4cbe00000000000080bf0000803e0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f0000403f0000803f000080be0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf0000803e0000803f0000803e0000803f00000000000000000000803f000080bf0000000000000080000080bf000000bf0000403f000080bf000080be0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f0000803e000080bf000080be000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000803e0000803f0000803e000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f0000403f0000803f000080be000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f0000803e000080bf0000803e000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000403f0000803f0000803e0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000403f0000803f000080be000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf0000803e0000803f0000803e000080bf0000803f000000000000000000000080000000000000803f000080bf000000bf0000403f0000803f000080be0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000803e000080bf0000803e000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000403f000080bf000080be0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000803e000080bf0000803e0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000403f000080bf000080be000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000803e0000803f000080be0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf000080bf000080be0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf713dca3e000080beb81e853e00000000000080bf000000000000803f0000000000000000000080bfb81e653f90c2753e713dcabe000080beb81e853e00000000000080bf000000000000803f0000000000000000000080bf3c0ad73d90c2753e713dcabe000080beb81e85be00000000000080bf000000000000803f0000000000000080000080bf3c0ad73d5c8f423f000080bf000080be000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f0000803f000080be000080bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000c03f713dca3e000080beb81e85be00000000000080bf000000000000803f0000000000000000000080bfb81e653f5c8f423f333333bfccccccbd0000003f0000803f00000080000000800000000000000000000080bf0000803f00000000cdcccc3e333333bfccccccbd000000bf0000803f00000080000000800000000000000000000080bf0000803f0000803fcdcccc3e333333bf0000803e000000bf0000803f00000080000000800000000000000000000080bf0000803f0000803f0000403f333333bf0000803e0000003f0000803f00000080000000800000000000000000000080bf0000803f000000000000403f713dcabe000080beb81e853e00000000000000000000803f000080bf0000000000000000000080bfb81e653f0000803e713dca3e85eb51bfb81e853e00000000000000000000803f000080bf0000000000000000000080bf3c0ad73d0ad7a3be713dca3e000080beb81e853e00000000000000000000803f000080bf0000000000000080000080bf3c0ad73d0000803e713dcabe85eb51bfb81e853e00000000000000000000803f000080bf0000000000000000000080bfb81e653f0ad7a3be713dcabecccc4c3eb81e853e00000000000000000000803f000080bf0000000000000000000080bfb81e653f3333333f713dca3eccccccbdb81e853e00000000000000000000803f000080bf0000000000000000000080bf3c0ad73dcdcccc3e713dca3ecccc4c3eb81e853e00000000000000000000803f000080bf0000000000000080000080bf3c0ad73d3333333f713dcabeccccccbdb81e853e00000000000000000000803f000080bf0000000000000000000080bfb81e653fcdcccc3e m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -3559,8 +3558,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: -1.06, y: 0.6, z: -0.73} - m_Extent: {x: 4.435, y: 1.005, z: 1.625} + m_Center: {x: 0, y: -0.285, z: 0} + m_Extent: {x: 1, y: 0.53499997, z: 1} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: diff --git a/Packages/com.chisel.components/Chisel/Components/API.public/Components/Containers/ChiselGeneratedObjects.cs b/Packages/com.chisel.components/Chisel/Components/API.public/Components/Containers/ChiselGeneratedObjects.cs index 5765ca641..350bc2c79 100644 --- a/Packages/com.chisel.components/Chisel/Components/API.public/Components/Containers/ChiselGeneratedObjects.cs +++ b/Packages/com.chisel.components/Chisel/Components/API.public/Components/Containers/ChiselGeneratedObjects.cs @@ -597,8 +597,6 @@ public int FinishMeshUpdates(ChiselModel model, GameObject parentGameObject, } } - Debug.Log(foundMeshes.Count); - Debug.Log(meshDataArray.Length); Profiler.BeginSample("ApplyAndDisposeWritableMeshData"); Mesh.ApplyAndDisposeWritableMeshData(meshDataArray, foundMeshes, diff --git a/Packages/com.chisel.core/Chisel/Core/API.public/CSGManager.cs b/Packages/com.chisel.core/Chisel/Core/API.public/CSGManager.cs index 1a56df2dd..856c4f72d 100644 --- a/Packages/com.chisel.core/Chisel/Core/API.public/CSGManager.cs +++ b/Packages/com.chisel.core/Chisel/Core/API.public/CSGManager.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using Unity.Collections; using Unity.Jobs; -using UnityEngine; namespace Chisel.Core { diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs index aed55ed7c..e354d271f 100644 --- a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs @@ -11,7 +11,7 @@ public override void OnHeaderGUI() GUI.color = Color.white; var node = target as ChiselGraphNode; var graph = node.graph as ChiselGraph; - if (graph.active == node) GUI.color = Color.cyan; + if (graph.active == node) GUI.color = Color.green; string title = target.name; GUILayout.Label(title, NodeEditorResources.styles.nodeHeader, GUILayout.Height(30)); @@ -22,7 +22,11 @@ public override void OnBodyGUI() { base.OnBodyGUI(); var node = target as ChiselGraphNode; - if (GUILayout.Button("Preview")) node.SetActive(); + if (node.chiselGraph.active != node) + { + if (GUILayout.Button("Preview")) + node.SetActive(); + } } } } \ No newline at end of file From 3ce62974127d4a2d1cba131962df199bbd4101cd Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Wed, 20 Jan 2021 01:49:50 +0800 Subject: [PATCH 11/26] Implemented SubGraph --- Assets/ChiselNodes/MySubGraph.asset | 145 ++++++++++++++++++ Assets/ChiselNodes/MySubGraph.asset.meta | 8 + Assets/ChiselNodes/New Chisel Graph.asset | 62 +++++++- Assets/ChiselNodes/NodeTest.unity | 20 +-- .../com.chisel.node/Chisel/ChiselGraph.cs | 4 +- .../com.chisel.node/Chisel/Nodes/BoxNode.cs | 11 +- .../Chisel/Nodes/ChiselGraphNode.cs | 16 +- .../Chisel/Nodes/SubGraphNode.cs | 20 +++ .../Chisel/Nodes/SubGraphNode.cs.meta | 11 ++ 9 files changed, 264 insertions(+), 33 deletions(-) create mode 100644 Assets/ChiselNodes/MySubGraph.asset create mode 100644 Assets/ChiselNodes/MySubGraph.asset.meta create mode 100644 Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs create mode 100644 Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs.meta diff --git a/Assets/ChiselNodes/MySubGraph.asset b/Assets/ChiselNodes/MySubGraph.asset new file mode 100644 index 000000000..d8ed48f5b --- /dev/null +++ b/Assets/ChiselNodes/MySubGraph.asset @@ -0,0 +1,145 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6468980190964667538 +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: d678cf2bf10f3bf4f8d68ae693a7a7a3, type: 3} + m_Name: Box + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: 136, y: 168} + ports: + keys: + - center + - size + - children + - parent + values: + - _fieldName: center + _node: {fileID: -6468980190964667538} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: size + _node: {fileID: -6468980190964667538} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: children + _node: {fileID: -6468980190964667538} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: parent + node: {fileID: 1688561918610544374} + reroutePoints: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: parent + _node: {fileID: -6468980190964667538} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + operation: 1 + center: {x: 0, y: 0.93, z: 0} + size: {x: 2.16, y: 1, z: 1} +--- !u!114 &11400000 +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: 1719bdb460489264dbc2eda6f3845f03, type: 3} + m_Name: MySubGraph + m_EditorClassIdentifier: + nodes: + - {fileID: 1688561918610544374} + - {fileID: -6468980190964667538} + active: {fileID: -6468980190964667538} + instance: {fileID: 0} +--- !u!114 &1688561918610544374 +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: d678cf2bf10f3bf4f8d68ae693a7a7a3, type: 3} + m_Name: Box + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: -184, y: 168} + ports: + keys: + - center + - size + - children + - parent + values: + - _fieldName: center + _node: {fileID: 1688561918610544374} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: size + _node: {fileID: 1688561918610544374} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: children + _node: {fileID: 1688561918610544374} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: parent + _node: {fileID: 1688561918610544374} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: children + node: {fileID: -6468980190964667538} + reroutePoints: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + operation: 0 + center: {x: 0, y: 0, z: 0} + size: {x: 2, y: 2, z: 2} diff --git a/Assets/ChiselNodes/MySubGraph.asset.meta b/Assets/ChiselNodes/MySubGraph.asset.meta new file mode 100644 index 000000000..a12ac78d9 --- /dev/null +++ b/Assets/ChiselNodes/MySubGraph.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fcd800f03725c234c8d479a178882e4e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index b5a464417..92895c358 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -117,8 +117,50 @@ MonoBehaviour: _typeConstraint: 0 _dynamic: 0 operation: 1 - center: {x: 0, y: 0.25, z: 0} - size: {x: 1.4, y: 0.7, z: 1} + center: {x: 0, y: 0.39, z: 0} + size: {x: 0.39, y: 0.7, z: 1} +--- !u!114 &-1383906636815730267 +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: 0dbbcedd95044154d9273ec01444868a, type: 3} + m_Name: Sub Graph + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: 632, y: 168} + ports: + keys: + - children + - parent + values: + - _fieldName: children + _node: {fileID: -1383906636815730267} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: parent + node: {fileID: 6654120812992344769} + reroutePoints: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: parent + _node: {fileID: -1383906636815730267} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + operation: 1 + subgraph: {fileID: 11400000, guid: fcd800f03725c234c8d479a178882e4e, type: 2} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -135,6 +177,7 @@ MonoBehaviour: - {fileID: 3873916941957806223} - {fileID: -3665420030514838893} - {fileID: 6654120812992344769} + - {fileID: -1383906636815730267} active: {fileID: 6654120812992344769} instance: {fileID: 0} --- !u!114 &3873916941957806223 @@ -150,7 +193,7 @@ MonoBehaviour: m_Name: Box m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -296, y: 88} + position: {x: -168, y: 152} ports: keys: - center @@ -199,7 +242,7 @@ MonoBehaviour: _dynamic: 0 operation: 0 center: {x: 0, y: 0, z: 0} - size: {x: 2, y: 0.5, z: 2} + size: {x: 3.42, y: 0.62, z: 2.88} --- !u!114 &6654120812992344769 MonoBehaviour: m_ObjectHideFlags: 0 @@ -213,7 +256,7 @@ MonoBehaviour: m_Name: Box m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: 408, y: 120} + position: {x: 376, y: 168} ports: keys: - center @@ -255,11 +298,14 @@ MonoBehaviour: _node: {fileID: 6654120812992344769} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: [] + connections: + - fieldName: children + node: {fileID: -1383906636815730267} + reroutePoints: [] _direction: 1 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - operation: 0 + operation: 1 center: {x: 0, y: -0.31, z: 0} - size: {x: 0.79, y: 1.02, z: 0.52} + size: {x: 0.69, y: 1.26, z: 0.52} diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index f39d903a8..b133a7450 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -3418,14 +3418,14 @@ Mesh: m_SubMeshes: - serializedVersion: 2 firstByte: 0 - indexCount: 180 + indexCount: 204 topology: 0 baseVertex: 0 firstVertex: 0 - vertexCount: 96 + vertexCount: 104 localAABB: - m_Center: {x: 0, y: -0.285, z: 0} - m_Extent: {x: 1, y: 0.53499997, z: 1} + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1.71, y: 1, z: 1.44} m_Shapes: vertices: [] shapes: [] @@ -3442,10 +3442,10 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000001000000030000000200000003000000040000000200000003000000050000000400000005000000060000000400000006000000070000000400000007000000060000000100000000000000070000000100000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d00000010000000110000001200000010000000130000001100000014000000150000001600000014000000170000001500000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001f0000001d00000020000000210000002200000023000000200000002200000024000000250000002600000027000000240000002600000028000000290000002a000000280000002b000000290000002c0000002d0000002e0000002c0000002f0000002d0000003000000031000000320000003300000030000000320000003400000035000000360000003700000034000000360000003700000038000000340000003700000039000000380000003a00000038000000390000003a000000390000003b000000350000003a0000003b000000350000003b000000360000003c0000003d0000003e0000003c0000003f0000003d00000040000000410000004200000040000000430000004100000044000000450000004600000044000000470000004500000048000000490000004a000000480000004b000000490000004c0000004d0000004e0000004d0000004f0000004e0000004f0000004d000000500000004d00000051000000500000005000000051000000520000005300000050000000520000004c00000053000000520000004c0000004e0000005300000054000000550000005600000057000000540000005600000058000000590000005a000000580000005b000000590000005c0000005d0000005e0000005c0000005f0000005d000000 + m_IndexBuffer: 00000000010000000200000001000000030000000200000002000000030000000400000002000000040000000500000004000000060000000500000006000000070000000500000000000000070000000600000001000000000000000600000008000000090000000a000000090000000b0000000a0000000b0000000c0000000a0000000b0000000d0000000c0000000d0000000e0000000c0000000e0000000f0000000c0000000f0000000e00000009000000080000000f0000000900000010000000110000001200000010000000130000001100000014000000150000001600000014000000170000001500000018000000190000001a000000180000001a0000001b0000001c0000001d0000001e0000001c0000001e0000001f00000020000000210000002200000020000000230000002100000024000000250000002600000024000000270000002500000028000000290000002a000000280000002b000000290000002c0000002d0000002e0000002c0000002f0000002d000000300000002d0000002f00000031000000300000002f00000032000000300000003100000032000000330000003000000034000000350000003600000034000000370000003500000038000000390000003a000000380000003b00000039000000390000003b0000003c0000003d000000390000003c0000003e0000003d0000003c0000003e0000003f0000003d00000040000000410000004200000040000000430000004100000044000000450000004600000044000000470000004500000048000000490000004a000000480000004b000000490000004c0000004d0000004e0000004c0000004f0000004d000000500000005100000052000000500000005300000051000000540000005500000056000000570000005800000059000000580000005a00000059000000590000005a0000005b0000005a000000540000005b0000005b00000054000000560000005c0000005d0000005e0000005d0000005f0000005e000000600000005f0000005d00000060000000610000005f000000620000006300000064000000650000006600000067000000650000006700000062000000650000006200000064000000 m_VertexData: serializedVersion: 3 - m_VertexCount: 96 + m_VertexCount: 104 m_Channels: - stream: 0 offset: 0 @@ -3503,8 +3503,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 4608 - _typelessdata: 000080bf0000803e000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f333333bf0000803e000000bf000000000000803f00000000000080bf0000000000000000000080bf9a99993f0000803f0000803f0000803e000080bf000000000000803f00000000000080bf0000008000000000000080bf000000bf0000c03f3333333f0000803e000000bf000000000000803f00000000000080bf0000000000000000000080bfcccc4cbe0000803f0000803f0000803e0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bf3333333f0000803e0000003f000000000000803f00000000000080bf0000000000000000000080bfcccc4cbe00000000333333bf0000803e0000003f000000000000803f00000000000080bf0000000000000000000080bf9a99993f00000000000080bf0000803e0000803f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000bf713dca3e000080beb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f0000803e713dca3e85eb51bfb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753e0ad7a3be713dca3e000080beb81e85be0000803f000000000000000000000080000000000000803f000080bf90c2753e0000803e713dca3e85eb51bfb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f0ad7a3be713dca3ecccc4c3eb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f3333333f713dca3eccccccbdb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753ecdcccc3e713dca3ecccc4c3eb81e85be0000803f000000000000000000000080000000000000803f000080bf90c2753e3333333f713dca3eccccccbdb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423fcdcccc3e713dcabe000080beb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f0000803e713dcabe85eb51bfb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e0ad7a3be713dcabe000080beb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e0000803e713dcabe85eb51bfb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f0ad7a3be713dcabecccc4c3eb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f3333333f713dcabeccccccbdb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753ecdcccc3e713dcabecccc4c3eb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e3333333f713dcabeccccccbdb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423fcdcccc3e713dcabe85eb51bfb81e853e00000000000080bf000000000000803f0000000000000000000080bf3c0ad73d90c2753e713dca3e85eb51bfb81e85be00000000000080bf000000000000803f0000000000000000000080bfb81e653f5c8f423f713dca3e85eb51bfb81e853e00000000000080bf000000000000803f0000000000000000000080bfb81e653f90c2753e713dcabe85eb51bfb81e85be00000000000080bf000000000000803f0000000000000000000080bf3c0ad73d5c8f423f713dcabecccc4c3eb81e85be000000000000803f00000000000080bf0000000000000000000080bfb81e653f5c8f423f713dca3ecccc4c3eb81e853e000000000000803f00000000000080bf0000000000000000000080bf3c0ad73d90c2753e713dca3ecccc4c3eb81e85be000000000000803f00000000000080bf0000000000000000000080bf3c0ad73d5c8f423f713dcabecccc4c3eb81e853e000000000000803f00000000000080bf0000000000000000000080bfb81e653f90c2753e3333333fccccccbd0000003f0000008000000080000080bf000080bf00000000000000000000803fcccc4cbecdcccc3e333333bfccccccbd0000003f0000008000000080000080bf000080bf00000000000000000000803f9a99993fcdcccc3e333333bf0000803e0000003f0000008000000080000080bf000080bf00000000000000000000803f9a99993f0000403f3333333f0000803e0000003f0000008000000080000080bf000080bf00000000000000000000803fcccc4cbe0000403f3333333f0000803e000000bf00000080000000800000803f0000803f00000000000000000000803f9a99993f0000403f333333bf0000803e000000bf00000080000000800000803f0000803f00000000000000000000803fcccc4cbe0000403f333333bfccccccbd000000bf00000080000000800000803f0000803f00000000000000000000803fcccc4cbecdcccc3e3333333fccccccbd000000bf00000080000000800000803f0000803f00000000000000000000803f9a99993fcdcccc3e713dcabe85eb51bfb81e85be0000000000000000000080bf0000803f0000000000000000000080bf3c0ad73d0ad7a3be713dca3e000080beb81e85be0000000000000000000080bf0000803f0000000000000000000080bfb81e653f0000803e713dca3e85eb51bfb81e85be0000000000000000000080bf0000803f0000000000000000000080bfb81e653f0ad7a3be713dcabe000080beb81e85be0000000000000000000080bf0000803f0000000000000000000080bf3c0ad73d0000803e713dcabeccccccbdb81e85be0000000000000000000080bf0000803f0000000000000000000080bf3c0ad73dcdcccc3e713dca3ecccc4c3eb81e85be0000000000000000000080bf0000803f0000000000000000000080bfb81e653f3333333f713dca3eccccccbdb81e85be0000000000000000000080bf0000803f0000000000000000000080bfb81e653fcdcccc3e713dcabecccc4c3eb81e85be0000000000000000000080bf0000803f0000000000000000000080bf3c0ad73d3333333f3333333fccccccbd000000bf000080bf000000800000008000000000000000000000803f0000803f00000000cdcccc3e3333333fccccccbd0000003f000080bf000000800000008000000000000000000000803f0000803f0000803fcdcccc3e3333333f0000803e0000003f000080bf000000800000008000000000000000000000803f0000803f0000803f0000403f3333333f0000803e000000bf000080bf000000800000008000000000000000000000803f0000803f000000000000403f713dca3eccccccbdb81e85be000000800000803f000000800000803f00000000000000000000803fb81e653f5c8f423f713dca3eccccccbdb81e853e000000800000803f000000800000803f00000000000000000000803fb81e653f90c2753e3333333fccccccbd0000003f000000800000803f000000800000803f00000000000000000000803f9a99993f000000003333333fccccccbd000000bf000000800000803f000000800000803f00000080000000000000803f9a99993f0000803f713dcabeccccccbdb81e85be000000800000803f000000800000803f000000004e051f260000803f3c0ad73d5c8f423f333333bfccccccbd000000bf000000800000803f000000800000803f00000000000000000000803fcccc4cbe0000803f713dcabeccccccbdb81e853e000000800000803f000000800000803f00000080000000000000803f3c0ad73d90c2753e333333bfccccccbd0000003f000000800000803f000000800000803f00000000000000000000803fcccc4cbe00000000000080bf0000803e0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f0000403f0000803f000080be0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf0000803e0000803f0000803e0000803f00000000000000000000803f000080bf0000000000000080000080bf000000bf0000403f000080bf000080be0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f0000803e000080bf000080be000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000803e0000803f0000803e000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f0000403f0000803f000080be000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f0000803e000080bf0000803e000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000403f0000803f0000803e0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000403f0000803f000080be000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf0000803e0000803f0000803e000080bf0000803f000000000000000000000080000000000000803f000080bf000000bf0000403f0000803f000080be0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000803e000080bf0000803e000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000403f000080bf000080be0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000803e000080bf0000803e0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000403f000080bf000080be000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000803e0000803f000080be0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf000080bf000080be0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf713dca3e000080beb81e853e00000000000080bf000000000000803f0000000000000000000080bfb81e653f90c2753e713dcabe000080beb81e853e00000000000080bf000000000000803f0000000000000000000080bf3c0ad73d90c2753e713dcabe000080beb81e85be00000000000080bf000000000000803f0000000000000080000080bf3c0ad73d5c8f423f000080bf000080be000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f0000803f000080be000080bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000c03f713dca3e000080beb81e85be00000000000080bf000000000000803f0000000000000000000080bfb81e653f5c8f423f333333bfccccccbd0000003f0000803f00000080000000800000000000000000000080bf0000803f00000000cdcccc3e333333bfccccccbd000000bf0000803f00000080000000800000000000000000000080bf0000803f0000803fcdcccc3e333333bf0000803e000000bf0000803f00000080000000800000000000000000000080bf0000803f0000803f0000403f333333bf0000803e0000003f0000803f00000080000000800000000000000000000080bf0000803f000000000000403f713dcabe000080beb81e853e00000000000000000000803f000080bf0000000000000000000080bfb81e653f0000803e713dca3e85eb51bfb81e853e00000000000000000000803f000080bf0000000000000000000080bf3c0ad73d0ad7a3be713dca3e000080beb81e853e00000000000000000000803f000080bf0000000000000080000080bf3c0ad73d0000803e713dcabe85eb51bfb81e853e00000000000000000000803f000080bf0000000000000000000080bfb81e653f0ad7a3be713dcabecccc4c3eb81e853e00000000000000000000803f000080bf0000000000000000000080bfb81e653f3333333f713dca3eccccccbdb81e853e00000000000000000000803f000080bf0000000000000000000080bf3c0ad73dcdcccc3e713dca3ecccc4c3eb81e853e00000000000000000000803f000080bf0000000000000080000080bf3c0ad73d3333333f713dcabeccccccbdb81e853e00000000000000000000803f000080bf0000000000000000000080bfb81e653fcdcccc3e + m_DataSize: 4992 + _typelessdata: 48e1dabf52b89e3eec51b8bf000000000000803f00000000000080bf0000000000000000000080bfa4700d40ec51f83f000080bf52b89e3e000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f48e1da3f52b89e3eec51b8bf000000000000803f00000000000080bf00000000c2e7f4a5000080bf48e19abfec51f83f0000803f52b89e3e000080bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000c03f0000803f52b89e3e0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bf48e1da3f52b89e3eec51b83f000000000000803f00000000000080bf0000000000000000000080bf48e19abfd8a370bf000080bf52b89e3e0000803f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000bf48e1dabf52b89e3eec51b83f000000000000803f00000000000080bf00000000c2e7f425000080bfa4700d40d8a370bf48e1dabf52b89ebeec51b83f00000000000080bf000000000000803f0000000000000000000080bf48e19abfd8a370bf000080bf52b89ebe0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf48e1da3f52b89ebeec51b83f00000000000080bf000000000000803f0000000000000000000080bfa4700d40d8a370bf0000803f52b89ebe0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf48e1da3f52b89ebeec51b8bf00000000000080bf000000000000803f0000000000000000000080bfa4700d40ec51f83f0000803f52b89ebe000080bf00000000000080bf000000000000803f0000000000000080000080bf0000c03f0000c03f000080bf52b89ebe000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f48e1dabf52b89ebeec51b8bf00000000000080bf000000000000803f0000000000000000000080bf48e19abfec51f83f48e1dabf52b89e3eec51b8bf000080bf00000000000000000000000000000000000080bf000080bfec51f83f295c4f3f48e1dabf52b89ebeec51b83f000080bf00000000000000000000000000000000000080bf000080bfd8a370bf5c8f423e48e1dabf52b89e3eec51b83f000080bf00000000000000000000000000000000000080bf000080bfd8a370bf295c4f3f48e1dabf52b89ebeec51b8bf000080bf00000000000000000000000000000000000080bf000080bfec51f83f5c8f423e48e1da3f52b89e3eec51b83f0000803f000000000000000000000000000000000000803f000080bfec51f83f295c4f3f48e1da3f52b89ebeec51b8bf0000803f000000000000000000000000000000000000803f000080bfd8a370bf5c8f423e48e1da3f52b89e3eec51b8bf0000803f000000000000000000000080000000000000803f000080bfd8a370bf295c4f3f48e1da3f52b89ebeec51b83f0000803f000000000000000000000000000000000000803f000080bfec51f83f5c8f423e48e1da3f52b89ebeec51b8bf0000000000000000000080bf0000803f0000000000000000000080bfa4700d405c8f423e48e1dabf52b89ebeec51b8bf0000000000000000000080bf0000803f0000000000000000000080bf48e19abf5c8f423e48e1dabf52b89e3eec51b8bf0000000000000000000080bf0000803f0000000000000000000080bf48e19abf295c4f3f48e1da3f52b89e3eec51b8bf0000000000000000000080bf0000803f0000000000000000000080bfa4700d40295c4f3f48e1da3f52b89e3eec51b83f00000000000000000000803f000080bf0000000000000000000080bf48e19abf295c4f3f48e1dabf52b89e3eec51b83f00000000000000000000803f000080bf0000000000000000000080bfa4700d40295c4f3f48e1dabf52b89ebeec51b83f00000000000000000000803f000080bf0000000000000000000080bfa4700d405c8f423e48e1da3f52b89ebeec51b83f00000000000000000000803f000080bf0000000000000000000080bf48e19abf5c8f423e000080bf0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000000000803f0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bf0000803f0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf000000bf00000000000080bf0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000bf000080bf0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f0000803f0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000803f0000803f0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000c03f000080bf0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000803f000080bf000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf0000803f000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf000080bf000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000c03f000080bff628dc3e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f7b146e3f000080bf0000803f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000c03f000080bf52b89e3e000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f295c4f3f000080bff628dc3e0000003f000080bf00000000000000000000000000000000000080bf000080bf000000007b146e3f000080bf52b89e3e0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf295c4f3f000080bf0000803f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000c03f000080bf0000803f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000c03f000080bf52b89ebe000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f5c8f423e000080bf000080bf0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf000000bf000080bf52b89ebe0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf5c8f423e000080bf000080bf000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f000000bf0000803f0000803f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000c03f0000803ff628dc3e0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f7b146e3f0000803f0000803f0000003f0000803f000000000000000000000080000000000000803f000080bf0000803f0000c03f0000803f52b89e3e0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f295c4f3f0000803f52b89e3e000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf295c4f3f0000803ff628dc3e000000bf0000803f000000000000000000000000000000000000803f000080bf000000007b146e3f0000803f0000803f000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf0000c03f0000803f0000803f000000bf0000803f000000000000000000000000000000000000803f000080bf000000000000c03f0000803f52b89ebe0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f5c8f423e0000803f000080bf000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf000000bf0000803f52b89ebe000080bf0000803f000000000000000000000080000000000000803f000080bf000000bf5c8f423e0000803f000080bf0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f000000bf000080bf52b89e3e000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf295c4f3f0000803f0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f0000c03f0000803f52b89e3e000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f295c4f3f000080bf0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000c03f000080bf000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf000000bf0000803f52b89ebe000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f5c8f423e0000803f000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f000000bf000080bf52b89ebe000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf5c8f423e000080bf52b89ebe0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f5c8f423e0000803f000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf000000bf0000803f52b89ebe0000803f00000000000000000000803f000080bf0000000000000080000080bf000000bf5c8f423e000080bf000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f000000bf000080bf0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f0000c03f0000803f52b89e3e0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf295c4f3f0000803f0000803f0000803f00000000000000000000803f000080bf0000000000000080000080bf000000bf0000c03f000080bf52b89e3e0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f295c4f3f14ae47bef628dc3e000000bf000000800000803f000000800000803f00000000000000000000803ff6289c3e0000803f000080bff628dc3e000000bf000000800000803f000000800000803f00000080000000000000803f000000bf0000803f000080bff628dc3e0000003f000000800000803f000000800000803f00000000000000000000803f000000bf000000000000803ff628dc3e0000003f000000800000803f000000800000803f00000000000000000000803f0000c03f000000000000803ff628dc3e000000bf000000800000803f000000800000803f00000080000000000000803f0000c03f0000803f14ae473ef628dc3e0000003f000000800000803f000000800000803f00000000000000000000803f85eb313f0000000014ae473ef628dc3e000000bf000000800000803f000000800000803f00000080000000000000803f85eb313f0000803f14ae47bef628dc3e0000003f000000800000803f000000800000803f00000000000000000000803ff6289c3e000000000000803ff628dc3e000000bf00000080000000800000803f0000803f00000000000000000000803f0000c03f7b146e3f0000803f0000803f000000bf00000080000000800000803f0000803f00000000000000000000803f0000c03f0000c03f14ae473ef628dc3e000000bf00000080000000800000803f0000803f00000000000000000000803f85eb313f7b146e3f14ae47bef628dc3e000000bf00000080000000800000803f0000803f00000000000000000000803ff6289c3e7b146e3f000080bf0000803f000000bf00000080000000800000803f0000803f00000000000000000000803f000000bf0000c03f000080bff628dc3e000000bf00000080000000800000803f0000803f00000000000000000000803f000000bf7b146e3f14ae47bef628dc3e0000003f0000008000000080000080bf000080bf00000000000000000000803f85eb313f7b146e3f000080bff628dc3e0000003f0000008000000080000080bf000080bf00000000000000000000803f0000c03f7b146e3f000080bf0000803f0000003f0000008000000080000080bf000080bf00000000000000000000803f0000c03f0000c03f0000803f0000803f0000003f0000008000000080000080bf000080bf00000000000000000000803f000000bf0000c03f0000803ff628dc3e0000003f0000008000000080000080bf000080bf00000000000000000000803f000000bf7b146e3f14ae473ef628dc3e0000003f0000008000000080000080bf000080bf00000000000000000000803ff6289c3e7b146e3f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -3558,8 +3558,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0, y: -0.285, z: 0} - m_Extent: {x: 1, y: 0.53499997, z: 1} + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1.71, y: 1, z: 1.44} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.node/Chisel/ChiselGraph.cs index 26a77eb97..aa1e73ee5 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs @@ -24,7 +24,9 @@ public void UpdateCSG() public void CollectTreeNode(CSGTree tree) { - active.ParseNode(tree); + var branch = CSGTreeBranch.Create(); + active.ParseNode(branch); + tree.Add(branch); } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs index 95eb5103b..27724583a 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs @@ -8,8 +8,6 @@ public class BoxNode : ChiselGraphNode [Input] public Vector3 center; [Input] public Vector3 size = Vector3.one; - CSGTreeNode treeNode; - public override CSGTreeNode GetNode() { var box = new ChiselBoxDefinition(); @@ -20,18 +18,11 @@ public override CSGTreeNode GetNode() BrushMeshFactory.GenerateBox(ref brushContainer, ref box); var instance = BrushMeshInstance.Create(brushContainer.brushMeshes[0]); - treeNode = CSGTreeBrush.Create(0, instance); + var treeNode = CSGTreeBrush.Create(0, instance); treeNode.Operation = operation; return treeNode; } - - void OnValidate() - { - if (treeNode.Valid) - treeNode.SetDirty(); - chiselGraph.UpdateCSG(); - } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs index 7cf30db12..ce40be00d 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs @@ -2,6 +2,7 @@ using UnityEngine; using XNode; using Chisel.Core; +using System.Collections.Generic; namespace Chisel.Nodes { @@ -22,20 +23,27 @@ public void SetActive() public abstract CSGTreeNode GetNode(); - public void ParseNode(CSGTree tree) + public void ParseNode(CSGTreeBranch branch) { var childrenPort = GetInputPort("children"); if (childrenPort.IsConnected) { var chiselNode = childrenPort.Connection.node as ChiselGraphNode; - chiselNode.ParseNode(tree); + chiselNode.ParseNode(branch); } var node = GetNode(); - node.Operation = operation; - tree.Add(node); + if (node.Valid) + { + node.Operation = operation; + branch.Add(node); + } + + OnParseNode(branch); } + public virtual void OnParseNode(CSGTreeBranch nodes) { } + public override object GetValue(NodePort port) { return null; diff --git a/Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs b/Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs new file mode 100644 index 000000000..80168f924 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs @@ -0,0 +1,20 @@ +using Chisel.Core; +using Chisel.Nodes; + +public class SubGraphNode : ChiselGraphNode +{ + public ChiselGraph subgraph; + + public override CSGTreeNode GetNode() + { + return default; + } + + public override void OnParseNode(CSGTreeBranch parentBranch) + { + var branch = CSGTreeBranch.Create(); + branch.Operation = operation; + parentBranch.Add(branch); + subgraph.active.ParseNode(branch); + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs.meta b/Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs.meta new file mode 100644 index 000000000..061011360 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0dbbcedd95044154d9273ec01444868a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 2f344efbd2ea7e660b232b3c1c9c0a21e45e1986 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Wed, 20 Jan 2021 09:07:44 +0800 Subject: [PATCH 12/26] Implemented FloatPropertyNode --- Assets/ChiselNodes/New Chisel Graph.asset | 128 ++++++- Assets/ChiselNodes/NodeTest.unity | 330 +++++++++--------- .../com.chisel.node/Chisel/ChiselGraph.cs | 12 + .../Chisel/ChiselGraphInstance.cs | 15 +- .../Editor/ChiselGraphInstanceEditor.cs | 21 +- .../Chisel/Editor/PropertyNodeEditor.cs | 21 ++ .../Chisel/Editor/PropertyNodeEditor.cs.meta | 11 + .../com.chisel.node/Chisel/Nodes/BoxNode.cs | 4 +- .../Chisel/Nodes/FloatPropertyNode.cs | 37 ++ .../Chisel/Nodes/FloatPropertyNode.cs.meta | 11 + .../com.chisel.node/Chisel/Nodes/Math.meta | 8 + .../Chisel/Nodes/Math/Vector3Node.cs | 31 ++ .../Chisel/Nodes/Math/Vector3Node.cs.meta | 11 + 13 files changed, 462 insertions(+), 178 deletions(-) create mode 100644 Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs create mode 100644 Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs.meta create mode 100644 Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs create mode 100644 Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs.meta create mode 100644 Packages/com.chisel.node/Chisel/Nodes/Math.meta create mode 100644 Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs create mode 100644 Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs.meta diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 92895c358..65b871cc5 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -1,5 +1,78 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6880739622989829563 +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: fc0e9af9ffadcb346b582cd96952763d, type: 3} + m_Name: Vector 3 + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: -456, y: 168} + ports: + keys: + - x + - y + - z + - output + values: + - _fieldName: x + _node: {fileID: -6880739622989829563} + _typeQualifiedName: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: + - fieldName: exit + node: {fileID: -1856057758424149880} + reroutePoints: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: y + _node: {fileID: -6880739622989829563} + _typeQualifiedName: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: + - fieldName: exit + node: {fileID: -1856057758424149880} + reroutePoints: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: z + _node: {fileID: -6880739622989829563} + _typeQualifiedName: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: + - fieldName: exit + node: {fileID: -1856057758424149880} + reroutePoints: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: output + _node: {fileID: -6880739622989829563} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: center + node: {fileID: 3873916941957806223} + reroutePoints: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + x: 0 + y: 0 + z: 0 + output: {x: 0, y: 0, z: 0} --- !u!114 &-5955115620694431845 MonoBehaviour: m_ObjectHideFlags: 0 @@ -119,6 +192,46 @@ MonoBehaviour: operation: 1 center: {x: 0, y: 0.39, z: 0} size: {x: 0.39, y: 0.7, z: 1} +--- !u!114 &-1856057758424149880 +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: 11822c15ff313934498d7437c0b00093, type: 3} + m_Name: Float Property + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: -712, y: 168} + ports: + keys: + - exit + values: + - _fieldName: exit + _node: {fileID: -1856057758424149880} + _typeQualifiedName: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: + - fieldName: x + node: {fileID: -6880739622989829563} + reroutePoints: [] + - fieldName: y + node: {fileID: -6880739622989829563} + reroutePoints: [] + - fieldName: z + node: {fileID: -6880739622989829563} + reroutePoints: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + property: + Name: Center + Value: 0.66 + exit: 0 --- !u!114 &-1383906636815730267 MonoBehaviour: m_ObjectHideFlags: 0 @@ -159,7 +272,7 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - operation: 1 + operation: 0 subgraph: {fileID: 11400000, guid: fcd800f03725c234c8d479a178882e4e, type: 2} --- !u!114 &11400000 MonoBehaviour: @@ -178,8 +291,12 @@ MonoBehaviour: - {fileID: -3665420030514838893} - {fileID: 6654120812992344769} - {fileID: -1383906636815730267} - active: {fileID: 6654120812992344769} + - {fileID: -1856057758424149880} + - {fileID: -6880739622989829563} + active: {fileID: 3873916941957806223} instance: {fileID: 0} + properties: + - Name: Center --- !u!114 &3873916941957806223 MonoBehaviour: m_ObjectHideFlags: 0 @@ -205,7 +322,10 @@ MonoBehaviour: _node: {fileID: 3873916941957806223} _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: [] + connections: + - fieldName: output + node: {fileID: -6880739622989829563} + reroutePoints: [] _direction: 0 _connectionType: 0 _typeConstraint: 0 @@ -242,7 +362,7 @@ MonoBehaviour: _dynamic: 0 operation: 0 center: {x: 0, y: 0, z: 0} - size: {x: 3.42, y: 0.62, z: 2.88} + size: {x: 2.98, y: 0.62, z: 2.88} --- !u!114 &6654120812992344769 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index b133a7450..befb50035 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -1294,7 +1294,171 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 479267782} - m_Mesh: {fileID: 1482171580} + m_Mesh: {fileID: 552957820} +--- !u!43 &552957820 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1.71, y: 0.31, z: 1.44} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001200000013000000140000001500000016000000140000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 48e1dabf52b89e3eec51b8bf000000000000803f00000000000080bf0000000000000000000080bfa4700d40ec51f83f48e1da3f52b89e3eec51b83f000000000000803f00000000000080bf0000000000000000000080bf48e19abfd8a370bf48e1da3f52b89e3eec51b8bf000000000000803f00000000000080bf0000000000000000000080bf48e19abfec51f83f48e1dabf52b89e3eec51b83f000000000000803f00000000000080bf0000000000000000000080bfa4700d40d8a370bf48e1dabf52b89ebeec51b83f00000000000080bf000000000000803f0000000000000000000080bf48e19abfd8a370bf48e1da3f52b89ebeec51b8bf00000000000080bf000000000000803f0000000000000000000080bfa4700d40ec51f83f48e1da3f52b89ebeec51b83f00000000000080bf000000000000803f0000000000000000000080bfa4700d40d8a370bf48e1dabf52b89ebeec51b8bf00000000000080bf000000000000803f0000000000000000000080bf48e19abfec51f83f48e1dabf52b89e3eec51b8bf000080bf00000000000000000000000000000000000080bf000080bfec51f83f295c4f3f48e1dabf52b89ebeec51b83f000080bf00000000000000000000000000000000000080bf000080bfd8a370bf5c8f423e48e1dabf52b89e3eec51b83f000080bf00000000000000000000000000000000000080bf000080bfd8a370bf295c4f3f48e1dabf52b89ebeec51b8bf000080bf00000000000000000000000000000000000080bf000080bfec51f83f5c8f423e48e1da3f52b89e3eec51b83f0000803f000000000000000000000000000000000000803f000080bfec51f83f295c4f3f48e1da3f52b89ebeec51b8bf0000803f000000000000000000000000000000000000803f000080bfd8a370bf5c8f423e48e1da3f52b89e3eec51b8bf0000803f000000000000000000000080000000000000803f000080bfd8a370bf295c4f3f48e1da3f52b89ebeec51b83f0000803f000000000000000000000000000000000000803f000080bfec51f83f5c8f423e48e1da3f52b89ebeec51b8bf0000000000000000000080bf0000803f0000000000000000000080bfa4700d405c8f423e48e1dabf52b89ebeec51b8bf0000000000000000000080bf0000803f0000000000000000000080bf48e19abf5c8f423e48e1dabf52b89e3eec51b8bf0000000000000000000080bf0000803f0000000000000000000080bf48e19abf295c4f3f48e1da3f52b89e3eec51b8bf0000000000000000000080bf0000803f0000000000000000000080bfa4700d40295c4f3f48e1da3f52b89e3eec51b83f00000000000000000000803f000080bf0000000000000000000080bf48e19abf295c4f3f48e1dabf52b89e3eec51b83f00000000000000000000803f000080bf0000000000000000000080bfa4700d40295c4f3f48e1dabf52b89ebeec51b83f00000000000000000000803f000080bf0000000000000000000080bfa4700d405c8f423e48e1da3f52b89ebeec51b83f00000000000000000000803f000080bf0000000000000000000080bf48e19abf5c8f423e + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1.71, y: 0.31, z: 1.44} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &650786225 GameObject: m_ObjectHideFlags: 24 @@ -3407,170 +3571,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!43 &1482171580 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 204 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 104 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1.71, y: 1, z: 1.44} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000001000000030000000200000002000000030000000400000002000000040000000500000004000000060000000500000006000000070000000500000000000000070000000600000001000000000000000600000008000000090000000a000000090000000b0000000a0000000b0000000c0000000a0000000b0000000d0000000c0000000d0000000e0000000c0000000e0000000f0000000c0000000f0000000e00000009000000080000000f0000000900000010000000110000001200000010000000130000001100000014000000150000001600000014000000170000001500000018000000190000001a000000180000001a0000001b0000001c0000001d0000001e0000001c0000001e0000001f00000020000000210000002200000020000000230000002100000024000000250000002600000024000000270000002500000028000000290000002a000000280000002b000000290000002c0000002d0000002e0000002c0000002f0000002d000000300000002d0000002f00000031000000300000002f00000032000000300000003100000032000000330000003000000034000000350000003600000034000000370000003500000038000000390000003a000000380000003b00000039000000390000003b0000003c0000003d000000390000003c0000003e0000003d0000003c0000003e0000003f0000003d00000040000000410000004200000040000000430000004100000044000000450000004600000044000000470000004500000048000000490000004a000000480000004b000000490000004c0000004d0000004e0000004c0000004f0000004d000000500000005100000052000000500000005300000051000000540000005500000056000000570000005800000059000000580000005a00000059000000590000005a0000005b0000005a000000540000005b0000005b00000054000000560000005c0000005d0000005e0000005d0000005f0000005e000000600000005f0000005d00000060000000610000005f000000620000006300000064000000650000006600000067000000650000006700000062000000650000006200000064000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 104 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 4992 - _typelessdata: 48e1dabf52b89e3eec51b8bf000000000000803f00000000000080bf0000000000000000000080bfa4700d40ec51f83f000080bf52b89e3e000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f48e1da3f52b89e3eec51b8bf000000000000803f00000000000080bf00000000c2e7f4a5000080bf48e19abfec51f83f0000803f52b89e3e000080bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000c03f0000803f52b89e3e0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bf48e1da3f52b89e3eec51b83f000000000000803f00000000000080bf0000000000000000000080bf48e19abfd8a370bf000080bf52b89e3e0000803f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000bf48e1dabf52b89e3eec51b83f000000000000803f00000000000080bf00000000c2e7f425000080bfa4700d40d8a370bf48e1dabf52b89ebeec51b83f00000000000080bf000000000000803f0000000000000000000080bf48e19abfd8a370bf000080bf52b89ebe0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf48e1da3f52b89ebeec51b83f00000000000080bf000000000000803f0000000000000000000080bfa4700d40d8a370bf0000803f52b89ebe0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf48e1da3f52b89ebeec51b8bf00000000000080bf000000000000803f0000000000000000000080bfa4700d40ec51f83f0000803f52b89ebe000080bf00000000000080bf000000000000803f0000000000000080000080bf0000c03f0000c03f000080bf52b89ebe000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f48e1dabf52b89ebeec51b8bf00000000000080bf000000000000803f0000000000000000000080bf48e19abfec51f83f48e1dabf52b89e3eec51b8bf000080bf00000000000000000000000000000000000080bf000080bfec51f83f295c4f3f48e1dabf52b89ebeec51b83f000080bf00000000000000000000000000000000000080bf000080bfd8a370bf5c8f423e48e1dabf52b89e3eec51b83f000080bf00000000000000000000000000000000000080bf000080bfd8a370bf295c4f3f48e1dabf52b89ebeec51b8bf000080bf00000000000000000000000000000000000080bf000080bfec51f83f5c8f423e48e1da3f52b89e3eec51b83f0000803f000000000000000000000000000000000000803f000080bfec51f83f295c4f3f48e1da3f52b89ebeec51b8bf0000803f000000000000000000000000000000000000803f000080bfd8a370bf5c8f423e48e1da3f52b89e3eec51b8bf0000803f000000000000000000000080000000000000803f000080bfd8a370bf295c4f3f48e1da3f52b89ebeec51b83f0000803f000000000000000000000000000000000000803f000080bfec51f83f5c8f423e48e1da3f52b89ebeec51b8bf0000000000000000000080bf0000803f0000000000000000000080bfa4700d405c8f423e48e1dabf52b89ebeec51b8bf0000000000000000000080bf0000803f0000000000000000000080bf48e19abf5c8f423e48e1dabf52b89e3eec51b8bf0000000000000000000080bf0000803f0000000000000000000080bf48e19abf295c4f3f48e1da3f52b89e3eec51b8bf0000000000000000000080bf0000803f0000000000000000000080bfa4700d40295c4f3f48e1da3f52b89e3eec51b83f00000000000000000000803f000080bf0000000000000000000080bf48e19abf295c4f3f48e1dabf52b89e3eec51b83f00000000000000000000803f000080bf0000000000000000000080bfa4700d40295c4f3f48e1dabf52b89ebeec51b83f00000000000000000000803f000080bf0000000000000000000080bfa4700d405c8f423e48e1da3f52b89ebeec51b83f00000000000000000000803f000080bf0000000000000000000080bf48e19abf5c8f423e000080bf0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000000000803f0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bf0000803f0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf000000bf00000000000080bf0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000bf000080bf0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f0000803f0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000803f0000803f0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000c03f000080bf0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000803f000080bf000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf0000803f000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf000080bf000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000c03f000080bff628dc3e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f7b146e3f000080bf0000803f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000c03f000080bf52b89e3e000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f295c4f3f000080bff628dc3e0000003f000080bf00000000000000000000000000000000000080bf000080bf000000007b146e3f000080bf52b89e3e0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf295c4f3f000080bf0000803f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000c03f000080bf0000803f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000c03f000080bf52b89ebe000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f5c8f423e000080bf000080bf0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf000000bf000080bf52b89ebe0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf5c8f423e000080bf000080bf000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f000000bf0000803f0000803f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000c03f0000803ff628dc3e0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f7b146e3f0000803f0000803f0000003f0000803f000000000000000000000080000000000000803f000080bf0000803f0000c03f0000803f52b89e3e0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f295c4f3f0000803f52b89e3e000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf295c4f3f0000803ff628dc3e000000bf0000803f000000000000000000000000000000000000803f000080bf000000007b146e3f0000803f0000803f000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf0000c03f0000803f0000803f000000bf0000803f000000000000000000000000000000000000803f000080bf000000000000c03f0000803f52b89ebe0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f5c8f423e0000803f000080bf000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf000000bf0000803f52b89ebe000080bf0000803f000000000000000000000080000000000000803f000080bf000000bf5c8f423e0000803f000080bf0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f000000bf000080bf52b89e3e000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf295c4f3f0000803f0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f0000c03f0000803f52b89e3e000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f295c4f3f000080bf0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000c03f000080bf000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf000000bf0000803f52b89ebe000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f5c8f423e0000803f000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f000000bf000080bf52b89ebe000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf5c8f423e000080bf52b89ebe0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f5c8f423e0000803f000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf000000bf0000803f52b89ebe0000803f00000000000000000000803f000080bf0000000000000080000080bf000000bf5c8f423e000080bf000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f000000bf000080bf0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f0000c03f0000803f52b89e3e0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf295c4f3f0000803f0000803f0000803f00000000000000000000803f000080bf0000000000000080000080bf000000bf0000c03f000080bf52b89e3e0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f295c4f3f14ae47bef628dc3e000000bf000000800000803f000000800000803f00000000000000000000803ff6289c3e0000803f000080bff628dc3e000000bf000000800000803f000000800000803f00000080000000000000803f000000bf0000803f000080bff628dc3e0000003f000000800000803f000000800000803f00000000000000000000803f000000bf000000000000803ff628dc3e0000003f000000800000803f000000800000803f00000000000000000000803f0000c03f000000000000803ff628dc3e000000bf000000800000803f000000800000803f00000080000000000000803f0000c03f0000803f14ae473ef628dc3e0000003f000000800000803f000000800000803f00000000000000000000803f85eb313f0000000014ae473ef628dc3e000000bf000000800000803f000000800000803f00000080000000000000803f85eb313f0000803f14ae47bef628dc3e0000003f000000800000803f000000800000803f00000000000000000000803ff6289c3e000000000000803ff628dc3e000000bf00000080000000800000803f0000803f00000000000000000000803f0000c03f7b146e3f0000803f0000803f000000bf00000080000000800000803f0000803f00000000000000000000803f0000c03f0000c03f14ae473ef628dc3e000000bf00000080000000800000803f0000803f00000000000000000000803f85eb313f7b146e3f14ae47bef628dc3e000000bf00000080000000800000803f0000803f00000000000000000000803ff6289c3e7b146e3f000080bf0000803f000000bf00000080000000800000803f0000803f00000000000000000000803f000000bf0000c03f000080bff628dc3e000000bf00000080000000800000803f0000803f00000000000000000000803f000000bf7b146e3f14ae47bef628dc3e0000003f0000008000000080000080bf000080bf00000000000000000000803f85eb313f7b146e3f000080bff628dc3e0000003f0000008000000080000080bf000080bf00000000000000000000803f0000c03f7b146e3f000080bf0000803f0000003f0000008000000080000080bf000080bf00000000000000000000803f0000c03f0000c03f0000803f0000803f0000003f0000008000000080000080bf000080bf00000000000000000000803f000000bf0000c03f0000803ff628dc3e0000003f0000008000000080000080bf000080bf00000000000000000000803f000000bf7b146e3f14ae473ef628dc3e0000003f0000008000000080000080bf000080bf00000000000000000000803ff6289c3e7b146e3f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1.71, y: 1, z: 1.44} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!43 &1497873584 Mesh: m_ObjectHideFlags: 0 diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.node/Chisel/ChiselGraph.cs index aa1e73ee5..e0d60300f 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs @@ -1,4 +1,5 @@ using Chisel.Core; +using System.Collections.Generic; using UnityEngine; using XNode; @@ -10,6 +11,8 @@ public class ChiselGraph : NodeGraph public ChiselGraphNode active; public ChiselGraphInstance instance; + public List properties; + public void SetActiveNode(ChiselGraphNode node) { active = node; @@ -20,6 +23,15 @@ public void UpdateCSG() { if (instance != null) instance.IsDirty = true; + + properties.Clear(); + instance?.properties.Clear(); + foreach (var node in nodes) + if (node is FloatPropertyNode floatNode) + { + instance?.properties.Add(floatNode.property); + properties.Add(floatNode.property); + } } public void CollectTreeNode(CSGTree tree) diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs index 9156d73bf..0c6d50d6d 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -14,6 +14,8 @@ public class ChiselGraphInstance : MonoBehaviour public MeshRenderer meshRenderer; public bool IsDirty { get; set; } + public List properties; + CSGTree tree; List meshes; @@ -25,13 +27,20 @@ void Start() void Update() { - if (IsDirty) - UpdateCSG(); + UpdateCSG(); + } + + void OnValidate() + { + graph.instance = this; + UpdateCSG(); } public void UpdateCSG() { + if (!IsDirty) return; IsDirty = false; + if (!tree.Valid) tree = CSGTree.Create(GetInstanceID()); else @@ -60,7 +69,7 @@ int finishMeshUpdates(CSGTree tree, Mesh.ApplyAndDisposeWritableMeshData(meshDataArray, meshes); - meshes[0].RecalculateNormals(); + meshes[1].RecalculateNormals(); meshes[1].RecalculateBounds(); meshFilter.mesh = meshes[1]; diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs index de3ab5c48..28e614c76 100644 --- a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs @@ -10,26 +10,39 @@ public class ChiselGraphInstanceEditor : Editor public override void OnInspectorGUI() { DrawDefaultInspector(); + var instance = target as ChiselGraphInstance; if (GUILayout.Button("Edit", GUI.skin.GetStyle("button"))) { - var instance = target as ChiselGraphInstance; instance.graph.instance = instance; NodeEditorWindow.Open(instance.graph); } - if (GUILayout.Button("Create Tree", GUI.skin.GetStyle("button"))) + if (GUILayout.Button("UpdateCSG", GUI.skin.GetStyle("button"))) { - var instance = target as ChiselGraphInstance; instance.UpdateCSG(); } if (GUILayout.Button("Rebuild", GUI.skin.GetStyle("button"))) { - var instance = target as ChiselGraphInstance; instance.Rebuild(); } + + + EditorGUI.BeginChangeCheck(); + + foreach (var property in instance.properties) + if (property is FloatProperty floatProperty) + { + floatProperty.Value = EditorGUILayout.FloatField(floatProperty.Name, floatProperty.Value); + } + + if (EditorGUI.EndChangeCheck()) + { + instance.IsDirty = true; + instance.UpdateCSG(); + } } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs b/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs new file mode 100644 index 000000000..521c4593b --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs @@ -0,0 +1,21 @@ +using UnityEditor; +using XNodeEditor; + +namespace Chisel.Nodes +{ + [CustomNodeEditor(typeof(PropertyNode))] + public class FloatPropertyNodeEditor : NodeEditor + { + public override void OnBodyGUI() + { + base.OnBodyGUI(); + var node = target as PropertyNode; + node.property.Name = EditorGUILayout.TextField("Name", node.property.Name); + + EditorGUI.BeginChangeCheck(); + node.property.Value = EditorGUILayout.FloatField("Value", node.property.Value); + if (EditorGUI.EndChangeCheck()) + node.chiselGraph.UpdateCSG(); + } + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs.meta b/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs.meta new file mode 100644 index 000000000..4e60f3381 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6248da201b72b5e49a0589434d6968bc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs index 27724583a..2a3d41574 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs @@ -11,8 +11,8 @@ public class BoxNode : ChiselGraphNode public override CSGTreeNode GetNode() { var box = new ChiselBoxDefinition(); - box.center = center; - box.size = size; + box.center = GetInputValue("center", center); + box.size = GetInputValue("size", size); var brushContainer = new ChiselBrushContainer(); BrushMeshFactory.GenerateBox(ref brushContainer, ref box); diff --git a/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs b/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs new file mode 100644 index 000000000..f173f593a --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using XNode; + +namespace Chisel.Nodes +{ + public class FloatPropertyNode : PropertyNode + { + [Output] public float exit; + + public override object GetValue(NodePort port) + { + return property.Value; + } + } + + [Serializable] + public class GraphProperty + { + public string Name; + } + + [Serializable] + public class FloatProperty : GraphProperty + { + public float Value; + } + + public class PropertyNode : Node where T:GraphProperty + { + [HideInInspector] + public T property; + public ChiselGraph chiselGraph => graph as ChiselGraph; + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs.meta b/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs.meta new file mode 100644 index 000000000..4db6547bb --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 11822c15ff313934498d7437c0b00093 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Nodes/Math.meta b/Packages/com.chisel.node/Chisel/Nodes/Math.meta new file mode 100644 index 000000000..518718085 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/Math.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 73d9bfa6fecbe6945a39a6ad61eda851 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs b/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs new file mode 100644 index 000000000..b6e1c797a --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using XNode; + +namespace Chisel.Nodes +{ + public class Vector3Node : Node + { + [Input] public float x; + [Input] public float y; + [Input] public float z; + [Output] public Vector3 output; + + public ChiselGraph chiselGraph => graph as ChiselGraph; + + public override object GetValue(NodePort port) + { + var x = GetInputValue("x", this.x); + var y = GetInputValue("y", this.y); + var z = GetInputValue("z", this.z); + + return new Vector3(x, y, z); + } + + void OnValidate() + { + chiselGraph.UpdateCSG(); + } + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs.meta b/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs.meta new file mode 100644 index 000000000..02e406cc9 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fc0e9af9ffadcb346b582cd96952763d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From bde82cd30849a03b09e01142aec7ad4c738afff0 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Wed, 20 Jan 2021 09:12:37 +0800 Subject: [PATCH 13/26] Hide property in GraphInstance --- Assets/ChiselNodes/New Chisel Graph.asset | 2 +- Assets/ChiselNodes/NodeTest.unity | 13 +++++++------ .../com.chisel.node/Chisel/ChiselGraphInstance.cs | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 65b871cc5..5f7803bfc 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -230,7 +230,7 @@ MonoBehaviour: _dynamic: 0 property: Name: Center - Value: 0.66 + Value: 0.19 exit: 0 --- !u!114 &-1383906636815730267 MonoBehaviour: diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index befb50035..6cbfb95a7 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -1232,6 +1232,7 @@ MonoBehaviour: graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} meshFilter: {fileID: 479267786} meshRenderer: {fileID: 479267785} + properties: [] --- !u!4 &479267784 Transform: m_ObjectHideFlags: 0 @@ -1312,8 +1313,8 @@ Mesh: firstVertex: 0 vertexCount: 24 localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1.71, y: 0.31, z: 1.44} + m_Center: {x: 0.6600001, y: 0.66, z: 0.6600001} + m_Extent: {x: 1.49, y: 0.31, z: 1.44} m_Shapes: vertices: [] shapes: [] @@ -1330,7 +1331,7 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001200000013000000140000001500000016000000140000001600000017000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 m_VertexData: serializedVersion: 3 m_VertexCount: 24 @@ -1392,7 +1393,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 1152 - _typelessdata: 48e1dabf52b89e3eec51b8bf000000000000803f00000000000080bf0000000000000000000080bfa4700d40ec51f83f48e1da3f52b89e3eec51b83f000000000000803f00000000000080bf0000000000000000000080bf48e19abfd8a370bf48e1da3f52b89e3eec51b8bf000000000000803f00000000000080bf0000000000000000000080bf48e19abfec51f83f48e1dabf52b89e3eec51b83f000000000000803f00000000000080bf0000000000000000000080bfa4700d40d8a370bf48e1dabf52b89ebeec51b83f00000000000080bf000000000000803f0000000000000000000080bf48e19abfd8a370bf48e1da3f52b89ebeec51b8bf00000000000080bf000000000000803f0000000000000000000080bfa4700d40ec51f83f48e1da3f52b89ebeec51b83f00000000000080bf000000000000803f0000000000000000000080bfa4700d40d8a370bf48e1dabf52b89ebeec51b8bf00000000000080bf000000000000803f0000000000000000000080bf48e19abfec51f83f48e1dabf52b89e3eec51b8bf000080bf00000000000000000000000000000000000080bf000080bfec51f83f295c4f3f48e1dabf52b89ebeec51b83f000080bf00000000000000000000000000000000000080bf000080bfd8a370bf5c8f423e48e1dabf52b89e3eec51b83f000080bf00000000000000000000000000000000000080bf000080bfd8a370bf295c4f3f48e1dabf52b89ebeec51b8bf000080bf00000000000000000000000000000000000080bf000080bfec51f83f5c8f423e48e1da3f52b89e3eec51b83f0000803f000000000000000000000000000000000000803f000080bfec51f83f295c4f3f48e1da3f52b89ebeec51b8bf0000803f000000000000000000000000000000000000803f000080bfd8a370bf5c8f423e48e1da3f52b89e3eec51b8bf0000803f000000000000000000000080000000000000803f000080bfd8a370bf295c4f3f48e1da3f52b89ebeec51b83f0000803f000000000000000000000000000000000000803f000080bfec51f83f5c8f423e48e1da3f52b89ebeec51b8bf0000000000000000000080bf0000803f0000000000000000000080bfa4700d405c8f423e48e1dabf52b89ebeec51b8bf0000000000000000000080bf0000803f0000000000000000000080bf48e19abf5c8f423e48e1dabf52b89e3eec51b8bf0000000000000000000080bf0000803f0000000000000000000080bf48e19abf295c4f3f48e1da3f52b89e3eec51b8bf0000000000000000000080bf0000803f0000000000000000000080bfa4700d40295c4f3f48e1da3f52b89e3eec51b83f00000000000000000000803f000080bf0000000000000000000080bf48e19abf295c4f3f48e1dabf52b89e3eec51b83f00000000000000000000803f000080bf0000000000000000000080bfa4700d40295c4f3f48e1dabf52b89ebeec51b83f00000000000000000000803f000080bf0000000000000000000080bfa4700d405c8f423e48e1da3f52b89ebeec51b83f00000000000000000000803f000080bf0000000000000000000080bf48e19abf5c8f423e + _typelessdata: e17a54bfec51783f15ae47bf000000000000803f00000000000080bf0000000000000000000080bf703daa3f0ad7a33f9a990940ec51783f67660640000000000000803f00000000000080bf0000000000000000000080bf3433d3bfceccccbf9a990940ec51783f15ae47bf000000000000803f00000000000080bf0000000000000000000080bf3433d3bf0ad7a33fe17a54bfec51783f67660640000000000000803f00000000000080bf0000000000000000000080bf703daa3fceccccbfe17a54bf3433b33e6766064000000000000080bf000000000000803f0000000000000000000080bfc2f5a8bececcccbf9a9909403433b33e15ae47bf00000000000080bf000000000000803f0000000000000000000080bf9a9929400ad7a33f9a9909403433b33e6766064000000000000080bf000000000000803f0000000000000000000080bf9a992940ceccccbfe17a54bf3433b33e15ae47bf00000000000080bf000000000000803f0000000000000000000080bfc2f5a8be0ad7a33fe17a54bfec51783f15ae47bf000080bf00000000000000000000000000000000000080bf000080bf0ad7a33ff628bc3fe17a54bf3433b33e67660640000080bf00000000000000000000000000000000000080bf000080bfceccccbf9a99593fe17a54bfec51783f67660640000080bf00000000000000000000000000000000000080bf000080bfceccccbff628bc3fe17a54bf3433b33e15ae47bf000080bf00000000000000000000000000000000000080bf000080bf0ad7a33f9a99593f9a990940ec51783f676606400000803f000000000000000000000000000000000000803f000080bf67662640f628bc3f9a9909403433b33e15ae47bf0000803f000000000000000000000000000000000000803f000080bf2a5c8fbe9a99593f9a990940ec51783f15ae47bf0000803f000000000000000000000080000000000000803f000080bf2a5c8fbef628bc3f9a9909403433b33e676606400000803f000000000000000000000000000000000000803f000080bf676626409a99593fe17a54bf3433b33e15ae47bf0000000000000000000080bf0000803f0000000000000000000080bfc2f5a8be9a99593f9a990940ec51783f15ae47bf0000000000000000000080bf0000803f0000000000000000000080bf9a992940f628bc3f9a9909403433b33e15ae47bf0000000000000000000080bf0000803f0000000000000000000080bf9a9929409a99593fe17a54bfec51783f15ae47bf0000000000000000000080bf0000803f0000000000000000000080bfc2f5a8bef628bc3fe17a54bfec51783f6766064000000000000000000000803f000080bf0000000000000000000080bf703daa3ff628bc3f9a9909403433b33e6766064000000000000000000000803f000080bf0000000000000000000080bf3433d3bf9a99593f9a990940ec51783f6766064000000000000000000000803f000080bf0000000000000080000080bf3433d3bff628bc3fe17a54bf3433b33e6766064000000000000000000000803f000080bf0000000000000000000080bf703daa3f9a99593f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -1446,8 +1447,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1.71, y: 0.31, z: 1.44} + m_Center: {x: 0.6600001, y: 0.66, z: 0.6600001} + m_Extent: {x: 1.49, y: 0.31, z: 1.44} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs index 0c6d50d6d..a01117896 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -14,6 +14,7 @@ public class ChiselGraphInstance : MonoBehaviour public MeshRenderer meshRenderer; public bool IsDirty { get; set; } + [HideInInspector] public List properties; CSGTree tree; From 9424b3596c273ccf0d06287e6254fb6863576bbe Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Wed, 20 Jan 2021 12:04:42 +0800 Subject: [PATCH 14/26] Implemented overridable editor GUI --- Assets/ChiselGraphInstance.prefab | 99 +++++++++++++++++ Assets/ChiselGraphInstance.prefab.meta | 7 ++ Assets/ChiselNodes/New Chisel Graph.asset | 7 +- .../com.chisel.node/Chisel/ChiselGraph.cs | 6 + .../Editor/ChiselGraphInstanceEditor.cs | 103 +++++++++++++++++- .../Chisel/Editor/ChiselGrpahEditorStyles.cs | 51 +++++++++ .../Editor/ChiselGrpahEditorStyles.cs.meta | 11 ++ .../Chisel/Nodes/FloatPropertyNode.cs | 14 +-- .../Chisel/Nodes/PropertyNode.cs | 20 ++++ .../Chisel/Nodes/PropertyNode.cs.meta | 11 ++ 10 files changed, 307 insertions(+), 22 deletions(-) create mode 100644 Assets/ChiselGraphInstance.prefab create mode 100644 Assets/ChiselGraphInstance.prefab.meta create mode 100644 Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs create mode 100644 Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs.meta create mode 100644 Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs create mode 100644 Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs.meta diff --git a/Assets/ChiselGraphInstance.prefab b/Assets/ChiselGraphInstance.prefab new file mode 100644 index 000000000..87c76063b --- /dev/null +++ b/Assets/ChiselGraphInstance.prefab @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3144103473529927222 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3144103473529927224} + - component: {fileID: 3144103473529927223} + - component: {fileID: 3144103473529927226} + - component: {fileID: 3144103473529927225} + m_Layer: 0 + m_Name: ChiselGraphInstance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3144103473529927224 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3144103473529927222} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.055} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3144103473529927223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3144103473529927222} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7112759bb6d84f45890aef9caadedbe, type: 3} + m_Name: + m_EditorClassIdentifier: + graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} + meshFilter: {fileID: 3144103473529927226} + meshRenderer: {fileID: 3144103473529927225} +--- !u!33 &3144103473529927226 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3144103473529927222} + m_Mesh: {fileID: 0} +--- !u!23 &3144103473529927225 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3144103473529927222} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/ChiselGraphInstance.prefab.meta b/Assets/ChiselGraphInstance.prefab.meta new file mode 100644 index 000000000..60bdf8cdd --- /dev/null +++ b/Assets/ChiselGraphInstance.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 59398c94f7e9adb4bb81f07189d54fbc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 5f7803bfc..ecac78c8a 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -230,7 +230,8 @@ MonoBehaviour: _dynamic: 0 property: Name: Center - Value: 0.19 + overrideValue: 0 + Value: 2.57 exit: 0 --- !u!114 &-1383906636815730267 MonoBehaviour: @@ -295,8 +296,6 @@ MonoBehaviour: - {fileID: -6880739622989829563} active: {fileID: 3873916941957806223} instance: {fileID: 0} - properties: - - Name: Center --- !u!114 &3873916941957806223 MonoBehaviour: m_ObjectHideFlags: 0 @@ -362,7 +361,7 @@ MonoBehaviour: _dynamic: 0 operation: 0 center: {x: 0, y: 0, z: 0} - size: {x: 2.98, y: 0.62, z: 2.88} + size: {x: 2.11, y: 0.62, z: 2.88} --- !u!114 &6654120812992344769 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.node/Chisel/ChiselGraph.cs index e0d60300f..413a1310a 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs @@ -24,6 +24,12 @@ public void UpdateCSG() if (instance != null) instance.IsDirty = true; + if (properties == null) + properties = new List(); + + if (instance != null && instance.properties == null) + instance.properties = new List(); + properties.Clear(); instance?.properties.Clear(); foreach (var node in nodes) diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs index 28e614c76..801e213c1 100644 --- a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs @@ -1,4 +1,8 @@ +using System; +using System.Collections.Generic; +using System.Linq; using UnityEditor; +using UnityEditor.Callbacks; using UnityEngine; using XNodeEditor; @@ -32,11 +36,7 @@ public override void OnInspectorGUI() EditorGUI.BeginChangeCheck(); - foreach (var property in instance.properties) - if (property is FloatProperty floatProperty) - { - floatProperty.Value = EditorGUILayout.FloatField(floatProperty.Name, floatProperty.Value); - } + ChiselGraphPropertyEditor.OnGUI(instance); if (EditorGUI.EndChangeCheck()) { @@ -45,4 +45,97 @@ public override void OnInspectorGUI() } } } + + public class ChiselGraphPropertyEditor + { + static Dictionary s_ParameterDrawers; + + static ChiselGraphPropertyEditor() + { + s_ParameterDrawers = new Dictionary(); + ReloadDecoratorTypes(); + } + + [DidReloadScripts] + static void OnEditorReload() + { + ReloadDecoratorTypes(); + } + + static void ReloadDecoratorTypes() + { + s_ParameterDrawers.Clear(); + + // Look for all the valid parameter drawers + var types = GetAllTypesDerivedFrom() + .Where( + t => t.IsDefined(typeof(GraphPropertyDrawerAttribute), false) + && !t.IsAbstract + ); + + // Store them + foreach (var type in types) + { + var attr = (GraphPropertyDrawerAttribute)type.GetCustomAttributes(typeof(GraphPropertyDrawerAttribute), false)[0]; + var decorator = (ChiselGraphPropertyDrawer)Activator.CreateInstance(type); + s_ParameterDrawers.Add(attr.propertyType, decorator); + } + } + + public static void OnGUI(ChiselGraphInstance instance) + { + if (instance.properties != null) + foreach (var property in instance.properties) + using (new EditorGUILayout.HorizontalScope()) + { + DrawOverrideCheckbox(property); + s_ParameterDrawers.TryGetValue(property.GetType(), out var drawer); + + if (drawer != null) + using (new EditorGUI.DisabledScope(!property.overrideValue)) + drawer.OnGUI(property); + } + } + + static void DrawOverrideCheckbox(GraphProperty property) + { + var overrideRect = GUILayoutUtility.GetRect(17f, 17f, GUILayout.ExpandWidth(false)); + overrideRect.yMin += 4f; + property.overrideValue = GUI.Toggle(overrideRect, property.overrideValue, EditorGUIUtility.TrTextContent("", "Override this setting for this volume."), ChiselGrpahEditorStyles.smallTickbox); + } + + public static IEnumerable GetAllTypesDerivedFrom() + { +#if UNITY_EDITOR && UNITY_2019_2_OR_NEWER + return TypeCache.GetTypesDerivedFrom(); +#else + return GetAllAssemblyTypes().Where(t => t.IsSubclassOf(typeof(T))); +#endif + } + } + + [GraphPropertyDrawer(typeof(FloatProperty))] + sealed class FloatPropertyDrawer : ChiselGraphPropertyDrawer + { + public override void OnGUI(GraphProperty property) + { + var floatProperty = property as FloatProperty; + floatProperty.Value = EditorGUILayout.FloatField(property.Name, floatProperty.Value); + } + } + + public abstract class ChiselGraphPropertyDrawer + { + public abstract void OnGUI(GraphProperty parameter); + } + + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)] + public sealed class GraphPropertyDrawerAttribute : Attribute + { + public readonly Type propertyType; + public GraphPropertyDrawerAttribute(Type propertyType) + { + this.propertyType = propertyType; + } + } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs b/Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs new file mode 100644 index 000000000..9d557b2f2 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs @@ -0,0 +1,51 @@ +using UnityEditor; +using UnityEngine; + +namespace Chisel.Nodes +{ + public static class ChiselGrpahEditorStyles + { + /// Style for a small checkbox + public static readonly GUIStyle smallTickbox; + /// Style for a small checkbox in mixed state + public static readonly GUIStyle smallMixedTickbox; + /// Style for a minilabel button + public static readonly GUIStyle miniLabelButton; + + static readonly Texture2D paneOptionsIconDark; + static readonly Texture2D paneOptionsIconLight; + + /// PaneOption icon + public static Texture2D paneOptionsIcon { get { return EditorGUIUtility.isProSkin ? paneOptionsIconDark : paneOptionsIconLight; } } + + static ChiselGrpahEditorStyles() + { + smallTickbox = new GUIStyle("ShurikenToggle"); + smallMixedTickbox = new GUIStyle("ShurikenToggleMixed"); + + var transparentTexture = new Texture2D(1, 1, TextureFormat.ARGB32, false); + transparentTexture.SetPixel(0, 0, Color.clear); + transparentTexture.Apply(); + + miniLabelButton = new GUIStyle(EditorStyles.miniLabel); + miniLabelButton.normal = new GUIStyleState + { + background = transparentTexture, + scaledBackgrounds = null, + textColor = Color.grey + }; + var activeState = new GUIStyleState + { + background = transparentTexture, + scaledBackgrounds = null, + textColor = Color.white + }; + miniLabelButton.active = activeState; + miniLabelButton.onNormal = activeState; + miniLabelButton.onActive = activeState; + + paneOptionsIconDark = (Texture2D)EditorGUIUtility.Load("Builtin Skins/DarkSkin/Images/pane options.png"); + paneOptionsIconLight = (Texture2D)EditorGUIUtility.Load("Builtin Skins/LightSkin/Images/pane options.png"); + } + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs.meta b/Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs.meta new file mode 100644 index 000000000..31c4de646 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2aa3cbfbbe71f8646ba596d5817935a6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs b/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs index f173f593a..b46f590e8 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using UnityEngine; using XNode; namespace Chisel.Nodes @@ -16,22 +15,11 @@ public override object GetValue(NodePort port) } } - [Serializable] - public class GraphProperty - { - public string Name; - } + [Serializable] public class FloatProperty : GraphProperty { public float Value; } - - public class PropertyNode : Node where T:GraphProperty - { - [HideInInspector] - public T property; - public ChiselGraph chiselGraph => graph as ChiselGraph; - } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs b/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs new file mode 100644 index 000000000..fb30c7c0b --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs @@ -0,0 +1,20 @@ +using System; +using UnityEngine; +using XNode; + +namespace Chisel.Nodes +{ + public class PropertyNode : Node where T:GraphProperty + { + [HideInInspector] + public T property; + public ChiselGraph chiselGraph => graph as ChiselGraph; + } + + [Serializable] + public abstract class GraphProperty + { + public string Name; + public bool overrideValue; + } +} \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs.meta b/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs.meta new file mode 100644 index 000000000..c58bea975 --- /dev/null +++ b/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3825029d157cff74893fdb4dec60ce09 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 0363177a266a5ebf9b5f61f61812704c8714222c Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Wed, 20 Jan 2021 15:25:37 +0800 Subject: [PATCH 15/26] Implemented overridable properties --- Assets/ChiselNodes/New Chisel Graph.asset | 6 +-- .../com.chisel.node/Chisel/ChiselGraph.cs | 25 ++++++----- .../Chisel/ChiselGraphInstance.cs | 44 ++++++++++++++++++- .../Editor/ChiselGraphInstanceEditor.cs | 3 +- .../Chisel/Nodes/FloatPropertyNode.cs | 8 ++-- 5 files changed, 66 insertions(+), 20 deletions(-) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index ecac78c8a..8a8d95b72 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -231,7 +231,7 @@ MonoBehaviour: property: Name: Center overrideValue: 0 - Value: 2.57 + Value: 1.85 exit: 0 --- !u!114 &-1383906636815730267 MonoBehaviour: @@ -294,7 +294,7 @@ MonoBehaviour: - {fileID: -1383906636815730267} - {fileID: -1856057758424149880} - {fileID: -6880739622989829563} - active: {fileID: 3873916941957806223} + active: {fileID: 6654120812992344769} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: @@ -361,7 +361,7 @@ MonoBehaviour: _dynamic: 0 operation: 0 center: {x: 0, y: 0, z: 0} - size: {x: 2.11, y: 0.62, z: 2.88} + size: {x: 0.51, y: 0.62, z: 2.88} --- !u!114 &6654120812992344769 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.node/Chisel/ChiselGraph.cs index 413a1310a..3c3a1af0a 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs @@ -21,23 +21,16 @@ public void SetActiveNode(ChiselGraphNode node) public void UpdateCSG() { - if (instance != null) - instance.IsDirty = true; - if (properties == null) properties = new List(); - if (instance != null && instance.properties == null) - instance.properties = new List(); - properties.Clear(); - instance?.properties.Clear(); foreach (var node in nodes) if (node is FloatPropertyNode floatNode) - { - instance?.properties.Add(floatNode.property); properties.Add(floatNode.property); - } + + if (instance != null) + instance.IsDirty = true; } public void CollectTreeNode(CSGTree tree) @@ -46,5 +39,17 @@ public void CollectTreeNode(CSGTree tree) active.ParseNode(branch); tree.Add(branch); } + + public T GetOverriddenProperty(string key) where T : GraphProperty + { + if (instance == null) return null; + + if (instance.overriddenProperties == null) + instance.UpdateProperties(); + + if (instance.overriddenProperties.ContainsKey(key)) + return instance.overriddenProperties[key] as T; + return null; + } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs index a01117896..76702fbca 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -1,5 +1,7 @@ using Chisel.Core; +using System; using System.Collections.Generic; +using System.Reflection; using Unity.Collections; using Unity.Jobs; using UnityEngine; @@ -14,8 +16,8 @@ public class ChiselGraphInstance : MonoBehaviour public MeshRenderer meshRenderer; public bool IsDirty { get; set; } - [HideInInspector] public List properties; + public Dictionary overriddenProperties; CSGTree tree; List meshes; @@ -34,7 +36,45 @@ void Update() void OnValidate() { graph.instance = this; - UpdateCSG(); + + if (properties == null || graph.properties.Count != properties.Count) + InitProperties(); + + for (int i = 0; i < graph.properties.Count; i++) + { + if (graph.properties[i].Name != properties[i].Name) + InitProperties(); + } + } + + void InitProperties() + { + properties = new List(); + foreach (var property in graph.properties) + properties.Add(Clone(property)); + UpdateProperties(); + } + + GraphProperty Clone(GraphProperty source) + { + var newProperty = Activator.CreateInstance(source.GetType()) as GraphProperty; + var fields = source.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance); + + foreach (var info in fields) + info.SetValue(newProperty, info.GetValue(source)); + + return newProperty; + } + + public void UpdateProperties() + { + if (overriddenProperties == null) + overriddenProperties = new Dictionary(); + overriddenProperties.Clear(); + + foreach (var property in properties) + if (property.overrideValue) + overriddenProperties[property.Name] = property; } public void UpdateCSG() diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs index 801e213c1..26ef351ed 100644 --- a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs @@ -41,6 +41,7 @@ public override void OnInspectorGUI() if (EditorGUI.EndChangeCheck()) { instance.IsDirty = true; + instance.UpdateProperties(); instance.UpdateCSG(); } } @@ -101,7 +102,7 @@ static void DrawOverrideCheckbox(GraphProperty property) { var overrideRect = GUILayoutUtility.GetRect(17f, 17f, GUILayout.ExpandWidth(false)); overrideRect.yMin += 4f; - property.overrideValue = GUI.Toggle(overrideRect, property.overrideValue, EditorGUIUtility.TrTextContent("", "Override this setting for this volume."), ChiselGrpahEditorStyles.smallTickbox); + property.overrideValue = GUI.Toggle(overrideRect, property.overrideValue, EditorGUIUtility.TrTextContent("", "Override this setting."), ChiselGrpahEditorStyles.smallTickbox); } public static IEnumerable GetAllTypesDerivedFrom() diff --git a/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs b/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs index b46f590e8..9d860d12b 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs @@ -1,6 +1,4 @@ using System; -using System.Collections; -using System.Collections.Generic; using XNode; namespace Chisel.Nodes @@ -11,12 +9,14 @@ public class FloatPropertyNode : PropertyNode public override object GetValue(NodePort port) { + var overridden = chiselGraph.GetOverriddenProperty(property.Name); + if (overridden != null) + return overridden.Value; + return property.Value; } } - - [Serializable] public class FloatProperty : GraphProperty { From 834dac9b795a164b4cf39e2b1819abb60c765768 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Wed, 20 Jan 2021 15:32:28 +0800 Subject: [PATCH 16/26] Handle multiple instance --- Assets/ChiselNodes/New Chisel Graph.asset | 4 +- Assets/ChiselNodes/NodeTest.unity | 798 ++++++++++++------ .../Chisel/ChiselGraphInstance.cs | 7 +- 3 files changed, 537 insertions(+), 272 deletions(-) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 8a8d95b72..57400ea01 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -294,7 +294,7 @@ MonoBehaviour: - {fileID: -1383906636815730267} - {fileID: -1856057758424149880} - {fileID: -6880739622989829563} - active: {fileID: 6654120812992344769} + active: {fileID: -1383906636815730267} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: @@ -361,7 +361,7 @@ MonoBehaviour: _dynamic: 0 operation: 0 center: {x: 0, y: 0, z: 0} - size: {x: 0.51, y: 0.62, z: 2.88} + size: {x: 0.85, y: 0.62, z: 2.88} --- !u!114 &6654120812992344769 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index 6cbfb95a7..f5edf9d62 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -439,6 +439,103 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &94382524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 94382528} + - component: {fileID: 94382527} + - component: {fileID: 94382526} + - component: {fileID: 94382525} + m_Layer: 0 + m_Name: ChiselGraphInstance (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &94382525 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94382524} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &94382526 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94382524} + m_Mesh: {fileID: 1536033006} +--- !u!114 &94382527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94382524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7112759bb6d84f45890aef9caadedbe, type: 3} + m_Name: + m_EditorClassIdentifier: + graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} + meshFilter: {fileID: 94382526} + meshRenderer: {fileID: 94382525} +--- !u!4 &94382528 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94382524} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.9, y: 0, z: -0.055} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &164276715 Mesh: m_ObjectHideFlags: 0 @@ -838,6 +935,170 @@ Mesh: offset: 0 size: 0 path: +--- !u!43 &339728852 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 1.85, y: 1.85, z: 1.8499999} + m_Extent: {x: 0.42500007, y: 0.31000006, z: 1.44} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000060000000700000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 6666b63f713d0a4084ebd13e000000000000803f00000000000080bf0000000000000000000080bfcccc6cbff051b83d9a991140713d0a405c8f5240000000000000803f00000000000080bf0000000000000000000080bf3433e3bf5c8f32c09a991140713d0a4084ebd13e000000000000803f00000000000080bf0000000000000000000080bf3433e3bff051b83d6666b63f713d0a405c8f5240000000000000803f00000000000080bf0000000000000000000080bfcccc6cbf5c8f32c09a991140b81ec53f5c8f524000000000000080bf000000000000803f0000000000000000000080bf9a9931405c8f32c06666b63fb81ec53f5c8f524000000000000080bf000000000000803f0000000000000080000080bf6666f63f5c8f32c06666b63fb81ec53f84ebd13e00000000000080bf000000000000803f0000000000000000000080bf6666f63ff051b83d9a991140b81ec53f84ebd13e00000000000080bf000000000000803f0000000000000000000080bf9a993140f051b83d6666b63f713d0a4084ebd13e000080bf00000000000000000000000000000000000080bf000080bff051b83d713d2a406666b63fb81ec53f5c8f5240000080bf00000000000000000000000000000000000080bf000080bf5c8f32c05c8f02406666b63f713d0a405c8f5240000080bf00000000000000000000000000000000000080bf000080bf5c8f32c0713d2a406666b63fb81ec53f84ebd13e000080bf00000000000000000000000000000000000080bf000080bff051b83d5c8f02409a991140713d0a405c8f52400000803f000000000000000000000000000000000000803f000080bf5c8f7240713d2a409a991140b81ec53f84ebd13e0000803f000000000000000000000000000000000000803f000080bfc2f5683f5c8f02409a991140713d0a4084ebd13e0000803f000000000000000000000080000000000000803f000080bfc2f5683f713d2a409a991140b81ec53f5c8f52400000803f000000000000000000000000000000000000803f000080bf5c8f72405c8f02406666b63fb81ec53f84ebd13e0000000000000000000080bf0000803f0000000000000000000080bf6666f63f5c8f02409a991140713d0a4084ebd13e0000000000000000000080bf0000803f0000000000000000000080bf9a993140713d2a409a991140b81ec53f84ebd13e0000000000000000000080bf0000803f0000000000000000000080bf9a9931405c8f02406666b63f713d0a4084ebd13e0000000000000000000080bf0000803f0000000000000000000080bf6666f63f713d2a406666b63f713d0a405c8f524000000000000000000000803f000080bf0000000000000000000080bfcccc6cbf713d2a409a991140b81ec53f5c8f524000000000000000000000803f000080bf0000000000000000000080bf3433e3bf5c8f02409a991140713d0a405c8f524000000000000000000000803f000080bf0000000000000080000080bf3433e3bf713d2a406666b63fb81ec53f5c8f524000000000000000000000803f000080bf0000000000000000000080bfcccc6cbf5c8f0240 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 1.85, y: 1.85, z: 1.8499999} + m_Extent: {x: 0.42500007, y: 0.31000006, z: 1.44} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &352119801 GameObject: m_ObjectHideFlags: 8 @@ -1191,275 +1452,110 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 459191710} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &479267782 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 479267784} - - component: {fileID: 479267783} - - component: {fileID: 479267786} - - component: {fileID: 479267785} - m_Layer: 0 - m_Name: ChiselGraphInstance - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &479267783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 479267782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b7112759bb6d84f45890aef9caadedbe, type: 3} - m_Name: - m_EditorClassIdentifier: - graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} - meshFilter: {fileID: 479267786} - meshRenderer: {fileID: 479267785} - properties: [] ---- !u!4 &479267784 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 479267782} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.055} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &479267785 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 479267782} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &479267786 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 479267782} - m_Mesh: {fileID: 552957820} ---- !u!43 &552957820 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0.6600001, y: 0.66, z: 0.6600001} - m_Extent: {x: 1.49, y: 0.31, z: 1.44} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: e17a54bfec51783f15ae47bf000000000000803f00000000000080bf0000000000000000000080bf703daa3f0ad7a33f9a990940ec51783f67660640000000000000803f00000000000080bf0000000000000000000080bf3433d3bfceccccbf9a990940ec51783f15ae47bf000000000000803f00000000000080bf0000000000000000000080bf3433d3bf0ad7a33fe17a54bfec51783f67660640000000000000803f00000000000080bf0000000000000000000080bf703daa3fceccccbfe17a54bf3433b33e6766064000000000000080bf000000000000803f0000000000000000000080bfc2f5a8bececcccbf9a9909403433b33e15ae47bf00000000000080bf000000000000803f0000000000000000000080bf9a9929400ad7a33f9a9909403433b33e6766064000000000000080bf000000000000803f0000000000000000000080bf9a992940ceccccbfe17a54bf3433b33e15ae47bf00000000000080bf000000000000803f0000000000000000000080bfc2f5a8be0ad7a33fe17a54bfec51783f15ae47bf000080bf00000000000000000000000000000000000080bf000080bf0ad7a33ff628bc3fe17a54bf3433b33e67660640000080bf00000000000000000000000000000000000080bf000080bfceccccbf9a99593fe17a54bfec51783f67660640000080bf00000000000000000000000000000000000080bf000080bfceccccbff628bc3fe17a54bf3433b33e15ae47bf000080bf00000000000000000000000000000000000080bf000080bf0ad7a33f9a99593f9a990940ec51783f676606400000803f000000000000000000000000000000000000803f000080bf67662640f628bc3f9a9909403433b33e15ae47bf0000803f000000000000000000000000000000000000803f000080bf2a5c8fbe9a99593f9a990940ec51783f15ae47bf0000803f000000000000000000000080000000000000803f000080bf2a5c8fbef628bc3f9a9909403433b33e676606400000803f000000000000000000000000000000000000803f000080bf676626409a99593fe17a54bf3433b33e15ae47bf0000000000000000000080bf0000803f0000000000000000000080bfc2f5a8be9a99593f9a990940ec51783f15ae47bf0000000000000000000080bf0000803f0000000000000000000080bf9a992940f628bc3f9a9909403433b33e15ae47bf0000000000000000000080bf0000803f0000000000000000000080bf9a9929409a99593fe17a54bfec51783f15ae47bf0000000000000000000080bf0000803f0000000000000000000080bfc2f5a8bef628bc3fe17a54bfec51783f6766064000000000000000000000803f000080bf0000000000000000000080bf703daa3ff628bc3f9a9909403433b33e6766064000000000000000000000803f000080bf0000000000000000000080bf3433d3bf9a99593f9a990940ec51783f6766064000000000000000000000803f000080bf0000000000000080000080bf3433d3bff628bc3fe17a54bf3433b33e6766064000000000000000000000803f000080bf0000000000000000000080bf703daa3f9a99593f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0.6600001, y: 0.66, z: 0.6600001} - m_Extent: {x: 1.49, y: 0.31, z: 1.44} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &479267782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 479267784} + - component: {fileID: 479267783} + - component: {fileID: 479267786} + - component: {fileID: 479267785} + m_Layer: 0 + m_Name: ChiselGraphInstance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &479267783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479267782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7112759bb6d84f45890aef9caadedbe, type: 3} + m_Name: + m_EditorClassIdentifier: + graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} + meshFilter: {fileID: 479267786} + meshRenderer: {fileID: 479267785} +--- !u!4 &479267784 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479267782} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.055} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &479267785 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479267782} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &479267786 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479267782} + m_Mesh: {fileID: 339728852} --- !u!1 &650786225 GameObject: m_ObjectHideFlags: 24 @@ -3726,6 +3822,170 @@ Mesh: offset: 0 size: 0 path: +--- !u!43 &1536033006 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 216 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 108 + localAABB: + m_Center: {x: 0, y: 0, z: 0.5} + m_Extent: {x: 1, y: 1, z: 1.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d00000010000000110000001200000010000000120000001300000014000000150000001600000014000000170000001500000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001e0000001f00000020000000210000002200000020000000230000002100000024000000250000002600000024000000270000002500000028000000290000002a000000280000002b000000290000002c0000002d0000002e0000002c0000002f0000002d000000300000002d0000002f00000031000000300000002f0000003200000030000000310000003200000033000000300000003400000035000000360000003400000037000000350000003500000037000000380000003900000035000000380000003a00000039000000380000003a0000003b000000390000003c0000003d0000003e0000003c0000003f0000003d00000040000000410000004200000041000000430000004200000044000000420000004300000044000000450000004200000044000000460000004500000046000000470000004500000040000000470000004600000041000000400000004600000048000000490000004a000000490000004b0000004a0000004c0000004d0000004e0000004f0000005000000051000000500000004c00000051000000510000004c0000004e00000052000000500000004f00000053000000520000004f0000005400000055000000560000005500000057000000560000005700000055000000580000005800000055000000590000005a0000005b0000005c0000005a0000005c0000005d0000005d000000590000005a0000005d0000005e00000059000000590000005e000000580000005e0000005f0000005800000060000000610000006200000061000000630000006200000064000000650000006600000063000000610000006400000067000000630000006400000067000000640000006600000068000000690000006a0000006a0000006b000000680000006b0000006a000000670000006b0000006700000066000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 108 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 5184 + _typelessdata: 703d0a3e52b85e3f0000803f00000000ffff7f3f00000000000080bf0000000000000000000080bf48e1ba3e000000bff6287c3f52b85e3f0000004000000000ffff7f3f00000000000080bf0000000000000000000080bfec51f8be0000c0bff6287c3f52b85e3f0000803f00000000ffff7f3f00000000000080bf0000000000000000000080bfec51f8be000000bf703d0a3e52b85e3f0000004000000000ffff7f3f00000000000080bf0000000000000000000080bf48e1ba3e0000c0bf703d0a3e52b85e3f000000bf00000000ffff7f3f00000000000080bf0000000000000000000080bf48e1ba3e0000803ff6287c3f52b85e3f0000003f00000000ffff7f3f00000000000080bf0000000000000000000080bfec51f8be00000000f6287c3f52b85e3f000000bf00000000ffff7f3f00000000000080bf0000000000000000000080bfec51f8be0000803f703d0a3e52b85e3f0000003f00000000ffff7f3f00000000000080bf0000000000000000000080bf48e1ba3e00000000703d0a3e0000803e0000004000000000ffff7fbf000000000000803f0000000000000000000080bf5c8f223f0000c0bff6287c3f0000803e0000803f00000000ffff7fbf000000000000803f0000000000000000000080bf7b14be3f000000bff6287c3f0000803e0000004000000000ffff7fbf000000000000803f0000000000000000000080bf7b14be3f0000c0bf703d0a3e0000803e0000803f00000000ffff7fbf000000000000803f0000000000000000000080bf5c8f223f000000bf703d0a3e52b85e3f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf295caf3f703d0a3e0000803e00000040000080bf00000000000000000000000000000000000080bf000080bf0000c0bf0000403f703d0a3e52b85e3f00000040000080bf00000000000000000000000000000000000080bf000080bf0000c0bf295caf3f703d0a3e0000803e0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000403f703d0a3e52b85e3f0000003f000080bf00000000000000000000000000000000000080bf000080bf00000000295caf3f703d0a3e52b85e3f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f295caf3f703d0a3ea4703d3f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f52b89e3f703d0a3ea4703d3f0000003f000080bf00000000000000000000000000000000000080bf000080bf0000000052b89e3ff6287c3f52b85e3f000000400000803f000000000000000000000000000000000000803f000080bf00002040295caf3ff6287c3f0000803e0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000403ff6287c3f52b85e3f0000803f0000803f000000000000000000000080000000000000803f000080bf0000c03f295caf3ff6287c3f0000803e000000400000803f000000000000000000000000000000000000803f000080bf000020400000403ff6287c3f52b85e3f0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f295caf3ff6287c3ff628dc3e000000bf0000803f000000000000000000000000000000000000803f000080bf000000007b146e3ff6287c3f52b85e3f000000bf0000803f000000000000000000000080000000000000803f000080bf00000000295caf3ff6287c3ff628dc3e0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f7b146e3ff6287c3f52b85e3f0000004000000000000000000000803f000080bf0000000000000000000080bfec51f8be295caf3f703d0a3e52b85e3f0000004000000000000000000000803f000080bf0000000000000000000080bf48e1ba3e295caf3f703d0a3e0000803e0000004000000000000000000000803f000080bf0000000000000000000080bf48e1ba3e0000403ff6287c3f0000803e0000004000000000000000000000803f000080bf0000000000000000000080bfec51f8be0000403f000080bf0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000000000803f0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bf0000803f0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf000000bf00000000000080bf0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000bf000080bf0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f0000803f0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000803f0000803f0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000c03f000080bf0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000803f000080bf000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf0000803f000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf000080bf000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000c03f000080bff628dc3e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f7b146e3f000080bf0000803f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000c03f000080bf000080bf000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f000000bf000080bff628dc3e0000003f000080bf00000000000000000000000000000000000080bf000080bf000000007b146e3f000080bf000080bf0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf000000bf000080bf0000803f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000c03f000080bf0000803f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000c03f0000803f0000803f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000c03f0000803ff628dc3e0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f7b146e3f0000803f0000803f0000003f0000803f000000000000000000000080000000000000803f000080bf0000803f0000c03f0000803f000080bf0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f000000bf0000803f000080bf000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf000000bf0000803ff628dc3e000000bf0000803f000000000000000000000000000000000000803f000080bf000000007b146e3f0000803f0000803f000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf0000c03f0000803f0000803f000000bf0000803f000000000000000000000000000000000000803f000080bf000000000000c03f000080bf000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf000000bf0000803f0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f000000bf000080bf0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f0000803f00000000000000000000803f000080bf0b3e812300000000000080bf0000c03f0000c03f703d0a3e52b85e3f0000803f00000000000000000000803f000080bf0b3e812300000000000080bf48e1ba3e295caf3f0000803f0000803f0000803f0000000000000000ffff7f3f000080bf0000000000000080000080bf000000bf0000c03ff6287c3f52b85e3f0000803f00000000000000000000803f000080bf35a834a800000000000080bfec51f8be295caf3ff6287c3f0000803e0000803f00000000000000000000803f000080bf0000000000000000000080bfec51f8be0000403f0000803f000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf000000bf703d0a3e0000803e0000803f00000000000000000000803f000080bf0b3e812300000000000080bf48e1ba3e0000403f000080bf000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f000000bf0000803ff628dc3e000000bf000000000000803f000000000000803f00000080000000000000803f0000c03f0000803ff6287c3ff628dc3e000000bf000000000000803f000000000000803f00000000000000000000803f7b14be3f0000803f0000803ff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f0000c03f00000000f6287c3ff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f7b14be3f0000000014ae47bef628dc3e000000bf000000000000803f000000000000803f00000000000000000000803ff6289c3e0000803f000080bff628dc3e000000bf000000000000803f000000000000803f00000080000000000000803f000000bf0000803f000080bff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f000000bf00000000703d0a3ef628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f5c8f223f00000000703d0a3ef628dc3e000000bf000000000000803f000000000000803f00000080000000000000803f5c8f223f0000803f14ae47bef628dc3e0000003f000000000000803f000000000000803f00000000000000000000803ff6289c3e0000000014ae473ef628dc3e000000bf000000000000803f000000000000803f00000000000000000000803f85eb313f0000803f14ae473ef628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f85eb313f0000000014ae473ea4703d3f000000bf00000000000000000000803f0000803f00000000000000000000803f85eb313f52b89e3f703d0a3ea4703d3f000000bf00000000000000000000803f0000803fded60726000000000000803f5c8f223f52b89e3f14ae473ef628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f85eb313f7b146e3f703d0a3ef628dc3e000000bf0000000000000000ffff7f3f0000803f00000000000000000000803f5c8f223f7b146e3f14ae47bef628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803ff6289c3e7b146e3f703d0a3e52b85e3f000000bf00000000000000000000803f0000803ff99e5923000000000000803f5c8f223f295caf3ff6287c3f52b85e3f000000bf00000000000000000000803f0000803f00000000000000000000803f7b14be3f295caf3ff6287c3ff628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f7b14be3f7b146e3f0000803ff628dc3e000000bf0000000000000000ffff7f3f0000803f00000000000000000000803f0000c03f7b146e3f0000803f0000803f000000bf00000000000000000000803f0000803f00000000000000000000803f0000c03f0000c03f000080bf0000803f000000bf00000000000000000000803f0000803f00000000000000000000803f000000bf0000c03f000080bff628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f000000bf7b146e3f14ae473ef628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803ff6289c3e7b146e3f703d0a3ef628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803f48e1ba3e7b146e3f14ae473ea4703d3f0000003f0000000000000000000080bf000080bf00000000000000000000803ff6289c3e52b89e3f703d0a3ea4703d3f0000003f0000000000000000000080bf000080bf00000000000000000000803f48e1ba3e52b89e3f14ae47bef628dc3e0000003f0000000000000000000080bf000080bff99e59a3000000000000803f85eb313f7b146e3f000080bff628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803f0000c03f7b146e3f000080bf0000803f0000003f0000000000000000000080bf000080bf00000000000000000000803f0000c03f0000c03f703d0a3e52b85e3f0000003f0000000000000000000080bf000080bf00000000000000000000803f48e1ba3e295caf3f0000803ff628dc3e0000003f0000000000000000ffff7fbf000080bf00000000000000000000803f000000bf7b146e3ff6287c3ff628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803fec51f8be7b146e3ff6287c3f52b85e3f0000003f0000000000000000000080bf000080bf00000000000000000000803fec51f8be295caf3f0000803f0000803f0000003f0000000000000000000080bf000080bf00000000000000000000803f000000bf0000c03f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0.5} + m_Extent: {x: 1, y: 1, z: 1.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1658714170 GameObject: m_ObjectHideFlags: 8 diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs index 76702fbca..f9369528b 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -82,6 +82,8 @@ public void UpdateCSG() if (!IsDirty) return; IsDirty = false; + graph.instance = this; + if (!tree.Valid) tree = CSGTree.Create(GetInstanceID()); else @@ -98,6 +100,9 @@ int finishMeshUpdates(CSGTree tree, NativeList renderMeshes, JobHandle dependencies) { + if (this.tree != tree) + return 0; + dependencies.Complete(); if (meshes == null || meshes.Count != meshDataArray.Length) @@ -114,7 +119,7 @@ int finishMeshUpdates(CSGTree tree, meshes[1].RecalculateBounds(); meshFilter.mesh = meshes[1]; - return 1; + return 0; } public void Rebuild() From 3f1155a9214c899d642962e1c16acb2f58bd1d95 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Wed, 20 Jan 2021 16:48:02 +0800 Subject: [PATCH 17/26] Property create and destroy update --- Assets/ChiselNodes/New Chisel Graph.asset | 76 ++++- Assets/ChiselNodes/NodeTest.unity | 286 ++---------------- .../com.chisel.node/Chisel/ChiselGraph.cs | 20 +- .../Chisel/ChiselGraphInstance.cs | 3 - .../Editor/ChiselGraphInstanceEditor.cs | 6 +- .../Chisel/Editor/PropertyNodeEditor.cs | 4 +- .../Chisel/Nodes/ChiselGraphNode.cs | 2 +- .../Chisel/Nodes/FloatPropertyNode.cs | 2 +- .../Chisel/Nodes/Math/Vector3Node.cs | 2 +- .../Chisel/Nodes/PropertyNode.cs | 21 +- 10 files changed, 130 insertions(+), 292 deletions(-) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 57400ea01..23027ada0 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -192,6 +192,70 @@ MonoBehaviour: operation: 1 center: {x: 0, y: 0.39, z: 0} size: {x: 0.39, y: 0.7, z: 1} +--- !u!114 &-2623054864538869351 +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: fc0e9af9ffadcb346b582cd96952763d, type: 3} + m_Name: Vector 3 + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: -440, y: 312} + ports: + keys: + - x + - y + - z + - output + values: + - _fieldName: x + _node: {fileID: -2623054864538869351} + _typeQualifiedName: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: y + _node: {fileID: -2623054864538869351} + _typeQualifiedName: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: z + _node: {fileID: -2623054864538869351} + _typeQualifiedName: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: output + _node: {fileID: -2623054864538869351} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: size + node: {fileID: 3873916941957806223} + reroutePoints: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + x: 1 + y: 1 + z: 1 + output: {x: 0, y: 0, z: 0} --- !u!114 &-1856057758424149880 MonoBehaviour: m_ObjectHideFlags: 0 @@ -205,7 +269,7 @@ MonoBehaviour: m_Name: Float Property m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -712, y: 168} + position: {x: -728, y: 184} ports: keys: - exit @@ -231,7 +295,7 @@ MonoBehaviour: property: Name: Center overrideValue: 0 - Value: 1.85 + Value: 0.65 exit: 0 --- !u!114 &-1383906636815730267 MonoBehaviour: @@ -294,7 +358,8 @@ MonoBehaviour: - {fileID: -1383906636815730267} - {fileID: -1856057758424149880} - {fileID: -6880739622989829563} - active: {fileID: -1383906636815730267} + - {fileID: -2623054864538869351} + active: {fileID: 3873916941957806223} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: @@ -333,7 +398,10 @@ MonoBehaviour: _node: {fileID: 3873916941957806223} _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: [] + connections: + - fieldName: output + node: {fileID: -2623054864538869351} + reroutePoints: [] _direction: 0 _connectionType: 0 _typeConstraint: 0 diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index f5edf9d62..f26007b10 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -439,103 +439,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &94382524 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 94382528} - - component: {fileID: 94382527} - - component: {fileID: 94382526} - - component: {fileID: 94382525} - m_Layer: 0 - m_Name: ChiselGraphInstance (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &94382525 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 94382524} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &94382526 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 94382524} - m_Mesh: {fileID: 1536033006} ---- !u!114 &94382527 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 94382524} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b7112759bb6d84f45890aef9caadedbe, type: 3} - m_Name: - m_EditorClassIdentifier: - graph: {fileID: 11400000, guid: 7554a9f6d7403e34597bef241745c03e, type: 2} - meshFilter: {fileID: 94382526} - meshRenderer: {fileID: 94382525} ---- !u!4 &94382528 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 94382524} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.9, y: 0, z: -0.055} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &164276715 Mesh: m_ObjectHideFlags: 0 @@ -952,8 +855,8 @@ Mesh: firstVertex: 0 vertexCount: 24 localAABB: - m_Center: {x: 1.85, y: 1.85, z: 1.8499999} - m_Extent: {x: 0.42500007, y: 0.31000006, z: 1.44} + m_Center: {x: 0.65, y: 0.65, z: 0.65} + m_Extent: {x: 0.5, y: 0.5, z: 0.5} m_Shapes: vertices: [] shapes: [] @@ -970,7 +873,7 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000060000000700000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 m_VertexData: serializedVersion: 3 m_VertexCount: 24 @@ -1032,7 +935,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 1152 - _typelessdata: 6666b63f713d0a4084ebd13e000000000000803f00000000000080bf0000000000000000000080bfcccc6cbff051b83d9a991140713d0a405c8f5240000000000000803f00000000000080bf0000000000000000000080bf3433e3bf5c8f32c09a991140713d0a4084ebd13e000000000000803f00000000000080bf0000000000000000000080bf3433e3bff051b83d6666b63f713d0a405c8f5240000000000000803f00000000000080bf0000000000000000000080bfcccc6cbf5c8f32c09a991140b81ec53f5c8f524000000000000080bf000000000000803f0000000000000000000080bf9a9931405c8f32c06666b63fb81ec53f5c8f524000000000000080bf000000000000803f0000000000000080000080bf6666f63f5c8f32c06666b63fb81ec53f84ebd13e00000000000080bf000000000000803f0000000000000000000080bf6666f63ff051b83d9a991140b81ec53f84ebd13e00000000000080bf000000000000803f0000000000000000000080bf9a993140f051b83d6666b63f713d0a4084ebd13e000080bf00000000000000000000000000000000000080bf000080bff051b83d713d2a406666b63fb81ec53f5c8f5240000080bf00000000000000000000000000000000000080bf000080bf5c8f32c05c8f02406666b63f713d0a405c8f5240000080bf00000000000000000000000000000000000080bf000080bf5c8f32c0713d2a406666b63fb81ec53f84ebd13e000080bf00000000000000000000000000000000000080bf000080bff051b83d5c8f02409a991140713d0a405c8f52400000803f000000000000000000000000000000000000803f000080bf5c8f7240713d2a409a991140b81ec53f84ebd13e0000803f000000000000000000000000000000000000803f000080bfc2f5683f5c8f02409a991140713d0a4084ebd13e0000803f000000000000000000000080000000000000803f000080bfc2f5683f713d2a409a991140b81ec53f5c8f52400000803f000000000000000000000000000000000000803f000080bf5c8f72405c8f02406666b63fb81ec53f84ebd13e0000000000000000000080bf0000803f0000000000000000000080bf6666f63f5c8f02409a991140713d0a4084ebd13e0000000000000000000080bf0000803f0000000000000000000080bf9a993140713d2a409a991140b81ec53f84ebd13e0000000000000000000080bf0000803f0000000000000000000080bf9a9931405c8f02406666b63f713d0a4084ebd13e0000000000000000000080bf0000803f0000000000000000000080bf6666f63f713d2a406666b63f713d0a405c8f524000000000000000000000803f000080bf0000000000000000000080bfcccc6cbf713d2a409a991140b81ec53f5c8f524000000000000000000000803f000080bf0000000000000000000080bf3433e3bf5c8f02409a991140713d0a405c8f524000000000000000000000803f000080bf0000000000000080000080bf3433e3bf713d2a406666b63fb81ec53f5c8f524000000000000000000000803f000080bf0000000000000000000080bfcccc6cbf5c8f0240 + _typelessdata: 9899193e3333933f9899193e000000000000803f00000000000080bf0000000000000000000080bf3433b33e3433b33e3333933f3333933f3333933f000000000000803f00000000000080bf0000000000000000000080bf666626bf666626bf3333933f3333933f9899193e000000000000803f00000000000080bf0000000000000000000080bf666626bf3433b33e9899193e3333933f3333933f000000000000803f00000000000080bf0000000000000000000080bf3433b33e666626bf9899193e9899193e3333933f00000000000080bf000000000000803f0000000000000000000080bf6666263f666626bf3333933f9899193e9899193e00000000000080bf000000000000803f0000000000000000000080bf3333d33f3433b33e3333933f9899193e3333933f00000000000080bf000000000000803f0000000000000000000080bf3333d33f666626bf9899193e9899193e9899193e00000000000080bf000000000000803f0000000000000000000080bf6666263f3433b33e9899193e3333933f9899193e000080bf00000000000000000000000000000000000080bf000080bf3433b33e3333d33f9899193e9899193e3333933f000080bf00000000000000000000000000000000000080bf000080bf666626bf6666263f9899193e3333933f3333933f000080bf00000000000000000000000000000000000080bf000080bf666626bf3333d33f9899193e9899193e9899193e000080bf00000000000000000000000000000000000080bf000080bf3433b33e6666263f3333933f3333933f3333933f0000803f000000000000000000000000000000000000803f000080bf3333d33f3333d33f3333933f9899193e9899193e0000803f000000000000000000000000000000000000803f000080bf6666263f6666263f3333933f3333933f9899193e0000803f000000000000000000000080000000000000803f000080bf6666263f3333d33f3333933f9899193e3333933f0000803f000000000000000000000000000000000000803f000080bf3333d33f6666263f9899193e9899193e9899193e0000000000000000000080bf0000803f0000000000000000000080bf6666263f6666263f3333933f3333933f9899193e0000000000000000000080bf0000803f0000000000000000000080bf3333d33f3333d33f3333933f9899193e9899193e0000000000000000000080bf0000803f0000000000000000000080bf3333d33f6666263f9899193e3333933f9899193e0000000000000000000080bf0000803f0000000000000000000080bf6666263f3333d33f9899193e3333933f3333933f00000000000000000000803f000080bf0000000000000000000080bf3433b33e3333d33f3333933f9899193e3333933f00000000000000000000803f000080bf0000000000000000000080bf666626bf6666263f3333933f3333933f3333933f00000000000000000000803f000080bf0000000000000080000080bf666626bf3333d33f9899193e9899193e3333933f00000000000000000000803f000080bf0000000000000000000080bf3433b33e6666263f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -1086,8 +989,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 1.85, y: 1.85, z: 1.8499999} - m_Extent: {x: 0.42500007, y: 0.31000006, z: 1.44} + m_Center: {x: 0.65, y: 0.65, z: 0.65} + m_Extent: {x: 0.5, y: 0.5, z: 0.5} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -1471,6 +1374,7 @@ GameObject: - component: {fileID: 479267783} - component: {fileID: 479267786} - component: {fileID: 479267785} + - component: {fileID: 479267787} m_Layer: 0 m_Name: ChiselGraphInstance m_TagString: Untagged @@ -1556,6 +1460,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 479267782} m_Mesh: {fileID: 339728852} +--- !u!114 &479267787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479267782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 96a015f314869d9429110036c3241d1c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &650786225 GameObject: m_ObjectHideFlags: 24 @@ -3822,170 +3738,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!43 &1536033006 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 216 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 108 - localAABB: - m_Center: {x: 0, y: 0, z: 0.5} - m_Extent: {x: 1, y: 1, z: 1.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d00000010000000110000001200000010000000120000001300000014000000150000001600000014000000170000001500000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001e0000001f00000020000000210000002200000020000000230000002100000024000000250000002600000024000000270000002500000028000000290000002a000000280000002b000000290000002c0000002d0000002e0000002c0000002f0000002d000000300000002d0000002f00000031000000300000002f0000003200000030000000310000003200000033000000300000003400000035000000360000003400000037000000350000003500000037000000380000003900000035000000380000003a00000039000000380000003a0000003b000000390000003c0000003d0000003e0000003c0000003f0000003d00000040000000410000004200000041000000430000004200000044000000420000004300000044000000450000004200000044000000460000004500000046000000470000004500000040000000470000004600000041000000400000004600000048000000490000004a000000490000004b0000004a0000004c0000004d0000004e0000004f0000005000000051000000500000004c00000051000000510000004c0000004e00000052000000500000004f00000053000000520000004f0000005400000055000000560000005500000057000000560000005700000055000000580000005800000055000000590000005a0000005b0000005c0000005a0000005c0000005d0000005d000000590000005a0000005d0000005e00000059000000590000005e000000580000005e0000005f0000005800000060000000610000006200000061000000630000006200000064000000650000006600000063000000610000006400000067000000630000006400000067000000640000006600000068000000690000006a0000006a0000006b000000680000006b0000006a000000670000006b0000006700000066000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 108 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 5184 - _typelessdata: 703d0a3e52b85e3f0000803f00000000ffff7f3f00000000000080bf0000000000000000000080bf48e1ba3e000000bff6287c3f52b85e3f0000004000000000ffff7f3f00000000000080bf0000000000000000000080bfec51f8be0000c0bff6287c3f52b85e3f0000803f00000000ffff7f3f00000000000080bf0000000000000000000080bfec51f8be000000bf703d0a3e52b85e3f0000004000000000ffff7f3f00000000000080bf0000000000000000000080bf48e1ba3e0000c0bf703d0a3e52b85e3f000000bf00000000ffff7f3f00000000000080bf0000000000000000000080bf48e1ba3e0000803ff6287c3f52b85e3f0000003f00000000ffff7f3f00000000000080bf0000000000000000000080bfec51f8be00000000f6287c3f52b85e3f000000bf00000000ffff7f3f00000000000080bf0000000000000000000080bfec51f8be0000803f703d0a3e52b85e3f0000003f00000000ffff7f3f00000000000080bf0000000000000000000080bf48e1ba3e00000000703d0a3e0000803e0000004000000000ffff7fbf000000000000803f0000000000000000000080bf5c8f223f0000c0bff6287c3f0000803e0000803f00000000ffff7fbf000000000000803f0000000000000000000080bf7b14be3f000000bff6287c3f0000803e0000004000000000ffff7fbf000000000000803f0000000000000000000080bf7b14be3f0000c0bf703d0a3e0000803e0000803f00000000ffff7fbf000000000000803f0000000000000000000080bf5c8f223f000000bf703d0a3e52b85e3f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf295caf3f703d0a3e0000803e00000040000080bf00000000000000000000000000000000000080bf000080bf0000c0bf0000403f703d0a3e52b85e3f00000040000080bf00000000000000000000000000000000000080bf000080bf0000c0bf295caf3f703d0a3e0000803e0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000403f703d0a3e52b85e3f0000003f000080bf00000000000000000000000000000000000080bf000080bf00000000295caf3f703d0a3e52b85e3f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f295caf3f703d0a3ea4703d3f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f52b89e3f703d0a3ea4703d3f0000003f000080bf00000000000000000000000000000000000080bf000080bf0000000052b89e3ff6287c3f52b85e3f000000400000803f000000000000000000000000000000000000803f000080bf00002040295caf3ff6287c3f0000803e0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000403ff6287c3f52b85e3f0000803f0000803f000000000000000000000080000000000000803f000080bf0000c03f295caf3ff6287c3f0000803e000000400000803f000000000000000000000000000000000000803f000080bf000020400000403ff6287c3f52b85e3f0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f295caf3ff6287c3ff628dc3e000000bf0000803f000000000000000000000000000000000000803f000080bf000000007b146e3ff6287c3f52b85e3f000000bf0000803f000000000000000000000080000000000000803f000080bf00000000295caf3ff6287c3ff628dc3e0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f7b146e3ff6287c3f52b85e3f0000004000000000000000000000803f000080bf0000000000000000000080bfec51f8be295caf3f703d0a3e52b85e3f0000004000000000000000000000803f000080bf0000000000000000000080bf48e1ba3e295caf3f703d0a3e0000803e0000004000000000000000000000803f000080bf0000000000000000000080bf48e1ba3e0000403ff6287c3f0000803e0000004000000000000000000000803f000080bf0000000000000000000080bfec51f8be0000403f000080bf0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000000000803f0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bf0000803f0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf000000bf00000000000080bf0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000bf000080bf0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f0000803f0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000803f0000803f0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000c03f000080bf0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000803f000080bf000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf0000803f000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf000080bf000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000c03f000080bff628dc3e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f7b146e3f000080bf0000803f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000c03f000080bf000080bf000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f000000bf000080bff628dc3e0000003f000080bf00000000000000000000000000000000000080bf000080bf000000007b146e3f000080bf000080bf0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf000000bf000080bf0000803f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000c03f000080bf0000803f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000c03f0000803f0000803f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000c03f0000803ff628dc3e0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f7b146e3f0000803f0000803f0000003f0000803f000000000000000000000080000000000000803f000080bf0000803f0000c03f0000803f000080bf0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f000000bf0000803f000080bf000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf000000bf0000803ff628dc3e000000bf0000803f000000000000000000000000000000000000803f000080bf000000007b146e3f0000803f0000803f000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf0000c03f0000803f0000803f000000bf0000803f000000000000000000000000000000000000803f000080bf000000000000c03f000080bf000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf000000bf0000803f0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f000000bf000080bf0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f0000803f00000000000000000000803f000080bf0b3e812300000000000080bf0000c03f0000c03f703d0a3e52b85e3f0000803f00000000000000000000803f000080bf0b3e812300000000000080bf48e1ba3e295caf3f0000803f0000803f0000803f0000000000000000ffff7f3f000080bf0000000000000080000080bf000000bf0000c03ff6287c3f52b85e3f0000803f00000000000000000000803f000080bf35a834a800000000000080bfec51f8be295caf3ff6287c3f0000803e0000803f00000000000000000000803f000080bf0000000000000000000080bfec51f8be0000403f0000803f000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf000000bf703d0a3e0000803e0000803f00000000000000000000803f000080bf0b3e812300000000000080bf48e1ba3e0000403f000080bf000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f000000bf0000803ff628dc3e000000bf000000000000803f000000000000803f00000080000000000000803f0000c03f0000803ff6287c3ff628dc3e000000bf000000000000803f000000000000803f00000000000000000000803f7b14be3f0000803f0000803ff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f0000c03f00000000f6287c3ff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f7b14be3f0000000014ae47bef628dc3e000000bf000000000000803f000000000000803f00000000000000000000803ff6289c3e0000803f000080bff628dc3e000000bf000000000000803f000000000000803f00000080000000000000803f000000bf0000803f000080bff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f000000bf00000000703d0a3ef628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f5c8f223f00000000703d0a3ef628dc3e000000bf000000000000803f000000000000803f00000080000000000000803f5c8f223f0000803f14ae47bef628dc3e0000003f000000000000803f000000000000803f00000000000000000000803ff6289c3e0000000014ae473ef628dc3e000000bf000000000000803f000000000000803f00000000000000000000803f85eb313f0000803f14ae473ef628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f85eb313f0000000014ae473ea4703d3f000000bf00000000000000000000803f0000803f00000000000000000000803f85eb313f52b89e3f703d0a3ea4703d3f000000bf00000000000000000000803f0000803fded60726000000000000803f5c8f223f52b89e3f14ae473ef628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f85eb313f7b146e3f703d0a3ef628dc3e000000bf0000000000000000ffff7f3f0000803f00000000000000000000803f5c8f223f7b146e3f14ae47bef628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803ff6289c3e7b146e3f703d0a3e52b85e3f000000bf00000000000000000000803f0000803ff99e5923000000000000803f5c8f223f295caf3ff6287c3f52b85e3f000000bf00000000000000000000803f0000803f00000000000000000000803f7b14be3f295caf3ff6287c3ff628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f7b14be3f7b146e3f0000803ff628dc3e000000bf0000000000000000ffff7f3f0000803f00000000000000000000803f0000c03f7b146e3f0000803f0000803f000000bf00000000000000000000803f0000803f00000000000000000000803f0000c03f0000c03f000080bf0000803f000000bf00000000000000000000803f0000803f00000000000000000000803f000000bf0000c03f000080bff628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f000000bf7b146e3f14ae473ef628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803ff6289c3e7b146e3f703d0a3ef628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803f48e1ba3e7b146e3f14ae473ea4703d3f0000003f0000000000000000000080bf000080bf00000000000000000000803ff6289c3e52b89e3f703d0a3ea4703d3f0000003f0000000000000000000080bf000080bf00000000000000000000803f48e1ba3e52b89e3f14ae47bef628dc3e0000003f0000000000000000000080bf000080bff99e59a3000000000000803f85eb313f7b146e3f000080bff628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803f0000c03f7b146e3f000080bf0000803f0000003f0000000000000000000080bf000080bf00000000000000000000803f0000c03f0000c03f703d0a3e52b85e3f0000003f0000000000000000000080bf000080bf00000000000000000000803f48e1ba3e295caf3f0000803ff628dc3e0000003f0000000000000000ffff7fbf000080bf00000000000000000000803f000000bf7b146e3ff6287c3ff628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803fec51f8be7b146e3ff6287c3f52b85e3f0000003f0000000000000000000080bf000080bf00000000000000000000803fec51f8be295caf3f0000803f0000803f0000003f0000000000000000000080bf000080bf00000000000000000000803f000000bf0000c03f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0.5} - m_Extent: {x: 1, y: 1, z: 1.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1658714170 GameObject: m_ObjectHideFlags: 8 diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.node/Chisel/ChiselGraph.cs index 3c3a1af0a..a96bccd4e 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraph.cs @@ -16,18 +16,12 @@ public class ChiselGraph : NodeGraph public void SetActiveNode(ChiselGraphNode node) { active = node; - UpdateCSG(); + UpdateProperties(); } - public void UpdateCSG() + public void UpdateProperties() { - if (properties == null) - properties = new List(); - - properties.Clear(); - foreach (var node in nodes) - if (node is FloatPropertyNode floatNode) - properties.Add(floatNode.property); + OnValidate(); if (instance != null) instance.IsDirty = true; @@ -51,5 +45,13 @@ public T GetOverriddenProperty(string key) where T : GraphProperty return instance.overriddenProperties[key] as T; return null; } + + void OnValidate() + { + properties = new List(); + foreach (var node in nodes) + if (node is IPropertyNode propertyNode) + properties.Add(propertyNode.Property); + } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs index f9369528b..52e620629 100644 --- a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs @@ -41,10 +41,8 @@ void OnValidate() InitProperties(); for (int i = 0; i < graph.properties.Count; i++) - { if (graph.properties[i].Name != properties[i].Name) InitProperties(); - } } void InitProperties() @@ -107,7 +105,6 @@ int finishMeshUpdates(CSGTree tree, if (meshes == null || meshes.Count != meshDataArray.Length) { - Debug.Log("new mesh"); meshes = new List(); for (int i = 0; i < meshDataArray.Length; i++) meshes.Add(new Mesh()); diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs index 26ef351ed..a1ae8890a 100644 --- a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs +++ b/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs @@ -13,8 +13,10 @@ public class ChiselGraphInstanceEditor : Editor { public override void OnInspectorGUI() { - DrawDefaultInspector(); var instance = target as ChiselGraphInstance; + instance.TriggerOnValidate(); + + DrawDefaultInspector(); if (GUILayout.Button("Edit", GUI.skin.GetStyle("button"))) { @@ -40,8 +42,8 @@ public override void OnInspectorGUI() if (EditorGUI.EndChangeCheck()) { - instance.IsDirty = true; instance.UpdateProperties(); + instance.IsDirty = true; instance.UpdateCSG(); } } diff --git a/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs b/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs index 521c4593b..ff79d6ae8 100644 --- a/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs +++ b/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs @@ -10,12 +10,12 @@ public override void OnBodyGUI() { base.OnBodyGUI(); var node = target as PropertyNode; - node.property.Name = EditorGUILayout.TextField("Name", node.property.Name); EditorGUI.BeginChangeCheck(); + node.property.Name = EditorGUILayout.TextField("Name", node.property.Name); node.property.Value = EditorGUILayout.FloatField("Value", node.property.Value); if (EditorGUI.EndChangeCheck()) - node.chiselGraph.UpdateCSG(); + node.ChiselGraph.UpdateProperties(); } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs index ce40be00d..c986eb31d 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs @@ -51,7 +51,7 @@ public override object GetValue(NodePort port) void OnValidate() { - chiselGraph.UpdateCSG(); + chiselGraph.UpdateProperties(); } [Serializable] diff --git a/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs b/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs index 9d860d12b..1fd2043fe 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs @@ -9,7 +9,7 @@ public class FloatPropertyNode : PropertyNode public override object GetValue(NodePort port) { - var overridden = chiselGraph.GetOverriddenProperty(property.Name); + var overridden = ChiselGraph.GetOverriddenProperty(property.Name); if (overridden != null) return overridden.Value; diff --git a/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs b/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs index b6e1c797a..97aaab216 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs @@ -25,7 +25,7 @@ public override object GetValue(NodePort port) void OnValidate() { - chiselGraph.UpdateCSG(); + chiselGraph.UpdateProperties(); } } } \ No newline at end of file diff --git a/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs b/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs index fb30c7c0b..a706ddcff 100644 --- a/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs +++ b/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs @@ -4,11 +4,28 @@ namespace Chisel.Nodes { - public class PropertyNode : Node where T:GraphProperty + public class PropertyNode : Node, IPropertyNode where T : GraphProperty { [HideInInspector] public T property; - public ChiselGraph chiselGraph => graph as ChiselGraph; + public GraphProperty Property => property; + + public ChiselGraph ChiselGraph => graph as ChiselGraph; + + protected override void Init() + { + ChiselGraph.UpdateProperties(); + } + + void OnDestroy() + { + ChiselGraph.UpdateProperties(); + } + } + + public interface IPropertyNode + { + GraphProperty Property { get; } } [Serializable] From e131813a3333a40efe8329638d45519ed71178e9 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Thu, 21 Jan 2021 11:01:32 +0800 Subject: [PATCH 18/26] Renamed to chisel graph --- Assets/ChiselNodes/New Chisel Graph.asset | 16 ++++++++-------- .../Chisel.meta | 0 .../Chisel/ChiselGraph.cs | 0 .../Chisel/ChiselGraph.cs.meta | 0 .../Chisel/ChiselGraphInstance.cs | 0 .../Chisel/ChiselGraphInstance.cs.meta | 0 .../Chisel/ChiselNodes.asmdef | 0 .../Chisel/ChiselNodes.asmdef.meta | 0 .../Chisel/Editor.meta | 0 .../Chisel/Editor/ChiselGraphInstanceEditor.cs | 0 .../Editor/ChiselGraphInstanceEditor.cs.meta | 0 .../Chisel/Editor/ChiselGraphNodeEditor.cs | 0 .../Chisel/Editor/ChiselGraphNodeEditor.cs.meta | 0 .../Chisel/Editor/ChiselGrpahEditorStyles.cs | 0 .../Editor/ChiselGrpahEditorStyles.cs.meta | 0 .../Chisel/Editor/ChiselNodesEditor.asmdef | 0 .../Chisel/Editor/ChiselNodesEditor.asmdef.meta | 0 .../Chisel/Editor/PropertyNodeEditor.cs | 0 .../Chisel/Editor/PropertyNodeEditor.cs.meta | 0 .../Chisel/Nodes.meta | 0 .../Chisel/Nodes/BoxNode.cs | 0 .../Chisel/Nodes/BoxNode.cs.meta | 0 .../Chisel/Nodes/ChiselGraphNode.cs | 0 .../Chisel/Nodes/ChiselGraphNode.cs.meta | 0 .../Chisel/Nodes/CompositeNode.cs | 0 .../Chisel/Nodes/CompositeNode.cs.meta | 0 .../Chisel/Nodes/FloatPropertyNode.cs | 0 .../Chisel/Nodes/FloatPropertyNode.cs.meta | 0 .../Chisel/Nodes/Math.meta | 0 .../Chisel/Nodes/Math/Vector3Node.cs | 0 .../Chisel/Nodes/Math/Vector3Node.cs.meta | 0 .../Chisel/Nodes/PropertyNode.cs | 0 .../Chisel/Nodes/PropertyNode.cs.meta | 0 .../Chisel/Nodes/SubGraphNode.cs | 0 .../Chisel/Nodes/SubGraphNode.cs.meta | 0 .../package.json | 2 +- .../package.json.meta | 0 Packages/packages-lock.json | 4 ++-- 38 files changed, 11 insertions(+), 11 deletions(-) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/ChiselGraph.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/ChiselGraph.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/ChiselGraphInstance.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/ChiselGraphInstance.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/ChiselNodes.asmdef (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/ChiselNodes.asmdef.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor/ChiselGraphInstanceEditor.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor/ChiselGraphInstanceEditor.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor/ChiselGraphNodeEditor.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor/ChiselGraphNodeEditor.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor/ChiselGrpahEditorStyles.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor/ChiselGrpahEditorStyles.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor/ChiselNodesEditor.asmdef (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor/ChiselNodesEditor.asmdef.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor/PropertyNodeEditor.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Editor/PropertyNodeEditor.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/BoxNode.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/BoxNode.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/ChiselGraphNode.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/ChiselGraphNode.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/CompositeNode.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/CompositeNode.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/FloatPropertyNode.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/FloatPropertyNode.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/Math.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/Math/Vector3Node.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/Math/Vector3Node.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/PropertyNode.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/PropertyNode.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/SubGraphNode.cs (100%) rename Packages/{com.chisel.node => com.chisel.graph}/Chisel/Nodes/SubGraphNode.cs.meta (100%) rename Packages/{com.chisel.node => com.chisel.graph}/package.json (93%) rename Packages/{com.chisel.node => com.chisel.graph}/package.json.meta (100%) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 23027ada0..0bb5391b9 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -189,9 +189,9 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - operation: 1 + operation: 0 center: {x: 0, y: 0.39, z: 0} - size: {x: 0.39, y: 0.7, z: 1} + size: {x: 0.39, y: 1.39, z: 1} --- !u!114 &-2623054864538869351 MonoBehaviour: m_ObjectHideFlags: 0 @@ -252,9 +252,9 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - x: 1 - y: 1 - z: 1 + x: 2.98 + y: 0.19 + z: 3.39 output: {x: 0, y: 0, z: 0} --- !u!114 &-1856057758424149880 MonoBehaviour: @@ -359,7 +359,7 @@ MonoBehaviour: - {fileID: -1856057758424149880} - {fileID: -6880739622989829563} - {fileID: -2623054864538869351} - active: {fileID: 3873916941957806223} + active: {fileID: 6654120812992344769} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: @@ -493,6 +493,6 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - operation: 1 - center: {x: 0, y: -0.31, z: 0} + operation: 0 + center: {x: 1.09, y: 0.65, z: 0} size: {x: 0.69, y: 1.26, z: 0.52} diff --git a/Packages/com.chisel.node/Chisel.meta b/Packages/com.chisel.graph/Chisel.meta similarity index 100% rename from Packages/com.chisel.node/Chisel.meta rename to Packages/com.chisel.graph/Chisel.meta diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs b/Packages/com.chisel.graph/Chisel/ChiselGraph.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/ChiselGraph.cs rename to Packages/com.chisel.graph/Chisel/ChiselGraph.cs diff --git a/Packages/com.chisel.node/Chisel/ChiselGraph.cs.meta b/Packages/com.chisel.graph/Chisel/ChiselGraph.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/ChiselGraph.cs.meta rename to Packages/com.chisel.graph/Chisel/ChiselGraph.cs.meta diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs rename to Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs diff --git a/Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs.meta b/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/ChiselGraphInstance.cs.meta rename to Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs.meta diff --git a/Packages/com.chisel.node/Chisel/ChiselNodes.asmdef b/Packages/com.chisel.graph/Chisel/ChiselNodes.asmdef similarity index 100% rename from Packages/com.chisel.node/Chisel/ChiselNodes.asmdef rename to Packages/com.chisel.graph/Chisel/ChiselNodes.asmdef diff --git a/Packages/com.chisel.node/Chisel/ChiselNodes.asmdef.meta b/Packages/com.chisel.graph/Chisel/ChiselNodes.asmdef.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/ChiselNodes.asmdef.meta rename to Packages/com.chisel.graph/Chisel/ChiselNodes.asmdef.meta diff --git a/Packages/com.chisel.node/Chisel/Editor.meta b/Packages/com.chisel.graph/Chisel/Editor.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor.meta rename to Packages/com.chisel.graph/Chisel/Editor.meta diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphInstanceEditor.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs rename to Packages/com.chisel.graph/Chisel/Editor/ChiselGraphInstanceEditor.cs diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs.meta b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphInstanceEditor.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/ChiselGraphInstanceEditor.cs.meta rename to Packages/com.chisel.graph/Chisel/Editor/ChiselGraphInstanceEditor.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphNodeEditor.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs rename to Packages/com.chisel.graph/Chisel/Editor/ChiselGraphNodeEditor.cs diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs.meta b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphNodeEditor.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/ChiselGraphNodeEditor.cs.meta rename to Packages/com.chisel.graph/Chisel/Editor/ChiselGraphNodeEditor.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs b/Packages/com.chisel.graph/Chisel/Editor/ChiselGrpahEditorStyles.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs rename to Packages/com.chisel.graph/Chisel/Editor/ChiselGrpahEditorStyles.cs diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs.meta b/Packages/com.chisel.graph/Chisel/Editor/ChiselGrpahEditorStyles.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/ChiselGrpahEditorStyles.cs.meta rename to Packages/com.chisel.graph/Chisel/Editor/ChiselGrpahEditorStyles.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselNodesEditor.asmdef b/Packages/com.chisel.graph/Chisel/Editor/ChiselNodesEditor.asmdef similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/ChiselNodesEditor.asmdef rename to Packages/com.chisel.graph/Chisel/Editor/ChiselNodesEditor.asmdef diff --git a/Packages/com.chisel.node/Chisel/Editor/ChiselNodesEditor.asmdef.meta b/Packages/com.chisel.graph/Chisel/Editor/ChiselNodesEditor.asmdef.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/ChiselNodesEditor.asmdef.meta rename to Packages/com.chisel.graph/Chisel/Editor/ChiselNodesEditor.asmdef.meta diff --git a/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs b/Packages/com.chisel.graph/Chisel/Editor/PropertyNodeEditor.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs rename to Packages/com.chisel.graph/Chisel/Editor/PropertyNodeEditor.cs diff --git a/Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs.meta b/Packages/com.chisel.graph/Chisel/Editor/PropertyNodeEditor.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Editor/PropertyNodeEditor.cs.meta rename to Packages/com.chisel.graph/Chisel/Editor/PropertyNodeEditor.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes.meta b/Packages/com.chisel.graph/Chisel/Nodes.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes.meta rename to Packages/com.chisel.graph/Chisel/Nodes.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/BoxNode.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs rename to Packages/com.chisel.graph/Chisel/Nodes/BoxNode.cs diff --git a/Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs.meta b/Packages/com.chisel.graph/Chisel/Nodes/BoxNode.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/BoxNode.cs.meta rename to Packages/com.chisel.graph/Chisel/Nodes/BoxNode.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs rename to Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs diff --git a/Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs.meta b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/ChiselGraphNode.cs.meta rename to Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/CompositeNode.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs rename to Packages/com.chisel.graph/Chisel/Nodes/CompositeNode.cs diff --git a/Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs.meta b/Packages/com.chisel.graph/Chisel/Nodes/CompositeNode.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/CompositeNode.cs.meta rename to Packages/com.chisel.graph/Chisel/Nodes/CompositeNode.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/FloatPropertyNode.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs rename to Packages/com.chisel.graph/Chisel/Nodes/FloatPropertyNode.cs diff --git a/Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs.meta b/Packages/com.chisel.graph/Chisel/Nodes/FloatPropertyNode.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/FloatPropertyNode.cs.meta rename to Packages/com.chisel.graph/Chisel/Nodes/FloatPropertyNode.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes/Math.meta b/Packages/com.chisel.graph/Chisel/Nodes/Math.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/Math.meta rename to Packages/com.chisel.graph/Chisel/Nodes/Math.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs b/Packages/com.chisel.graph/Chisel/Nodes/Math/Vector3Node.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs rename to Packages/com.chisel.graph/Chisel/Nodes/Math/Vector3Node.cs diff --git a/Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs.meta b/Packages/com.chisel.graph/Chisel/Nodes/Math/Vector3Node.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/Math/Vector3Node.cs.meta rename to Packages/com.chisel.graph/Chisel/Nodes/Math/Vector3Node.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/PropertyNode.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs rename to Packages/com.chisel.graph/Chisel/Nodes/PropertyNode.cs diff --git a/Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs.meta b/Packages/com.chisel.graph/Chisel/Nodes/PropertyNode.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/PropertyNode.cs.meta rename to Packages/com.chisel.graph/Chisel/Nodes/PropertyNode.cs.meta diff --git a/Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs rename to Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs diff --git a/Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs.meta b/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs.meta similarity index 100% rename from Packages/com.chisel.node/Chisel/Nodes/SubGraphNode.cs.meta rename to Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs.meta diff --git a/Packages/com.chisel.node/package.json b/Packages/com.chisel.graph/package.json similarity index 93% rename from Packages/com.chisel.node/package.json rename to Packages/com.chisel.graph/package.json index 26abf7177..8bd61046a 100644 --- a/Packages/com.chisel.node/package.json +++ b/Packages/com.chisel.graph/package.json @@ -1,7 +1,7 @@ { "description": "The Chisel Node Graph", "displayName": "Chisel Node Graph", - "name": "com.chisel.node", + "name": "com.chisel.graph", "keywords": [ "level design", "world building", diff --git a/Packages/com.chisel.node/package.json.meta b/Packages/com.chisel.graph/package.json.meta similarity index 100% rename from Packages/com.chisel.node/package.json.meta rename to Packages/com.chisel.graph/package.json.meta diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 5c1c28258..1a67eed89 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -45,8 +45,8 @@ "com.chisel.components": "0.0.1-preview" } }, - "com.chisel.node": { - "version": "file:com.chisel.node", + "com.chisel.graph": { + "version": "file:com.chisel.graph", "depth": 0, "source": "embedded", "dependencies": { From b940f9a833bb9c736e1109cb9691b3e1fcc40305 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Thu, 21 Jan 2021 11:39:42 +0800 Subject: [PATCH 19/26] Added local position and rotation --- Assets/ChiselNodes/MySubGraph.asset | 78 ++++++-- Assets/ChiselNodes/New Chisel Graph.asset | 170 +++++++++++++----- Assets/ChiselNodes/NodeTest.unity | 22 +-- .../com.chisel.graph/Chisel/ChiselGraph.cs | 15 +- .../Chisel/Editor/ChiselGraphNodeEditor.cs | 9 + .../Chisel/Nodes/ChiselGraphNode.cs | 26 ++- .../Chisel/Nodes/SubGraphNode.cs | 2 + 7 files changed, 242 insertions(+), 80 deletions(-) diff --git a/Assets/ChiselNodes/MySubGraph.asset b/Assets/ChiselNodes/MySubGraph.asset index d8ed48f5b..b26dc3744 100644 --- a/Assets/ChiselNodes/MySubGraph.asset +++ b/Assets/ChiselNodes/MySubGraph.asset @@ -18,8 +18,10 @@ MonoBehaviour: keys: - center - size - - children - - parent + - output + - input + - localPosition + - localRotation values: - _fieldName: center _node: {fileID: -6468980190964667538} @@ -39,27 +41,47 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: children + - _fieldName: output + _node: {fileID: -6468980190964667538} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: input _node: {fileID: -6468980190964667538} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: - - fieldName: parent + - fieldName: output node: {fileID: 1688561918610544374} reroutePoints: [] _direction: 0 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: parent + - _fieldName: localPosition _node: {fileID: -6468980190964667538} - _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: [] - _direction: 1 + _direction: 0 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 + - _fieldName: localRotation + _node: {fileID: -6468980190964667538} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + localPosition: {x: 0, y: 0, z: 0} + localRotation: {x: 0, y: 0, z: 0} operation: 1 center: {x: 0, y: 0.93, z: 0} size: {x: 2.16, y: 1, z: 1} @@ -98,8 +120,10 @@ MonoBehaviour: keys: - center - size - - children - - parent + - output + - input + - localPosition + - localRotation values: - _fieldName: center _node: {fileID: 1688561918610544374} @@ -119,7 +143,19 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: children + - _fieldName: output + _node: {fileID: 1688561918610544374} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: input + node: {fileID: -6468980190964667538} + reroutePoints: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: input _node: {fileID: 1688561918610544374} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -128,18 +164,26 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: parent + - _fieldName: localPosition _node: {fileID: 1688561918610544374} - _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: - - fieldName: children - node: {fileID: -6468980190964667538} - reroutePoints: [] - _direction: 1 + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localRotation + _node: {fileID: 1688561918610544374} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 + localPosition: {x: 0, y: 0, z: 0} + localRotation: {x: 0, y: 0, z: 0} operation: 0 center: {x: 0, y: 0, z: 0} size: {x: 2, y: 2, z: 2} diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 0bb5391b9..474419c59 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -139,13 +139,15 @@ MonoBehaviour: m_Name: Box m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: 88, y: 216} + position: {x: 104, y: 200} ports: keys: - center - size - - children - - parent + - output + - input + - localPosition + - localRotation values: - _fieldName: center _node: {fileID: -3665420030514838893} @@ -165,30 +167,50 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: children + - _fieldName: output _node: {fileID: -3665420030514838893} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: - - fieldName: parent - node: {fileID: 3873916941957806223} + - fieldName: input + node: {fileID: 6654120812992344769} reroutePoints: [] - _direction: 0 + _direction: 1 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: parent + - _fieldName: input _node: {fileID: -3665420030514838893} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: - - fieldName: children - node: {fileID: 6654120812992344769} + - fieldName: output + node: {fileID: 3873916941957806223} reroutePoints: [] - _direction: 1 + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localPosition + _node: {fileID: -3665420030514838893} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localRotation + _node: {fileID: -3665420030514838893} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 + localPosition: {x: -0.17, y: 0, z: 1.21} + localRotation: {x: 0, y: 42.19, z: 0} operation: 0 center: {x: 0, y: 0.39, z: 0} size: {x: 0.39, y: 1.39, z: 1} @@ -310,33 +332,55 @@ MonoBehaviour: m_Name: Sub Graph m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: 632, y: 168} + position: {x: 632, y: 200} ports: keys: - - children - - parent + - output + - input + - localPosition + - localRotation values: - - _fieldName: children + - _fieldName: output + _node: {fileID: -1383906636815730267} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: input _node: {fileID: -1383906636815730267} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: - - fieldName: parent + - fieldName: output node: {fileID: 6654120812992344769} reroutePoints: [] _direction: 0 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: parent + - _fieldName: localPosition _node: {fileID: -1383906636815730267} - _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: [] - _direction: 1 + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localRotation + _node: {fileID: -1383906636815730267} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 + localPosition: {x: 0.97, y: -1.15, z: 0.08} + localRotation: {x: 1.13, y: 0, z: 0} operation: 0 subgraph: {fileID: 11400000, guid: fcd800f03725c234c8d479a178882e4e, type: 2} --- !u!114 &11400000 @@ -359,7 +403,7 @@ MonoBehaviour: - {fileID: -1856057758424149880} - {fileID: -6880739622989829563} - {fileID: -2623054864538869351} - active: {fileID: 6654120812992344769} + active: {fileID: -1383906636815730267} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: @@ -379,8 +423,10 @@ MonoBehaviour: keys: - center - size - - children - - parent + - output + - input + - localPosition + - localRotation values: - _fieldName: center _node: {fileID: 3873916941957806223} @@ -406,7 +452,19 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: children + - _fieldName: output + _node: {fileID: 3873916941957806223} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: input + node: {fileID: -3665420030514838893} + reroutePoints: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: input _node: {fileID: 3873916941957806223} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -415,18 +473,26 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: parent + - _fieldName: localPosition _node: {fileID: 3873916941957806223} - _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: - - fieldName: children - node: {fileID: -3665420030514838893} - reroutePoints: [] - _direction: 1 + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localRotation + _node: {fileID: 3873916941957806223} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 + localPosition: {x: 0, y: 0, z: 0} + localRotation: {x: 0, y: 0, z: 0} operation: 0 center: {x: 0, y: 0, z: 0} size: {x: 0.85, y: 0.62, z: 2.88} @@ -448,8 +514,10 @@ MonoBehaviour: keys: - center - size - - children - - parent + - output + - input + - localPosition + - localRotation values: - _fieldName: center _node: {fileID: 6654120812992344769} @@ -469,30 +537,50 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: children + - _fieldName: output _node: {fileID: 6654120812992344769} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: - - fieldName: parent - node: {fileID: -3665420030514838893} + - fieldName: input + node: {fileID: -1383906636815730267} reroutePoints: [] - _direction: 0 + _direction: 1 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - - _fieldName: parent + - _fieldName: input _node: {fileID: 6654120812992344769} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null connections: - - fieldName: children - node: {fileID: -1383906636815730267} + - fieldName: output + node: {fileID: -3665420030514838893} reroutePoints: [] - _direction: 1 + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localPosition + _node: {fileID: 6654120812992344769} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localRotation + _node: {fileID: 6654120812992344769} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 _connectionType: 0 _typeConstraint: 0 _dynamic: 0 + localPosition: {x: 1.17, y: 0.38, z: 0} + localRotation: {x: 0, y: 0, z: 0} operation: 0 - center: {x: 1.09, y: 0.65, z: 0} + center: {x: 0.72, y: 0.65, z: 0} size: {x: 0.69, y: 1.26, z: 0.52} diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index f26007b10..39a1cc833 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -849,14 +849,14 @@ Mesh: m_SubMeshes: - serializedVersion: 2 firstByte: 0 - indexCount: 36 + indexCount: 456 topology: 0 baseVertex: 0 firstVertex: 0 - vertexCount: 24 + vertexCount: 228 localAABB: - m_Center: {x: 0.65, y: 0.65, z: 0.65} - m_Extent: {x: 0.5, y: 0.5, z: 0.5} + m_Center: {x: 0.8275001, y: 0.13999999, z: 0.65} + m_Extent: {x: 1.8275001, y: 1.14, z: 1.695} m_Shapes: vertices: [] shapes: [] @@ -873,10 +873,10 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000001100000012000000100000001300000011000000140000001500000016000000140000001700000015000000 + m_IndexBuffer: 000000000100000002000000010000000300000002000000030000000400000002000000010000000500000003000000050000000600000003000000060000000700000003000000070000000600000008000000090000000700000008000000080000000a000000090000000a0000000b000000090000000b0000000c000000090000000b0000000d0000000c0000000d0000000e0000000c0000000f0000000a0000000800000007000000090000001000000000000000110000000100000012000000060000000500000012000000130000000600000014000000150000001600000017000000140000001600000018000000190000001a000000190000001b0000001a0000001c0000001d0000001e0000001e0000001d0000001f0000001d0000001c00000020000000200000001c0000002100000020000000210000002200000023000000220000002100000024000000230000002100000025000000230000002400000025000000260000002300000020000000220000002700000028000000290000002a000000290000002b0000002a00000029000000280000002c0000002c0000002d000000290000002d0000002c0000002e0000002d0000002e0000002f00000030000000310000003200000030000000330000003100000034000000350000003600000034000000370000003500000038000000390000003a000000380000003b00000039000000390000003b0000003c0000003d000000390000003c0000003e0000003d0000003c0000003e0000003f0000003d00000040000000410000004200000040000000430000004100000044000000410000004300000045000000440000004300000046000000440000004500000046000000470000004400000048000000490000004a000000480000004b000000490000004c0000004d0000004e0000004c0000004f0000004d00000050000000510000005200000051000000530000005200000053000000540000005200000050000000550000005100000050000000560000005500000055000000560000005700000058000000590000005a0000005a000000590000005b0000005a0000005b0000005c0000005c0000005b0000005d0000005b0000005e0000005d000000580000005f0000005900000060000000610000006200000062000000610000006300000062000000630000006400000064000000630000006500000063000000660000006500000060000000670000006100000068000000690000006a000000680000006a0000006b0000006c0000006d0000006e0000006c0000006f0000006d0000007000000071000000720000007000000073000000710000007400000075000000760000007500000077000000760000007600000077000000780000007600000078000000790000007a0000007b000000790000007a00000079000000780000007c0000007d0000007e0000007c0000007e0000007f00000080000000810000008200000080000000830000008100000084000000850000008600000084000000870000008500000088000000890000008a000000880000008b000000890000008c0000008d0000008e0000008c0000008e0000008f000000900000009100000092000000910000009300000092000000900000009400000091000000940000009500000091000000960000009700000098000000980000009700000099000000970000009a00000099000000960000009b000000970000009c0000009d0000009e0000009c0000009e0000009f000000a0000000a1000000a2000000a2000000a1000000a3000000a4000000a5000000a6000000a5000000a7000000a6000000a8000000a9000000aa000000a8000000aa000000ab000000ac000000ad000000ae000000ac000000ae000000af000000b0000000b1000000b2000000b0000000b3000000b1000000b4000000b5000000b6000000b4000000b6000000b7000000b8000000b9000000ba000000b8000000bb000000b9000000bc000000bd000000be000000bc000000bf000000bd000000c0000000c1000000c2000000c0000000c3000000c1000000c4000000c5000000c6000000c5000000c7000000c6000000c7000000c8000000c6000000c8000000c9000000c6000000c9000000ca000000c6000000c8000000cb000000c9000000cb000000cc000000c9000000cc000000cd000000c9000000cd000000cc000000ce000000cf000000cd000000ce000000cf000000ce000000d0000000ce000000d1000000d0000000cd000000cf000000d2000000c7000000d3000000c8000000c4000000d4000000c5000000c4000000d5000000d4000000d6000000cc000000cb000000d6000000d7000000cc000000d8000000d9000000da000000d8000000db000000d9000000dc000000dd000000de000000dd000000df000000de000000e0000000de000000df000000e0000000df000000e1000000e2000000e3000000e0000000e2000000e0000000e1000000 m_VertexData: serializedVersion: 3 - m_VertexCount: 24 + m_VertexCount: 228 m_Channels: - stream: 0 offset: 0 @@ -934,8 +934,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 1152 - _typelessdata: 9899193e3333933f9899193e000000000000803f00000000000080bf0000000000000000000080bf3433b33e3433b33e3333933f3333933f3333933f000000000000803f00000000000080bf0000000000000000000080bf666626bf666626bf3333933f3333933f9899193e000000000000803f00000000000080bf0000000000000000000080bf666626bf3433b33e9899193e3333933f3333933f000000000000803f00000000000080bf0000000000000000000080bf3433b33e666626bf9899193e9899193e3333933f00000000000080bf000000000000803f0000000000000000000080bf6666263f666626bf3333933f9899193e9899193e00000000000080bf000000000000803f0000000000000000000080bf3333d33f3433b33e3333933f9899193e3333933f00000000000080bf000000000000803f0000000000000000000080bf3333d33f666626bf9899193e9899193e9899193e00000000000080bf000000000000803f0000000000000000000080bf6666263f3433b33e9899193e3333933f9899193e000080bf00000000000000000000000000000000000080bf000080bf3433b33e3333d33f9899193e9899193e3333933f000080bf00000000000000000000000000000000000080bf000080bf666626bf6666263f9899193e3333933f3333933f000080bf00000000000000000000000000000000000080bf000080bf666626bf3333d33f9899193e9899193e9899193e000080bf00000000000000000000000000000000000080bf000080bf3433b33e6666263f3333933f3333933f3333933f0000803f000000000000000000000000000000000000803f000080bf3333d33f3333d33f3333933f9899193e9899193e0000803f000000000000000000000000000000000000803f000080bf6666263f6666263f3333933f3333933f9899193e0000803f000000000000000000000080000000000000803f000080bf6666263f3333d33f3333933f9899193e3333933f0000803f000000000000000000000000000000000000803f000080bf3333d33f6666263f9899193e9899193e9899193e0000000000000000000080bf0000803f0000000000000000000080bf6666263f6666263f3333933f3333933f9899193e0000000000000000000080bf0000803f0000000000000000000080bf3333d33f3333d33f3333933f9899193e9899193e0000000000000000000080bf0000803f0000000000000000000080bf3333d33f6666263f9899193e3333933f9899193e0000000000000000000080bf0000803f0000000000000000000080bf6666263f3333d33f9899193e3333933f3333933f00000000000000000000803f000080bf0000000000000000000080bf3433b33e3333d33f3333933f9899193e3333933f00000000000000000000803f000080bf0000000000000000000080bf666626bf6666263f3333933f3333933f3333933f00000000000000000000803f000080bf0000000000000080000080bf666626bf3333d33f9899193e9899193e3333933f00000000000000000000803f000080bf0000000000000000000080bf3433b33e6666263f + m_DataSize: 10944 + _typelessdata: 3e0a57bf52b83e3f90c285bf000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f90c2c53f0000803f52b83e3f000080bf00000000ffff7f3f00000000000080bf0000000000000000000080bf000000bf0000c03fc2f5084052b83e3f90c285bf000000000000803f00000000000080bf0000000000000080000080bf84ebd1bf90c2c53f1f85fb3f52b83e3fb81e85be000000000000803f00000000000080bf00000000ad2a7ea4000080bf1f85bbbf5c8f423fc2f5084052b83e3fb81e85be000000000000803f00000000000080bf0000000000000080000080bf84ebd1bf5c8f423f0000803f52b83e3f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000803f0000803f52b83e3f0000003f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000001f85fb3f52b83e3fb81e853e000000000000803f00000000000080bf0000000000000000000080bf1f85bbbf90c2753e0000803f52b83e3f0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bfc2f5084052b83e3f7b141640000000000000803f00000000000080bf0000000000000000000080bf84ebd1bff628ecbf6ddc9e3e52b83e3f3d89b93f000000000000803f00000000000080bf0000000000000000000080bf2647423e7a1273bfd59eae3c52b83e3fda0fdb3f00000000ffff7f3f00000000000080bf000000001f6c75a4000080bf1316f53eda0f9bbf3e0a57bf52b83e3f7b14164000000000ffff7f3f00000000000080bf0000000000000000000080bf1f85ab3ff628ecbf02a01fbf52b83e3f0000803f00000000ffff7f3f00000000000080bf0000000000000000000080bf01d08f3f000000bf3e0a57bf52b83e3f0000803f000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f000000bfe0fdc6bd52b83e3f0000803f000000000000803f00000000000080bf0000000000000000000080bfbcdf183f000000bfc2f5084052b83e3fb81e853e000000000000803f00000000000080bf0000000000000000000080bf84ebd1bf90c2753e3e0a57bf52b83e3f000080bf000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f0000c03f3e0a57bf52b83e3f000000bf000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f0000803f3e0a57bf52b83e3f0000003f000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f000000000000803ff628dc3e000000bf000000000000803f000000000000803f00000000000000000000803f0000c03f0000803f000080bff628dc3e000000bf000000000000803f000000000000803f00000080000000000000803f000000bf0000803f000080bff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f000000bf000000000000803ff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f0000c03f00000000e8fdc6bd0000803f0000803f00000000000000000000803f000080bf0000000000000080000080bfbddf183f0000c03fe0fdc6bd52b83e3f0000803f00000000000000000000803f000080bf0000000000000000000080bfbcdf183f295c9f3f0000803f0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf0000c03f0000803f52b83e3f0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf295c9f3f000080bf0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f0000c03f3e0a57bf52b83e3f0000803f00000000000000000000803f000080bf084287a500000000000080bf1f85ab3f295c9f3f03a01fbf0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf02d08f3f0000c03f02a01fbf52b83e3f0000803f00000000000000000000803f000080bf0000000000000000000080bf01d08f3f295c9f3f3e0a57bf7a140e3f0000803f00000000000000000000803f000080bf0000000000000080000080bf1f85ab3f3d0a873f000080bf000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f000000bf03a01fbff6289cbe0000803f00000000000000000000803f000080bf0000000000000080000080bf02d08f3f14ae473ee8fdc6bdf6289cbe0000803f00000000000000000000803f000080bf0000000000000000000080bfbddf183f14ae473e0000803f000080bf0000803f0000000000000000ffff7f3f000080bf6fe62fa500000000000080bf000000bf000000bf0000803f7a140e3f0000803f0000000000000000ffff7f3f000080bf0000000000000000000080bf000000bf3d0a873fe0fdc6bd7a140e3f0000803f00000000000000000000803f000080bf0000000000000000000080bfbcdf183f3d0a873f02a01fbf7a140e3f0000803f00000000000000000000803f000080bf0000000000000080000080bf01d08f3f3d0a873f000080bf000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf000000bf3e0a57bf7a140e3f000080bf0000000000000000ffff7fbf0000803f0842072600000000000080bf7c14aebe3d0a873f0000803f000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f000000bf0000803f7a140e3f000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f3d0a873f000080bf0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000c03f3e0a57bf52b83e3f000080bf0000000000000000000080bf0000803f0000000000000000000080bf7c14aebe295c9f3f0000803f0000803f000080bf0000000000000000ffff7fbf0000803f0000000000000000000080bf0000c03f0000c03f0000803f52b83e3f000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f295c9f3f0000803f0000803f000000bf0000803f000000000000000000000000000000000000803f000080bf000000000000c03f0000803f52b83e3f000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf295c9f3f0000803f0000803f000080bf0000803f000000000000000000000080000000000000803f000080bf000000bf0000c03f0000803f52b83e3f000000bf0000803f000000000000000000000000000000000000803f000080bf00000000295c9f3f0000803f0000803f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000c03f0000803f52b83e3f0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f295c9f3f0000803f0000803f0000003f0000803f000000000000000000000080000000000000803f000080bf0000803f0000c03f0000803f52b83e3f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f295c9f3f0000803f7a140e3f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f3d0a873f0000803ff628dc3e0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f7b146e3f0000803f7a140e3f0000003f0000803f000000000000000000000080000000000000803f000080bf0000803f3d0a873f0000803f000080bf0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f000000bf0000803f000080bf000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf000000bf0000803ff628dc3e000000bf0000803f000000000000000000000000000000000000803f000080bf000000007b146e3f0000803f7a140e3f000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf3d0a873f0000803f7a140e3f000000bf0000803f000000000000000000000000000000000000803f000080bf000000003d0a873f000080bf0000803f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000c03f000080bff628dc3e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f7b146e3f000080bf0000803f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000c03f000080bf000080bf000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f000000bf000080bff628dc3e0000003f000080bf00000000000000000000000000000000000080bf000080bf000000007b146e3f000080bf000080bf0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf000000bf000080bf0000803f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000c03f000080bf0000803f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000c03f000080bf000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf0000803f000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf000080bf000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f0000803f0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000803f0000803f0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000c03f000080bf0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000803f000080bf0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000000066feb8be0000803f6c65353f000000000000803f00000000000080bf0000000000000000000080bf337f5c3fb09555be0000803f0000803f0000003f00000000ffff7f3f00000000000080bf0000000000000080000080bf000000bf00000000e8fdc6bd0000803f0000803f000000000000803f00000000000080bf0000000000000080000080bfbddf183f000000bf0000803f0000803f0000803f000000000000803f00000000000080bf0000000000000080000080bf000000bf000000bf737826bf0000803fa772783f000000000000803f00000000000080bf0000000000000000000080bf3a3c933f4ee5f0be000080bf0000803f0000803f00000000ffff7f3f00000000000080bf0000000000000000000080bf0000c03f000000bf03a01fbf0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf02d08f3f000000bf1f85fb3f0ad7a33fb81e853e00000000000000000000803f000080bf0000000000000000000080bf48e17abe0ad7e33fc2f5084052b83e3fb81e853e00000000000000000000803f000080bf0000000000000000000080bf380ad7be295c9f3f86eb29400ad7a33fb81e853e00000000000000000000803f000080bf3bfe97a500000000000080bf2c5c6fbf0ad7e33fc2f508407a140e3fb81e853e00000000000000000000803f000080bf0000000000000000000080bf380ad7be3d0a873f86eb294000d7a33cb81e853e00000000000000000000803f000080bf0000000000000000000080bf2c5c6fbfb81e053f1f85fb3f00d7a33cb81e853e00000000000000000000803f000080bf0000000000000000000080bf48e17abeb81e053f1f85fb3f7a140e3fb81e853e00000000000000000000803f000080bf0000000000000000000080bf48e17abe3d0a873f1f85fb3f52b83e3fb81e853e00000000000000000000803f000080bf0000000000000000000080bf48e17abe295c9f3f1f85fb3f00d7a33cb81e85be0000000000000000000080bf0000803f0000000000000000000080bf295c9f3fb81e053fc2f508407a140e3fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf8ec2b53f3d0a873f86eb294000d7a33cb81e85be0000000000000000000080bf0000803f3bfe97a500000000000080bf16aef73fb81e053fc2f5084052b83e3fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf8ec2b53f295c9f3f86eb29400ad7a33fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf16aef73f0ad7e33f1f85fb3f0ad7a33fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf295c9f3f0ad7e33f1f85fb3f52b83e3fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf295c9f3f295c9f3f1f85fb3f7a140e3fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf295c9f3f3d0a873f86eb29400ad7a33fb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753e0ad7e33f86eb29400ad7a33fb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f0ad7e33f86eb294000d7a33cb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423fb81e053f86eb294000d7a33cb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753eb81e053f1f85fb3f0ad7a33fb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f0ad7e33f1f85fb3f52b83e3fb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e295c9f3f1f85fb3f0ad7a33fb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e0ad7e33f1f85fb3f52b83e3fb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f295c9f3f1f85fb3f7a140e3fb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f3d0a873f1f85fb3f00d7a33cb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753eb81e053f1f85fb3f7a140e3fb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e3d0a873f1f85fb3f00d7a33cb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423fb81e053f0000803f52b83e3f000000bf00000000000000000000803f0000803f00000000000000000000803f0000c03f295c9f3f0000803f0000803f000000bf0000000000000000ffff7f3f0000803f00000000000000000000803f0000c03f0000c03f3e0a57bf52b83e3f000000bf00000000000000000000803f0000803f00000000000000000000803f7c14aebe295c9f3f000080bf0000803f000000bf0000000000000000ffff7f3f0000803f00000000000000000000803f000000bf0000c03f000080bff628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f000000bf7b146e3f3e0a57bf7a140e3f000000bf00000000000000000000803f0000803f00000000000000000000803f7c14aebe3d0a873f0000803ff628dc3e000000bf0000000000000000ffff7f3f0000803f00000000000000000000803f0000c03f7b146e3f0000803f7a140e3f000000bf00000000000000000000803f0000803f00000000000000000000803f0000c03f3d0a873f86eb294000d7a33cb81e853e00000000000080bf000000000000803f0000000000000000000080bf16aef73f90c2753e1f85fb3f00d7a33cb81e853e00000000000080bf000000000000803f0000000000000080000080bf295c9f3f90c2753e1f85fb3f00d7a33cb81e85be00000000000080bf000000000000803f0000000000000000000080bf295c9f3f5c8f423f86eb294000d7a33cb81e85be00000000000080bf000000000000803f0000000000000000000080bf16aef73f5c8f423fd59eae3c7a140e3fda0fdb3f66ed2b3f7c4a0ab30ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f3d0a873f6cdc9e3ef6289cbe3d89b93f66ed2b3f7c4a0ab30ead3d3f0dad3dbf0000000069ed2b3f000080bff6289c3e14ae473e6ddc9e3e7a140e3f3d89b93f67ed2b3f24d1beb20ead3d3f0dad3dbf0000000069ed2b3f000080bff4289c3e3d0a873fb89eae3cf6289cbeda0fdb3f66ed2b3f672c35b30ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f14ae473eb89eae3c48e18a3fda0fdb3f67ed2b3fac3aeb330ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f48e1ca3f6ddc9e3e52b83e3f3d89b93f67ed2b3fac3aeb330ead3d3f0dad3dbf0000000069ed2b3f000080bff4289c3e295c9f3f6cdc9e3e48e18a3f3d89b93f67ed2b3fc953f1330dad3d3f0dad3dbf0000000069ed2b3f000080bff6289c3e48e1ca3fd59eae3c52b83e3fda0fdb3f67ed2b3f9021e5330ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f295c9f3f66feb8be48e18a3f6c65353f69ed2bbf000000000dad3dbf0dad3d3f0000000069ed2bbf000080bf86eb313f48e1ca3f737826bf0000803fa772783f69ed2bbf000000000dad3dbf0dad3d3f0000000069ed2bbf000080bff8289c3e0000c03f737826bf48e18a3fa772783f69ed2bbf000000000dad3dbf0dad3d3f0000000069ed2bbf000080bff8289c3e48e1ca3f66feb8be0000803f6c65353f69ed2bbf000000000dad3dbf0dad3d3f0000000069ed2bbf000080bf86eb313f0000c03fe0fdc6bd7a140e3f0000803f0cad3d3fb08ddcb268ed2bbf69ed2b3f000000000dad3d3f000080bf9061c93e3d0a873f6ddc9e3e7a140e3f3d89b93f0ead3d3f0000000068ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f3d0a873f6cdc9e3ef6289cbe3d89b93f0cad3d3fb08ddcb268ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f14ae473ee8fdc6bdf6289cbe0000803f0cad3d3fb08d5cb368ed2bbf69ed2b3f000000000dad3d3f000080bf9061c93e14ae473e6cdc9e3e48e18a3f3d89b93f0dad3d3ff088453368ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f48e1ca3fe8fdc6bd0000803f0000803f0dad3d3fa081c13368ed2bbf69ed2b3f000000000dad3d3f000080bf9061c93e0000c03f66feb8be48e18a3f6c65353f0ead3d3f0000000069ed2bbf69ed2b3f000000000dad3d3f000080bf0000003348e1ca3f66feb8be0000803f6c65353f0dad3d3f0000000068ed2bbf69ed2b3f000000000dad3d3f000080bf000000330000c03f6ddc9e3e52b83e3f3d89b93f0dad3d3f447f003468ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f295c9f3fe0fdc6bd52b83e3f0000803f0ead3d3f27d94e3468ed2bbf69ed2b3f000000000dad3d3f000080bf9061c93e295c9f3f737826bf48e18a3fa772783f0cad3dbf44c5873369ed2b3f69ed2bbf000000000dad3dbf000080bf0000803f48e1ca3f03a01fbf0000803f0000803f0dad3dbf2bf1f4b369ed2b3f69ed2bbf000000000dad3dbf000080bf9ece753f0000c03fb89eae3c48e18a3fda0fdb3f0dad3dbf8166abb36aed2b3f69ed2bbf022096230dad3dbf000080bf0000000048e1ca3fd59eae3c52b83e3fda0fdb3f0cad3dbf8beb17b469ed2b3f69ed2bbf000000000dad3dbf000080bf00000000295c9f3f02a01fbf52b83e3f0000803f0dad3dbff4f439b469ed2b3f69ed2bbf000000000dad3dbf000080bf9ece753f295c9f3f737826bf0000803fa772783f0ead3dbf0000000067ed2b3f69ed2bbf000000000dad3dbf000080bf0000803f0000c03f02a01fbf7a140e3f0000803f0cad3dbf00c83b3368ed2b3f69ed2bbf000000000dad3dbf000080bf9ece753f3d0a873f03a01fbff6289cbe0000803f0cad3dbfb08d5c3368ed2b3f69ed2bbf000000000dad3dbf000080bf9ece753f14ae473eb89eae3cf6289cbeda0fdb3f0cad3dbf00c83b3368ed2b3f69ed2bbf000000000dad3dbf000080bf0000000014ae473ed59eae3c7a140e3fda0fdb3f0cad3dbf51021b3368ed2b3f69ed2bbf000000000dad3dbf000080bf000000003d0a873f03a01fbff6289cbe0000803f00000000000080bf000000000cad3d3f0000000069ed2bbf000080bff8289c3e9ece753fe8fdc6bdf6289cbe0000803f00000000000080bf000000000ead3d3f0000000068ed2bbf000080bf85eb313f384f1b3fb89eae3cf6289cbeda0fdb3f00000000000080bf000000000ead3d3f0000000068ed2bbf000080bff8289c3e000000006cdc9e3ef6289cbe3d89b93f00000000000080bf000000000ead3d3f0000000068ed2bbf000080bf85eb313f0000000066feb8be48e18a3f6c65353f00000000ffff7f3f000000000dad3dbf0000000069ed2b3f000080bff4289c3e0000803f737826bf48e18a3fa772783f000000000000803f000000000ead3dbf0000000068ed2b3f000080bf84eb313f0000803f6cdc9e3e48e18a3f3d89b93f000000000000803f000000000ead3dbf0000000068ed2b3f000080bff6289c3e00000000b89eae3c48e18a3fda0fdb3f000000000000803f000000000ead3dbf0000000068ed2b3f000080bf84eb313f00000000c2f5084052b83e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf84ebd1bf295c9f3f3e0a57bf52b83e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf1f85ab3f295c9f3f3e0a57bf7a140e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf1f85ab3f3d0a873fc2f508407a140e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf84ebd1bf3d0a873fc2f508407a140e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bfc2f528403d0a873f3e0a57bf7a140e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bf7c14aebe3d0a873f3e0a57bf52b83e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bf7c14aebe295c9f3fc2f5084052b83e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bfc2f52840295c9f3fc2f5084052b83e3fb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753e295c9f3fc2f508407a140e3f90c285bf0000803f000000000000000000000000000000000000803f000080bf20850bbf3d0a873fc2f5084052b83e3f90c285bf0000803f000000000000000000000080000000000000803f000080bf20850bbf295c9f3fc2f508407a140e3fb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753e3d0a873fc2f5084052b83e3fb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f295c9f3fc2f5084052b83e3f7b1416400000803f000000000000000000000000000000000000803f000080bf7b143640295c9f3fc2f508407a140e3f7b1416400000803f000000000000000000000000000000000000803f000080bf7b1436403d0a873fc2f508407a140e3fb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f3d0a873f3e0a57bf52b83e3f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf295c9f3f3e0a57bf7a140e3f7b141640000080bf00000000000000000000000000000000000080bf000080bff628ecbf3d0a873f3e0a57bf52b83e3f7b141640000080bf00000000000000000000000000000000000080bf000080bff628ecbf295c9f3f3e0a57bf7a140e3f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf3d0a873f3e0a57bf52b83e3f90c285bf000080bf00000000000000000000000000000000000080bf000080bf90c2c53f295c9f3f3e0a57bf7a140e3f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f3d0a873f3e0a57bf52b83e3f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f295c9f3f3e0a57bf7a140e3f90c285bf000080bf00000000000000000000000000000000000080bf000080bf90c2c53f3d0a873f3e0a57bf52b83e3f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f295c9f3f3e0a57bf7a140e3f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000003d0a873f3e0a57bf52b83e3f0000003f000080bf00000000000000000000000000000000000080bf000080bf00000000295c9f3f3e0a57bf7a140e3f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f3d0a873f3e0a57bf7a140e3f7b14164000000000000080bf000000000000803f0000000000000000000080bf7c14aebef628ecbfd59eae3c7a140e3fda0fdb3f00000000ffff7fbf000000000000803f000000001e6cf524000080bff774053fda0f9bbfc2f508407a140e3f7b14164000000000000080bf000000000000803f0000000000000000000080bfc2f52840f628ecbf6ddc9e3e7a140e3f3d89b93f00000000000080bf000000000000803f0000000000000000000080bf366e4f3f7a1273bf0000803f7a140e3f0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf1f85fb3f7a140e3fb81e853e00000000000080bf000000000000803f00000000ab2a7e24000080bf90c21d4090c2753ec2f508407a140e3fb81e853e00000000000080bf000000000000803f0000000000000000000080bfc2f5284090c2753e0000803f7a140e3f0000003f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000000000803f7a140e3f000000bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000803f1f85fb3f7a140e3fb81e85be00000000000080bf000000000000803f0000000000000000000080bf90c21d405c8f423f0000803f7a140e3f000080bf00000000ffff7fbf000000000000803f0000000000000080000080bf0000c03f0000c03fc2f508407a140e3f90c285bf00000000000080bf000000000000803f0000000000000000000080bfc2f5284090c2c53f3e0a57bf7a140e3f90c285bf00000000000080bf000000000000803f0000000000000080000080bf7c14aebe90c2c53f3e0a57bf7a140e3f000080bf00000000000080bf000000000000803f0000000000000080000080bf7c14aebe0000c03fc2f508407a140e3fb81e85be00000000000080bf000000000000803f0000000000000000000080bfc2f528405c8f423fe0fdc6bd7a140e3f0000803f00000000000080bf000000000000803f0000000000000000000080bf8840ce3e000000bf02a01fbf7a140e3f0000803f00000000ffff7fbf000000000000803f0000000000000000000080bf1000fdbd000000bf3e0a57bf7a140e3f0000803f00000000000080bf000000000000803f0000000000000000000080bf7c14aebe000000bf3e0a57bf7a140e3f0000003f00000000000080bf000000000000803f0000000000000000000080bf7c14aebe000000003e0a57bf7a140e3f000000bf00000000000080bf000000000000803f0000000000000000000080bf7c14aebe0000803f1f85fb3f0ad7a33fb81e85be000000000000803f00000000000080bf0000000000000000000080bf48e17abe5c8f423f86eb29400ad7a33fb81e853e000000000000803f00000000000080bf0000000000000000000080bf2c5c6fbf90c2753e86eb29400ad7a33fb81e85be000000000000803f00000000000080bf0000000000000000000080bf2c5c6fbf5c8f423f1f85fb3f0ad7a33fb81e853e000000000000803f00000000000080bf0000000000000000000080bf48e17abe90c2753e0000803f7a140e3f0000003f0000000000000000000080bf000080bf00000000000000000000803f000000bf3d0a873f0000803ff628dc3e0000003f0000000000000000ffff7fbf000080bf00000000000000000000803f000000bf7b146e3f3e0a57bf7a140e3f0000003f0000000000000000000080bf000080bf00000000000000000000803f1f85ab3f3d0a873f000080bff628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803f0000c03f7b146e3f3e0a57bf52b83e3f0000003f0000000000000000000080bf000080bf00000000000000000000803f1f85ab3f295c9f3f000080bf0000803f0000003f0000000000000000ffff7fbf000080bf00000000000000000000803f0000c03f0000c03f0000803f0000803f0000003f0000000000000000ffff7fbf000080bf00000000000000000000803f000000bf0000c03f0000803f52b83e3f0000003f0000000000000000000080bf000080bf00000000000000000000803f000000bf295c9f3f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -989,8 +989,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0.65, y: 0.65, z: 0.65} - m_Extent: {x: 0.5, y: 0.5, z: 0.5} + m_Center: {x: 0.8275001, y: 0.13999999, z: 0.65} + m_Extent: {x: 1.8275001, y: 1.14, z: 1.695} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -1405,7 +1405,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 479267782} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.055} + m_LocalPosition: {x: -0.28, y: 0, z: -0.64} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Packages/com.chisel.graph/Chisel/ChiselGraph.cs b/Packages/com.chisel.graph/Chisel/ChiselGraph.cs index a96bccd4e..4a88efe17 100644 --- a/Packages/com.chisel.graph/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.graph/Chisel/ChiselGraph.cs @@ -21,10 +21,18 @@ public void SetActiveNode(ChiselGraphNode node) public void UpdateProperties() { - OnValidate(); + properties = new List(); + foreach (var node in nodes) + if (node is IPropertyNode propertyNode) + properties.Add(propertyNode.Property); + UpdateCSG(); + } + public void UpdateCSG() + { if (instance != null) instance.IsDirty = true; + Debug.Log("csg"); } public void CollectTreeNode(CSGTree tree) @@ -48,10 +56,7 @@ public T GetOverriddenProperty(string key) where T : GraphProperty void OnValidate() { - properties = new List(); - foreach (var node in nodes) - if (node is IPropertyNode propertyNode) - properties.Add(propertyNode.Property); + UpdateProperties(); } } } \ No newline at end of file diff --git a/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphNodeEditor.cs b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphNodeEditor.cs index e354d271f..d1baa20a8 100644 --- a/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphNodeEditor.cs +++ b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphNodeEditor.cs @@ -20,6 +20,15 @@ public override void OnHeaderGUI() public override void OnBodyGUI() { + + var input = target.GetPort("input"); + var output = target.GetPort("output"); + + GUILayout.BeginHorizontal(); + if (input != null) NodeEditorGUILayout.PortField(GUIContent.none, input, GUILayout.MinWidth(0)); + if (output != null) NodeEditorGUILayout.PortField(GUIContent.none, output, GUILayout.MinWidth(0)); + GUILayout.EndHorizontal(); + base.OnBodyGUI(); var node = target as ChiselGraphNode; if (node.chiselGraph.active != node) diff --git a/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs index c986eb31d..0c8a34620 100644 --- a/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs +++ b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs @@ -2,14 +2,17 @@ using UnityEngine; using XNode; using Chisel.Core; -using System.Collections.Generic; namespace Chisel.Nodes { public abstract class ChiselGraphNode : Node { - [Input] public CSG children; - [Output] public CSG parent; + [Input, HideInInspector] public CSG input; + [Output, HideInInspector] public CSG output; + + [Input] public Vector3 localPosition; + [Input] public Vector3 localRotation; + public Action onStateChange; public ChiselGraph chiselGraph => graph as ChiselGraph; @@ -25,16 +28,17 @@ public void SetActive() public void ParseNode(CSGTreeBranch branch) { - var childrenPort = GetInputPort("children"); - if (childrenPort.IsConnected) + var inputPort = GetInputPort("input"); + if (inputPort.IsConnected) { - var chiselNode = childrenPort.Connection.node as ChiselGraphNode; + var chiselNode = inputPort.Connection.node as ChiselGraphNode; chiselNode.ParseNode(branch); } var node = GetNode(); if (node.Valid) { + node.LocalTransformation = Matrix4x4.TRS(localPosition, Quaternion.Euler(localRotation), Vector3.one); node.Operation = operation; branch.Add(node); } @@ -49,6 +53,16 @@ public override object GetValue(NodePort port) return null; } + public override void OnCreateConnection(NodePort from, NodePort to) + { + chiselGraph.UpdateCSG(); + } + + public override void OnRemoveConnection(NodePort port) + { + chiselGraph.UpdateCSG(); + } + void OnValidate() { chiselGraph.UpdateProperties(); diff --git a/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs index 80168f924..51c3eba61 100644 --- a/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs +++ b/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs @@ -1,5 +1,6 @@ using Chisel.Core; using Chisel.Nodes; +using UnityEngine; public class SubGraphNode : ChiselGraphNode { @@ -13,6 +14,7 @@ public override CSGTreeNode GetNode() public override void OnParseNode(CSGTreeBranch parentBranch) { var branch = CSGTreeBranch.Create(); + branch.LocalTransformation = Matrix4x4.TRS(localPosition, Quaternion.Euler(localRotation), Vector3.one); branch.Operation = operation; parentBranch.Add(branch); subgraph.active.ParseNode(branch); From 9176bd1f8f2e5b405b408d03da1729451aa7cbc2 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Thu, 21 Jan 2021 11:54:16 +0800 Subject: [PATCH 20/26] Treat SubGraphNode like other node --- Assets/ChiselNodes/New Chisel Graph.asset | 68 ++- Assets/ChiselNodes/NodeTest.unity | 402 +++++++++--------- .../Chisel/Nodes/ChiselGraphNode.cs | 4 - .../Chisel/Nodes/SubGraphNode.cs | 9 +- 4 files changed, 267 insertions(+), 216 deletions(-) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 474419c59..c683c9b76 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -379,7 +379,7 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - localPosition: {x: 0.97, y: -1.15, z: 0.08} + localPosition: {x: 1.12, y: -1.15, z: 1.55} localRotation: {x: 1.13, y: 0, z: 0} operation: 0 subgraph: {fileID: 11400000, guid: fcd800f03725c234c8d479a178882e4e, type: 2} @@ -403,7 +403,8 @@ MonoBehaviour: - {fileID: -1856057758424149880} - {fileID: -6880739622989829563} - {fileID: -2623054864538869351} - active: {fileID: -1383906636815730267} + - {fileID: 7746474342110482381} + active: {fileID: 7746474342110482381} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: @@ -579,8 +580,69 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - localPosition: {x: 1.17, y: 0.38, z: 0} + localPosition: {x: 1.8, y: 0.38, z: 0} localRotation: {x: 0, y: 0, z: 0} operation: 0 center: {x: 0.72, y: 0.65, z: 0} size: {x: 0.69, y: 1.26, z: 0.52} +--- !u!114 &7746474342110482381 +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: 0dbbcedd95044154d9273ec01444868a, type: 3} + m_Name: Sub Graph + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: 651.8141, y: 508.04434} + ports: + keys: + - input + - output + - localPosition + - localRotation + values: + - _fieldName: input + _node: {fileID: 7746474342110482381} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: output + _node: {fileID: 7746474342110482381} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localPosition + _node: {fileID: 7746474342110482381} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localRotation + _node: {fileID: 7746474342110482381} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + localPosition: {x: 2.28, y: 2.27, z: -0.49} + localRotation: {x: 0, y: 0, z: 0} + operation: 0 + subgraph: {fileID: 11400000, guid: fcd800f03725c234c8d479a178882e4e, type: 2} diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index 39a1cc833..87c2a7303 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -285,6 +285,170 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 33383802} m_Mesh: {fileID: 1777405532} +--- !u!43 &63015121 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[generated-Collider]\u203A" + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 180 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 96 + localAABB: + m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001e0000001f0000001e000000200000001f0000001e00000021000000200000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000320000003100000033000000340000003200000033000000340000003500000032000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 96 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 3233d3bf0000003f0d711cbf3333733f0000003fe61dc73e3333733f0000003f0d711cbf3233d3bf0000003fe61dc73e703dca3fd066153e6a2bf6be703dca3f4ca65abfda8abdbf703dca3fd066153eda8abdbf703dca3f4ca65abf6a2bf6be5c8f82bfd066153eda8abdbf5c8f82bf000000bf0d711cbf5c8f82bfd066153e0d711cbf5c8f82bf4ca65abfda8abdbf5c8f82bf4ca65abf6a2bf6be5c8f82bf000000bf6a2bf6be5c8f82bf4ca65abf6a2bf6be703dca3f4ca65abfda8abdbf703dca3f4ca65abf6a2bf6be5c8f82bf4ca65abfda8abdbf5c8f82bfd066153eda8abdbf3333733fd066153e0d711cbf703dca3fd066153eda8abdbf703dca3fd066153e6a2bf6be3333733fd066153e6a2bf6be5c8f82bfd066153e0d711cbf285c4fbfd066153ee09c893fb81ee53f4ca65abfe09c893fb81ee53fd066153ee09c893f285c4fbf4ca65abfe09c893f285c4fbf4ca65abf08ce993d295c4fbf000000bf0ace993d3333733f000000bf0ace993db81ee53f4ca65abf08ce993db81ee53fd066153e08ce993d3333733fd066153e0ace993db81ee53fd066153ee09c893fb81ee53f4ca65abf08ce993db81ee53fd066153e08ce993db81ee53f4ca65abfe09c893f295c4fbf000000bfe61dc73e295c4fbf000000bf0ace993d285c4fbf4ca65abf08ce993d285c4fbf4ca65abfe09c893f285c4fbfd066153ee09c893f295c4fbfd066153ee61dc73e285c4fbf4ca65abfe09c893fb81ee53f4ca65abf08ce993db81ee53f4ca65abfe09c893f285c4fbf4ca65abf08ce993d295c4fbfd066153ee61dc73e285c4fbfd066153ee09c893f3333733fd066153ee61dc73eb81ee53fd066153ee09c893fb81ee53fd066153e08ce993d3333733fd066153e0ace993d3233d3bf0000003fe61dc73e295c4fbfd066153ee61dc73e3333733f0000003fe61dc73e3333733fd066153ee61dc73e3233d3bf000000bfe61dc73e295c4fbf000000bfe61dc73e3233d3bf000000bf0d711cbf5c8f82bfd066153e0d711cbf5c8f82bf000000bf0d711cbf3233d3bf0000003f0d711cbf3333733f0000003f0d711cbf3333733fd066153e0d711cbf3333733f0000003fe61dc73e3333733fd066153e0ace993d3333733f0000003f0d711cbf3333733fd066153e6a2bf6be3333733fd066153e0d711cbf3333733f000000bf6a2bf6be3333733f000000bf0ace993d3333733fd066153ee61dc73e3233d3bf0000003f0d711cbf3233d3bf000000bfe61dc73e3233d3bf0000003fe61dc73e3233d3bf000000bf0d711cbf3233d3bf000000bfe61dc73e295c4fbf000000bf0ace993d295c4fbf000000bfe61dc73e5c8f82bf000000bf6a2bf6be3333733f000000bf6a2bf6be3333733f000000bf0ace993d3233d3bf000000bf0d711cbf5c8f82bf000000bf0d711cbf5c8f82bf4ca65abfda8abdbf703dca3fd066153eda8abdbf703dca3f4ca65abfda8abdbf5c8f82bfd066153eda8abdbf3333733f000000bf6a2bf6be5c8f82bf000000bf6a2bf6be5c8f82bf4ca65abf6a2bf6be703dca3f4ca65abf6a2bf6be703dca3fd066153e6a2bf6be3333733fd066153e6a2bf6be + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!43 &69493321 Mesh: m_ObjectHideFlags: 0 @@ -456,8 +620,8 @@ Mesh: firstVertex: 0 vertexCount: 96 localAABB: - m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} + m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} m_Shapes: vertices: [] shapes: [] @@ -474,7 +638,7 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001e0000001f0000001e000000200000001f0000001e00000021000000200000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000320000003100000033000000340000003200000033000000340000003500000032000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 m_VertexData: serializedVersion: 3 m_VertexCount: 96 @@ -536,7 +700,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 4608 - _typelessdata: 5c8f023f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3d0a47400000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003d0a47400000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f5c8f023f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000b81e7540d066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81e75404ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81e7540d066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81e75404ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000a4709d3fd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803fa4709d3f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53ea4709d3fd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803fa4709d3f4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000a4709d3f4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf0000000000000000a4709d3f000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53ea4709d3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81e75404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81e75404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000a4709d3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3fa4709d3fd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3d0a4740d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd606d053eb81e7540d066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3fb81e7540d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003d0a4740d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd00000000a4709d3fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053eec51b83fd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fae4781404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803fec51b83f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000003d0a4740000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f984cb53eae4781404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000ae478140d066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3d0a4740d066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f0000803fec51b83f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf984cb53eae478140d066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fae4781404ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000ae478140d066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fae4781404ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000ec51b83f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53eec51b83f000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53eec51b83f4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000ec51b83f4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000ec51b83fd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803fec51b83fd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803fec51b83f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000ae4781404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fae4781404ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f3d0a4740d066153ee61dc73e000000000000803f00000000000080bf0000000068a28932000080bfc01e053ecdaa2f3fec51b83fd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3fec51b83fd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f00000000ae478140d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153e08ce993d000000000000803f00000000000080bf0000000068a28932000080bfcccc4cbfffff7f3f3d0a4740d066153e0ace993d000000000000803f00000000000080bf0000000068a28932000080bfc01e053effff7f3f5c8f023f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803fec51b83fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213fb459253f3d0a47400000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3d0a4740d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f5c8f023f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000ec51b83f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213f000000005c8f023f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf00000000a4709d3fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233eb459253fa4709d3f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233e000000005c8f023f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3d0a47400000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3d0a4740d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3d0a47400000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3d0a4740d066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3d0a47400000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3d0a4740d066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3d0a4740d066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3d0a4740000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003d0a4740000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003d0a4740d066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f5c8f023f0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f5c8f023f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f023f0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f5c8f023f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000005c8f023f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000ec51b83f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bfa870bd3e64aaa03eec51b83f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bfa870bd3e00000000a4709d3f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf10d7233ea8a45e3f3d0a4740000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3d0a4740000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e5c8f023f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803fa4709d3f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf10d7233e0000803fa4709d3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000b81e7540d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803fb81e75404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000a4709d3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3d0a4740000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd984cb53ea4709d3f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53ea4709d3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000b81e75404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81e7540d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3d0a4740d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd0000803f + _typelessdata: 3233d3bf0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3333733f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003333733f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f3233d3bf0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000703dca3fd066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f703dca3f4ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000703dca3fd066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803f703dca3f4ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f000000005c8f82bfd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803f5c8f82bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53e5c8f82bfd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803f5c8f82bf4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f000000005c8f82bf4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f82bf000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53e5c8f82bf4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000703dca3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3f703dca3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000005c8f82bf4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f5c8f82bfd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3333733fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf7c142ebe606d053e703dca3fd066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3f703dca3fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003333733fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf7c142ebe000000005c8f82bfd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053e285c4fbfd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fb81ee53f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81ee53fd066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f285c4fbf4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000295c4fbf000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcdcc4cbf984cb53e3333733f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f984cb53eb81ee53f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000b81ee53fd066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3333733fd066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f0000803fb81ee53fd066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81ee53f4ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81ee53fd066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81ee53f4ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000295c4fbf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53e295c4fbf000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53e285c4fbf4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000285c4fbf4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000285c4fbfd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f295c4fbfd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803f285c4fbf4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81ee53f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81ee53f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f295c4fbfd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3f285c4fbfd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000003333733fd066153ee61dc73e000000000000803f00000000000080bf0000000086619832000080bf10d7233dcdaa2f3fb81ee53fd066153ee09c893f000000000000803f00000000000080bf00000000eb67b5a4000080bfcccc4cbf00000000b81ee53fd066153e08ce993d000000000000803f00000000000080bf0000000086619832000080bfcccc4cbfffff7f3f3333733fd066153e0ace993d000000000000803f00000000000080bf0000000086619832000080bf10d7233dffff7f3f3233d3bf0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803f295c4fbfd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383fb459253f3333733f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3333733fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f3233d3bf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000295c4fbf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383f000000003233d3bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf000000005c8f82bfd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3db459253f5c8f82bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3d000000003233d3bf0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3333733f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3333733fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3333733f0000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3333733fd066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3333733f0000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3333733fd066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3333733fd066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3333733f000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003333733f000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003333733fd066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f3233d3bf0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f3233d3bf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000003233d3bf0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f3233d3bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000003233d3bf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000295c4fbf000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf265c8f3e64aaa03e295c4fbf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf265c8f3e000000005c8f82bf000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf205c8f3da8a45e3f3333733f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3333733f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e3233d3bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803f5c8f82bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf205c8f3d0000803f5c8f82bf4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000703dca3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f703dca3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000005c8f82bfd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3333733f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe984cb53e5c8f82bf000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53e5c8f82bf4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000703dca3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000703dca3fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3333733fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe0000803f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -590,8 +754,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} + m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -849,14 +1013,14 @@ Mesh: m_SubMeshes: - serializedVersion: 2 firstByte: 0 - indexCount: 456 + indexCount: 84 topology: 0 baseVertex: 0 firstVertex: 0 - vertexCount: 228 + vertexCount: 48 localAABB: - m_Center: {x: 0.8275001, y: 0.13999999, z: 0.65} - m_Extent: {x: 1.8275001, y: 1.14, z: 1.695} + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1, y: 1, z: 1} m_Shapes: vertices: [] shapes: [] @@ -873,10 +1037,10 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 000000000100000002000000010000000300000002000000030000000400000002000000010000000500000003000000050000000600000003000000060000000700000003000000070000000600000008000000090000000700000008000000080000000a000000090000000a0000000b000000090000000b0000000c000000090000000b0000000d0000000c0000000d0000000e0000000c0000000f0000000a0000000800000007000000090000001000000000000000110000000100000012000000060000000500000012000000130000000600000014000000150000001600000017000000140000001600000018000000190000001a000000190000001b0000001a0000001c0000001d0000001e0000001e0000001d0000001f0000001d0000001c00000020000000200000001c0000002100000020000000210000002200000023000000220000002100000024000000230000002100000025000000230000002400000025000000260000002300000020000000220000002700000028000000290000002a000000290000002b0000002a00000029000000280000002c0000002c0000002d000000290000002d0000002c0000002e0000002d0000002e0000002f00000030000000310000003200000030000000330000003100000034000000350000003600000034000000370000003500000038000000390000003a000000380000003b00000039000000390000003b0000003c0000003d000000390000003c0000003e0000003d0000003c0000003e0000003f0000003d00000040000000410000004200000040000000430000004100000044000000410000004300000045000000440000004300000046000000440000004500000046000000470000004400000048000000490000004a000000480000004b000000490000004c0000004d0000004e0000004c0000004f0000004d00000050000000510000005200000051000000530000005200000053000000540000005200000050000000550000005100000050000000560000005500000055000000560000005700000058000000590000005a0000005a000000590000005b0000005a0000005b0000005c0000005c0000005b0000005d0000005b0000005e0000005d000000580000005f0000005900000060000000610000006200000062000000610000006300000062000000630000006400000064000000630000006500000063000000660000006500000060000000670000006100000068000000690000006a000000680000006a0000006b0000006c0000006d0000006e0000006c0000006f0000006d0000007000000071000000720000007000000073000000710000007400000075000000760000007500000077000000760000007600000077000000780000007600000078000000790000007a0000007b000000790000007a00000079000000780000007c0000007d0000007e0000007c0000007e0000007f00000080000000810000008200000080000000830000008100000084000000850000008600000084000000870000008500000088000000890000008a000000880000008b000000890000008c0000008d0000008e0000008c0000008e0000008f000000900000009100000092000000910000009300000092000000900000009400000091000000940000009500000091000000960000009700000098000000980000009700000099000000970000009a00000099000000960000009b000000970000009c0000009d0000009e0000009c0000009e0000009f000000a0000000a1000000a2000000a2000000a1000000a3000000a4000000a5000000a6000000a5000000a7000000a6000000a8000000a9000000aa000000a8000000aa000000ab000000ac000000ad000000ae000000ac000000ae000000af000000b0000000b1000000b2000000b0000000b3000000b1000000b4000000b5000000b6000000b4000000b6000000b7000000b8000000b9000000ba000000b8000000bb000000b9000000bc000000bd000000be000000bc000000bf000000bd000000c0000000c1000000c2000000c0000000c3000000c1000000c4000000c5000000c6000000c5000000c7000000c6000000c7000000c8000000c6000000c8000000c9000000c6000000c9000000ca000000c6000000c8000000cb000000c9000000cb000000cc000000c9000000cc000000cd000000c9000000cd000000cc000000ce000000cf000000cd000000ce000000cf000000ce000000d0000000ce000000d1000000d0000000cd000000cf000000d2000000c7000000d3000000c8000000c4000000d4000000c5000000c4000000d5000000d4000000d6000000cc000000cb000000d6000000d7000000cc000000d8000000d9000000da000000d8000000db000000d9000000dc000000dd000000de000000dd000000df000000de000000e0000000de000000df000000e0000000df000000e1000000e2000000e3000000e0000000e2000000e0000000e1000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000000d0000000f00000011000000100000000f0000001200000010000000110000001200000013000000100000001400000015000000160000001400000017000000150000001500000017000000180000001900000015000000180000001a00000019000000180000001a0000001b000000190000001c0000001d0000001e0000001c0000001f0000001d00000020000000210000002200000020000000230000002100000024000000250000002600000027000000240000002600000028000000290000002a0000002b000000280000002a0000002c0000002d0000002e0000002f0000002c0000002e000000 m_VertexData: serializedVersion: 3 - m_VertexCount: 228 + m_VertexCount: 48 m_Channels: - stream: 0 offset: 0 @@ -934,8 +1098,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 10944 - _typelessdata: 3e0a57bf52b83e3f90c285bf000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f90c2c53f0000803f52b83e3f000080bf00000000ffff7f3f00000000000080bf0000000000000000000080bf000000bf0000c03fc2f5084052b83e3f90c285bf000000000000803f00000000000080bf0000000000000080000080bf84ebd1bf90c2c53f1f85fb3f52b83e3fb81e85be000000000000803f00000000000080bf00000000ad2a7ea4000080bf1f85bbbf5c8f423fc2f5084052b83e3fb81e85be000000000000803f00000000000080bf0000000000000080000080bf84ebd1bf5c8f423f0000803f52b83e3f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000803f0000803f52b83e3f0000003f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000001f85fb3f52b83e3fb81e853e000000000000803f00000000000080bf0000000000000000000080bf1f85bbbf90c2753e0000803f52b83e3f0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bfc2f5084052b83e3f7b141640000000000000803f00000000000080bf0000000000000000000080bf84ebd1bff628ecbf6ddc9e3e52b83e3f3d89b93f000000000000803f00000000000080bf0000000000000000000080bf2647423e7a1273bfd59eae3c52b83e3fda0fdb3f00000000ffff7f3f00000000000080bf000000001f6c75a4000080bf1316f53eda0f9bbf3e0a57bf52b83e3f7b14164000000000ffff7f3f00000000000080bf0000000000000000000080bf1f85ab3ff628ecbf02a01fbf52b83e3f0000803f00000000ffff7f3f00000000000080bf0000000000000000000080bf01d08f3f000000bf3e0a57bf52b83e3f0000803f000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f000000bfe0fdc6bd52b83e3f0000803f000000000000803f00000000000080bf0000000000000000000080bfbcdf183f000000bfc2f5084052b83e3fb81e853e000000000000803f00000000000080bf0000000000000000000080bf84ebd1bf90c2753e3e0a57bf52b83e3f000080bf000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f0000c03f3e0a57bf52b83e3f000000bf000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f0000803f3e0a57bf52b83e3f0000003f000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f000000000000803ff628dc3e000000bf000000000000803f000000000000803f00000000000000000000803f0000c03f0000803f000080bff628dc3e000000bf000000000000803f000000000000803f00000080000000000000803f000000bf0000803f000080bff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f000000bf000000000000803ff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f0000c03f00000000e8fdc6bd0000803f0000803f00000000000000000000803f000080bf0000000000000080000080bfbddf183f0000c03fe0fdc6bd52b83e3f0000803f00000000000000000000803f000080bf0000000000000000000080bfbcdf183f295c9f3f0000803f0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf0000c03f0000803f52b83e3f0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf295c9f3f000080bf0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f0000c03f3e0a57bf52b83e3f0000803f00000000000000000000803f000080bf084287a500000000000080bf1f85ab3f295c9f3f03a01fbf0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf02d08f3f0000c03f02a01fbf52b83e3f0000803f00000000000000000000803f000080bf0000000000000000000080bf01d08f3f295c9f3f3e0a57bf7a140e3f0000803f00000000000000000000803f000080bf0000000000000080000080bf1f85ab3f3d0a873f000080bf000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f000000bf03a01fbff6289cbe0000803f00000000000000000000803f000080bf0000000000000080000080bf02d08f3f14ae473ee8fdc6bdf6289cbe0000803f00000000000000000000803f000080bf0000000000000000000080bfbddf183f14ae473e0000803f000080bf0000803f0000000000000000ffff7f3f000080bf6fe62fa500000000000080bf000000bf000000bf0000803f7a140e3f0000803f0000000000000000ffff7f3f000080bf0000000000000000000080bf000000bf3d0a873fe0fdc6bd7a140e3f0000803f00000000000000000000803f000080bf0000000000000000000080bfbcdf183f3d0a873f02a01fbf7a140e3f0000803f00000000000000000000803f000080bf0000000000000080000080bf01d08f3f3d0a873f000080bf000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf000000bf3e0a57bf7a140e3f000080bf0000000000000000ffff7fbf0000803f0842072600000000000080bf7c14aebe3d0a873f0000803f000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f000000bf0000803f7a140e3f000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f3d0a873f000080bf0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000c03f3e0a57bf52b83e3f000080bf0000000000000000000080bf0000803f0000000000000000000080bf7c14aebe295c9f3f0000803f0000803f000080bf0000000000000000ffff7fbf0000803f0000000000000000000080bf0000c03f0000c03f0000803f52b83e3f000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f295c9f3f0000803f0000803f000000bf0000803f000000000000000000000000000000000000803f000080bf000000000000c03f0000803f52b83e3f000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf295c9f3f0000803f0000803f000080bf0000803f000000000000000000000080000000000000803f000080bf000000bf0000c03f0000803f52b83e3f000000bf0000803f000000000000000000000000000000000000803f000080bf00000000295c9f3f0000803f0000803f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000c03f0000803f52b83e3f0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f295c9f3f0000803f0000803f0000003f0000803f000000000000000000000080000000000000803f000080bf0000803f0000c03f0000803f52b83e3f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f295c9f3f0000803f7a140e3f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f3d0a873f0000803ff628dc3e0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f7b146e3f0000803f7a140e3f0000003f0000803f000000000000000000000080000000000000803f000080bf0000803f3d0a873f0000803f000080bf0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f000000bf0000803f000080bf000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf000000bf0000803ff628dc3e000000bf0000803f000000000000000000000000000000000000803f000080bf000000007b146e3f0000803f7a140e3f000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf3d0a873f0000803f7a140e3f000000bf0000803f000000000000000000000000000000000000803f000080bf000000003d0a873f000080bf0000803f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000c03f000080bff628dc3e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f7b146e3f000080bf0000803f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000c03f000080bf000080bf000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f000000bf000080bff628dc3e0000003f000080bf00000000000000000000000000000000000080bf000080bf000000007b146e3f000080bf000080bf0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf000000bf000080bf0000803f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000c03f000080bf0000803f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000c03f000080bf000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf0000803f000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf000080bf000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f0000803f0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000803f0000803f0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000c03f000080bf0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000803f000080bf0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000000066feb8be0000803f6c65353f000000000000803f00000000000080bf0000000000000000000080bf337f5c3fb09555be0000803f0000803f0000003f00000000ffff7f3f00000000000080bf0000000000000080000080bf000000bf00000000e8fdc6bd0000803f0000803f000000000000803f00000000000080bf0000000000000080000080bfbddf183f000000bf0000803f0000803f0000803f000000000000803f00000000000080bf0000000000000080000080bf000000bf000000bf737826bf0000803fa772783f000000000000803f00000000000080bf0000000000000000000080bf3a3c933f4ee5f0be000080bf0000803f0000803f00000000ffff7f3f00000000000080bf0000000000000000000080bf0000c03f000000bf03a01fbf0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf02d08f3f000000bf1f85fb3f0ad7a33fb81e853e00000000000000000000803f000080bf0000000000000000000080bf48e17abe0ad7e33fc2f5084052b83e3fb81e853e00000000000000000000803f000080bf0000000000000000000080bf380ad7be295c9f3f86eb29400ad7a33fb81e853e00000000000000000000803f000080bf3bfe97a500000000000080bf2c5c6fbf0ad7e33fc2f508407a140e3fb81e853e00000000000000000000803f000080bf0000000000000000000080bf380ad7be3d0a873f86eb294000d7a33cb81e853e00000000000000000000803f000080bf0000000000000000000080bf2c5c6fbfb81e053f1f85fb3f00d7a33cb81e853e00000000000000000000803f000080bf0000000000000000000080bf48e17abeb81e053f1f85fb3f7a140e3fb81e853e00000000000000000000803f000080bf0000000000000000000080bf48e17abe3d0a873f1f85fb3f52b83e3fb81e853e00000000000000000000803f000080bf0000000000000000000080bf48e17abe295c9f3f1f85fb3f00d7a33cb81e85be0000000000000000000080bf0000803f0000000000000000000080bf295c9f3fb81e053fc2f508407a140e3fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf8ec2b53f3d0a873f86eb294000d7a33cb81e85be0000000000000000000080bf0000803f3bfe97a500000000000080bf16aef73fb81e053fc2f5084052b83e3fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf8ec2b53f295c9f3f86eb29400ad7a33fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf16aef73f0ad7e33f1f85fb3f0ad7a33fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf295c9f3f0ad7e33f1f85fb3f52b83e3fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf295c9f3f295c9f3f1f85fb3f7a140e3fb81e85be0000000000000000000080bf0000803f0000000000000000000080bf295c9f3f3d0a873f86eb29400ad7a33fb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753e0ad7e33f86eb29400ad7a33fb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f0ad7e33f86eb294000d7a33cb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423fb81e053f86eb294000d7a33cb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753eb81e053f1f85fb3f0ad7a33fb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f0ad7e33f1f85fb3f52b83e3fb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e295c9f3f1f85fb3f0ad7a33fb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e0ad7e33f1f85fb3f52b83e3fb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f295c9f3f1f85fb3f7a140e3fb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423f3d0a873f1f85fb3f00d7a33cb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753eb81e053f1f85fb3f7a140e3fb81e853e000080bf00000000000000000000000000000000000080bf000080bf90c2753e3d0a873f1f85fb3f00d7a33cb81e85be000080bf00000000000000000000000000000000000080bf000080bf5c8f423fb81e053f0000803f52b83e3f000000bf00000000000000000000803f0000803f00000000000000000000803f0000c03f295c9f3f0000803f0000803f000000bf0000000000000000ffff7f3f0000803f00000000000000000000803f0000c03f0000c03f3e0a57bf52b83e3f000000bf00000000000000000000803f0000803f00000000000000000000803f7c14aebe295c9f3f000080bf0000803f000000bf0000000000000000ffff7f3f0000803f00000000000000000000803f000000bf0000c03f000080bff628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f000000bf7b146e3f3e0a57bf7a140e3f000000bf00000000000000000000803f0000803f00000000000000000000803f7c14aebe3d0a873f0000803ff628dc3e000000bf0000000000000000ffff7f3f0000803f00000000000000000000803f0000c03f7b146e3f0000803f7a140e3f000000bf00000000000000000000803f0000803f00000000000000000000803f0000c03f3d0a873f86eb294000d7a33cb81e853e00000000000080bf000000000000803f0000000000000000000080bf16aef73f90c2753e1f85fb3f00d7a33cb81e853e00000000000080bf000000000000803f0000000000000080000080bf295c9f3f90c2753e1f85fb3f00d7a33cb81e85be00000000000080bf000000000000803f0000000000000000000080bf295c9f3f5c8f423f86eb294000d7a33cb81e85be00000000000080bf000000000000803f0000000000000000000080bf16aef73f5c8f423fd59eae3c7a140e3fda0fdb3f66ed2b3f7c4a0ab30ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f3d0a873f6cdc9e3ef6289cbe3d89b93f66ed2b3f7c4a0ab30ead3d3f0dad3dbf0000000069ed2b3f000080bff6289c3e14ae473e6ddc9e3e7a140e3f3d89b93f67ed2b3f24d1beb20ead3d3f0dad3dbf0000000069ed2b3f000080bff4289c3e3d0a873fb89eae3cf6289cbeda0fdb3f66ed2b3f672c35b30ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f14ae473eb89eae3c48e18a3fda0fdb3f67ed2b3fac3aeb330ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f48e1ca3f6ddc9e3e52b83e3f3d89b93f67ed2b3fac3aeb330ead3d3f0dad3dbf0000000069ed2b3f000080bff4289c3e295c9f3f6cdc9e3e48e18a3f3d89b93f67ed2b3fc953f1330dad3d3f0dad3dbf0000000069ed2b3f000080bff6289c3e48e1ca3fd59eae3c52b83e3fda0fdb3f67ed2b3f9021e5330ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f295c9f3f66feb8be48e18a3f6c65353f69ed2bbf000000000dad3dbf0dad3d3f0000000069ed2bbf000080bf86eb313f48e1ca3f737826bf0000803fa772783f69ed2bbf000000000dad3dbf0dad3d3f0000000069ed2bbf000080bff8289c3e0000c03f737826bf48e18a3fa772783f69ed2bbf000000000dad3dbf0dad3d3f0000000069ed2bbf000080bff8289c3e48e1ca3f66feb8be0000803f6c65353f69ed2bbf000000000dad3dbf0dad3d3f0000000069ed2bbf000080bf86eb313f0000c03fe0fdc6bd7a140e3f0000803f0cad3d3fb08ddcb268ed2bbf69ed2b3f000000000dad3d3f000080bf9061c93e3d0a873f6ddc9e3e7a140e3f3d89b93f0ead3d3f0000000068ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f3d0a873f6cdc9e3ef6289cbe3d89b93f0cad3d3fb08ddcb268ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f14ae473ee8fdc6bdf6289cbe0000803f0cad3d3fb08d5cb368ed2bbf69ed2b3f000000000dad3d3f000080bf9061c93e14ae473e6cdc9e3e48e18a3f3d89b93f0dad3d3ff088453368ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f48e1ca3fe8fdc6bd0000803f0000803f0dad3d3fa081c13368ed2bbf69ed2b3f000000000dad3d3f000080bf9061c93e0000c03f66feb8be48e18a3f6c65353f0ead3d3f0000000069ed2bbf69ed2b3f000000000dad3d3f000080bf0000003348e1ca3f66feb8be0000803f6c65353f0dad3d3f0000000068ed2bbf69ed2b3f000000000dad3d3f000080bf000000330000c03f6ddc9e3e52b83e3f3d89b93f0dad3d3f447f003468ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f295c9f3fe0fdc6bd52b83e3f0000803f0ead3d3f27d94e3468ed2bbf69ed2b3f000000000dad3d3f000080bf9061c93e295c9f3f737826bf48e18a3fa772783f0cad3dbf44c5873369ed2b3f69ed2bbf000000000dad3dbf000080bf0000803f48e1ca3f03a01fbf0000803f0000803f0dad3dbf2bf1f4b369ed2b3f69ed2bbf000000000dad3dbf000080bf9ece753f0000c03fb89eae3c48e18a3fda0fdb3f0dad3dbf8166abb36aed2b3f69ed2bbf022096230dad3dbf000080bf0000000048e1ca3fd59eae3c52b83e3fda0fdb3f0cad3dbf8beb17b469ed2b3f69ed2bbf000000000dad3dbf000080bf00000000295c9f3f02a01fbf52b83e3f0000803f0dad3dbff4f439b469ed2b3f69ed2bbf000000000dad3dbf000080bf9ece753f295c9f3f737826bf0000803fa772783f0ead3dbf0000000067ed2b3f69ed2bbf000000000dad3dbf000080bf0000803f0000c03f02a01fbf7a140e3f0000803f0cad3dbf00c83b3368ed2b3f69ed2bbf000000000dad3dbf000080bf9ece753f3d0a873f03a01fbff6289cbe0000803f0cad3dbfb08d5c3368ed2b3f69ed2bbf000000000dad3dbf000080bf9ece753f14ae473eb89eae3cf6289cbeda0fdb3f0cad3dbf00c83b3368ed2b3f69ed2bbf000000000dad3dbf000080bf0000000014ae473ed59eae3c7a140e3fda0fdb3f0cad3dbf51021b3368ed2b3f69ed2bbf000000000dad3dbf000080bf000000003d0a873f03a01fbff6289cbe0000803f00000000000080bf000000000cad3d3f0000000069ed2bbf000080bff8289c3e9ece753fe8fdc6bdf6289cbe0000803f00000000000080bf000000000ead3d3f0000000068ed2bbf000080bf85eb313f384f1b3fb89eae3cf6289cbeda0fdb3f00000000000080bf000000000ead3d3f0000000068ed2bbf000080bff8289c3e000000006cdc9e3ef6289cbe3d89b93f00000000000080bf000000000ead3d3f0000000068ed2bbf000080bf85eb313f0000000066feb8be48e18a3f6c65353f00000000ffff7f3f000000000dad3dbf0000000069ed2b3f000080bff4289c3e0000803f737826bf48e18a3fa772783f000000000000803f000000000ead3dbf0000000068ed2b3f000080bf84eb313f0000803f6cdc9e3e48e18a3f3d89b93f000000000000803f000000000ead3dbf0000000068ed2b3f000080bff6289c3e00000000b89eae3c48e18a3fda0fdb3f000000000000803f000000000ead3dbf0000000068ed2b3f000080bf84eb313f00000000c2f5084052b83e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf84ebd1bf295c9f3f3e0a57bf52b83e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf1f85ab3f295c9f3f3e0a57bf7a140e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf1f85ab3f3d0a873fc2f508407a140e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf84ebd1bf3d0a873fc2f508407a140e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bfc2f528403d0a873f3e0a57bf7a140e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bf7c14aebe3d0a873f3e0a57bf52b83e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bf7c14aebe295c9f3fc2f5084052b83e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bfc2f52840295c9f3fc2f5084052b83e3fb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753e295c9f3fc2f508407a140e3f90c285bf0000803f000000000000000000000000000000000000803f000080bf20850bbf3d0a873fc2f5084052b83e3f90c285bf0000803f000000000000000000000080000000000000803f000080bf20850bbf295c9f3fc2f508407a140e3fb81e85be0000803f000000000000000000000000000000000000803f000080bf90c2753e3d0a873fc2f5084052b83e3fb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f295c9f3fc2f5084052b83e3f7b1416400000803f000000000000000000000000000000000000803f000080bf7b143640295c9f3fc2f508407a140e3f7b1416400000803f000000000000000000000000000000000000803f000080bf7b1436403d0a873fc2f508407a140e3fb81e853e0000803f000000000000000000000000000000000000803f000080bf5c8f423f3d0a873f3e0a57bf52b83e3f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf295c9f3f3e0a57bf7a140e3f7b141640000080bf00000000000000000000000000000000000080bf000080bff628ecbf3d0a873f3e0a57bf52b83e3f7b141640000080bf00000000000000000000000000000000000080bf000080bff628ecbf295c9f3f3e0a57bf7a140e3f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf3d0a873f3e0a57bf52b83e3f90c285bf000080bf00000000000000000000000000000000000080bf000080bf90c2c53f295c9f3f3e0a57bf7a140e3f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f3d0a873f3e0a57bf52b83e3f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f295c9f3f3e0a57bf7a140e3f90c285bf000080bf00000000000000000000000000000000000080bf000080bf90c2c53f3d0a873f3e0a57bf52b83e3f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f295c9f3f3e0a57bf7a140e3f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000003d0a873f3e0a57bf52b83e3f0000003f000080bf00000000000000000000000000000000000080bf000080bf00000000295c9f3f3e0a57bf7a140e3f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f3d0a873f3e0a57bf7a140e3f7b14164000000000000080bf000000000000803f0000000000000000000080bf7c14aebef628ecbfd59eae3c7a140e3fda0fdb3f00000000ffff7fbf000000000000803f000000001e6cf524000080bff774053fda0f9bbfc2f508407a140e3f7b14164000000000000080bf000000000000803f0000000000000000000080bfc2f52840f628ecbf6ddc9e3e7a140e3f3d89b93f00000000000080bf000000000000803f0000000000000000000080bf366e4f3f7a1273bf0000803f7a140e3f0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf1f85fb3f7a140e3fb81e853e00000000000080bf000000000000803f00000000ab2a7e24000080bf90c21d4090c2753ec2f508407a140e3fb81e853e00000000000080bf000000000000803f0000000000000000000080bfc2f5284090c2753e0000803f7a140e3f0000003f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000000000803f7a140e3f000000bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000803f1f85fb3f7a140e3fb81e85be00000000000080bf000000000000803f0000000000000000000080bf90c21d405c8f423f0000803f7a140e3f000080bf00000000ffff7fbf000000000000803f0000000000000080000080bf0000c03f0000c03fc2f508407a140e3f90c285bf00000000000080bf000000000000803f0000000000000000000080bfc2f5284090c2c53f3e0a57bf7a140e3f90c285bf00000000000080bf000000000000803f0000000000000080000080bf7c14aebe90c2c53f3e0a57bf7a140e3f000080bf00000000000080bf000000000000803f0000000000000080000080bf7c14aebe0000c03fc2f508407a140e3fb81e85be00000000000080bf000000000000803f0000000000000000000080bfc2f528405c8f423fe0fdc6bd7a140e3f0000803f00000000000080bf000000000000803f0000000000000000000080bf8840ce3e000000bf02a01fbf7a140e3f0000803f00000000ffff7fbf000000000000803f0000000000000000000080bf1000fdbd000000bf3e0a57bf7a140e3f0000803f00000000000080bf000000000000803f0000000000000000000080bf7c14aebe000000bf3e0a57bf7a140e3f0000003f00000000000080bf000000000000803f0000000000000000000080bf7c14aebe000000003e0a57bf7a140e3f000000bf00000000000080bf000000000000803f0000000000000000000080bf7c14aebe0000803f1f85fb3f0ad7a33fb81e85be000000000000803f00000000000080bf0000000000000000000080bf48e17abe5c8f423f86eb29400ad7a33fb81e853e000000000000803f00000000000080bf0000000000000000000080bf2c5c6fbf90c2753e86eb29400ad7a33fb81e85be000000000000803f00000000000080bf0000000000000000000080bf2c5c6fbf5c8f423f1f85fb3f0ad7a33fb81e853e000000000000803f00000000000080bf0000000000000000000080bf48e17abe90c2753e0000803f7a140e3f0000003f0000000000000000000080bf000080bf00000000000000000000803f000000bf3d0a873f0000803ff628dc3e0000003f0000000000000000ffff7fbf000080bf00000000000000000000803f000000bf7b146e3f3e0a57bf7a140e3f0000003f0000000000000000000080bf000080bf00000000000000000000803f1f85ab3f3d0a873f000080bff628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803f0000c03f7b146e3f3e0a57bf52b83e3f0000003f0000000000000000000080bf000080bf00000000000000000000803f1f85ab3f295c9f3f000080bf0000803f0000003f0000000000000000ffff7fbf000080bf00000000000000000000803f0000c03f0000c03f0000803f0000803f0000003f0000000000000000ffff7fbf000080bf00000000000000000000803f000000bf0000c03f0000803f52b83e3f0000003f0000000000000000000080bf000080bf00000000000000000000803f000000bf295c9f3f + m_DataSize: 2304 + _typelessdata: 000080bf0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000000000803f0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bf0000803f0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf000000bf00000000000080bf0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000bf000080bf0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f0000803f0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000803f0000803f0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000c03f000080bf0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000803f000080bf000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf0000803f000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf000080bf000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000c03f000080bff628dc3e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f7b146e3f000080bf0000803f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000c03f000080bf000080bf000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f000000bf000080bff628dc3e0000003f000080bf00000000000000000000000000000000000080bf000080bf000000007b146e3f000080bf000080bf0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf000000bf000080bf0000803f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000c03f000080bf0000803f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000c03f0000803f0000803f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000c03f0000803ff628dc3e0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f7b146e3f0000803f0000803f0000003f0000803f000000000000000000000080000000000000803f000080bf0000803f0000c03f0000803f000080bf0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f000000bf0000803f000080bf000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf000000bf0000803ff628dc3e000000bf0000803f000000000000000000000000000000000000803f000080bf000000007b146e3f0000803f0000803f000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf0000c03f0000803f0000803f000000bf0000803f000000000000000000000000000000000000803f000080bf000000000000c03f000080bf000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf000000bf0000803f0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f000000bf000080bf0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f0000c03f0000803f000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf000000bf0000803f0000803f0000803f00000000000000000000803f000080bf0000000000000080000080bf000000bf0000c03f000080bf000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f000000bf0000803ff628dc3e000000bf000000000000803f000000000000803f00000000000000000000803f0000c03f0000803f000080bff628dc3e000000bf000000000000803f000000000000803f00000080000000000000803f000000bf0000803f000080bff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f000000bf000000000000803ff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f0000c03f000000000000803f0000803f000000bf00000000000000000000803f0000803f00000000000000000000803f0000c03f0000c03f000080bf0000803f000000bf00000000000000000000803f0000803f00000000000000000000803f000000bf0000c03f000080bff628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f000000bf7b146e3f0000803ff628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f0000c03f7b146e3f0000803ff628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803f000000bf7b146e3f000080bff628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803f0000c03f7b146e3f000080bf0000803f0000003f0000000000000000000080bf000080bf00000000000000000000803f0000c03f0000c03f0000803f0000803f0000003f0000000000000000000080bf000080bf00000000000000000000803f000000bf0000c03f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -989,8 +1153,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0.8275001, y: 0.13999999, z: 0.65} - m_Extent: {x: 1.8275001, y: 1.14, z: 1.695} + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1, y: 1, z: 1} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -1602,7 +1766,7 @@ MonoBehaviour: e00: 1 e01: 0 e02: 0 - e03: 2.74 + e03: 0.49 e10: 0 e11: 1 e12: 0 @@ -1751,8 +1915,8 @@ MonoBehaviour: generatedDataContainer: {fileID: 352119801} colliderContainer: {fileID: 1658714170} colliders: - - surfaceParameter: 3200 - sharedMesh: {fileID: 1036007948} + - surfaceParameter: 3198 + sharedMesh: {fileID: 63015121} meshCollider: {fileID: 1658714172} physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} geometryHashValue: 0 @@ -1943,7 +2107,7 @@ MonoBehaviour: - {fileID: 1703547413} - {fileID: 1703547413} visibilityState: 1 - needVisibilityMeshUpdate: 1 + needVisibilityMeshUpdate: 0 --- !u!4 &763721119 Transform: m_ObjectHideFlags: 0 @@ -2195,170 +2359,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 962769117} m_Mesh: {fileID: 358445131} ---- !u!43 &1036007948 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: "\u2039[generated-Collider]\u203A" - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 180 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 96 - localAABB: - m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 96 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 5c8f023f0000003f0d711cbf3d0a47400000003fe61dc73e3d0a47400000003f0d711cbf5c8f023f0000003fe61dc73eb81e7540d066153e6a2bf6beb81e75404ca65abfda8abdbfb81e7540d066153eda8abdbfb81e75404ca65abf6a2bf6bea4709d3fd066153eda8abdbfa4709d3f000000bf0d711cbfa4709d3fd066153e0d711cbfa4709d3f4ca65abfda8abdbfa4709d3f4ca65abf6a2bf6bea4709d3f000000bf6a2bf6bea4709d3f4ca65abf6a2bf6beb81e75404ca65abfda8abdbfb81e75404ca65abf6a2bf6bea4709d3f4ca65abfda8abdbfa4709d3fd066153eda8abdbf3d0a4740d066153e0d711cbfb81e7540d066153eda8abdbfb81e7540d066153e6a2bf6be3d0a4740d066153e6a2bf6bea4709d3fd066153e0d711cbfec51b83fd066153ee09c893fae4781404ca65abfe09c893fae478140d066153ee09c893fec51b83f4ca65abfe09c893fec51b83f4ca65abf08ce993d3d0a4740000000bf0ace993dae4781404ca65abf08ce993dae478140d066153e08ce993d3d0a4740d066153e0ace993dec51b83f000000bf0ace993dae478140d066153ee09c893fae4781404ca65abf08ce993dae478140d066153e08ce993dae4781404ca65abfe09c893fec51b83f000000bfe61dc73eec51b83f000000bf0ace993dec51b83f4ca65abf08ce993dec51b83f4ca65abfe09c893fec51b83fd066153ee09c893fec51b83fd066153ee61dc73eec51b83f4ca65abfe09c893fae4781404ca65abf08ce993dae4781404ca65abfe09c893fec51b83f4ca65abf08ce993d3d0a4740d066153ee61dc73eec51b83fd066153ee61dc73eec51b83fd066153ee09c893fae478140d066153ee09c893fae478140d066153e08ce993d3d0a4740d066153e0ace993d5c8f023f0000003fe61dc73eec51b83fd066153ee61dc73e3d0a47400000003fe61dc73e3d0a4740d066153ee61dc73e5c8f023f000000bfe61dc73eec51b83f000000bfe61dc73e5c8f023f000000bf0d711cbfa4709d3fd066153e0d711cbfa4709d3f000000bf0d711cbf5c8f023f0000003f0d711cbf3d0a47400000003f0d711cbf3d0a4740d066153e0d711cbf3d0a47400000003fe61dc73e3d0a4740d066153e0ace993d3d0a47400000003f0d711cbf3d0a4740d066153e6a2bf6be3d0a4740d066153e0d711cbf3d0a4740000000bf6a2bf6be3d0a4740000000bf0ace993d3d0a4740d066153ee61dc73e5c8f023f0000003f0d711cbf5c8f023f000000bfe61dc73e5c8f023f0000003fe61dc73e5c8f023f000000bf0d711cbf5c8f023f000000bfe61dc73eec51b83f000000bf0ace993dec51b83f000000bfe61dc73ea4709d3f000000bf6a2bf6be3d0a4740000000bf6a2bf6be3d0a4740000000bf0ace993d5c8f023f000000bf0d711cbfa4709d3f000000bf0d711cbfa4709d3f4ca65abfda8abdbfb81e7540d066153eda8abdbfb81e75404ca65abfda8abdbfa4709d3fd066153eda8abdbf3d0a4740000000bf6a2bf6bea4709d3f000000bf6a2bf6bea4709d3f4ca65abf6a2bf6beb81e75404ca65abf6a2bf6beb81e7540d066153e6a2bf6be3d0a4740d066153e6a2bf6be - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1116557894 GameObject: m_ObjectHideFlags: 24 @@ -2576,7 +2576,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357061025} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.57, y: 0, z: -0.1111} + m_LocalPosition: {x: 0.66, y: 0, z: -0.1111} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1726353266} @@ -2600,7 +2600,7 @@ MonoBehaviour: e00: 1 e01: 0 e02: 0 - e03: 1.5699999 + e03: -0.59 e10: 0 e11: 1 e12: 0 @@ -2703,8 +2703,8 @@ Mesh: firstVertex: 0 vertexCount: 96 localAABB: - m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} + m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} m_Shapes: vertices: [] shapes: [] @@ -2721,7 +2721,7 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001e0000001f0000001e000000200000001f0000001e00000021000000200000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000320000003100000033000000340000003200000033000000340000003500000032000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 m_VertexData: serializedVersion: 3 m_VertexCount: 96 @@ -2783,7 +2783,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 4608 - _typelessdata: 5c8f023f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3d0a47400000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003d0a47400000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f5c8f023f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000b81e7540d066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81e75404ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81e7540d066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81e75404ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000a4709d3fd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803fa4709d3f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53ea4709d3fd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803fa4709d3f4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000a4709d3f4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf0000000000000000a4709d3f000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53ea4709d3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81e75404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81e75404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000a4709d3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3fa4709d3fd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3d0a4740d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd606d053eb81e7540d066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3fb81e7540d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003d0a4740d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd00000000a4709d3fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053eec51b83fd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fae4781404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803fec51b83f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000003d0a4740000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f984cb53eae4781404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000ae478140d066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3d0a4740d066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f0000803fec51b83f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf984cb53eae478140d066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fae4781404ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000ae478140d066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fae4781404ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000ec51b83f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53eec51b83f000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53eec51b83f4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000ec51b83f4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000ec51b83fd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803fec51b83fd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803fec51b83f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000ae4781404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fae4781404ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f3d0a4740d066153ee61dc73e000000000000803f00000000000080bf0000000068a28932000080bfc01e053ecdaa2f3fec51b83fd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3fec51b83fd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f00000000ae478140d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153e08ce993d000000000000803f00000000000080bf0000000068a28932000080bfcccc4cbfffff7f3f3d0a4740d066153e0ace993d000000000000803f00000000000080bf0000000068a28932000080bfc01e053effff7f3f5c8f023f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803fec51b83fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213fb459253f3d0a47400000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3d0a4740d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f5c8f023f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000ec51b83f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213f000000005c8f023f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf00000000a4709d3fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233eb459253fa4709d3f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233e000000005c8f023f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3d0a47400000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3d0a4740d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3d0a47400000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3d0a4740d066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3d0a47400000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3d0a4740d066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3d0a4740d066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3d0a4740000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003d0a4740000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003d0a4740d066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f5c8f023f0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f5c8f023f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f023f0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f5c8f023f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000005c8f023f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000ec51b83f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bfa870bd3e64aaa03eec51b83f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bfa870bd3e00000000a4709d3f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf10d7233ea8a45e3f3d0a4740000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3d0a4740000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e5c8f023f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803fa4709d3f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf10d7233e0000803fa4709d3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000b81e7540d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803fb81e75404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000a4709d3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3d0a4740000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd984cb53ea4709d3f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53ea4709d3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000b81e75404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81e7540d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3d0a4740d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd0000803f + _typelessdata: 3233d3bf0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3333733f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003333733f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f3233d3bf0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000703dca3fd066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f703dca3f4ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000703dca3fd066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803f703dca3f4ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f000000005c8f82bfd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803f5c8f82bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53e5c8f82bfd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803f5c8f82bf4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f000000005c8f82bf4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f82bf000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53e5c8f82bf4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000703dca3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3f703dca3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000005c8f82bf4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f5c8f82bfd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3333733fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf7c142ebe606d053e703dca3fd066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3f703dca3fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003333733fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf7c142ebe000000005c8f82bfd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053e285c4fbfd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fb81ee53f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81ee53fd066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f285c4fbf4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000295c4fbf000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcdcc4cbf984cb53e3333733f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f984cb53eb81ee53f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000b81ee53fd066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3333733fd066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f0000803fb81ee53fd066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81ee53f4ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81ee53fd066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81ee53f4ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000295c4fbf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53e295c4fbf000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53e285c4fbf4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000285c4fbf4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000285c4fbfd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f295c4fbfd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803f285c4fbf4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81ee53f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81ee53f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f295c4fbfd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3f285c4fbfd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000003333733fd066153ee61dc73e000000000000803f00000000000080bf0000000086619832000080bf10d7233dcdaa2f3fb81ee53fd066153ee09c893f000000000000803f00000000000080bf00000000eb67b5a4000080bfcccc4cbf00000000b81ee53fd066153e08ce993d000000000000803f00000000000080bf0000000086619832000080bfcccc4cbfffff7f3f3333733fd066153e0ace993d000000000000803f00000000000080bf0000000086619832000080bf10d7233dffff7f3f3233d3bf0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803f295c4fbfd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383fb459253f3333733f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3333733fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f3233d3bf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000295c4fbf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383f000000003233d3bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf000000005c8f82bfd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3db459253f5c8f82bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3d000000003233d3bf0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3333733f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3333733fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3333733f0000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3333733fd066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3333733f0000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3333733fd066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3333733fd066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3333733f000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003333733f000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003333733fd066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f3233d3bf0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f3233d3bf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000003233d3bf0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f3233d3bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000003233d3bf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000295c4fbf000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf265c8f3e64aaa03e295c4fbf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf265c8f3e000000005c8f82bf000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf205c8f3da8a45e3f3333733f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3333733f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e3233d3bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803f5c8f82bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf205c8f3d0000803f5c8f82bf4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000703dca3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f703dca3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000005c8f82bfd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3333733f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe984cb53e5c8f82bf000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53e5c8f82bf4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000703dca3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000703dca3fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3333733fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe0000803f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -2837,8 +2837,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} + m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -3283,8 +3283,8 @@ Mesh: firstVertex: 0 vertexCount: 96 localAABB: - m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} + m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} m_Shapes: vertices: [] shapes: [] @@ -3301,7 +3301,7 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001e0000001f0000001e000000200000001f0000001e00000021000000200000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000320000003100000033000000340000003200000033000000340000003500000032000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 m_VertexData: serializedVersion: 3 m_VertexCount: 96 @@ -3363,7 +3363,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 4608 - _typelessdata: 5c8f023f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3d0a47400000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003d0a47400000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f5c8f023f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000b81e7540d066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81e75404ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81e7540d066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81e75404ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000a4709d3fd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803fa4709d3f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53ea4709d3fd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803fa4709d3f4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000a4709d3f4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf0000000000000000a4709d3f000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53ea4709d3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81e75404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81e75404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000a4709d3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3fa4709d3fd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3d0a4740d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd606d053eb81e7540d066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3fb81e7540d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003d0a4740d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf00d7a3bd00000000a4709d3fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053eec51b83fd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fae4781404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803fec51b83f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf000000003d0a4740000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f984cb53eae4781404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000ae478140d066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3d0a4740d066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf50b85e3f0000803fec51b83f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf984cb53eae478140d066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fae4781404ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000ae478140d066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fae4781404ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000ec51b83f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53eec51b83f000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53eec51b83f4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000ec51b83f4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000ec51b83fd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803fec51b83fd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803fec51b83f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000ae4781404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fae4781404ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000ec51b83f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f3d0a4740d066153ee61dc73e000000000000803f00000000000080bf0000000068a28932000080bfc01e053ecdaa2f3fec51b83fd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3fec51b83fd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f00000000ae478140d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf00000000ae478140d066153e08ce993d000000000000803f00000000000080bf0000000068a28932000080bfcccc4cbfffff7f3f3d0a4740d066153e0ace993d000000000000803f00000000000080bf0000000068a28932000080bfc01e053effff7f3f5c8f023f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803fec51b83fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213fb459253f3d0a47400000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3d0a4740d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f5c8f023f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000ec51b83f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfac47213f000000005c8f023f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf00000000a4709d3fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233eb459253fa4709d3f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf10d7233e000000005c8f023f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3d0a47400000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3d0a4740d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3d0a47400000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3d0a4740d066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3d0a47400000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3d0a4740d066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3d0a4740d066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3d0a4740000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003d0a4740000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003d0a4740d066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f5c8f023f0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f5c8f023f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f023f0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f5c8f023f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000005c8f023f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000ec51b83f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bfa870bd3e64aaa03eec51b83f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bfa870bd3e00000000a4709d3f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf10d7233ea8a45e3f3d0a4740000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3d0a4740000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e5c8f023f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803fa4709d3f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf10d7233e0000803fa4709d3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000b81e7540d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803fb81e75404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000a4709d3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3d0a4740000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd984cb53ea4709d3f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53ea4709d3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000b81e75404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81e7540d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3d0a4740d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf00d7a3bd0000803f + _typelessdata: 3233d3bf0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3333733f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003333733f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f3233d3bf0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000703dca3fd066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f703dca3f4ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000703dca3fd066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803f703dca3f4ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f000000005c8f82bfd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803f5c8f82bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53e5c8f82bfd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803f5c8f82bf4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f000000005c8f82bf4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f82bf000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53e5c8f82bf4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000703dca3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3f703dca3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000005c8f82bf4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f5c8f82bfd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3333733fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf7c142ebe606d053e703dca3fd066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3f703dca3fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003333733fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf7c142ebe000000005c8f82bfd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053e285c4fbfd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fb81ee53f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81ee53fd066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f285c4fbf4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000295c4fbf000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcdcc4cbf984cb53e3333733f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f984cb53eb81ee53f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000b81ee53fd066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3333733fd066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f0000803fb81ee53fd066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81ee53f4ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81ee53fd066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81ee53f4ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000295c4fbf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53e295c4fbf000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53e285c4fbf4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000285c4fbf4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000285c4fbfd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f295c4fbfd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803f285c4fbf4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81ee53f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81ee53f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f295c4fbfd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3f285c4fbfd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000003333733fd066153ee61dc73e000000000000803f00000000000080bf0000000086619832000080bf10d7233dcdaa2f3fb81ee53fd066153ee09c893f000000000000803f00000000000080bf00000000eb67b5a4000080bfcccc4cbf00000000b81ee53fd066153e08ce993d000000000000803f00000000000080bf0000000086619832000080bfcccc4cbfffff7f3f3333733fd066153e0ace993d000000000000803f00000000000080bf0000000086619832000080bf10d7233dffff7f3f3233d3bf0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803f295c4fbfd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383fb459253f3333733f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3333733fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f3233d3bf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000295c4fbf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383f000000003233d3bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf000000005c8f82bfd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3db459253f5c8f82bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3d000000003233d3bf0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3333733f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3333733fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3333733f0000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3333733fd066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3333733f0000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3333733fd066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3333733fd066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3333733f000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003333733f000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003333733fd066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f3233d3bf0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f3233d3bf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000003233d3bf0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f3233d3bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000003233d3bf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000295c4fbf000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf265c8f3e64aaa03e295c4fbf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf265c8f3e000000005c8f82bf000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf205c8f3da8a45e3f3333733f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3333733f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e3233d3bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803f5c8f82bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf205c8f3d0000803f5c8f82bf4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000703dca3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f703dca3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000005c8f82bfd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3333733f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe984cb53e5c8f82bf000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53e5c8f82bf4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000703dca3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000703dca3fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3333733fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe0000803f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -3417,8 +3417,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 2.275, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.765, y: 0.67705, z: 1.2779499} + m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -3782,7 +3782,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1036007948} + m_Mesh: {fileID: 63015121} --- !u!1 &1703547411 GameObject: m_ObjectHideFlags: 24 @@ -3889,7 +3889,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726353265} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 0, z: 0} + m_LocalPosition: {x: -1.25, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1357061026} @@ -4416,7 +4416,7 @@ MonoBehaviour: e00: 1 e01: 0 e02: 0 - e03: 2.53 + e03: 0.27999997 e10: 0 e11: 1 e12: 0 diff --git a/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs index 0c8a34620..3f95c71de 100644 --- a/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs +++ b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs @@ -42,12 +42,8 @@ public void ParseNode(CSGTreeBranch branch) node.Operation = operation; branch.Add(node); } - - OnParseNode(branch); } - public virtual void OnParseNode(CSGTreeBranch nodes) { } - public override object GetValue(NodePort port) { return null; diff --git a/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs index 51c3eba61..a4a1b20a1 100644 --- a/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs +++ b/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs @@ -7,16 +7,9 @@ public class SubGraphNode : ChiselGraphNode public ChiselGraph subgraph; public override CSGTreeNode GetNode() - { - return default; - } - - public override void OnParseNode(CSGTreeBranch parentBranch) { var branch = CSGTreeBranch.Create(); - branch.LocalTransformation = Matrix4x4.TRS(localPosition, Quaternion.Euler(localRotation), Vector3.one); - branch.Operation = operation; - parentBranch.Add(branch); subgraph.active.ParseNode(branch); + return branch; } } \ No newline at end of file From 3af46839b2b499ed07f0b47db81e1d1ee2f2ba64 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Thu, 21 Jan 2021 12:36:06 +0800 Subject: [PATCH 21/26] Added ChiselGraphHierarchyView --- Assets/ChiselNodes/New Chisel Graph.asset | 12 +- .../ChiselInternalHierarchyView.cs.meta | 2 +- .../com.chisel.graph/Chisel/ChiselGraph.cs | 3 +- .../Chisel/ChiselGraphInstance.cs | 2 + .../Chisel/Editor/ChiselGraphHierarchyView.cs | 461 ++++++++++++++++++ .../Editor/ChiselGraphHierarchyView.cs.meta | 12 + .../Chisel/Editor/ChiselNodesEditor.asmdef | 1 + .../com.chisel.graph/Chisel/Nodes/BoxNode.cs | 4 +- .../Chisel/Nodes/ChiselGraphNode.cs | 5 + .../Chisel/Nodes/SubGraphNode.cs | 2 +- 10 files changed, 491 insertions(+), 13 deletions(-) create mode 100644 Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs create mode 100644 Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs.meta diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index c683c9b76..7c348d451 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -379,8 +379,8 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - localPosition: {x: 1.12, y: -1.15, z: 1.55} - localRotation: {x: 1.13, y: 0, z: 0} + localPosition: {x: 1.62, y: -1.15, z: 1.55} + localRotation: {x: 0.96, y: 0, z: 0} operation: 0 subgraph: {fileID: 11400000, guid: fcd800f03725c234c8d479a178882e4e, type: 2} --- !u!114 &11400000 @@ -580,8 +580,8 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - localPosition: {x: 1.8, y: 0.38, z: 0} - localRotation: {x: 0, y: 0, z: 0} + localPosition: {x: 0.78, y: 0.38, z: 0} + localRotation: {x: -33.98, y: 0, z: 0} operation: 0 center: {x: 0.72, y: 0.65, z: 0} size: {x: 0.69, y: 1.26, z: 0.52} @@ -642,7 +642,7 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - localPosition: {x: 2.28, y: 2.27, z: -0.49} - localRotation: {x: 0, y: 0, z: 0} + localPosition: {x: 2.06, y: 2.27, z: -0.49} + localRotation: {x: 0.16, y: 0, z: 0} operation: 0 subgraph: {fileID: 11400000, guid: fcd800f03725c234c8d479a178882e4e, type: 2} diff --git a/Packages/com.chisel.editor/Chisel/Editor/Editor/DebugHelpers/ChiselInternalHierarchyView.cs.meta b/Packages/com.chisel.editor/Chisel/Editor/Editor/DebugHelpers/ChiselInternalHierarchyView.cs.meta index 4b92ee61c..4d2b93367 100644 --- a/Packages/com.chisel.editor/Chisel/Editor/Editor/DebugHelpers/ChiselInternalHierarchyView.cs.meta +++ b/Packages/com.chisel.editor/Chisel/Editor/Editor/DebugHelpers/ChiselInternalHierarchyView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7b8d828815301fb4d8b281b284870aa1 +guid: adad89983c8251e4ba706e2cca2ac8f4 timeCreated: 1525334689 licenseType: Free MonoImporter: diff --git a/Packages/com.chisel.graph/Chisel/ChiselGraph.cs b/Packages/com.chisel.graph/Chisel/ChiselGraph.cs index 4a88efe17..7dc685611 100644 --- a/Packages/com.chisel.graph/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.graph/Chisel/ChiselGraph.cs @@ -32,12 +32,11 @@ public void UpdateCSG() { if (instance != null) instance.IsDirty = true; - Debug.Log("csg"); } public void CollectTreeNode(CSGTree tree) { - var branch = CSGTreeBranch.Create(); + var branch = CSGTreeBranch.Create(GetInstanceID()); active.ParseNode(branch); tree.Add(branch); } diff --git a/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs index 52e620629..3f0d9efda 100644 --- a/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs @@ -77,6 +77,7 @@ public void UpdateProperties() public void UpdateCSG() { + CSGManager.Clear(); if (!IsDirty) return; IsDirty = false; @@ -86,6 +87,7 @@ public void UpdateCSG() tree = CSGTree.Create(GetInstanceID()); else tree.Clear(); + graph.CollectTreeNode(tree); CSGManager.Flush(finishMeshUpdates); } diff --git a/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs new file mode 100644 index 000000000..82f2e286f --- /dev/null +++ b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs @@ -0,0 +1,461 @@ +using System.Collections.Generic; +using System.Linq; +using UnityEditor; +using UnityEngine; +using Chisel.Core; +//using Chisel.Components; + +namespace Chisel.Nodes +{ +#if true + // This window is a helper window to see what the CSG tree looks like internally + sealed class ChiselGraphHierarchyView : EditorWindow + { + ChiselGraphHierarchyView() + { + windows.Add(this); + } + + public void Awake() + { + Selection.selectionChanged -= OnSelectionChanged; + Selection.selectionChanged += OnSelectionChanged; + } + + public void OnSelectionChanged() + { + this.Repaint(); + } + + void OnDestroy() + { + windows.Remove(this); + } + + Dictionary openNodes = new Dictionary(); + static List windows = new List(); + + public static void RepaintAll() + { + foreach (var window in windows) + { + if (window) + window.Repaint(); + } + } + + [MenuItem("Chisel DEBUG/Chisel Graph Hierarchy")] + static void Create() + { + window = (ChiselGraphHierarchyView)EditorWindow.GetWindow(typeof(ChiselGraphHierarchyView), false, "Chisel Graph Hierarchy"); + window.autoRepaintOnSceneChange = true; + } + + static ChiselGraphHierarchyView window; + + class Styles + { + public GUIStyle emptyItem; + public GUIStyle emptySelected; + public GUIStyle foldOut; + public GUIStyle foldOutSelected; + + public GUIStyle emptyLabelItem; + public GUIStyle emptyLabelSelected; + public GUIStyle foldOutLabel; + public GUIStyle foldOutLabelSelected; + + public Color backGroundColor; + }; + + static Styles styles; + + static void UpdateStyles() + { + styles = new Styles(); + styles.emptyItem = new GUIStyle(EditorStyles.foldout); + + styles.emptyItem.active.background = null; + styles.emptyItem.hover.background = null; + styles.emptyItem.normal.background = null; + styles.emptyItem.focused.background = null; + + styles.emptyItem.onActive.background = null; + styles.emptyItem.onHover.background = null; + styles.emptyItem.onNormal.background = null; + styles.emptyItem.onFocused.background = null; + + styles.emptySelected = new GUIStyle(styles.emptyItem); + styles.emptySelected.normal = styles.emptySelected.active; + styles.emptySelected.onNormal = styles.emptySelected.onActive; + + + styles.emptyLabelItem = new GUIStyle(EditorStyles.label); + styles.emptyLabelSelected = new GUIStyle(styles.emptyLabelItem); + styles.emptyLabelSelected.normal = styles.emptyLabelSelected.active; + styles.emptyLabelSelected.onNormal = styles.emptyLabelSelected.onActive; + + + styles.foldOut = new GUIStyle(EditorStyles.foldout); + styles.foldOut.focused = styles.foldOut.normal; + styles.foldOut.active = styles.foldOut.normal; + styles.foldOut.onNormal = styles.foldOut.normal; + styles.foldOut.onActive = styles.foldOut.normal; + + styles.foldOutSelected = new GUIStyle(EditorStyles.foldout); + styles.foldOutSelected.normal = styles.foldOutSelected.active; + styles.foldOutSelected.onNormal = styles.foldOutSelected.onActive; + + + + styles.foldOutLabel = new GUIStyle(EditorStyles.label); + styles.foldOutLabel.active = styles.foldOutLabel.normal; + styles.foldOutLabel.onActive = styles.foldOutLabel.onNormal; + + styles.foldOutLabelSelected = new GUIStyle(EditorStyles.label); + styles.foldOutLabelSelected.normal = styles.foldOutLabelSelected.active; + styles.foldOutLabelSelected.onNormal = styles.foldOutLabelSelected.onActive; + + styles.backGroundColor = styles.foldOutLabelSelected.onNormal.textColor; + styles.backGroundColor.a = 0.5f; + + GUIStyleState selected = styles.foldOutLabelSelected.normal; + selected.textColor = Color.white; + styles.foldOutSelected.normal = selected; + styles.foldOutSelected.onNormal = selected; + styles.foldOutSelected.active = selected; + styles.foldOutSelected.onActive = selected; + styles.foldOutSelected.focused = selected; + styles.foldOutSelected.onFocused = selected; + + styles.foldOutLabelSelected.normal = selected; + styles.foldOutLabelSelected.onNormal = selected; + styles.foldOutLabelSelected.active = selected; + styles.foldOutLabelSelected.onActive = selected; + styles.foldOutLabelSelected.focused = selected; + styles.foldOutLabelSelected.onFocused = selected; + + styles.emptyLabelSelected.normal = selected; + styles.emptyLabelSelected.onNormal = selected; + styles.emptyLabelSelected.active = selected; + styles.emptyLabelSelected.onActive = selected; + styles.emptyLabelSelected.focused = selected; + styles.emptyLabelSelected.onFocused = selected; + + + + + styles.emptyItem.active = styles.emptyItem.normal; + styles.emptyItem.onActive = styles.emptyItem.onNormal; + } + + const int kScrollWidth = 20; + const int kItemIndent = 20; + const int kIconWidth = 20; + const int kPadding = 2; + static Vector2 m_ScrollPos; + + sealed class StackItem + { + public StackItem(CSGTreeNode[] _children, float _xpos = 0) { children = _children; index = 0; count = children.Length; xpos = _xpos; } + public int index; + public int count; + public float xpos; + public CSGTreeNode[] children; + } + static List itemStack = new List(); + + static int GetVisibleItems(Dictionary sceneHierarchies, ref Dictionary openNodes) + { + if (sceneHierarchies == null || sceneHierarchies.Count == 0) + return 0; + + int totalCount = 0; + foreach (var item in sceneHierarchies) + { + totalCount += 1; // scene foldout itself + itemStack.Clear(); + totalCount += GetVisibleItems(item.Value, ref openNodes); + } + return totalCount; + } + + static int GetVisibleItems(CSGTreeNode[] hierarchyItems, ref Dictionary openNodes) + { + if (hierarchyItems == null) + return 0; + + int totalCount = hierarchyItems.Length; + itemStack.Add(new StackItem(hierarchyItems)); + + ContinueOnNextStackItem: + if (itemStack.Count == 0) + return totalCount; + + var currentStackItem = itemStack[itemStack.Count - 1]; + var children = currentStackItem.children; + + while (currentStackItem.index < currentStackItem.count) + { + int i = currentStackItem.index; + currentStackItem.index++; + + var nodeID = children[i].NodeID; + bool isOpen; + if (!openNodes.TryGetValue(nodeID, out isOpen)) + { + isOpen = true; + openNodes[nodeID] = true; + } + if (isOpen) + { + var childCount = children[i].Count; + if (childCount > 0) + { + totalCount += childCount; + itemStack.Add(new StackItem(children[i].ChildrenToArray())); + goto ContinueOnNextStackItem; + } + } + } + itemStack.RemoveAt(itemStack.Count - 1); + goto ContinueOnNextStackItem; + } + + static void AddFoldOuts(ref Rect itemRect, ref Rect visibleArea, CSGTreeNode[] hierarchyItems, HashSet selectedInstanceIDs, ref Dictionary openNodes) + { + if (hierarchyItems == null || hierarchyItems.Length == 0) + return; + + var defaultColor = GUI.color; + AddFoldOuts(ref itemRect, ref visibleArea, hierarchyItems, selectedInstanceIDs, defaultColor, ref openNodes); + GUI.color = defaultColor; + } + + static string NameForTreeNode(CSGTreeNode coreNode) + { + var userID = coreNode.UserID; + var nodeID = coreNode.NodeID; + var obj = (userID != 0) ? EditorUtility.InstanceIDToObject(userID) : null; + string name; + if (obj == null) + { + name = ""; + } + else + { + name = obj.name; + } + return string.Format("{0} [{1}:{2}:{3}]", name, (nodeID - 1), userID, coreNode.Type); + } + + static void AddFoldOuts(ref Rect itemRect, ref Rect visibleArea, CSGTreeNode[] hierarchyItems, HashSet selectedInstanceIDs, Color defaultColor, ref Dictionary openNodes) + { + if (hierarchyItems == null) + return; + itemStack.Add(new StackItem(hierarchyItems, itemRect.x)); + + ContinueOnNextStackItem: + if (itemStack.Count == 0) + { + return; + } + + float kItemHeight = EditorGUIUtility.singleLineHeight; + + var prevBackgroundColor = GUI.backgroundColor; + var currentStackItem = itemStack[itemStack.Count - 1]; + var children = currentStackItem.children; + itemRect.x = currentStackItem.xpos; + while (currentStackItem.index < currentStackItem.count) + { + int i = currentStackItem.index; + currentStackItem.index++; + if (itemRect.y > visibleArea.yMax) + { + GUI.backgroundColor = prevBackgroundColor; + return; + } + + var nodeID = children[i].NodeID; + var userID = children[i].UserID; + var childCount = children[i].Count; + if (itemRect.y > visibleArea.yMin) + { + var name = NameForTreeNode(children[i]); + var selected = selectedInstanceIDs.Contains(userID); + var labelStyle = (childCount > 0) ? + (selected ? styles.foldOutLabelSelected : styles.foldOutLabel) : + (selected ? styles.emptyLabelSelected : styles.emptyLabelItem); + + + bool isOpen; + if (!openNodes.TryGetValue(nodeID, out isOpen)) + openNodes[nodeID] = false; + + const float labelOffset = 14; + + if (selected) + { + GUI.backgroundColor = styles.backGroundColor; + var extended = itemRect; + extended.x = 0; + GUI.Box(extended, GUIContent.none); + } + else + GUI.backgroundColor = prevBackgroundColor; + EditorGUI.BeginChangeCheck(); + var foldOutRect = itemRect; + foldOutRect.width = labelOffset; + var labelRect = itemRect; + labelRect.x += labelOffset; + labelRect.width -= labelOffset; + if (childCount > 0) + openNodes[nodeID] = EditorGUI.Foldout(foldOutRect, isOpen, string.Empty, true, styles.foldOut); + if (EditorGUI.EndChangeCheck() || + GUI.Button(labelRect, name, labelStyle)) + { + Debug.Log(name); + var obj = EditorUtility.InstanceIDToObject(userID); + if (!(obj is GameObject)) + { + var mono = (obj as MonoBehaviour); + if (mono) + userID = mono.gameObject.GetInstanceID(); + } + Selection.instanceIDs = new[] { userID }; + } + } + itemRect.y += kItemHeight; + + if (openNodes[nodeID]) + { + if (childCount > 0) + { + itemStack.Add(new StackItem(children[i].ChildrenToArray(), itemRect.x + kItemIndent)); + goto ContinueOnNextStackItem; + } + } + } + itemStack.RemoveAt(itemStack.Count - 1); + goto ContinueOnNextStackItem; + } + + + void OnGUI() + { + if (styles == null) + UpdateStyles(); + + var selectedInstanceIDs = new HashSet(); + + foreach (var instanceID in Selection.instanceIDs) + { + var obj = EditorUtility.InstanceIDToObject(instanceID); + var graphNode = obj as ChiselGraphNode; + if (graphNode != null) + { + var instanceID_ = graphNode.GetInstanceID(); + selectedInstanceIDs.Add(instanceID_); + } + } + + float kItemHeight = EditorGUIUtility.singleLineHeight; + + var allNodes = CSGManager.AllTreeNodes; + var allRootNodeList = new List(); + for (int i = 0; i < allNodes.Length; i++) + { + if (allNodes[i].Type != CSGNodeType.Tree && + (allNodes[i].Tree.Valid || allNodes[i].Parent.Valid)) + continue; + + allRootNodeList.Add(allNodes[i]); + } + + var allRootNodes = allRootNodeList.ToArray(); + + var totalCount = GetVisibleItems(allRootNodes, ref openNodes); + + var itemArea = position; + itemArea.x = 0; + itemArea.y = 0; + itemArea.height -= 200; + + var totalRect = position; + totalRect.x = 0; + totalRect.y = 0; + totalRect.width = position.width - kScrollWidth; + totalRect.height = (totalCount * kItemHeight) + (2 * kPadding); + + var itemRect = position; + itemRect.x = 0; + itemRect.y = kPadding; + itemRect.height = kItemHeight; + + m_ScrollPos = GUI.BeginScrollView(itemArea, m_ScrollPos, totalRect); + { + Rect visibleArea = itemArea; + visibleArea.x += m_ScrollPos.x; + visibleArea.y += m_ScrollPos.y; + + AddFoldOuts(ref itemRect, ref visibleArea, allRootNodes, selectedInstanceIDs, ref openNodes); + } + GUI.EndScrollView(); + if (selectedInstanceIDs.Count == 1) + { + var instanceID = selectedInstanceIDs.First(); + var obj = EditorUtility.InstanceIDToObject(instanceID) as ChiselGraphNode; + if (obj) + { + //var brush = obj as ChiselBrush; + //var composite = obj as ChiselComposite; + //var model = obj as ChiselModel; + int nodeID = CSGTreeNode.InvalidNode.NodeID; + //if (brush ) nodeID = brush.TopNode.NodeID; + //else if (composite) nodeID = composite.Node.NodeID; + //else if (model ) nodeID = model.Node.NodeID; + //else + { + for (int n = 0; n < allNodes.Length; n++) + { + if (allNodes[n].UserID == instanceID) + { + nodeID = allNodes[n].NodeID; + break; + } + } + } + + if (nodeID != CSGTreeNode.InvalidNode.NodeID) + { + var labelArea = itemArea; + labelArea.x = 0; + labelArea.y = labelArea.height; + labelArea.height = kItemHeight; + CSGTreeNode node = CSGTreeNode.Encapsulate(nodeID); + GUI.Label(labelArea, "NodeID: " + (nodeID - 1)); labelArea.y += kItemHeight; + GUI.Label(labelArea, "UserID: " + node.UserID); labelArea.y += kItemHeight; + GUI.Label(labelArea, "Operation: " + node.Operation); labelArea.y += kItemHeight; + GUI.Label(labelArea, "Valid: " + node.Valid); labelArea.y += kItemHeight; + GUI.Label(labelArea, "NodeType: " + node.Type); labelArea.y += kItemHeight; + GUI.Label(labelArea, "ChildCount: " + node.Count); labelArea.y += kItemHeight; + if (node.Type != CSGNodeType.Tree) + { + GUI.Label(labelArea, "Parent: " + (node.Parent.NodeID - 1) + " valid: " + node.Parent.Valid); labelArea.y += kItemHeight; + GUI.Label(labelArea, "Model: " + (node.Tree.NodeID - 1) + " valid: " + node.Tree.Valid); labelArea.y += kItemHeight; + } + if (node.Type == CSGNodeType.Brush) + { + var treeBrush = (CSGTreeBrush)node; + var brushMeshInstance = treeBrush.BrushMesh; + GUI.Label(labelArea, "BrushMeshInstance: " + brushMeshInstance.BrushMeshID + " valid: " + brushMeshInstance.Valid); labelArea.y += kItemHeight; + } + } + } + } + } + } +#endif +} + diff --git a/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs.meta b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs.meta new file mode 100644 index 000000000..4b92ee61c --- /dev/null +++ b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 7b8d828815301fb4d8b281b284870aa1 +timeCreated: 1525334689 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.graph/Chisel/Editor/ChiselNodesEditor.asmdef b/Packages/com.chisel.graph/Chisel/Editor/ChiselNodesEditor.asmdef index 3f5ae756e..62d05fa47 100644 --- a/Packages/com.chisel.graph/Chisel/Editor/ChiselNodesEditor.asmdef +++ b/Packages/com.chisel.graph/Chisel/Editor/ChiselNodesEditor.asmdef @@ -2,6 +2,7 @@ "name": "ChiselNodeEditor", "rootNamespace": "", "references": [ + "GUID:642cde28f6a094d458a26f9a4533c056", "GUID:cf37be73cdb56984ba3a7eb55f849524", "GUID:002c1bbed08fa44d282ef34fd5edb138", "GUID:b8e24fd1eb19b4226afebb2810e3c19b" diff --git a/Packages/com.chisel.graph/Chisel/Nodes/BoxNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/BoxNode.cs index 2a3d41574..e270e9f65 100644 --- a/Packages/com.chisel.graph/Chisel/Nodes/BoxNode.cs +++ b/Packages/com.chisel.graph/Chisel/Nodes/BoxNode.cs @@ -18,9 +18,7 @@ public override CSGTreeNode GetNode() BrushMeshFactory.GenerateBox(ref brushContainer, ref box); var instance = BrushMeshInstance.Create(brushContainer.brushMeshes[0]); - var treeNode = CSGTreeBrush.Create(0, instance); - - treeNode.Operation = operation; + var treeNode = CSGTreeBrush.Create(GetInstanceID(), instance); return treeNode; } diff --git a/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs index 3f95c71de..cb25800cf 100644 --- a/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs +++ b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs @@ -64,6 +64,11 @@ void OnValidate() chiselGraph.UpdateProperties(); } + protected int GetGraphNodeID() + { + return chiselGraph.nodes.IndexOf(this); + } + [Serializable] public class CSG { } } diff --git a/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs index a4a1b20a1..c03e709e3 100644 --- a/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs +++ b/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs @@ -8,7 +8,7 @@ public class SubGraphNode : ChiselGraphNode public override CSGTreeNode GetNode() { - var branch = CSGTreeBranch.Create(); + var branch = CSGTreeBranch.Create(GetInstanceID()); subgraph.active.ParseNode(branch); return branch; } From 3e8d8d5418910cce0624ba534d81caee47440e1b Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Thu, 21 Jan 2021 12:45:41 +0800 Subject: [PATCH 22/26] Show position and rotation in ChiselGraphHierarchyView --- .../Chisel/Editor/ChiselGraphHierarchyView.cs | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs index 82f2e286f..5e7395335 100644 --- a/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs +++ b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs @@ -405,28 +405,20 @@ void OnGUI() if (selectedInstanceIDs.Count == 1) { var instanceID = selectedInstanceIDs.First(); - var obj = EditorUtility.InstanceIDToObject(instanceID) as ChiselGraphNode; - if (obj) + var graphNode = EditorUtility.InstanceIDToObject(instanceID) as ChiselGraphNode; + if (graphNode) { - //var brush = obj as ChiselBrush; - //var composite = obj as ChiselComposite; - //var model = obj as ChiselModel; int nodeID = CSGTreeNode.InvalidNode.NodeID; - //if (brush ) nodeID = brush.TopNode.NodeID; - //else if (composite) nodeID = composite.Node.NodeID; - //else if (model ) nodeID = model.Node.NodeID; - //else + for (int n = 0; n < allNodes.Length; n++) { - for (int n = 0; n < allNodes.Length; n++) + if (allNodes[n].UserID == instanceID) { - if (allNodes[n].UserID == instanceID) - { - nodeID = allNodes[n].NodeID; - break; - } + nodeID = allNodes[n].NodeID; + break; } } + if (nodeID != CSGTreeNode.InvalidNode.NodeID) { var labelArea = itemArea; @@ -440,6 +432,8 @@ void OnGUI() GUI.Label(labelArea, "Valid: " + node.Valid); labelArea.y += kItemHeight; GUI.Label(labelArea, "NodeType: " + node.Type); labelArea.y += kItemHeight; GUI.Label(labelArea, "ChildCount: " + node.Count); labelArea.y += kItemHeight; + GUI.Label(labelArea, "LocalPosition: " + GetPosition(node.LocalTransformation)); labelArea.y += kItemHeight; + GUI.Label(labelArea, "LocalRotation: " + GetRotation(node.LocalTransformation)); labelArea.y += kItemHeight; if (node.Type != CSGNodeType.Tree) { GUI.Label(labelArea, "Parent: " + (node.Parent.NodeID - 1) + " valid: " + node.Parent.Valid); labelArea.y += kItemHeight; @@ -455,6 +449,15 @@ void OnGUI() } } } + public static Vector3 GetPosition(Matrix4x4 m) + { + return m.GetColumn(3); + } + + public static Vector3 GetRotation(Matrix4x4 m) + { + return Quaternion.LookRotation(m.GetColumn(2), m.GetColumn(1)).eulerAngles; + } } #endif } From ab6d4dc2af819282637ed136bc098462e5d04a90 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Thu, 21 Jan 2021 12:50:45 +0800 Subject: [PATCH 23/26] Clear only when dirty --- Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs index 3f0d9efda..2f8502c4a 100644 --- a/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs @@ -77,10 +77,11 @@ public void UpdateProperties() public void UpdateCSG() { - CSGManager.Clear(); if (!IsDirty) return; IsDirty = false; + CSGManager.Clear(); + graph.instance = this; if (!tree.Valid) From fac43643c4dcfd6be43bccaf7010c82fd8fe39e3 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Thu, 21 Jan 2021 13:05:09 +0800 Subject: [PATCH 24/26] Allow selecting any obj in ChiselGraphHierarchyView --- Assets/ChiselNodes/New Chisel Graph.asset | 2 +- .../Chisel/ChiselGraphInstance.cs | 2 ++ .../Chisel/Editor/ChiselGraphHierarchyView.cs | 29 ++++--------------- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 7c348d451..889967b27 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -404,7 +404,7 @@ MonoBehaviour: - {fileID: -6880739622989829563} - {fileID: -2623054864538869351} - {fileID: 7746474342110482381} - active: {fileID: 7746474342110482381} + active: {fileID: -1383906636815730267} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: diff --git a/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs index 2f8502c4a..9c14df83c 100644 --- a/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs @@ -89,6 +89,8 @@ public void UpdateCSG() else tree.Clear(); + print(tree.UserID + "|" + tree.NodeID); + graph.CollectTreeNode(tree); CSGManager.Flush(finishMeshUpdates); } diff --git a/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs index 5e7395335..d5efac4a4 100644 --- a/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs +++ b/Packages/com.chisel.graph/Chisel/Editor/ChiselGraphHierarchyView.cs @@ -3,7 +3,6 @@ using UnityEditor; using UnityEngine; using Chisel.Core; -//using Chisel.Components; namespace Chisel.Nodes { @@ -312,19 +311,9 @@ static void AddFoldOuts(ref Rect itemRect, ref Rect visibleArea, CSGTreeNode[] h labelRect.width -= labelOffset; if (childCount > 0) openNodes[nodeID] = EditorGUI.Foldout(foldOutRect, isOpen, string.Empty, true, styles.foldOut); - if (EditorGUI.EndChangeCheck() || - GUI.Button(labelRect, name, labelStyle)) - { - Debug.Log(name); - var obj = EditorUtility.InstanceIDToObject(userID); - if (!(obj is GameObject)) - { - var mono = (obj as MonoBehaviour); - if (mono) - userID = mono.gameObject.GetInstanceID(); - } + + if (EditorGUI.EndChangeCheck() || GUI.Button(labelRect, name, labelStyle)) Selection.instanceIDs = new[] { userID }; - } } itemRect.y += kItemHeight; @@ -352,12 +341,8 @@ void OnGUI() foreach (var instanceID in Selection.instanceIDs) { var obj = EditorUtility.InstanceIDToObject(instanceID); - var graphNode = obj as ChiselGraphNode; - if (graphNode != null) - { - var instanceID_ = graphNode.GetInstanceID(); - selectedInstanceIDs.Add(instanceID_); - } + if (obj != null) + selectedInstanceIDs.Add(obj.GetInstanceID()); } float kItemHeight = EditorGUIUtility.singleLineHeight; @@ -405,18 +390,16 @@ void OnGUI() if (selectedInstanceIDs.Count == 1) { var instanceID = selectedInstanceIDs.First(); - var graphNode = EditorUtility.InstanceIDToObject(instanceID) as ChiselGraphNode; - if (graphNode) + var obj = EditorUtility.InstanceIDToObject(instanceID); + if (obj) { int nodeID = CSGTreeNode.InvalidNode.NodeID; for (int n = 0; n < allNodes.Length; n++) - { if (allNodes[n].UserID == instanceID) { nodeID = allNodes[n].NodeID; break; } - } if (nodeID != CSGTreeNode.InvalidNode.NodeID) From e5835b0369418708565b10a16d8b6fd1e39b9796 Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Thu, 21 Jan 2021 15:16:14 +0800 Subject: [PATCH 25/26] Implemented cylinder node and multiple input connections --- Assets/ChiselNodes/New Chisel Graph.asset | 102 ++- Assets/ChiselNodes/NodeTest.unity | 834 +++++++++--------- .../Chisel/ChiselGraphInstance.cs | 2 - .../Chisel/Nodes/ChiselGraphNode.cs | 8 +- .../Chisel/Nodes/CylinderNode.cs | 29 + .../Chisel/Nodes/CylinderNode.cs.meta | 11 + 6 files changed, 564 insertions(+), 422 deletions(-) create mode 100644 Packages/com.chisel.graph/Chisel/Nodes/CylinderNode.cs create mode 100644 Packages/com.chisel.graph/Chisel/Nodes/CylinderNode.cs.meta diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 889967b27..4561f7f53 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -187,6 +187,9 @@ MonoBehaviour: - fieldName: output node: {fileID: 3873916941957806223} reroutePoints: [] + - fieldName: output + node: {fileID: 6932176701218924448} + reroutePoints: [] _direction: 0 _connectionType: 0 _typeConstraint: 0 @@ -404,7 +407,8 @@ MonoBehaviour: - {fileID: -6880739622989829563} - {fileID: -2623054864538869351} - {fileID: 7746474342110482381} - active: {fileID: -1383906636815730267} + - {fileID: 6932176701218924448} + active: {fileID: -3665420030514838893} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: @@ -585,6 +589,102 @@ MonoBehaviour: operation: 0 center: {x: 0.72, y: 0.65, z: 0} size: {x: 0.69, y: 1.26, z: 0.52} +--- !u!114 &6932176701218924448 +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: 2c0b6f7ddb5b0034697c7de4ea7f6f99, type: 3} + m_Name: Cylinder + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: -168, y: 440} + ports: + keys: + - diameter + - input + - output + - localPosition + - localRotation + - height + - sides + values: + - _fieldName: diameter + _node: {fileID: 6932176701218924448} + _typeQualifiedName: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: input + _node: {fileID: 6932176701218924448} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: output + _node: {fileID: 6932176701218924448} + _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: + - fieldName: input + node: {fileID: -3665420030514838893} + reroutePoints: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localPosition + _node: {fileID: 6932176701218924448} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: localRotation + _node: {fileID: 6932176701218924448} + _typeQualifiedName: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: height + _node: {fileID: 6932176701218924448} + _typeQualifiedName: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + - _fieldName: sides + _node: {fileID: 6932176701218924448} + _typeQualifiedName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + localPosition: {x: 0, y: -0.19, z: 0} + localRotation: {x: 0.1, y: 0, z: 0} + operation: 1 + diameter: 1.08 + height: 1.24 + sides: 12 --- !u!114 &7746474342110482381 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ChiselNodes/NodeTest.unity b/Assets/ChiselNodes/NodeTest.unity index 87c2a7303..f1614c368 100644 --- a/Assets/ChiselNodes/NodeTest.unity +++ b/Assets/ChiselNodes/NodeTest.unity @@ -285,170 +285,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 33383802} m_Mesh: {fileID: 1777405532} ---- !u!43 &63015121 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: "\u2039[generated-Collider]\u203A" - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 180 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 96 - localAABB: - m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001e0000001f0000001e000000200000001f0000001e00000021000000200000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000320000003100000033000000340000003200000033000000340000003500000032000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 96 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 3233d3bf0000003f0d711cbf3333733f0000003fe61dc73e3333733f0000003f0d711cbf3233d3bf0000003fe61dc73e703dca3fd066153e6a2bf6be703dca3f4ca65abfda8abdbf703dca3fd066153eda8abdbf703dca3f4ca65abf6a2bf6be5c8f82bfd066153eda8abdbf5c8f82bf000000bf0d711cbf5c8f82bfd066153e0d711cbf5c8f82bf4ca65abfda8abdbf5c8f82bf4ca65abf6a2bf6be5c8f82bf000000bf6a2bf6be5c8f82bf4ca65abf6a2bf6be703dca3f4ca65abfda8abdbf703dca3f4ca65abf6a2bf6be5c8f82bf4ca65abfda8abdbf5c8f82bfd066153eda8abdbf3333733fd066153e0d711cbf703dca3fd066153eda8abdbf703dca3fd066153e6a2bf6be3333733fd066153e6a2bf6be5c8f82bfd066153e0d711cbf285c4fbfd066153ee09c893fb81ee53f4ca65abfe09c893fb81ee53fd066153ee09c893f285c4fbf4ca65abfe09c893f285c4fbf4ca65abf08ce993d295c4fbf000000bf0ace993d3333733f000000bf0ace993db81ee53f4ca65abf08ce993db81ee53fd066153e08ce993d3333733fd066153e0ace993db81ee53fd066153ee09c893fb81ee53f4ca65abf08ce993db81ee53fd066153e08ce993db81ee53f4ca65abfe09c893f295c4fbf000000bfe61dc73e295c4fbf000000bf0ace993d285c4fbf4ca65abf08ce993d285c4fbf4ca65abfe09c893f285c4fbfd066153ee09c893f295c4fbfd066153ee61dc73e285c4fbf4ca65abfe09c893fb81ee53f4ca65abf08ce993db81ee53f4ca65abfe09c893f285c4fbf4ca65abf08ce993d295c4fbfd066153ee61dc73e285c4fbfd066153ee09c893f3333733fd066153ee61dc73eb81ee53fd066153ee09c893fb81ee53fd066153e08ce993d3333733fd066153e0ace993d3233d3bf0000003fe61dc73e295c4fbfd066153ee61dc73e3333733f0000003fe61dc73e3333733fd066153ee61dc73e3233d3bf000000bfe61dc73e295c4fbf000000bfe61dc73e3233d3bf000000bf0d711cbf5c8f82bfd066153e0d711cbf5c8f82bf000000bf0d711cbf3233d3bf0000003f0d711cbf3333733f0000003f0d711cbf3333733fd066153e0d711cbf3333733f0000003fe61dc73e3333733fd066153e0ace993d3333733f0000003f0d711cbf3333733fd066153e6a2bf6be3333733fd066153e0d711cbf3333733f000000bf6a2bf6be3333733f000000bf0ace993d3333733fd066153ee61dc73e3233d3bf0000003f0d711cbf3233d3bf000000bfe61dc73e3233d3bf0000003fe61dc73e3233d3bf000000bf0d711cbf3233d3bf000000bfe61dc73e295c4fbf000000bf0ace993d295c4fbf000000bfe61dc73e5c8f82bf000000bf6a2bf6be3333733f000000bf6a2bf6be3333733f000000bf0ace993d3233d3bf000000bf0d711cbf5c8f82bf000000bf0d711cbf5c8f82bf4ca65abfda8abdbf703dca3fd066153eda8abdbf703dca3f4ca65abfda8abdbf5c8f82bfd066153eda8abdbf3333733f000000bf6a2bf6be5c8f82bf000000bf6a2bf6be5c8f82bf4ca65abf6a2bf6be703dca3f4ca65abf6a2bf6be703dca3fd066153e6a2bf6be3333733fd066153e6a2bf6be - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!43 &69493321 Mesh: m_ObjectHideFlags: 0 @@ -620,8 +456,8 @@ Mesh: firstVertex: 0 vertexCount: 96 localAABB: - m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} + m_Center: {x: 3.2199998, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199998, y: 0.67705, z: 1.2779499} m_Shapes: vertices: [] shapes: [] @@ -638,7 +474,7 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001e0000001f0000001e000000200000001f0000001e00000021000000200000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000320000003100000033000000340000003200000033000000340000003500000032000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002e0000002f000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 m_VertexData: serializedVersion: 3 m_VertexCount: 96 @@ -700,7 +536,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 4608 - _typelessdata: 3233d3bf0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3333733f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003333733f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f3233d3bf0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000703dca3fd066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f703dca3f4ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000703dca3fd066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803f703dca3f4ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f000000005c8f82bfd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803f5c8f82bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53e5c8f82bfd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803f5c8f82bf4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f000000005c8f82bf4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f82bf000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53e5c8f82bf4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000703dca3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3f703dca3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000005c8f82bf4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f5c8f82bfd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3333733fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf7c142ebe606d053e703dca3fd066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3f703dca3fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003333733fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf7c142ebe000000005c8f82bfd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053e285c4fbfd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fb81ee53f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81ee53fd066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f285c4fbf4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000295c4fbf000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcdcc4cbf984cb53e3333733f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f984cb53eb81ee53f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000b81ee53fd066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3333733fd066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f0000803fb81ee53fd066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81ee53f4ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81ee53fd066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81ee53f4ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000295c4fbf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53e295c4fbf000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53e285c4fbf4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000285c4fbf4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000285c4fbfd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f295c4fbfd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803f285c4fbf4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81ee53f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81ee53f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f295c4fbfd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3f285c4fbfd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000003333733fd066153ee61dc73e000000000000803f00000000000080bf0000000086619832000080bf10d7233dcdaa2f3fb81ee53fd066153ee09c893f000000000000803f00000000000080bf00000000eb67b5a4000080bfcccc4cbf00000000b81ee53fd066153e08ce993d000000000000803f00000000000080bf0000000086619832000080bfcccc4cbfffff7f3f3333733fd066153e0ace993d000000000000803f00000000000080bf0000000086619832000080bf10d7233dffff7f3f3233d3bf0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803f295c4fbfd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383fb459253f3333733f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3333733fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f3233d3bf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000295c4fbf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383f000000003233d3bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf000000005c8f82bfd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3db459253f5c8f82bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3d000000003233d3bf0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3333733f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3333733fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3333733f0000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3333733fd066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3333733f0000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3333733fd066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3333733fd066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3333733f000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003333733f000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003333733fd066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f3233d3bf0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f3233d3bf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000003233d3bf0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f3233d3bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000003233d3bf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000295c4fbf000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf265c8f3e64aaa03e295c4fbf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf265c8f3e000000005c8f82bf000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf205c8f3da8a45e3f3333733f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3333733f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e3233d3bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803f5c8f82bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf205c8f3d0000803f5c8f82bf4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000703dca3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f703dca3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000005c8f82bfd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3333733f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe984cb53e5c8f82bf000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53e5c8f82bf4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000703dca3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000703dca3fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3333733fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe0000803f + _typelessdata: 0000c03f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f333383400000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf00000000333383400000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f0000c03f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000285c9740d066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f285c97404ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000285c9740d066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803f285c97404ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000eb510840d066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803feb510840000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53eeb510840d066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803feb5108404ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000eb5108404ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf0000000000000000eb510840000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53eeb5108404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000285c97404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6466e63fffff7f3f285c97404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6466e63f00000000eb5108404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3feb510840d066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f33338340d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf80142ebe606d053e285c9740d066153eda8abdbf000000000000803f00000000000080bf00000000f93f21a4000080bfc8cc4cbfffff7f3f285c9740d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfc8cc4cbf0000000033338340d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf80142ebe00000000eb510840d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053e8fc21540d066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803f7a149e404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfc8cc4cbf000000007a149e40d066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfc8cc4cbf0000803f8fc215404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f000000008fc215404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000000033338340000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf90c2753f984cb53e7a149e404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6466e63f000000007a149e40d066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6466e63f0000803f33338340d066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf90c2753f0000803f8fc21540000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf984cb53e7a149e40d066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f7a149e404ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf00000000000000007a149e40d066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803f7a149e404ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f000000008fc21540000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53e8fc21540000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53e8fc215404ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f000000008fc215404ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf00000000000000008fc21540d066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f8fc21540d066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803f7a149e404ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6466e63f000000008fc215404ca65abfe09c893f00000000000080bf000000000000803f0000000000000080000080bfcccc4cbf000000008fc215404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f7a149e404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6466e63fffff7f3f33338340d066153ee61dc73e000000000000803f00000000000080bf000000008a619832000080bf00d7233dcdaa2f3f8fc21540d066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3f8fc21540d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000007a149e40d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bfc8cc4cbf000000007a149e40d066153e08ce993d000000000000803f00000000000080bf000000008a619832000080bfc8cc4cbfffff7f3f33338340d066153e0ace993d000000000000803f00000000000080bf000000008a619832000080bf00d7233dffff7f3f0000c03f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803f8fc21540d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383fb459253f333383400000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f33338340d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f0000c03f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f000000008fc21540000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383f000000000000c03f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf00000000eb510840d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3db459253feb510840000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3d000000000000c03f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f333383400000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f33338340d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f333383400000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f33338340d066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f333383400000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f33338340d066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f33338340d066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f33338340000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e0000000033338340000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f0000000033338340d066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f0000c03f0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000c03f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000c03f0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f0000c03f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000000000c03f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf000000008fc21540000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf285c8f3e64aaa03e8fc21540000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c8f3e00000000eb510840000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf205c8f3da8a45e3f33338340000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f33338340000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e0000c03f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803feb510840000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf205c8f3d0000803feb5108404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000285c9740d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6466e63f0000803f285c97404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6466e63f00000000eb510840d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f33338340000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf80142ebe984cb53eeb510840000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53eeb5108404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000285c97404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfc8cc4cbf00000000285c9740d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfc8cc4cbf0000803f33338340d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf80142ebe0000803f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -754,8 +590,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} + m_Center: {x: 3.2199998, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199998, y: 0.67705, z: 1.2779499} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -1002,25 +838,57 @@ Mesh: offset: 0 size: 0 path: ---- !u!43 &339728852 +--- !u!1 &352119801 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 352119802} + m_Layer: 0 + m_Name: "\u2039[generated]\u203A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &352119802 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 352119801} + 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_Children: + - {fileID: 1658714171} + - {fileID: 426374966} + - {fileID: 33383803} + - {fileID: 962769118} + - {fileID: 283560758} + - {fileID: 1994922928} + - {fileID: 1703547412} + - {fileID: 30283945} + - {fileID: 1163184883} + - {fileID: 2018435911} + - {fileID: 1116557895} + - {fileID: 650786228} + m_Father: {fileID: 763721119} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &358445131 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: + m_Name: "\u2039[generated-Renderable|CastShadows]\u203A" serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 84 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 48 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 1} + m_SubMeshes: [] m_Shapes: vertices: [] shapes: [] @@ -1037,10 +905,10 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b000000090000000c0000000d0000000e0000000c0000000f0000000d000000100000000d0000000f00000011000000100000000f0000001200000010000000110000001200000013000000100000001400000015000000160000001400000017000000150000001500000017000000180000001900000015000000180000001a00000019000000180000001a0000001b000000190000001c0000001d0000001e0000001c0000001f0000001d00000020000000210000002200000020000000230000002100000024000000250000002600000027000000240000002600000028000000290000002a0000002b000000280000002a0000002c0000002d0000002e0000002f0000002c0000002e000000 + m_IndexBuffer: m_VertexData: serializedVersion: 3 - m_VertexCount: 48 + m_VertexCount: 0 m_Channels: - stream: 0 offset: 0 @@ -1098,8 +966,8 @@ Mesh: offset: 0 format: 0 dimension: 0 - m_DataSize: 2304 - _typelessdata: 000080bf0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000000000803f0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf000000bf000000bf0000803f0000803f0000003f000000000000803f00000000000080bf0000000000000000000080bf000000bf00000000000080bf0000803f0000803f000000000000803f00000000000080bf0000000000000000000080bf0000c03f000000bf000080bf0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000c03f0000803f0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000803f0000803f0000803f000080bf000000000000803f00000000000080bf0000000000000000000080bf000000bf0000c03f000080bf0000803f000000bf000000000000803f00000000000080bf0000000000000000000080bf0000c03f0000803f000080bf000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf000000bf000000bf0000803f000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf0000803f00000000000080bf000000000000803f0000000000000000000080bf0000c03f000000bf000080bf000080bf000080bf00000000000080bf000000000000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f0000c03f000080bff628dc3e000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f7b146e3f000080bf0000803f000000bf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000c03f000080bf000080bf000080bf000080bf00000000000000000000000000000000000080bf000080bf0000c03f000000bf000080bff628dc3e0000003f000080bf00000000000000000000000000000000000080bf000080bf000000007b146e3f000080bf000080bf0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf000000bf000080bf0000803f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000bf0000c03f000080bf0000803f0000003f000080bf00000000000000000000000000000000000080bf000080bf000000000000c03f0000803f0000803f0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f0000c03f0000803ff628dc3e0000003f0000803f000000000000000000000000000000000000803f000080bf0000803f7b146e3f0000803f0000803f0000003f0000803f000000000000000000000080000000000000803f000080bf0000803f0000c03f0000803f000080bf0000803f0000803f000000000000000000000000000000000000803f000080bf0000c03f000000bf0000803f000080bf000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf000000bf0000803ff628dc3e000000bf0000803f000000000000000000000000000000000000803f000080bf000000007b146e3f0000803f0000803f000080bf0000803f000000000000000000000000000000000000803f000080bf000000bf0000c03f0000803f0000803f000000bf0000803f000000000000000000000000000000000000803f000080bf000000000000c03f000080bf000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf000000bf0000803f0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f0000c03f0000803f000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf0000c03f000000bf000080bf0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000bf0000c03f000080bf0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f0000c03f0000803f000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf000000bf000000bf0000803f0000803f0000803f00000000000000000000803f000080bf0000000000000080000080bf000000bf0000c03f000080bf000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf0000c03f000000bf0000803ff628dc3e000000bf000000000000803f000000000000803f00000000000000000000803f0000c03f0000803f000080bff628dc3e000000bf000000000000803f000000000000803f00000080000000000000803f000000bf0000803f000080bff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f000000bf000000000000803ff628dc3e0000003f000000000000803f000000000000803f00000000000000000000803f0000c03f000000000000803f0000803f000000bf00000000000000000000803f0000803f00000000000000000000803f0000c03f0000c03f000080bf0000803f000000bf00000000000000000000803f0000803f00000000000000000000803f000000bf0000c03f000080bff628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f000000bf7b146e3f0000803ff628dc3e000000bf00000000000000000000803f0000803f00000000000000000000803f0000c03f7b146e3f0000803ff628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803f000000bf7b146e3f000080bff628dc3e0000003f0000000000000000000080bf000080bf00000000000000000000803f0000c03f7b146e3f000080bf0000803f0000003f0000000000000000000080bf000080bf00000000000000000000803f0000c03f0000c03f0000803f0000803f0000003f0000000000000000000080bf000080bf00000000000000000000803f000000bf0000c03f + m_DataSize: 0 + _typelessdata: m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -1154,7 +1022,7 @@ Mesh: m_UVInfo: 0 m_LocalAABB: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 1} + m_Extent: {x: 0, y: 0, z: 0} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -1166,7 +1034,7 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &352119801 +--- !u!1 &426374965 GameObject: m_ObjectHideFlags: 8 m_CorrespondingSourceObject: {fileID: 0} @@ -1174,229 +1042,33 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 352119802} + - component: {fileID: 426374966} + - component: {fileID: 426374968} + - component: {fileID: 426374967} m_Layer: 0 - m_Name: "\u2039[generated]\u203A" + m_Name: "\u2039[generated-Renderable]\u203A" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &352119802 +--- !u!4 &426374966 Transform: m_ObjectHideFlags: 8 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 352119801} + m_GameObject: {fileID: 426374965} 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_Children: - - {fileID: 1658714171} - - {fileID: 426374966} - - {fileID: 33383803} - - {fileID: 962769118} - - {fileID: 283560758} - - {fileID: 1994922928} - - {fileID: 1703547412} - - {fileID: 30283945} - - {fileID: 1163184883} - - {fileID: 2018435911} - - {fileID: 1116557895} - - {fileID: 650786228} - m_Father: {fileID: 763721119} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 352119802} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &358445131 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: "\u2039[generated-Renderable|CastShadows]\u203A" - serializedVersion: 10 - m_SubMeshes: [] - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: - m_VertexData: - serializedVersion: 3 - m_VertexCount: 0 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 0 - _typelessdata: - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: ---- !u!1 &426374965 -GameObject: - m_ObjectHideFlags: 8 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 426374966} - - component: {fileID: 426374968} - - component: {fileID: 426374967} - m_Layer: 0 - m_Name: "\u2039[generated-Renderable]\u203A" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &426374966 -Transform: - m_ObjectHideFlags: 8 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 426374965} - 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_Children: [] - m_Father: {fileID: 352119802} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &426374967 -MeshRenderer: - m_ObjectHideFlags: 8 +--- !u!23 &426374967 +MeshRenderer: + m_ObjectHideFlags: 8 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1623,7 +1295,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 479267782} - m_Mesh: {fileID: 339728852} + m_Mesh: {fileID: 2133041187} --- !u!114 &479267787 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1766,7 +1438,7 @@ MonoBehaviour: e00: 1 e01: 0 e02: 0 - e03: 0.49 + e03: 3.6399999 e10: 0 e11: 1 e12: 0 @@ -1915,8 +1587,8 @@ MonoBehaviour: generatedDataContainer: {fileID: 352119801} colliderContainer: {fileID: 1658714170} colliders: - - surfaceParameter: 3198 - sharedMesh: {fileID: 63015121} + - surfaceParameter: 3204 + sharedMesh: {fileID: 2038071750} meshCollider: {fileID: 1658714172} physicsMaterial: {fileID: 13400000, guid: 9a131e27bee822f49bbeaa7ee131d929, type: 2} geometryHashValue: 0 @@ -2600,7 +2272,7 @@ MonoBehaviour: e00: 1 e01: 0 e02: 0 - e03: -0.59 + e03: 2.56 e10: 0 e11: 1 e12: 0 @@ -2703,8 +2375,8 @@ Mesh: firstVertex: 0 vertexCount: 96 localAABB: - m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} + m_Center: {x: 3.2199998, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199998, y: 0.67705, z: 1.2779499} m_Shapes: vertices: [] shapes: [] @@ -2721,7 +2393,7 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001e0000001f0000001e000000200000001f0000001e00000021000000200000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000320000003100000033000000340000003200000033000000340000003500000032000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002e0000002f000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 m_VertexData: serializedVersion: 3 m_VertexCount: 96 @@ -2783,7 +2455,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 4608 - _typelessdata: 3233d3bf0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3333733f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003333733f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f3233d3bf0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000703dca3fd066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f703dca3f4ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000703dca3fd066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803f703dca3f4ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f000000005c8f82bfd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803f5c8f82bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53e5c8f82bfd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803f5c8f82bf4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f000000005c8f82bf4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f82bf000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53e5c8f82bf4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000703dca3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3f703dca3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000005c8f82bf4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f5c8f82bfd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3333733fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf7c142ebe606d053e703dca3fd066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3f703dca3fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003333733fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf7c142ebe000000005c8f82bfd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053e285c4fbfd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fb81ee53f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81ee53fd066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f285c4fbf4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000295c4fbf000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcdcc4cbf984cb53e3333733f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f984cb53eb81ee53f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000b81ee53fd066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3333733fd066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f0000803fb81ee53fd066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81ee53f4ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81ee53fd066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81ee53f4ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000295c4fbf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53e295c4fbf000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53e285c4fbf4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000285c4fbf4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000285c4fbfd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f295c4fbfd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803f285c4fbf4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81ee53f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81ee53f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f295c4fbfd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3f285c4fbfd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000003333733fd066153ee61dc73e000000000000803f00000000000080bf0000000086619832000080bf10d7233dcdaa2f3fb81ee53fd066153ee09c893f000000000000803f00000000000080bf00000000eb67b5a4000080bfcccc4cbf00000000b81ee53fd066153e08ce993d000000000000803f00000000000080bf0000000086619832000080bfcccc4cbfffff7f3f3333733fd066153e0ace993d000000000000803f00000000000080bf0000000086619832000080bf10d7233dffff7f3f3233d3bf0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803f295c4fbfd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383fb459253f3333733f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3333733fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f3233d3bf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000295c4fbf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383f000000003233d3bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf000000005c8f82bfd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3db459253f5c8f82bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3d000000003233d3bf0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3333733f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3333733fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3333733f0000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3333733fd066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3333733f0000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3333733fd066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3333733fd066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3333733f000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003333733f000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003333733fd066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f3233d3bf0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f3233d3bf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000003233d3bf0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f3233d3bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000003233d3bf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000295c4fbf000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf265c8f3e64aaa03e295c4fbf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf265c8f3e000000005c8f82bf000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf205c8f3da8a45e3f3333733f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3333733f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e3233d3bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803f5c8f82bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf205c8f3d0000803f5c8f82bf4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000703dca3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f703dca3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000005c8f82bfd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3333733f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe984cb53e5c8f82bf000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53e5c8f82bf4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000703dca3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000703dca3fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3333733fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe0000803f + _typelessdata: 0000c03f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f333383400000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf00000000333383400000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f0000c03f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000285c9740d066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f285c97404ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000285c9740d066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803f285c97404ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000eb510840d066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803feb510840000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53eeb510840d066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803feb5108404ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000eb5108404ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf0000000000000000eb510840000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53eeb5108404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000285c97404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6466e63fffff7f3f285c97404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6466e63f00000000eb5108404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3feb510840d066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f33338340d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf80142ebe606d053e285c9740d066153eda8abdbf000000000000803f00000000000080bf00000000f93f21a4000080bfc8cc4cbfffff7f3f285c9740d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfc8cc4cbf0000000033338340d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf80142ebe00000000eb510840d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053e8fc21540d066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803f7a149e404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfc8cc4cbf000000007a149e40d066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfc8cc4cbf0000803f8fc215404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f000000008fc215404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000000033338340000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf90c2753f984cb53e7a149e404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6466e63f000000007a149e40d066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6466e63f0000803f33338340d066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf90c2753f0000803f8fc21540000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf984cb53e7a149e40d066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f7a149e404ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf00000000000000007a149e40d066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803f7a149e404ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f000000008fc21540000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53e8fc21540000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53e8fc215404ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f000000008fc215404ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf00000000000000008fc21540d066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f8fc21540d066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803f7a149e404ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6466e63f000000008fc215404ca65abfe09c893f00000000000080bf000000000000803f0000000000000080000080bfcccc4cbf000000008fc215404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f7a149e404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6466e63fffff7f3f33338340d066153ee61dc73e000000000000803f00000000000080bf000000008a619832000080bf00d7233dcdaa2f3f8fc21540d066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3f8fc21540d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000007a149e40d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bfc8cc4cbf000000007a149e40d066153e08ce993d000000000000803f00000000000080bf000000008a619832000080bfc8cc4cbfffff7f3f33338340d066153e0ace993d000000000000803f00000000000080bf000000008a619832000080bf00d7233dffff7f3f0000c03f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803f8fc21540d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383fb459253f333383400000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f33338340d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f0000c03f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f000000008fc21540000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383f000000000000c03f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf00000000eb510840d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3db459253feb510840000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3d000000000000c03f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f333383400000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f33338340d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f333383400000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f33338340d066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f333383400000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f33338340d066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f33338340d066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f33338340000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e0000000033338340000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f0000000033338340d066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f0000c03f0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000c03f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000c03f0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f0000c03f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000000000c03f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf000000008fc21540000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf285c8f3e64aaa03e8fc21540000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c8f3e00000000eb510840000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf205c8f3da8a45e3f33338340000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f33338340000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e0000c03f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803feb510840000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf205c8f3d0000803feb5108404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000285c9740d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6466e63f0000803f285c97404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6466e63f00000000eb510840d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f33338340000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf80142ebe984cb53eeb510840000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53eeb5108404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000285c97404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfc8cc4cbf00000000285c9740d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfc8cc4cbf0000803f33338340d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf80142ebe0000803f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -2837,8 +2509,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} + m_Center: {x: 3.2199998, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199998, y: 0.67705, z: 1.2779499} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -3283,8 +2955,8 @@ Mesh: firstVertex: 0 vertexCount: 96 localAABB: - m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} + m_Center: {x: 3.2199998, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199998, y: 0.67705, z: 1.2779499} m_Shapes: vertices: [] shapes: [] @@ -3301,7 +2973,7 @@ Mesh: m_KeepVertices: 0 m_KeepIndices: 0 m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001e0000001f0000001e000000200000001f0000001e00000021000000200000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002f0000002d000000300000003100000032000000320000003100000033000000340000003200000033000000340000003500000032000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002e0000002f000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 m_VertexData: serializedVersion: 3 m_VertexCount: 96 @@ -3363,7 +3035,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 4608 - _typelessdata: 3233d3bf0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f3333733f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf000000003333733f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f3233d3bf0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000703dca3fd066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f703dca3f4ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000703dca3fd066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803f703dca3f4ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f000000005c8f82bfd066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803f5c8f82bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53e5c8f82bfd066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803f5c8f82bf4ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f000000005c8f82bf4ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000000000005c8f82bf000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53e5c8f82bf4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000703dca3f4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3f703dca3f4ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6666e63f000000005c8f82bf4ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f5c8f82bfd066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f3333733fd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf7c142ebe606d053e703dca3fd066153eda8abdbf000000000000803f00000000000080bf0000008000000000000080bfcccc4cbfffff7f3f703dca3fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfcccc4cbf000000003333733fd066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf7c142ebe000000005c8f82bfd066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053e285c4fbfd066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803fb81ee53f4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000b81ee53fd066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfcccc4cbf0000803f285c4fbf4ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000295c4fbf000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcdcc4cbf984cb53e3333733f000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f984cb53eb81ee53f4ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f00000000b81ee53fd066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f3333733fd066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf8fc2753f0000803fb81ee53fd066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803fb81ee53f4ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf0000000000000000b81ee53fd066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803fb81ee53f4ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000295c4fbf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53e295c4fbf000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53e285c4fbf4ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000285c4fbf4ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf0000000000000000285c4fbfd066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f295c4fbfd066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803f285c4fbf4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000b81ee53f4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6666e63fffff7f3fb81ee53f4ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6666e63f00000000285c4fbf4ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f295c4fbfd066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3f285c4fbfd066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000003333733fd066153ee61dc73e000000000000803f00000000000080bf0000000086619832000080bf10d7233dcdaa2f3fb81ee53fd066153ee09c893f000000000000803f00000000000080bf00000000eb67b5a4000080bfcccc4cbf00000000b81ee53fd066153e08ce993d000000000000803f00000000000080bf0000000086619832000080bfcccc4cbfffff7f3f3333733fd066153e0ace993d000000000000803f00000000000080bf0000000086619832000080bf10d7233dffff7f3f3233d3bf0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803f295c4fbfd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383fb459253f3333733f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f3333733fd066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f3233d3bf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f00000000295c4fbf000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383f000000003233d3bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf000000005c8f82bfd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3db459253f5c8f82bf000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3d000000003233d3bf0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f3333733f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f3333733fd066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f3333733f0000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f3333733fd066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f3333733f0000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f3333733fd066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f3333733fd066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f3333733f000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e000000003333733f000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f000000003333733fd066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f3233d3bf0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f3233d3bf000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000003233d3bf0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f3233d3bf000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000003233d3bf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf00000000295c4fbf000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf265c8f3e64aaa03e295c4fbf000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf265c8f3e000000005c8f82bf000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf205c8f3da8a45e3f3333733f000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f3333733f000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e3233d3bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803f5c8f82bf000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf205c8f3d0000803f5c8f82bf4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000703dca3fd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f0000803f703dca3f4ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6666e63f000000005c8f82bfd066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f3333733f000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe984cb53e5c8f82bf000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53e5c8f82bf4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000703dca3f4ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf00000000703dca3fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfcccc4cbf0000803f3333733fd066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf7c142ebe0000803f + _typelessdata: 0000c03f0000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bf14aec73f0000803f333383400000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bfb81e85bf00000000333383400000003f0d711cbf000000000000803f00000000000080bf0000000000000000000080bfb81e85bf0000803f0000c03f0000003fe61dc73e000000000000803f00000000000080bf0000000000000000000080bf14aec73f00000000285c9740d066153e6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f285c97404ca65abfda8abdbf0000803f000000000000000000000000000000000000803f000080bf0000000000000000285c9740d066153eda8abdbf0000803f000000000000000000000080000000000000803f000080bf000000000000803f285c97404ca65abf6a2bf6be0000803f000000000000000000000000000000000000803f000080bfffff7f3f00000000eb510840d066153eda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f0000803feb510840000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e984cb53eeb510840d066153e0d711cbf000080bf00000000000000000000000000000000000080bf000080bf606d053e0000803feb5108404ca65abfda8abdbf000080bf00000000000000000000000000000000000080bf000080bfffff7f3f00000000eb5108404ca65abf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf0000000000000000eb510840000000bf6a2bf6be000080bf00000000000000000000000000000000000080bf000080bf00000000984cb53eeb5108404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bfcccc4cbf00000000285c97404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bf6466e63fffff7f3f285c97404ca65abf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf6466e63f00000000eb5108404ca65abfda8abdbf00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3feb510840d066153eda8abdbf000000000000803f00000000000080bf0000000000000000000080bf6666e63fffff7f3f33338340d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf80142ebe606d053e285c9740d066153eda8abdbf000000000000803f00000000000080bf00000000f93f21a4000080bfc8cc4cbfffff7f3f285c9740d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bfc8cc4cbf0000000033338340d066153e6a2bf6be000000000000803f00000000000080bf0000000000000000000080bf80142ebe00000000eb510840d066153e0d711cbf000000000000803f00000000000080bf0000000000000000000080bf6666e63f606d053e8fc21540d066153ee09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f0000803f7a149e404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bfc8cc4cbf000000007a149e40d066153ee09c893f00000000000000000000803f000080bf0000000000000080000080bfc8cc4cbf0000803f8fc215404ca65abfe09c893f00000000000000000000803f000080bf0000000000000000000080bf6666e63f000000008fc215404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000000033338340000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bf90c2753f984cb53e7a149e404ca65abf08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6466e63f000000007a149e40d066153e08ce993d0000000000000000000080bf0000803f0000000000000000000080bf6466e63f0000803f33338340d066153e0ace993d0000000000000000000080bf0000803f0000000000000000000080bf90c2753f0000803f8fc21540000000bf0ace993d0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf984cb53e7a149e40d066153ee09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f0000803f7a149e404ca65abf08ce993d0000803f000000000000000000000000000000000000803f000080bf00000000000000007a149e40d066153e08ce993d0000803f000000000000000000000080000000000000803f000080bf000000000000803f7a149e404ca65abfe09c893f0000803f000000000000000000000000000000000000803f000080bfffff7f3f000000008fc21540000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f984cb53e8fc21540000000bf0ace993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f984cb53e8fc215404ca65abf08ce993d000080bf00000000000000000000000000000000000080bf000080bfffff7f3f000000008fc215404ca65abfe09c893f000080bf00000000000000000000000000000000000080bf000080bf00000000000000008fc21540d066153ee09c893f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f8fc21540d066153ee61dc73e000080bf00000000000000000000000000000000000080bf000080bfcdaa2f3f0000803f7a149e404ca65abfe09c893f00000000000080bf000000000000803f0000000000000000000080bf6466e63f000000008fc215404ca65abfe09c893f00000000000080bf000000000000803f0000000000000080000080bfcccc4cbf000000008fc215404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bfcccc4cbfffff7f3f7a149e404ca65abf08ce993d00000000000080bf000000000000803f0000000000000000000080bf6466e63fffff7f3f33338340d066153ee61dc73e000000000000803f00000000000080bf000000008a619832000080bf00d7233dcdaa2f3f8fc21540d066153ee61dc73e000000000000803f00000000000080bf0000000000000000000080bf6666e63fcdaa2f3f8fc21540d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bf6666e63f000000007a149e40d066153ee09c893f000000000000803f00000000000080bf0000000000000000000080bfc8cc4cbf000000007a149e40d066153e08ce993d000000000000803f00000000000080bf000000008a619832000080bfc8cc4cbfffff7f3f33338340d066153e0ace993d000000000000803f00000000000080bf000000008a619832000080bf00d7233dffff7f3f0000c03f0000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f0000803f8fc21540d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383fb459253f333383400000003fe61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bf0000803f33338340d066153ee61dc73e00000000000000000000803f000080bf0000000000000000000080bfb81e85bfb459253f0000c03f000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bf14aec73f000000008fc21540000000bfe61dc73e00000000000000000000803f000080bf0000000000000000000080bfec51383f000000000000c03f000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf00000000eb510840d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3db459253feb510840000000bf0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf205c8f3d000000000000c03f0000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf285c0fbf0000803f333383400000003f0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f02400000803f33338340d066153e0d711cbf0000000000000000000080bf0000803f0000000000000000000080bf5c8f0240b459253f333383400000003fe61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803f0000803f33338340d066153e0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3fb459253f333383400000003f0d711cbf0000803f000000000000000000000000000000000000803f000080bf000000000000803f33338340d066153e6a2bf6be0000803f000000000000000000000080000000000000803f000080bf606d053eb459253f33338340d066153e0d711cbf0000803f000000000000000000000000000000000000803f000080bf00000000b459253f33338340000000bf6a2bf6be0000803f000000000000000000000000000000000000803f000080bf606d053e0000000033338340000000bf0ace993d0000803f000000000000000000000000000000000000803f000080bfceaa2f3f0000000033338340d066153ee61dc73e0000803f000000000000000000000000000000000000803f000080bf0000803fb459253f0000c03f0000003f0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f0000803f0000c03f000000bfe61dc73e000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000c03f0000003fe61dc73e000080bf00000000000000000000000000000000000080bf000080bf000000000000803f0000c03f000000bf0d711cbf000080bf00000000000000000000000000000000000080bf000080bf0000803f000000000000c03f000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c0fbf000000008fc21540000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf285c8f3e64aaa03e8fc21540000000bfe61dc73e00000000000080bf000000000000803f0000000000000000000080bf285c8f3e00000000eb510840000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf205c8f3da8a45e3f33338340000000bf6a2bf6be00000000000080bf000000000000803f0000000000000000000080bf5c8f0240a8a45e3f33338340000000bf0ace993d00000000000080bf000000000000803f0000000000000000000080bf5c8f024064aaa03e0000c03f000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf285c0fbf0000803feb510840000000bf0d711cbf00000000000080bf000000000000803f0000000000000000000080bf205c8f3d0000803feb5108404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf00000000285c9740d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6466e63f0000803f285c97404ca65abfda8abdbf0000000000000000000080bf0000803f0000000000000000000080bf6466e63f00000000eb510840d066153eda8abdbf0000000000000000000080bf0000803f0000000000000000000080bfcccc4cbf0000803f33338340000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf80142ebe984cb53eeb510840000000bf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f984cb53eeb5108404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf6666e63f00000000285c97404ca65abf6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfc8cc4cbf00000000285c9740d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bfc8cc4cbf0000803f33338340d066153e6a2bf6be00000000000000000000803f000080bf0000000000000000000080bf80142ebe0000803f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -3417,8 +3089,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0.07000005, y: -0.17705, z: -0.20284998} - m_Extent: {x: 1.7199999, y: 0.67705, z: 1.2779499} + m_Center: {x: 3.2199998, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199998, y: 0.67705, z: 1.2779499} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -3782,7 +3454,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 63015121} + m_Mesh: {fileID: 2038071750} --- !u!1 &1703547411 GameObject: m_ObjectHideFlags: 24 @@ -3889,7 +3561,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726353265} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.25, y: 0, z: 0} + m_LocalPosition: {x: 1.9, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1357061026} @@ -4416,7 +4088,7 @@ MonoBehaviour: e00: 1 e01: 0 e02: 0 - e03: 0.27999997 + e03: 3.4299998 e10: 0 e11: 1 e12: 0 @@ -4844,3 +4516,331 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2018435910} m_Mesh: {fileID: 164276715} +--- !u!43 &2038071750 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u2039[generated-Collider]\u203A" + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 180 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 96 + localAABB: + m_Center: {x: 3.2199998, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199998, y: 0.67705, z: 1.2779499} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000000000000030000000100000004000000050000000600000004000000070000000500000008000000090000000a000000080000000b00000009000000090000000b0000000c000000090000000c0000000d0000000e0000000f000000100000000e000000110000000f00000012000000130000001400000013000000150000001400000013000000160000001500000012000000170000001300000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001d0000001f0000001e0000001d000000200000001f0000001c000000210000001d0000002200000023000000240000002200000025000000230000002600000027000000280000002900000026000000280000002a00000026000000290000002a0000002b000000260000002c0000002d0000002e0000002c0000002e0000002f000000300000003100000032000000330000003000000032000000340000003000000033000000340000003500000030000000360000003700000038000000370000003900000038000000360000003a000000370000003a0000003b000000370000003c0000003d0000003e0000003c0000003f0000003d0000003d0000003f000000400000003d00000040000000410000004200000043000000440000004300000045000000440000004500000046000000440000004300000047000000450000004300000048000000470000004200000049000000430000004a0000004b0000004c0000004a0000004d0000004b0000004e0000004f000000500000004e000000510000004f0000004f00000051000000520000004f00000052000000530000004e00000054000000510000005400000055000000510000005600000057000000580000005600000059000000570000005a0000005b0000005c0000005d0000005a0000005c0000005e0000005a0000005d0000005e0000005f0000005a000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 96 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 0000c03f0000003f0d711cbf333383400000003fe61dc73e333383400000003f0d711cbf0000c03f0000003fe61dc73e285c9740d066153e6a2bf6be285c97404ca65abfda8abdbf285c9740d066153eda8abdbf285c97404ca65abf6a2bf6beeb510840d066153eda8abdbfeb510840000000bf0d711cbfeb510840d066153e0d711cbfeb5108404ca65abfda8abdbfeb5108404ca65abf6a2bf6beeb510840000000bf6a2bf6beeb5108404ca65abf6a2bf6be285c97404ca65abfda8abdbf285c97404ca65abf6a2bf6beeb5108404ca65abfda8abdbfeb510840d066153eda8abdbf33338340d066153e0d711cbf285c9740d066153eda8abdbf285c9740d066153e6a2bf6be33338340d066153e6a2bf6beeb510840d066153e0d711cbf8fc21540d066153ee09c893f7a149e404ca65abfe09c893f7a149e40d066153ee09c893f8fc215404ca65abfe09c893f8fc215404ca65abf08ce993d33338340000000bf0ace993d7a149e404ca65abf08ce993d7a149e40d066153e08ce993d33338340d066153e0ace993d8fc21540000000bf0ace993d7a149e40d066153ee09c893f7a149e404ca65abf08ce993d7a149e40d066153e08ce993d7a149e404ca65abfe09c893f8fc21540000000bfe61dc73e8fc21540000000bf0ace993d8fc215404ca65abf08ce993d8fc215404ca65abfe09c893f8fc21540d066153ee09c893f8fc21540d066153ee61dc73e7a149e404ca65abfe09c893f8fc215404ca65abfe09c893f8fc215404ca65abf08ce993d7a149e404ca65abf08ce993d33338340d066153ee61dc73e8fc21540d066153ee61dc73e8fc21540d066153ee09c893f7a149e40d066153ee09c893f7a149e40d066153e08ce993d33338340d066153e0ace993d0000c03f0000003fe61dc73e8fc21540d066153ee61dc73e333383400000003fe61dc73e33338340d066153ee61dc73e0000c03f000000bfe61dc73e8fc21540000000bfe61dc73e0000c03f000000bf0d711cbfeb510840d066153e0d711cbfeb510840000000bf0d711cbf0000c03f0000003f0d711cbf333383400000003f0d711cbf33338340d066153e0d711cbf333383400000003fe61dc73e33338340d066153e0ace993d333383400000003f0d711cbf33338340d066153e6a2bf6be33338340d066153e0d711cbf33338340000000bf6a2bf6be33338340000000bf0ace993d33338340d066153ee61dc73e0000c03f0000003f0d711cbf0000c03f000000bfe61dc73e0000c03f0000003fe61dc73e0000c03f000000bf0d711cbf0000c03f000000bfe61dc73e8fc21540000000bf0ace993d8fc21540000000bfe61dc73eeb510840000000bf6a2bf6be33338340000000bf6a2bf6be33338340000000bf0ace993d0000c03f000000bf0d711cbfeb510840000000bf0d711cbfeb5108404ca65abfda8abdbf285c9740d066153eda8abdbf285c97404ca65abfda8abdbfeb510840d066153eda8abdbf33338340000000bf6a2bf6beeb510840000000bf6a2bf6beeb5108404ca65abf6a2bf6be285c97404ca65abf6a2bf6be285c9740d066153e6a2bf6be33338340d066153e6a2bf6be + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 3.2199998, y: -0.17705, z: -0.20284998} + m_Extent: {x: 1.7199998, y: 0.67705, z: 1.2779499} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!43 &2133041187 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 288 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 144 + localAABB: + m_Center: {x: 0.6499999, y: 0.39000002, z: 0.65} + m_Extent: {x: 1.49, y: 0.69500005, z: 1.695} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000200000001000000030000000200000001000000040000000300000001000000050000000400000005000000010000000600000001000000070000000600000006000000070000000800000008000000070000000900000008000000090000000a0000000b0000000a000000090000000c0000000b000000090000000b0000000c0000000d0000000d0000000c0000000e0000000c0000000f0000000e0000000f000000100000000e00000007000000100000000f000000070000000100000010000000110000000d0000000e00000000000000110000000e00000000000000120000001100000013000000120000000000000002000000130000000000000014000000150000001600000014000000160000001700000018000000190000001a000000180000001b000000190000001c0000001d0000001e0000001c0000001f0000001d00000020000000210000002200000020000000230000002100000024000000250000002600000025000000270000002600000028000000290000002a000000290000002b0000002a0000002c0000002d0000002e0000002e0000002d0000002f00000030000000310000003200000031000000330000003200000034000000350000003600000035000000370000003600000038000000390000003a000000390000003b0000003a0000003c0000003d0000003e0000003d0000003f0000003e00000040000000410000004200000041000000430000004200000044000000450000004600000045000000470000004600000048000000490000004a0000004b000000480000004a0000004c0000004d0000004e0000004e0000004d0000004f00000050000000510000005200000052000000510000005300000054000000550000005600000056000000550000005700000058000000590000005a0000005a000000590000005b0000005c0000005d0000005e0000005c0000005e0000005f00000060000000610000006200000060000000620000006300000064000000650000006600000064000000670000006500000068000000690000006a000000680000006a0000006b0000006c0000006d0000006e0000006d0000006f0000006e0000006f000000700000006e00000070000000710000006e00000071000000720000006e00000071000000730000007200000073000000740000007200000074000000750000007200000072000000750000007600000075000000770000007600000078000000760000007700000079000000760000007800000076000000790000007a0000007b000000760000007a0000007b0000007a0000007c0000007b0000007c0000007d0000007d0000007c0000007e0000007d0000007e0000007f0000006f0000007d0000007f0000006f0000007f000000700000007b0000006c000000760000006c0000007b0000006d00000080000000810000008200000080000000820000008300000084000000850000008600000085000000870000008600000088000000890000008a000000880000008b000000890000008c0000008d0000008e0000008c0000008f0000008d000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 144 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 6912 + _typelessdata: c2f5084052b83e3f90c285bf000000000000803f00000000000080bf00000000b54225b3000080bf84ebd1bf90c2c53f3e0a57bf52b83e3f90c285bf000000000000803f00000000000080bf0000000000000000000080bf1f85ab3f90c2c53fe11d0f3e52b83e3fae1c05bf000000000000803f00000000000080bf00000000b54225b3000080bf1071b83e578e823fde1d0fbe52b83e3faf1c05bf00000000ffff7f3f00000000000080bf0000000089203db4000080bf78c7233f588e823f3980c3be52b83e3f6aaac2be000000000000803f00000000000080bf0000000000000000000080bf1cc0613f3555613f938705bf52b83e3f1c720dbe000000000000803f00000000000080bf0000000000000000000080bfcac3823f875c233f938705bf52b83e3fb2c9103e000000000000803f00000000000080bf0000000000000000000080bfcac3823f279bb73e737826bf52b83e3fa772783f000000000000803f00000000000080bf0000000000000000000080bf3a3c933f4ee5f0be3980c3be52b83e3f3456c43e000000000000803f00000000000080bf0000000030e5ada4000080bf1cc0613f30a7ee3d67feb8be52b83e3f6c65353f00000000ffff7f3f00000000000080bf0000000000000000000080bf347f5c3fb09555bed61d0fbe52b83e3f94f2053f000000000000803f00000000000080bf0000000000000000000080bf76c7233f8052bebcd21d0f3e52b83e3f94f2053f000000000000803f00000000000080bf0000008000000000000080bf1771b83e8052bebc6ddc9e3e52b83e3f3d89b93f000000000000803f00000000000080bf0000000000000000000080bf2647423e7a1273bf3c80c33e52b83e3f3156c43e000000000000803f00000000000080bf0000000000000000000080bf10fff13d3ca7ee3dc2f5084052b83e3f7b141640000000000000803f00000000000080bf0000000000000000000080bf84ebd1bff628ecbfd59eae3c52b83e3fda0fdb3f000000000000803f00000000000080bf0000000000000000000080bf1316f53eda0f9bbf3e0a57bf52b83e3f7b141640000000000000803f00000000000080bf0000000000000000000080bf1f85ab3ff628ecbf9387053f52b83e3fb4c9103e000000000000803f00000000000080bf00000000315d9ca5000080bf60f2b0bc269bb73e9387053f52b83e3f20720dbe000000000000803f00000000000080bf00000080a21b2433000080bf60f2b0bc885c233f3480c33e52b83e3f6faac2be000000000000803f00000000000080bf00000000b54225b3000080bf30fff13d3855613f66feb8be48e18a3f6c65353f0dad3d3f1112433269ed2bbf69ed2b3f000000000dad3d3f000080bf0000003348e1ca3f6cdc9e3e48e18a3f3d89b93f0dad3d3f3a3cbc3368ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f48e1ca3f6ddc9e3e52b83e3f3d89b93f0dad3d3f1112433269ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f295c9f3f67feb8be52b83e3f6c65353f0dad3d3fb6778bb36aed2bbf69ed2b3f000000000dad3d3f000080bf00000000295c9f3f6ddc9e3e7a140e3f3d89b93f0dad3d3fb18d5cb269ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f3d0a873f66feb8bef6289cbe6c65353f0dad3d3fb18d5cb269ed2bbf69ed2b3f000000000dad3d3f000080bf0000003314ae473e67feb8be7a140e3f6c65353f0dad3d3f0000000069ed2bbf69ed2b3f000000000dad3d3f000080bf000000003d0a873f6cdc9e3ef6289cbe3d89b93f0dad3d3fb18ddcb269ed2bbf69ed2b3f000000000dad3d3f000080bf0000803f14ae473e737826bf48e18a3fa772783f0dad3dbf3b3cbcb369ed2b3f69ed2bbf000000000dad3dbf000080bf0000803f48e1ca3fd59eae3c52b83e3fda0fdb3f0dad3dbf3b3cbcb369ed2b3f69ed2bbf000000000dad3dbf000080bf00000000295c9f3fb89eae3c48e18a3fda0fdb3f0dad3dbf3b3c3cb469ed2b3f69ed2bbf000000000dad3dbf000080bf0000000048e1ca3f737826bf52b83e3fa772783f0cad3dbf0000000069ed2b3f69ed2bbf000000000dad3dbf000080bf0000803f295c9f3f737826bf7a140e3fa772783f0dad3dbf54d6143369ed2b3f69ed2bbf000000000dad3dbf000080bf0000803f3d0a873fb89eae3cf6289cbeda0fdb3f0dad3dbf54d6143369ed2b3f69ed2bbf000000000dad3dbf000080bf0000000014ae473ed59eae3c7a140e3fda0fdb3f0cad3dbf53d6943369ed2b3f69ed2bbf000000000dad3dbf000080bf000000003d0a873f737826bff6289cbea772783f0dad3dbf0000000069ed2b3f69ed2bbf000000000dad3dbf000080bf0000803f14ae473eb89eae3cf6289cbeda0fdb3f00000000000080bf000000000ead3d3f0000000068ed2bbf000080bff8289c3e00000000737826bff6289cbea772783f00000000000080bf000000000dad3d3f0000000069ed2bbf000080bff8289c3e0000803f6cdc9e3ef6289cbe3d89b93f00000000000080bf000000000dad3d3f0000000069ed2bbf000080bf85eb313f0000000066feb8bef6289cbe6c65353f00000000ffff7fbf000000000dad3d3f0000000069ed2bbf000080bf86eb313f0000803f66feb8be48e18a3f6c65353f00000000ffff7f3f000000000dad3dbf0000000069ed2b3f000080bff4289c3e0000803f737826bf48e18a3fa772783f000000000000803f000000000ead3dbf0000000068ed2b3f000080bf84eb313f0000803f6cdc9e3e48e18a3f3d89b93f000000000000803f000000000ead3dbf0000000068ed2b3f000080bff6289c3e00000000b89eae3c48e18a3fda0fdb3f000000000000803f000000000ead3dbf0000000068ed2b3f000080bf84eb313f00000000e11d0f3e7a140e3f693205bffdffffbe8918c6bac3b35d3fd8b35d3f94bc64bae4ffff3e0000803f0ac94440bb7c3e3f3480c33e7a140e3fe6d5c2befeffffbe281ac6bac1b35d3fd8b35d3fdbca64bae4ffff3e0000803fc3ac5640b78c3e3fe11d0f3e52b83e3fae1c05bffeffffbe281ac6bac1b35d3fd8b35d3fdbca64bae4ffff3e0000803f0ac9444097206f3f3480c33e52b83e3f6faac2beffffffbec91bc6bac1b35d3fd8b35d3fdbca64bae4ffff3e0000803fc3ac564094306f3fe11d0f3e7a140e3f693205bfabf564b4c9bde4bae6ff7f3f0000803fbf6989a6e9f564340000803f0ac94440bb7c3e3fe11d0f3e52b83e3fae1c05bfabf564b4c9bde4bae6ff7f3f0000803fbf6989a6e9f564340000803f0ac9444097206f3fde1d0fbe7a140e3f6a3205bfabf564b4c9bde4bae6ff7f3f0000803fbf6989a6e9f564340000803f4ee53240bb7c3e3fde1d0fbe52b83e3faf1c05bfabf564b4c9bde4bae6ff7f3f0000803fbf6989a6e9f564340000803f4ee5324097206f3f3980c3be52b83e3f6aaac2be0300003f141dc6babeb35d3fd6b35d3fccca643aebffffbe0000803f9301214094306f3f3980c3be7a140e3fe1d5c2be0200003f3a1bc6babeb35d3fd6b35d3f84bc643aebffffbe0000803f92012140b78c3e3fde1d0fbe52b83e3faf1c05bf0200003f3a1bc6babeb35d3fd6b35d3f84bc643aebffffbe0000803f4de5324097206f3fde1d0fbe7a140e3f6a3205bf0200003f6219c6bac0b35d3fd6b35d3f84bc643aebffffbe0000803f4de53240bb7c3e3f938705bf52b83e3f1c720dbed7b35d3f0cc364bae5ffff3e0000003f9c1ac63ac1b35dbf0000803fd91d0f40444c6f3f938705bf7a140e3f0ac90dbed7b35d3f35c564bae5ffff3e0000003fbf21c63ac1b35dbf0000803fd91d0f4068a83e3f3980c3be52b83e3f6aaac2bed7b35d3f35c564bae5ffff3e0000003fbf21c63ac1b35dbf0000803f9401214094306f3f3980c3be7a140e3fe1d5c2bed7b35d3f5ec764bae5ffff3e0000003fbf21c63ac1b35dbf0000803f94012140b78c3e3f938705bf52b83e3fb2c9103e0000803f000000000000000000000000a6c3e43ae6ff7fbf0000803f3974fa3f3d6c6f3f938705bf7a140e3fc472103e0000803f000000000000000000000000a6c3e43ae6ff7fbf0000803f3974fa3f61c83e3f938705bf52b83e3f1c720dbe0000803f000000000000000000000000a6c3e43ae6ff7fbf0000803fd81d0f40444c6f3f938705bf7a140e3f0ac90dbe0000803f000000000000000000000000a6c3e43ae6ff7fbf0000803fd81d0f4068a83e3f3980c3be52b83e3f3456c43ed7b35d3f0ec3643ae7ffffbe010000bfc121c63ac1b35dbf0000803fc4acd63fee876f3f3980c3be7a140e3fbd2ac43ed7b35d3fdcc2643ae7ffffbe010000bf9d1ac63ac1b35dbf0000803fc4acd63f11e43e3f938705bf52b83e3fb2c9103ed7b35d3fdcc2643ae7ffffbe010000bf9d1ac63ac1b35dbf0000803f3a74fa3f3d6c6f3f938705bf7a140e3fc472103ed7b35d3fabc2643ae7ffffbe010000bf9d1ac63ac1b35dbf0000803f3a74fa3f61c83e3fd61d0fbe52b83e3f94f2053f0000003fa421c63abfb35dbfd7b35dbf79bc643ae7ffffbe0000803f4ee5b23fea976f3fd61d0fbe7a140e3fd8dc053f0000003fdd1fc63ac2b35dbfd7b35dbf7cbc643ae7ffffbe0000803f4ee5b23f0df43e3f3980c3be52b83e3f3456c43e0000003fdd1fc63ac2b35dbfd7b35dbf7cbc643ae7ffffbe0000803fc4acd63fee876f3f3980c3be7a140e3fbd2ac43e0000003f141ec63ac2b35dbfd7b35dbf7cbc643ae7ffffbe0000803fc4acd63f11e43e3fd21d0f3e7a140e3fd8dc053f0000000051c8e43ae7ff7fbf000080bf00000000000000000000803fd91d8f3f0df43e3fd61d0fbe7a140e3fd8dc053f0000000051c8e43ae7ff7fbf000080bf00000000000000000000803f4ee5b23f0df43e3fd61d0fbe52b83e3f94f2053f0000000051c8e43ae7ff7fbf000080bf00000000000000000000803f4ee5b23fea976f3fd21d0f3e52b83e3f94f2053f0000000051c8e43ae7ff7fbf000080bf00000000000000000000803fd91d8f3fea976f3f3c80c33e7a140e3fba2ac43efeffffbe171dc63ac0b35dbfd7b35dbf74bc64bae9ffff3e0000803fc3ac563f11e43e3fd21d0f3e7a140e3fd8dc053f000000bfea1fc63ac0b35dbfd7b35dbf71bc64bae9ffff3e0000803fd91d8f3f0df43e3f3c80c33e52b83e3f3156c43e000000bfea1fc63ac0b35dbfd7b35dbf71bc64bae9ffff3e0000803fc3ac563fee876f3fd21d0f3e52b83e3f94f2053f010000bfbf22c63ac0b35dbfd7b35dbf71bc64bae9ffff3e0000803fd91d8f3fea976f3f9387053f7a140e3fc572103ed7b35dbfadc5643ae5ffffbe000000bfa31ac6bac1b35d3f0000803fd81d0f3f61c83e3f3c80c33e7a140e3fba2ac43ed8b35dbf31c4643ae7ffffbe000000bfc721c6bac1b35d3f0000803fc3ac563f11e43e3f9387053f52b83e3fb4c9103ed8b35dbf31c4643ae7ffffbe000000bfc721c6bac1b35d3f0000803fd81d0f3f3d6c6f3f3c80c33e52b83e3f3156c43ed8b35dbfb4c2643ae7ffffbe000000bfc721c6bac1b35d3f0000803fc3ac563fee876f3f9387053f7a140e3f0ec90dbe000080bf000000000000000000000000a1c3e4bae6ff7f3f0000803fd61d8f3e68a83e3f9387053f7a140e3fc572103e000080bf000000000000000000000000a1c3e4bae6ff7f3f0000803fd91d0f3f61c83e3f9387053f52b83e3f20720dbe000080bf000000000000000000000000a1c3e4bae6ff7f3f0000803fd61d8f3e444c6f3f9387053f52b83e3fb4c9103e000080bf000000000000000000000000a1c3e4bae6ff7f3f0000803fd91d0f3f3d6c6f3f3480c33e7a140e3fe6d5c2bed5b35dbf15c364baeeffff3e0400003fb921c6babfb35d3f0000803f0000e0b3b78c3e3f9387053f7a140e3f0ec90dbed5b35dbf36c564baeeffff3e0400003f951ac6babfb35d3f0000803fdc1d8f3e68a83e3f3480c33e52b83e3f6faac2bed5b35dbf36c564baeeffff3e0400003f951ac6babfb35d3f0000803f0000c0b394306f3f9387053f52b83e3f20720dbed5b35dbf57c764baeeffff3e0400003f951ac6babfb35d3f0000803fda1d8f3e444c6f3fc2f5084052b83e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf84ebd1bf295c9f3f3e0a57bf52b83e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf1f85ab3f295c9f3f3e0a57bf7a140e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf1f85ab3f3d0a873fc2f508407a140e3f7b14164000000000000000000000803f000080bf0000000000000000000080bf84ebd1bf3d0a873fc2f508407a140e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bfc2f528403d0a873f3e0a57bf7a140e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bf7c14aebe3d0a873f3e0a57bf52b83e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bf7c14aebe295c9f3fc2f5084052b83e3f90c285bf0000000000000000000080bf0000803f0000000000000000000080bfc2f52840295c9f3fc2f5084052b83e3f7b1416400000803f000000000000000000000000000000000000803f000080bf7b143640295c9f3fc2f508407a140e3f90c285bf0000803f000000000000000000000000000000000000803f000080bf20850bbf3d0a873fc2f5084052b83e3f90c285bf0000803f000000000000000000000080000000000000803f000080bf20850bbf295c9f3fc2f508407a140e3f7b1416400000803f000000000000000000000000000000000000803f000080bf7b1436403d0a873f3e0a57bf52b83e3f7b141640000080bf00000000000000000000000000000000000080bf000080bff628ecbf295c9f3f3e0a57bf52b83e3f90c285bf000080bf00000000000000000000000000000000000080bf000080bf90c2c53f295c9f3f3e0a57bf7a140e3f90c285bf000080bf00000000000000000000000000000000000080bf000080bf90c2c53f3d0a873f3e0a57bf7a140e3f7b141640000080bf00000000000000000000000000000000000080bf000080bff628ecbf3d0a873f3e0a57bf7a140e3f7b14164000000000000080bf000000000000803f0000000000000000000080bf7c14aebef628ecbfd59eae3c7a140e3fda0fdb3f00000000000080bf000000000000803f0000000000000000000080bff774053fda0f9bbfc2f508407a140e3f7b14164000000000000080bf000000000000803f000000000fad4db3000080bfc2f52840f628ecbf6ddc9e3e7a140e3f3d89b93f00000000ffff7fbf000000000000803f0000000000000000000080bf366e4f3f7a1273bf3c80c33e7a140e3fba2ac43e00000000000080bf000000000000803f0000000000000000000080bf1ec0613f1855ef3d9387053f7a140e3fc572103e00000000000080bf000000000000803f00000000522e9eb3000080bfcac3823f9ec6b73ec2f508407a140e3f90c285bf00000000000080bf000000000000803f0000000000000080000080bfc2f5284090c2c53f9387053f7a140e3f0ec90dbe00000000ffff7fbf000000000000803f00000000cccd5f33000080bfcac3823f4472233f3480c33e7a140e3fe6d5c2be00000000000080bf000000000000803f000000008a30d133000080bf1ac0613ff36a613fe11d0f3e7a140e3f693205bf00000000000080bf000000000000803f00000000cbf564b4000080bf78c7233f3499823f3e0a57bf7a140e3f90c285bf00000000000080bf000000000000803f000000001bb71aa6000080bf7c14aebe90c2c53fde1d0fbe7a140e3f6a3205bf00000000ffff7fbf000000000000803f00000000a919bd33000080bf1171b83e3599823f3980c3be7a140e3fe1d5c2be00000000000080bf000000000000803f0000000000000000000080bf1cfff13df06a613f938705bf7a140e3f0ac90dbe00000000000080bf000000000000803f0000000000000000000080bf60f2b0bc4272233f938705bf7a140e3fc472103e00000000000080bf000000000000803f0000000000000000000080bf60f2b0bc9ec6b73e737826bf7a140e3fa772783f00000000000080bf000000000000803f0000000000000000000080bfcce119be4ee5f0be3980c3be7a140e3fbd2ac43e00000000000080bf000000000000803f0000000015872da5000080bf1cfff13d0c55ef3d67feb8be7a140e3f6c65353f00000000000080bf000000000000803f000000001c1882a5000080bf32030e3eb09555bed61d0fbe7a140e3fd8dc053f00000000000080bf000000000000803f0000000000000000000080bf1571b83e009bbbbcd21d0f3e7a140e3fd8dc053f00000000000080bf000000000000803f0000000000000000000080bf74c7233f009bbbbc67feb8be7a140e3f6c65353f69ed2bbf63ea47b20cad3dbf0dad3d3f0000000069ed2bbf000080bf85eb313f3d0a873f66feb8bef6289cbe6c65353f69ed2bbf63eac7b20dad3dbf0dad3d3f0000000069ed2bbf000080bf86eb313f14ae473e737826bff6289cbea772783f69ed2bbf63ea47b20cad3dbf0dad3d3f0000000069ed2bbf000080bff8289c3e14ae473e737826bf7a140e3fa772783f69ed2bbf000000000bad3dbf0dad3d3f0000000069ed2bbf000080bff8289c3e3d0a873f66feb8be48e18a3f6c65353f69ed2bbf9ad57c330dad3dbf0dad3d3f0000000069ed2bbf000080bf86eb313f48e1ca3f67feb8be52b83e3f6c65353f69ed2bbf9ad5fc320cad3dbf0dad3d3f0000000069ed2bbf000080bf85eb313f295c9f3f737826bf48e18a3fa772783f69ed2bbf9ad5fc320cad3dbf0dad3d3f0000000069ed2bbf000080bff8289c3e48e1ca3f737826bf52b83e3fa772783f69ed2bbf000000000cad3dbf0dad3d3f0000000069ed2bbf000080bff8289c3e295c9f3fd59eae3c7a140e3fda0fdb3f66ed2b3f7c4a0ab30ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f3d0a873f6cdc9e3ef6289cbe3d89b93f66ed2b3f7c4a0ab30ead3d3f0dad3dbf0000000069ed2b3f000080bff6289c3e14ae473e6ddc9e3e7a140e3f3d89b93f67ed2b3f24d1beb20ead3d3f0dad3dbf0000000069ed2b3f000080bff4289c3e3d0a873fb89eae3cf6289cbeda0fdb3f66ed2b3f672c35b30ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f14ae473eb89eae3c48e18a3fda0fdb3f67ed2b3fac3aeb330ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f48e1ca3f6ddc9e3e52b83e3f3d89b93f67ed2b3fac3aeb330ead3d3f0dad3dbf0000000069ed2b3f000080bff4289c3e295c9f3f6cdc9e3e48e18a3f3d89b93f67ed2b3fc953f1330dad3d3f0dad3dbf0000000069ed2b3f000080bff6289c3e48e1ca3fd59eae3c52b83e3fda0fdb3f67ed2b3f9021e5330ead3d3f0dad3dbf0000000069ed2b3f000080bf84eb313f295c9f3f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.6499999, y: 0.39000002, z: 0.65} + m_Extent: {x: 1.49, y: 0.69500005, z: 1.695} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: diff --git a/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs b/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs index 9c14df83c..2f8502c4a 100644 --- a/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs +++ b/Packages/com.chisel.graph/Chisel/ChiselGraphInstance.cs @@ -89,8 +89,6 @@ public void UpdateCSG() else tree.Clear(); - print(tree.UserID + "|" + tree.NodeID); - graph.CollectTreeNode(tree); CSGManager.Flush(finishMeshUpdates); } diff --git a/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs index cb25800cf..cd1289518 100644 --- a/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs +++ b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs @@ -31,8 +31,12 @@ public void ParseNode(CSGTreeBranch branch) var inputPort = GetInputPort("input"); if (inputPort.IsConnected) { - var chiselNode = inputPort.Connection.node as ChiselGraphNode; - chiselNode.ParseNode(branch); + var connections = inputPort.GetConnections(); + foreach (var connection in connections) + { + var chiselNode = connection.node as ChiselGraphNode; + chiselNode.ParseNode(branch); + } } var node = GetNode(); diff --git a/Packages/com.chisel.graph/Chisel/Nodes/CylinderNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/CylinderNode.cs new file mode 100644 index 000000000..42d2a1210 --- /dev/null +++ b/Packages/com.chisel.graph/Chisel/Nodes/CylinderNode.cs @@ -0,0 +1,29 @@ +using Chisel.Core; +using UnityEngine; + +namespace Chisel.Nodes +{ + public class CylinderNode : ChiselGraphNode + { + [Input] public float diameter = 1; + [Input] public float height = 1; + [Input] public int sides = 3; + + public override CSGTreeNode GetNode() + { + var cylinder = new ChiselCylinderDefinition(); + cylinder.type = CylinderShapeType.Cylinder; + cylinder.Diameter = GetInputValue("diameter", diameter); + cylinder.height = GetInputValue("height", height); + cylinder.sides = GetInputValue("sides", sides); + + var brushContainer = new ChiselBrushContainer(); + BrushMeshFactory.GenerateCylinder(ref brushContainer, ref cylinder); + + var instance = BrushMeshInstance.Create(brushContainer.brushMeshes[0]); + var treeNode = CSGTreeBrush.Create(GetInstanceID(), instance); + + return treeNode; + } + } +} \ No newline at end of file diff --git a/Packages/com.chisel.graph/Chisel/Nodes/CylinderNode.cs.meta b/Packages/com.chisel.graph/Chisel/Nodes/CylinderNode.cs.meta new file mode 100644 index 000000000..8f14a1a7e --- /dev/null +++ b/Packages/com.chisel.graph/Chisel/Nodes/CylinderNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2c0b6f7ddb5b0034697c7de4ea7f6f99 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 2ff0cb6db279fa3199f40a38e0f75c6c5e845d2d Mon Sep 17 00:00:00 2001 From: Michael Yuen Date: Tue, 16 Mar 2021 12:19:59 +0800 Subject: [PATCH 26/26] GraphRuntime WIP --- Assets/ChiselNodes/New Chisel Graph.asset | 36 ++++---- Assets/ChiselNodes/Test.cs | 88 +++++++++++++++++-- .../com.chisel.graph/Chisel/ChiselGraph.cs | 5 ++ .../Chisel/ChiselNodes.asmdef | 1 + .../com.chisel.graph/Chisel/GraphRuntime.cs | 49 +++++++++++ .../Chisel/GraphRuntime.cs.meta | 11 +++ .../Chisel/Nodes/ChiselGraphNode.cs | 13 ++- .../Chisel/Nodes/SubGraphNode.cs | 1 - .../Chisel/Nodes/TransformNode.cs | 11 +++ .../Chisel/Nodes/TransformNode.cs.meta | 11 +++ Packages/manifest.json | 4 +- Packages/packages-lock.json | 16 ++-- ProjectSettings/ProjectVersion.txt | 4 +- 13 files changed, 210 insertions(+), 40 deletions(-) create mode 100644 Packages/com.chisel.graph/Chisel/GraphRuntime.cs create mode 100644 Packages/com.chisel.graph/Chisel/GraphRuntime.cs.meta create mode 100644 Packages/com.chisel.graph/Chisel/Nodes/TransformNode.cs create mode 100644 Packages/com.chisel.graph/Chisel/Nodes/TransformNode.cs.meta diff --git a/Assets/ChiselNodes/New Chisel Graph.asset b/Assets/ChiselNodes/New Chisel Graph.asset index 4561f7f53..8bafd4e4a 100644 --- a/Assets/ChiselNodes/New Chisel Graph.asset +++ b/Assets/ChiselNodes/New Chisel Graph.asset @@ -187,9 +187,6 @@ MonoBehaviour: - fieldName: output node: {fileID: 3873916941957806223} reroutePoints: [] - - fieldName: output - node: {fileID: 6932176701218924448} - reroutePoints: [] _direction: 0 _connectionType: 0 _typeConstraint: 0 @@ -212,7 +209,7 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - localPosition: {x: -0.17, y: 0, z: 1.21} + localPosition: {x: 0.17, y: 0, z: 1.21} localRotation: {x: 0, y: 42.19, z: 0} operation: 0 center: {x: 0, y: 0.39, z: 0} @@ -408,7 +405,7 @@ MonoBehaviour: - {fileID: -2623054864538869351} - {fileID: 7746474342110482381} - {fileID: 6932176701218924448} - active: {fileID: -3665420030514838893} + active: {fileID: 6932176701218924448} instance: {fileID: 0} --- !u!114 &3873916941957806223 MonoBehaviour: @@ -602,7 +599,7 @@ MonoBehaviour: m_Name: Cylinder m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -168, y: 440} + position: {x: 904, y: 424} ports: keys: - diameter @@ -626,7 +623,10 @@ MonoBehaviour: _node: {fileID: 6932176701218924448} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: [] + connections: + - fieldName: output + node: {fileID: 7746474342110482381} + reroutePoints: [] _direction: 0 _connectionType: 0 _typeConstraint: 0 @@ -635,10 +635,7 @@ MonoBehaviour: _node: {fileID: 6932176701218924448} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: - - fieldName: input - node: {fileID: -3665420030514838893} - reroutePoints: [] + connections: [] _direction: 1 _connectionType: 0 _typeConstraint: 0 @@ -679,12 +676,12 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - localPosition: {x: 0, y: -0.19, z: 0} - localRotation: {x: 0.1, y: 0, z: 0} + localPosition: {x: -0.07, y: 0.73, z: -1.39} + localRotation: {x: 90, y: 0, z: 0} operation: 1 diameter: 1.08 - height: 1.24 - sides: 12 + height: 2.9 + sides: 11 --- !u!114 &7746474342110482381 MonoBehaviour: m_ObjectHideFlags: 0 @@ -719,7 +716,10 @@ MonoBehaviour: _node: {fileID: 7746474342110482381} _typeQualifiedName: Chisel.Nodes.ChiselGraphNode+CSG, ChiselNode, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - connections: [] + connections: + - fieldName: input + node: {fileID: 6932176701218924448} + reroutePoints: [] _direction: 1 _connectionType: 0 _typeConstraint: 0 @@ -742,7 +742,7 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 - localPosition: {x: 2.06, y: 2.27, z: -0.49} - localRotation: {x: 0.16, y: 0, z: 0} + localPosition: {x: -1.4, y: 2.27, z: -0.49} + localRotation: {x: 0.16, y: 0.91, z: 0} operation: 0 subgraph: {fileID: 11400000, guid: fcd800f03725c234c8d479a178882e4e, type: 2} diff --git a/Assets/ChiselNodes/Test.cs b/Assets/ChiselNodes/Test.cs index 15a5d1c26..a6a318b5e 100644 --- a/Assets/ChiselNodes/Test.cs +++ b/Assets/ChiselNodes/Test.cs @@ -1,25 +1,95 @@ using System.Collections; using System.Collections.Generic; +using Unity.Burst; +using Unity.Collections; using UnityEngine; namespace Chisel.Core { public class Test : MonoBehaviour { - // Start is called before the first frame update void Start() { - var allNodes = CSGManager.AllTreeNodes; - print(allNodes.Length); + var runtime = new GraphRuntime(); - foreach (var node in allNodes) - print(node); - } + var node1 = new Node1(); + var node2 = new Node2(); + + var list = new List { node1, node2 }; + runtime.ParseGraph(list); - // Update is called once per frame - void Update() - { } } +} + +public class Node1 : IRuntimeNode +{ + public int a; + + public void AddNode(NativeStream stream) + { + var writer = stream.AsWriter(); + writer.BeginForEachIndex(stream.Count()); + writer.Write(a); + writer.EndForEachIndex(); + } + + public FunctionPointer GetFunction() + { + return BurstCompiler.CompileFunctionPointer(Node1Function.Function); + } +} + +[BurstCompile(CompileSynchronously = true)] +public static class Node1Function +{ + [BurstCompile(CompileSynchronously = true)] + public static void Function(int index, ref NativeStream stream) + { + + } +} + +public class Node2 : IRuntimeNode +{ + public int index; + public int output; + + public void AddNode(NativeStream stream) + { + var writer = stream.AsWriter(); + writer.BeginForEachIndex(stream.Count()); + writer.Write(index); + writer.EndForEachIndex(); + } + + public FunctionPointer GetFunction() + { + return BurstCompiler.CompileFunctionPointer(Node2Function.Function); + } +} + +[BurstCompile(CompileSynchronously = true)] +public static class Node2Function +{ + [BurstCompile(CompileSynchronously = true)] + public static void Function(int index, ref NativeStream stream) + { + var reader = stream.AsReader(); + reader.BeginForEachIndex(index); + var targetIndex = reader.Read(); + reader.EndForEachIndex(); + + reader.BeginForEachIndex(targetIndex); + var target = reader.Read(); + reader.EndForEachIndex(); + + + var writer = stream.AsWriter(); + writer.BeginForEachIndex(index); + writer.Write(targetIndex); + writer.Write(target); + writer.EndForEachIndex(); + } } \ No newline at end of file diff --git a/Packages/com.chisel.graph/Chisel/ChiselGraph.cs b/Packages/com.chisel.graph/Chisel/ChiselGraph.cs index 7dc685611..883d7a187 100644 --- a/Packages/com.chisel.graph/Chisel/ChiselGraph.cs +++ b/Packages/com.chisel.graph/Chisel/ChiselGraph.cs @@ -1,5 +1,8 @@ using Chisel.Core; using System.Collections.Generic; +using Unity.Burst; +using Unity.Collections; +using Unity.Jobs; using UnityEngine; using XNode; @@ -58,4 +61,6 @@ void OnValidate() UpdateProperties(); } } + + } \ No newline at end of file diff --git a/Packages/com.chisel.graph/Chisel/ChiselNodes.asmdef b/Packages/com.chisel.graph/Chisel/ChiselNodes.asmdef index e66c68934..53f8287de 100644 --- a/Packages/com.chisel.graph/Chisel/ChiselNodes.asmdef +++ b/Packages/com.chisel.graph/Chisel/ChiselNodes.asmdef @@ -2,6 +2,7 @@ "name": "ChiselNode", "rootNamespace": "", "references": [ + "GUID:2665a8d13d1b3f18800f46e256720795", "GUID:e0cd26848372d4e5c891c569017e11f1", "GUID:642cde28f6a094d458a26f9a4533c056", "GUID:c5c65302a7823bb47a9cb6d9c848b0da", diff --git a/Packages/com.chisel.graph/Chisel/GraphRuntime.cs b/Packages/com.chisel.graph/Chisel/GraphRuntime.cs new file mode 100644 index 000000000..33ca572d2 --- /dev/null +++ b/Packages/com.chisel.graph/Chisel/GraphRuntime.cs @@ -0,0 +1,49 @@ +using Unity.Burst; +using Unity.Jobs; +using Unity.Collections; +using System.Collections.Generic; + +public delegate void FunctionDelegate(int index, ref NativeStream stream); + +public class GraphRuntime +{ + public NativeArray> functions; + public NativeStream stream; + + public void ParseGraph(List nodes) + { + functions = new NativeArray>(nodes.Count, Allocator.Persistent); + stream = new NativeStream(nodes.Count, Allocator.Persistent); + + for (int i = 0; i < nodes.Count; i++) + { + functions[i] = nodes[i].GetFunction(); + nodes[i].AddNode(stream); + } + } + + public void Execute() + { + var graphJob = new GraphJob { functions = functions, nodes = stream }; + graphJob.Run(); + } +} + +[BurstCompile(CompileSynchronously = true)] +struct GraphJob : IJob +{ + public NativeArray> functions; + public NativeStream nodes; + + public void Execute() + { + for (int i = 0; i < functions.Length; i++) + functions[i].Invoke(i, ref nodes); + } +} + +public interface IRuntimeNode +{ + public void AddNode(NativeStream stream); + public FunctionPointer GetFunction(); +} \ No newline at end of file diff --git a/Packages/com.chisel.graph/Chisel/GraphRuntime.cs.meta b/Packages/com.chisel.graph/Chisel/GraphRuntime.cs.meta new file mode 100644 index 000000000..65061674f --- /dev/null +++ b/Packages/com.chisel.graph/Chisel/GraphRuntime.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a0ca93bd740437d49a0691f046a40350 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs index cd1289518..4941822f0 100644 --- a/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs +++ b/Packages/com.chisel.graph/Chisel/Nodes/ChiselGraphNode.cs @@ -2,10 +2,12 @@ using UnityEngine; using XNode; using Chisel.Core; +using Unity.Collections; +using Unity.Burst; namespace Chisel.Nodes { - public abstract class ChiselGraphNode : Node + public abstract class ChiselGraphNode : Node, IRuntimeNode { [Input, HideInInspector] public CSG input; [Output, HideInInspector] public CSG output; @@ -73,6 +75,15 @@ protected int GetGraphNodeID() return chiselGraph.nodes.IndexOf(this); } + public void AddNode(NativeStream stream) + { + OnAddNode(stream); + } + + public FunctionPointer GetFunction() { throw new NotImplementedException(); } + + protected virtual void OnAddNode(NativeStream stream) { } + [Serializable] public class CSG { } } diff --git a/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs index c03e709e3..54646926c 100644 --- a/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs +++ b/Packages/com.chisel.graph/Chisel/Nodes/SubGraphNode.cs @@ -1,6 +1,5 @@ using Chisel.Core; using Chisel.Nodes; -using UnityEngine; public class SubGraphNode : ChiselGraphNode { diff --git a/Packages/com.chisel.graph/Chisel/Nodes/TransformNode.cs b/Packages/com.chisel.graph/Chisel/Nodes/TransformNode.cs new file mode 100644 index 000000000..0e1277925 --- /dev/null +++ b/Packages/com.chisel.graph/Chisel/Nodes/TransformNode.cs @@ -0,0 +1,11 @@ +using Chisel.Core; +using Chisel.Nodes; + +public class TransformNode : ChiselGraphNode +{ + public override CSGTreeNode GetNode() + { + var branch = CSGTreeBranch.Create(GetInstanceID()); + return branch; + } +} \ No newline at end of file diff --git a/Packages/com.chisel.graph/Chisel/Nodes/TransformNode.cs.meta b/Packages/com.chisel.graph/Chisel/Nodes/TransformNode.cs.meta new file mode 100644 index 000000000..cd7901393 --- /dev/null +++ b/Packages/com.chisel.graph/Chisel/Nodes/TransformNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ba37dc768ce0c30498404c1fcac6aaf1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 95ef2aa8e..f688a33f5 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,9 +1,9 @@ { "dependencies": { - "com.github.siccity.xnode": "https://github.com/siccity/xNode.git", + "com.github.siccity.xnode": "https://github.com/siccity/xNode.git", "com.unity.burst": "1.4.1", "com.unity.entities": "0.16.0-preview.21", - "com.unity.ide.visualstudio": "2.0.5", + "com.unity.ide.visualstudio": "2.0.7", "com.unity.nuget.newtonsoft-json": "2.0.0", "com.unity.performance.profile-analyzer": "1.0.3", "com.unity.ugui": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1a67eed89..138fb4799 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -107,17 +107,19 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.5", - "depth": 3, + "version": "1.0.6", + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.5", + "version": "2.0.7", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, "url": "https://packages.unity.com" }, "com.unity.jobs": { @@ -214,11 +216,11 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.19", - "depth": 2, + "version": "1.1.22", + "depth": 1, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.5", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a328ffde0..3bdba1535 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.1f1 -m_EditorVersionWithRevision: 2020.2.1f1 (270dd8c3da1c) +m_EditorVersion: 2020.2.7f1 +m_EditorVersionWithRevision: 2020.2.7f1 (c53830e277f1)