Skip to content

Commit 42c9514

Browse files
author
kijai
committed
Highlighter and normal mapped brush fixes
Remade highlighter brushes to support SPI and fixed normal mapping for any textured brushes
1 parent 68bceb3 commit 42c9514

11 files changed

+2709
-26
lines changed

‎UnitySDK/Assets/Scenes/SampleScene.unity‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,63 @@ NavMeshSettings:
123123
debug:
124124
m_Flags: 0
125125
m_NavMeshData: {fileID: 0}
126+
--- !u!1001 &90866600
127+
PrefabInstance:
128+
m_ObjectHideFlags: 0
129+
serializedVersion: 2
130+
m_Modification:
131+
m_TransformParent: {fileID: 0}
132+
m_Modifications:
133+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
134+
propertyPath: m_RootOrder
135+
value: 1
136+
objectReference: {fileID: 0}
137+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
138+
propertyPath: m_LocalPosition.x
139+
value: 0
140+
objectReference: {fileID: 0}
141+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
142+
propertyPath: m_LocalPosition.y
143+
value: 0
144+
objectReference: {fileID: 0}
145+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
146+
propertyPath: m_LocalPosition.z
147+
value: 0
148+
objectReference: {fileID: 0}
149+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
150+
propertyPath: m_LocalRotation.w
151+
value: 1
152+
objectReference: {fileID: 0}
153+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
154+
propertyPath: m_LocalRotation.x
155+
value: 0
156+
objectReference: {fileID: 0}
157+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
158+
propertyPath: m_LocalRotation.y
159+
value: 0
160+
objectReference: {fileID: 0}
161+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
162+
propertyPath: m_LocalRotation.z
163+
value: 0
164+
objectReference: {fileID: 0}
165+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
166+
propertyPath: m_LocalEulerAnglesHint.x
167+
value: 0
168+
objectReference: {fileID: 0}
169+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
170+
propertyPath: m_LocalEulerAnglesHint.y
171+
value: 0
172+
objectReference: {fileID: 0}
173+
- target: {fileID: -8679921383154817045, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
174+
propertyPath: m_LocalEulerAnglesHint.z
175+
value: 0
176+
objectReference: {fileID: 0}
177+
- target: {fileID: 919132149155446097, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
178+
propertyPath: m_Name
179+
value: tiltbrushbrushesall_blue
180+
objectReference: {fileID: 0}
181+
m_RemovedComponents: []
182+
m_SourcePrefab: {fileID: 100100000, guid: 2305b408fbf8d5d4f8a4becb9ab1e552, type: 3}
126183
--- !u!1 &677856533
127184
GameObject:
128185
m_ObjectHideFlags: 0
@@ -247,3 +304,72 @@ Transform:
247304
m_Father: {fileID: 677856534}
248305
m_RootOrder: 0
249306
m_LocalEulerAnglesHint: {x: 32.791, y: -41.949, z: -15.092}
307+
--- !u!1001 &1452735444
308+
PrefabInstance:
309+
m_ObjectHideFlags: 0
310+
serializedVersion: 2
311+
m_Modification:
312+
m_TransformParent: {fileID: 0}
313+
m_Modifications:
314+
- target: {fileID: -8000427043621907267, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
315+
propertyPath: m_LocalPosition.x
316+
value: -0.154
317+
objectReference: {fileID: 0}
318+
- target: {fileID: -8000427043621907267, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
319+
propertyPath: m_LocalPosition.z
320+
value: 0.676
321+
objectReference: {fileID: 0}
322+
- target: {fileID: -7505887750368321166, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
323+
propertyPath: m_Name
324+
value: openbrush_export_test
325+
objectReference: {fileID: 0}
326+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
327+
propertyPath: m_RootOrder
328+
value: 2
329+
objectReference: {fileID: 0}
330+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
331+
propertyPath: m_LocalPosition.x
332+
value: 0
333+
objectReference: {fileID: 0}
334+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
335+
propertyPath: m_LocalPosition.y
336+
value: 0
337+
objectReference: {fileID: 0}
338+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
339+
propertyPath: m_LocalPosition.z
340+
value: 0
341+
objectReference: {fileID: 0}
342+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
343+
propertyPath: m_LocalRotation.w
344+
value: 1
345+
objectReference: {fileID: 0}
346+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
347+
propertyPath: m_LocalRotation.x
348+
value: 0
349+
objectReference: {fileID: 0}
350+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
351+
propertyPath: m_LocalRotation.y
352+
value: 0
353+
objectReference: {fileID: 0}
354+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
355+
propertyPath: m_LocalRotation.z
356+
value: 0
357+
objectReference: {fileID: 0}
358+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
359+
propertyPath: m_LocalEulerAnglesHint.x
360+
value: 0
361+
objectReference: {fileID: 0}
362+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
363+
propertyPath: m_LocalEulerAnglesHint.y
364+
value: 0
365+
objectReference: {fileID: 0}
366+
- target: {fileID: -5296785932026551556, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
367+
propertyPath: m_LocalEulerAnglesHint.z
368+
value: 0
369+
objectReference: {fileID: 0}
370+
- target: {fileID: 4479270150844219792, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}
371+
propertyPath: m_LocalPosition.z
372+
value: 1.055
373+
objectReference: {fileID: 0}
374+
m_RemovedComponents: []
375+
m_SourcePrefab: {fileID: -4770717420272714671, guid: cc2019d757c0ad24c98fc594311a6376, type: 3}

‎UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: Highlighter
10-
m_Shader: {fileID: 4800000, guid: e2d9c195722354e42a5a45e5b73a9f19, type: 3}
11+
m_Shader: {fileID: -6465566751694194690, guid: e93e382e610d1f641abc64a3ad7b6985, type: 3}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 5
1314
m_EnableInstancingVariants: 0
@@ -18,6 +19,10 @@ Material:
1819
m_SavedProperties:
1920
serializedVersion: 3
2021
m_TexEnvs:
22+
- Texture2D_7cc1569ec5ab475ebef759959328b817:
23+
m_Texture: {fileID: 2800000, guid: 2a6e115fa9494f2479d7a5284cbe2d3b, type: 3}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
2126
- _BumpMap:
2227
m_Texture: {fileID: 0}
2328
m_Scale: {x: 1, y: 1}
@@ -30,7 +35,23 @@ Material:
3035
m_Texture: {fileID: 0}
3136
m_Scale: {x: 1, y: 1}
3237
m_Offset: {x: 0, y: 0}
38+
- unity_Lightmaps:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- unity_LightmapsInd:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- unity_ShadowMasks:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
3350
m_Floats:
51+
- BOOLEAN_A54E69A86362495BB601CBFC480C864D: 0
52+
- Vector1_7683367b3a324d5397407217add23608: 1
53+
- Vector1_8b14a7da717f4ceda97d0c9975f88d0b: 0.55
54+
- Vector1_b02453c75d8a473186e7588172c2a0f1: 0.507
3455
- _Cutoff: 0.12
3556
- _DisplacementIntensity: 0.1
3657
- _EmissionGain: 0.25
@@ -40,8 +61,10 @@ Material:
4061
- _Smoothness: 0.078125
4162
- _Strength: 0.5
4263
m_Colors:
64+
- Color_2ca6888f8e6b4df4838a0a56190ca5f2: {r: 1, g: 1, b: 1, a: 0}
4365
- _Color: {r: 1, g: 1, b: 1, a: 1}
4466
- _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1}
67+
m_BuildTextureStacks: []
4568
--- !u!1002 &2100001
4669
EditorExtensionImpl:
4770
serializedVersion: 6

‎UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.mat‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,52 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: SoftHighlighter
10-
m_Shader: {fileID: 4800000, guid: 63ee81a0fbf19bc44bec7e2ca3ba73e1, type: 3}
11-
m_ShaderKeywords:
11+
m_Shader: {fileID: -6465566751694194690, guid: e93e382e610d1f641abc64a3ad7b6985, type: 3}
12+
m_ShaderKeywords: BOOLEAN_A54E69A86362495BB601CBFC480C864D_ON
1213
m_LightmapFlags: 5
1314
m_EnableInstancingVariants: 0
1415
m_DoubleSidedGI: 0
15-
m_CustomRenderQueue: 3000
16+
m_CustomRenderQueue: -1
1617
stringTagMap: {}
1718
disabledShaderPasses: []
1819
m_SavedProperties:
1920
serializedVersion: 3
2021
m_TexEnvs:
22+
- Texture2D_7cc1569ec5ab475ebef759959328b817:
23+
m_Texture: {fileID: 2800000, guid: 32bb2679f5fb44b4f88d7afc21730e9b, type: 3}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
2126
- _MainTex:
2227
m_Texture: {fileID: 2800000, guid: 32bb2679f5fb44b4f88d7afc21730e9b, type: 3}
2328
m_Scale: {x: 1, y: 1}
2429
m_Offset: {x: 0, y: 0}
30+
- unity_Lightmaps:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- unity_LightmapsInd:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- unity_ShadowMasks:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
2542
m_Floats:
43+
- BOOLEAN_A54E69A86362495BB601CBFC480C864D: 1
44+
- Vector1_7683367b3a324d5397407217add23608: 1
45+
- Vector1_8b14a7da717f4ceda97d0c9975f88d0b: 0
46+
- Vector1_b02453c75d8a473186e7588172c2a0f1: 0.529
2647
- _InvFade: 1
2748
m_Colors:
49+
- Color_2ca6888f8e6b4df4838a0a56190ca5f2: {r: 1, g: 1, b: 1, a: 0}
2850
- _Color: {r: 1, g: 1, b: 1, a: 1}
2951
- _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1}
52+
m_BuildTextureStacks: []
3053
--- !u!1002 &2100001
3154
EditorExtensionImpl:
3255
serializedVersion: 6

0 commit comments

Comments
 (0)