Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
4dca52c
Test [CI BUILD] on main
andybak Mar 29, 2021
3327710
Merge remote-tracking branch 'upstream/main' into main
andybak Apr 9, 2021
b292361
Merge remote-tracking branch 'upstream/main' into main
andybak Apr 10, 2021
c9ed09e
Merge remote-tracking branch 'upstream/main' into main
andybak Apr 14, 2021
4e7542d
Merge remote-tracking branch 'upstream/main' into main
andybak Apr 16, 2021
0f2be07
Add initial support for 'user variant' brushes.
TimAidley Feb 13, 2021
52d804b
Turn off brush panel atlasing on flag
TimAidley Feb 13, 2021
3c21d5e
Move AtomicWriter out of TiltFile.
TimAidley Feb 20, 2021
45e535b
Support loading brushes from zipped .brush files.
TimAidley Feb 14, 2021
08847fe
Sketch metadata now supports fallback brush GUIDs.
TimAidley Feb 20, 2021
3876d3a
Saves User Variant Brushes to the .tilt file.
TimAidley Feb 21, 2021
3dfc5f4
Load User Brushes from Sketches.
TimAidley Feb 23, 2021
974d1e7
Rename FileOrZip to FolderOrZipReader.
TimAidley Feb 23, 2021
cfdfa39
Remove all writing ability from FolderOrZipReader.
TimAidley Feb 25, 2021
1c3ca72
Make TiltFile inherit from FolderOrZipReader.
TimAidley Apr 4, 2021
604f874
Poly and Google Drive User Brush support.
TimAidley Mar 7, 2021
6ac4cd5
Ensure we don't get duplicate variant brushes.
TimAidley Mar 15, 2021
858f6f0
Add brushes that only get kept with their scene.
TimAidley Mar 15, 2021
50c639c
Read in all fields from Brush Descriptor.
TimAidley Mar 21, 2021
bd3b854
Load Material Properties for User Brushes.
TimAidley Mar 22, 2021
f9ecd8e
Make JsonGlue support nullable types.
TimAidley Mar 24, 2021
5b9f19c
Add HashCode override for SerializableGuid.
TimAidley Mar 24, 2021
ea2bef0
Ability to serialize BrushDescriptors
TimAidley Mar 24, 2021
7d06269
Serialize Brush Material properties.
TimAidley Mar 26, 2021
4272cfc
Support variant brush shader switching.
TimAidley Mar 26, 2021
df2e54a
Script for creating a new brush
TimAidley Mar 26, 2021
100a55b
Fix array fields in user brush descriptions.
TimAidley Apr 2, 2021
b1006d5
Add copy restrictions.
TimAidley Apr 2, 2021
bf4f809
Re-export of brush properties.
TimAidley Apr 2, 2021
e54dfe5
Alter the json for the brushes.
TimAidley Apr 3, 2021
135a0f3
Brush cfg now has all the values by default.
TimAidley Apr 3, 2021
5caa320
Add header comments to all functions.
TimAidley Apr 3, 2021
2c765a7
Only allow specifying base brush by GUID.
TimAidley Apr 3, 2021
e47311b
Add a brush descriptor version.
TimAidley Apr 4, 2021
8e8939b
Added User Brush Documentation.
TimAidley Apr 4, 2021
edea971
Fix precommit errors and do Mike's suggestions:
TimAidley Apr 5, 2021
fc55442
Rexport of OilBrush properties.
TimAidley Apr 5, 2021
35222c1
Remove ExtraDescription from User Brushes.
TimAidley Apr 5, 2021
8c0f76b
Fix a NRE when a matching brush was found.
TimAidley Apr 5, 2021
c5c0a82
Make brush folders of the form Name_GUID
TimAidley Apr 5, 2021
d4ebef8
Document update
TimAidley Apr 5, 2021
74327ed
Take User Brushes out of TiltBrushManifest.
TimAidley Apr 7, 2021
83c5f55
Ensure the Brushes folder exists.
TimAidley Apr 7, 2021
63d39d9
Add a filewatcher to User Brushes.
TimAidley Apr 8, 2021
89c788a
Change all panel Brush buttons to a prefab.
TimAidley Apr 8, 2021
de3f1b5
Add a 'Library' icon to user brushes.
TimAidley Apr 9, 2021
8868fc2
Show author name and brush location in panel.
TimAidley Apr 12, 2021
48e2476
Merge branch 'upstream-main' into main
andybak Apr 19, 2021
cce2355
Merge remote-tracking branch 'upstream/main' into main
andybak Apr 28, 2021
0de947e
Rough initial sketch of functionality and UI
andybak Jun 20, 2021
5d6e6d8
Remove some prototyping code
andybak Jun 20, 2021
728cf51
A bit more stubbed out functionality
andybak Jun 20, 2021
c18f795
Holy moley. It almost works in a potemkin village kinda way.
andybak Jun 20, 2021
2377d7e
dotnet-format
andybak Jun 21, 2021
9660781
Merge branch 'main' into features/brush-editing
andybak Jun 21, 2021
fa06235
Avoid enum collisions
andybak Jun 21, 2021
62fa2c4
Color picker and texture popup vaguely working. Saving still not work…
andybak Jun 27, 2021
253a503
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jun 27, 2021
c89e40c
Remove some logging and turn off monoscopic mode by default
andybak Jun 27, 2021
1ae215c
Move some methods out of the editor namespace
andybak Jun 27, 2021
82b788e
Forgot to remove my debugging hack
andybak Jun 28, 2021
ce0afc5
Update EditBrushPanel.cs
andybak Jun 28, 2021
bfc330a
Bug fixes. WIP
andybak Jun 28, 2021
d433902
Progress towards saving user brushes
andybak Jun 29, 2021
dac59bb
Active texture button state
andybak Jun 29, 2021
691d5a9
Brush textures need to be readable.
andybak Jul 2, 2021
ba8416c
We appear to be mostly saving changes
andybak Jul 2, 2021
591641b
Ever so slightly less bug-ridden
andybak Jul 2, 2021
d0aa732
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 12, 2021
e219c1f
Dummy commit
andybak Jul 15, 2021
8786293
Bug fixes. Test making more params editable (just Neon Pulse for now)
andybak Aug 7, 2021
4cbe812
Support vector params on shaders
andybak Aug 17, 2021
14ad3df
Force a development build
andybak Aug 18, 2021
c0d91ab
This texture is used in a brush so needs to be rw
andybak Aug 23, 2021
4d537c0
Util to check brush textures (currently only checks if read write is on)
andybak Aug 23, 2021
b13309b
Fix inability to use edit brush panel in mono mode.
andybak Aug 24, 2021
51d01db
Fix saving of edited brushes with missing textures
andybak Aug 24, 2021
128f1da
[CI BUILD]
andybak Dec 28, 2021
84d52f6
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jan 11, 2022
d963c4e
Fix merge errors
andybak Jan 13, 2022
44520b8
[CI BUILD]
andybak Jan 23, 2022
c318f1c
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Feb 8, 2022
7df946a
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Apr 5, 2022
2e46bd3
[CI BUILD]
andybak May 14, 2022
f4b4876
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Dec 23, 2022
c1b0c61
WIP. Fixes after merging in main.
andybak Dec 23, 2022
d56bfa0
Fix a couple of post-merge prefabs issues
andybak Dec 23, 2022
6deadcc
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jan 21, 2023
f809441
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Feb 13, 2023
872b9e0
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Mar 15, 2023
756540a
Fix some post-merge issues
andybak Mar 15, 2023
ac6f519
Sketch loading was failing with unsaved existing sketch
andybak Mar 16, 2023
4a9e811
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jun 17, 2023
2ad8431
[CI BUILD]
andybak Jun 17, 2023
18e458d
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 10, 2023
82b8271
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 14, 2023
9385ad0
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 18, 2023
4fbd1a6
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 19, 2023
9155684
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 19, 2023
2a906b7
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 24, 2023
c727de9
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 28, 2023
b33589e
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 28, 2023
351d7b0
Post-merge fixes
andybak Jul 28, 2023
bf62b93
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 30, 2023
5782545
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jul 31, 2023
36768a2
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Aug 3, 2023
8851451
Remove merge markers
andybak Aug 3, 2023
9bea296
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Aug 3, 2023
2d3227d
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Aug 15, 2023
8cf44d4
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Aug 30, 2023
bb5c483
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Sep 6, 2023
023cb07
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Sep 7, 2023
63d9cdf
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Sep 12, 2023
288182f
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Sep 30, 2023
de9adbe
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Oct 24, 2023
4cc62a8
Unity autogenerated InputActions changes
andybak Oct 27, 2023
fd70236
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Nov 23, 2023
698bd79
[CI BUILD]
andybak Nov 23, 2023
fe7b7a5
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Nov 29, 2023
0c7622d
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Dec 7, 2023
d8f07da
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Dec 7, 2023
f7a4ed1
Fix Brush editing merge issues
andybak Dec 7, 2023
9e172c3
Panel Map fixes post-merge
andybak Dec 7, 2023
560f488
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Dec 20, 2023
20f3252
[CI BUILD]
andybak Dec 20, 2023
84e0bd3
Sync shader changes from plugin scripting branch
andybak Dec 23, 2023
4790dad
missing metafile
andybak Dec 24, 2023
0aa2180
Switch to advanced slider. Hide some shader params from UI
andybak Dec 24, 2023
544dce8
Slider fixes
andybak Dec 26, 2023
eec8357
Formatting
andybak Dec 31, 2023
7e0bf2c
NRE fix
andybak Dec 31, 2023
c360ce3
Fixes for browsing/saving files.
andybak Dec 31, 2023
7833b82
Formatting
andybak Dec 31, 2023
9bd77b8
Fix brush icons
andybak Dec 31, 2023
304f09f
Make brush edit slider smaller
andybak Dec 31, 2023
768d794
Brush widget spacing
andybak Dec 31, 2023
be7c699
Last commit included a change that requires this (WIP)
andybak Jan 1, 2024
325379a
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Jan 1, 2024
5b71e27
Restore enums that were lost in a previous merge
andybak Jan 8, 2024
a5b038b
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Feb 28, 2024
c6c2d86
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak Mar 5, 2024
e30fed7
dotnet-format
andybak Apr 3, 2024
5b7f5de
Merge remote-tracking branch 'upstream/main' into feature/brush-editing
andybak Apr 3, 2024
0a31b66
dotnet-format
andybak Apr 3, 2024
ac56a72
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak Apr 7, 2024
70e02aa
Post merge fixes
andybak Apr 8, 2024
37cb403
[CI BUILD]
andybak Apr 8, 2024
7686c7f
Merge remote-tracking branch 'upstream/main' into features/brush-editing
andybak May 2, 2024
2fd0af8
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak May 3, 2024
7aa4795
Update BrushLister.cs
andybak May 5, 2024
5178800
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak Sep 15, 2024
3872057
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak Dec 22, 2024
863c677
Post-merge fixes
andybak Dec 23, 2024
f55f8b9
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak Jan 13, 2025
8e3d2cc
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak Feb 27, 2025
07e3fe5
[CI BUILD]
andybak Feb 27, 2025
f30ba55
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak Apr 21, 2025
61e2d50
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak May 1, 2025
f84d2a0
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak May 1, 2025
a00b719
resync some stuff that had drifted from the main branch
andybak May 2, 2025
11de27f
dotnet format
andybak May 29, 2025
9bb2c71
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak Jun 25, 2025
37dfcfb
post-merge fix
andybak Jun 26, 2025
b4d4896
Hide drafting button to make space for brush edit (temporarily)
andybak Jun 26, 2025
ee3ade6
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak Jun 26, 2025
cad2712
[CI BUILD]
andybak Jun 26, 2025
1d923ea
Merge remote-tracking branch 'origin/main' into features/brush-editing
andybak Dec 10, 2025
3bc4bcc
Post-merge fix
andybak Dec 10, 2025
9d4d3d3
dotnet format
andybak Dec 10, 2025
693a703
Remove stray semicolon
andybak Dec 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions Assets/Editor/BrushLister.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,41 @@ public class BrushLister : MonoBehaviour
private static TiltBrushManifest brushManifest;
private static TiltBrushManifest brushManifestX;


[MenuItem("Tilt/Info/Check Brush Textures")]
static void CheckBrushTextures()
{
Object[] defaultBrushes = Resources.LoadAll("Brushes", typeof(BrushDescriptor)).ToArray();
var experimentalBrushes = Resources.LoadAll("X/Brushes", typeof(BrushDescriptor)).ToArray();
var allBrushes = defaultBrushes.Concat(experimentalBrushes);

var checkedMaterials = new HashSet<Material>();

foreach (BrushDescriptor brush in allBrushes)
{
if (brush.Material == null) continue;
Debug.Log($"Checking {brush.Material.name}");
if (!checkedMaterials.Contains(brush.Material))
{
var textureProps = brush.Material.GetTexturePropertyNames();
foreach (var textureProp in textureProps)
{
var texture = brush.Material.GetTexture(textureProp);
if (texture != null && !texture.isReadable)
{
Debug.LogWarning($"{brush.Material.name} {textureProp} needs read/write enabled");
}
else
{
Debug.Log($"{textureProp} checked");
}
}
checkedMaterials.Add(brush.Material);
}
}
}


[MenuItem("Open Brush/Info/Brush Lister")]
static void ListBrushes()
{
Expand Down
5 changes: 5 additions & 0 deletions Assets/Editor/GlTF_EditorExporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,11 @@ private static Dictionary<Guid, BrushDescriptor> GetBrushes()
cat[desc.m_Guid] = desc;
}

foreach (BrushDescriptor desc in BrushCatalog.m_Instance.AllBrushes.Where(x => x.UserVariantBrush != null))
{
cat.Add(desc.m_Guid, desc);
}

return cat;
}

Expand Down
80 changes: 80 additions & 0 deletions Assets/Materials/LibraryIcon.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LibraryIcon
m_Shader: {fileID: 4800000, guid: 44e8ab88637a620428771faaf58665b8, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 32738d93ad8ff8b4782d6f80de9962cb, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.061
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Glossiness: 0.5
- _InvFade: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Saturation: 1
- _Shininess: 0.7
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Emission: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 0}
- _Tint: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
8 changes: 8 additions & 0 deletions Assets/Materials/LibraryIcon.mat.meta

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

Loading