Skip to content

Commit e75d03c

Browse files
author
kijai
committed
Added Lightwire brush and other small fixes
1 parent 3792f06 commit e75d03c

16 files changed

+11578
-190
lines changed

‎UnitySDK/Assets/Scenes/SampleScene.unity‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,3 +247,117 @@ Transform:
247247
m_Father: {fileID: 677856534}
248248
m_RootOrder: 0
249249
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
250+
--- !u!1001 &1526885804
251+
PrefabInstance:
252+
m_ObjectHideFlags: 0
253+
serializedVersion: 2
254+
m_Modification:
255+
m_TransformParent: {fileID: 0}
256+
m_Modifications:
257+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
258+
propertyPath: m_RootOrder
259+
value: 1
260+
objectReference: {fileID: 0}
261+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
262+
propertyPath: m_LocalPosition.x
263+
value: 0
264+
objectReference: {fileID: 0}
265+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
266+
propertyPath: m_LocalPosition.y
267+
value: 0
268+
objectReference: {fileID: 0}
269+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
270+
propertyPath: m_LocalPosition.z
271+
value: 0
272+
objectReference: {fileID: 0}
273+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
274+
propertyPath: m_LocalRotation.w
275+
value: 1
276+
objectReference: {fileID: 0}
277+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
278+
propertyPath: m_LocalRotation.x
279+
value: 0
280+
objectReference: {fileID: 0}
281+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
282+
propertyPath: m_LocalRotation.y
283+
value: 0
284+
objectReference: {fileID: 0}
285+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
286+
propertyPath: m_LocalRotation.z
287+
value: 0
288+
objectReference: {fileID: 0}
289+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
290+
propertyPath: m_LocalEulerAnglesHint.x
291+
value: 0
292+
objectReference: {fileID: 0}
293+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
294+
propertyPath: m_LocalEulerAnglesHint.y
295+
value: 0
296+
objectReference: {fileID: 0}
297+
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
298+
propertyPath: m_LocalEulerAnglesHint.z
299+
value: 0
300+
objectReference: {fileID: 0}
301+
- target: {fileID: 919132149155446097, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
302+
propertyPath: m_Name
303+
value: Untitled_0
304+
objectReference: {fileID: 0}
305+
m_RemovedComponents: []
306+
m_SourcePrefab: {fileID: 100100000, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
307+
--- !u!1001 &1645930825
308+
PrefabInstance:
309+
m_ObjectHideFlags: 0
310+
serializedVersion: 2
311+
m_Modification:
312+
m_TransformParent: {fileID: 0}
313+
m_Modifications:
314+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
315+
propertyPath: m_RootOrder
316+
value: 2
317+
objectReference: {fileID: 0}
318+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
319+
propertyPath: m_LocalPosition.x
320+
value: 0
321+
objectReference: {fileID: 0}
322+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
323+
propertyPath: m_LocalPosition.y
324+
value: 0
325+
objectReference: {fileID: 0}
326+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
327+
propertyPath: m_LocalPosition.z
328+
value: 0
329+
objectReference: {fileID: 0}
330+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
331+
propertyPath: m_LocalRotation.w
332+
value: 1
333+
objectReference: {fileID: 0}
334+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
335+
propertyPath: m_LocalRotation.x
336+
value: 0
337+
objectReference: {fileID: 0}
338+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
339+
propertyPath: m_LocalRotation.y
340+
value: 0
341+
objectReference: {fileID: 0}
342+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
343+
propertyPath: m_LocalRotation.z
344+
value: 0
345+
objectReference: {fileID: 0}
346+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
347+
propertyPath: m_LocalEulerAnglesHint.x
348+
value: 0
349+
objectReference: {fileID: 0}
350+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
351+
propertyPath: m_LocalEulerAnglesHint.y
352+
value: 0
353+
objectReference: {fileID: 0}
354+
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
355+
propertyPath: m_LocalEulerAnglesHint.z
356+
value: 0
357+
objectReference: {fileID: 0}
358+
- target: {fileID: 919132149155446097, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
359+
propertyPath: m_Name
360+
value: Untitled
361+
objectReference: {fileID: 0}
362+
m_RemovedComponents: []
363+
m_SourcePrefab: {fileID: 100100000, guid: d2a1db757c3b84649a781683e24ae790, type: 3}

‎UnitySDK/Assets/Tests.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnitySDK/Assets/Tests/Untitled.fbx‎

474 KB
Binary file not shown.

‎UnitySDK/Assets/Tests/Untitled.fbx.meta‎

Lines changed: 102 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,29 @@
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: LightWire
10-
m_Shader: {fileID: 4800000, guid: 3b4cc34a39a839049b4387ce42e3b56c, type: 3}
11+
m_Shader: {fileID: -6465566751694194690, guid: 71991e2633fe0d34cb9e24581c14b32e, type: 3}
1112
m_ShaderKeywords:
12-
m_LightmapFlags: 5
13+
m_LightmapFlags: 2
1314
m_EnableInstancingVariants: 0
1415
m_DoubleSidedGI: 0
15-
m_CustomRenderQueue: 2000
16+
m_CustomRenderQueue: -1
1617
stringTagMap: {}
1718
disabledShaderPasses: []
1819
m_SavedProperties:
1920
serializedVersion: 3
2021
m_TexEnvs:
22+
- Texture2D_1:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- Texture2D_7cc1569ec5ab475ebef759959328b817:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
2130
- _BumpMap:
2231
m_Texture: {fileID: 0}
2332
m_Scale: {x: 1, y: 1}
@@ -30,13 +39,36 @@ Material:
3039
m_Texture: {fileID: 2800000, guid: ea466d6b6f5981a418210cf0db7aee16, type: 3}
3140
m_Scale: {x: 1, y: 1}
3241
m_Offset: {x: 0, y: 0}
42+
- unity_Lightmaps:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- unity_LightmapsInd:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- unity_ShadowMasks:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
3354
m_Floats:
55+
- Vector1_577edccb0841452493f741f21d1b56ff: 10.24
56+
- Vector1_7683367b3a324d5397407217add23608: 1
57+
- Vector1_84bd9cc5c05e47a7a55776dc739f48f6: 2.55
58+
- Vector1_96e74f654340414f92b9941286e6e808: 0.41
59+
- Vector1_a06045d2792d4f0b99c977b4fa510089: 1
60+
- Vector1_a23fd0e00c3f44b4aa2844ebbe534cb3: 0.00583
61+
- Vector1_ac95d1fbaf684fbc863cf391aafe19ea: 0.03
62+
- Vector1_c7ce491301ae4ba3aaf89078428d6208: 0.85
3463
- _Cutoff: 0.5
3564
- _EmissionGain: 0.5
3665
- _EmissionLM: 0
3766
- _InvFade: 1
3867
- _Shininess: 0.81
3968
m_Colors:
69+
- Color_2ca6888f8e6b4df4838a0a56190ca5f2: {r: 0, g: 0, b: 0, a: 0}
70+
- Color_86feff33dc9c4bc2bc28ed5d6e2dae3c: {r: 0, g: 0, b: 0, a: 0}
4071
- _Color: {r: 1, g: 1, b: 1, a: 1}
4172
- _SpecColor: {r: 0.3455882, g: 0.3455882, b: 0.3455882, a: 0}
4273
- _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608}
74+
m_BuildTextureStacks: []

‎UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ Material:
7676
m_Scale: {x: 1, y: 1}
7777
m_Offset: {x: 0, y: 0}
7878
m_Floats:
79+
- Vector1_43d512ab2ecd4b68a10ca02a004c7f3a: 0
7980
- Vector1_7683367b3a324d5397407217add23608: 1
81+
- Vector1_7e140da91b024369b3c2752f10e96ce6: 0
8082
- _BumpScale: 1
8183
- _Cutoff: 0.5
8284
- _DetailNormalMapScale: 1

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
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: Toon
1011
m_Shader: {fileID: 4800000, guid: f642cb91c8b664571967bdb587334e76, type: 3}
1112
m_ShaderKeywords:
@@ -31,6 +32,8 @@ Material:
3132
- _EmissionGain: 0.5
3233
- _EmissionLM: 0
3334
- _InvFade: 1
35+
- _OutlineMax: 0.032
3436
m_Colors:
3537
- _Color: {r: 1, g: 1, b: 1, a: 1}
3638
- _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608}
39+
m_BuildTextureStacks: []

0 commit comments

Comments
 (0)