Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1725 commits
Select commit Hold shift + click to select a range
2566c26
Fix some shader compilation errors
andybak Dec 6, 2023
635499a
Fix Leaky Pen on Quest
andybak Dec 6, 2023
c61a671
Make StandardSingleSided more consistent with StandardDoubleSided
andybak Dec 6, 2023
ecd7a8d
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Dec 7, 2023
eef540e
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Dec 7, 2023
14828ae
Fix another shader error
andybak Dec 7, 2023
5cd1c13
[CI BUILD]
andybak Dec 7, 2023
1fb57c5
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Dec 13, 2023
2103362
[CI BUILD]
andybak Dec 13, 2023
d656bd0
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Dec 20, 2023
98e67a3
FrameIds for editable models
andybak Dec 19, 2023
2db54e9
Previous cherry pick wasn't meant to include frameIds
andybak Dec 20, 2023
ceccc52
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Dec 20, 2023
a116084
Typo crept in last merge
andybak Dec 20, 2023
9898c48
Merge remote-tracking branch 'upstream/main' into feature/3d-shapes
andybak Jan 1, 2024
f6c13c1
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Jan 1, 2024
cab4a3b
[CI BUILD]
andybak Jan 2, 2024
f6c8e66
Switch to "Parameters.foo" syntax in plugins
andybak Jan 4, 2024
99fe604
Small refactor for efficiency
andybak Jan 4, 2024
e1bc3d9
small autocomplete update
andybak Jan 4, 2024
7d19797
Tool should be a top level class to appear in autocomplete
andybak Jan 4, 2024
de18f7e
Fix Tool autocomplete docs not generating
andybak Jan 4, 2024
49c426c
hard code Moonsharp builtins into autocomplete. Fix type for Tool.vector
andybak Jan 4, 2024
ba0f0c7
Make autocomplete happy
andybak Jan 4, 2024
d90e8d2
Shader fix
andybak Jan 4, 2024
29a8160
Gridfollow rotation fix. Better defaults
andybak Jan 4, 2024
0ffb9ad
Support a shorter shorthand for generating a T transform
andybak Jan 4, 2024
91abcb8
Fix symmetry widget transform api. Don't store an undo
andybak Jan 4, 2024
ba9ce34
Example script fix
andybak Jan 4, 2024
ff79583
Update __autocomplete.lua
andybak Jan 4, 2024
a0d884e
Merge remote-tracking branch 'ixxyxr/experiments/moonsharp' into feat…
andybak Jan 4, 2024
2d565a6
[CI BUILD]
andybak Jan 5, 2024
b749f3e
Docs and example script tweaks
andybak Jan 5, 2024
8d7bc50
dotnet-format
andybak Jan 5, 2024
9724c6f
Round slider values in the widget
andybak Jan 5, 2024
8198108
Fix symmetryhueshift include for recent changes
andybak Jan 5, 2024
80fb06f
Revert "Round slider values in the widget"
andybak Jan 6, 2024
440716d
Maintain float value internally but send int out to subscribers
andybak Jan 6, 2024
44cac39
Example script fixes
andybak Jan 6, 2024
aa29bc4
Fix ducklings
andybak Jan 6, 2024
047212a
Incremental GC
andybak Jan 6, 2024
35084b5
Merge remote-tracking branch 'IxxyXR/experiments/moonsharp' into feat…
andybak Jan 6, 2024
925c2d9
Color widget. Refactor popups to allow popups to open other popups.
andybak Jan 8, 2024
4a98f04
More script widget types (WIP)
andybak Jan 10, 2024
8d7887d
Update scripts to use new widgets
andybak Jan 10, 2024
bbdd4ec
Fix paging popup with dynamic items
andybak Jan 12, 2024
5bb91a5
Update example script to use new widgets.
andybak Jan 12, 2024
3077bf9
Fewer items per page to stop overlap with nav buttons
andybak Jan 12, 2024
efc1473
Fix Scripts Panel collider and centering
andybak Jan 12, 2024
0267cf1
Bigger script parameter popup
andybak Jan 12, 2024
34f7137
Small cosmetic and docs tweaks
andybak Jan 14, 2024
5ee5f6e
Matrix and Vector4 wrappers
andybak Jan 16, 2024
efb46b5
API support for getting matrices from multimirror
andybak Jan 16, 2024
28bfa29
API docs fix
andybak Jan 16, 2024
99bc967
Register the Vector4 and Matrix types
andybak Jan 16, 2024
925df56
Return MatrixList
andybak Jan 16, 2024
477d312
Update __autocomplete.lua
andybak Jan 16, 2024
de1231f
MatrixListWrapper should implement IPathApiWrapper
andybak Jan 17, 2024
2a39ae0
Handle matrix lists the same as any IPathApiWrapper instance
andybak Jan 17, 2024
054e219
Register MatrixList
andybak Jan 17, 2024
fad5984
Setters for position, rotation and scale on Matrix wrapper
andybak Jan 17, 2024
5ba4682
Setter for MatrixList indexer
andybak Jan 17, 2024
b8a255a
Symmetry scripts refactor and fix
andybak Jan 17, 2024
17b59c9
Update __autocomplete.lua
andybak Jan 17, 2024
2f8719e
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Jan 18, 2024
c917492
Remove some junk comments
andybak Jan 18, 2024
dbc8788
Post-merge fix
andybak Jan 18, 2024
64f962c
Setters for indexers
andybak Jan 28, 2024
3ece637
update polyhydra version
andybak Feb 28, 2024
e72ffe3
Use new grid enum format
andybak Feb 28, 2024
d515a8e
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Feb 28, 2024
162697e
[CI BUILD]
andybak Feb 28, 2024
a3396ad
dotnet-format
andybak Feb 28, 2024
947bc28
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Feb 28, 2024
d1327b3
dotnet-format
andybak Feb 28, 2024
7b142ee
Display image picker icons with correct aspect ratio
andybak Feb 28, 2024
b390bf7
Assign image button results correctly
andybak Feb 28, 2024
f97db97
Merge remote-tracking branch 'upstream/main' into feature/3d-shapes
andybak Mar 5, 2024
f3157ee
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Mar 5, 2024
30462be
Update polyhydra package
andybak Mar 23, 2024
0b3efc4
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Mar 23, 2024
278cada
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Mar 23, 2024
46fa98e
Merge remote-tracking branch 'ixxyxr/experiments/moonsharp' into feat…
andybak Mar 23, 2024
68db9c3
Update packages-lock.json
andybak Mar 23, 2024
5ef8026
Partially fix button icons
andybak Mar 24, 2024
9869236
Update packages-lock.json
andybak Mar 24, 2024
bb95c9c
Multiple grid categories
andybak Mar 24, 2024
1e16456
More updates for new grids
andybak Mar 24, 2024
5a63c68
Add some new ops
andybak Mar 24, 2024
157a1ae
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Apr 3, 2024
80320ec
Quest experimental flags for new panels
andybak Apr 3, 2024
abe6d00
Fix reticle bounds for monoscopic
andybak Apr 3, 2024
9a54847
Merge branch 'main' into feature/3d-shapes
andybak Apr 3, 2024
7145bf5
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Apr 7, 2024
d637af8
Merge remote-tracking branch 'upstream/main' into feature/3d-shapes
andybak Apr 7, 2024
76bfd9f
Post-merge panel fixes
andybak Apr 7, 2024
2b088b1
Post-merge panel fixes
andybak Apr 7, 2024
f3c2666
Merge remote-tracking branch 'IxxyXR/experiments/moonsharp' into feat…
andybak Apr 7, 2024
b06842e
Packages update
andybak Apr 7, 2024
ac8c6c6
Disable background polymesh building as it's not currently working.
andybak Apr 7, 2024
db6d69f
picker popup fixes
andybak Apr 12, 2024
7184f47
picker popup fixes
andybak Apr 12, 2024
26ef2a0
svg mesh import fix
andybak Apr 12, 2024
ce18925
Image api fixes
andybak Apr 12, 2024
569f30e
Minimal port of text tool - just enough to allow API creation of text…
andybak Apr 13, 2024
cbaf7a9
Add Open Type glyph loader
andybak Apr 13, 2024
d3e32d4
Update the vector graphic package
andybak Apr 14, 2024
48d09a9
Add various text utility methods
andybak Apr 14, 2024
46d4c05
formatting
andybak Apr 14, 2024
4aa88b9
Image extrusion (WIP)
andybak Apr 14, 2024
34a478e
Needed for image extrusion
andybak Apr 14, 2024
e0ef08f
Fixes for image and text widget changes
andybak Apr 14, 2024
3a7f442
"Save as" fixed (overwriting and file extensions)
andybak Apr 14, 2024
2fbe853
Http API endpoint for image extrusion (WIP)
andybak Apr 14, 2024
69f1e72
Move example usages into the endpoint attribute
andybak Apr 16, 2024
0bbacb2
Merge branch 'experiments/moonsharp' of https://github.com/ixxyxr/ope…
andybak Apr 16, 2024
b761664
Stub for text extrusion. Disable image extrusion for now as it doesn'…
andybak Apr 16, 2024
75793d6
Remove debug log
andybak Apr 16, 2024
e6db885
Change folder where open type fonts are looked for
andybak Apr 16, 2024
28cfff8
Refactor and simplify stroke drawing for Lua and Http APIs
andybak Apr 17, 2024
6e57852
Endpoint for drawing full SVG docs
andybak Apr 21, 2024
c673df0
API SVG fixes [CI BUILD]
andybak Apr 22, 2024
4597a97
Merge remote-tracking branch 'upstream/main' into experiments/moonsharp
andybak Apr 27, 2024
b942409
Merge remote-tracking branch 'upstream/main' into feature/plugin-scri…
andybak Apr 30, 2024
dd1dda2
Rename dither param to _Dissolve and ensure it's on all brush shaders
andybak May 1, 2024
68db335
Update example script to use _Dissolve
andybak May 1, 2024
54d63cd
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak May 1, 2024
76747f8
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak May 3, 2024
eb0a028
Post-merge fixes
andybak May 3, 2024
fe75f1a
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak May 3, 2024
9fcbd31
Post-merge fix
andybak May 5, 2024
c922e6d
Merge remote-tracking branch 'origin/feature/plugin-scripting' into f…
andybak May 5, 2024
e9dd487
Post-merge fixes
andybak May 5, 2024
e8c5bb4
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak May 19, 2024
82496b0
[CI BUILD]
andybak Jun 1, 2024
81df4e2
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak Aug 15, 2024
e919a51
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Sep 8, 2024
2492815
Fix button overlap
andybak Sep 8, 2024
40d30f9
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Sep 15, 2024
5517311
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak Sep 15, 2024
206ed65
Fix shaders (mostly the dissolve logic)
andybak Sep 15, 2024
3d781c1
Fix bubblewand dissolve
andybak Sep 15, 2024
a6901a9
Merge remote-tracking branch 'upstream/feature/plugin-scripting' into…
andybak Sep 15, 2024
54dab29
Fix bad merge on main scene
andybak Sep 15, 2024
4b20a56
Util to read current git branch
andybak Sep 25, 2024
ea10dba
Allow loading of bundled sketches with "tiltbrush://builtin/" prefix
andybak Sep 25, 2024
f051a8a
Tweak location and content of profiling summary
andybak Sep 25, 2024
bad1dad
Merge remote-tracking branch 'origin/feature/profile-bundled-sketches…
andybak Sep 25, 2024
b49ac7e
[CI BUILD]
andybak Oct 4, 2024
bca9dbf
Stroke debug command
andybak Oct 5, 2024
368e12c
Fix spelling
andybak Oct 5, 2024
64641a3
Add another fps bucket to profiler
andybak Oct 5, 2024
8b7ab35
Update Zapbox SDK (#770)
andybak Sep 26, 2024
6d2dbbf
gzip config.vdf before storing as a secret (#771)
mikeage Sep 26, 2024
48a3f78
Fix speling
andybak Sep 25, 2024
371e9e1
Include build string in profile summary. Add a 40fps bucket
andybak Sep 25, 2024
2f8db0c
Use mult compile flags for scripted shader properties
andybak Oct 5, 2024
4a3db8e
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak Oct 6, 2024
3e69c0f
Post-merge package changes
andybak Oct 6, 2024
f370722
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak Oct 9, 2024
9f38097
Set the default sdk back to openxr. Assorted unity changes
andybak Oct 9, 2024
0b05029
Fix Ballistic Missile script
andybak Oct 9, 2024
da61275
Refactor the api interface for controller actions
andybak Oct 10, 2024
bc08adc
Better up vector for scripted tool
andybak Oct 10, 2024
76abfeb
Scripts panel shouldn't start fixed
andybak Dec 14, 2024
c1cc8a3
Unity being unity
andybak Dec 14, 2024
b5e1ff0
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak Dec 14, 2024
6d45c06
Yet another Rider update
andybak Dec 14, 2024
f360aea
Make the console window a prefab
andybak Dec 14, 2024
e91b4dd
Basic ram logging for Android
andybak Dec 14, 2024
d2b49fd
ram log font size and bounding box
andybak Dec 14, 2024
e2f64fc
Merge remote-tracking branch 'origin/feature/ram-logging' into featur…
andybak Dec 14, 2024
ada8e60
Post-merge fix
andybak Dec 14, 2024
5916392
Lazy init of Lua stuff
andybak Dec 17, 2024
324762c
Make sure "New Sketch" cleans up lua stuff properly
andybak Dec 17, 2024
42e7c21
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak Dec 17, 2024
30c1628
Delete test.jpg
andybak Dec 18, 2024
bc14a39
Remove commented out update method
andybak Dec 18, 2024
8b775da
Delete .gitkeep
andybak Dec 18, 2024
6c93a74
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak Dec 22, 2024
7a9afdf
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Dec 22, 2024
7c31da2
Post-merge fixes
andybak Dec 22, 2024
4b8df0d
Post-merge fixes
andybak Dec 22, 2024
b8e5684
Merge remote-tracking branch 'origin/feature/plugin-scripting' into f…
andybak Dec 23, 2024
c8de1fd
Fix another merge issue
andybak Dec 23, 2024
4214e50
Modified English text for View-only mode (other languages are still n…
andybak Dec 30, 2024
62c7884
Always replace script placeholders in html even if Lua isn't initialized
andybak Jan 2, 2025
fdec044
Fix a null exception and ignore transform buffers if not initialized
andybak Jan 2, 2025
b85e2c5
typo
andybak Jan 2, 2025
8fc34de
Support enums for list widgets
andybak Jan 2, 2025
1032fb3
Fixes for enum picker widget
andybak Jan 2, 2025
667140d
Incremental GC is rather a necessity with the current plugin implemen…
andybak Jan 2, 2025
367eae9
See if this prevents the glitching when CPU load is high
andybak Dec 31, 2024
80aa43c
Fixes for new sketch with the scripting panel open
andybak Jan 2, 2025
20d0e73
Fix scale for scripted tool
andybak Jan 2, 2025
b1ed976
Apply jitter to toolscript output
andybak Jan 2, 2025
e5e99e6
Enable support for snapping when using scripted tools
andybak Jan 3, 2025
50e8ef9
Add/update example plugins and remove some duds
andybak Jan 5, 2025
f314720
dotnet-format
andybak Jan 5, 2025
5883a83
more dotnet-format
andybak Jan 5, 2025
f66ec1b
[CI BUILD]
andybak Jan 9, 2025
e84601e
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Jan 13, 2025
8ca807d
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak Jan 13, 2025
11174ea
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak Feb 18, 2025
4de5a94
Use a different material for extruded images
andybak Feb 18, 2025
7ae512e
WIP fix svg image handling when extruding
andybak Feb 18, 2025
3b50910
Fix a potential null
andybak Feb 21, 2025
54bc2fe
Don't spam the log
andybak Feb 21, 2025
fbcaf99
Update vectorgraphics package (our fork)
andybak Feb 21, 2025
df8e378
Fix typo
andybak Feb 21, 2025
7c59795
Downgrade some errors to warnings
andybak Feb 21, 2025
0ac967f
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Feb 27, 2025
cce3e98
Fix bad merge
andybak Feb 27, 2025
a968d5c
Merge remote-tracking branch 'origin/main' into feature/plugin-scripting
andybak Feb 27, 2025
357e55d
Fix duplicate packages after merge
andybak Feb 27, 2025
b7774c3
Post-merge automatic change
andybak Feb 27, 2025
b2df1f4
[CI BUILD]
andybak Feb 27, 2025
50254a8
[CI BUILD]
andybak Feb 27, 2025
7628e33
Packages update (to mostly match plugins branch)
andybak Mar 14, 2025
0c851e0
Fix compatibility with latest Polyhydra
andybak Mar 14, 2025
90362b7
Don't spam the log
andybak Mar 14, 2025
c935c1e
Stuff Unity changed
andybak Mar 14, 2025
8bdf3c4
Fix snip tool offset transform
andybak Mar 15, 2025
7460f22
Catch occasional null error when initializing
andybak Mar 15, 2025
d0530e9
Merge remote-tracking branch 'origin/feature/plugin-scripting' into f…
andybak Mar 15, 2025
093bf4e
Continue with warning if we get errors initializing LuaManager
andybak Mar 15, 2025
375b464
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Apr 21, 2025
050f574
Fix broken second op slider
andybak Apr 24, 2025
ae0c954
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak May 1, 2025
b15cb7d
Post-merge fixes
andybak May 1, 2025
a4b8f4e
Post-merge fixes
andybak May 1, 2025
79cf060
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak May 1, 2025
088c59c
Post-merge tweak
andybak May 1, 2025
a8c7bea
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Jun 25, 2025
5a11c82
post-merge fix
andybak Jun 26, 2025
50fb569
Another post-merge fix
andybak Jun 26, 2025
1a2e6ca
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Jun 26, 2025
c6d420f
[CI BUILD]
andybak Jun 26, 2025
9c5f802
dotnet format
andybak Jun 26, 2025
42367be
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Aug 28, 2025
959b74c
Method signature had changed
andybak Aug 28, 2025
795f7be
Remove empty prefab file from merge
andybak Aug 28, 2025
bf01f49
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Sep 10, 2025
4d2f7df
Update recipe seeding to new method
andybak Sep 10, 2025
0cec420
Missed renaming var instance here
andybak Sep 10, 2025
e927b14
Fix panels
andybak Sep 10, 2025
bce7a14
EditableModelManager had accidentally been removed
andybak Sep 10, 2025
26273c0
stopgap fix until we disentangle panel logic from shape creation logi…
andybak Sep 10, 2025
ad3949e
Merge remote-tracking branch 'origin/main' into feature/3d-shapes
andybak Sep 15, 2025
057528f
Center Labs Panel buttons
andybak Sep 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_InkDoubleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_InkDoubleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3}
m_Texture: {fileID: 2800000, guid: 17e2bcfa1203af74ea0cb72e33667888, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.23529412, g: 0.23529412, b: 0.23529412, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_InkSingleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_InkSingleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3}
m_Texture: {fileID: 2800000, guid: 17e2bcfa1203af74ea0cb72e33667888, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.23529412, g: 0.23529412, b: 0.23529412, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_OilPaintDoubleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_OilPaintDoubleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 432d5c408cd625945ab19bb572a6f8e4, type: 3}
m_Texture: {fileID: 2800000, guid: 78eb000bc8f2bef4f84b7aee5fe988c1, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.23529412, g: 0.23529412, b: 0.23529412, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_OilPaintSingleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_OilPaintSingleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 432d5c408cd625945ab19bb572a6f8e4, type: 3}
m_Texture: {fileID: 2800000, guid: 78eb000bc8f2bef4f84b7aee5fe988c1, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.23529412, g: 0.23529412, b: 0.23529412, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_PaperDoubleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_PaperDoubleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 72b554b36eb21d445a97a119717a00e9, type: 3}
m_Texture: {fileID: 2800000, guid: 6d67c6013e98da046b93edaa3384bb51, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.16
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.14117648, g: 0.14117648, b: 0.14117648, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_PaperSingleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_PaperSingleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 72b554b36eb21d445a97a119717a00e9, type: 3}
m_Texture: {fileID: 2800000, guid: 6d67c6013e98da046b93edaa3384bb51, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.16
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.14117648, g: 0.14117648, b: 0.14117648, a: 1}
m_BuildTextureStacks: []
9 changes: 6 additions & 3 deletions Assets/Materials/ModelTutorialGhost.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ModelTutorialGhost
m_Shader: {fileID: 4800000, guid: 9f2e62d534247cc4183f14aa0d7a810b, type: 3}
m_ShaderKeywords:
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -23,10 +24,12 @@ Material:
m_Texture: {fileID: 2800000, guid: c7a663eacfb5db7488d34ffe9c07736b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Intensity: 1
- _OutlineWidth: 0.02
m_Colors:
- _Color: {r: 0.303, g: 0.303, b: 0.303, a: 1}
- _Color: {r: 0.97949594, g: 0.97949594, b: 0.97949594, a: 1}
- _PulseColor: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
31 changes: 31 additions & 0 deletions Assets/Materials/ModelVertexColor.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
%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: ModelVertexColor
m_Shader: {fileID: 4800000, guid: 1b8b8f31013e5d54bb0ee76696c50b02, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Glossiness: 0.5
- _Metallic: 0
- _Saturation: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
8 changes: 8 additions & 0 deletions Assets/Materials/ModelVertexColor.mat.meta

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

Loading
Loading