Skip to content

Commit

Permalink
Highlighter and normal mapped brush fixes
Browse files Browse the repository at this point in the history 
Remade highlighter brushes to support SPI and fixed normal mapping for any textured brushes
  • Loading branch information
@kijai
kijai committed Nov 1, 2021
1 parent 68bceb3 commit 42c9514
Show file tree
Hide file tree
Showing 11 changed files with 2,709 additions and 26 deletions.
126 changes: 126 additions & 0 deletions UnitySDK/Assets/Scenes/SampleScene.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,63 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &90866600
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
propertyPath: m_Name
value: tiltbrushbrushesall_blue
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
--- !u!1 &677856533
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -247,3 +304,72 @@ Transform:
m_Father: {fileID: 677856534}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 32.791, y: -41.949, z: -15.092}
--- !u!1001 &1452735444
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8000427043621907267, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalPosition.x
value: -0.154
objectReference: {fileID: 0}
- target: {fileID: -8000427043621907267, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalPosition.z
value: 0.676
objectReference: {fileID: 0}
- target: {fileID: -7505887750368321166, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_Name
value: openbrush_export_test
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4479270150844219792, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
propertyPath: m_LocalPosition.z
value: 1.055
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: -4770717420272714671, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
29 changes: 26 additions & 3 deletions UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Highlighter
m_Shader: {fileID: 4800000, guid: e2d9c195722354e42a5a45e5b73a9f19, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: e93e382e610d1f641abc64a3ad7b6985, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
Expand All @@ -18,6 +19,10 @@ Material:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- Texture2D_7cc1569ec5ab475ebef759959328b817:
m_Texture: {fileID: 2800000, guid: 2a6e115fa9494f2479d7a5284cbe2d3b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand All @@ -30,7 +35,23 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- BOOLEAN_A54E69A86362495BB601CBFC480C864D: 0
- Vector1_7683367b3a324d5397407217add23608: 1
- Vector1_8b14a7da717f4ceda97d0c9975f88d0b: 0.55
- Vector1_b02453c75d8a473186e7588172c2a0f1: 0.507
- _Cutoff: 0.12
- _DisplacementIntensity: 0.1
- _EmissionGain: 0.25
Expand All @@ -40,8 +61,10 @@ Material:
- _Smoothness: 0.078125
- _Strength: 0.5
m_Colors:
- Color_2ca6888f8e6b4df4838a0a56190ca5f2: {r: 1, g: 1, b: 1, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1}
m_BuildTextureStacks: []
--- !u!1002 &2100001
EditorExtensionImpl:
serializedVersion: 6
33 changes: 28 additions & 5 deletions UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,52 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SoftHighlighter
m_Shader: {fileID: 4800000, guid: 63ee81a0fbf19bc44bec7e2ca3ba73e1, type: 3}
m_ShaderKeywords:
m_Shader: {fileID: -6465566751694194690, guid: e93e382e610d1f641abc64a3ad7b6985, type: 3}
m_ShaderKeywords: BOOLEAN_A54E69A86362495BB601CBFC480C864D_ON
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- Texture2D_7cc1569ec5ab475ebef759959328b817:
m_Texture: {fileID: 2800000, guid: 32bb2679f5fb44b4f88d7afc21730e9b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 32bb2679f5fb44b4f88d7afc21730e9b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- BOOLEAN_A54E69A86362495BB601CBFC480C864D: 1
- Vector1_7683367b3a324d5397407217add23608: 1
- Vector1_8b14a7da717f4ceda97d0c9975f88d0b: 0
- Vector1_b02453c75d8a473186e7588172c2a0f1: 0.529
- _InvFade: 1
m_Colors:
- Color_2ca6888f8e6b4df4838a0a56190ca5f2: {r: 1, g: 1, b: 1, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1}
m_BuildTextureStacks: []
--- !u!1002 &2100001
EditorExtensionImpl:
serializedVersion: 6
Loading

0 comments on commit 42c9514

Please sign in to comment.