From 7ce55f441c86765817f275e23863f18da9df6b3e Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Sun, 22 Dec 2024 14:03:55 +0000 Subject: [PATCH] Work in progress --- Assets/Materials/sculpting/SculptOff.mat | 21 +++-- Assets/Materials/sculpting/SculptOn.mat | 21 +++-- Assets/Scenes/Main.unity | 110 +++++++++++++++++++++++ 3 files changed, 140 insertions(+), 12 deletions(-) diff --git a/Assets/Materials/sculpting/SculptOff.mat b/Assets/Materials/sculpting/SculptOff.mat index 9d82513a5b..fec2c865f6 100644 --- a/Assets/Materials/sculpting/SculptOff.mat +++ b/Assets/Materials/sculpting/SculptOff.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SculptOff - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION + m_Shader: {fileID: 4800000, guid: 4ec22985cf4da3a489262499812ec6c7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -40,8 +42,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: c8848c12b4797314d8055899b5eef959, type: 3} + m_Scale: {x: 0.1, y: 4} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -55,6 +57,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -70,8 +73,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _TilingX: 3 + - _TilingY: 1 - _UVSec: 0 + - _VectorX: 0 + - _VectorY: 1 + - _VectorZ: 1 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 0.037613586, b: 0, a: 1} + - _Color: {r: 0.6320754, g: 0.3488341, b: 0.3822964, a: 1} - _EmissionColor: {r: 0.4665165, g: 0.018294765, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/sculpting/SculptOn.mat b/Assets/Materials/sculpting/SculptOn.mat index b3f1a83e3d..4ad40a9ee5 100644 --- a/Assets/Materials/sculpting/SculptOn.mat +++ b/Assets/Materials/sculpting/SculptOn.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SculptOn - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION + m_Shader: {fileID: 4800000, guid: 4ec22985cf4da3a489262499812ec6c7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -40,8 +42,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: c8848c12b4797314d8055899b5eef959, type: 3} + m_Scale: {x: 0.1, y: 4} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -55,6 +57,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -70,8 +73,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _TilingX: 1 + - _TilingY: 1 - _UVSec: 0 + - _VectorX: 0 + - _VectorY: 0 + - _VectorZ: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 1, b: 0.09511161, a: 1} + - _Color: {r: 0.4309808, g: 0.6132076, b: 0.44813156, a: 1} - _EmissionColor: {r: 0, g: 0.34943, b: 0.03293058, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index e3e7b41cd8..e839e9fc25 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -36792,6 +36792,56 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 593121476} m_Modifications: + - target: {fileID: 8454566571192234474, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} + - target: {fileID: 8454566571192234475, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 8edcc1cc602f51b4b8195cfcd465578e, type: 2} + - target: {fileID: 8454566571192234485, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8454566571192234485, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8454566571192234485, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8454566571192234485, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8454566571192234485, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8454566571192234485, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8454566571192234485, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8454566571192234485, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8454566571286676275, guid: 047c579494388e84dbf6a71d8fb33146, type: 3} propertyPath: m_RootOrder @@ -36852,6 +36902,66 @@ PrefabInstance: propertyPath: m_Name value: SculptTool objectReference: {fileID: 0} + - target: {fileID: 8454566571286676284, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8454566571453144859, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} + - target: {fileID: 8454566571453144868, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: a0fee68e9219a024f9ed7800b4ccb3f4, type: 2} + - target: {fileID: 8454566571453144869, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8454566571453144869, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8454566571453144869, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8454566571453144869, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8454566571453144869, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8454566571453144869, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8454566572415709803, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8454566572415709803, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8454566572415709803, guid: 047c579494388e84dbf6a71d8fb33146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 047c579494388e84dbf6a71d8fb33146, type: 3} --- !u!4 &9123593761565215834