Skip to content

Commit

Permalink
Brush fixes
Browse files Browse the repository at this point in the history
- Electricity and Toon brush tweaks
- Added Disco -brush
- Fixed couple of brushes not using Vertex Color
- Added more color adjustments to the Shader graph brushes, emission toggle

Tested compatibility with Open Brush .glb exports, works in AltSpace SteamVR URP preview client.
  • Loading branch information
kijai committed Sep 16, 2021
1 parent e75d03c commit fd6081b
Show file tree
Hide file tree
Showing 31 changed files with 10,878 additions and 1,433 deletions.
Binary file not shown.
649 changes: 599 additions & 50 deletions UnitySDK/Assets/Scenes/SampleScene.unity

Large diffs are not rendered by default.

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

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

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

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

Binary file added UnitySDK/Assets/Tests/openbrush_export_test.glb
Binary file not shown.
10 changes: 10 additions & 0 deletions UnitySDK/Assets/Tests/openbrush_export_test.glb.meta

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

15 changes: 11 additions & 4 deletions UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,16 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_01e58a7ff5d94fc9b6d8577144c1afff: 0.896
- Vector1_7683367b3a324d5397407217add23608: 1
- Vector1_b8f1f52095e04cf39dcd20d38bc200e5: 1
- Boolean_00114b6c6c9246b7806913273236d982: 1
- Boolean_a1ab06cca9bc4fca9ec759b8c8814db9: 1
- Vector1_01e58a7ff5d94fc9b6d8577144c1afff: 0.871
- Vector1_0bb879fa6a634a34b0513e1a88b01fcc: 0.0601
- Vector1_7683367b3a324d5397407217add23608: 0.5
- Vector1_7bf1b47183834e3fb0e18f4a7e9f4da9: 100
- Vector1_7c69a76ce160452eab312d851a9b8bb4: 59.94
- Vector1_b8f1f52095e04cf39dcd20d38bc200e5: 0.464
- Vector1_f05c193af0124a3dbafb21bcc386a115: 4
- Vector1_f4399b85a0d841d7a58686dbcb1630ed: 61.1
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
Expand Down Expand Up @@ -118,7 +125,7 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- Color_2ca6888f8e6b4df4838a0a56190ca5f2: {r: 0.67966056, g: 0.7346637, b: 0.745283, a: 0}
- Color_2ca6888f8e6b4df4838a0a56190ca5f2: {r: 1, g: 1, b: 1, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,25 @@
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: Electricity
m_Shader: {fileID: 4800000, guid: 698f6f8dc012a8b4e9d6f36db04f0dd3, type: 3}
m_Shader: {fileID: 4800000, guid: 728b292333b299748a902df31f3351a4, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 5
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 0.1, y: 1}
Expand All @@ -26,8 +31,29 @@ Material:
m_Texture: {fileID: 2800000, guid: 8036ea6d636847a429e2def5bf99ffe0, 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:
- _DisplacementIntensity: 2
- Boolean_10f7618faac4429f94d7ab2e78dfebba: 1
- Boolean_420d47fff25e4551842d5543b683d9d9: 1
- Vector1_43d512ab2ecd4b68a10ca02a004c7f3a: 0
- Vector1_7469e832f84b43c59a06406c900968c8: 6.92
- Vector1_7683367b3a324d5397407217add23608: 1
- Vector1_7e140da91b024369b3c2752f10e96ce6: 0
- Vector1_927f31a0e7bc49a6b446c76dad068ec4: 0.02
- Vector1_a321789f352b46cf9244cfc3f7758b7a: -0.1
- _DisplacementIntensity: 0.64
- _DisplacementIntensity2: 0.1
- _EmissionGain: 0.2
- _EmissionScroll1: 15
- _EmissionScroll2: -10
Expand All @@ -39,8 +65,11 @@ Material:
- _UVTile2: 1
- _UVTile3: 1
m_Colors:
- Color_2ca6888f8e6b4df4838a0a56190ca5f2: {r: 1, g: 1, b: 1, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1}
m_BuildTextureStacks: []
--- !u!1002 &2100001
EditorExtensionImpl:
serializedVersion: 6
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ CGINCLUDE
{
return vertModulated(v, 1, 1);
}

v2f vert_2 (appdata_t v)
{
return vertModulated(v, 1.333, -1);
Expand Down
Loading

0 comments on commit fd6081b

Please sign in to comment.