Skip to content

Commit

Permalink
Added Lightwire brush and other small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@kijai
kijai committed Sep 14, 2021
1 parent 3792f06 commit e75d03c
Show file tree
Hide file tree
Showing 16 changed files with 11,578 additions and 190 deletions.
114 changes: 114 additions & 0 deletions UnitySDK/Assets/Scenes/SampleScene.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,117 @@ Transform:
m_Father: {fileID: 677856534}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1526885804
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
propertyPath: m_Name
value: Untitled_0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6562cf36980fbd7459e2263f04356a1c, type: 3}
--- !u!1001 &1645930825
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
propertyPath: m_Name
value: Untitled
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d2a1db757c3b84649a781683e24ae790, type: 3}
8 changes: 8 additions & 0 deletions UnitySDK/Assets/Tests.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added UnitySDK/Assets/Tests/Untitled.fbx
View file
Binary file not shown.
102 changes: 102 additions & 0 deletions UnitySDK/Assets/Tests/Untitled.fbx.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 37 additions & 5 deletions UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,29 @@
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: LightWire
m_Shader: {fileID: 4800000, guid: 3b4cc34a39a839049b4387ce42e3b56c, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 71991e2633fe0d34cb9e24581c14b32e, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 5
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- Texture2D_1:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- Texture2D_7cc1569ec5ab475ebef759959328b817:
m_Texture: {fileID: 0}
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,13 +39,36 @@ Material:
m_Texture: {fileID: 2800000, guid: ea466d6b6f5981a418210cf0db7aee16, 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:
- Vector1_577edccb0841452493f741f21d1b56ff: 10.24
- Vector1_7683367b3a324d5397407217add23608: 1
- Vector1_84bd9cc5c05e47a7a55776dc739f48f6: 2.55
- Vector1_96e74f654340414f92b9941286e6e808: 0.41
- Vector1_a06045d2792d4f0b99c977b4fa510089: 1
- Vector1_a23fd0e00c3f44b4aa2844ebbe534cb3: 0.00583
- Vector1_ac95d1fbaf684fbc863cf391aafe19ea: 0.03
- Vector1_c7ce491301ae4ba3aaf89078428d6208: 0.85
- _Cutoff: 0.5
- _EmissionGain: 0.5
- _EmissionLM: 0
- _InvFade: 1
- _Shininess: 0.81
m_Colors:
- Color_2ca6888f8e6b4df4838a0a56190ca5f2: {r: 0, g: 0, b: 0, a: 0}
- Color_86feff33dc9c4bc2bc28ed5d6e2dae3c: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.3455882, g: 0.3455882, b: 0.3455882, a: 0}
- _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608}
m_BuildTextureStacks: []
2 changes: 2 additions & 0 deletions UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_43d512ab2ecd4b68a10ca02a004c7f3a: 0
- Vector1_7683367b3a324d5397407217add23608: 1
- Vector1_7e140da91b024369b3c2752f10e96ce6: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
Expand Down
7 changes: 5 additions & 2 deletions UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
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: Toon
m_Shader: {fileID: 4800000, guid: f642cb91c8b664571967bdb587334e76, type: 3}
m_ShaderKeywords:
Expand All @@ -31,6 +32,8 @@ Material:
- _EmissionGain: 0.5
- _EmissionLM: 0
- _InvFade: 1
- _OutlineMax: 0.032
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608}
m_BuildTextureStacks: []
Loading

0 comments on commit e75d03c

Please sign in to comment.