From 89b75dd3ea48e732219a5351a6cf8425df1b044e Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Tue, 10 Aug 2021 11:05:39 +0100 Subject: [PATCH 1/8] Try adding experimental brushes --- .../TiltBrush/Assets/Brushes/AllBrushes.asset | 114 ++++++- .../Assets/Brushes/Basic/BlocksGem.meta | 8 + .../Brushes/Basic/BlocksGem/BlocksGem.asset | 26 ++ .../Basic/BlocksGem/BlocksGem.asset.meta | 8 + .../Brushes/Basic/BlocksGem/BlocksGem.mat | 88 +++++ .../Basic/BlocksGem/BlocksGem.mat.meta | 8 + .../Basic/BlocksGem/BlocksGem_16.asset | 26 ++ .../Basic/BlocksGem/BlocksGem_16.asset.meta | 8 + .../Brushes/Basic/BlocksGem/BlocksGem_16.mat | 88 +++++ .../Basic/BlocksGem/BlocksGem_16.mat.meta | 8 + .../Assets/Brushes/Basic/BlocksGlass.meta | 8 + .../Basic/BlocksGlass/BlocksGlass.asset | 26 ++ .../Basic/BlocksGlass/BlocksGlass.asset.meta | 8 + .../Brushes/Basic/BlocksGlass/BlocksGlass.mat | 86 +++++ .../Basic/BlocksGlass/BlocksGlass.mat.meta | 8 + .../Basic/BlocksGlass/BlocksGlass_16.asset | 26 ++ .../BlocksGlass/BlocksGlass_16.asset.meta | 8 + .../Basic/BlocksGlass/BlocksGlass_16.mat | 86 +++++ .../Basic/BlocksGlass/BlocksGlass_16.mat.meta | 8 + .../Assets/Brushes/Basic/BlocksPaper.meta | 8 + .../Basic/BlocksPaper/BlocksBasic_16.asset | 26 ++ .../BlocksPaper/BlocksBasic_16.asset.meta | 8 + .../Basic/BlocksPaper/BlocksBasic_16.mat | 79 +++++ .../Basic/BlocksPaper/BlocksBasic_16.mat.meta | 8 + .../Basic/BlocksPaper/BlocksPaper.asset | 26 ++ .../Basic/BlocksPaper/BlocksPaper.asset.meta | 8 + .../Brushes/Basic/BlocksPaper/BlocksPaper.mat | 79 +++++ .../Basic/BlocksPaper/BlocksPaper.mat.meta | 8 + .../Assets/Brushes/Basic/BubbleWand.meta | 8 + .../Basic/BubbleWand/BubbleWand_16.asset | 26 ++ .../Basic/BubbleWand/BubbleWand_16.asset.meta | 8 + .../Basic/BubbleWand/BubbleWand_16.mat | 51 +++ .../Basic/BubbleWand/BubbleWand_16.mat.meta | 8 + .../Brushes/Basic/Bubbles/Bubbles.asset | 5 +- .../Brushes/Basic/Bubbles/Bubbles.asset.meta | 2 - .../Assets/Brushes/Basic/Bubbles/Bubbles.mat | 5 +- .../Brushes/Basic/Bubbles/Bubbles.mat.meta | 4 +- .../Brushes/Basic/Bubbles/Bubbles.shader | 15 +- .../Brushes/Basic/Bubbles/Bubbles.shader.meta | 4 +- .../Brushes/Basic/Bubbles/Bubbles_16.asset | 26 ++ .../Basic/Bubbles/Bubbles_16.asset.meta | 8 + .../Brushes/Basic/Bubbles/Bubbles_16.mat | 90 +++++ .../Brushes/Basic/Bubbles/Bubbles_16.mat.meta | 8 + .../Basic/Bubbles/maintexture.png.meta | 89 ++++- .../Assets/Brushes/Basic/CandyCane.meta | 8 + .../Basic/CandyCane/CandyCane_16.asset | 26 ++ .../Basic/CandyCane/CandyCane_16.asset.meta | 8 + .../Brushes/Basic/CandyCane/CandyCane_16.mat | 37 ++ .../Basic/CandyCane/CandyCane_16.mat.meta | 8 + .../Brushes/Basic/CelVinyl/CelVinyl.shader | 18 +- .../Basic/CelVinyl/CelVinyl.shader.meta | 4 +- .../Brushes/Basic/CelVinyl/CelVinyl_16.asset | 5 +- .../Basic/CelVinyl/CelVinyl_16.asset.meta | 2 - .../Brushes/Basic/CelVinyl/CelVinyl_16.mat | 5 +- .../Basic/CelVinyl/CelVinyl_16.mat.meta | 4 +- .../Brushes/Basic/CelVinyl/main.png.meta | 92 ++++- .../Assets/Brushes/Basic/Charcoal.meta | 8 + .../Brushes/Basic/Charcoal/Charcoal_16.asset | 26 ++ .../Basic/Charcoal/Charcoal_16.asset.meta | 8 + .../Brushes/Basic/Charcoal/Charcoal_16.mat | 79 +++++ .../Basic/Charcoal/Charcoal_16.mat.meta | 8 + .../Basic/ChromaticWave/ChromaticWave.asset | 9 +- .../ChromaticWave/ChromaticWave.asset.meta | 2 - .../Basic/ChromaticWave/ChromaticWave.mat | 5 +- .../ChromaticWave/ChromaticWave.mat.meta | 4 +- .../Basic/ChromaticWave/ChromaticWave.shader | 13 +- .../ChromaticWave/ChromaticWave.shader.meta | 4 +- .../ChromaticWave/ChromaticWave_16.asset | 26 ++ .../ChromaticWave/ChromaticWave_16.asset.meta | 8 + .../Basic/ChromaticWave/ChromaticWave_16.mat | 85 +++++ .../ChromaticWave/ChromaticWave_16.mat.meta | 8 + .../CoarseBristles/CoarseBristles_15.asset | 5 +- .../CoarseBristles_15.asset.meta | 2 - .../CoarseBristles/CoarseBristles_15.mat | 8 +- .../CoarseBristles/CoarseBristles_15.mat.meta | 4 +- .../CoarseBristles/CoarseBristles_16.asset | 26 ++ .../CoarseBristles_16.asset.meta | 8 + .../CoarseBristles/CoarseBristles_16.mat | 78 +++++ .../CoarseBristles/CoarseBristles_16.mat.meta | 8 + .../Basic/CoarseBristles/leaves.png.meta | 96 +++++- .../CoarseBristles_0.asset | 5 +- .../CoarseBristles_0.asset.meta | 2 - .../CoarseBristles_0.mat | 5 +- .../CoarseBristles_0.mat.meta | 4 +- .../CoarseBristles_16.asset | 26 ++ .../CoarseBristles_16.asset.meta | 8 + .../CoarseBristles_16.mat | 77 +++++ .../CoarseBristles_16.mat.meta | 8 + .../Assets/Brushes/Basic/Comet/Comet.shader | 15 +- .../Brushes/Basic/Comet/Comet.shader.meta | 4 +- .../Assets/Brushes/Basic/Comet/Comet_16.asset | 5 +- .../Brushes/Basic/Comet/Comet_16.asset.meta | 2 - .../Assets/Brushes/Basic/Comet/Comet_16.mat | 5 +- .../Brushes/Basic/Comet/Comet_16.mat.meta | 4 +- .../Brushes/Basic/Comet/gradient.png.meta | 88 ++++- .../Assets/Brushes/Basic/Comet/main.png.meta | 88 ++++- .../Assets/Brushes/Basic/ConcaveHull.meta | 8 + .../Basic/ConcaveHull/ConcaveHull_16.asset | 26 ++ .../ConcaveHull/ConcaveHull_16.asset.meta | 8 + .../Basic/ConcaveHull/ConcaveHull_16.mat | 102 ++++++ .../Basic/ConcaveHull/ConcaveHull_16.mat.meta | 8 + .../Assets/Brushes/Basic/DanceFloor.meta | 8 + .../Basic/DanceFloor/DanceFloor.shader | 107 ++++++ .../Basic/DanceFloor/DanceFloor.shader.meta | 9 + .../Basic/DanceFloor/DanceFloor_16.asset | 26 ++ .../Basic/DanceFloor/DanceFloor_16.asset.meta | 8 + .../Basic/DanceFloor/DanceFloor_16.mat | 39 +++ .../Basic/DanceFloor/DanceFloor_16.mat.meta | 8 + .../Brushes/Basic/DanceFloor/maintexture.png | Bin 0 -> 26563 bytes .../Basic/DanceFloor/maintexture.png.meta | 121 +++++++ .../Basic/DiamondHull/DiamondHull.shader | 13 +- .../Basic/DiamondHull/DiamondHull.shader.meta | 4 +- .../Basic/DiamondHull/DiamondHull_16.asset | 9 +- .../DiamondHull/DiamondHull_16.asset.meta | 2 - .../Basic/DiamondHull/DiamondHull_16.mat | 5 +- .../Basic/DiamondHull/DiamondHull_16.mat.meta | 4 +- .../Brushes/Basic/DiamondHull/main.png.meta | 56 +++- .../Assets/Brushes/Basic/Digital.meta | 8 + .../Brushes/Basic/Digital/Digital_16.asset | 26 ++ .../Basic/Digital/Digital_16.asset.meta | 8 + .../Brushes/Basic/Digital/Digital_16.mat | 28 ++ .../Brushes/Basic/Digital/Digital_16.mat.meta | 8 + .../Assets/Brushes/Basic/Disco/Disco.asset | 5 +- .../Brushes/Basic/Disco/Disco.asset.meta | 2 - .../Assets/Brushes/Basic/Disco/Disco.mat | 5 +- .../Assets/Brushes/Basic/Disco/Disco.mat.meta | 4 +- .../Assets/Brushes/Basic/Disco/Disco.shader | 10 +- .../Brushes/Basic/Disco/Disco.shader.meta | 4 +- .../Assets/Brushes/Basic/Disco/Disco_16.asset | 26 ++ .../Brushes/Basic/Disco/Disco_16.asset.meta | 8 + .../Assets/Brushes/Basic/Disco/Disco_16.mat | 43 +++ .../Brushes/Basic/Disco/Disco_16.mat.meta | 8 + .../Brushes/Basic/DotMarker/DotMarker.asset | 5 +- .../Basic/DotMarker/DotMarker.asset.meta | 2 - .../Brushes/Basic/DotMarker/DotMarker.mat | 8 +- .../Basic/DotMarker/DotMarker.mat.meta | 4 +- .../Basic/DotMarker/DotMarker_16.asset | 26 ++ .../Basic/DotMarker/DotMarker_16.asset.meta | 8 + .../Brushes/Basic/DotMarker/DotMarker_16.mat | 78 +++++ .../Basic/DotMarker/DotMarker_16.mat.meta | 8 + .../Basic/DotMarker/maintexture.png.meta | 92 ++++- .../Assets/Brushes/Basic/Dots/Dots.asset | 5 +- .../Assets/Brushes/Basic/Dots/Dots.asset.meta | 2 - .../Assets/Brushes/Basic/Dots/Dots.mat | 5 +- .../Assets/Brushes/Basic/Dots/Dots.mat.meta | 4 +- .../Assets/Brushes/Basic/Dots/Dots.shader | 14 +- .../Brushes/Basic/Dots/Dots.shader.meta | 4 +- .../Assets/Brushes/Basic/Dots/Dots_16.asset | 26 ++ .../Brushes/Basic/Dots/Dots_16.asset.meta | 8 + .../Assets/Brushes/Basic/Dots/Dots_16.mat | 84 +++++ .../Brushes/Basic/Dots/Dots_16.mat.meta | 8 + .../Brushes/Basic/Dots/maintexture.png.meta | 89 ++++- .../Assets/Brushes/Basic/DoubleFlat.meta | 8 + .../Basic/DoubleFlat/DoubleFlat_16.asset | 26 ++ .../Basic/DoubleFlat/DoubleFlat_16.asset.meta | 8 + .../Basic/DoubleFlat/DoubleFlat_16.mat | 77 +++++ .../Basic/DoubleFlat/DoubleFlat_16.mat.meta | 8 + .../DiffuseNoTextureDoubleSided.shader | 12 +- .../DiffuseNoTextureDoubleSided.shader.meta | 4 +- .../DoubleTaperedFlat/DoubleTaperedFlat.asset | 5 +- .../DoubleTaperedFlat.asset.meta | 2 - .../DoubleTaperedFlat/DoubleTaperedFlat.mat | 8 +- .../DoubleTaperedFlat.mat.meta | 4 +- .../DoubleTaperedFlat_16.asset | 26 ++ .../DoubleTaperedFlat_16.asset.meta | 8 + .../DoubleTaperedFlat_16.mat | 49 +++ .../DoubleTaperedFlat_16.mat.meta | 8 + .../DoubleTaperedMarker.asset | 5 +- .../DoubleTaperedMarker.asset.meta | 2 - .../DoubleTaperedMarker.mat | 6 +- .../DoubleTaperedMarker.mat.meta | 4 +- .../DoubleTaperedMarker.shader | 22 +- .../DoubleTaperedMarker.shader.meta | 4 +- .../DoubleTaperedMarker_16.asset | 26 ++ .../DoubleTaperedMarker_16.asset.meta | 8 + .../DoubleTaperedMarker_16.mat | 48 +++ .../DoubleTaperedMarker_16.mat.meta | 8 + .../Assets/Brushes/Basic/Drafting.meta | 8 + .../Brushes/Basic/Drafting/Drafting_16.asset | 26 ++ .../Basic/Drafting/Drafting_16.asset.meta | 8 + .../Brushes/Basic/Drafting/Drafting_16.mat | 34 ++ .../Basic/Drafting/Drafting_16.mat.meta | 8 + .../Assets/Brushes/Basic/DryBrush.meta | 8 + .../Assets/Brushes/Basic/DryBrush/_16.asset | 26 ++ .../Brushes/Basic/DryBrush/_16.asset.meta | 8 + .../Assets/Brushes/Basic/DryBrush/_16.mat | 79 +++++ .../Brushes/Basic/DryBrush/_16.mat.meta | 8 + .../Brushes/Basic/DuctTape/DuctTape_15.asset | 5 +- .../Basic/DuctTape/DuctTape_15.asset.meta | 2 - .../Brushes/Basic/DuctTape/DuctTape_15.mat | 8 +- .../Basic/DuctTape/DuctTape_15.mat.meta | 4 +- .../Brushes/Basic/DuctTape/DuctTape_16.asset | 26 ++ .../Basic/DuctTape/DuctTape_16.asset.meta | 8 + .../Brushes/Basic/DuctTape/DuctTape_16.mat | 80 +++++ .../Basic/DuctTape/DuctTape_16.mat.meta | 8 + .../Brushes/Basic/DuctTape/main.png.meta | 96 +++++- .../Brushes/Basic/DuctTape/normal.png.meta | 94 +++++- .../Brushes/Basic/DuctTapeGeometry.meta | 8 + .../Brushes/Basic/DuctTapeGeometry/_16.asset | 26 ++ .../Basic/DuctTapeGeometry/_16.asset.meta | 8 + .../Brushes/Basic/DuctTapeGeometry/_16.mat | 80 +++++ .../Basic/DuctTapeGeometry/_16.mat.meta | 8 + .../DuctTapeSingleSided/DuctTape_0.asset | 5 +- .../DuctTapeSingleSided/DuctTape_0.asset.meta | 2 - .../Basic/DuctTapeSingleSided/DuctTape_0.mat | 8 +- .../DuctTapeSingleSided/DuctTape_0.mat.meta | 4 +- .../DuctTapeSingleSided/DuctTape_16.asset | 26 ++ .../DuctTape_16.asset.meta | 8 + .../Basic/DuctTapeSingleSided/DuctTape_16.mat | 80 +++++ .../DuctTapeSingleSided/DuctTape_16.mat.meta | 8 + .../Basic/Electricity/Electricity.asset | 5 +- .../Basic/Electricity/Electricity.asset.meta | 2 - .../Brushes/Basic/Electricity/Electricity.mat | 5 +- .../Basic/Electricity/Electricity.mat.meta | 4 +- .../Basic/Electricity/Electricity.shader | 63 +++- .../Basic/Electricity/Electricity.shader.meta | 4 +- .../Basic/Electricity/Electricity_16.asset | 26 ++ .../Electricity/Electricity_16.asset.meta | 8 + .../Basic/Electricity/Electricity_16.mat | 47 +++ .../Basic/Electricity/Electricity_16.mat.meta | 8 + .../Assets/Brushes/Basic/Embers/Embers.asset | 5 +- .../Brushes/Basic/Embers/Embers.asset.meta | 2 - .../Assets/Brushes/Basic/Embers/Embers.mat | 5 +- .../Brushes/Basic/Embers/Embers.mat.meta | 4 +- .../Assets/Brushes/Basic/Embers/Embers.shader | 30 +- .../Brushes/Basic/Embers/Embers.shader.meta | 4 +- .../Brushes/Basic/Embers/Embers_16.asset | 26 ++ .../Brushes/Basic/Embers/Embers_16.asset.meta | 8 + .../Assets/Brushes/Basic/Embers/Embers_16.mat | 90 +++++ .../Brushes/Basic/Embers/Embers_16.mat.meta | 8 + .../Brushes/Basic/Embers/maintexture.png | Bin 21353 -> 8219 bytes .../Brushes/Basic/Embers/maintexture.png.meta | 91 ++++- .../Assets/Brushes/Basic/FacetedTube.meta | 8 + .../Basic/FacetedTube/FacetedTube_16.asset | 26 ++ .../FacetedTube/FacetedTube_16.asset.meta | 8 + .../Basic/FacetedTube/FacetedTube_16.mat | 37 ++ .../Basic/FacetedTube/FacetedTube_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Fairy.meta | 8 + .../Assets/Brushes/Basic/Fairy/Fairy_16.asset | 26 ++ .../Brushes/Basic/Fairy/Fairy_16.asset.meta | 8 + .../Assets/Brushes/Basic/Fairy/Fairy_16.mat | 78 +++++ .../Brushes/Basic/Fairy/Fairy_16.mat.meta | 8 + .../Assets/Brushes/Basic/Feather.meta | 8 + .../Brushes/Basic/Feather/Feather_16.asset | 26 ++ .../Basic/Feather/Feather_16.asset.meta | 8 + .../Brushes/Basic/Feather/Feather_16.mat | 78 +++++ .../Brushes/Basic/Feather/Feather_16.mat.meta | 8 + .../Assets/Brushes/Basic/Fire/Fire.asset | 5 +- .../Assets/Brushes/Basic/Fire/Fire.asset.meta | 2 - .../Assets/Brushes/Basic/Fire/Fire.mat | 5 +- .../Assets/Brushes/Basic/Fire/Fire.mat.meta | 4 + .../Assets/Brushes/Basic/Fire/Fire.shader | 19 +- .../Brushes/Basic/Fire/Fire.shader.meta | 4 + .../Assets/Brushes/Basic/Fire/Fire_16.asset | 26 ++ .../Brushes/Basic/Fire/Fire_16.asset.meta | 8 + .../Assets/Brushes/Basic/Fire/Fire_16.mat | 37 ++ .../Brushes/Basic/Fire/Fire_16.mat.meta | 8 + .../Assets/Brushes/Basic/Fire/fire.png.meta | 89 ++++- .../TiltBrush/Assets/Brushes/Basic/Fire2.meta | 8 + .../Assets/Brushes/Basic/Fire2/Fire2_16.asset | 26 ++ .../Brushes/Basic/Fire2/Fire2_16.asset.meta | 8 + .../Assets/Brushes/Basic/Fire2/Fire2_16.mat | 47 +++ .../Brushes/Basic/Fire2/Fire2_16.mat.meta | 8 + .../Assets/Brushes/Basic/Flat/Flat_15.asset | 5 +- .../Brushes/Basic/Flat/Flat_15.asset.meta | 2 - .../Assets/Brushes/Basic/Flat/Flat_15.mat | 8 +- .../Brushes/Basic/Flat/Flat_15.mat.meta | 4 +- .../Assets/Brushes/Basic/Flat/Flat_16.asset | 26 ++ .../Brushes/Basic/Flat/Flat_16.asset.meta | 8 + .../Assets/Brushes/Basic/Flat/Flat_16.mat | 78 +++++ .../Brushes/Basic/Flat/Flat_16.mat.meta | 8 + .../Basic/FlatDeprecated/FlatDeprecated.asset | 5 +- .../FlatDeprecated/FlatDeprecated.asset.meta | 2 - .../Basic/FlatDeprecated/FlatDeprecated.mat | 5 +- .../FlatDeprecated/FlatDeprecated.mat.meta | 4 +- .../FlatDeprecated/FlatDeprecated_16.asset | 26 ++ .../FlatDeprecated_16.asset.meta | 8 + .../FlatDeprecated/FlatDeprecated_16.mat | 77 +++++ .../FlatDeprecated/FlatDeprecated_16.mat.meta | 8 + .../Basic/FlatSingleSided/Flat_0.asset | 5 +- .../Basic/FlatSingleSided/Flat_0.asset.meta | 2 - .../Brushes/Basic/FlatSingleSided/Flat_0.mat | 5 +- .../Basic/FlatSingleSided/Flat_0.mat.meta | 4 +- .../Basic/FlatSingleSided/Flat_16.asset | 26 ++ .../Basic/FlatSingleSided/Flat_16.asset.meta | 8 + .../Brushes/Basic/FlatSingleSided/Flat_16.mat | 77 +++++ .../Basic/FlatSingleSided/Flat_16.mat.meta | 8 + .../Assets/Brushes/Basic/Gouache.meta | 8 + .../Brushes/Basic/Gouache/Gouache_16.asset | 26 ++ .../Basic/Gouache/Gouache_16.asset.meta | 8 + .../Brushes/Basic/Gouache/Gouache_16.mat | 79 +++++ .../Brushes/Basic/Gouache/Gouache_16.mat.meta | 8 + .../Brushes/Basic/GouacheSingleSided.meta | 8 + .../Basic/GouacheSingleSided/Gouache_16.asset | 26 ++ .../GouacheSingleSided/Gouache_16.asset.meta | 8 + .../Basic/GouacheSingleSided/Gouache_16.mat | 79 +++++ .../GouacheSingleSided/Gouache_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Guts.meta | 8 + .../Assets/Brushes/Basic/Guts/Guts_16.asset | 26 ++ .../Brushes/Basic/Guts/Guts_16.asset.meta | 8 + .../Assets/Brushes/Basic/Guts/Guts_16.mat | 83 +++++ .../Brushes/Basic/Guts/Guts_16.mat.meta | 8 + .../Basic/Highlighter/AdditiveCutout.shader | 17 +- .../Highlighter/AdditiveCutout.shader.meta | 4 +- .../Basic/Highlighter/Highlighter.asset | 5 +- .../Basic/Highlighter/Highlighter.asset.meta | 2 - .../Brushes/Basic/Highlighter/Highlighter.mat | 9 +- .../Basic/Highlighter/Highlighter.mat.meta | 4 +- .../Basic/Highlighter/Highlighter_16.asset | 26 ++ .../Highlighter/Highlighter_16.asset.meta | 8 + .../Basic/Highlighter/Highlighter_16.mat | 50 +++ .../Basic/Highlighter/Highlighter_16.mat.meta | 8 + .../Basic/Highlighter/maintexture.png.meta | 96 +++++- .../Assets/Brushes/Basic/HolidayTree.meta | 8 + .../Basic/HolidayTree/HolidayTree_16.asset | 26 ++ .../HolidayTree/HolidayTree_16.asset.meta | 8 + .../Basic/HolidayTree/HolidayTree_16.mat | 37 ++ .../Basic/HolidayTree/HolidayTree_16.mat.meta | 8 + .../Brushes/Basic/HyperGrid/HyperGrid.asset | 5 +- .../Basic/HyperGrid/HyperGrid.asset.meta | 2 - .../Brushes/Basic/HyperGrid/HyperGrid.mat | 5 +- .../Basic/HyperGrid/HyperGrid.mat.meta | 4 +- .../Brushes/Basic/HyperGrid/HyperGrid.shader | 11 +- .../Basic/HyperGrid/HyperGrid.shader.meta | 4 +- .../Basic/HyperGrid/HyperGrid_16.asset | 26 ++ .../Basic/HyperGrid/HyperGrid_16.asset.meta | 8 + .../Brushes/Basic/HyperGrid/HyperGrid_16.mat | 39 +++ .../Basic/HyperGrid/HyperGrid_16.mat.meta | 8 + .../Basic/HyperGrid/maintexture.png.meta | 92 ++++- .../Hypercolor/HypercolorDoubleSided.shader | 34 +- .../HypercolorDoubleSided.shader.meta | 4 +- .../Hypercolor/HypercolorSingleSided.shader | 4 +- .../HypercolorSingleSided.shader.meta | 4 +- .../Basic/Hypercolor/Hypercolor_15.asset | 5 +- .../Basic/Hypercolor/Hypercolor_15.asset.meta | 2 - .../Basic/Hypercolor/Hypercolor_15.mat | 5 +- .../Basic/Hypercolor/Hypercolor_15.mat.meta | 4 +- .../Basic/Hypercolor/Hypercolor_16.asset | 26 ++ .../Basic/Hypercolor/Hypercolor_16.asset.meta | 8 + .../Basic/Hypercolor/Hypercolor_16.mat | 46 +++ .../Basic/Hypercolor/Hypercolor_16.mat.meta | 8 + .../Brushes/Basic/Hypercolor/main.png.meta | 89 ++++- .../Brushes/Basic/Hypercolor/normal.png.meta | 94 +++++- .../HypercolorSingleSided/Hypercolor_0.asset | 5 +- .../Hypercolor_0.asset.meta | 2 - .../HypercolorSingleSided/Hypercolor_0.mat | 5 +- .../Hypercolor_0.mat.meta | 4 +- .../HypercolorSingleSided/Hypercolor_16.asset | 26 ++ .../Hypercolor_16.asset.meta | 8 + .../HypercolorSingleSided/Hypercolor_16.mat | 46 +++ .../Hypercolor_16.mat.meta | 8 + .../Assets/Brushes/Basic/Icing/Icing_16.asset | 9 +- .../Brushes/Basic/Icing/Icing_16.asset.meta | 2 - .../Assets/Brushes/Basic/Icing/Icing_16.mat | 5 +- .../Brushes/Basic/Icing/Icing_16.mat.meta | 4 +- .../Brushes/Basic/Icing/normal.png.meta | 87 ++++- .../Assets/Brushes/Basic/Ink/Ink_15.asset | 5 +- .../Brushes/Basic/Ink/Ink_15.asset.meta | 2 - .../Assets/Brushes/Basic/Ink/Ink_15.mat | 8 +- .../Assets/Brushes/Basic/Ink/Ink_15.mat.meta | 4 +- .../Assets/Brushes/Basic/Ink/Ink_16.asset | 26 ++ .../Brushes/Basic/Ink/Ink_16.asset.meta | 8 + .../Assets/Brushes/Basic/Ink/Ink_16.mat | 80 +++++ .../Assets/Brushes/Basic/Ink/Ink_16.mat.meta | 8 + .../Brushes/Basic/Ink/maintexture.png.meta | 96 +++++- .../Basic/Ink/maintexture_normal.png.meta | 94 +++++- .../Assets/Brushes/Basic/InkGeometry.meta | 8 + .../Brushes/Basic/InkGeometry/_16.asset | 26 ++ .../Brushes/Basic/InkGeometry/_16.asset.meta | 8 + .../Assets/Brushes/Basic/InkGeometry/_16.mat | 80 +++++ .../Brushes/Basic/InkGeometry/_16.mat.meta | 8 + .../Brushes/Basic/InkSingleSided/Ink_0.asset | 5 +- .../Basic/InkSingleSided/Ink_0.asset.meta | 2 - .../Brushes/Basic/InkSingleSided/Ink_0.mat | 8 +- .../Basic/InkSingleSided/Ink_0.mat.meta | 4 +- .../Brushes/Basic/InkSingleSided/Ink_16.asset | 26 ++ .../Basic/InkSingleSided/Ink_16.asset.meta | 8 + .../Brushes/Basic/InkSingleSided/Ink_16.mat | 80 +++++ .../Basic/InkSingleSided/Ink_16.mat.meta | 8 + .../Assets/Brushes/Basic/KeijiroTube.meta | 8 + .../Basic/KeijiroTube/KeijiroTube_16.asset | 26 ++ .../KeijiroTube/KeijiroTube_16.asset.meta | 8 + .../Basic/KeijiroTube/KeijiroTube_16.mat | 79 +++++ .../Basic/KeijiroTube/KeijiroTube_16.mat.meta | 8 + .../Assets/Brushes/Basic/Lacewing.meta | 8 + .../Brushes/Basic/Lacewing/Lacewing_16.asset | 26 ++ .../Basic/Lacewing/Lacewing_16.asset.meta | 8 + .../Brushes/Basic/Lacewing/Lacewing_16.mat | 87 +++++ .../Basic/Lacewing/Lacewing_16.mat.meta | 8 + .../Assets/Brushes/Basic/LeakyPen.meta | 8 + .../Assets/Brushes/Basic/LeakyPen/_16.asset | 26 ++ .../Brushes/Basic/LeakyPen/_16.asset.meta | 8 + .../Assets/Brushes/Basic/LeakyPen/_16.mat | 90 +++++ .../Brushes/Basic/LeakyPen/_16.mat.meta | 8 + .../Brushes/Basic/Leaves/leaves.png.meta | 94 +++++- .../Brushes/Basic/Leaves/normal.png.meta | 94 +++++- .../Assets/Brushes/Basic/Leaves2.meta | 8 + .../Brushes/Basic/Leaves2/Leaves2_16.asset | 26 ++ .../Basic/Leaves2/Leaves2_16.asset.meta | 8 + .../Brushes/Basic/Leaves2/Leaves2_16.mat | 80 +++++ .../Brushes/Basic/Leaves2/Leaves2_16.mat.meta | 8 + .../Basic/LeavesSingleSided/Leaves_0.asset | 5 +- .../LeavesSingleSided/Leaves_0.asset.meta | 2 - .../Basic/LeavesSingleSided/Leaves_0.mat | 8 +- .../Basic/LeavesSingleSided/Leaves_0.mat.meta | 4 +- .../Basic/LeavesSingleSided/Leaves_16.asset | 26 ++ .../LeavesSingleSided/Leaves_16.asset.meta | 8 + .../Basic/LeavesSingleSided/Leaves_16.mat | 80 +++++ .../LeavesSingleSided/Leaves_16.mat.meta | 8 + .../Assets/Brushes/Basic/Light/Light.asset | 5 +- .../Brushes/Basic/Light/Light.asset.meta | 2 - .../Assets/Brushes/Basic/Light/Light.mat | 5 +- .../Assets/Brushes/Basic/Light/Light.mat.meta | 4 +- .../Assets/Brushes/Basic/Light/Light_16.asset | 26 ++ .../Brushes/Basic/Light/Light_16.asset.meta | 8 + .../Assets/Brushes/Basic/Light/Light_16.mat | 78 +++++ .../Brushes/Basic/Light/Light_16.mat.meta | 8 + .../Brushes/Basic/Light/maintexture.png.meta | 89 ++++- .../Brushes/Basic/LightWire/LightWire.asset | 5 +- .../Basic/LightWire/LightWire.asset.meta | 2 - .../Brushes/Basic/LightWire/LightWire.mat | 5 +- .../Basic/LightWire/LightWire.mat.meta | 4 +- .../Brushes/Basic/LightWire/LightWire.shader | 16 +- .../Basic/LightWire/LightWire.shader.meta | 4 +- .../Basic/LightWire/LightWire_16.asset | 26 ++ .../Basic/LightWire/LightWire_16.asset.meta | 8 + .../Brushes/Basic/LightWire/LightWire_16.mat | 43 +++ .../Basic/LightWire/LightWire_16.mat.meta | 8 + .../Basic/LightWire/maintexture.png.meta | 92 ++++- .../Assets/Brushes/Basic/LitWire.meta | 8 + .../Brushes/Basic/LitWire/Wire (Lit)_16.asset | 26 ++ .../Basic/LitWire/Wire (Lit)_16.asset.meta | 8 + .../Brushes/Basic/LitWire/Wire (Lit)_16.mat | 79 +++++ .../Basic/LitWire/Wire (Lit)_16.mat.meta | 8 + .../Brushes/Basic/Lofted/Lofted_16.asset | 9 +- .../Brushes/Basic/Lofted/Lofted_16.asset.meta | 2 - .../Assets/Brushes/Basic/Lofted/Lofted_16.mat | 5 +- .../Brushes/Basic/Lofted/Lofted_16.mat.meta | 4 +- .../Assets/Brushes/Basic/LoftedHueShift.meta | 8 + .../Lofted (Hue Shift)_16.asset | 26 ++ .../Lofted (Hue Shift)_16.asset.meta | 8 + .../LoftedHueShift/Lofted (Hue Shift)_16.mat | 43 +++ .../Lofted (Hue Shift)_16.mat.meta | 8 + .../Assets/Brushes/Basic/MarbledRainbow.meta | 8 + .../MarbledRainbow/Marbled Rainbow_16.asset | 26 ++ .../Marbled Rainbow_16.asset.meta | 8 + .../MarbledRainbow/Marbled Rainbow_16.mat | 87 +++++ .../Marbled Rainbow_16.mat.meta | 8 + .../Assets/Brushes/Basic/Marker/Marker.asset | 5 +- .../Brushes/Basic/Marker/Marker.asset.meta | 2 - .../Assets/Brushes/Basic/Marker/Marker.mat | 9 +- .../Brushes/Basic/Marker/Marker.mat.meta | 4 +- .../Brushes/Basic/Marker/Marker_16.asset | 26 ++ .../Brushes/Basic/Marker/Marker_16.asset.meta | 8 + .../Assets/Brushes/Basic/Marker/Marker_16.mat | 79 +++++ .../Brushes/Basic/Marker/Marker_16.mat.meta | 8 + .../Brushes/Basic/Marker/maintexture.png.meta | 96 +++++- .../Basic/MatteHull/MatteHull_16.asset | 9 +- .../Basic/MatteHull/MatteHull_16.asset.meta | 2 - .../Brushes/Basic/MatteHull/MatteHull_16.mat | 5 +- .../Basic/MatteHull/MatteHull_16.mat.meta | 4 +- .../Assets/Brushes/Basic/Muscle.meta | 8 + .../Brushes/Basic/Muscle/Muscle_16.asset | 26 ++ .../Brushes/Basic/Muscle/Muscle_16.asset.meta | 8 + .../Assets/Brushes/Basic/Muscle/Muscle_16.mat | 83 +++++ .../Brushes/Basic/Muscle/Muscle_16.mat.meta | 8 + .../Assets/Brushes/Basic/MylarTube.meta | 8 + .../Basic/MylarTube/MylarTube_16.asset | 26 ++ .../Basic/MylarTube/MylarTube_16.asset.meta | 8 + .../Brushes/Basic/MylarTube/MylarTube_16.mat | 54 +++ .../Basic/MylarTube/MylarTube_16.mat.meta | 8 + .../Brushes/Basic/NeonPulse/NeonPulse.asset | 9 +- .../Basic/NeonPulse/NeonPulse.asset.meta | 2 - .../Brushes/Basic/NeonPulse/NeonPulse.mat | 5 +- .../Basic/NeonPulse/NeonPulse.mat.meta | 4 +- .../Basic/NeonPulse/NeonPulse_16.asset | 26 ++ .../Basic/NeonPulse/NeonPulse_16.asset.meta | 8 + .../Brushes/Basic/NeonPulse/NeonPulse_16.mat | 36 ++ .../Basic/NeonPulse/NeonPulse_16.mat.meta | 8 + .../Brushes/Basic/OilPaint/OilPaint_15.asset | 5 +- .../Basic/OilPaint/OilPaint_15.asset.meta | 2 - .../Brushes/Basic/OilPaint/OilPaint_15.mat | 8 +- .../Basic/OilPaint/OilPaint_15.mat.meta | 4 +- .../Brushes/Basic/OilPaint/OilPaint_16.asset | 26 ++ .../Basic/OilPaint/OilPaint_16.asset.meta | 8 + .../Brushes/Basic/OilPaint/OilPaint_16.mat | 80 +++++ .../Basic/OilPaint/OilPaint_16.mat.meta | 8 + .../Brushes/Basic/OilPaint/main.png.meta | 96 +++++- .../Brushes/Basic/OilPaint/normal.png.meta | 94 +++++- .../OilPaintSingleSided/OilPaint_0.asset | 5 +- .../OilPaintSingleSided/OilPaint_0.asset.meta | 2 - .../Basic/OilPaintSingleSided/OilPaint_0.mat | 8 +- .../OilPaintSingleSided/OilPaint_0.mat.meta | 4 +- .../OilPaintSingleSided/OilPaint_16.asset | 26 ++ .../OilPaint_16.asset.meta | 8 + .../Basic/OilPaintSingleSided/OilPaint_16.mat | 80 +++++ .../OilPaintSingleSided/OilPaint_16.mat.meta | 8 + .../Assets/Brushes/Basic/Paper/Paper_15.asset | 5 +- .../Brushes/Basic/Paper/Paper_15.asset.meta | 2 - .../Assets/Brushes/Basic/Paper/Paper_15.mat | 8 +- .../Brushes/Basic/Paper/Paper_15.mat.meta | 4 +- .../Assets/Brushes/Basic/Paper/Paper_16.asset | 26 ++ .../Brushes/Basic/Paper/Paper_16.asset.meta | 8 + .../Assets/Brushes/Basic/Paper/Paper_16.mat | 80 +++++ .../Brushes/Basic/Paper/Paper_16.mat.meta | 8 + .../Assets/Brushes/Basic/Paper/bump.png.meta | 54 ++- .../Assets/Brushes/Basic/Paper/main.png.meta | 96 +++++- .../Basic/PaperSingleSided/Paper_0.asset | 5 +- .../Basic/PaperSingleSided/Paper_0.asset.meta | 2 - .../Basic/PaperSingleSided/Paper_0.mat | 8 +- .../Basic/PaperSingleSided/Paper_0.mat.meta | 4 +- .../Basic/PaperSingleSided/Paper_16.asset | 26 ++ .../PaperSingleSided/Paper_16.asset.meta | 8 + .../Basic/PaperSingleSided/Paper_16.mat | 80 +++++ .../Basic/PaperSingleSided/Paper_16.mat.meta | 8 + .../Assets/Brushes/Basic/Petal/Petal.shader | 14 +- .../Brushes/Basic/Petal/Petal.shader.meta | 4 +- .../Assets/Brushes/Basic/Petal/Petal_16.asset | 9 +- .../Brushes/Basic/Petal/Petal_16.asset.meta | 2 - .../Assets/Brushes/Basic/Petal/Petal_16.mat | 5 +- .../Brushes/Basic/Petal/Petal_16.mat.meta | 4 +- .../TiltBrush/Assets/Brushes/Basic/Plait.meta | 8 + .../Brushes/Basic/Plait/Braid3_16.asset | 26 ++ .../Brushes/Basic/Plait/Braid3_16.asset.meta | 8 + .../Assets/Brushes/Basic/Plait/Braid3_16.mat | 37 ++ .../Brushes/Basic/Plait/Braid3_16.mat.meta | 8 + .../Assets/Brushes/Basic/Plasma/Plasma.asset | 5 +- .../Brushes/Basic/Plasma/Plasma.asset.meta | 2 - .../Assets/Brushes/Basic/Plasma/Plasma.mat | 5 +- .../Brushes/Basic/Plasma/Plasma.mat.meta | 4 +- .../Assets/Brushes/Basic/Plasma/Plasma.shader | 13 +- .../Brushes/Basic/Plasma/Plasma.shader.meta | 4 +- .../Brushes/Basic/Plasma/Plasma_16.asset | 26 ++ .../Brushes/Basic/Plasma/Plasma_16.asset.meta | 8 + .../Assets/Brushes/Basic/Plasma/Plasma_16.mat | 47 +++ .../Brushes/Basic/Plasma/Plasma_16.mat.meta | 8 + .../Assets/Brushes/Basic/Plasma/main.png.meta | 96 +++++- .../TiltBrush/Assets/Brushes/Basic/Race.meta | 8 + .../Assets/Brushes/Basic/Race/Race_16.asset | 26 ++ .../Brushes/Basic/Race/Race_16.asset.meta | 8 + .../Assets/Brushes/Basic/Race/Race_16.mat | 28 ++ .../Brushes/Basic/Race/Race_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Rain.meta | 8 + .../Assets/Brushes/Basic/Rain/Rain_16.asset | 26 ++ .../Brushes/Basic/Rain/Rain_16.asset.meta | 8 + .../Assets/Brushes/Basic/Rain/Rain_16.mat | 88 +++++ .../Brushes/Basic/Rain/Rain_16.mat.meta | 8 + .../Brushes/Basic/Rainbow/Rainbow.asset | 5 +- .../Brushes/Basic/Rainbow/Rainbow.asset.meta | 2 - .../Assets/Brushes/Basic/Rainbow/Rainbow.mat | 5 +- .../Brushes/Basic/Rainbow/Rainbow.mat.meta | 3 + .../Brushes/Basic/Rainbow/Rainbow.shader | 317 ++++++++++-------- .../Brushes/Basic/Rainbow/Rainbow.shader.meta | 3 + .../Brushes/Basic/Rainbow/Rainbow_16.asset | 26 ++ .../Basic/Rainbow/Rainbow_16.asset.meta | 8 + .../Brushes/Basic/Rainbow/Rainbow_16.mat | 85 +++++ .../Brushes/Basic/Rainbow/Rainbow_16.mat.meta | 8 + .../Assets/Brushes/Basic/RisingBubbles.meta | 8 + .../RisingBubbles/Rising Bubbles_16.asset | 26 ++ .../Rising Bubbles_16.asset.meta | 8 + .../Basic/RisingBubbles/Rising Bubbles_16.mat | 91 +++++ .../RisingBubbles/Rising Bubbles_16.mat.meta | 8 + .../Basic/ShinyHull/ShinyHull_16.asset | 9 +- .../Basic/ShinyHull/ShinyHull_16.asset.meta | 2 - .../Brushes/Basic/ShinyHull/ShinyHull_16.mat | 5 +- .../Basic/ShinyHull/ShinyHull_16.mat.meta | 4 +- .../Assets/Brushes/Basic/SingleSided.meta | 8 + .../Basic/SingleSided/SingleSided_16.asset | 26 ++ .../SingleSided/SingleSided_16.asset.meta | 8 + .../Basic/SingleSided/SingleSided_16.mat | 77 +++++ .../Basic/SingleSided/SingleSided_16.mat.meta | 8 + .../Assets/Brushes/Basic/Smoke/Smoke.asset | 5 +- .../Brushes/Basic/Smoke/Smoke.asset.meta | 2 - .../Assets/Brushes/Basic/Smoke/Smoke.mat | 5 +- .../Assets/Brushes/Basic/Smoke/Smoke.mat.meta | 4 +- .../Assets/Brushes/Basic/Smoke/Smoke.shader | 15 +- .../Brushes/Basic/Smoke/Smoke.shader.meta | 4 +- .../Assets/Brushes/Basic/Smoke/Smoke_16.asset | 26 ++ .../Brushes/Basic/Smoke/Smoke_16.asset.meta | 8 + .../Assets/Brushes/Basic/Smoke/Smoke_16.mat | 90 +++++ .../Brushes/Basic/Smoke/Smoke_16.mat.meta | 8 + .../Brushes/Basic/Smoke/maintexture.png | Bin 68701 -> 65492 bytes .../Brushes/Basic/Smoke/maintexture.png.meta | 89 ++++- .../Assets/Brushes/Basic/SmoothHull.meta | 8 + .../Basic/SmoothHull/SmoothHull_16.asset | 26 ++ .../Basic/SmoothHull/SmoothHull_16.asset.meta | 8 + .../Basic/SmoothHull/SmoothHull_16.mat | 94 ++++++ .../Basic/SmoothHull/SmoothHull_16.mat.meta | 8 + .../Assets/Brushes/Basic/Snow/Snow.asset | 5 +- .../Assets/Brushes/Basic/Snow/Snow.asset.meta | 2 - .../Assets/Brushes/Basic/Snow/Snow.mat | 5 +- .../Assets/Brushes/Basic/Snow/Snow.mat.meta | 4 +- .../Assets/Brushes/Basic/Snow/Snow.shader | 14 +- .../Brushes/Basic/Snow/Snow.shader.meta | 4 +- .../Assets/Brushes/Basic/Snow/Snow_16.asset | 26 ++ .../Brushes/Basic/Snow/Snow_16.asset.meta | 8 + .../Assets/Brushes/Basic/Snow/Snow_16.mat | 90 +++++ .../Brushes/Basic/Snow/Snow_16.mat.meta | 8 + .../Brushes/Basic/Snow/maintexture.png.meta | 96 +++++- .../Assets/Brushes/Basic/Snowflake.meta | 8 + .../Basic/Snowflake/Snowflake_16.asset | 26 ++ .../Basic/Snowflake/Snowflake_16.asset.meta | 8 + .../Brushes/Basic/Snowflake/Snowflake_16.mat | 37 ++ .../Basic/Snowflake/Snowflake_16.mat.meta | 8 + .../SoftHighlighter/SoftHighlighter.asset | 5 +- .../SoftHighlighter.asset.meta | 2 - .../Basic/SoftHighlighter/SoftHighlighter.mat | 5 +- .../SoftHighlighter/SoftHighlighter.mat.meta | 4 +- .../SoftHighlighter/SoftHighlighter.shader | 21 +- .../SoftHighlighter.shader.meta | 4 +- .../SoftHighlighter/SoftHighlighter_16.asset | 26 ++ .../SoftHighlighter_16.asset.meta | 8 + .../SoftHighlighter/SoftHighlighter_16.mat | 33 ++ .../SoftHighlighter_16.mat.meta | 8 + .../SoftHighlighter/maintexture.png.meta | 92 ++++- .../TiltBrush/Assets/Brushes/Basic/Space.meta | 8 + .../Assets/Brushes/Basic/Space/Space_16.asset | 26 ++ .../Brushes/Basic/Space/Space_16.asset.meta | 8 + .../Assets/Brushes/Basic/Space/Space_16.mat | 28 ++ .../Brushes/Basic/Space/Space_16.mat.meta | 8 + .../Assets/Brushes/Basic/Sparks.meta | 8 + .../Brushes/Basic/Sparks/Sparks_16.asset | 26 ++ .../Brushes/Basic/Sparks/Sparks_16.asset.meta | 8 + .../Assets/Brushes/Basic/Sparks/Sparks_16.mat | 83 +++++ .../Brushes/Basic/Sparks/Sparks_16.mat.meta | 8 + .../Brushes/Basic/Spikes/Spikes_16.asset | 9 +- .../Brushes/Basic/Spikes/Spikes_16.asset.meta | 2 - .../Assets/Brushes/Basic/Spikes/Spikes_16.mat | 5 +- .../Brushes/Basic/Spikes/Spikes_16.mat.meta | 4 +- .../Brushes/Basic/Splatter/Splatter_15.asset | 5 +- .../Basic/Splatter/Splatter_15.asset.meta | 2 - .../Brushes/Basic/Splatter/Splatter_15.mat | 5 +- .../Basic/Splatter/Splatter_15.mat.meta | 4 +- .../Brushes/Basic/Splatter/Splatter_16.asset | 26 ++ .../Basic/Splatter/Splatter_16.asset.meta | 8 + .../Brushes/Basic/Splatter/Splatter_16.mat | 77 +++++ .../Basic/Splatter/Splatter_16.mat.meta | 8 + .../Brushes/Basic/Splatter/main.png.meta | 96 +++++- .../SplatterSingleSided/Splatter_0.asset | 5 +- .../SplatterSingleSided/Splatter_0.asset.meta | 2 - .../Basic/SplatterSingleSided/Splatter_0.mat | 5 +- .../SplatterSingleSided/Splatter_0.mat.meta | 4 +- .../SplatterSingleSided/Splatter_16.asset | 26 ++ .../Splatter_16.asset.meta | 8 + .../Basic/SplatterSingleSided/Splatter_16.mat | 77 +++++ .../SplatterSingleSided/Splatter_16.mat.meta | 8 + .../Brushes/Basic/Square3DPrintBrush.meta | 8 + .../3D Printing Brush_16.asset | 26 ++ .../3D Printing Brush_16.asset.meta | 8 + .../3D Printing Brush_16.mat | 50 +++ .../3D Printing Brush_16.mat.meta | 8 + .../Assets/Brushes/Basic/SquarePaper.meta | 8 + .../Basic/SquarePaper/SquarePaper_16.asset | 26 ++ .../SquarePaper/SquarePaper_16.asset.meta | 8 + .../Basic/SquarePaper/SquarePaper_16.mat | 79 +++++ .../Basic/SquarePaper/SquarePaper_16.mat.meta | 8 + .../Assets/Brushes/Basic/Stars/Stars.asset | 5 +- .../Brushes/Basic/Stars/Stars.asset.meta | 2 - .../Assets/Brushes/Basic/Stars/Stars.mat | 5 +- .../Assets/Brushes/Basic/Stars/Stars.mat.meta | 4 +- .../Assets/Brushes/Basic/Stars/Stars.shader | 13 +- .../Brushes/Basic/Stars/Stars.shader.meta | 4 +- .../Assets/Brushes/Basic/Stars/Stars_16.asset | 26 ++ .../Brushes/Basic/Stars/Stars_16.asset.meta | 8 + .../Assets/Brushes/Basic/Stars/Stars_16.mat | 86 +++++ .../Brushes/Basic/Stars/Stars_16.mat.meta | 8 + .../Brushes/Basic/Stars/maintexture.png | Bin 48941 -> 39241 bytes .../Brushes/Basic/Stars/maintexture.png.meta | 104 +++++- .../Brushes/Basic/Streamers/Streamers.asset | 5 +- .../Basic/Streamers/Streamers.asset.meta | 2 - .../Brushes/Basic/Streamers/Streamers.mat | 5 +- .../Basic/Streamers/Streamers.mat.meta | 4 +- .../Brushes/Basic/Streamers/Streamers.shader | 15 +- .../Basic/Streamers/Streamers.shader.meta | 4 +- .../Basic/Streamers/Streamers_16.asset | 26 ++ .../Basic/Streamers/Streamers_16.asset.meta | 8 + .../Brushes/Basic/Streamers/Streamers_16.mat | 37 ++ .../Basic/Streamers/Streamers_16.mat.meta | 8 + .../Brushes/Basic/Streamers/main.png.meta | 42 ++- .../Assets/Brushes/Basic/Taffy/Taffy.asset | 5 +- .../Brushes/Basic/Taffy/Taffy.asset.meta | 2 - .../Assets/Brushes/Basic/Taffy/Taffy.mat | 8 +- .../Assets/Brushes/Basic/Taffy/Taffy.mat.meta | 4 +- .../Assets/Brushes/Basic/Taffy/Taffy_16.asset | 26 ++ .../Brushes/Basic/Taffy/Taffy_16.asset.meta | 8 + .../Assets/Brushes/Basic/Taffy/Taffy_16.mat | 78 +++++ .../Brushes/Basic/Taffy/Taffy_16.mat.meta | 8 + .../Assets/Brushes/Basic/Taffy/main.png.meta | 96 +++++- .../Basic/TaperedFlat/TaperedFlat_15.asset | 5 +- .../TaperedFlat/TaperedFlat_15.asset.meta | 2 - .../Basic/TaperedFlat/TaperedFlat_15.mat | 8 +- .../Basic/TaperedFlat/TaperedFlat_15.mat.meta | 4 +- .../Basic/TaperedFlat/TaperedFlat_16.asset | 26 ++ .../TaperedFlat/TaperedFlat_16.asset.meta | 8 + .../Basic/TaperedFlat/TaperedFlat_16.mat | 78 +++++ .../Basic/TaperedFlat/TaperedFlat_16.mat.meta | 8 + .../Basic/TaperedFlat/maintexture.png.meta | 92 ++++- .../TaperedFlat_0.asset | 5 +- .../TaperedFlat_0.asset.meta | 2 - .../TaperedFlatSingleSided/TaperedFlat_0.mat | 5 +- .../TaperedFlat_0.mat.meta | 4 +- .../TaperedFlat_16.asset | 26 ++ .../TaperedFlat_16.asset.meta | 8 + .../TaperedFlatSingleSided/TaperedFlat_16.mat | 77 +++++ .../TaperedFlat_16.mat.meta | 8 + .../Assets/Brushes/Basic/TaperedHueShift.meta | 8 + .../TaperedHueShift/TaperedHueShift_16.asset | 26 ++ .../TaperedHueShift_16.asset.meta | 8 + .../TaperedHueShift/TaperedHueShift_16.mat | 78 +++++ .../TaperedHueShift_16.mat.meta | 8 + .../Basic/TaperedMarker/TaperedMarker.asset | 5 +- .../TaperedMarker/TaperedMarker.asset.meta | 2 - .../Basic/TaperedMarker/TaperedMarker.mat | 9 +- .../TaperedMarker/TaperedMarker.mat.meta | 4 +- .../TaperedMarker/TaperedMarker_16.asset | 26 ++ .../TaperedMarker/TaperedMarker_16.asset.meta | 8 + .../Basic/TaperedMarker/TaperedMarker_16.mat | 79 +++++ .../TaperedMarker/TaperedMarker_16.mat.meta | 8 + .../Basic/TaperedMarker/maintexture.png.meta | 92 ++++- .../TaperedMarker_Flat.asset | 5 +- .../TaperedMarker_Flat.asset.meta | 2 - .../TaperedMarker_Flat/TaperedMarker_Flat.mat | 5 +- .../TaperedMarker_Flat.mat.meta | 4 +- .../TaperedMarker_Flat_16.asset | 26 ++ .../TaperedMarker_Flat_16.asset.meta | 8 + .../TaperedMarker_Flat_16.mat | 77 +++++ .../TaperedMarker_Flat_16.mat.meta | 8 + .../Assets/Brushes/Basic/TaperedWire.meta | 8 + .../Basic/TaperedWire/TaperedWire_16.asset | 26 ++ .../TaperedWire/TaperedWire_16.asset.meta | 8 + .../Basic/TaperedWire/TaperedWire_16.mat | 79 +++++ .../Basic/TaperedWire/TaperedWire_16.mat.meta | 8 + .../Assets/Brushes/Basic/ThickGeometry.meta | 8 + .../ThickGeometry/ThickGeometry_16.asset | 26 ++ .../ThickGeometry/ThickGeometry_16.asset.meta | 8 + .../Basic/ThickGeometry/ThickGeometry_16.mat | 80 +++++ .../ThickGeometry/ThickGeometry_16.mat.meta | 8 + .../Basic/ThickPaint/ThickPaint_15.asset | 5 +- .../Basic/ThickPaint/ThickPaint_15.asset.meta | 2 - .../Basic/ThickPaint/ThickPaint_15.mat | 8 +- .../Basic/ThickPaint/ThickPaint_15.mat.meta | 4 +- .../Basic/ThickPaint/ThickPaint_16.asset | 26 ++ .../Basic/ThickPaint/ThickPaint_16.asset.meta | 8 + .../Basic/ThickPaint/ThickPaint_16.mat | 80 +++++ .../Basic/ThickPaint/ThickPaint_16.mat.meta | 8 + .../Basic/ThickPaint/streakystroke.png.meta | 85 ++++- .../ThickPaint/streakystroke_bump.png.meta | 87 ++++- .../ThickPaintSingleSided/ThickPaint_0.asset | 5 +- .../ThickPaint_0.asset.meta | 2 - .../ThickPaintSingleSided/ThickPaint_0.mat | 8 +- .../ThickPaint_0.mat.meta | 4 +- .../ThickPaintSingleSided/ThickPaint_16.asset | 26 ++ .../ThickPaint_16.asset.meta | 8 + .../ThickPaintSingleSided/ThickPaint_16.mat | 80 +++++ .../ThickPaint_16.mat.meta | 8 + .../Assets/Brushes/Basic/Toon/Toon.asset | 5 +- .../Assets/Brushes/Basic/Toon/Toon.asset.meta | 2 - .../Assets/Brushes/Basic/Toon/Toon.mat | 5 +- .../Assets/Brushes/Basic/Toon/Toon.mat.meta | 4 +- .../Assets/Brushes/Basic/Toon/Toon.shader | 34 +- .../Brushes/Basic/Toon/Toon.shader.meta | 4 +- .../Assets/Brushes/Basic/Toon/Toon_16.asset | 26 ++ .../Brushes/Basic/Toon/Toon_16.asset.meta | 8 + .../Assets/Brushes/Basic/Toon/Toon_16.mat | 37 ++ .../Brushes/Basic/Toon/Toon_16.mat.meta | 8 + .../Assets/Brushes/Basic/TubeAdditive.meta | 8 + .../Basic/TubeAdditive/TubeAdditive_16.asset | 26 ++ .../TubeAdditive/TubeAdditive_16.asset.meta | 8 + .../Basic/TubeAdditive/TubeAdditive_16.mat | 34 ++ .../TubeAdditive/TubeAdditive_16.mat.meta | 8 + .../Brushes/Basic/TubeToonInverted.meta | 8 + .../TubeToonInverted/TubeToonInverted.shader | 102 ++++++ .../TubeToonInverted.shader.meta | 9 + .../TubeToonInverted_16.asset | 26 ++ .../TubeToonInverted_16.asset.meta | 8 + .../TubeToonInverted/TubeToonInverted_16.mat | 37 ++ .../TubeToonInverted_16.mat.meta | 8 + .../Basic/UnlitHull/UnlitHull_16.asset | 9 +- .../Basic/UnlitHull/UnlitHull_16.asset.meta | 2 - .../Brushes/Basic/UnlitHull/UnlitHull_16.mat | 5 +- .../Basic/UnlitHull/UnlitHull_16.mat.meta | 4 +- .../Brushes/Basic/VelvetInk/VelvetInk.asset | 5 +- .../Basic/VelvetInk/VelvetInk.asset.meta | 2 - .../Brushes/Basic/VelvetInk/VelvetInk.mat | 5 +- .../Basic/VelvetInk/VelvetInk.mat.meta | 4 +- .../Brushes/Basic/VelvetInk/VelvetInk.shader | 17 +- .../Basic/VelvetInk/VelvetInk.shader.meta | 4 +- .../Basic/VelvetInk/VelvetInk_16.asset | 26 ++ .../Basic/VelvetInk/VelvetInk_16.asset.meta | 8 + .../Brushes/Basic/VelvetInk/VelvetInk_16.mat | 27 ++ .../Basic/VelvetInk/VelvetInk_16.mat.meta | 8 + .../Basic/VelvetInk/maintexture.png.meta | 96 +++++- .../Brushes/Basic/Waveform/Waveform.asset | 5 +- .../Basic/Waveform/Waveform.asset.meta | 2 - .../Brushes/Basic/Waveform/Waveform.mat | 5 +- .../Brushes/Basic/Waveform/Waveform.mat.meta | 4 +- .../Brushes/Basic/Waveform/Waveform.shader | 13 +- .../Basic/Waveform/Waveform.shader.meta | 4 +- .../Brushes/Basic/Waveform/Waveform_16.asset | 26 ++ .../Basic/Waveform/Waveform_16.asset.meta | 8 + .../Brushes/Basic/Waveform/Waveform_16.mat | 36 ++ .../Basic/Waveform/Waveform_16.mat.meta | 8 + .../Brushes/Basic/Waveform/waveform.png.meta | 59 +++- .../Assets/Brushes/Basic/WaveformFFT.meta | 8 + .../Basic/WaveformFFT/WaveformFFT.shader | 96 ++++++ .../Basic/WaveformFFT/WaveformFFT.shader.meta | 9 + .../Basic/WaveformFFT/WaveformFFT_16.asset | 26 ++ .../WaveformFFT/WaveformFFT_16.asset.meta | 8 + .../Basic/WaveformFFT/WaveformFFT_16.mat | 36 ++ .../Basic/WaveformFFT/WaveformFFT_16.mat.meta | 8 + .../Brushes/Basic/WaveformParticles.meta | 8 + .../WaveformParticles.shader | 109 ++++++ .../WaveformParticles.shader.meta | 9 + .../WaveformParticles_16.asset | 26 ++ .../WaveformParticles_16.asset.meta | 8 + .../WaveformParticles_16.mat | 39 +++ .../WaveformParticles_16.mat.meta | 8 + .../Basic/WaveformParticles/maintexture.png | Bin 0 -> 16908 bytes .../WaveformParticles/maintexture.png.meta | 121 +++++++ .../Basic/WaveformPulse/NeonPulse.shader | 110 +++--- .../Basic/WaveformPulse/NeonPulse.shader.meta | 4 +- .../Brushes/Basic/WaveformPulse/main.png.meta | 92 ++++- .../Assets/Brushes/Basic/WaveformTube.meta | 8 + .../Basic/WaveformTube/WaveformTube.shader | 83 +++++ .../WaveformTube/WaveformTube.shader.meta | 9 + .../Basic/WaveformTube/WaveformTube_16.asset | 26 ++ .../WaveformTube/WaveformTube_16.asset.meta | 8 + .../Basic/WaveformTube/WaveformTube_16.mat | 36 ++ .../WaveformTube/WaveformTube_16.mat.meta | 8 + .../Brushes/Basic/WaveformTube/waveform.png | Bin 0 -> 16401 bytes .../Basic/WaveformTube/waveform.png.meta | 88 +++++ .../Brushes/Basic/WetPaint/WetPaint_16.asset | 5 +- .../Basic/WetPaint/WetPaint_16.asset.meta | 2 - .../Brushes/Basic/WetPaint/WetPaint_16.mat | 8 +- .../Basic/WetPaint/WetPaint_16.mat.meta | 4 +- .../Brushes/Basic/WetPaint/main.png.meta | 89 ++++- .../Brushes/Basic/WetPaint/normal.png.meta | 87 ++++- .../WetPaintSingleSided/WetPaint_16.asset | 26 ++ .../WetPaint_16.asset.meta | 8 + .../Basic/WetPaintSingleSided/WetPaint_16.mat | 80 +++++ .../WetPaintSingleSided/WetPaint_16.mat.meta | 8 + .../WigglyGraphiteDoubleSided.shader | 36 +- .../WigglyGraphiteDoubleSided.shader.meta | 4 +- .../WigglyGraphiteSingleSided.shader | 73 ++++ .../WigglyGraphiteSingleSided.shader.meta | 9 + .../WigglyGraphite/WigglyGraphite_16.asset | 5 +- .../WigglyGraphite_16.asset.meta | 2 - .../WigglyGraphite/WigglyGraphite_16.mat | 5 +- .../WigglyGraphite/WigglyGraphite_16.mat.meta | 4 +- .../Basic/WigglyGraphite/main.png.meta | 89 ++++- .../WigglyGraphite_16.asset | 26 ++ .../WigglyGraphite_16.asset.meta | 8 + .../WigglyGraphite_16.mat | 91 +++++ .../WigglyGraphite_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Wind.meta | 8 + .../Assets/Brushes/Basic/Wind/Wind_16.asset | 26 ++ .../Brushes/Basic/Wind/Wind_16.asset.meta | 8 + .../Assets/Brushes/Basic/Wind/Wind_16.mat | 82 +++++ .../Brushes/Basic/Wind/Wind_16.mat.meta | 8 + .../Assets/Brushes/Basic/Wire/Wire.asset | 9 +- .../Assets/Brushes/Basic/Wire/Wire.asset.meta | 2 - .../Assets/Brushes/Basic/Wire/Wire.mat | 5 +- .../Assets/Brushes/Basic/Wire/Wire.mat.meta | 4 +- .../Assets/Brushes/Basic/Wire/Wire_16.asset | 26 ++ .../Brushes/Basic/Wire/Wire_16.asset.meta | 8 + .../Assets/Brushes/Basic/Wire/Wire_16.mat | 77 +++++ .../Brushes/Basic/Wire/Wire_16.mat.meta | 8 + .../Assets/Brushes/Basic/Wireframe.meta | 8 + .../Brushes/Basic/Wireframe/Wireframe.shader | 83 +++++ .../Basic/Wireframe/Wireframe.shader.meta | 9 + .../Basic/Wireframe/Wireframe_16.asset | 26 ++ .../Basic/Wireframe/Wireframe_16.asset.meta | 8 + .../Brushes/Basic/Wireframe/Wireframe_16.mat | 33 ++ .../Basic/Wireframe/Wireframe_16.mat.meta | 8 + UnitySDK/Packages/manifest.json | 26 +- UnitySDK/ProjectSettings/AudioManager.asset | 2 +- .../ProjectSettings/DynamicsManager.asset | 5 +- .../ProjectSettings/EditorBuildSettings.asset | 1 + UnitySDK/ProjectSettings/EditorSettings.asset | 14 +- .../ProjectSettings/Physics2DSettings.asset | 5 +- UnitySDK/ProjectSettings/PresetManager.asset | 23 +- .../ProjectSettings/ProjectSettings.asset | 209 +++++------- .../ProjectSettings/QualitySettings.asset | 144 +++++--- UnitySDK/ProjectSettings/TagManager.asset | 2 +- .../UnityConnectSettings.asset | 14 +- 885 files changed, 18424 insertions(+), 1790 deletions(-) create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/AllBrushes.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/AllBrushes.asset index c0d2e093..ebc001a1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/AllBrushes.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/AllBrushes.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -12,72 +13,181 @@ MonoBehaviour: m_Name: AllBrushes m_EditorClassIdentifier: m_Brushes: + - {fileID: 11400000, guid: d77ea36785d5a7b419ab8e161de8f8ca, type: 2} + - {fileID: 11400000, guid: 0c0e3228224d5864a93d61026d354d00, type: 2} + - {fileID: 11400000, guid: 705442d8f410e5d4090de2d415ed53a8, type: 2} + - {fileID: 11400000, guid: 36477b2a7b4be2241a2044dc90fdfe24, type: 2} + - {fileID: 11400000, guid: f615a7800dfaf0a40ba36e5347d25c3d, type: 2} + - {fileID: 11400000, guid: 016d62951ae551d4482d68b5e3f3fd98, type: 2} - {fileID: 11400000, guid: cadc04d18daae874aa63168911a19ba6, type: 2} + - {fileID: 11400000, guid: c37f30529c327e5469e5a8f79331bdb0, type: 2} + - {fileID: 11400000, guid: 6e7af0f6547124b549b0e6cd1382e09d, type: 2} + - {fileID: 11400000, guid: 6caf73c57b041b15aa8be4416ce94539, type: 2} - {fileID: 11400000, guid: 94e865ca3b92ee5568334254825adac1, type: 2} + - {fileID: 11400000, guid: b10752a9c95c62c53bb7746fec40de88, type: 2} - {fileID: 11400000, guid: 58575cce2727fec449fd95b38f249b39, type: 2} + - {fileID: 11400000, guid: bd0a10bbb8ec79f4aa47556fc9888118, type: 2} - {fileID: 11400000, guid: d654adeb77b0e4e57be9d81558a4eab8, type: 2} + - {fileID: 11400000, guid: 480c909c605dbc04687a61b47e5b0b78, type: 2} - {fileID: 11400000, guid: 07ab675df8bcbd148809e406fcd485fd, type: 2} + - {fileID: 11400000, guid: e89827c6fdba0244d97001ab8f7048bd, type: 2} - {fileID: 11400000, guid: ac595c6b6de2ec859a96231504448d7c, type: 2} + - {fileID: 11400000, guid: 48bbb35d5d49b315d9b442fc6745f631, type: 2} + - {fileID: 11400000, guid: dae3fdb8756823f5da4e8b5637689dce, type: 2} - {fileID: 11400000, guid: c6fa15292ff30d25f819be478121d74e, type: 2} + - {fileID: 11400000, guid: c77e0f00fa715965884077fd916bcad2, type: 2} - {fileID: 11400000, guid: d4d57e30cdd022945b067d76b7ded1c7, type: 2} + - {fileID: 11400000, guid: 1016614611341384a97cdb6b75474c6a, type: 2} - {fileID: 11400000, guid: 89d06e0e0a68a1c488e9eb9bc2ca3abc, type: 2} + - {fileID: 11400000, guid: 196fe7771f9f9a14fbf47b7ebadcb378, type: 2} - {fileID: 11400000, guid: 7f2dcdb5c7d9fc94db14b323331d5860, type: 2} + - {fileID: 11400000, guid: e43bb1c4b2255c141a10b5aff3a4c521, type: 2} + - {fileID: 11400000, guid: 091ec3bb464eb8c59b355450492173d5, type: 2} - {fileID: 11400000, guid: f4ed52160dfaf694ea666a6294e38f42, type: 2} + - {fileID: 11400000, guid: 65433607e003d134eaa467eabd2f003e, type: 2} - {fileID: 11400000, guid: c2b9f7e0f4fb54b41b7dbeb23b117551, type: 2} + - {fileID: 11400000, guid: 33912e297edc2234daead69ef39cf936, type: 2} + - {fileID: 11400000, guid: 0afc2cbbd5388dd5c9edea230b9878f6, type: 2} + - {fileID: 11400000, guid: ca487b7672ab3a452ac3e54a6b4438e9, type: 2} - {fileID: 11400000, guid: 1087726a0694716539a6894556a3a557, type: 2} + - {fileID: 11400000, guid: 00d3fab5731a7e449b1bd525c88629b7, type: 2} + - {fileID: 11400000, guid: 78a794d54b7adc55c8069dac327af9b5, type: 2} - {fileID: 11400000, guid: 6d014762200f4014fa8a87bcfaa038fe, type: 2} + - {fileID: 11400000, guid: edcdd7f6ba80d6f4a9814acfe5be99d7, type: 2} - {fileID: 11400000, guid: 6e268406bbadd084a825dda73d24387a, type: 2} + - {fileID: 11400000, guid: 93ec1af6c3122d04cb342c379dc2dd64, type: 2} - {fileID: 11400000, guid: 9f45a29bbed9af6479948c03267fe239, type: 2} + - {fileID: 11400000, guid: 980867b687111b64d84af77dcff37963, type: 2} + - {fileID: 11400000, guid: 811c48395a037e651a901d38ff989b7f, type: 2} + - {fileID: 11400000, guid: 66fb653e1d4373957b0c0fa8573c322d, type: 2} + - {fileID: 11400000, guid: 1fef1d9521b15395c9ec46fe58b33955, type: 2} - {fileID: 11400000, guid: 3c7ec9f584dd60e4a9308abe95b9f22e, type: 2} + - {fileID: 11400000, guid: 124ef0e473e7c4748b73c65209b43ace, type: 2} + - {fileID: 11400000, guid: 026e014eee7f6bf5c8e1787b57ebaefc, type: 2} - {fileID: 11400000, guid: de779677f45c66b5bb80d8fdc8604238, type: 2} + - {fileID: 11400000, guid: 0de450cbc920f1940b8b8321cc716bfa, type: 2} - {fileID: 11400000, guid: 969b71c814f75e9408602593d4e10e3e, type: 2} + - {fileID: 11400000, guid: 48988924b98c9d94183824f4f58e12a7, type: 2} - {fileID: 11400000, guid: a97674f9669261b48a61cfed32378345, type: 2} + - {fileID: 11400000, guid: 4af48b7f339a4ca4e9f1c9a7658aebcd, type: 2} + - {fileID: 11400000, guid: 2b04662a6e713b0578030ffa3d74d5dc, type: 2} + - {fileID: 11400000, guid: 55d97626500acb15394a5c4604f100cc, type: 2} + - {fileID: 11400000, guid: 5316e81a637acfe58aa970f605fa1618, type: 2} - {fileID: 11400000, guid: 0cfb52fb947fb6e4786ed9f2bdc5328c, type: 2} + - {fileID: 11400000, guid: 9707c937e62b19849928a8dc2cd5a6a0, type: 2} + - {fileID: 11400000, guid: dd353eba365eee252b6e8be44267c191, type: 2} - {fileID: 11400000, guid: b22741da3567d9353a0ccc88393d8c8e, type: 2} + - {fileID: 11400000, guid: a455d846f69efbd4da961d2a0cd90bd9, type: 2} - {fileID: 11400000, guid: 3251442494b7f6c43aa51c2ede6c409e, type: 2} + - {fileID: 11400000, guid: 9642984e79fd55b43ab26d97ce89ca0d, type: 2} - {fileID: 11400000, guid: 88ecf340d7ce92a4bada6eac937e887a, type: 2} + - {fileID: 11400000, guid: 89666103549d60b4b854b5bbb8d2ee50, type: 2} - {fileID: 11400000, guid: 4fcc165667ef68c5780910cc28494a38, type: 2} - {fileID: 11400000, guid: f83c05f7491995a53af9be352980ef25, type: 2} + - {fileID: 11400000, guid: c0a85870efa4ab545ac3bd845b0f53b7, type: 2} + - {fileID: 11400000, guid: fd102dbcd22fb8c5a92659c58182d7aa, type: 2} - {fileID: 11400000, guid: 6c27caca67a732d4f9d59b028c4dd9a8, type: 2} + - {fileID: 11400000, guid: 2d801113f2492244ea287404fda275fd, type: 2} + - {fileID: 11400000, guid: f9e50c54c7ace8a5b88473c447fdbf8e, type: 2} + - {fileID: 11400000, guid: 78b2b9b4f4a66d855b5ff47423606d67, type: 2} + - {fileID: 11400000, guid: 92ff03b2bb2a29a5e9d6a4f1a713c69d, type: 2} + - {fileID: 11400000, guid: 242adf01c508b5253aefe5c5bab9cd42, type: 2} - {fileID: 11400000, guid: 362043fe9dab1704fa0f912c4f1e0d09, type: 2} + - {fileID: 11400000, guid: baf111a6ab075664cbad82455f9dd517, type: 2} - {fileID: 11400000, guid: 54a30b55c2e961643a7701bedc663c88, type: 2} + - {fileID: 11400000, guid: 44810a6fc26cce84d9f618d2da2584c7, type: 2} - {fileID: 11400000, guid: 4f55fba4b64913b419cf4a17ba5d489b, type: 2} + - {fileID: 11400000, guid: 16b56a1a0e1590147a104e9abc851e36, type: 2} + - {fileID: 11400000, guid: bfc9ec097bc4a445383f719c6602584d, type: 2} - {fileID: 11400000, guid: 1d8b02cc1233fee5fae7728123e6257d, type: 2} + - {fileID: 11400000, guid: ddfae286c35c87e54a394a983cad0491, type: 2} + - {fileID: 11400000, guid: 658eed08dfd4e5850b642d22cd495b97, type: 2} - {fileID: 11400000, guid: 3fd505f4dc669fe4c86c80d009ec2efd, type: 2} + - {fileID: 11400000, guid: 585b99ab356f38d44bfa0bca89166410, type: 2} - {fileID: 11400000, guid: cc8a936db644b835cb1d6ac3836f65f2, type: 2} + - {fileID: 11400000, guid: 66eaa331dac132e588b955c39ede2701, type: 2} + - {fileID: 11400000, guid: 0ab8a65ca50e7bf5897129432ea7e033, type: 2} - {fileID: 11400000, guid: 71228caab923caf46a89c3275938564a, type: 2} + - {fileID: 11400000, guid: 3bd18e27f9d1cc44c9c7552284201e11, type: 2} - {fileID: 11400000, guid: 542d61ce63831da52a2faf8cb6e2d161, type: 2} + - {fileID: 11400000, guid: 4125a45648abee64eb549c7c003b1fe2, type: 2} - {fileID: 11400000, guid: d7ada22e6a436e742910a7553f159550, type: 2} + - {fileID: 11400000, guid: 6b210bd5b0128ec4aa57a8bc87e26e00, type: 2} - {fileID: 11400000, guid: 4c750113c587a7e5c97a5627a917967e, type: 2} + - {fileID: 11400000, guid: 8c7c475a7169a5a478e5520ec7f9284f, type: 2} - {fileID: 11400000, guid: 9b77a7cd7bb6c0244bca8ab8221af846, type: 2} + - {fileID: 11400000, guid: 575b9a60acc02e94e813b4b603315c8c, type: 2} - {fileID: 11400000, guid: a8f488f387b09e35dba50b6e9904301b, type: 2} + - {fileID: 11400000, guid: dd29338e13ec5265cb0cc4ee30d69155, type: 2} - {fileID: 11400000, guid: 7e6a9b8a0ad82cf4da20e86f1a326040, type: 2} + - {fileID: 11400000, guid: 5df1efb0a9f5a4b449cd34f5c9fbb232, type: 2} + - {fileID: 11400000, guid: 606ebb8edb618d15ebfb4adfa5a9b189, type: 2} + - {fileID: 11400000, guid: a9da63d3165051050aee14877ccd42d1, type: 2} - {fileID: 11400000, guid: d75833fb286458e468c00cc5b0ac5f4d, type: 2} + - {fileID: 11400000, guid: 40a77d8708a5f444fb776b8bbdbfadfd, type: 2} + - {fileID: 11400000, guid: ecab58a919952a75794e6a35e44ce78c, type: 2} - {fileID: 11400000, guid: aaaca97d63dd3d156ad1632b76baaf8d, type: 2} + - {fileID: 11400000, guid: 2b5f408092403755e919f0fc824bf6a3, type: 2} - {fileID: 11400000, guid: 84e07a49ce756cf44ab7ea2dbdc064c4, type: 2} + - {fileID: 11400000, guid: 223b21ecc1428d44d93e74389a965196, type: 2} + - {fileID: 11400000, guid: 0021c46bddf53615c9b1d1c49d3e5d37, type: 2} - {fileID: 11400000, guid: 7ccf5a61af1914e409b526a98d43354b, type: 2} + - {fileID: 11400000, guid: 302cd9feddaee0240a038004cb3e49ca, type: 2} + - {fileID: 11400000, guid: 60bf941436447e8599139730ce08379d, type: 2} - {fileID: 11400000, guid: bf5c0e36bc63d7b418af3ac347cfdcfd, type: 2} + - {fileID: 11400000, guid: f2cf6894b64c09445b05dcc8e6963e61, type: 2} + - {fileID: 11400000, guid: 322b8ef424dc2f45ea8442ca3ed14cf0, type: 2} + - {fileID: 11400000, guid: 295b9c80a6eebfd5c9e5c6e0615dac3b, type: 2} - {fileID: 11400000, guid: aa162493b08406a5a82822709c50af77, type: 2} - {fileID: 11400000, guid: 20e65e1c9af17105b8a58d0d04ad41c8, type: 2} + - {fileID: 11400000, guid: 6e90179fa3f1c1348b1adb8caa139704, type: 2} - {fileID: 11400000, guid: 402a078d5db9ad0468dda690396443bc, type: 2} + - {fileID: 11400000, guid: 629992284a019b445a3dd2b35644033a, type: 2} + - {fileID: 11400000, guid: 08d130e1f5140755eb770be7a61f79e4, type: 2} + - {fileID: 11400000, guid: 4d5095d2aa98e0c5d8b5e0a06c3240cf, type: 2} - {fileID: 11400000, guid: b1626af60ae7a31419a1c40afb39c5ed, type: 2} + - {fileID: 11400000, guid: e171f1fbc1bb36847b42a2427fb49f44, type: 2} - {fileID: 11400000, guid: 12b98790c761f47429559af03b6669d2, type: 2} + - {fileID: 11400000, guid: d77a6ccba6197d5429b222f034992612, type: 2} - {fileID: 11400000, guid: 38f5be2edab11fa429b090756d26d000, type: 2} + - {fileID: 11400000, guid: 56c831cfe8253c8499b7ea534671c9d9, type: 2} - {fileID: 11400000, guid: a713e4e48dc9bed57b2da96e510f3770, type: 2} + - {fileID: 11400000, guid: 4a18a2a26afe5df49a448b0a1446b987, type: 2} - {fileID: 11400000, guid: e7ec06c48c590ea4ebe400ce6a278efe, type: 2} + - {fileID: 11400000, guid: 93785a02ac6b05d459886fbf637434b1, type: 2} + - {fileID: 11400000, guid: 8c461ae8fae1efd5082fa32f46219e26, type: 2} - {fileID: 11400000, guid: b39f584eb1440404289d9461a0973e35, type: 2} + - {fileID: 11400000, guid: 6e625fa844480314da97f6513b4f369a, type: 2} - {fileID: 11400000, guid: 26d7464425c0b84479a8a21a695b194c, type: 2} + - {fileID: 11400000, guid: 14dd5597756a2a74da022c5ea3c5d81b, type: 2} + - {fileID: 11400000, guid: 2c9e9a86997c0a75184dfed9299d2664, type: 2} + - {fileID: 11400000, guid: b4ce13e091416ef5ea08f0fd3df1156c, type: 2} - {fileID: 11400000, guid: de4112b6c3a19ae5bb03397212a78339, type: 2} + - {fileID: 11400000, guid: ecfcc5034e7fb7347b5a07c5743a9e1b, type: 2} - {fileID: 11400000, guid: 94cb84ebeec44c540bb15b32797e5a98, type: 2} + - {fileID: 11400000, guid: 302e0cbfcebefbb4fa956278fa38973c, type: 2} - {fileID: 11400000, guid: b8a2349e67797ea4593639454ef74543, type: 2} + - {fileID: 11400000, guid: dffc61528de4c4f4d90eb8b7e03c70eb, type: 2} + - {fileID: 11400000, guid: 53ec6eb494e328f5dafde9b5de65f9c8, type: 2} + - {fileID: 11400000, guid: 3fd7519544b911b50a0f5ace4d3bbb50, type: 2} - {fileID: 11400000, guid: e6226d3ece719e15aae431e9b1bacf2d, type: 2} - {fileID: 11400000, guid: 5398e778cce3fdf469bbfa388aa46d5d, type: 2} + - {fileID: 11400000, guid: ca1b285cd96d183408d1a0e25bda4982, type: 2} - {fileID: 11400000, guid: ebe8a9d99afbd6b46909ea24a9896258, type: 2} + - {fileID: 11400000, guid: 47b2b5bdc01fa7a40a157c51c0712a34, type: 2} + - {fileID: 11400000, guid: af3d0280849bf6a5989c2223b37ac07b, type: 2} + - {fileID: 11400000, guid: e8beca0f9aca87a57b219b821606fcaa, type: 2} + - {fileID: 11400000, guid: c4479051e46c7a65fbb4a51ad2eb5910, type: 2} - {fileID: 11400000, guid: cb620f38d66c44f559d8abd0efa6a295, type: 2} + - {fileID: 11400000, guid: c546c4baee4eba441a31a3e3e6fb516a, type: 2} - {fileID: 11400000, guid: 979dc653ba7d1d358a1a3c25bf5d033f, type: 2} - {fileID: 11400000, guid: b250a068d80bad858be65c3d4675b50d, type: 2} + - {fileID: 11400000, guid: c869d93d31fc61a4c866ada41aa85f3a, type: 2} - {fileID: 11400000, guid: 34192af8b5bb56258ba49d0cf281f850, type: 2} + - {fileID: 11400000, guid: 99fe8738f2e0bea53a4370be40a8aaa4, type: 2} - {fileID: 11400000, guid: 3a72bd3c1fe3d784ab8896ec9fdfd058, type: 2} + - {fileID: 11400000, guid: 58f17ed358c05fb4590f1f6821d2e9c2, type: 2} + - {fileID: 11400000, guid: 5cc686c70856a215e8f8fea06ce5e8f1, type: 2} - {fileID: 11400000, guid: 71dc5ead67382b75789dd72c8058d553, type: 2} - {fileID: 11400000, guid: 185ca6407d6d6095e95d6695d994a12b, type: 2} - {fileID: 11400000, guid: d6f6de76308b4b05386f187491479d94, type: 2} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem.meta new file mode 100644 index 00000000..b7ef8218 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9c66a2647cd4644fad23abb10418c19 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset new file mode 100644 index 00000000..a4b23fda --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: BlocksGem + m_EditorClassIdentifier: + m_Guid: + m_storage: 232998f8-d357-47a2-993a-53415df9be10 + m_DurableName: BlocksGem + m_Material: {fileID: 2100000, guid: 232998f8d35747a2993a53415df9be10, type: 2} + m_IsParticle: 0 + m_uv0Size: 0 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset.meta new file mode 100644 index 00000000..369e68d7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d77ea36785d5a7b419ab8e161de8f8ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat new file mode 100644 index 00000000..abeaf7d9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat @@ -0,0 +1,88 @@ +%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: BlocksGem + m_Shader: {fileID: 4800000, guid: cd72ccec010118e44bcae69ab6186eb4, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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: + - _Amp: 2.5 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _FacetSize: 0.05 + - _Frequency: 2 + - _Gain: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.8 + - _GlossyReflections: 1 + - _Jitter: 1 + - _Lacunarity: 0 + - _Metallic: 0.853 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _RimIntensity: 0.5 + - _RimPower: 2 + - _Shininess: 0.9 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Transmission: 0.357 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat.meta new file mode 100644 index 00000000..422cbad9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 88c1fdd2979c6f242b9344bbcc3c452f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset new file mode 100644 index 00000000..5d326986 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: BlocksGem_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 232998f8-d357-47a2-993a-53415df9be10 + m_DurableName: BlocksGem + m_Material: {fileID: 2100000, guid: 232998f8d35747a2993a53415df9be10, type: 2} + m_IsParticle: 0 + m_uv0Size: 0 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset.meta new file mode 100644 index 00000000..7ad04814 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c0e3228224d5864a93d61026d354d00 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat new file mode 100644 index 00000000..de09566c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat @@ -0,0 +1,88 @@ +%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: BlocksGem_16 + m_Shader: {fileID: 4800000, guid: cd72ccec010118e44bcae69ab6186eb4, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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: + - _Amp: 2.5 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _FacetSize: 0.05 + - _Frequency: 2 + - _Gain: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.8 + - _GlossyReflections: 1 + - _Jitter: 1 + - _Lacunarity: 0 + - _Metallic: 0.853 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _RimIntensity: 0.5 + - _RimPower: 2 + - _Shininess: 0.9 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Transmission: 0.357 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat.meta new file mode 100644 index 00000000..2fc71d1f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e73902e44ec6844982cbde48359c46e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass.meta new file mode 100644 index 00000000..823d3aa4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8874b860b24e9054b91a724fb52d306c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset new file mode 100644 index 00000000..bc6db42e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: BlocksGlass + m_EditorClassIdentifier: + m_Guid: + m_storage: 3d813d82-5839-4450-8ddc-8e889ecd96c7 + m_DurableName: BlocksGlass + m_Material: {fileID: 2100000, guid: 3d813d82583944508ddc8e889ecd96c7, type: 2} + m_IsParticle: 0 + m_uv0Size: 0 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset.meta new file mode 100644 index 00000000..e0dc0681 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 705442d8f410e5d4090de2d415ed53a8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat new file mode 100644 index 00000000..081f8a6a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat @@ -0,0 +1,86 @@ +%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: BlocksGlass + m_Shader: {fileID: 4800000, guid: 7fbe2fe7dc7c2a64a9b2abac67b85b54, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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} + - _Noise: + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.8 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _RimIntensity: 0.7 + - _RimPower: 4 + - _Shininess: 0.8 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Transmission: 0.5 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat.meta new file mode 100644 index 00000000..99fd0266 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b9c98887e736894a8265228fa36186f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset new file mode 100644 index 00000000..f1eb9bb9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: BlocksGlass_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 3d813d82-5839-4450-8ddc-8e889ecd96c7 + m_DurableName: BlocksGlass + m_Material: {fileID: 2100000, guid: 3d813d82583944508ddc8e889ecd96c7, type: 2} + m_IsParticle: 0 + m_uv0Size: 0 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset.meta new file mode 100644 index 00000000..4cb613cf --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36477b2a7b4be2241a2044dc90fdfe24 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat new file mode 100644 index 00000000..23d724f7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat @@ -0,0 +1,86 @@ +%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: BlocksGlass_16 + m_Shader: {fileID: 4800000, guid: 7fbe2fe7dc7c2a64a9b2abac67b85b54, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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} + - _Noise: + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.8 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _RimIntensity: 0.7 + - _RimPower: 4 + - _Shininess: 0.8 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Transmission: 0.5 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat.meta new file mode 100644 index 00000000..cf911615 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61592719810538f4888eedfc3747c986 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper.meta new file mode 100644 index 00000000..60347a2a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0efa8ea0d6bb8d43843350bb3ec901d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset new file mode 100644 index 00000000..204be60f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: BlocksBasic_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 0e87b49c-6546-3a34-3a44-8a556d7d6c3e + m_DurableName: BlocksBasic + m_Material: {fileID: 2100000, guid: 0e87b49c65463a343a448a556d7d6c3e, type: 2} + m_IsParticle: 0 + m_uv0Size: 0 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset.meta new file mode 100644 index 00000000..e6801f21 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f615a7800dfaf0a40ba36e5347d25c3d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat new file mode 100644 index 00000000..49485d5a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat @@ -0,0 +1,79 @@ +%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: BlocksBasic_16 + m_Shader: {fileID: 4800000, guid: 50d409e7765e3e8489865238cdf646e7, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.2 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat.meta new file mode 100644 index 00000000..3d7f0993 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 789f00718c1e7794b86b6f178f9688fb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset new file mode 100644 index 00000000..691bb85a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: BlocksPaper + m_EditorClassIdentifier: + m_Guid: + m_storage: 0e87b49c-6546-3a34-3a44-8a556d7d6c3e + m_DurableName: BlocksBasic + m_Material: {fileID: 2100000, guid: 0e87b49c65463a343a448a556d7d6c3e, type: 2} + m_IsParticle: 0 + m_uv0Size: 0 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset.meta new file mode 100644 index 00000000..34e2f11c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 016d62951ae551d4482d68b5e3f3fd98 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat new file mode 100644 index 00000000..64bc3a21 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat @@ -0,0 +1,79 @@ +%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: BlocksPaper + m_Shader: {fileID: 4800000, guid: 50d409e7765e3e8489865238cdf646e7, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.2 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat.meta new file mode 100644 index 00000000..2edd1fe4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a9410ad3e50bf1498134c69c66e91e9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta new file mode 100644 index 00000000..9fa309da --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25cfc524cc091b340ada42975b5496c3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset new file mode 100644 index 00000000..ba14a104 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: BubbleWand_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: EBA3F993-F9A1-4D35-B84E-BB08F48981A4 + m_DurableName: BubbleWand + m_Material: {fileID: 2100000, guid: eba3f993f9a14d35b84ebb08f48981a4, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta new file mode 100644 index 00000000..6b2448ef --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e7af0f6547124b549b0e6cd1382e09d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat new file mode 100644 index 00000000..c67e2d83 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat @@ -0,0 +1,51 @@ +%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: BubbleWand_16 + m_Shader: {fileID: 4800000, guid: 0291fdb46401c4826bc02d7ec6d76cbb, 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} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a23cfe16e9d8cf4b820c79d8d2b9c5a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _DisplacementIntensity: 0.1 + - _EmissionGain: 0.25 + - _InvFade: 1 + - _Scroll1: 2 + - _Scroll2: -2 + - _ScrollJitterFrequency: 1 + - _ScrollJitterIntensity: 3 + - _ScrollRate: -0.54 + - _Smoothness: 0.078125 + - _Strength: 0.5 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta new file mode 100644 index 00000000..6ed5d69e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eba3f993f9a14d35b84ebb08f48981a4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset index 0a19e942..bb21278e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset.meta index 5fc7279a..b7c2128d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: cadc04d18daae874aa63168911a19ba6 -timeCreated: 1495127967 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat index 91b111df..4ffdd851 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat @@ -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: Bubbles m_Shader: {fileID: 4800000, guid: ecfbf36005cdcc94d881047728719bd8, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat.meta index db033a9b..d3e35c1e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 89d104cdd012426bb5b3bbaee63ac43c -timeCreated: 1495148312 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader index 2646b520..61d0ca54 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -37,11 +37,13 @@ Category { #pragma multi_compile_particles #pragma target 3.0 #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "../../../Shaders/Include/Particles.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; @@ -112,7 +114,14 @@ Category { float3 highlightcolor = tex.a; float4 color = float4(basecolor + highlightcolor, 1); - return SrgbToNative(color); + color = SrgbToNative(color); + +#if SELECTION_ON + color.rgb = GetSelectionColor() * tex.r; + color.a = tex.a; +#endif + + return color; } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader.meta index eb27173e..59c3f42a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: ecfbf36005cdcc94d881047728719bd8 -timeCreated: 1467773228 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset new file mode 100644 index 00000000..be668363 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Bubbles_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 89d104cd-d012-426b-b5b3-bbaee63ac43c + m_DurableName: Bubbles + m_Material: {fileID: 2100000, guid: 89d104cdd012426bb5b3bbaee63ac43c, type: 2} + m_IsParticle: 1 + m_uv0Size: 4 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 1 + m_bUseNormals: 1 + m_normalSemantic: 1 + m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset.meta new file mode 100644 index 00000000..005fe0dd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c37f30529c327e5469e5a8f79331bdb0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat new file mode 100644 index 00000000..5640a031 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat @@ -0,0 +1,90 @@ +%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: Bubbles_16 + m_Shader: {fileID: 4800000, guid: ecfbf36005cdcc94d881047728719bd8, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: ed9b3d77606ffd840bbc7ae1adfedced, 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: + - _BaseGain: 0.4 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 300 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ScrollJitterFrequency: 0.2 + - _ScrollJitterIntensity: 0.02 + - _ScrollRate: 0.5 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SparkleRate: 2.5 + - _SpecularHighlights: 1 + - _SpreadSize: 1.25 + - _SrcBlend: 1 + - _UVSec: 0 + - _WaveformFreq: 0.1 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _ScrollDistance: {r: 2, g: 6, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} + - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat.meta new file mode 100644 index 00000000..95bab597 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 526efb3b927b8a44aace63e692f437de +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/maintexture.png.meta index 016fdb50..11fc97ba 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: ed9b3d77606ffd840bbc7ae1adfedced -timeCreated: 1440714591 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 1 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: 2 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 5 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta new file mode 100644 index 00000000..57bd9b32 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d50656153893eec47bf4cf51aed2c1cb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset new file mode 100644 index 00000000..1eded37c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: CandyCane_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 61d2ef63-ed60-49b3-85fb-7267b7d234f2 + m_DurableName: CandyCane + m_Material: {fileID: 2100000, guid: 61d2ef63ed6049b385fb7267b7d234f2, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 0 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta new file mode 100644 index 00000000..846a942b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6caf73c57b041b15aa8be4416ce94539 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat new file mode 100644 index 00000000..fa48ed29 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat @@ -0,0 +1,37 @@ +%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: CandyCane_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta new file mode 100644 index 00000000..4f611b17 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61d2ef63ed6049b385fb7267b7d234f2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader index 21088a22..ffab3241 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -31,8 +31,10 @@ Shader "Brush/Special/CelVinyl" { #pragma fragment frag #pragma multi_compile __ TBT_LINEAR_TARGET #pragma multi_compile_fog + #pragma multi_compile __ SELECTION_ON #include "../../../Shaders/Include/Brush.cginc" #include "UnityCG.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" #pragma target 3.0 sampler2D _MainTex; @@ -47,7 +49,7 @@ Shader "Brush/Special/CelVinyl" { }; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : POSITION; float2 texcoord : TEXCOORD0; float4 color : COLOR; UNITY_FOG_COORDS(1) @@ -58,14 +60,14 @@ Shader "Brush/Special/CelVinyl" { v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.texcoord = v.texcoord; o.color = TbVertToNative(v.color); - UNITY_TRANSFER_FOG(o, o.vertex); + UNITY_TRANSFER_FOG(o, o.pos); return o; } - fixed4 frag (v2f i) : SV_Target + fixed4 frag (v2f i) : COLOR { fixed4 tex = tex2D(_MainTex, i.texcoord) * i.color; UNITY_APPLY_FOG(i.fogCoord, tex); @@ -74,6 +76,8 @@ Shader "Brush/Special/CelVinyl" { if (tex.a < _Cutoff) { discard; } + tex.a = 1; + FRAG_MOBILESELECT(tex) return tex; } @@ -82,4 +86,4 @@ Shader "Brush/Special/CelVinyl" { } Fallback "Unlit/Diffuse" -} \ No newline at end of file +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader.meta index 7680fa1c..63143ea6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8ece14794d9fb9c42a263008101ca435 -timeCreated: 1496853657 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset index 7a3e52f8..1020d70d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset.meta index b605f757..934cd73f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 94e865ca3b92ee5568334254825adac1 -timeCreated: 1529443736 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat index 31c8b8b9..b61db455 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat @@ -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: CelVinyl_16 m_Shader: {fileID: 4800000, guid: 8ece14794d9fb9c42a263008101ca435, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat.meta index fedc62f8..76d1f8ed 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 700f3aa89a7c23848b8aea028905dd8c -timeCreated: 1496858561 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/main.png.meta index 8e03ab19..2fdc8f94 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/main.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 8aecb07e1a668d24f89309f1e2dab649 -timeCreated: 1440714585 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: 2 aniso: 4 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta new file mode 100644 index 00000000..41100861 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b3b367f7865ee1e48aa234c1de07f2fb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset new file mode 100644 index 00000000..318332a8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Charcoal_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: fde6e778-0f7a-e584-38d6-89d44cee59f6 + m_DurableName: Charcoal + m_Material: {fileID: 2100000, guid: fde6e7780f7ae58438d689d44cee59f6, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta new file mode 100644 index 00000000..6b39b73c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b10752a9c95c62c53bb7746fec40de88 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat new file mode 100644 index 00000000..cf7d923a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat @@ -0,0 +1,79 @@ +%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: Charcoal_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 9bdb8bc5360ddc148bfcb994ca09401f, type: 3} + 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: 2e3b6862a2aeea04780ff5a7350b6132, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.01 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta new file mode 100644 index 00000000..5c52d259 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fde6e7780f7ae58438d689d44cee59f6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset index cce8aaf8..1675a163 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: ChromaticWave m_Material: {fileID: 2100000, guid: 0f0ff7b2a67745eba7d60cd7206f4816, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset.meta index 2197aaf5..56bcb89d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 58575cce2727fec449fd95b38f249b39 -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat index e4455c35..cd5bfb42 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat @@ -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: ChromaticWave m_Shader: {fileID: 4800000, guid: 89cb52de98c379048bcf61a01a3c5f18, type: 3} m_ShaderKeywords: _LIGHTMAPPING_REALTIME diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat.meta index 91a0b2d0..8b74da98 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 0f0ff7b2a67745eba7d60cd7206f4816 -timeCreated: 1481917492 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader index 242b25b5..a7f238c5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -35,10 +35,12 @@ Category { #pragma multi_compile_particles #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #pragma target 3.0 #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" float _EmissionGain; @@ -49,7 +51,7 @@ Category { }; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : POSITION; float4 color : COLOR; float2 texcoord : TEXCOORD0; float4 unbloomedColor : TEXCOORD1; @@ -59,7 +61,7 @@ Category { { v.color = TbVertToSrgb(v.color); v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.texcoord = v.texcoord; o.color = bloomColor(v.color, _EmissionGain); o.unbloomedColor = v.color; @@ -67,7 +69,7 @@ Category { } // Input color is srgb - fixed4 frag (v2f i) : SV_Target + fixed4 frag (v2f i) : COLOR { // Envelope float envelope = sin(i.texcoord.x * 3.14159); @@ -91,6 +93,7 @@ Category { color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); + FRAG_MOBILESELECT(color) return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader.meta index 0a42ec5a..ea9526d5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 89cb52de98c379048bcf61a01a3c5f18 -timeCreated: 1457578865 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset new file mode 100644 index 00000000..cfe6a1fe --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: ChromaticWave_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 0f0ff7b2-a677-45eb-a7d6-0cd7206f4816 + m_DurableName: ChromaticWave + m_Material: {fileID: 2100000, guid: 0f0ff7b2a67745eba7d60cd7206f4816, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset.meta new file mode 100644 index 00000000..0698af0a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bd0a10bbb8ec79f4aa47556fc9888118 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat new file mode 100644 index 00000000..dd451f89 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat @@ -0,0 +1,85 @@ +%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: ChromaticWave_16 + m_Shader: {fileID: 4800000, guid: 89cb52de98c379048bcf61a01a3c5f18, type: 3} + m_ShaderKeywords: _LIGHTMAPPING_REALTIME + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + 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} + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.45 + - _EmissionLM: 0 + - _EmissionScaleUI: 0 + - _Glossiness: 0.38 + - _InvFade: 1 + - _Lightmapping: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Scroll1: 13 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat.meta new file mode 100644 index 00000000..d4c20654 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9588564d59c101e4fa91109550d6ba9f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset index 4f80d6c0..f6b5fcc7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset.meta index f5ae0736..0c6f8f5c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: d654adeb77b0e4e57be9d81558a4eab8 -timeCreated: 1529443738 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat index b2bae2b5..62136cfb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat @@ -4,11 +4,12 @@ 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: CoarseBristles_15 m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat.meta index fa24d6f2..f4b5820e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 1161af8250cf47db97060c3576d43c43 -timeCreated: 1496878118 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset new file mode 100644 index 00000000..8c4a2bae --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: CoarseBristles_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 1161af82-50cf-47db-9706-0c3576d43c43 + m_DurableName: CoarseBristles + m_Material: {fileID: 2100000, guid: 1161af8250cf47db97060c3576d43c43, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset.meta new file mode 100644 index 00000000..9c5d941d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 480c909c605dbc04687a61b47e5b0b78 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat new file mode 100644 index 00000000..94160f46 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat @@ -0,0 +1,78 @@ +%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: CoarseBristles_16 + m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + 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: 511e136566fbfc241b63ff2207dbcafe, 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.25 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat.meta new file mode 100644 index 00000000..6717f97c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f99647b79f185e4aa0c09df2f3d5d8b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/leaves.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/leaves.png.meta index e442c645..bd8ff321 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/leaves.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/leaves.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 511e136566fbfc241b63ff2207dbcafe -timeCreated: 1440714585 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset index ec5d8d3e..097766a8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset.meta index 8be28e98..6a02b8c8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 07ab675df8bcbd148809e406fcd485fd -timeCreated: 1529443739 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat index 6d902efe..b7aa27c4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat @@ -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: CoarseBristles_0 m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat.meta index ab151c34..5bec9aa6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 79168f106961464a8be157ed364c5600 -timeCreated: 1496878118 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset new file mode 100644 index 00000000..e89e9f33 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: CoarseBristles_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 79168f10-6961-464a-8be1-57ed364c5600 + m_DurableName: CoarseBristles + m_Material: {fileID: 2100000, guid: 79168f106961464a8be157ed364c5600, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset.meta new file mode 100644 index 00000000..675d1fef --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e89827c6fdba0244d97001ab8f7048bd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat new file mode 100644 index 00000000..e4e2e468 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat @@ -0,0 +1,77 @@ +%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: CoarseBristles_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 511e136566fbfc241b63ff2207dbcafe, 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.25 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat.meta new file mode 100644 index 00000000..3d751614 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e32ecc6605b5bc9429a994a47379195f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader index 0d09f749..dc239f57 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -35,8 +35,10 @@ Category { #pragma fragment frag #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; sampler2D _AlphaMask; @@ -53,7 +55,7 @@ Category { }; struct v2f { - float4 vertex : POSITION; + float4 pos : POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -71,8 +73,7 @@ Category { saturate((1.0 - smoothstep(0, .3, v.texcoord.x)) * v.texcoord.z); v.vertex.xyz += displacement; #endif - o.vertex = UnityObjectToClipPos(v.vertex); - + o.pos = UnityObjectToClipPos(v.vertex); return o; } @@ -107,7 +108,9 @@ Category { float falloff = max((0.2 - i.texcoord.x) * 5, 0); float tex = tex2D(_AlphaMask, saturate(gradient_lookup_value + falloff)).r; - return float4((tex * i.color).rgb , 1.0); + float4 color = float4((tex * i.color).rgb , 1.0); + FRAG_MOBILESELECT(color) + return color; } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader.meta index 58191ace..526768f7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8224f6980454ee9448eaf50da5fc3ca4 -timeCreated: 1497652398 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset index b9d39217..71c27875 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset.meta index 9b1ab50e..7a8651af 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: ac595c6b6de2ec859a96231504448d7c -timeCreated: 1529443740 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat index 294b53e6..c29ba364 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat @@ -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: Comet_16 m_Shader: {fileID: 4800000, guid: 8224f6980454ee9448eaf50da5fc3ca4, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat.meta index 0466bda5..73ba8b4b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 1caa6d7df0153f543a4b8b5354d39f81 -timeCreated: 1497650213 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/gradient.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/gradient.png.meta index 042fb372..bee60c3d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/gradient.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/gradient.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: b0396e66243f48449a3710f12f224199 -timeCreated: 1497653637 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,44 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 5 - buildTargetSettings: - - buildTarget: Standalone + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL maxTextureSize: 2048 - textureFormat: 7 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 + crunchedCompression: 0 allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/main.png.meta index 6f0fe2ed..aec6bfc0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/main.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 5115e6d4283754649a847abe8d481dbc -timeCreated: 1497661871 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,44 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 0 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 5 - buildTargetSettings: - - buildTarget: Standalone + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL maxTextureSize: 2048 - textureFormat: 5 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 + crunchedCompression: 0 allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta new file mode 100644 index 00000000..bed87911 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a83e25e0d151e346b0138b1cf16aafa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset new file mode 100644 index 00000000..6b31a970 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: ConcaveHull_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 7ae1f880-a517-44a0-99f9-1cab654498c6 + m_DurableName: ConcaveHull + m_Material: {fileID: 2100000, guid: 7ae1f880a51744a099f91cab654498c6, type: 2} + m_IsParticle: 0 + m_uv0Size: 0 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta new file mode 100644 index 00000000..e372647f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 48bbb35d5d49b315d9b442fc6745f631 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat new file mode 100644 index 00000000..423664bc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat @@ -0,0 +1,102 @@ +%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: ConcaveHull_16 + m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Bottom: + 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} + 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: 0} + 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} + - _Side: + m_Texture: {fileID: 2800000, guid: 006eb4ee45e4eee4b84cf30d54b01889, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Top: + m_Texture: {fileID: 2800000, guid: 640eb58bac1e8c349b8aef55f817627b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BottomScale: 2 + - _Bulge: 2.25 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _NumSides: 5 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ScrollJitterFrequency: 1 + - _ScrollJitterIntensity: 1 + - _ScrollRate: 1 + - _Shininess: 0.078125 + - _SideScale: 0.2 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 1 + - _SpreadRate: 1.539 + - _SrcBlend: 1 + - _TopScale: 0.3 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta new file mode 100644 index 00000000..4d8b10bd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ae1f880a51744a099f91cab654498c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta new file mode 100644 index 00000000..3c38d6fc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57310860c5180594fbc8da76d0e5cfe7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader new file mode 100644 index 00000000..b1ded660 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader @@ -0,0 +1,107 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Special/DanceFloor" { +Properties { + _TintColor ("Tint Color", Color) = (0.5,0.5,0.5,0.5) + _MainTex ("Particle Texture", 2D) = "white" {} +} + +Category { + //Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + //Blend One One + //BlendOp Add, Min + //AlphaTest Greater .01 +// ColorMask RGBA + Cull Off Lighting Off ZWrite On Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 3.0 + #pragma glsl + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + + sampler2D _MainTex; + fixed4 _TintColor; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float4 texcoord1 : TEXCOORD1; + float3 normal : NORMAL; + }; + + struct v2f { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float3 worldPos : TEXCOORD1; + }; + + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + v2f o; + float4 worldPos = mul(unity_ObjectToWorld, v.vertex); + float waveform = 0; + + float lifetime = _Time.y - v.texcoord1.w; + float release = saturate(lifetime); + + +#ifdef AUDIO_REACTIVE + //worldPos.y -= release * fmod(_BeatOutputAccum.x * 2 - v.texcoord1.w, 5); + //worldPos.y += .3 * release * pow(sin(_BeatOutputAccum.x * 5 + worldPos.x),5); + lifetime = v.texcoord1.w * 10 + _BeatOutputAccum.x; + o.color += tex2Dlod(_WaveFormTex, float4(lifetime * 5,0, 0, 0)).r - .5; + +#endif + + v.color.xyz = pow(fmod(lifetime,1),3) * v.color.xyz; // * saturate(sin(lifetime * 10)) + v.color.zxy * saturate(cos(lifetime * 7)); + + // Quantize vertices + float q = 5; + float3 quantPos = ceil(worldPos.xyz * q) / q; + worldPos.xyz = quantPos; + worldPos.xyz += v.normal * pow(fmod(lifetime,1),3) * .1; + o.vertex = mul(UNITY_MATRIX_VP, worldPos); + o.color = 2 * v.color + v.color.yzxw * _BeatOutput.x; + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + o.worldPos = worldPos.xyz; + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + + //float waveform = tex2D(_WaveFormTex, float2(fmod(i.worldPos.x * 0.1f + _Time.y,1),0) ).r - .5f; + //i.texcoord.y += waveform; + float4 c = i.color * _TintColor * tex2D(_MainTex, i.texcoord); + return float4(c.rgb * c.a, 1.0); + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta new file mode 100644 index 00000000..cfdf76b3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 14968e66fc8cfe441b31a7c23a07897c +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset new file mode 100644 index 00000000..6b1a03c9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: DanceFloor_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 6a1cf9f9-032c-45ec-311e-a6680bee32e9 + m_DurableName: DanceFloor + m_Material: {fileID: 2100000, guid: 6a1cf9f9032c45ec311ea6680bee32e9, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 4 + m_uv1Semantic: 2 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta new file mode 100644 index 00000000..311ddf05 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dae3fdb8756823f5da4e8b5637689dce +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat new file mode 100644 index 00000000..568f0c65 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat @@ -0,0 +1,39 @@ +%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: DanceFloor_16 + m_Shader: {fileID: 4800000, guid: 14968e66fc8cfe441b31a7c23a07897c, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: a376d2141060ffb4c80eb5f3d39ceb07, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BaseGain: 0.4 + - _EmissionGain: 1 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + - _WaveformFreq: 0.2 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} + - _WaveformIntensity: {r: 0, g: 0.3, b: 0, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta new file mode 100644 index 00000000..03f20ef1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a1cf9f9032c45ec311ea6680bee32e9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png new file mode 100644 index 0000000000000000000000000000000000000000..3757a9c54a4e960919fcac4d07cb1ac2c0b015d7 GIT binary patch literal 26563 zcmeI42{@G9`}m((Z8MB4F~nF3*~Y$)u`87&*|V=%#-1e%LLpR=N|vM)Wl0fX3aQ9Y zq9jWyvNUAhf1}=|*ZaQy-|PSTUf2KnUzfQsbD#U%_c_n!KIeX(=bU+*Haet-q({>O z0D#=5uWbSVAnHdDKnth7+4vW_Zb$(pdYZu9Htw%ffzDUoG5`P=ST=q^z~w9sY9USF zzJoe612nWyVK|S>muza$!9X30KwS?n7tA3CZx=vI*(Si>$tKXzMk64=B{0Co#3g_b z4`1-h^3P211pc><0 zY7uC0@PM)t!CS(?nc(Om5#sGjZIP-|5Ak(y@^lHrIJ&rb_^9zyYU=qh9?oj~=5hzI z2Yt0%+&%Qe{9O)*9Wr$a^K?>j=2yqjtA;339eBG0I$%P)y?g?cL)7?x_*JHU-YAyj z$NZ=g=&8o9vC$yL;-C>mi{S5qk&}=Ycf!gmU=)-jq~sJ7WEI3P(pV`uNvw>d3|3rP zMp+iCEGv!q?ZuCyr+!lPcXm}a(boN~IjW?_?;aTFt1Kyb{P=N+<1!Kie>X`fB_$E>pJqRX!p{h)Qjb+x%iqNzkl=4hAb8<^jxwX) z5n{BoevB%Nu(^kiGvRoEh^pjflRxAAr#BaEhd>t`bv(+7OJT*O2={O8!&vKU(e6(lYWV zxKgtgj+z%S8+q?n>tEFWXs%6g3fhF)|J4;(e7 z63!mZ%1T%%B`GNx9XTyIIUQLkDJ3l_c`dAhw4#)fqLPf9lB(p!Os5+B*^3P?KT7}V z|JUAc)w_)`bMT<@KA(WVjr_Y$`$u0qsC|)=SCp1>a*-2vR=~=LJ3Gm`iYv)FN{c&7 zODnlb%gH*+y1M=tNPji|vuD4#{=N0zT>oc>`LkEQnEuVJp}z+;(>r+mQs+OX_|yGA zxcFN$`W_qc4BZ5LBMOII{Qg?{XFPx8V_ygV0GEwyqsISxy7?o4Q>*^*QvH#&lpUNl zGC9s^BN@0jt4jW*^v`Z>HuLy<;Qr5p=%?>rO#j{gad#J=trE#kS3hd~yORKdYv6GQ ze-{lm>Kyrdjyo*>YkvFb@vkPEUH|huptAWf)4V+X7Xb)x2>xH{3qr2bY|7NsV^N*I6|7!V*<~Pfqf%@fU;m1kqXDRhognAbw`NwV0 z-_B=$oNfM_AO1X~|EAYXzP20L1Y~P*8`su+HfgtUZ342jxQ%OTKAW`LxHbXVTHMC9 zHJ?q|ZCsmxY%Ol%+M3TM?KZAWK(-dQac#|KlXe@|CLmjj+qkyovq`&+YZH*I#cf<$ z^Vy``#ZOvzsb{p3wAX|&uxVGlANxO|}6OgUNZCqRP z*`(dZwF$`9;x?|W`E1f|OY?96 z`NgO^kgIzJ4Flwk zbqWJiQ5S@#R;CAz{ae*xj&Smo`ntLY-tQm0pO_11n7_|8AGx3yiCFX2sv$(28D1Rm z^!$`ep-?KiKMvpO_AK$3FQ{LL8m$Y=x2^GhKS$}WUj#6m>#LE+LD6v9^g)AE7vS-J zz*mG87+UN0WQk*GO{`Br2{U!V zfKj~n)B=0SdSv}R$W5N8`u?#vfIYu*g^5CVKQ|V2hAt%84h)k-g&-dyqEt~KkMifN z$m`q;?T^+bf(4N4!8NPk==tT^50rU6d^-~0pcNLV@2AwS-CXm>#2~4DlYm^QScH+q z^96Gt5Fia2pD61lOs~#{t%5321(! z<`j2`8Zdx_xVkdkMS-0QrmxXQG66>GS|tZVBNuj}17sqfK?mgG@f~ZFtB?->QBA>Z zq;nmul8dl)1TRR^u(O}R7%)}EM3*q4va9;Jh79~_nJ1ZLrSt47JSey4>U4DFf3`{$T&DRO|smxSz%fnu_zL`em~V@W&Ez+C4` zQl1}Wd2P&3L@@U)&_s*j%5@a+xT;|)$o&{xj#x#Y@z=e&i@tsqLBs37& z=MM+=doEy;Ntn`;@Z301`qW`BAOXrMP+Bb14t+vPtDP8+Q({TG3Yuh{pFyk32TD#v z)!M4>kB|vlP&8eg3VN!$7Fl1}JTz5A9GOIs_@O4Iyl8b8oC8`65G{#~^olnI=xAi& z*c#`MJw~mqtDf<^M@zLh>l&fH4oov^?;ot1ES60@IYFI({n_MUa(GWrI4(z>PlBC2 zZ%T3}*gp2W1t1$N!TokVqUM8-delRs+^b@T5S^LCnJOKzicuiPMlJK`o8jkxZ(sKJ zFRz9!cN60GbDpT_f3!BexFVw`wVD8D0)bww@8%#r017!pbe0RSKwpm(meyWiSQ>UV z8}fEQyqfrCQqKd>BWg1-JS!eKPl~=ao3UUE1|OJ}!Wb#obf+SD(Q4P%t4uk#A}K+< z8L$Dw&U+w6gs&n|3w)4uW(3^D>LAO~-T>eVc3_i0AtvGMPQ%AmL^_y6*U~4C*L;Yy z0Cr9*VB9IO_%tN=YY^~KreQzsHt_7+F48THtUV|5XkZ9#gFMwo1rTN$FsB;LUB_`5 z4x$?@rx7m32MB>bvhsEU=nogauS`U$@LXR)(JG>dgH1d5F~eud$_WqUu(^Fqm*P4t z8sEnp_`cQ!)44Q=_Wu$G6oAH;Tb^E;XAU`SV|q?B=owqYF+b)wLX#Xa>3zl&a(H*D+)u+82r0- z6Epw^-MVh>2yI`;!_wLnfs&3ew7Q1y>k)k(-Bv05^Q;2M?Hg!A%ahf5!2DvRdG;SpFz}3n8gyae@WSO zI`Mei?WvJV78+17X|CX~jD@g_>5r~gtMc6PDKA?Z>KD*zIb^%N>dqi)qOF$n0JXRS znT#GmtLamooRH_!4b6q^f+o_cd!fS2SPAgl-O<;oxbg1pFFPcrnyi5FiRM+^tf7nJ zF;-6b7b$f|O6=%THrYV{a+0F9i^ENf7X*uOxcVmmBNF z{1|Fifr0gq(9)T32UpJE10=F*kA@Vi9RMS(QV#XG zwdFcOe}DgbYF4;6$17nL>i|@meyHw_yKgx$BL=`|JNN8D!(KUJUbHKf5MZEvByJes z_I*vXj3@@A5%JQIy>EtBBMHlO>qI~{j61(_ks%21eslYQ-%Dx!Tpgy;>vViFx%(qU z@a@vbjw3OaT*`1R z(~L#RX&l-QF{ z4I%?1x5KG{AO^?)A!4`2yL%d>!>^lx{mB7O5?q{^t4xfP{dyQ1Ov-ee9om!64HR96 z$gw}>RQI{m6dLtn;8vW9)p$QVdGUP&BlREU;O|Uz_Y8+xz0*^;#(5iLapXV>n=hMj z28$49R4U^DGpI-sF#I6*f*=+7a@lE#ngrkw37_Fc^|u*Z3E z-klz>m{U{XOE8NwQE_4<`d!f#6pR!&b;^lQ5*j5k+uXF4HFX#bTwh0>@}?47rQ027*{NjEP_(_~;tuhIp3q@JCJ7o!H=&(tazm6ihEq!^)vRd!AQn$}3X zy6RzK&akY=OCRal^->gmxtzJWq~NfugI_%3B%K4XfCvBnY_bP<$3_``FOnt4k-?qFaHA=t~&!$OD>gcXgK; z9=LsIwj=1={6##z=Z1mwj6Ue{?&7wpzGXzJ1Cm9I2j_31M;~3AhyTRS^Bi7GU;laa z92^tsPY;##Ed}p{gGSNeazyy*oospLJ-y&L+J)0^h@1dl9E4SL zGKTmRQGp_UUtwj)rSB1YTH^9d_@;Z={m*6)f4kOm-zQBqLp|@*BA$TljWHY^3q{`$ zjhr>Ca0|yU%JG4|mX39OdC~IqlXBn4tibDXAmg09cyP)nBzyGnfkgQy3*>Y36}MNI zF_T1M^RhKjKyy7`p{P{stC4{R&=+W*%I8`Z%Vq|%6=zK|jZ9K_5JPN!9c~euQJ3;` zqCIpv&-GgUy;93J;v@uK6W#0(f}D0tS1WlMmN{*Kksu@Xyj~L)>P3$| z5+oL1!nuNIP%oEzt3O1^o0P$m94pjp>u3P`9CZTSiAGS0E9@{sbg`eIwo)w`;C{n; z(%|(OX!H>+4o^SEKE6x{tYzhaP0<0YJ{w59te%GBk*<$g%1%XH5XrI{yo+;B76=gR zXuG!C(rcI%O{~0rp9ZS>WWN;gJ_tX`8rV5MP>wL=AgQ@}E0latKf;%mzNFfEC|VAg zOm@tbaRH@#gS~zK%+$(uJhWC2usXTlu+l53p*^J@3RuW@R)Axh+QmO671SioDylh< zF5&HAL&M5omlN#siaX&JYW4R=$xqz@V4#lGZ($gg&lgp;Izn-&1b?a^ybc zz0(T&Qb`c!mpa~{R$*HA^uAHyTJU#iKB9u`WQf;u`#Vo@R?w{701q8~*EjWrS>qmx z11Q@F93^=IK@U|ukXcP&YtXYDOaBlpU|@N_+N~`~7j@AI)Z-^k8_CXGTA6A`@l!j4 z7mpV!18xWSYC}e-(Q19`zk2b*PLk&OooqW9Zc(*4v92;3;*mKT#V4=b#)SoUB}pG5 z$QX&byMKOic`Be!U28Qp9%KL_?nb&t;0$Oh;yG*mYy_cI;8osT@Q};Vy0z-FSF09y z%~vcnUlqy+?_+KsTFeh>@4Ff)tJ_|~9de;-AYT(`DU*}8_onk<11nJo6MF7v*7G~n zH7WOv7G?SEgJ4QmrfH0NCwo~f~ zAp9o-J*ccGByFubc}rcXtO5dPV(^ME%h9GWCJ-_EQT_1sP_`3Hg&~^fIW38A0*TqhM04W#N9D~6YW?rR zP7t`HOO~RlQTFNj%p$QfGXkCMHco6jL-m?&1K9^P#IhCnpLs09!|E#CXs#h@CPUVZ zyO(jEue9G0cS9!|&3TSK?zyPubj6o!m2jaFS$V>+$d~I~nE0sdBT}z5_|c2El{yJQ zcZkgv;hF&1S>^Wbx2>ny=xB=fK57;<=<8WllhGo&hn%1TO3f-mE$}7!?BWvT*A~T? zeS`Q)g%BJMMV^hLFfuhV-^2Rd4rOF3&m%h8xWF?UcikM$yBWV4T?LB!-yBwCQKJZG z0WJ5Fl%HH8mX=^0q-BZjO9gt#<491sT9a5XitUM*3Mll^dNGQ0&7rjmIP?K^eV#_U z=7z;QHksp?;BYPDqUO-8(Q7}B(Y;`#1wYY)SuaF?nYl%qCS$#d35a@Ry& zVi(p?m*tt|O#k=lV&4}32(|7HPrigTBI=DeEj z>}t3to=MGjm58y>m+$6%dQ&qkIODUXIMqDM%wGd$eR}Qpc86rZ?d8U4IUMFtBDkdN zZ1OkiB4f(ZN9)-X<>!^^-ttV>u^J=XAlSTi#u8v-Q?C(5rC@D`x>5HA>Bl0 zwkk^cyRL`Lr_8{g5oA}kqXI==uHicw%tYrx6n8-^URpbkpfXMe#G?W7{A>&}GHJM?J=9avJDd64XyMC3eQ<~D3Ao-)_?;q1Jg*|*SFX9Z@8E;)(7vH2RV6)!Ur zQe0PV6gKnbA!m4G@~tF9JFT0X^jZcD8Gw7!R|E|0&BQfzNBmB5aICg=47<$9kyU9f zx&Uf3!GdS3?ypB)U;MgPYMqnpB9%X-(loJxM$WMGn$XZaM;+OVIA zG%axN;x`_cd-ek1!IU*uE;k7LPHLuuH0mI5v1g|}>xCEDv_;{4?_eSw1$D2c!bWLR zR4JScdAj6+KBqo&#g3foYRRrL0=1!ryGX^|*%3i~x8wlBDdkNI}FwXG!^I-%y-k^{d$GyTfk%)!~aPhJVNJ!X>z>V#TM zpXdxyk}Rs~7F4`xToPPozR+i$9h(n)w%v0ar)~F;wW`h_4hZTPt?XJ z<}?#qDeUK7P8Qe;S5E=iynCxRf2Ank?E0!Yh(vMA#EJ@p886cB(p}5`d>pR)dSC7S z!Tp>o%Ke`YytER97M`~2uY4K`44mIDtNzlyZ7sZ{ysv-*e{d~TNzy!b90oM$AItjG zV|v&K_Q71tO`K_pbNt#}KPlqt_L+N!x}?j0Tjoozylos%u(8kwj{jrj&ta~R?Hb!( zmH;Kx2ijEKdXE-vRAqt{gNfB4a>wrezD{Vg22ndyc6+ut@{_ZLcMOSgICR((5*B?} zighcWnNqu7-x!gLxKT%tB9gJ$ zoaf8;thq&hf2WnWydSPSooSh43Abzg*qWyk2QYxz#M+e`9$GvOBUlvyJsVVVnz0buTA@X4hWhd6rl!A!fS48bSf$LS9R0bja6Eu*7|eK zjt+kt50IEX-q$ioe`>TktJz+X1)TNf_3Q~Z&&1~GE2%hj&iY67Fi+sPNcVOYgB3bQA-3z*Bnn5Me9wn*h;^Bx_p7($u z;f5FA*YY(_F~>Mj9%erbnZS)X@=hrg6}DxNYaDlH%`2RFWtyTImE9kzJvU@xNj%Wm zCDA*c6tw3}LZ|A5?6+Jo`kl|n03 zJFII;R4r8_`W~Hc3eR&bs4Iq7IEqXP11i^^@^u0l0}xX`}S$? zde4#?rjaYOs`Ej&zI&Q0EC|&SI&XXa9r9pB{lzXocMM*e9UPdmB=AwMtxB&nK>#5m zDo<`d(}tq&HJ2O7PGX-LUC>ND0MU(_<}``UpeQZ%>bxe3CY0yjU0$UfYQruRS6E4Y zeqe@mW#_#Ehi6k*MB2`^dAp*qP8}D8oWjOYt3s6uhLL@;$=MLd0a2brG_Kmiuyx#q| z-vwz{D0OX^RQyy(fSRhlDjx5>w7WjP;gbtG#`$=CS>rr2lDJfF4oSlc9cvdYjit3# z*$+A8>{o6v^jQ-))0J%dXy^^V-*@dMu~E~Qj9<;~@3b>3gS0ysx$XdZPw*2$kQ&@}ui#^PO?s{1AhZj6%*2sq? z_MiGf4()Zie|=1KCP&6LamgCjj0Vrl%&4@)^VN#sS-^VbPi@mIc5}aVvkM$+YR$dI zK9r6~mOk`+$iO~7H0tFvnRQt=yik8!T^d??($h@n6DWi2Db61}6SnT&vghTpt|s7~ zdk%GqH$O8Lj^%-Lw>_sv>V)qdE&hsMv1qifz17IWJ{A;{j~6%tnyKjco+z6^y$t9L zN3>pnrLE0}L?y|WnJA_`JVv%=Kp`QD>}k8X^(;xro|UO}3ufu}8UxPCzh@t+2s28W zvPRZ7FOw&i-kq1OL6Z;DezIH>+tu&iE5`0?g~S{dPk9<(%QV3Zx@AOMGN`4lLnfiz z<-W;yaVXzL8%bM;GEACr>Q=x+Ka&{^Zh-KV#?y@f?S)}F_|b=K9K_F#J0ZD6+Db!H zbD_D9>ddVz;*jI_gib45(CVPr!Uv>q2&kS65#ca-8x6Rnog4H=kj`6GjDl=a2}pqq z1gN|)ssc`G0b~iIbdbpavxZ8ONQ&Ty12kVnR_}P*RC^Q?hlNGq?k~ecC)1z-X#geC z+kU9}K9oH+8V2>Lyb=IExqj~E*qxIjbiN+4Z&n2HGlxA)H zmCfJ-NH?*mbq`Hq-;)Ga#T{1rN0Msmcgt6zGlbTcBYD)d=6LFSr6S`uIomUs>Ne8( zeH=j(^OmQ0K_JP*Ax#W7qlJ^N=xSvt5ivxrp47X;#{mK}Q?JVx3yetgV(h_uQYo(! ziDs!jwZ65&5^(^ta=&LX&(QoRz^vSN4HGhutozhVWmGUJw?Y8ruSHj6Kn957i+ zW;=T6X^rwoF&wCMAbAZ@9IDPudV3hxH6Fva>?})fnR~i!D*l-H+5QMJThH;US3%AI zQ7-F~EUc(5H?9ml5Xx}*288IE{`QLXp=5=&X4{;@>uw-?e4bv46qkK@&HFa$=*-m6 zR-C!3Xj8qzNOXUh2{+PDP00N4;fLpyj|p9U#;B==!Hz1t{Kk;E_)b8lqVTG_BSxt1 z7Ikunqr-f1OsP~Z&MCi zTt7v@V{&53wSD4~Di4!+57G^`vGW0S^`_^Kjy}S*APcvbT1!UZzxRaHeSFCE=D{P1 ziVY-}{hI|0_f0N4-9}{*6;jBGS*z!}dt=SXDMcRg(isqyi5_WtD8Pa5d{&j21CDOR zg4#Y`Qh`ob?)-4?ZS*yKR@wq}AFF$8wgph?srP;_IZEB{xd%_m-N$*ad*S|`>sHgL zGBVNbmk7>DlO0@fR<8py*(^q?3vjNBP591;k-Wi)*)VVF((vM-;)CI|?~5mV?Ck75 z(S34Py1vZ3vAM>9QABk}c$uk8%7C6A_(~H%_Uy!U>UNsf!fmP8IkdqZF>B!i6uJ@b zlO$u&k+Op3vS9*52IMtkI!^A0^ikk@xsaz}JqJGJWjVKx4^P;OeE}4vy*_s>J(DJD zKHKx^2aLQNbTS>}sa~f>jd1YBMw(a*Jx$N@cxo2Le$;r8YB)YN>*%>`JrO0d ze?k3X%uu0vq~uPxdtZG|H1ByB2Q%0x%QS}iPuJ-MHogmRB+Nv2V}DfYLgUpW-U>G8nQ>GxjfMQp zPYC&jg?l`Sqt$uoPuJvhg_>HNd)8d?wDjGI$ zVDEZ6#y5+}93sEBD;fPNYP1W%8+)hhsUL?ZGQB!_KNu06syjz8pl9-!1t71!9vvwb?*6qf;#G+ z^G*mcRW7xEO|#@o11N=UAl;#a)}0M3uyf`$J7hK<#5^>7QvF3K7gsJ+LyXmN0#MN` zzT($EWP~J{^yVHpbl-aVqv==4tPzWc2?H@|j^X1|AuFd>Maoi>URS|yGRvoZUN!fU z!3F5#rtcURq5A?r$R6(3+plP8CFn{hfkwkMhi*LiRD3oA*1n(rVRrx@kUT3jOAvZ^ zRak#9hdeAf8KTPLm`wJ7rgs?h)d?X(GBTqw>_=dL=<3A^VDE=!DbQ_I4t8*@ZHYQh zof@3*ss~IcnrgTQyt4P9huL{tKgqnHn)MwRRSm;7IEV03L^)uz=vD zAaoetm&5|cDJ&AdV_orny~x4@)bAKhRX2RKj#3Zg)n+HY5$DG=RU{&@sN3+gOg>QJ$DMe*UA}|yPib!?0O=h=il<&UIHpJ7as<@~aqMs3 z`Wd5CIZN@h-Kc>e!1NZuP?hH$rg8d&?2($VLi?{oR&UgPPSr|qs!EiNJD@>&ji6!p zkfpUNZ;i{VZpODp33D1XsL^`?z;3}qn3H)SBNb2#!(AO z6BZL3Rp07YKa=qJ%jwUAI8|?SG0(2w76s+A;=n-W2aEl&aul&U@K5MSUw+=?X+M3y zPBIQ)rQOxXf|`GyuT0&*NCVS81JIxQ=T|Rc7iMQ?4S0#4AE&_vUfJFH$kacnU2Y2O zhwm4c9+jIcl7-Ep>mLN#EQo7y%}c?knuE366PgQ>k)aQYFC3vESAC1yFP}kHT@fJtqUm4b4}2$OVux%-dw% z1aKPCi2qu;rn(LEQ=$4r%{*201M80!Z>uq?MTQr1s0*RXtp!-(Bv2PuS9cT{K z=hPF0V5U7&>Luv)??2gQR7bO*WqmkN& zFVvp_mltR#hnIi?q*$4XZ&KyMgDUoIb*GP4$?i-dPOO%;)1XyVCG2%m~ky|5D)$uD}9lDHtvH>w+xX>E6!ob~Y?PPHZ~w4Hl&(!-)O{S>QyB za2b;;XrRaA)b;kFZ_9P7%kz|BNjUIgdT4=%Yp*L0dbJyo9e!qR;SG#*fDe0)ZJ<%> zj`!6@gfRNh8O1~PLvA%=Hu?chx8(?pMY z!EeSQxLZ%iSC(EU&nAKgj5RUyRp~osd}I@s!B)~VHoCw~kb_xn=vvhJ+F4Qf!&xBX zOEq=>h;=oAAp|2#y1`X7zEfe=y$L6t?7mDlu%a%udf_ClsKXO)KQ(EKdL}z^L5Fk- zHG+i60%;$k2oH#3-~$&P56yxUS#vKZ>%TwEYfA&HC+IR+hZ@VRo%z_n3$Be+fwxUL zA#-71ojFLhoYW=eUI>_%nwG0EesaaPrkLPHiX0lKNi$& z7g&lox0J&-6Dm?KcX(i8kG2b=BFLu4K79xDJ_^j?Amqn>Q*VP_WTG3^FN?i772W;>bTi?^0O00JH1vVVt##=}A)03U^? zpr?ZfqNdidd7j<@2wLn2J)(mt2Ie#Qn6viC$~}&nVYRbj8XfCdRsa*rz}sk-Smx(+ zntPs$j}Joe2H$ui6SO!1pZq&6Fku1eU0&yV-dOq@>(m{~?0Jp=DdG?Zaahen1Esev z&Ij2In4qHz7R6!EK6qY&4DcfJmM?(bRXmfAkKM6W+D$n<>&Kk-Wl<)4jt%n60bmA7 z(e*Iy+(9jZVH~(OQ6uG>!5B-qE*dhRsw98nc7r5t4=c#;p5d{@yQVWvFBij=msnTr zc%hHDl0z!d=br#xE3aG?Ex138(oRak78D3VaTUnwD^ODRj?%cBKnz-aoQJ@-&>B@_k5;_eyHY5jUb-mM41E;X z|8e!s(-Uv3)?~)u>`MeBjo2l~fz|uE*K87aJ=SB4X9brF8E$?Bs$hzy%YOSLdlig| zW-Dol=knafM+3efab^lL$#Gh*R!<4*gFriX_{xEOMar7qyLlszzke_hUSypAR4*m` zYRr~jmfYfdl`@RMQti~!Y~PPBS@ru)pYeWQH-$Tq+C0Q1M_G8fy0T`MJbiFtD4}{W z(z<%lB4ee`r;@OORt#HOA&*kjKZeLOCnL2AhsAOXW?xMQqF!B&uOR343^$N(vLgn` m?HL>a*73$%S4hL_kP_6w&VuV8>Ut~y?9(}y=6?XQSqt6( literal 0 HcmV?d00001 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta new file mode 100644 index 00000000..6cc32a05 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: a376d2141060ffb4c80eb5f3d39ceb07 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader index 3db94e58..865df881 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -24,12 +24,14 @@ Shader "Brush/Special/DiamondHull" { Fog{ Mode Off } CGPROGRAM - #pragma target 3.0 + #pragma target 4.0 #pragma surface surf StandardSpecular vertex:vert nofog #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "../../../Shaders/Include/Brush.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -124,7 +126,7 @@ Shader "Brush/Special/DiamondHull" { const float nmedium = 1; const float nfilm = 1.3; const float ninternal = 1; - + const float cos0 = abs(dot(I, N)); //float3 thickTex = texture(thickness, u, v); @@ -153,7 +155,7 @@ Shader "Brush/Special/DiamondHull" { // Calculate rim half rim = 1.0 - abs(dot(normalize(IN.viewDir), IN.worldNormal)); rim *= 1-pow(rim,5); - + const float3 I = (_WorldSpaceCameraPos - IN.worldPos); rim = lerp(rim, 150, 1 - saturate(abs(dot(normalize(I), IN.worldNormal)) / .1)); @@ -162,6 +164,7 @@ Shader "Brush/Special/DiamondHull" { diffraction = GetDiffraction(diffraction, o.Normal, normalize(IN.viewDir)); o.Emission = rim * IN.color * diffraction * .5 + rim * diffraction * .25; + SURF_FRAG_MOBILESELECT(o); o.Specular = SrgbToNative(IN.color).rgb * clamp(diffraction, .0, 1); } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader.meta index f1ef0b8f..cb40ffc8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8521b049d4675f340a0d50e4bd78cd0d -timeCreated: 1452563229 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset index b57eb09f..62e69eb3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: DiamondHull m_Material: {fileID: 2100000, guid: c8313697256347fc832e290f4c04b901, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset.meta index e477fa41..a7624ed0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: c6fa15292ff30d25f819be478121d74e -timeCreated: 1529443740 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat index 861786f1..d2c7f5a9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat @@ -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: DiamondHull_16 m_Shader: {fileID: 4800000, guid: 8521b049d4675f340a0d50e4bd78cd0d, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat.meta index 26a62528..ec04611d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: c8313697256347fc832e290f4c04b901 -timeCreated: 1498761536 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/main.png.meta index 39822363..51eb9f72 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/main.png.meta @@ -1,11 +1,9 @@ fileFormatVersion: 2 guid: 2a6e5a1bbfe8dd240ba16ff658d95cd3 -timeCreated: 1525713743 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 + mipBias: -100 wrapU: -1 wrapV: -1 wrapW: -1 @@ -45,18 +45,54 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -71,7 +107,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta new file mode 100644 index 00000000..afc2cf71 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 72e82b63fa3c0d240a59dd8ed2172de3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset new file mode 100644 index 00000000..15eb5c03 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Digital_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 30cb9af6-be41-4872-8f3e-cbff63fe3db8 + m_DurableName: Digital + m_Material: {fileID: 2100000, guid: 30cb9af6be4148728f3ecbff63fe3db8, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta new file mode 100644 index 00000000..81715e2e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c77e0f00fa715965884077fd916bcad2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat new file mode 100644 index 00000000..c450945d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat @@ -0,0 +1,28 @@ +%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: Digital_16 + m_Shader: {fileID: 4800000, guid: c8def03accc4e8341b9fa2db8eb6ff87, 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: + - _EmissionGain: 0.5 + m_Colors: [] diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta new file mode 100644 index 00000000..65854bbc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30cb9af6be4148728f3ecbff63fe3db8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset index 6897d8c8..a6f03b2f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset.meta index 5d184978..0bdb8777 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: d4d57e30cdd022945b067d76b7ded1c7 -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat index 4af6eb59..2b1b909b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat @@ -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: Disco m_Shader: {fileID: 4800000, guid: 2d606fd47b43446739974645ed823957, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat.meta index 355951b8..65b5625f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 4391aaaadf7343969e3331e4e4930b27 -timeCreated: 1481917491 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader index ae4ebd58..991f7468 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -27,7 +27,9 @@ Shader "Brush/Disco" { #pragma surface surf StandardSpecular vertex:vert noshadow #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" struct Input { float2 uv_MainTex; @@ -41,7 +43,8 @@ Shader "Brush/Disco" { fixed4 _Color; half _Shininess; - void vert (inout appdata_full v) { + void vert (inout appdata_full v, out Input o) { + UNITY_INITIALIZE_OUTPUT(Input, o); v.color = TbVertToNative(v.color); float t, uTileRate, waveIntensity; @@ -81,6 +84,7 @@ Shader "Brush/Disco" { // Add a fake "disco ball" hot spot float fakeLight = pow( abs(dot(worldNormal, float3(0,1,0))),100); o.Emission = IN.color.rgb * fakeLight * 200; + SURF_FRAG_MOBILESELECT(o); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader.meta index 3b5bd2a1..401339ed 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 2d606fd47b43446739974645ed823957 -timeCreated: 1466956512 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset new file mode 100644 index 00000000..d2f5d631 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Disco_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 4391aaaa-df73-4396-9e33-31e4e4930b27 + m_DurableName: Disco + m_Material: {fileID: 2100000, guid: 4391aaaadf7343969e3331e4e4930b27, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset.meta new file mode 100644 index 00000000..485f240b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1016614611341384a97cdb6b75474c6a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat new file mode 100644 index 00000000..65cae25a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat @@ -0,0 +1,43 @@ +%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: Disco_16 + m_Shader: {fileID: 4800000, guid: 2d606fd47b43446739974645ed823957, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + 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} + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + - _Shininess: 0.65 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5147059, g: 0.5147059, b: 0.5147059, a: 0} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat.meta new file mode 100644 index 00000000..2fbb6849 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93e1baa66dea95e40912c4e1034c3ae2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset index d94905f0..9a41125a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset.meta index 85a01f7b..c3dac0a9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 89d06e0e0a68a1c488e9eb9bc2ca3abc -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat index 4c88fd55..6a00e9f7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat @@ -4,11 +4,12 @@ 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: DotMarker m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat.meta index 8f8e844f..2a6a4c04 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d1d991f2e7a04cf1b328f57e915e6260 -timeCreated: 1481917493 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset new file mode 100644 index 00000000..d6d48efe --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: DotMarker_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d1d991f2-e7a0-4cf1-b328-f57e915e6260 + m_DurableName: DotMarker + m_Material: {fileID: 2100000, guid: d1d991f2e7a04cf1b328f57e915e6260, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset.meta new file mode 100644 index 00000000..ece79216 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 196fe7771f9f9a14fbf47b7ebadcb378 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat new file mode 100644 index 00000000..b7392b31 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat @@ -0,0 +1,78 @@ +%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: DotMarker_16 + m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + 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: e4cba7db327fac04f9f443913ee51fc0, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat.meta new file mode 100644 index 00000000..f1936d8d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f35a3db45d0b93541b5bd34cf128111b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/maintexture.png.meta index d1a397ec..890d522d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: e4cba7db327fac04f9f443913ee51fc0 -timeCreated: 1462479037 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 128 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset index 6bea7fe8..f3a54a5d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset.meta index 8059ca78..41f26ad3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 7f2dcdb5c7d9fc94db14b323331d5860 -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat index 11291ec8..d190d6e1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat @@ -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: Dots m_Shader: {fileID: 4800000, guid: 732f16cce31764a49a67b2c782bf444a, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat.meta index a8b5324b..3edc5f1f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 6a1cf9f9032c45ec9b1da6680bee30f7 -timeCreated: 1495148315 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader index 0aa7258b..7f0a476a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -40,10 +40,12 @@ Category { #pragma glsl #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "../../../Shaders/Include/Particles.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; @@ -75,7 +77,7 @@ Category { #ifdef AUDIO_REACTIVE float4 dispVec = float4(0,0,0,0); float4 corner_WS = mul(unity_ObjectToWorld, corner); - // TODO(pld): worldspace is almost certainly incorrect: use scene or object? + // TODO: worldspace is almost certainly incorrect: use scene or object? waveform = tex2Dlod(_FFTTex, float4(fmod(corner_WS.x * _WaveformFreq + _BeatOutputAccum.z*.5,1),0,0,0) ).b * .25; dispVec.xyz += waveform * _WaveformIntensity.xyz; corner = corner + dispVec; @@ -104,7 +106,11 @@ Category { c.rgb += c.rgb * c.a * _EmissionGain; c.a = 1; c = SrgbToNative(c); - return float4(c.rgb, 1.0); + c = float4(c.rgb, 1.0); +#if SELECTION_ON + c.rgb = GetSelectionColor() * tex.r; +#endif + return c; } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader.meta index 228f6823..c86a4906 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 732f16cce31764a49a67b2c782bf444a -timeCreated: 1467773228 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset new file mode 100644 index 00000000..5af6ca8d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Dots_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 6a1cf9f9-032c-45ec-9b1d-a6680bee30f7 + m_DurableName: Dots + m_Material: {fileID: 2100000, guid: 6a1cf9f9032c45ec9b1da6680bee30f7, type: 2} + m_IsParticle: 1 + m_uv0Size: 4 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 1 + m_bUseNormals: 1 + m_normalSemantic: 1 + m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset.meta new file mode 100644 index 00000000..70b24c7f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e43bb1c4b2255c141a10b5aff3a4c521 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat new file mode 100644 index 00000000..1bfc8fd4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat @@ -0,0 +1,84 @@ +%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: Dots_16 + m_Shader: {fileID: 4800000, guid: 732f16cce31764a49a67b2c782bf444a, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: f54d138cbc195f142a9994593db7876a, 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: + - _BaseGain: 0.4 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 300 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _WaveformFreq: 0.1 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} + - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat.meta new file mode 100644 index 00000000..39faa8a7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5cb1c5fc336ff8c468c03b5f00c3db64 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/maintexture.png.meta index 70f58201..6c70d3dc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: f54d138cbc195f142a9994593db7876a -timeCreated: 1467773228 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 5 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta new file mode 100644 index 00000000..7683bd4b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b79b104f5d077248ace6fa64abc6f00 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset new file mode 100644 index 00000000..8fd857f0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: DoubleFlat_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f4a0550c-332a-4e1a-9793-b71508f4a454 + m_DurableName: DoubleFlat + m_Material: {fileID: 2100000, guid: f4a0550c332a4e1a9793b71508f4a454, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta new file mode 100644 index 00000000..8a558b02 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 091ec3bb464eb8c59b355450492173d5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat new file mode 100644 index 00000000..711fb933 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat @@ -0,0 +1,77 @@ +%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: DoubleFlat_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 7c22e3178fa6e2d49a7c323bd3001eff, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta new file mode 100644 index 00000000..45a0c9ba --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4a0550c332a4e1a9793b71508f4a454 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader index 0616a8e1..76c8be69 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -25,7 +25,11 @@ SubShader { #pragma surface surf Lambert vertex:vert addshadow #pragma target 3.0 #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON + // Faster compiles + #pragma skip_variants INSTANCING_ON #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" fixed4 _Color; @@ -35,8 +39,9 @@ SubShader { float3 normal : NORMAL; float4 tangent : TANGENT; float2 texcoord0 : TEXCOORD0; - float4 texcoord1 : TEXCOORD1; + float3 texcoord1 : TEXCOORD1; float4 texcoord2 : TEXCOORD2; + UNITY_VERTEX_INPUT_INSTANCE_ID }; @@ -64,6 +69,7 @@ SubShader { fixed4 c = _Color; o.Normal = float3(0,0,IN.vface); o.Albedo = c.rgb * IN.color.rgb; + SURF_FRAG_MOBILESELECT(o); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader.meta index eebfbecb..d2464660 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 4496a9baf3f2fc446bbaff38336003df -timeCreated: 1467133606 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset index 847ec117..c6732585 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset.meta index 2e3342c9..a58b229d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: f4ed52160dfaf694ea666a6294e38f42 -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat index 294b3f61..5f29ea16 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat @@ -4,11 +4,12 @@ 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: DoubleTaperedFlat m_Shader: {fileID: 4800000, guid: 4496a9baf3f2fc446bbaff38336003df, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: SELECTION_EDGING m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -36,6 +37,7 @@ Material: - _Scroll1: 20 - _Scroll2: 50 - _Scroll3: 0.05 + - _SelectionEdging: 1 - _UVTile1: 1 - _UVTile2: 1 - _UVTile3: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat.meta index 21153792..3bbc1a87 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 0d3889f33ede470c8af4f44813306126 -timeCreated: 1481917485 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset new file mode 100644 index 00000000..82e681bc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: DoubleTaperedFlat_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 0d3889f3-3ede-470c-8af4-f44813306126 + m_DurableName: DoubleTaperedFlat + m_Material: {fileID: 2100000, guid: 0d3889f33ede470c8af4f44813306126, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 2 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset.meta new file mode 100644 index 00000000..1bd2273a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65433607e003d134eaa467eabd2f003e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat new file mode 100644 index 00000000..eb663a7d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat @@ -0,0 +1,49 @@ +%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: DoubleTaperedFlat_16 + m_Shader: {fileID: 4800000, guid: 4496a9baf3f2fc446bbaff38336003df, type: 3} + m_ShaderKeywords: SELECTION_EDGING + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 0.1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 0.5, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _DisplacementIntensity: 0.2 + - _EmissionGain: 0.5 + - _EmissionScroll1: 15 + - _EmissionScroll2: -10 + - _InvFade: 1 + - _Scroll1: 20 + - _Scroll2: 50 + - _Scroll3: 0.05 + - _SelectionEdging: 1 + - _UVTile1: 1 + - _UVTile2: 1 + - _UVTile3: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat.meta new file mode 100644 index 00000000..03b2a1fd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a92ed282c42137640a0350a6d839054a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset index b8727025..df2f1460 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset.meta index 7d5857e0..b7d37466 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: c2b9f7e0f4fb54b41b7dbeb23b117551 -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat index 52219d45..6f88d1be 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat @@ -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: DoubleTaperedMarker m_Shader: {fileID: 4800000, guid: e412fb1c98a347b4ab08429cbf1d0894, type: 3} m_ShaderKeywords: @@ -35,6 +36,7 @@ Material: - _Scroll1: 20 - _Scroll2: 50 - _Scroll3: 0.05 + - _SelectAmplifyEdges: 1 - _UVTile1: 1 - _UVTile2: 1 - _UVTile3: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat.meta index 17d9f29e..c854c061 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 0d3889f33ede470c8af4de4813306126 -timeCreated: 1481917483 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader index 0edd6b27..0e67629f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -30,9 +30,11 @@ Category { #pragma multi_compile_particles #pragma multi_compile_fog #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -44,7 +46,7 @@ Category { }; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; UNITY_FOG_COORDS(1) @@ -54,26 +56,26 @@ Category { { // - // XXX - THIS SHADER SHOULD BE DELETED AFTER WE TAPERING IS DONE IN THE GEOMETRY GENERATION + // XXX - THIS SHADER SHOULD BE DELETED AFTER TAPERING IS DONE IN THE GEOMETRY GENERATION // v2f o; float envelope = sin(v.texcoord0.x * 3.14159); float widthMultiplier = 1 - envelope; v.vertex.xyz += -v.texcoord1 * widthMultiplier; - o.vertex = UnityObjectToClipPos(v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.color = TbVertToNative(v.color); o.texcoord = v.texcoord0; - UNITY_TRANSFER_FOG(o, o.vertex); + UNITY_TRANSFER_FOG(o, o.pos); return o; } - fixed4 frag (v2f i) : SV_Target + fixed4 frag (v2f i) : COLOR { - UNITY_APPLY_FOG(i.fogCoord, i.color.rgb); - return float4(i.color.rgb, 1); - + float4 color = float4(i.color.rgb, 1); + FRAG_MOBILESELECT(color) + return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader.meta index ffc9fd82..31b29d6b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: e412fb1c98a347b4ab08429cbf1d0894 -timeCreated: 1466535959 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset new file mode 100644 index 00000000..f76ed376 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: DoubleTaperedMarker_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 0d3889f3-3ede-470c-8af4-de4813306126 + m_DurableName: DoubleTaperedMarker + m_Material: {fileID: 2100000, guid: 0d3889f33ede470c8af4de4813306126, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 2 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset.meta new file mode 100644 index 00000000..faf12dbd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33912e297edc2234daead69ef39cf936 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat new file mode 100644 index 00000000..ac8fa7b4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat @@ -0,0 +1,48 @@ +%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: DoubleTaperedMarker_16 + m_Shader: {fileID: 4800000, guid: e412fb1c98a347b4ab08429cbf1d0894, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 0.1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 0.5, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _DisplacementIntensity: 0.2 + - _EmissionGain: 0.5 + - _EmissionScroll1: 15 + - _EmissionScroll2: -10 + - _InvFade: 1 + - _Scroll1: 20 + - _Scroll2: 50 + - _Scroll3: 0.05 + - _SelectAmplifyEdges: 1 + - _UVTile1: 1 + - _UVTile2: 1 + - _UVTile3: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat.meta new file mode 100644 index 00000000..07caa8c2 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17b4808f70082264fa86e2d013398980 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta new file mode 100644 index 00000000..0edd65c6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 206b124be661f3146841d8a39e00524f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset new file mode 100644 index 00000000..66894e57 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Drafting_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 492b36ff-b337-436a-ba5f-1e87ee86747e + m_DurableName: Drafting + m_Material: {fileID: 2100000, guid: 492b36ffb337436aba5f1e87ee86747e, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta new file mode 100644 index 00000000..55760cc8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0afc2cbbd5388dd5c9edea230b9878f6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat new file mode 100644 index 00000000..3d10bda7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat @@ -0,0 +1,34 @@ +%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: Drafting_16 + m_Shader: {fileID: 4800000, guid: b8dd2d296c760ad4dba8f0d9ec26d921, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 95c96bad81d7efa45b4fa690f0b520c3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _InvFade: 1 + - _Visibility01: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta new file mode 100644 index 00000000..85623c97 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 492b36ffb337436aba5f1e87ee86747e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta new file mode 100644 index 00000000..38f1b06b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef4e935153c6cbb4bab61f3d11d52871 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset new file mode 100644 index 00000000..50f81953 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: _16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 725f4c6a-6427-6524-29ab-da371924adab + m_DurableName: + m_Material: {fileID: 2100000, guid: 725f4c6a6427652429abda371924adab, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta new file mode 100644 index 00000000..38925b54 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca487b7672ab3a452ac3e54a6b4438e9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat new file mode 100644 index 00000000..21475d3c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat @@ -0,0 +1,79 @@ +%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: _16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 3d0bfa733a1992c4484952a4e71fc67f, type: 3} + 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: 576a5ce02d271ad46a5c2c0d90fd9543, 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.2 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.05 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta new file mode 100644 index 00000000..2b5220cf --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 725f4c6a6427652429abda371924adab +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset index a399ff10..19e02efc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset.meta index d95f10d3..6bf74d20 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 1087726a0694716539a6894556a3a557 -timeCreated: 1529443745 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat index 95b26aee..eaa57d03 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat @@ -4,11 +4,12 @@ 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: DuctTape_15 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.414 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat.meta index b7a3ceba..1199ae8c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d0262945853c44819cbd88586bed93cb -timeCreated: 1496877848 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset new file mode 100644 index 00000000..6593dd5d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: DuctTape_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d0262945-853c-4481-9cbd-88586bed93cb + m_DurableName: DuctTape + m_Material: {fileID: 2100000, guid: d0262945853c44819cbd88586bed93cb, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset.meta new file mode 100644 index 00000000..fc26d833 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00d3fab5731a7e449b1bd525c88629b7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat new file mode 100644 index 00000000..45cd9dbc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat @@ -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: DuctTape_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3} + 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: 1819abb411411e243b701e7dd664ac9a, 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.2 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.414 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat.meta new file mode 100644 index 00000000..475082ca --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9916b54fff7366a4a96a67a78f5ad366 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/main.png.meta index 0b0f6c47..c7e70f6a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/main.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 1819abb411411e243b701e7dd664ac9a -timeCreated: 1442276315 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 512 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -1 - wrapMode: 0 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/normal.png.meta index f9a7a319..cc5682a9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/normal.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 23192df5929e8904ba29a31ec2c68e46 -timeCreated: 1442278035 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 1 externalNormalMap: 1 - heightScale: .0109999999 + heightScale: 0.011 normalMapFilter: 1 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 512 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -1 - wrapMode: 0 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 + spriteTessellationDetail: -1 textureType: 1 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 51 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta new file mode 100644 index 00000000..d0f65ab0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57927278325276f4c9a831c4eecafab2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset new file mode 100644 index 00000000..93499a44 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: _16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 84d5bbb2-6634-8434-f8a7-681b576b4664 + m_DurableName: + m_Material: {fileID: 2100000, guid: 84d5bbb266348434f8a7681b576b4664, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta new file mode 100644 index 00000000..6967c46d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78a794d54b7adc55c8069dac327af9b5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat new file mode 100644 index 00000000..7f0a1156 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat @@ -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: _16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3} + 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: 1819abb411411e243b701e7dd664ac9a, 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.2 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.414 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta new file mode 100644 index 00000000..f6e9331d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84d5bbb266348434f8a7681b576b4664 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset index 0bb625a3..18a6c83f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset.meta index f195f597..96436ed4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 6d014762200f4014fa8a87bcfaa038fe -timeCreated: 1529443745 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat index df9ab1cd..303c8be4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat @@ -4,11 +4,12 @@ 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: DuctTape_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.414 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat.meta index 6253746e..e1a09546 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 3ca16e2fbdcd4da28631dcef342f40f1 -timeCreated: 1496877848 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset new file mode 100644 index 00000000..13fd09e8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: DuctTape_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 3ca16e2f-bdcd-4da2-8631-dcef342f40f1 + m_DurableName: DuctTape + m_Material: {fileID: 2100000, guid: 3ca16e2fbdcd4da28631dcef342f40f1, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset.meta new file mode 100644 index 00000000..69b6ec14 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: edcdd7f6ba80d6f4a9814acfe5be99d7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat new file mode 100644 index 00000000..fc0c00a1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat @@ -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: DuctTape_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3} + 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: 1819abb411411e243b701e7dd664ac9a, 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.2 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.414 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat.meta new file mode 100644 index 00000000..eae951a0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b32d0f1504bce346975433df2b7a7c1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset index 4c2036f4..ec9c4113 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset.meta index eb802825..c35ff07f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 6e268406bbadd084a825dda73d24387a -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat index bb32a66a..a9187042 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat @@ -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: Electricity m_Shader: {fileID: 4800000, guid: 698f6f8dc012a8b4e9d6f36db04f0dd3, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat.meta index 89f52998..b5ad4aff 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: f6e85de36dcc4e7f87fdcee8c3d25d51 -timeCreated: 1481917490 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader index d4266f6c..01b189c0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -20,9 +20,17 @@ Properties { } CGINCLUDE + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" + + #ifdef SHADER_API_D3D11 + # define SHARP_AND_BLOOMY 1 + #else + # define SHARP_AND_BLOOMY 0 + #endif struct appdata_t { float4 vertex : POSITION; @@ -38,7 +46,7 @@ CGINCLUDE half _EmissionGain; struct v2f { - float4 vertex : SV_POSITION; + float4 vertex : POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -83,16 +91,30 @@ CGINCLUDE disp.y += waveform * .1; v.color = v.color*.5 + v.color*_BeatOutput.z*.5; #endif + + // Slightly thicken the line on mobile to accommodate the softer interior line. This reduces artifacts + // from the low resolution. +#if SHARP_AND_BLOOMY + float widthScale = 1.0; +#else + float widthScale = 1.6; +#endif + // This recreates the standard ribbon position with some tapering at edges - v.vertex.xyz = midpointPos_CS + offsetFromMiddleToEdge_CS * envelopePow; + v.vertex.xyz = midpointPos_CS + offsetFromMiddleToEdge_CS * envelopePow * widthScale; // This adds curl noise v.vertex.xyz += disp * _DisplacementIntensity * envelopePow; o.vertex = UnityObjectToClipPos(v.vertex); + // TODO(b/123094204) bloom is turned off on mobile as it completely broke the shader + // for still-unknown reasons. +#if SHARP_AND_BLOOMY o.color = bloomColor(v.color, _EmissionGain); +#else + o.color = v.color; +#endif o.texcoord = v.texcoord0; - return o; } @@ -112,15 +134,32 @@ CGINCLUDE } // Input color is srgb - fixed4 frag (v2f i) : SV_Target + fixed4 frag (v2f i) : COLOR { // interior procedural line - float procedural = ( abs(i.texcoord.y - 0.5) < .1 ) ? 2 : 0; - i.color.a = 1; // kill any other alpha values that may come into this brush - float4 c = i.color + i.color * procedural; - c = float4(c.rgb * c.a, 1.0); - c = SrgbToNative(c); - return c; +#if SHARP_AND_BLOOMY + // Step function: 3 in [.4, .6], 1 elsewhere + float procedural = ( abs(i.texcoord.y - 0.5) < .1 ) ? 3 : 1; +#else + // The lack of AA and low resolution on mobile is really visible, so instead use a + // softer interior line. This has a lot more brightness, so it's good that the + // vertex color isn't also blown out. + + float edginess = ( abs(i.texcoord.y - 0.5) * 2.0 ); // in [0, 1] + // Smooth ramp from 2 in the middle to 1 on the edge + float procedural = lerp(2.0, 1.0, edginess); +#endif + + // Ignore incoming i.color.a +#if SELECTION_ON + float3 unencoded = GetSelectionColor() * (0.5 * procedural); +#else + float3 unencoded = i.color.rgb * (procedural * procedural); +#endif + + // It doesn't matter which of these is first since they can't both be active at the same time; + // but only one ordering will compile because of the return types. + return SrgbToNative(float4(unencoded), 1.0); } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader.meta index bf85e6af..cf6814e4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 698f6f8dc012a8b4e9d6f36db04f0dd3 -timeCreated: 1466532907 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset new file mode 100644 index 00000000..4d5b8808 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Electricity_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f6e85de3-6dcc-4e7f-87fd-cee8c3d25d51 + m_DurableName: Electricity + m_Material: {fileID: 2100000, guid: f6e85de36dcc4e7f87fdcee8c3d25d51, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 2 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset.meta new file mode 100644 index 00000000..32410089 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93ec1af6c3122d04cb342c379dc2dd64 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat new file mode 100644 index 00000000..76f6015b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat @@ -0,0 +1,47 @@ +%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: Electricity_16 + m_Shader: {fileID: 4800000, guid: 698f6f8dc012a8b4e9d6f36db04f0dd3, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 0.1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 8036ea6d636847a429e2def5bf99ffe0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _DisplacementIntensity: 2 + - _EmissionGain: 0.2 + - _EmissionScroll1: 15 + - _EmissionScroll2: -10 + - _InvFade: 1 + - _Scroll1: 20 + - _Scroll2: 50 + - _Scroll3: 0.05 + - _UVTile1: 1 + - _UVTile2: 1 + - _UVTile3: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat.meta new file mode 100644 index 00000000..d61cc737 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fdc5d3156b0985449ff13686c7f81ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset index fc883299..a433ee88 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset.meta index d4d820ef..02d433ea 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 9f45a29bbed9af6479948c03267fe239 -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat index c914f77c..a85f2692 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat @@ -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: Embers m_Shader: {fileID: 4800000, guid: f62b84c7d6bc5f24487edcd3a458ce88, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat.meta index 9d57c6aa..68b3bf4a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 02ffb8667fb24d15b7611012cefb1360 -timeCreated: 1495148303 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader index df69491b..3dca8127 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -39,12 +39,14 @@ Category { #pragma multi_compile_particles #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #pragma target 3.0 #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "../../../Shaders/Include/Particles.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; @@ -69,21 +71,31 @@ Category { // t01 is a time value in [0, 1] float3 ComputeDisplacement(float3 pos, float seed, float t01) { float t2 = _Time.y; + float floatUpTime01 = t01; + +#if SELECTION_ON + t01 = 0; + t2 = 0; +#endif // Animate the motion of the embers // Accumulate all displacement into a common, pre-transformed space. float4 dispVec = float4(_ScrollDistance, 0.0) * t01; dispVec.x += sin(t01 * _ScrollJitterFrequency + seed * 100 + t2 + pos.z) * _ScrollJitterIntensity; - dispVec.y += (fmod(seed * 100, 1) - 0.5) * _ScrollDistance.y * t01; + dispVec.y += (fmod(seed * 100, 1) - 0.5) * _ScrollDistance.y * floatUpTime01; dispVec.z += cos(t01 * _ScrollJitterFrequency + seed * 100 + t2 + pos.x) * _ScrollJitterIntensity; #ifdef AUDIO_REACTIVE float fft = (tex2Dlod(_FFTTex, float4(pos.y,0,0,0)).b)*2 + .1; dispVec.y += fft; #endif - // Allow scaling to affect particle speed and distance in toolkit - return dispVec * kDecimetersToWorldUnits * length(unity_ObjectToWorld[0].xyz); + +#if SELECTION_ON + dispVec.y = abs(dispVec.y * 0.2); + dispVec *= 0.5; +#endif + return dispVec * kDecimetersToWorldUnits; } v2f vert (ParticleVertexWithSpread_t v) { @@ -126,7 +138,6 @@ Category { float4 corner_WS = OrientParticle_WS(center_WS.xyz, halfSize, v.vid, rotation); o.vertex = mul(UNITY_MATRIX_VP, corner_WS); #else - // TODO(pld): convince drew to use this version // Displacement is in canvas space // Note that we assume object space == canvas space (which it is, for TB) center = center + float4(disp.xyz, 0); @@ -136,16 +147,19 @@ Category { o.color = v.color; o.texcoord = TRANSFORM_TEX(v.texcoord.xy,_MainTex); - return o; } // i.color is srgb fixed4 frag (v2f i) : SV_Target { - float4 color = 2.0f * i.color * _TintColor * tex2D(_MainTex, i.texcoord); + float4 texCol = tex2D(_MainTex, i.texcoord); + float4 color = 2.0f * i.color * _TintColor * texCol; color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); +#if SELECTION_ON + color.rgb = GetSelectionColor() * texCol.a; +#endif return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader.meta index 20ded7bf..43e8c873 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: f62b84c7d6bc5f24487edcd3a458ce88 -timeCreated: 1467773228 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset new file mode 100644 index 00000000..c560fde4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Embers_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 02ffb866-7fb2-4d15-b761-1012cefb1360 + m_DurableName: Embers + m_Material: {fileID: 2100000, guid: 02ffb8667fb24d15b7611012cefb1360, type: 2} + m_IsParticle: 1 + m_uv0Size: 4 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 1 + m_bUseNormals: 1 + m_normalSemantic: 1 + m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset.meta new file mode 100644 index 00000000..d2cf311a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 980867b687111b64d84af77dcff37963 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat new file mode 100644 index 00000000..f45c00bd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat @@ -0,0 +1,90 @@ +%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: Embers_16 + m_Shader: {fileID: 4800000, guid: f62b84c7d6bc5f24487edcd3a458ce88, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: b7d6447f2b229224fadf587c59f88775, 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: + - _BaseGain: 0.4 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 300 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ScrollJitterFrequency: 5 + - _ScrollJitterIntensity: 0.3 + - _ScrollRate: 0.6 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SparkleRate: 2.5 + - _SpecularHighlights: 1 + - _SpreadSize: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _WaveformFreq: 0.1 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _ScrollDistance: {r: 2, g: 6, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} + - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat.meta new file mode 100644 index 00000000..91dc480b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ad90888a38f27c4980540e491c48164 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/maintexture.png index 03a994c359868304dc8833a279b19cfdb618204d..8075e75e04db7107312660568d7ecff7c12cec38 100644 GIT binary patch literal 8219 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 JDl{F={TKBx+CBgP diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/maintexture.png.meta index 7e6fd075..9820497d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: b7d6447f2b229224fadf587c59f88775 -timeCreated: 1443497436 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 5 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube.meta new file mode 100644 index 00000000..19c94537 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bdc489579fffcb4ca43bf5041afb19f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset new file mode 100644 index 00000000..4e435c9a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: FacetedTube_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 4391ffaa-df73-4396-9e33-31e4e4930b27 + m_DurableName: FacetedTube + m_Material: {fileID: 2100000, guid: 4391ffaadf7343969e3331e4e4930b27, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset.meta new file mode 100644 index 00000000..df626f62 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 811c48395a037e651a901d38ff989b7f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat new file mode 100644 index 00000000..ff23ddf3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat @@ -0,0 +1,37 @@ +%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: FacetedTube_16 + m_Shader: {fileID: 4800000, guid: 387f4f61bc82c4e5f813ad7caa1f394a, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat.meta new file mode 100644 index 00000000..c7ff6a26 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4391ffaadf7343969e3331e4e4930b27 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy.meta new file mode 100644 index 00000000..b7c1d4c3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ef69ad5ade0bb547a1e57a2938b54a7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset new file mode 100644 index 00000000..8fde5b20 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Fairy_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d9cc5e99-ace1-4d12-96e0-4a7c18c99cfc + m_DurableName: Fairy + m_Material: {fileID: 2100000, guid: d9cc5e99ace14d1296e04a7c18c99cfc, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset.meta new file mode 100644 index 00000000..bd60a595 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66fb653e1d4373957b0c0fa8573c322d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat new file mode 100644 index 00000000..2aa7eeb9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat @@ -0,0 +1,78 @@ +%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: Fairy_16 + m_Shader: {fileID: 4800000, guid: 2ff11252cfff6694db314e548417a3f3, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat.meta new file mode 100644 index 00000000..c2c03790 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9cc5e99ace14d1296e04a7c18c99cfc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather.meta new file mode 100644 index 00000000..068f82bf --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff414b7d7ef5e084295dd53c4b92a474 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset new file mode 100644 index 00000000..51f031f3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Feather_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: a555b809-2017-46cb-ac26-e63173d8f45e + m_DurableName: Feather + m_Material: {fileID: 2100000, guid: a555b809201746cbac26e63173d8f45e, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset.meta new file mode 100644 index 00000000..84b1971e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fef1d9521b15395c9ec46fe58b33955 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat new file mode 100644 index 00000000..76c7d460 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat @@ -0,0 +1,78 @@ +%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: Feather_16 + m_Shader: {fileID: 4800000, guid: 63ee81a0fbf19bc44bec7e2ca3ba73e1, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 8b8ab8aee175c7944adfbff2011ee7ad, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat.meta new file mode 100644 index 00000000..44f59923 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a555b809201746cbac26e63173d8f45e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.asset index c15b6852..8996340f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.asset.meta index 0f523df6..c32566e9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 3c7ec9f584dd60e4a9308abe95b9f22e -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.mat index ee077455..090eb0c8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.mat @@ -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: Fire m_Shader: {fileID: 4800000, guid: aed6c5abd15318e448cc6f01d2ac0dd1, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.mat.meta index 1306c70f..1bfe3081 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.mat.meta @@ -1,4 +1,8 @@ fileFormatVersion: 2 guid: cb92b59794ca4255b0170e3f42f12f9e NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader index 1432ed1c..3049fa7e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -18,7 +18,7 @@ Properties { _Scroll1 ("Scroll1", Float) = 0 _Scroll2 ("Scroll2", Float) = 0 _DisplacementIntensity("Displacement", Float) = .1 - _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 + _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 } Category { @@ -38,9 +38,11 @@ Category { #pragma multi_compile_particles #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -57,7 +59,7 @@ Category { }; struct v2f { - float4 vertex : POSITION; + float4 pos : POSITION; float4 color : COLOR; #if SHADER_TARGET >= 40 centroid float2 texcoord : TEXCOORD0; @@ -79,7 +81,7 @@ Category { v2f o; o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); o.color = bloomColor(v.color, _EmissionGain); - o.vertex = UnityObjectToClipPos(v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.worldPos = mul(unity_ObjectToWorld, v.vertex); return o; } @@ -108,16 +110,19 @@ Category { //procedural_line = pow(procedural_line, i.texcoord.x* 10); #else - displacement = tex2D(_MainTex, i.texcoord + half2(-_Time.x * _Scroll1, 0) ).a; + displacement = tex2D(_MainTex, i.texcoord + half2(-_Time.x * _Scroll1, 0) ).a; #endif - half4 tex = tex2D(_MainTex, i.texcoord + half2(-_Time.x * _Scroll2, 0) - displacement * _DisplacementIntensity); + half4 tex = tex2D(_MainTex, i.texcoord + half2(-_Time.x * _Scroll2, 0) - displacement * _DisplacementIntensity); + tex.xyz *= step(0.01, tex.xyz); + #ifdef AUDIO_REACTIVE tex = tex * .5 + 2 * procedural_line * ( envelope * envelopeHalf); #endif float4 color = i.color * tex; color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); + FRAG_MOBILESELECT(color) return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader.meta index f0beb7d0..31e1f4ac 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 guid: aed6c5abd15318e448cc6f01d2ac0dd1 ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset new file mode 100644 index 00000000..93a69bc6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Fire_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: cb92b597-94ca-4255-b017-0e3f42f12f9e + m_DurableName: Fire + m_Material: {fileID: 2100000, guid: cb92b59794ca4255b0170e3f42f12f9e, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset.meta new file mode 100644 index 00000000..35fcbcbf --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 124ef0e473e7c4748b73c65209b43ace +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat new file mode 100644 index 00000000..e1a6e9c6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat @@ -0,0 +1,37 @@ +%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: Fire_16 + m_Shader: {fileID: 4800000, guid: aed6c5abd15318e448cc6f01d2ac0dd1, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7fd085260938914449a4cdca9398e8d1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _DisplacementIntensity: 0.1 + - _EmissionGain: 0.5 + - _InvFade: 1 + - _Scroll1: 20 + - _Scroll2: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat.meta new file mode 100644 index 00000000..e08cc447 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2bb539dcdc15cd468d39a419770d923 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/fire.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/fire.png.meta index d2caacf9..4a711f0d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/fire.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/fire.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 7fd085260938914449a4cdca9398e8d1 -timeCreated: 1440714590 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 3 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 5 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta new file mode 100644 index 00000000..032aae34 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78241a9546dbb6b4fa1e8ba8f2e079fd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset new file mode 100644 index 00000000..9eeb09b9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Fire2_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 53d753ef-083c-45e1-98e7-4459b4471219 + m_DurableName: Fire2 + m_Material: {fileID: 2100000, guid: 53d753ef083c45e198e74459b4471219, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta new file mode 100644 index 00000000..982d8613 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 026e014eee7f6bf5c8e1787b57ebaefc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat new file mode 100644 index 00000000..cfadd867 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat @@ -0,0 +1,47 @@ +%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: Fire2_16 + m_Shader: {fileID: 4800000, guid: fb1ab3f9ab465f54eb58155e74965fd3, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _DisplaceTex: + m_Texture: {fileID: 2800000, guid: 81848e33c61a3044488261d77f876538, type: 3} + m_Scale: {x: 2.45, y: 1} + m_Offset: {x: 0, y: 0} + - _DisplaceTex2: + m_Texture: {fileID: 2800000, guid: 40f5f7fe2711abc49996d6c0b10f65eb, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 3e1013826bb3a0c458492e9d6bede944, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _DisplacementIntensity: 0.04 + - _EmissionGain: 0.405 + - _FlameFadeMax: 30 + - _FlameFadeMin: 8.53 + - _InvFade: 1 + - _Scroll1: 15 + - _Scroll2: 8 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta new file mode 100644 index 00000000..d71c0dab --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53d753ef083c45e198e74459b4471219 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset index 5e3d5021..77e32d16 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset.meta index d1b41bdc..7b976c4a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: de779677f45c66b5bb80d8fdc8604238 -timeCreated: 1529443748 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat index 50a708ca..77ab9afc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat @@ -4,11 +4,12 @@ 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: Flat_15 m_Shader: {fileID: 4800000, guid: 86ab46f12486fa446b99415e1f4785ca, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat.meta index 9042208c..c364e1c3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 2d35bcf0e4d8452c97b13311be063130 -timeCreated: 1496877550 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset new file mode 100644 index 00000000..78adf2c6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Flat_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 2d35bcf0-e4d8-452c-97b1-3311be063130 + m_DurableName: Flat + m_Material: {fileID: 2100000, guid: 2d35bcf0e4d8452c97b13311be063130, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset.meta new file mode 100644 index 00000000..d85c610c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0de450cbc920f1940b8b8321cc716bfa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat new file mode 100644 index 00000000..1436d47e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat @@ -0,0 +1,78 @@ +%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: Flat_16 + m_Shader: {fileID: 4800000, guid: 86ab46f12486fa446b99415e1f4785ca, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat.meta new file mode 100644 index 00000000..4659c580 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 121e942829f7f734bbd2015d15dc508d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset index a63b41a6..4ee52b64 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset.meta index 35c9d084..447076e9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 969b71c814f75e9408602593d4e10e3e -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat index d557358e..525e99bd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat @@ -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: FlatDeprecated m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat.meta index a715b878..b1b9956c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 55303bc4c7494a7298d9d23e68e76e18 -timeCreated: 1481917494 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset new file mode 100644 index 00000000..f6eee813 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: FlatDeprecated_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 55303bc4-c749-4a72-98d9-d23e68e76e18 + m_DurableName: FlatDeprecated + m_Material: {fileID: 2100000, guid: 55303bc4c7494a7298d9d23e68e76e18, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset.meta new file mode 100644 index 00000000..cba0e169 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 48988924b98c9d94183824f4f58e12a7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat new file mode 100644 index 00000000..e098bbde --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat @@ -0,0 +1,77 @@ +%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: FlatDeprecated_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat.meta new file mode 100644 index 00000000..228bd746 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc0144a19a6931341a74641d79c3bd59 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset index ce6590cd..94fa7c1f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset.meta index f823c6e4..364fe17f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: a97674f9669261b48a61cfed32378345 -timeCreated: 1529443749 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat index 2e673525..56401ffc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat @@ -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: Flat_0 m_Shader: {fileID: 4800000, guid: fc163d24473ddd04881e4fc188ed5802, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat.meta index 33b478fe..b3fcc733 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 280c0a7aaad8416ca7d2df63d129ca70 -timeCreated: 1496877550 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset new file mode 100644 index 00000000..a456e454 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Flat_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 280c0a7a-aad8-416c-a7d2-df63d129ca70 + m_DurableName: Flat + m_Material: {fileID: 2100000, guid: 280c0a7aaad8416ca7d2df63d129ca70, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset.meta new file mode 100644 index 00000000..2b74d1fe --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4af48b7f339a4ca4e9f1c9a7658aebcd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat new file mode 100644 index 00000000..41a65a1e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat @@ -0,0 +1,77 @@ +%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: Flat_16 + m_Shader: {fileID: 4800000, guid: fc163d24473ddd04881e4fc188ed5802, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat.meta new file mode 100644 index 00000000..baed3eb5 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2b4fe4f8cd68db4482658b112edb77c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta new file mode 100644 index 00000000..60d87cbc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac17f035faddb8d4191f4be44d737220 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset new file mode 100644 index 00000000..ca3262a6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Gouache_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 1b897b7e-9b76-425a-b031-a867c48df409 + m_DurableName: Gouache + m_Material: {fileID: 2100000, guid: 1b897b7e9b76425ab031a867c48df409, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta new file mode 100644 index 00000000..245aebeb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b04662a6e713b0578030ffa3d74d5dc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat new file mode 100644 index 00000000..8964f513 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat @@ -0,0 +1,79 @@ +%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: Gouache_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 3a1bfa901a032c94e9a3e4adb6952d0f, type: 3} + 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: 6c1cf6c0ae3c96846946d476a0b86a09, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.01 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta new file mode 100644 index 00000000..903acafb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b897b7e9b76425ab031a867c48df409 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta new file mode 100644 index 00000000..64742b33 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b68cd706e4e6cc2408ed2ce7a4647021 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset new file mode 100644 index 00000000..1d001e4e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Gouache_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 4465b5ef-3605-bec4-2b3e-6b04508ddb6b + m_DurableName: Gouache + m_Material: {fileID: 2100000, guid: 4465b5ef3605bec42b3e6b04508ddb6b, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta new file mode 100644 index 00000000..fe5a5de3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55d97626500acb15394a5c4604f100cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat new file mode 100644 index 00000000..c673aff0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat @@ -0,0 +1,79 @@ +%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: Gouache_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 3a1bfa901a032c94e9a3e4adb6952d0f, type: 3} + 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: 6c1cf6c0ae3c96846946d476a0b86a09, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.01 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta new file mode 100644 index 00000000..16bd56b0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4465b5ef3605bec42b3e6b04508ddb6b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta new file mode 100644 index 00000000..6dba8e03 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c2435ebd91affb647b2ccd4c9d56201c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset new file mode 100644 index 00000000..317dff39 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Guts_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 99aafe96-1645-44cd-99bd-979bc6ef37c5 + m_DurableName: Guts + m_Material: {fileID: 2100000, guid: 99aafe96164544cd99bd979bc6ef37c5, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta new file mode 100644 index 00000000..d03a3b84 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5316e81a637acfe58aa970f605fa1618 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat new file mode 100644 index 00000000..f1ae5823 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat @@ -0,0 +1,83 @@ +%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: Guts_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: _EMISSION _NORMALMAP + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: d03c44c5f6a1b194ea104833f9ba840d, type: 3} + m_Scale: {x: 0.15, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 0.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: 0.1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ccfef80c6153521489f5745b0d4dffec, type: 3} + m_Scale: {x: 0.15, 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.3 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.305 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.743 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.23745675, g: 0.2579406, b: 0.2647059, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta new file mode 100644 index 00000000..810bd184 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99aafe96164544cd99bd979bc6ef37c5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader index 0c1f54c1..6094a664 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -16,7 +16,6 @@ Shader "Brush/Special/AdditiveCutout" { Properties { _MainTex ("Texture", 2D) = "white" {} _Cutoff ("Alpha cutoff", Range(0,1)) = 0.5 - } Category { @@ -33,8 +32,10 @@ Category { #pragma vertex vert #pragma fragment frag #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; uniform float _Cutoff; @@ -46,7 +47,7 @@ Category { }; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -57,20 +58,22 @@ Category { { v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); o.color = TbVertToNative(v.color); return o; } - fixed4 frag (v2f i) : SV_Target + fixed4 frag (v2f i) : COLOR { half4 c = tex2D(_MainTex, i.texcoord ); // Cutoff the alpha value based on the incoming vertex alpha i.color.a = (i.color.a * c.a < _Cutoff) ? 0 : 1; - return i.color * float4(c.rgb,1); + float4 col = i.color * float4(c.rgb,1); + FRAG_MOBILESELECT(col) + return col; } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader.meta index 8c773240..d2b8adf0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: e2d9c195722354e42a5a45e5b73a9f19 -timeCreated: 1449195007 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset index a757fea4..5c19afda 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset.meta index 3a7a1591..e21cdccf 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 0cfb52fb947fb6e4786ed9f2bdc5328c -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat index 7d6acac7..779883c9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat @@ -4,11 +4,12 @@ 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: Highlighter m_Shader: {fileID: 4800000, guid: e2d9c195722354e42a5a45e5b73a9f19, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: SELECTION_EDGING m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -31,12 +32,14 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - SelectAmplifyEdges: 1 - _Cutoff: 0.12 - _DisplacementIntensity: 0.1 - _EmissionGain: 0.25 - _InvFade: 1 - _Scroll1: 2 - _Scroll2: -2 + - _SelectionEdging: 1 - _Smoothness: 0.078125 - _Strength: 0.5 m_Colors: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat.meta index 6575de10..771cc5cc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: cf019139d41c4eb0a1d05cf54b0a42f3 -timeCreated: 1481917484 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset new file mode 100644 index 00000000..c8bd1a35 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Highlighter_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: cf019139-d41c-4eb0-a1d0-5cf54b0a42f3 + m_DurableName: Highlighter + m_Material: {fileID: 2100000, guid: cf019139d41c4eb0a1d05cf54b0a42f3, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset.meta new file mode 100644 index 00000000..c6dcf467 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9707c937e62b19849928a8dc2cd5a6a0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat new file mode 100644 index 00000000..c64b160e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat @@ -0,0 +1,50 @@ +%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: Highlighter_16 + m_Shader: {fileID: 4800000, guid: e2d9c195722354e42a5a45e5b73a9f19, type: 3} + m_ShaderKeywords: SELECTION_EDGING + 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} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 2a6e115fa9494f2479d7a5284cbe2d3b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - SelectAmplifyEdges: 1 + - _Cutoff: 0.12 + - _DisplacementIntensity: 0.1 + - _EmissionGain: 0.25 + - _InvFade: 1 + - _Scroll1: 2 + - _Scroll2: -2 + - _SelectionEdging: 1 + - _Smoothness: 0.078125 + - _Strength: 0.5 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat.meta new file mode 100644 index 00000000..de510e10 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbc9990a3d7b7b9429a62ea359ad65e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/maintexture.png.meta index 7aad0d55..cdca3152 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/maintexture.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 2a6e115fa9494f2479d7a5284cbe2d3b -timeCreated: 1440714585 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta new file mode 100644 index 00000000..2690a88f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8ee14578eb601843851b75dbe1d50a2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset new file mode 100644 index 00000000..b84d89fd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: HolidayTree_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 20a0bf1a-a96e-44e5-84ac-9823d2d65023 + m_DurableName: HolidayTree + m_Material: {fileID: 2100000, guid: 20a0bf1aa96e44e584ac9823d2d65023, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 0 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta new file mode 100644 index 00000000..3a118df1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd353eba365eee252b6e8be44267c191 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat new file mode 100644 index 00000000..da59ca5d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat @@ -0,0 +1,37 @@ +%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: HolidayTree_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta new file mode 100644 index 00000000..4dd42b60 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20a0bf1aa96e44e584ac9823d2d65023 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset index 6b6a3cc9..14caa119 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset.meta index fe47671a..600c37f6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 88ecf340d7ce92a4bada6eac937e887a -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat index 71cd184a..172938b6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat @@ -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: HyperGrid m_Shader: {fileID: 4800000, guid: a2fa29912c23a774898a1b8b236ed79d, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat.meta index 600c1a3e..7ede3ac4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 6a1cf9f9032c45ec9b6ea6680bee32e9 -timeCreated: 1481917492 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader index 19474872..d75a0304 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -36,9 +36,11 @@ Category { #pragma glsl #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; @@ -51,7 +53,7 @@ Category { }; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -83,7 +85,7 @@ Category { float3 quantPos = ceil(worldPos.xyz * q) / q; worldPos.xyz = quantPos; worldPos = mul(xf_CS, worldPos); - o.vertex = mul(UNITY_MATRIX_VP, worldPos); + o.pos = mul(UNITY_MATRIX_VP, worldPos); o.color = 2 * v.color + v.color.yzxw * _BeatOutput.x; o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); @@ -96,6 +98,7 @@ Category { float4 c = i.color * _TintColor * tex2D(_MainTex, i.texcoord); c = float4(c.rgb * c.a, 1.0); c = SrgbToNative(c); + FRAG_MOBILESELECT(c) return c; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader.meta index 7f1f9da4..0903860c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: a2fa29912c23a774898a1b8b236ed79d -timeCreated: 1467942564 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset new file mode 100644 index 00000000..a1bdd060 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: HyperGrid_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 6a1cf9f9-032c-45ec-9b6e-a6680bee32e9 + m_DurableName: HyperGrid + m_Material: {fileID: 2100000, guid: 6a1cf9f9032c45ec9b6ea6680bee32e9, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 4 + m_uv1Semantic: 2 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset.meta new file mode 100644 index 00000000..87484f95 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89666103549d60b4b854b5bbb8d2ee50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat new file mode 100644 index 00000000..9c3b656e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat @@ -0,0 +1,39 @@ +%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: HyperGrid_16 + m_Shader: {fileID: 4800000, guid: a2fa29912c23a774898a1b8b236ed79d, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: b8757e27137f3ba4da9ad36c95d82bb4, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BaseGain: 0.4 + - _EmissionGain: 1 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + - _WaveformFreq: 0.2 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} + - _WaveformIntensity: {r: 0, g: 0.3, b: 0, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat.meta new file mode 100644 index 00000000..0585cefc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2763ab2e38683ba40a0738c5822ce037 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/maintexture.png.meta index 18eebee6..94cb3258 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: b8757e27137f3ba4da9ad36c95d82bb4 -timeCreated: 1467942564 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader index 2cc25131..a8b13309 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -27,11 +27,26 @@ Properties { LOD 100 CGPROGRAM - #pragma target 3.0 - #pragma surface surf StandardSpecular vertex:vert alphatest:_Cutoff addshadow + #pragma target 4.0 + #pragma surface surf StandardSpecular vertex:vert addshadow #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON + // Faster compiles + #pragma skip_variants INSTANCING_ON #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" + + struct appdata { + float4 vertex : POSITION; + float3 texcoord : TEXCOORD0; + float3 texcoord1 : TEXCOORD1; + float3 texcoord2 : TEXCOORD2; + half3 normal : NORMAL; + fixed4 color : COLOR; + float4 tangent : TANGENT; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; struct Input { float2 uv_MainTex; @@ -45,8 +60,10 @@ Properties { sampler2D _BumpMap; fixed4 _Color; half _Shininess; + fixed _Cutoff; - void vert (inout appdata_full v) { + void vert (inout appdata v, out Input o) { + UNITY_INITIALIZE_OUTPUT(Input, o); v.color = TbVertToSrgb(v.color); float t = 0.0; @@ -88,14 +105,17 @@ Properties { o.Specular = SrgbToNative(_SpecColor * tex).rgb; o.Normal = UnpackNormal(tex2D(_BumpMap, IN.uv_BumpMap)); o.Alpha = tex.a * IN.color.a; + if (o.Alpha < _Cutoff) { + discard; + } + o.Alpha = 1; #ifdef AUDIO_REACTIVE o.Emission = o.Albedo; o.Albedo = .2; o.Specular *= .5; #endif - + SURF_FRAG_MOBILESELECT(o); o.Normal.z *= IN.vface; - } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader.meta index 4f654260..4625779b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 9a1f8894d4b051a43a120f0b237cd2f8 -timeCreated: 1443582864 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader index c2985329..7389bfe8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader.meta index 95d45aab..8e5c9258 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: ea5570411cfab2d4b9b3f053e5497f0a -timeCreated: 1443582864 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset index ac8b69e8..03ec13f5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset.meta index 91d77851..2ab28a62 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: b22741da3567d9353a0ccc88393d8c8e -timeCreated: 1529443751 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat index 30b1289c..d035e10c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat @@ -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: Hypercolor_15 m_Shader: {fileID: 4800000, guid: 9a1f8894d4b051a43a120f0b237cd2f8, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat.meta index 752ee998..d8bc54a0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: dce872c27b494684b59bc45387949c5c -timeCreated: 1443583622 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset new file mode 100644 index 00000000..44055ddd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Hypercolor_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: dce872c2-7b49-4684-b59b-c45387949c5c + m_DurableName: Hypercolor + m_Material: {fileID: 2100000, guid: dce872c27b494684b59bc45387949c5c, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset.meta new file mode 100644 index 00000000..0ff4c84c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a455d846f69efbd4da961d2a0cd90bd9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat new file mode 100644 index 00000000..94ffc3dc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat @@ -0,0 +1,46 @@ +%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: Hypercolor_16 + m_Shader: {fileID: 4800000, guid: 9a1f8894d4b051a43a120f0b237cd2f8, 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: 2800000, guid: 7c4d1ee0e90a536468404363fb2bef1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: df7c592ef1f278543b4de38471df9994, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _DisplacementIntensity: 0.1 + - _EmissionGain: 0.5 + - _EmissionScroll1: 0 + - _EmissionScroll2: 0 + - _InvFade: 1 + - _Scroll1: 20 + - _Scroll2: 0 + - _Shininess: 0.5 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat.meta new file mode 100644 index 00000000..3f57f626 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61f5c55851cf5ed419b7fa2936f1daa4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/main.png.meta index 85f7e2bd..0cde5688 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/main.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: df7c592ef1f278543b4de38471df9994 -timeCreated: 1442276315 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 5 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/normal.png.meta index ce1c9e6d..0180b9c0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/normal.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 7c4d1ee0e90a536468404363fb2bef1d -timeCreated: 1443584492 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 1 externalNormalMap: 1 - heightScale: .0659999996 + heightScale: 0.066 normalMapFilter: 1 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 + spriteTessellationDetail: -1 textureType: 1 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 51 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset index 196ca3f7..ca5b9734 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset.meta index 724280cf..fea29614 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 3251442494b7f6c43aa51c2ede6c409e -timeCreated: 1529443752 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat index 221c7ffe..d348feea 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat @@ -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: Hypercolor_0 m_Shader: {fileID: 4800000, guid: ea5570411cfab2d4b9b3f053e5497f0a, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat.meta index dafc35ac..00730f4b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: e8ef32b1baa8460a9c2c9cf8506794f5 -timeCreated: 1443583622 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset new file mode 100644 index 00000000..fa3010f9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Hypercolor_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: e8ef32b1-baa8-460a-9c2c-9cf8506794f5 + m_DurableName: Hypercolor + m_Material: {fileID: 2100000, guid: e8ef32b1baa8460a9c2c9cf8506794f5, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset.meta new file mode 100644 index 00000000..fd41c691 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9642984e79fd55b43ab26d97ce89ca0d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat new file mode 100644 index 00000000..11df1b08 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat @@ -0,0 +1,46 @@ +%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: Hypercolor_16 + m_Shader: {fileID: 4800000, guid: ea5570411cfab2d4b9b3f053e5497f0a, 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: 2800000, guid: 7c4d1ee0e90a536468404363fb2bef1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: df7c592ef1f278543b4de38471df9994, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _DisplacementIntensity: 0.1 + - _EmissionGain: 0.5 + - _EmissionScroll1: 0 + - _EmissionScroll2: 0 + - _InvFade: 1 + - _Scroll1: 20 + - _Scroll2: 0 + - _Shininess: 0.5 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat.meta new file mode 100644 index 00000000..bf1d1f10 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e9ed8655025ad646814db8ec882fe92 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset index dc7e0b85..31e9d409 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: Icing m_Material: {fileID: 2100000, guid: 2f212815f4d3c1a4681afeeaf9c6dc37, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset.meta index a22dad81..b0ef955f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 4fcc165667ef68c5780910cc28494a38 -timeCreated: 1529443753 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat index 3efb8401..6a8e0d02 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat @@ -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: Icing_16 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat.meta index 03b582fb..e3bb9115 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 2f212815f4d3c1a4681afeeaf9c6dc37 -timeCreated: 1496358003 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/normal.png.meta index 518e0880..8415c719 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/normal.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 5130495e7534a264da464eec3b7c43d2 -timeCreated: 1496279801 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.02 normalMapFilter: 1 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 1 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 51 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset index 26a69d0d..fb976418 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset.meta index 679c3a6c..1e9ff05e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: f83c05f7491995a53af9be352980ef25 -timeCreated: 1529443754 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat index 4d069180..015493b0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat @@ -4,11 +4,12 @@ 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: Ink_15 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat.meta index c1df8fd7..b5601fac 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: f5c336cf51084b40ade9c687504385ab -timeCreated: 1496877187 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset new file mode 100644 index 00000000..da76b567 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Ink_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f5c336cf-5108-4b40-ade9-c687504385ab + m_DurableName: Ink + m_Material: {fileID: 2100000, guid: f5c336cf51084b40ade9c687504385ab, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset.meta new file mode 100644 index 00000000..ebb45f64 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0a85870efa4ab545ac3bd845b0f53b7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat new file mode 100644 index 00000000..b37ac78c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat @@ -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: Ink_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3} + 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: 31a0dba64c25fa442a02171bc2131ccc, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.4 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat.meta new file mode 100644 index 00000000..0116eaec --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4aca275abc907af40bec616a3e23dce0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture.png.meta index e493f8a3..e9ca4ab8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 31a0dba64c25fa442a02171bc2131ccc -timeCreated: 1440714585 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture_normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture_normal.png.meta index e84e99bc..e25b669f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture_normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture_normal.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 599e16957e2a8a84c81e8e72b55312d7 -timeCreated: 1440714587 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 1 externalNormalMap: 1 - heightScale: .0890000015 + heightScale: 0.089 normalMapFilter: 1 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 + spriteTessellationDetail: -1 textureType: 1 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 51 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta new file mode 100644 index 00000000..5f1a5984 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc6a175fdcdb9144fa0c9407283da447 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset new file mode 100644 index 00000000..1a5986a1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: _16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 7c972c27-d3c2-8af4-7bf8-5d9db8f0b7bb + m_DurableName: + m_Material: {fileID: 2100000, guid: 7c972c27d3c28af47bf85d9db8f0b7bb, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta new file mode 100644 index 00000000..66905094 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd102dbcd22fb8c5a92659c58182d7aa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat new file mode 100644 index 00000000..ece816f1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat @@ -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: _16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3} + 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: 31a0dba64c25fa442a02171bc2131ccc, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.4 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta new file mode 100644 index 00000000..0dd2cd1a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c972c27d3c28af47bf85d9db8f0b7bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset index 0a9c9482..f11290f7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset.meta index 0bf8a885..d6e16bcf 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 6c27caca67a732d4f9d59b028c4dd9a8 -timeCreated: 1529443755 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat index 66d687e2..1a229c31 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat @@ -4,11 +4,12 @@ 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: Ink_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat.meta index 1f975256..9cfe8d0c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: c00120953ffd40408ee1fc180d346eaa -timeCreated: 1496877187 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset new file mode 100644 index 00000000..2ee2378d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Ink_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: c0012095-3ffd-4040-8ee1-fc180d346eaa + m_DurableName: Ink + m_Material: {fileID: 2100000, guid: c00120953ffd40408ee1fc180d346eaa, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset.meta new file mode 100644 index 00000000..9c118fb8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d801113f2492244ea287404fda275fd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat new file mode 100644 index 00000000..5ab9551b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat @@ -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: Ink_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3} + 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: 31a0dba64c25fa442a02171bc2131ccc, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.4 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat.meta new file mode 100644 index 00000000..739990d2 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9f51eb8d2e128248ae1e9b0091c7af8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta new file mode 100644 index 00000000..10c893e0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 493376b5db3b75b438e87799459aa1a2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset new file mode 100644 index 00000000..1f4945a8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: KeijiroTube_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f8ba3d18-01fc-4d7b-b2d9-b99d10b8e7cf + m_DurableName: KeijiroTube + m_Material: {fileID: 2100000, guid: f8ba3d1801fc4d7bb2d9b99d10b8e7cf, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta new file mode 100644 index 00000000..e0e21616 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f9e50c54c7ace8a5b88473c447fdbf8e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat new file mode 100644 index 00000000..bd7bbdfb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat @@ -0,0 +1,79 @@ +%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: KeijiroTube_16 + m_Shader: {fileID: 4800000, guid: 54cf55a2c62eff1458edd3f1e68d0f0a, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.432 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.75735295, g: 0.75735295, b: 0.75735295, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta new file mode 100644 index 00000000..4608364d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8ba3d1801fc4d7bb2d9b99d10b8e7cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta new file mode 100644 index 00000000..8c90dd7e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b85b1d9f9232be40ad5fc76b828daac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset new file mode 100644 index 00000000..0a11484d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Lacewing_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 1cf94f63-f57a-4a1a-ad14-295af4f5ab5c + m_DurableName: Lacewing + m_Material: {fileID: 2100000, guid: 1cf94f63f57a4a1aad14295af4f5ab5c, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta new file mode 100644 index 00000000..5f6f5d66 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78b2b9b4f4a66d855b5ff47423606d67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat new file mode 100644 index 00000000..458a620d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat @@ -0,0 +1,87 @@ +%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: Lacewing_16 + m_Shader: {fileID: 4800000, guid: 7e1a0dadd1e4c4d4188e90445d167319, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION _NORMALMAP _SPECGLOSSMAP + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: dc24e2075b423f943aaa744cbccf20c9, type: 3} + 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: 8eb8288ae9ead3741a090cdc7940f161, 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} + - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: 9f5fc705fe72374448bf9e0f1203beb3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecTex: + m_Texture: {fileID: 2800000, guid: 9f5fc705fe72374448bf9e0f1203beb3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.9 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 0.741 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.8 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.14705884, g: 0.14705884, b: 0.14705884, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta new file mode 100644 index 00000000..be894a78 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1cf94f63f57a4a1aad14295af4f5ab5c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta new file mode 100644 index 00000000..c3ee3e88 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 817db968ed74e2241918e00ba3c5cac7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset new file mode 100644 index 00000000..78dac412 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: _16 + m_EditorClassIdentifier: + m_Guid: + m_storage: ddda8745-4bb5-ac54-88b6-d1480370583e + m_DurableName: + m_Material: {fileID: 2100000, guid: ddda87454bb5ac5488b6d1480370583e, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta new file mode 100644 index 00000000..e91f93b7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92ff03b2bb2a29a5e9d6a4f1a713c69d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat new file mode 100644 index 00000000..4b150dc2 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat @@ -0,0 +1,90 @@ +%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: _16 + m_Shader: {fileID: 4800000, guid: 6bb8cf7337b1ff743819661ccd6cbb61, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BGTex: + m_Texture: {fileID: 2800000, guid: 05eafee566d1a0246aa955fe3b5c71e2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 5748e3a43c5fac54684f79a6f855b2f6, type: 3} + 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: 69d2e7612c71ad14298c0f84c741c1e5, type: 3} + m_Scale: {x: 0.3, y: 0.5} + 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} + - _SecondaryTex: + m_Texture: {fileID: 2800000, guid: 69d2e7612c71ad14298c0f84c741c1e5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Ratio: 0.57 + - _Shininess: 0.01 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SqueezeAmount: 0.9 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.44117647, g: 0.44117647, b: 0.44117647, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _LineColor: {r: 0.15158093, g: 0.62766045, b: 0.9411765, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta new file mode 100644 index 00000000..b6d4499f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ddda87454bb5ac5488b6d1480370583e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/leaves.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/leaves.png.meta index dc6c5b8e..5e5c03db 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/leaves.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/leaves.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 3743071a0f034424390b1aa53dda0d60 -timeCreated: 1440714585 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 + spriteTessellationDetail: -1 textureType: 0 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/normal.png.meta index f1ffde5e..4b53f7ec 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/normal.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 735a5f2fd14c4764682ef32fc6822de5 -timeCreated: 1443655891 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 1 externalNormalMap: 1 - heightScale: .0460000001 + heightScale: 0.046 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 + spriteTessellationDetail: -1 textureType: 1 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 51 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta new file mode 100644 index 00000000..893c1e9f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9c5cdaa4f512f040a381f1e2a0d41af +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset new file mode 100644 index 00000000..21eb2a3e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Leaves2_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 7259cce5-41c1-ec74-c885-78af28a31d95 + m_DurableName: Leaves2 + m_Material: {fileID: 2100000, guid: 7259cce541c1ec74c88578af28a31d95, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta new file mode 100644 index 00000000..0bd02b4b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 242adf01c508b5253aefe5c5bab9cd42 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat new file mode 100644 index 00000000..976899fb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat @@ -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: Leaves2_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 735a5f2fd14c4764682ef32fc6822de5, type: 3} + 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: 3743071a0f034424390b1aa53dda0d60, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.395 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta new file mode 100644 index 00000000..57a107fd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7259cce541c1ec74c88578af28a31d95 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset index 7a6d2193..2febf5d0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset.meta index f2b8c6dc..99a79038 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 362043fe9dab1704fa0f912c4f1e0d09 -timeCreated: 1529443756 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat index 45770823..48b1902b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat @@ -4,11 +4,12 @@ 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: Leaves_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.395 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat.meta index d1a7e956..4641defd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: ea19de07d0c04484919818489a3c1487 -timeCreated: 1496879712 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset new file mode 100644 index 00000000..13ca845d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Leaves_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: ea19de07-d0c0-4484-9198-18489a3c1487 + m_DurableName: Leaves + m_Material: {fileID: 2100000, guid: ea19de07d0c04484919818489a3c1487, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset.meta new file mode 100644 index 00000000..324d38eb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: baf111a6ab075664cbad82455f9dd517 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat new file mode 100644 index 00000000..023a64da --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat @@ -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: Leaves_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 735a5f2fd14c4764682ef32fc6822de5, type: 3} + 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: 3743071a0f034424390b1aa53dda0d60, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.395 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat.meta new file mode 100644 index 00000000..d42b2826 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dfd791f59a9944f498dbf0bc0fe018fc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset index 572a1606..035e8ad2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset.meta index 417e8292..77be0916 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 54a30b55c2e961643a7701bedc663c88 -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat index 0d269fb7..0451be73 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat @@ -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: Light m_Shader: {fileID: 4800000, guid: 3623f1b71da7dda49b588a77c984e1de, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat.meta index 9ff557cd..1c550fe5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 2241cd328ba248a59ee72caef7e9ed62 -timeCreated: 1481917485 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset new file mode 100644 index 00000000..711c1828 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Light_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 2241cd32-8ba2-48a5-9ee7-2caef7e9ed62 + m_DurableName: Light + m_Material: {fileID: 2100000, guid: 2241cd328ba248a59ee72caef7e9ed62, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset.meta new file mode 100644 index 00000000..75412d1f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 44810a6fc26cce84d9f618d2da2584c7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat new file mode 100644 index 00000000..eb1f6b1e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat @@ -0,0 +1,78 @@ +%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: Light_16 + m_Shader: {fileID: 4800000, guid: 3623f1b71da7dda49b588a77c984e1de, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0e093d6c79a128746b77cc289ed425a7, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.45 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat.meta new file mode 100644 index 00000000..bfd736d4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e6ce78101b8d554d9eefc2822e5a4aa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/maintexture.png.meta index 52362130..938d295a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 0e093d6c79a128746b77cc289ed425a7 -timeCreated: 1440714584 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 5 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset index 59582c87..c5bf79a0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset.meta index c3ce6c74..5a298188 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 4f55fba4b64913b419cf4a17ba5d489b -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat index 2b5552dd..4b04ba41 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat @@ -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: LightWire m_Shader: {fileID: 4800000, guid: 3b4cc34a39a839049b4387ce42e3b56c, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat.meta index 7e1a64be..ca05ffb3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 4391aaaadf8143969e3331e4e4930b27 -timeCreated: 1481917492 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader index 71666d5e..2ea76d30 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -23,18 +23,17 @@ Shader "Brush/Special/LightWire" { SubShader { Cull Back CGPROGRAM - #pragma target 3.0 + #pragma target 4.0 #pragma surface surf StandardSpecular vertex:vert noshadow #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" struct Input { float2 uv_MainTex; - float2 uv_BumpMap; float4 color : Color; - float3 worldPos; - float3 viewDir; }; sampler2D _MainTex; @@ -42,7 +41,8 @@ Shader "Brush/Special/LightWire" { fixed4 _Color; half _Shininess; - void vert (inout appdata_full v) { + void vert (inout appdata_full v, out Input o) { + UNITY_INITIALIZE_OUTPUT(Input, o); v.color = TbVertToSrgb(v.color); // Radius is stored in texcoord (used to be tangent.w) @@ -100,6 +100,8 @@ Shader "Brush/Special/LightWire" { o.Albedo = SrgbToNative3(o.Albedo); o.Emission = SrgbToNative3(o.Emission); o.Specular = SrgbToNative3(o.Specular); + + SURF_FRAG_MOBILESELECT(o); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader.meta index 74c60897..598b844d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 3b4cc34a39a839049b4387ce42e3b56c -timeCreated: 1468009950 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset new file mode 100644 index 00000000..18a20de6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: LightWire_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 4391aaaa-df81-4396-9e33-31e4e4930b27 + m_DurableName: LightWire + m_Material: {fileID: 2100000, guid: 4391aaaadf8143969e3331e4e4930b27, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset.meta new file mode 100644 index 00000000..f56e5ddd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 16b56a1a0e1590147a104e9abc851e36 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat new file mode 100644 index 00000000..57ba82f1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat @@ -0,0 +1,43 @@ +%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: LightWire_16 + m_Shader: {fileID: 4800000, guid: 3b4cc34a39a839049b4387ce42e3b56c, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + 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} + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ea466d6b6f5981a418210cf0db7aee16, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + - _Shininess: 0.81 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat.meta new file mode 100644 index 00000000..abbd51fa --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b60fdd5b9e3ca984c8aeecfd0b13748f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/maintexture.png.meta index be99fcd2..cbf909f1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: ea466d6b6f5981a418210cf0db7aee16 -timeCreated: 1468011076 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta new file mode 100644 index 00000000..69fa211a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30f17350ba549c04d9327268e159f550 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset new file mode 100644 index 00000000..61777b50 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Wire (Lit)_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 62fef968-e842-3224-4a0e-1fdb7cfb745c + m_DurableName: Wire (Lit) + m_Material: {fileID: 2100000, guid: 62fef968e84232244a0e1fdb7cfb745c, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta new file mode 100644 index 00000000..ae106eac --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bfc9ec097bc4a445383f719c6602584d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat new file mode 100644 index 00000000..d9687a6f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat @@ -0,0 +1,79 @@ +%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: Wire (Lit)_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta new file mode 100644 index 00000000..a2744718 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62fef968e84232244a0e1fdb7cfb745c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset index 91f924cd..ee6b49ad 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: Lofted m_Material: {fileID: 2100000, guid: d381e0f53def4a0d885331e9200bcbda, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset.meta index c2ef52c4..2d8c9d80 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 1d8b02cc1233fee5fae7728123e6257d -timeCreated: 1529443758 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat index 336e58b8..d10cfdeb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat @@ -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: Lofted_16 m_Shader: {fileID: 4800000, guid: fc163d24473ddd04881e4fc188ed5802, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat.meta index 544cdf41..4425df59 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d381e0f53def4a0d885331e9200bcbda -timeCreated: 1480279860 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta new file mode 100644 index 00000000..a7e493fb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f2569232895ece4b84f369068b9fdca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset new file mode 100644 index 00000000..34e792f3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Lofted (Hue Shift)_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: c5da2e70-a6e4-63a4-898c-5cfedef09c97 + m_DurableName: Lofted (Hue Shift) + m_Material: {fileID: 2100000, guid: c5da2e70a6e463a4898c5cfedef09c97, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta new file mode 100644 index 00000000..c486273b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ddfae286c35c87e54a394a983cad0491 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat new file mode 100644 index 00000000..3b7cde56 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat @@ -0,0 +1,43 @@ +%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: Lofted (Hue Shift)_16 + m_Shader: {fileID: 4800000, guid: 9c338a5b76b34404c95b237822b3bd21, 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} + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + - _Shininess: 0.4 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.13235295, g: 0.13235295, b: 0.13235295, a: 0} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta new file mode 100644 index 00000000..2b662205 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5da2e70a6e463a4898c5cfedef09c97 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta new file mode 100644 index 00000000..007fe670 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d264e7e8e8b1984d97c7d4b596ece1c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset new file mode 100644 index 00000000..6e751457 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Marbled Rainbow_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: c86c058d-1bda-2e94-08db-f3d6a96ac4a1 + m_DurableName: Marbled Rainbow + m_Material: {fileID: 2100000, guid: c86c058d1bda2e9408dbf3d6a96ac4a1, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta new file mode 100644 index 00000000..6e23bcb6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 658eed08dfd4e5850b642d22cd495b97 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat new file mode 100644 index 00000000..118a0f60 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat @@ -0,0 +1,87 @@ +%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: Marbled Rainbow_16 + m_Shader: {fileID: 4800000, guid: 2734c8c206f6a5f408615a5ab03a6e6d, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION _NORMALMAP _SPECGLOSSMAP + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 70738dc9310ce1a4f88400c683a47494, type: 3} + 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: 795b3993927f0fa4d88e29f4596b1d2b, 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} + - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: 9f5fc705fe72374448bf9e0f1203beb3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecTex: + m_Texture: {fileID: 2800000, guid: 6697d3cba218276429328ca416628c75, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 0.741 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.8 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2205882, g: 0.2205882, b: 0.2205882, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta new file mode 100644 index 00000000..e01d5a4a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c86c058d1bda2e9408dbf3d6a96ac4a1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset index 0b77a90b..5ac3bdfa 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset.meta index 0afe43d2..2b440c3d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 3fd505f4dc669fe4c86c80d009ec2efd -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat index 985b7703..902ba989 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat @@ -4,11 +4,12 @@ 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: Marker m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: EDGING_ON SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -59,6 +60,7 @@ Material: - _Cutoff: 0.067 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Edging: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -66,6 +68,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat.meta index 224b0051..af7c5f32 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 429ed64a4e97446684d3145a861ef684 -timeCreated: 1481917483 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset new file mode 100644 index 00000000..40909e43 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Marker_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 429ed64a-4e97-4466-84d3-145a861ef684 + m_DurableName: Marker + m_Material: {fileID: 2100000, guid: 429ed64a4e97446684d3145a861ef684, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset.meta new file mode 100644 index 00000000..a6716bbf --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 585b99ab356f38d44bfa0bca89166410 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat new file mode 100644 index 00000000..e39a3f8b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat @@ -0,0 +1,79 @@ +%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: Marker_16 + m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} + m_ShaderKeywords: EDGING_ON SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + 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: a5e21dec06724194490cbe6156ac19d2, 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.067 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Edging: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat.meta new file mode 100644 index 00000000..afd7fade --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02bf69f0523f4884097212f649440707 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/maintexture.png.meta index 9d1986c7..da9c385d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/maintexture.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: a5e21dec06724194490cbe6156ac19d2 -timeCreated: 1449103567 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset index 9db8860e..43e128a6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: MatteHull m_Material: {fileID: 2100000, guid: 79348357432d47468e290e25c112e3aa, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset.meta index 12d5550c..2fa0b886 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: cc8a936db644b835cb1d6ac3836f65f2 -timeCreated: 1529443760 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat index 0739e2fa..de62174b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat @@ -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: MatteHull_16 m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat.meta index ac7f2481..165328dc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 79348357432d47468e290e25c112e3aa -timeCreated: 1498761536 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta new file mode 100644 index 00000000..eaf7763d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8829dc4033451184e8c2e803035d45a5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset new file mode 100644 index 00000000..b41000e1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Muscle_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f28c395c-a57d-464b-8f0b-558c59478fa3 + m_DurableName: Muscle + m_Material: {fileID: 2100000, guid: f28c395ca57d464b8f0b558c59478fa3, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta new file mode 100644 index 00000000..41b1d279 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66eaa331dac132e588b955c39ede2701 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat new file mode 100644 index 00000000..2b7f6b18 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat @@ -0,0 +1,83 @@ +%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: Muscle_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: _EMISSION _NORMALMAP + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: d72cc108e6b8e2b459e9399f8217b7e1, type: 3} + m_Scale: {x: 0.25, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 0.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: 0.1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 8bb9cbfa02bae984fba39bb96a916591, type: 3} + m_Scale: {x: 0.25, 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.3 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.305 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.57 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.08088237, g: 0.08088237, b: 0.08088237, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta new file mode 100644 index 00000000..360270c1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f28c395ca57d464b8f0b558c59478fa3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta new file mode 100644 index 00000000..9cb14c6f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea685b76f3faae942865cadea282aa5e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset new file mode 100644 index 00000000..ecb0c721 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: MylarTube_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 8e58ceea-7830-49b4-aba9-6215104ab52a + m_DurableName: MylarTube + m_Material: {fileID: 2100000, guid: 8e58ceea783049b4aba96215104ab52a, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta new file mode 100644 index 00000000..618c76fc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ab8a65ca50e7bf5897129432ea7e033 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat new file mode 100644 index 00000000..29f9ee31 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat @@ -0,0 +1,54 @@ +%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: MylarTube_16 + m_Shader: {fileID: 4800000, guid: 073d6ba13e511e24bb3ba4f7c8f744ee, 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} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a23cfe16e9d8cf4b820c79d8d2b9c5a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _DisplacementIntensity: 0.1 + - _EmissionGain: 0.25 + - _InvFade: 1 + - _Scroll1: 2 + - _Scroll2: -2 + - _ScrollJitterFrequency: 1 + - _ScrollJitterIntensity: 3 + - _ScrollRate: -0.54 + - _Shininess: 0.68 + - _Smoothness: 0.078125 + - _SqueezeAmount: 0.873 + - _Strength: 0.5 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.75, g: 0.75, b: 0.75, a: 0} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta new file mode 100644 index 00000000..59009c41 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e58ceea783049b4aba96215104ab52a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset index c34a919d..9c269160 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: NeonPulse m_Material: {fileID: 2100000, guid: b2ffef01eaaa4ab5aa6495a2c4f5dbc6, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset.meta index a7e7896d..c15ca7aa 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 71228caab923caf46a89c3275938564a -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat index 42c4f79f..7ff435d1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat @@ -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: NeonPulse m_Shader: {fileID: 4800000, guid: 39f9ec0559d25f44bad64ce4dbc8a0c4, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat.meta index 217e4ed6..7c068dac 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: b2ffef01eaaa4ab5aa6495a2c4f5dbc6 -timeCreated: 1481917491 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset new file mode 100644 index 00000000..2ce3a4e0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: NeonPulse_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: b2ffef01-eaaa-4ab5-aa64-95a2c4f5dbc6 + m_DurableName: NeonPulse + m_Material: {fileID: 2100000, guid: b2ffef01eaaa4ab5aa6495a2c4f5dbc6, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset.meta new file mode 100644 index 00000000..c33b8245 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3bd18e27f9d1cc44c9c7552284201e11 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat new file mode 100644 index 00000000..bf7033fd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat @@ -0,0 +1,36 @@ +%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: NeonPulse_16 + m_Shader: {fileID: 4800000, guid: 39f9ec0559d25f44bad64ce4dbc8a0c4, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7c9e2c33abd01d5468b670b8d02d6925, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _EmissionGain: 0.5 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat.meta new file mode 100644 index 00000000..d208cdb9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 207010d5701a4144fa6743f421a5b7ef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset index ef30e365..6d403569 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset.meta index d99cc2be..31c6e5c6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 542d61ce63831da52a2faf8cb6e2d161 -timeCreated: 1529443761 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat index 60c379e7..804a63f4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat @@ -4,11 +4,12 @@ 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: OilPaint_15 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat.meta index 5db939d5..267cc1e3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: f72ec0e7a8444e3882e3140c44772699 -timeCreated: 1496877084 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset new file mode 100644 index 00000000..47b1fb9f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: OilPaint_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f72ec0e7-a844-4e38-82e3-140c44772699 + m_DurableName: OilPaint + m_Material: {fileID: 2100000, guid: f72ec0e7a8444e3882e3140c44772699, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset.meta new file mode 100644 index 00000000..8f1489cb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4125a45648abee64eb549c7c003b1fe2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat new file mode 100644 index 00000000..0c68f26e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat @@ -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: OilPaint_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 432d5c408cd625945ab19bb572a6f8e4, type: 3} + 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: d986b523673bfdb4f8325bc62054d06b, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.4 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat.meta new file mode 100644 index 00000000..8d2f2966 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c84564e3cf2f384dadf0104d158f7ab +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/main.png.meta index bfdb54ad..fb44722f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/main.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: d986b523673bfdb4f8325bc62054d06b -timeCreated: 1442276315 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/normal.png.meta index 111176e2..eed12905 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/normal.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 432d5c408cd625945ab19bb572a6f8e4 -timeCreated: 1442278035 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 1 externalNormalMap: 1 - heightScale: .0179999992 + heightScale: 0.018 normalMapFilter: 1 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -1 - wrapMode: 0 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 + spriteTessellationDetail: -1 textureType: 1 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 51 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset index a75f3d98..e06beee3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset.meta index ae340641..f7596083 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: d7ada22e6a436e742910a7553f159550 -timeCreated: 1529443762 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat index 76b7d10d..686529b2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat @@ -4,11 +4,12 @@ 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: OilPaint_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat.meta index 3ff0b7a5..c39cd454 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: c515dad74393468181ad162ef052241b -timeCreated: 1496877084 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset new file mode 100644 index 00000000..0be58919 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: OilPaint_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: c515dad7-4393-4681-81ad-162ef052241b + m_DurableName: OilPaint + m_Material: {fileID: 2100000, guid: c515dad74393468181ad162ef052241b, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset.meta new file mode 100644 index 00000000..d48ff4bd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b210bd5b0128ec4aa57a8bc87e26e00 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat new file mode 100644 index 00000000..f31c8579 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat @@ -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: OilPaint_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 432d5c408cd625945ab19bb572a6f8e4, type: 3} + 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: d986b523673bfdb4f8325bc62054d06b, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.4 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat.meta new file mode 100644 index 00000000..e6678612 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b8e69efefcca1b041bd44e4d73bffb2e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset index 00e1bf3f..29b20813 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset.meta index bae4bb5d..29442ddd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 4c750113c587a7e5c97a5627a917967e -timeCreated: 1529443763 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat index 8cad7e8f..c60f7717 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat @@ -4,11 +4,12 @@ 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: Paper_15 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.145 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat.meta index 277a9611..9a45c062 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: f1114e2eeb8d4fde915a6e653b54e9f5 -timeCreated: 1496878249 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset new file mode 100644 index 00000000..5fe98bd4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Paper_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f1114e2e-eb8d-4fde-915a-6e653b54e9f5 + m_DurableName: Paper + m_Material: {fileID: 2100000, guid: f1114e2eeb8d4fde915a6e653b54e9f5, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset.meta new file mode 100644 index 00000000..5ce2b2d7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c7c475a7169a5a478e5520ec7f9284f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat new file mode 100644 index 00000000..84384326 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat @@ -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: Paper_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 72b554b36eb21d445a97a119717a00e9, type: 3} + 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: d2267f6b367938a49abf5cf6e5daab14, 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.16 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.145 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat.meta new file mode 100644 index 00000000..f8d75e52 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ae64161a82c58c41ab424b4bf0a71a1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/bump.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/bump.png.meta index 8b9a6d06..b39df78f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/bump.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/bump.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 72b554b36eb21d445a97a119717a00e9 -timeCreated: 1491944683 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,68 @@ TextureImporter: heightScale: 0.05 normalMapFilter: 1 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 1 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/main.png.meta index 65b29677..b28cded5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/main.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: d2267f6b367938a49abf5cf6e5daab14 -timeCreated: 1442276315 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -1 - wrapMode: 0 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset index a0de2262..bc82d5fa 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset.meta index c5e72894..fd73af2a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 9b77a7cd7bb6c0244bca8ab8221af846 -timeCreated: 1529443764 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat index 74294140..6a997681 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat @@ -4,11 +4,12 @@ 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: Paper_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.145 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat.meta index cbcdab8e..7389038b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 759f1ebd20cd47208d41234e0da63716 -timeCreated: 1496878249 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset new file mode 100644 index 00000000..3dac5f4d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Paper_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 759f1ebd-20cd-4720-8d41-234e0da63716 + m_DurableName: Paper + m_Material: {fileID: 2100000, guid: 759f1ebd20cd47208d41234e0da63716, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset.meta new file mode 100644 index 00000000..8b940eef --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 575b9a60acc02e94e813b4b603315c8c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat new file mode 100644 index 00000000..0c3d96f8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat @@ -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: Paper_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 72b554b36eb21d445a97a119717a00e9, type: 3} + 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: d2267f6b367938a49abf5cf6e5daab14, 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.16 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.145 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat.meta new file mode 100644 index 00000000..bab0d334 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06adbfd29b8789a41b50d6fa5be1cc4d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader index db582ed3..40239109 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -23,12 +23,13 @@ Shader "Brush/Special/Petal" { Cull Off CGPROGRAM - #pragma target 3.0 + #pragma target 4.0 #pragma surface surf StandardSpecular vertex:vert addshadow #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ ODS_RENDER - + #pragma multi_compile __ SELECTION_ON #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" struct Input { float2 uv_MainTex; @@ -38,7 +39,8 @@ Shader "Brush/Special/Petal" { half _Shininess; - void vert(inout appdata_full i) { + void vert(inout appdata_full i, out Input o) { + UNITY_INITIALIZE_OUTPUT(Input, o); i.color = TbVertToNative(i.color); } @@ -53,6 +55,8 @@ Shader "Brush/Special/Petal" { o.Smoothness = _Shininess; o.Specular = _SpecColor * fAO; o.Alpha = 1; + + SURF_FRAG_MOBILESELECT(o); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader.meta index a4f14f4d..46dbbd65 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 542a05b67e6a6ef4c994b08f44143639 -timeCreated: 1498166764 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset index 8e993c7d..cc0a29d6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: Petal m_Material: {fileID: 2100000, guid: e0abbc800f80e85449708924a0863dcc, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset.meta index a954a67c..071eddb6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: a8f488f387b09e35dba50b6e9904301b -timeCreated: 1529443765 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat index 79ac23b4..aead96d4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat @@ -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: Petal_16 m_Shader: {fileID: 4800000, guid: 542a05b67e6a6ef4c994b08f44143639, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat.meta index f6abb3b0..732894ec 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: e0abbc800f80e85449708924a0863dcc -timeCreated: 1498166756 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta new file mode 100644 index 00000000..5e581aab --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bd52a144173c1742a9054c8f9fce194 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset new file mode 100644 index 00000000..7b76ef6d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Braid3_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 22d4f434-23e4-49d9-a9bd-05798aa21e58 + m_DurableName: Braid3 + m_Material: {fileID: 2100000, guid: 22d4f43423e449d9a9bd05798aa21e58, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 0 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta new file mode 100644 index 00000000..0fc4c551 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd29338e13ec5265cb0cc4ee30d69155 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat new file mode 100644 index 00000000..68e6c4d4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat @@ -0,0 +1,37 @@ +%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: Braid3_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta new file mode 100644 index 00000000..b74ca39f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22d4f43423e449d9a9bd05798aa21e58 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset index f4307cfb..8889aeac 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset.meta index f984c7b4..ed939a13 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 7e6a9b8a0ad82cf4da20e86f1a326040 -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat index 13e75ce2..85cc06dc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat @@ -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: Plasma m_Shader: {fileID: 4800000, guid: 0417065cc2dc3244588be4534f9bbd91, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat.meta index 0a52839e..2574c058 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: c33714d1b2f9412ebd501884c9d46336 -timeCreated: 1481917493 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader index e6c3fbbc..48f4b9e4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -42,11 +42,13 @@ Category { #pragma fragment frag #pragma target 3.0 #pragma multi_compile_particles + #pragma multi_compile __ SELECTION_ON #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -59,7 +61,7 @@ Category { }; struct v2f { - float4 vertex : SV_POSITION; + float4 vertex : POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; float3 worldPos : TEXCOORD1; @@ -90,7 +92,7 @@ Category { return abs(noise.x + noise.y) * 0.5; } - fixed4 frag (v2f i) : SV_Target + fixed4 frag (v2f i) : COLOR { // Workaround for b/30500118, caused by b/30504121 i.color.a = saturate(i.color.a); @@ -134,6 +136,9 @@ Category { i.color.a = 1; // kill any other alpha values that may come into this brush float4 c = i.color * tex; +#if SELECTION_ON + c.rgb = GetSelectionColor() * tex; +#endif return float4(c.rgb * c.a, 1.0); } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader.meta index 37b0a45e..2be9b57a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 0417065cc2dc3244588be4534f9bbd91 -timeCreated: 1442704399 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset new file mode 100644 index 00000000..83b1c1ac --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Plasma_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: c33714d1-b2f9-412e-bd50-1884c9d46336 + m_DurableName: Plasma + m_Material: {fileID: 2100000, guid: c33714d1b2f9412ebd501884c9d46336, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset.meta new file mode 100644 index 00000000..d31c7855 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5df1efb0a9f5a4b449cd34f5c9fbb232 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat new file mode 100644 index 00000000..69c18ea0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat @@ -0,0 +1,47 @@ +%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: Plasma_16 + m_Shader: {fileID: 4800000, guid: 0417065cc2dc3244588be4534f9bbd91, 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: 0.1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 164c6b5add812494f8f5395410e84ac8, type: 3} + m_Scale: {x: 0.5, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _DisplacementIntensity: 0.2 + - _EmissionGain: 0.5 + - _EmissionScroll1: 15 + - _EmissionScroll2: -10 + - _InvFade: 1 + - _Scroll1: 20 + - _Scroll2: 50 + - _Scroll3: 0.05 + - _UVTile1: 1 + - _UVTile2: 1 + - _UVTile3: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat.meta new file mode 100644 index 00000000..7319ea49 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 509ee817edc14f5449875a2d7cb64ebe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/main.png.meta index 8d7541a5..5fcbe2bf 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/main.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 164c6b5add812494f8f5395410e84ac8 -timeCreated: 1442535682 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta new file mode 100644 index 00000000..f2da950a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92b4321d2e0ef1f4aac54629a7f54781 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset new file mode 100644 index 00000000..7f221e00 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Race_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: abfbb2aa-70b4-4a5c-8126-8eedda2b3628 + m_DurableName: Race + m_Material: {fileID: 2100000, guid: abfbb2aa70b44a5c81268eedda2b3628, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta new file mode 100644 index 00000000..8ee1a5b9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 606ebb8edb618d15ebfb4adfa5a9b189 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat new file mode 100644 index 00000000..a32637f7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat @@ -0,0 +1,28 @@ +%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: Race_16 + m_Shader: {fileID: 4800000, guid: 66d9ab24e044638439b322295d3afa8e, 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: + - _EmissionGain: 0.5 + m_Colors: [] diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta new file mode 100644 index 00000000..4c63abf8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: abfbb2aa70b44a5c81268eedda2b3628 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta new file mode 100644 index 00000000..2fb30139 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 158e241b2cec58d4fa1ea8b6128c87c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset new file mode 100644 index 00000000..28e73685 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Rain_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 03a529e1-f519-3dd4-582d-2d5cd92c3f4f + m_DurableName: Rain + m_Material: {fileID: 2100000, guid: 03a529e1f5193dd4582d2d5cd92c3f4f, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta new file mode 100644 index 00000000..090e3f8a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9da63d3165051050aee14877ccd42d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat new file mode 100644 index 00000000..3891dc97 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat @@ -0,0 +1,88 @@ +%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: Rain_16 + m_Shader: {fileID: 4800000, guid: a7b2cc37e7b92574483d5e8e4d08ecb7, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaMask: + m_Texture: {fileID: 2800000, guid: d6a5bd2db2f9407499d2c40e01d0fd06, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: d6a5bd2db2f9407499d2c40e01d0fd06, type: 3} + m_Scale: {x: 4, 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.5 + - _DetailNormalMapScale: 1 + - _DisplacementIntensity: 0.1 + - _DstBlend: 0 + - _EmissionGain: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _NumSides: 6 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Scroll1: 2 + - _Scroll2: 3 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 4 + - _SrcBlend: 1 + - _StretchDistortionExponent: 3 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta new file mode 100644 index 00000000..2fccad95 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03a529e1f5193dd4582d2d5cd92c3f4f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset index bc712d8c..e42bd320 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset.meta index a280f09a..38f77e35 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: d75833fb286458e468c00cc5b0ac5f4d -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat index 12641a25..99d06029 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat @@ -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: Rainbow m_Shader: {fileID: 4800000, guid: 2427d50c8f9a5c04592a6dbb537bfa0d, type: 3} m_ShaderKeywords: _LIGHTMAPPING_REALTIME diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat.meta index 1dccd0f3..52b9beea 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat.meta @@ -1,5 +1,8 @@ fileFormatVersion: 2 guid: ad1ad43776e2450da23ae17f8310b960 NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader index 604fdbc5..89e7dcca 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -15,159 +15,190 @@ Shader "Brush/Special/Rainbow" { Properties { _MainTex ("Particle Texture", 2D) = "white" {} - _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 + _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 } Category { Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } Blend One One // SrcAlpha One - BlendOp Add, Min ColorMask RGBA Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } - SubShader { - Pass { + // Split into two different LOD passes as the 200 lod (mobile) needs to use a different + // blend mode than standard. + CGINCLUDE + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON + + #pragma target 3.0 + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" + + sampler2D _MainTex; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float3 normal : NORMAL; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 pos : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + float4 _MainTex_ST; + half _EmissionGain; + + v2f vert (appdata_t v) + { + v.color = TbVertToSrgb(v.color); + + v2f o; + o.pos = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + o.color = v.color; + return o; + } - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma multi_compile __ AUDIO_REACTIVE - #pragma multi_compile __ TBT_LINEAR_TARGET - - #pragma target 3.0 - #include "UnityCG.cginc" - #include "../../../Shaders/Include/Brush.cginc" - - sampler2D _MainTex; - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float3 normal : NORMAL; - float2 texcoord : TEXCOORD0; - }; - - struct v2f { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - float4 _MainTex_ST; - half _EmissionGain; - - v2f vert (appdata_t v) - { - v.color = TbVertToSrgb(v.color); - - v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); - o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); - o.color = v.color; - return o; - } - - float4 GetRainbowColor( half2 texcoord) - { - texcoord = saturate(texcoord); - // Create parametric UV's - half2 uvs = texcoord; - float row_id = floor(uvs.y * 5); - uvs.y *= 5; - - // Create parametric colors - half4 tex = float4(0,0,0,1); - half row_y = fmod(uvs.y,1); - - row_id = ceil(fmod(row_id + _Time.z,5)) - 1; - - tex.rgb = row_id == 0 ? float3(1,0,0) : tex.rgb; - tex.rgb = row_id == 1 ? float3(.7,.3,0) : tex.rgb; - tex.rgb = row_id == 2 ? float3(0,1,.0) : tex.rgb; - tex.rgb = row_id == 3 ? float3(0,.2,1) : tex.rgb; - tex.rgb = row_id == 4 ? float3(.4,0,1.2) : tex.rgb; - - // Make rainbow lines pulse - tex.rgb *= pow( (sin(row_id * 1 + _Time.z) + 1)/2,5); - - // Make rainbow lines thin - tex.rgb *= saturate(pow(row_y * (1 - row_y) * 5, 50)); - - return tex; - } - - float4 GetAudioReactiveRainbowColor( half2 texcoord) - { - texcoord = saturate(texcoord); - // Create parametric UV's - half2 uvs = texcoord; - float row_id = floor(uvs.y * 5); - uvs.y *= 5; - - // Create parametric colors - half4 tex = float4(0,0,0,1); - half row_y = fmod(uvs.y,1); - - row_id = ceil(fmod(row_id + _BeatOutputAccum.x*3,5)) - 1; - - tex.rgb = row_id == 0 ? float3(1,0,0) : tex.rgb; - tex.rgb = row_id == 1 ? float3(.7,.3,0) : tex.rgb; - tex.rgb = row_id == 2 ? float3(0,1,.0) : tex.rgb; - tex.rgb = row_id == 3 ? float3(0,.2,1) : tex.rgb; - tex.rgb = row_id == 4 ? float3(.4,0,1.2) : tex.rgb; - - // Make rainbow lines pulse - // tex.rgb *= pow( (sin(row_id * 1 + _BeatOutputAccum.x*10) + 1)/2,5); - - // Make rainbow lines thin - tex.rgb *= saturate(pow(row_y * (1 - row_y) * 5, 50)); - - return tex; - } - - float4 GetAudioReactiveColor( half2 texcoord) - { - texcoord = texcoord.yx; - texcoord.y *= 2; - - // Create parametric UV's - float quantizedMotion = ceil((_BeatOutputAccum.z*.1) / 10); - float row_id = abs(texcoord.y * 12 + quantizedMotion); - - // Create parametric colors - float4 tex = float4(0,0,0,1); - float row_y = fmod(abs(row_id),1.0); - - row_id = ceil(fmod(row_id, 8)); - - float bandlevels = tex2D(_FFTTex, float2(row_id/8,0) ).w; - bandlevels = max(bandlevels, .1); - tex.rgb = abs(texcoord.x - .5) < bandlevels * .5 ? float3(1,1,1) : tex.rgb; - - // Make rainbow lines pulse - tex.rgb *= tex.rgb * .5 + tex.rgb * _BeatOutput.y; - - // Make rainbow lines thin - tex.rgb *= saturate(20 - abs(row_y - .5)*50); - return tex; - } - - // Input color is srgb - fixed4 frag (v2f i) : SV_Target - { - i.color.a = 1; //ignore incoming vert alpha + float4 GetRainbowColor( half2 texcoord) + { + texcoord = saturate(texcoord); + // Create parametric UV's + half2 uvs = texcoord; + float row_id = floor(uvs.y * 5); + uvs.y *= 5; + + // Create parametric colors + half4 tex = float4(0,0,0,1); + half row_y = fmod(uvs.y,1); + + float time = frac( _Time.z * 0.2 ) * 5; + float rowOffset = floor( time ); + + row_id += rowOffset; + row_id = floor(fmod( row_id, 5) + 0.1); + + tex.rgb = row_id == 0 ? float3(1,0,0) : tex.rgb; + tex.rgb = row_id == 1 ? float3(.7,.3,0) : tex.rgb; + tex.rgb = row_id == 2 ? float3(0,1,.0) : tex.rgb; + tex.rgb = row_id == 3 ? float3(0,.2,1) : tex.rgb; + tex.rgb = row_id == 4 ? float3(.4,0,1.2) : tex.rgb; + + // Make rainbow lines pulse + tex.rgb *= pow( (sin(row_id * 1 + _Time.z) + 1)/2,5); + + // Make rainbow lines thin + tex.rgb *= saturate(pow(row_y * (1 - row_y) * 5, 50)); + + return tex; + } + + float4 GetAudioReactiveRainbowColor( half2 texcoord) + { + texcoord = saturate(texcoord); + // Create parametric UV's + half2 uvs = texcoord; + float row_id = floor(uvs.y * 5); + uvs.y *= 5; + + // Create parametric colors + half4 tex = float4(0,0,0,1); + half row_y = fmod(uvs.y,1); + + row_id = ceil(fmod(row_id + _BeatOutputAccum.x*3,5)) - 1; + + tex.rgb = row_id == 0 ? float3(1,0,0) : tex.rgb; + tex.rgb = row_id == 1 ? float3(.7,.3,0) : tex.rgb; + tex.rgb = row_id == 2 ? float3(0,1,.0) : tex.rgb; + tex.rgb = row_id == 3 ? float3(0,.2,1) : tex.rgb; + tex.rgb = row_id == 4 ? float3(.4,0,1.2) : tex.rgb; + + // Make rainbow lines pulse + // tex.rgb *= pow( (sin(row_id * 1 + _BeatOutputAccum.x*10) + 1)/2,5); + + // Make rainbow lines thin + tex.rgb *= saturate(pow(row_y * (1 - row_y) * 5, 50)); + + return tex; + } + + float4 GetAudioReactiveColor( half2 texcoord) + { + texcoord = texcoord.yx; + texcoord.y *= 2; + + // Create parametric UV's + float quantizedMotion = ceil((_BeatOutputAccum.z*.1) / 10); + float row_id = abs(texcoord.y * 12 + quantizedMotion); + + // Create parametric colors + float4 tex = float4(0,0,0,1); + float row_y = fmod(abs(row_id),1.0); + + row_id = ceil(fmod(row_id, 8)); + + float bandlevels = tex2D(_FFTTex, float2(row_id/8,0) ).w; + bandlevels = max(bandlevels, .1); + tex.rgb = abs(texcoord.x - .5) < bandlevels * .5 ? float3(1,1,1) : tex.rgb; + + // Make rainbow lines pulse + tex.rgb *= tex.rgb * .5 + tex.rgb * _BeatOutput.y; + + // Make rainbow lines thin + tex.rgb *= saturate(20 - abs(row_y - .5)*50); + return tex; + } + + + + // Input color is srgb + fixed4 frag (v2f i) : COLOR + { + i.color.a = 1; //ignore incoming vert alpha #ifdef AUDIO_REACTIVE - float4 tex = GetAudioReactiveRainbowColor(i.texcoord.xy); - tex *= GetAudioReactiveColor(i.texcoord.xy); - tex = i.color * tex * exp(_EmissionGain * 2.5f); + float4 tex = GetAudioReactiveRainbowColor(i.texcoord.xy); + tex *= GetAudioReactiveColor(i.texcoord.xy); + tex = i.color * tex * exp(_EmissionGain * 2.5f); #else - float4 tex = GetRainbowColor(i.texcoord.xy); - tex = i.color * tex * exp(_EmissionGain * 3.0f); + float4 tex = GetRainbowColor(i.texcoord.xy); + tex = i.color * tex * exp(_EmissionGain * 3.0f); #endif - float4 color = float4(tex.rgb * tex.a, 1.0); - color = SrgbToNative(color); - return color; - } + float4 color = float4(tex.rgb * tex.a, 1.0); + color = SrgbToNative(color); + FRAG_MOBILESELECT(color) + return color; + } + + + ENDCG + + // PC (Uses 'Add' blend mode for RGB) + SubShader { + LOD 201 + Pass { + BlendOp Add, Min + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + ENDCG + } + } + + // Mobile (Uses 'Max' blend mode for RGB) + SubShader { + LOD 150 + Pass { + BlendOp Max, Min + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag ENDCG } } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader.meta index 21388c29..e5e7ff2d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader.meta @@ -1,6 +1,9 @@ fileFormatVersion: 2 guid: 2427d50c8f9a5c04592a6dbb537bfa0d ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset new file mode 100644 index 00000000..199eb4a7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Rainbow_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: ad1ad437-76e2-450d-a23a-e17f8310b960 + m_DurableName: Rainbow + m_Material: {fileID: 2100000, guid: ad1ad43776e2450da23ae17f8310b960, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset.meta new file mode 100644 index 00000000..39cff194 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40a77d8708a5f444fb776b8bbdbfadfd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat new file mode 100644 index 00000000..d112d753 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat @@ -0,0 +1,85 @@ +%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: Rainbow_16 + m_Shader: {fileID: 4800000, guid: 2427d50c8f9a5c04592a6dbb537bfa0d, type: 3} + m_ShaderKeywords: _LIGHTMAPPING_REALTIME + 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} + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.65 + - _EmissionLM: 0 + - _EmissionScaleUI: 0 + - _Glossiness: 0.38 + - _InvFade: 1 + - _Lightmapping: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Scroll1: 13 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat.meta new file mode 100644 index 00000000..3d411541 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66d0a14afd8191844bf0efc9795f39ec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta new file mode 100644 index 00000000..ecd298fc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c7c0f95392e47245a0b3342453ff48b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset new file mode 100644 index 00000000..fda03a63 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Rising Bubbles_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: a8147ce1-005e-abe4-88e8-09a1eaadcc89 + m_DurableName: Rising Bubbles + m_Material: {fileID: 2100000, guid: a8147ce1005eabe488e809a1eaadcc89, type: 2} + m_IsParticle: 1 + m_uv0Size: 4 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 1 + m_bUseNormals: 1 + m_normalSemantic: 1 + m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta new file mode 100644 index 00000000..21233849 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ecab58a919952a75794e6a35e44ce78c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat new file mode 100644 index 00000000..78005016 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat @@ -0,0 +1,91 @@ +%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: Rising Bubbles_16 + m_Shader: {fileID: 4800000, guid: c4285dcf87bf5b84d8d4bbec752f1883, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 6092e34c8de5a054bad8c1f4824f959a, 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: + - _BaseGain: 0.4 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 300 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ScrollJitterFrequency: 5 + - _ScrollJitterIntensity: 0.2 + - _ScrollRate: 0.1 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SparkleRate: 2.5 + - _SpecularHighlights: 1 + - _SpreadRate: 1.25 + - _SpreadSize: 1.25 + - _SrcBlend: 1 + - _UVSec: 0 + - _WaveformFreq: 0.1 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _ScrollDistance: {r: 0.5, g: 5, b: 0, a: 0.5} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} + - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta new file mode 100644 index 00000000..07b461b3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8147ce1005eabe488e809a1eaadcc89 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset index 975e3b2d..df955828 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: ShinyHull m_Material: {fileID: 2100000, guid: faaa4d44fcfb417796be753ac0421ba3, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset.meta index 663e117f..595474d4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: aaaca97d63dd3d156ad1632b76baaf8d -timeCreated: 1529443767 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat index ae38c483..5cd52e22 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat @@ -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: ShinyHull_16 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat.meta index 29639b46..874e86ee 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: faaa4d44fcfb417796be753ac0421ba3 -timeCreated: 1498761536 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta new file mode 100644 index 00000000..e0e7e1d4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26ae29c30ecc3fa469b49325b6a6006f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset new file mode 100644 index 00000000..8d3278e3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: SingleSided_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f0a2298a-be80-432c-9fee-a86dcc06f4f9 + m_DurableName: SingleSided + m_Material: {fileID: 2100000, guid: f0a2298abe80432c9feea86dcc06f4f9, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta new file mode 100644 index 00000000..d484fd03 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b5f408092403755e919f0fc824bf6a3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat new file mode 100644 index 00000000..1f88a6a6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat @@ -0,0 +1,77 @@ +%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: SingleSided_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: dc60a5efa113ed54392f4ba836fbedd8, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta new file mode 100644 index 00000000..6823c9d3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0a2298abe80432c9feea86dcc06f4f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset index 7279d835..b398bdb4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset.meta index 44f8ed52..54c0be23 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 84e07a49ce756cf44ab7ea2dbdc064c4 -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat index a6e7cd7b..0168be38 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat @@ -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: Smoke m_Shader: {fileID: 4800000, guid: b00f8a3e2356b6144b32fe4a62905a7b, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat.meta index 5ccb5f46..77e9597b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 70d79ccab1594f35990cf02193947fe8 -timeCreated: 1495148303 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader index 07abbdc2..2e3e9ff1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -35,17 +35,19 @@ Category { #pragma multi_compile_particles #pragma target 3.0 #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "../../../Shaders/Include/Particles.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -98,7 +100,7 @@ Category { center_WS.xyz += mul(xf_CS, float4(disp, 0)); float4 corner = OrientParticle_WS(center_WS.xyz, halfSize, v.vid, rotation); - o.vertex = mul(UNITY_MATRIX_VP, corner); + o.pos = mul(UNITY_MATRIX_VP, corner); o.color = v.color; v.color.a = 1; @@ -112,6 +114,11 @@ Category { float4 c = tex2D(_MainTex, i.texcoord); c *= i.color * _TintColor; c = SrgbToNative(c); +#if SELECTION_ON + float strength = length(c.rgb * c.a) * 3; + FRAG_MOBILESELECT(c) + c.rgb *= strength; +#endif return c; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader.meta index 0ca5e12e..7d73cf3a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: b00f8a3e2356b6144b32fe4a62905a7b -timeCreated: 1467773228 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset new file mode 100644 index 00000000..d7f6f1ec --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Smoke_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 70d79cca-b159-4f35-990c-f02193947fe8 + m_DurableName: Smoke + m_Material: {fileID: 2100000, guid: 70d79ccab1594f35990cf02193947fe8, type: 2} + m_IsParticle: 1 + m_uv0Size: 4 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 1 + m_bUseNormals: 1 + m_normalSemantic: 1 + m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset.meta new file mode 100644 index 00000000..5fe2aa1b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 223b21ecc1428d44d93e74389a965196 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat new file mode 100644 index 00000000..3479d582 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat @@ -0,0 +1,90 @@ +%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: Smoke_16 + m_Shader: {fileID: 4800000, guid: b00f8a3e2356b6144b32fe4a62905a7b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 5a1c975bb724e2a4ebdde0f9e9674023, 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: + - _BaseGain: 0.4 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 300 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ScrollJitterFrequency: 0.2 + - _ScrollJitterIntensity: 0.02 + - _ScrollRate: 0.75 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SparkleRate: 2.5 + - _SpecularHighlights: 1 + - _SpreadSize: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _WaveformFreq: 0.1 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _ScrollDistance: {r: 2, g: 6, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} + - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat.meta new file mode 100644 index 00000000..13d39645 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fded50f2c7e3ff4aa60d767631e7e66 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/maintexture.png index 4cb98e6f62b346df322e9e2c5786bb5965f466cb..ea875d034f6cd6d88d3c3fbc4cbb55a499bb8cc4 100644 GIT binary patch literal 65492 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 Rew$FQ> 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

&FVBdU3ay~dU2xvyqp%b#OL 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 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/maintexture.png.meta index 222e9437..ccd52cf4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 5a1c975bb724e2a4ebdde0f9e9674023 -timeCreated: 1440714585 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 5 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull.meta new file mode 100644 index 00000000..a8db1463 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 73d77c00047575d459069c5bdc983ade +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset new file mode 100644 index 00000000..1f78aa51 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: SmoothHull_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 355b3579-bf1d-4ff5-a200-704437fe684b + m_DurableName: SmoothHull + m_Material: {fileID: 2100000, guid: 355b3579bf1d4ff5a200704437fe684b, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset.meta new file mode 100644 index 00000000..02a03b8e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0021c46bddf53615c9b1d1c49d3e5d37 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat new file mode 100644 index 00000000..69dc862d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat @@ -0,0 +1,94 @@ +%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: SmoothHull_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Bottom: + m_Texture: {fileID: 2800000, guid: 36752f6114447a844a013406d30a3c29, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: 0} + 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} + - _Side: + m_Texture: {fileID: 2800000, guid: 31a0dba64c25fa442a02171bc2131ccc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Top: + m_Texture: {fileID: 2800000, guid: 36752f6114447a844a013406d30a3c29, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BottomScale: 0.3 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.574 + - _SideScale: 5.21 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _TopScale: 0.3 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.29411763, g: 0.29411763, b: 0.29411763, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat.meta new file mode 100644 index 00000000..064dc018 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 355b3579bf1d4ff5a200704437fe684b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.asset index d18502e9..d7b746d9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.asset.meta index 6721aa52..f0c4d42e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 7ccf5a61af1914e409b526a98d43354b -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.mat index ec627456..f3f5421c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.mat @@ -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: Snow m_Shader: {fileID: 4800000, guid: 731f18bedecafd24f8a663a28a1e1b42, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.mat.meta index 9c0987aa..448068f2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d902ed8bd0d1476ca8de878a79e3a34c -timeCreated: 1495148304 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.shader index d7014e9a..051e33e3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -39,11 +39,13 @@ Category { #pragma multi_compile_particles #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #pragma target 3.0 #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "../../../Shaders/Include/Particles.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; @@ -99,7 +101,13 @@ Category { // Input color is srgb fixed4 frag (v2f i) : SV_Target { - return SrgbToNative(2.0f * i.color * _TintColor * tex2D(_MainTex, i.texcoord)); + float4 texCol = tex2D(_MainTex, i.texcoord); + float4 color = SrgbToNative(2.0f * i.color * _TintColor * texCol); +#if SELECTION_ON + color.rgb = GetSelectionColor() * texCol.r; + color.a = texCol.a; +#endif + return color; } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.shader.meta index 6cc8b6b4..c21a1e68 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 731f18bedecafd24f8a663a28a1e1b42 -timeCreated: 1467773228 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.asset new file mode 100644 index 00000000..4ae9b05e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Snow_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d902ed8b-d0d1-476c-a8de-878a79e3a34c + m_DurableName: Snow + m_Material: {fileID: 2100000, guid: d902ed8bd0d1476ca8de878a79e3a34c, type: 2} + m_IsParticle: 1 + m_uv0Size: 4 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 1 + m_bUseNormals: 1 + m_normalSemantic: 1 + m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.asset.meta new file mode 100644 index 00000000..ebd277a5 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 302cd9feddaee0240a038004cb3e49ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.mat new file mode 100644 index 00000000..b9c55b84 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.mat @@ -0,0 +1,90 @@ +%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: Snow_16 + m_Shader: {fileID: 4800000, guid: 731f18bedecafd24f8a663a28a1e1b42, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: d015d7bf56fb5a248a95618587bc43d5, 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: + - _BaseGain: 0.4 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 300 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ScrollJitterFrequency: 12 + - _ScrollJitterIntensity: 0.1 + - _ScrollRate: 0.2 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SparkleRate: 2.5 + - _SpecularHighlights: 1 + - _SpreadSize: 5.75 + - _SrcBlend: 1 + - _UVSec: 0 + - _WaveformFreq: 0.1 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _ScrollDistance: {r: 0, g: -3, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} + - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.mat.meta new file mode 100644 index 00000000..1fcfb4f4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 950adc2da5935a741a5697fa5cad4561 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/maintexture.png.meta index a3a95b9f..9027204d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/maintexture.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: d015d7bf56fb5a248a95618587bc43d5 -timeCreated: 1440714591 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake.meta new file mode 100644 index 00000000..9aca46d4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51e1d0cac0401e64c95c830c0845b4e5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset new file mode 100644 index 00000000..b36851d5 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Snowflake_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 2b65cd94-9259-4f10-99d2-d54b6664ac33 + m_DurableName: Snowflake + m_Material: {fileID: 2100000, guid: 2b65cd9492594f1099d2d54b6664ac33, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 0 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset.meta new file mode 100644 index 00000000..c55de901 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60bf941436447e8599139730ce08379d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat new file mode 100644 index 00000000..9f25f925 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat @@ -0,0 +1,37 @@ +%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: Snowflake_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat.meta new file mode 100644 index 00000000..75c51573 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b65cd9492594f1099d2d54b6664ac33 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.asset index a4f7c923..e5989034 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.asset.meta index b4192ad1..6d794a32 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: bf5c0e36bc63d7b418af3ac347cfdcfd -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.mat index 1de3ad85..e972881b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.mat @@ -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: SoftHighlighter m_Shader: {fileID: 4800000, guid: 63ee81a0fbf19bc44bec7e2ca3ba73e1, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.mat.meta index 9d111ba5..1e42b40e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: accb32f54509454f93f81df3fd31df1b -timeCreated: 1481917485 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.shader index 517941ed..bf911e78 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -18,7 +18,7 @@ Properties { } Category { - Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" "DisableBatching"="True" } Blend SrcAlpha One AlphaTest Greater .01 ColorMask RGB @@ -32,8 +32,10 @@ Category { #pragma fragment frag #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -45,7 +47,7 @@ Category { }; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -66,16 +68,17 @@ Category { #else o.color = TbVertToNative(v.color); #endif - o.vertex = UnityObjectToClipPos(v.vertex); - + o.pos = UnityObjectToClipPos(v.vertex); return o; } - fixed4 frag (v2f i) : SV_Target + fixed4 frag (v2f i) : COLOR { - half4 c = tex2D(_MainTex, i.texcoord ); - return i.color * c; + float4 c = tex2D(_MainTex, i.texcoord ); + c *= i.color; + FRAG_MOBILESELECT(c) + return c; } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.shader.meta index 3431deef..f10a10e3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 63ee81a0fbf19bc44bec7e2ca3ba73e1 -timeCreated: 1467842216 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.asset new file mode 100644 index 00000000..3fabc560 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: SoftHighlighter_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: accb32f5-4509-454f-93f8-1df3fd31df1b + m_DurableName: SoftHighlighter + m_Material: {fileID: 2100000, guid: accb32f54509454f93f81df3fd31df1b, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.asset.meta new file mode 100644 index 00000000..7c4a7b96 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2cf6894b64c09445b05dcc8e6963e61 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.mat new file mode 100644 index 00000000..f23c4c32 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.mat @@ -0,0 +1,33 @@ +%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: SoftHighlighter_16 + m_Shader: {fileID: 4800000, guid: 63ee81a0fbf19bc44bec7e2ca3ba73e1, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32bb2679f5fb44b4f88d7afc21730e9b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.mat.meta new file mode 100644 index 00000000..ccf0c783 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c7c62459defb9b46aec80330f28e8dc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/maintexture.png.meta index 8819e95f..799c489d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 32bb2679f5fb44b4f88d7afc21730e9b -timeCreated: 1465424359 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: 2 aniso: 4 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space.meta new file mode 100644 index 00000000..f28fe7df --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a1196cc2efe96243a2eb1bc4afe417f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset new file mode 100644 index 00000000..3642580c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Space_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: bdf65db2-1fb7-4202-b5e0-c6b5e3ea851e + m_DurableName: Space + m_Material: {fileID: 2100000, guid: bdf65db21fb74202b5e0c6b5e3ea851e, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset.meta new file mode 100644 index 00000000..504858c3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 322b8ef424dc2f45ea8442ca3ed14cf0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat new file mode 100644 index 00000000..70105d31 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat @@ -0,0 +1,28 @@ +%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: Space_16 + m_Shader: {fileID: 4800000, guid: 4712a5a85cfe9144190e6dbb83cbb62e, 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: + - _EmissionGain: 0.5 + m_Colors: [] diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat.meta new file mode 100644 index 00000000..66142467 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bdf65db21fb74202b5e0c6b5e3ea851e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks.meta new file mode 100644 index 00000000..c7e90d37 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab5b1caa7011d5d468de7989837b2055 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset new file mode 100644 index 00000000..33966182 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Sparks_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 50e99447-3861-05f4-697d-a1b96e771b98 + m_DurableName: Sparks + m_Material: {fileID: 2100000, guid: 50e99447386105f4697da1b96e771b98, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset.meta new file mode 100644 index 00000000..dd787664 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 295b9c80a6eebfd5c9e5c6e0615dac3b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat new file mode 100644 index 00000000..ae8312d8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat @@ -0,0 +1,83 @@ +%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: Sparks_16 + m_Shader: {fileID: 4800000, guid: f10b4ff7ab4b8bc49b4cabd89f56378f, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0c1a21747a147e64ca86bb92080382ab, 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.5 + - _DetailNormalMapScale: 1 + - _DisplacementAmount: 1.45 + - _DisplacementExponent: 2.84 + - _DstBlend: 0 + - _EmissionGain: 0.723 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _NumSides: 4 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 11.78 + - _SrcBlend: 1 + - _StretchDistortionExponent: 1.73 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat.meta new file mode 100644 index 00000000..efdb269a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50e99447386105f4697da1b96e771b98 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.asset index 6b20bf21..c5de01c8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: Spikes m_Material: {fileID: 2100000, guid: cf7f00597aeb53a42b67c83d863a9ffa, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.asset.meta index decea683..68e18d92 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: aa162493b08406a5a82822709c50af77 -timeCreated: 1529443770 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.mat index 3a1fca4d..3cda29a6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.mat @@ -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: Spikes_16 m_Shader: {fileID: 4800000, guid: fc163d24473ddd04881e4fc188ed5802, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.mat.meta index daf00f9b..363caf06 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Spikes/Spikes_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: cf7f00597aeb53a42b67c83d863a9ffa -timeCreated: 1498171568 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.asset index 719590ec..9a626252 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.asset.meta index b61e8772..c283a466 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 20e65e1c9af17105b8a58d0d04ad41c8 -timeCreated: 1529443771 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.mat index 17bdc7ad..477c789a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.mat @@ -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: Splatter_15 m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.mat.meta index 5ac26705..3c121846 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 8dc4a70cd5584efda5edd4e860f40dc3 -timeCreated: 1496878064 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.asset new file mode 100644 index 00000000..1711a396 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Splatter_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 8dc4a70c-d558-4efd-a5ed-d4e860f40dc3 + m_DurableName: Splatter + m_Material: {fileID: 2100000, guid: 8dc4a70cd5584efda5edd4e860f40dc3, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.asset.meta new file mode 100644 index 00000000..642162cd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e90179fa3f1c1348b1adb8caa139704 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.mat new file mode 100644 index 00000000..e496e135 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.mat @@ -0,0 +1,77 @@ +%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: Splatter_16 + m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: ff92acc4bd186bd4ca5a9fa9c32220a6, 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.2 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.mat.meta new file mode 100644 index 00000000..c195faa7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4436a76525c722408e361b51cd86163 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/main.png.meta index 50fd151d..38260776 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/main.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: ff92acc4bd186bd4ca5a9fa9c32220a6 -timeCreated: 1442276315 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.asset index 723e4d95..c83a7e01 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.asset.meta index f2e9d27a..59f641d8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 402a078d5db9ad0468dda690396443bc -timeCreated: 1529443772 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.mat index 8af9f9a0..a80eb873 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.mat @@ -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: Splatter_0 m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.mat.meta index f45d5e38..68d487c7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 7a1c810750c54b709a39421576d6617e -timeCreated: 1496878064 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.asset new file mode 100644 index 00000000..0f948cb0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Splatter_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 7a1c8107-50c5-4b70-9a39-421576d6617e + m_DurableName: Splatter + m_Material: {fileID: 2100000, guid: 7a1c810750c54b709a39421576d6617e, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.asset.meta new file mode 100644 index 00000000..0e80ac07 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 629992284a019b445a3dd2b35644033a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.mat new file mode 100644 index 00000000..473a9e3f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.mat @@ -0,0 +1,77 @@ +%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: Splatter_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: ff92acc4bd186bd4ca5a9fa9c32220a6, 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.2 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.mat.meta new file mode 100644 index 00000000..1872ccab --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1983fc9c9a86c1149b06c26f13f6405f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush.meta new file mode 100644 index 00000000..403977c3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 746c62bb4f0dfa8419fa0784cdd5770a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset new file mode 100644 index 00000000..b8a8257f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: 3D Printing Brush_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d3f3b18a-da03-f694-b838-28ba8e749a98 + m_DurableName: 3D Printing Brush + m_Material: {fileID: 2100000, guid: d3f3b18ada03f694b83828ba8e749a98, type: 2} + m_IsParticle: 0 + m_uv0Size: 0 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 0 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset.meta new file mode 100644 index 00000000..30b2ea16 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08d130e1f5140755eb770be7a61f79e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat new file mode 100644 index 00000000..3313291b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat @@ -0,0 +1,50 @@ +%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: 3D Printing Brush_16 + m_Shader: {fileID: 4800000, guid: 096108490caa83c46b96a1e171214c8b, 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} + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + - _Metallic: 0 + - _Shininess: 0.4 + - _Smoothness: 1 + - _VertOrder: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.13235295, g: 0.13235295, b: 0.13235295, a: 0} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat.meta new file mode 100644 index 00000000..6fa8e4ba --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d3f3b18ada03f694b83828ba8e749a98 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper.meta new file mode 100644 index 00000000..835107f9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cafc7b356725b92479d84bbd60a714ab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset new file mode 100644 index 00000000..9f361ea9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: SquarePaper_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 2e03b1bf-3ebd-4609-9d7e-f4cafadc4dfa + m_DurableName: SquarePaper + m_Material: {fileID: 2100000, guid: 2e03b1bf3ebd46099d7ef4cafadc4dfa, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset.meta new file mode 100644 index 00000000..cf8a49b0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d5095d2aa98e0c5d8b5e0a06c3240cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat new file mode 100644 index 00000000..336c9431 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat @@ -0,0 +1,79 @@ +%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: SquarePaper_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 7f06e0457ba1c9140b95991692f69cef, type: 3} + 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: c83c06260e6378044b0981215b4531fa, 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.16 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.145 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat.meta new file mode 100644 index 00000000..eb52b056 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e03b1bf3ebd46099d7ef4cafadc4dfa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.asset index 4a37cb63..aa74a78f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.asset.meta index 729c5466..01a32703 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: b1626af60ae7a31419a1c40afb39c5ed -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.mat index dc927e29..f2de2766 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.mat @@ -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: Stars m_Shader: {fileID: 4800000, guid: c5ccca3779289ff49a2768609995604b, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.mat.meta index 0889ccff..0b56f0dc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 0eb4db273f82408db5a119ebd7d5b711 -timeCreated: 1495148305 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.shader index ee993d5b..f3e145c6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -36,11 +36,13 @@ Category { #pragma multi_compile_particles #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #pragma target 3.0 #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "../../../Shaders/Include/Particles.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; float4 _MainTex_ST; @@ -86,9 +88,14 @@ Category { // Input color is srgb fixed4 frag (v2f i) : SV_Target { - float4 color = i.color * tex2D(_MainTex, i.texcoord); + float4 texCol = tex2D(_MainTex, i.texcoord); + float4 color = i.color * texCol; color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); +#if SELECTION_ON + color.rgb = GetSelectionColor() * texCol.r; + color.a = texCol.a; +#endif return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.shader.meta index 110e241a..7e075a39 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: c5ccca3779289ff49a2768609995604b -timeCreated: 1467773228 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.asset new file mode 100644 index 00000000..b6684af1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Stars_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 0eb4db27-3f82-408d-b5a1-19ebd7d5b711 + m_DurableName: Stars + m_Material: {fileID: 2100000, guid: 0eb4db273f82408db5a119ebd7d5b711, type: 2} + m_IsParticle: 1 + m_uv0Size: 4 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 1 + m_bUseNormals: 1 + m_normalSemantic: 1 + m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.asset.meta new file mode 100644 index 00000000..8c149567 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e171f1fbc1bb36847b42a2427fb49f44 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.mat new file mode 100644 index 00000000..2c707057 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.mat @@ -0,0 +1,86 @@ +%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: Stars_16 + m_Shader: {fileID: 4800000, guid: c5ccca3779289ff49a2768609995604b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: e336afde05c4832408da68507aa57261, 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: + - _BaseGain: 0.4 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 300 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SparkleRate: 5.3 + - _SpecularHighlights: 1 + - _SpreadSize: 1.25 + - _SrcBlend: 1 + - _UVSec: 0 + - _WaveformFreq: 0.1 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.mat.meta new file mode 100644 index 00000000..bfe39b3b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4bc0da7e786c344083e9ff5c45e48d0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/maintexture.png index e1bc40ca6cd9daae74a41ec4f863f368c322d34e..dafea38f8a594693db0b83a592fbb9d1ce403c85 100644 GIT binary patch literal 39241 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 OfUVU9%VKknnEwH3^5^sb literal 48941 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 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/maintexture.png.meta index 01d0aaa9..94f07b67 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: e336afde05c4832408da68507aa57261 -timeCreated: 1440714591 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 1 - enableMipMap: 0 + enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 - borderMipMap: 0 + borderMipMap: 1 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,112 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 5 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset index a20ad278..11de7ec9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset.meta index 3ec12483..1d99263e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 12b98790c761f47429559af03b6669d2 -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat index 5c3f3878..8329b882 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat @@ -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: Streamers m_Shader: {fileID: 4800000, guid: d3f113ebb941b344eab871b7ff555989, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat.meta index 6b78ff17..c6a09a1a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 44bb800afbc34592842694ecb05ddec3 -timeCreated: 1481917490 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader index 1f9fd1e7..ca45b5fc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -18,7 +18,7 @@ Properties { _Scroll1 ("Scroll1", Float) = 0 _Scroll2 ("Scroll2", Float) = 0 _DisplacementIntensity("Displacement", Float) = .1 - _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 + _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 } Category { @@ -38,10 +38,12 @@ Category { #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile_particles #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #pragma target 3.0 // Required -> compiler error: too many instructions for SM 2.0 #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -53,7 +55,7 @@ Category { }; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; float4 worldPos : TEXCOORD1; @@ -71,7 +73,7 @@ Category { v2f o; o.worldPos = mul(unity_ObjectToWorld, v.vertex); - o.vertex = UnityObjectToClipPos(v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); o.color = v.color; return o; @@ -84,7 +86,7 @@ Category { } // Input color is srgb - fixed4 frag (v2f i) : SV_Target + fixed4 frag (v2f i) : COLOR { // Create parametric flowing UV's half2 uvs = i.texcoord; @@ -124,6 +126,7 @@ Category { float4 color = i.color * tex * exp(_EmissionGain * 5.0f); color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); + FRAG_MOBILESELECT(color) return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader.meta index 9c0eaec4..de935bf1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: d3f113ebb941b344eab871b7ff555989 -timeCreated: 1443567489 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset new file mode 100644 index 00000000..0595ae50 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Streamers_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 44bb800a-fbc3-4592-8426-94ecb05ddec3 + m_DurableName: Streamers + m_Material: {fileID: 2100000, guid: 44bb800afbc34592842694ecb05ddec3, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset.meta new file mode 100644 index 00000000..143c006e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d77a6ccba6197d5429b222f034992612 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat new file mode 100644 index 00000000..7ab393fb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat @@ -0,0 +1,37 @@ +%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: Streamers_16 + m_Shader: {fileID: 4800000, guid: d3f113ebb941b344eab871b7ff555989, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 448c9093ac3aecc41a1b6ab64a727073, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _DisplacementIntensity: 0.02 + - _EmissionGain: 0.4 + - _InvFade: 1 + - _Scroll1: 1 + - _Scroll2: 3 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat.meta new file mode 100644 index 00000000..adc3f6ee --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2b018de7ec2bbb4fb261deb7171fa19 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/main.png.meta index bbca9919..58559db6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/main.png.meta @@ -1,11 +1,9 @@ fileFormatVersion: 2 guid: 448c9093ac3aecc41a1b6ab64a727073 -timeCreated: 1440714585 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -13,7 +11,7 @@ TextureImporter: linearTexture: 1 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 + mipMapsPreserveCoverage: 1 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 @@ -23,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 5 - mipBias: -1 + mipBias: -100 wrapU: -1 wrapV: -1 wrapW: -1 @@ -45,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -66,7 +69,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Standalone + - serializedVersion: 2 + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -76,7 +80,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Android + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -91,7 +107,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset index fe1390ae..bcbf86bd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset.meta index 5b4fe37f..7bd4433b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 38f5be2edab11fa429b090756d26d000 -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat index 9303e545..cd836120 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat @@ -4,11 +4,12 @@ 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: Taffy m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat.meta index 6eefc56f..bf920a73 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 0077f88cd93a42f3b59bb31c50cdb414 -timeCreated: 1481917494 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset new file mode 100644 index 00000000..cc3d5d03 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Taffy_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 0077f88c-d93a-42f3-b59b-b31c50cdb414 + m_DurableName: Taffy + m_Material: {fileID: 2100000, guid: 0077f88cd93a42f3b59bb31c50cdb414, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset.meta new file mode 100644 index 00000000..1dd67117 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 56c831cfe8253c8499b7ea534671c9d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat new file mode 100644 index 00000000..73cb099a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat @@ -0,0 +1,78 @@ +%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: Taffy_16 + m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + 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: 0758becf0979c9c42a2419c32260227b, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat.meta new file mode 100644 index 00000000..00e51dc5 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be043f2fcc85c764c9498d6c07ea2f4c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/main.png.meta index 17b96685..7ee4dfdd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/main.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 0758becf0979c9c42a2419c32260227b -timeCreated: 1442276315 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset index 39b4043d..80edf87f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset.meta index d5c4967c..7c78fb3e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: a713e4e48dc9bed57b2da96e510f3770 -timeCreated: 1529443775 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat index 1af62f83..95c29fc3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat @@ -4,11 +4,12 @@ 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: TaperedFlat_15 m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat.meta index 3fb2c60e..ebfbdbf0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: b468c1fbf25441ed8ec957030bc5660c -timeCreated: 1496877602 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset new file mode 100644 index 00000000..7d410bc6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TaperedFlat_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: b468c1fb-f254-41ed-8ec9-57030bc5660c + m_DurableName: TaperedFlat + m_Material: {fileID: 2100000, guid: b468c1fbf25441ed8ec957030bc5660c, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset.meta new file mode 100644 index 00000000..ad09399b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a18a2a26afe5df49a448b0a1446b987 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat new file mode 100644 index 00000000..76912811 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat @@ -0,0 +1,78 @@ +%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: TaperedFlat_16 + m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + 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: f3edc2a3ac909e640b160e04d7c1f116, 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.067 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat.meta new file mode 100644 index 00000000..c4080f72 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e08e38fd0a6e35e4784a9d6a0f3af64d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/maintexture.png.meta index 13d62136..f05c4757 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: f3edc2a3ac909e640b160e04d7c1f116 -timeCreated: 1440714585 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: 2 aniso: 4 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset index 30242d56..4bcf5251 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset.meta index 89699269..fe79b1fb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: e7ec06c48c590ea4ebe400ce6a278efe -timeCreated: 1529443776 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat index 4445fc2f..a0213e37 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat @@ -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: TaperedFlat_0 m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat.meta index 330fd8a7..2559e830 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: c8ccb53dae1345ef8afbb730d81394eb -timeCreated: 1496877602 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset new file mode 100644 index 00000000..02837d7d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TaperedFlat_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: c8ccb53d-ae13-45ef-8afb-b730d81394eb + m_DurableName: TaperedFlat + m_Material: {fileID: 2100000, guid: c8ccb53dae1345ef8afbb730d81394eb, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset.meta new file mode 100644 index 00000000..eace6633 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93785a02ac6b05d459886fbf637434b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat new file mode 100644 index 00000000..5229fd0c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat @@ -0,0 +1,77 @@ +%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: TaperedFlat_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: f3edc2a3ac909e640b160e04d7c1f116, 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.067 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat.meta new file mode 100644 index 00000000..87fe0c4e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 873fce4e50d20484bac6467dfe3eb28d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta new file mode 100644 index 00000000..178458bb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f5e705a9ac3e8f41ba3debd2f46f385 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset new file mode 100644 index 00000000..dae9bf0d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TaperedHueShift_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 3d9755da-56c7-7294-9b1d-5ec349975f52 + m_DurableName: TaperedHueShift + m_Material: {fileID: 2100000, guid: 3d9755da56c772949b1d5ec349975f52, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta new file mode 100644 index 00000000..2b787832 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c461ae8fae1efd5082fa32f46219e26 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat new file mode 100644 index 00000000..e9e3fd57 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat @@ -0,0 +1,78 @@ +%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: TaperedHueShift_16 + m_Shader: {fileID: 4800000, guid: 8ba0f3c594b3c3243a67d6b96370de7b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: cfe8e241b4edafc4dbcaaf50726d253d, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta new file mode 100644 index 00000000..8cd5c634 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d9755da56c772949b1d5ec349975f52 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset index 4301199c..0bc144e4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset.meta index 2466b72d..538eb6dd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: b39f584eb1440404289d9461a0973e35 -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat index 10598a0c..d6a6a98b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat @@ -4,11 +4,12 @@ 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: TaperedMarker m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: EDGING_ON SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -59,6 +60,7 @@ Material: - _Cutoff: 0.067 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Edging: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -66,6 +68,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat.meta index 50791072..5ba7ac16 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d90c6ad8af0f4b54b422e0f92abe1b3c -timeCreated: 1481917483 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset new file mode 100644 index 00000000..e7ed5271 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TaperedMarker_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d90c6ad8-af0f-4b54-b422-e0f92abe1b3c + m_DurableName: TaperedMarker + m_Material: {fileID: 2100000, guid: d90c6ad8af0f4b54b422e0f92abe1b3c, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset.meta new file mode 100644 index 00000000..bb77069c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e625fa844480314da97f6513b4f369a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat new file mode 100644 index 00000000..6a67bb2e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat @@ -0,0 +1,79 @@ +%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: TaperedMarker_16 + m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} + m_ShaderKeywords: EDGING_ON SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + 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: 12b1499f1adf4d545a80f2ec18204030, 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.067 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Edging: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat.meta new file mode 100644 index 00000000..5e51cfd1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b35c518ded57f54439e6298df8067e77 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/maintexture.png.meta index 7df9a133..789a3f3b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/maintexture.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 12b1499f1adf4d545a80f2ec18204030 -timeCreated: 1440714585 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: 2 aniso: 4 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset index c4e83b03..6f1bd3a0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset.meta index b9489212..9eb79b22 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 26d7464425c0b84479a8a21a695b194c -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat index 657efc6f..83685271 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat @@ -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: TaperedMarker_Flat m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat.meta index 99612faa..7e0946f6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 1a26b8c08a074f8a9facd2ef36e0cad0 -timeCreated: 1481917495 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset new file mode 100644 index 00000000..b0cce09a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TaperedMarker_Flat_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 1a26b8c0-8a07-4f8a-9fac-d2ef36e0cad0 + m_DurableName: TaperedMarker_Flat + m_Material: {fileID: 2100000, guid: 1a26b8c08a074f8a9facd2ef36e0cad0, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset.meta new file mode 100644 index 00000000..ece417ad --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14dd5597756a2a74da022c5ea3c5d81b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat new file mode 100644 index 00000000..de755be8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat @@ -0,0 +1,77 @@ +%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: TaperedMarker_Flat_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 12b1499f1adf4d545a80f2ec18204030, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat.meta new file mode 100644 index 00000000..4832b71a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 652f3175541845346b6f58ca8101964a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta new file mode 100644 index 00000000..424efd69 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8da6609618250b541ba7ead1a2ea358a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset new file mode 100644 index 00000000..7c82b22e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TaperedWire_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 9568870f-8594-60f4-1b20-dfbc8a5eac0e + m_DurableName: TaperedWire + m_Material: {fileID: 2100000, guid: 9568870f859460f41b20dfbc8a5eac0e, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta new file mode 100644 index 00000000..b591eb91 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c9e9a86997c0a75184dfed9299d2664 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat new file mode 100644 index 00000000..c8fa5333 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat @@ -0,0 +1,79 @@ +%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: TaperedWire_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 35c509404b758af4fb07fb3dc1ca76f0, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.09558821, g: 0.09558821, b: 0.09558821, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta new file mode 100644 index 00000000..f44e9dc9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9568870f859460f41b20dfbc8a5eac0e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta new file mode 100644 index 00000000..39961c09 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 805dfe4251b6e57429e137dd7ab2ac59 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset new file mode 100644 index 00000000..be4325f5 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: ThickGeometry_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 39ee7377-7a9e-47a7-a0f8-0c77712f75d3 + m_DurableName: ThickGeometry + m_Material: {fileID: 2100000, guid: 39ee73777a9e47a7a0f80c77712f75d3, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta new file mode 100644 index 00000000..a6d47647 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4ce13e091416ef5ea08f0fd3df1156c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat new file mode 100644 index 00000000..08bd0d59 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat @@ -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: ThickGeometry_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3} + 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: 1819abb411411e243b701e7dd664ac9a, 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.2 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.414 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta new file mode 100644 index 00000000..815b19ba --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39ee73777a9e47a7a0f80c77712f75d3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset index bafadb5c..e2317f78 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset.meta index 0000519b..3648c109 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: de4112b6c3a19ae5bb03397212a78339 -timeCreated: 1529443778 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat index abfbcf68..a0d5f0a2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat @@ -4,11 +4,12 @@ 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: ThickPaint_15 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat.meta index 040af02f..83944dfb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 75b32cf0fdd64d89a64be2a00b247b0f -timeCreated: 1496877269 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset new file mode 100644 index 00000000..dc32afab --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: ThickPaint_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 75b32cf0-fdd6-4d89-a64b-e2a00b247b0f + m_DurableName: ThickPaint + m_Material: {fileID: 2100000, guid: 75b32cf0fdd64d89a64be2a00b247b0f, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset.meta new file mode 100644 index 00000000..eb8d56be --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ecfcc5034e7fb7347b5a07c5743a9e1b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat new file mode 100644 index 00000000..363a935b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat @@ -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: ThickPaint_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: adae364a85e64564f8a75e1c0c9958e7, type: 3} + 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: b0bde6581a3229a4aa4a2d294da9d00f, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.4 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat.meta new file mode 100644 index 00000000..863bf764 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76ce22899a154a44ca89150f84e94fe1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke.png.meta index 39f005c7..87df5740 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke.png.meta @@ -1,55 +1,110 @@ fileFormatVersion: 2 guid: b0bde6581a3229a4aa4a2d294da9d00f -timeCreated: 1440714592 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke_bump.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke_bump.png.meta index ec6178e3..9e0e3405 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke_bump.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke_bump.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: adae364a85e64564f8a75e1c0c9958e7 -timeCreated: 1491942709 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.1 normalMapFilter: 1 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 1 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 51 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset index 877d59f2..057d8bee 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset.meta index 47019a67..7fa5b032 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 94cb84ebeec44c540bb15b32797e5a98 -timeCreated: 1529443779 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat index e637d55b..fc69fa4f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat @@ -4,11 +4,12 @@ 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: ThickPaint_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat.meta index 1183b84b..d49ac5bd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: fdf0326ac0d14fedb1019db0ff6d071f -timeCreated: 1496877269 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset new file mode 100644 index 00000000..611864b3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: ThickPaint_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: fdf0326a-c0d1-4fed-b101-9db0ff6d071f + m_DurableName: ThickPaint + m_Material: {fileID: 2100000, guid: fdf0326ac0d14fedb1019db0ff6d071f, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset.meta new file mode 100644 index 00000000..77c707d3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 302e0cbfcebefbb4fa956278fa38973c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat new file mode 100644 index 00000000..dda3b145 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat @@ -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: ThickPaint_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: adae364a85e64564f8a75e1c0c9958e7, type: 3} + 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: b0bde6581a3229a4aa4a2d294da9d00f, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.4 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat.meta new file mode 100644 index 00000000..914e609b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4f036576123be68408c2e7cf73788386 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset index f3060669..8cbdec49 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset.meta index ed67ee9a..146e8bad 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: b8a2349e67797ea4593639454ef74543 -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat index 9fcb44eb..4111032c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat @@ -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: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat.meta index 837f9723..c83e0017 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 4391385adf7343969e3331e4e4930b27 -timeCreated: 1481917489 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader index 73efff32..f86cdde1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -22,9 +22,11 @@ CGINCLUDE #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET #pragma multi_compile_fog + #pragma multi_compile __ SELECTION_ON #pragma target 3.0 sampler2D _MainTex; float4 _MainTex_ST; @@ -38,7 +40,7 @@ CGINCLUDE }; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; UNITY_FOG_COORDS(1) @@ -65,11 +67,11 @@ CGINCLUDE // Technically these are not yet in NDC because they haven't been divided by W, so their // range is currently [-W, W]. - o.vertex = UnityObjectToClipPos(float4(v.vertex.xyz + v.normal.xyz * bulge, v.vertex.w)); + o.pos = UnityObjectToClipPos(float4(v.vertex.xyz + v.normal.xyz * bulge, v.vertex.w)); float4 outline_NDC = UnityObjectToClipPos(float4(v.vertex.xyz + v.normal.xyz * inflate, v.vertex.w)); // Displacement in proper NDC coords (e.g. [-1, 1]) - float3 disp = outline_NDC.xyz / outline_NDC.w - o.vertex.xyz / o.vertex.w; + float3 disp = outline_NDC.xyz / outline_NDC.w - o.pos.xyz / o.pos.w; // Magnitude is a scaling factor to shrink large outlines down to a max width, in NDC space. // Notice here we're only measuring 2D displacment in X and Y. @@ -81,19 +83,19 @@ CGINCLUDE // component so both sides of the += operator below are in the same space. Also note // that the w component is a function of depth, so modifying X and Y independent of Z // should mean that the original w value remains valid. - o.vertex.xyz += float3(disp.xy * mag, disp.z) * o.vertex.w * outlineEnabled; + o.pos.xyz += float3(disp.xy * mag, disp.z) * o.pos.w * outlineEnabled; // Push Z back to avoid z-fighting when scaled very small. This is not legit, // mathematically speaking and likely causes crazy surface derivitives. - o.vertex.z -= disp.z * o.vertex.w * outlineEnabled; - - o.color = v.color; - o.color.a = 1; - o.color.xyz += worldNormal.y *.2; - o.color.xyz = max(0, o.color.xyz); - o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); - UNITY_TRANSFER_FOG(o, o.vertex); - return o; + o.pos.z -= disp.z * o.pos.w * outlineEnabled; + + o.color = v.color; + o.color.a = 1; + o.color.xyz += worldNormal.y *.2; + o.color.xyz = max(0, o.color.xyz); + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + UNITY_TRANSFER_FOG(o, o.pos); + return o; } v2f vert (appdata_t v) @@ -112,12 +114,14 @@ CGINCLUDE { float4 color = float4(0,0,0,1); UNITY_APPLY_FOG(i.fogCoord, color); + FRAG_MOBILESELECT(color) return color; } fixed4 fragColor (v2f i) : SV_Target { UNITY_APPLY_FOG(i.fogCoord, i.color); + FRAG_MOBILESELECT(i.color) return i.color; } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader.meta index b6d1db0f..7d1978c9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: f642cb91c8b664571967bdb587334e76 -timeCreated: 1466953084 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset new file mode 100644 index 00000000..da40d909 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Toon_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 4391385a-df73-4396-9e33-31e4e4930b27 + m_DurableName: Toon + m_Material: {fileID: 2100000, guid: 4391385adf7343969e3331e4e4930b27, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset.meta new file mode 100644 index 00000000..a8bfaf6e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dffc61528de4c4f4d90eb8b7e03c70eb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat new file mode 100644 index 00000000..f31ea5fd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat @@ -0,0 +1,37 @@ +%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: Toon_16 + m_Shader: {fileID: 4800000, guid: f642cb91c8b664571967bdb587334e76, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat.meta new file mode 100644 index 00000000..e24fd500 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60a0a1db78bcd9d49b4a785d0f680762 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta new file mode 100644 index 00000000..0a492d98 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7f4c966e56705948becbdfcf4f9cccf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset new file mode 100644 index 00000000..59d4a2ed --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TubeAdditive_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: c1c9b26d-673a-4dc6-b373-51715654ab96 + m_DurableName: TubeAdditive + m_Material: {fileID: 2100000, guid: c1c9b26d673a4dc6b37351715654ab96, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta new file mode 100644 index 00000000..5fc46ff0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53ec6eb494e328f5dafde9b5de65f9c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat new file mode 100644 index 00000000..de643298 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat @@ -0,0 +1,34 @@ +%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: TubeAdditive_16 + m_Shader: {fileID: 4800000, guid: 884e980aab67a7e429223bbe0b9a91f6, type: 3} + m_ShaderKeywords: SELECTION_EDGING + m_LightmapFlags: 5 + 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: + - _InvFade: 1 + - _SelectionEdging: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta new file mode 100644 index 00000000..c0c2c059 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1c9b26d673a4dc6b37351715654ab96 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta new file mode 100644 index 00000000..6743c052 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66d3539f85fd39049983df3b263c1346 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader new file mode 100644 index 00000000..c41d48cd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader @@ -0,0 +1,102 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Special/TubeToonInverted" { +Properties { + _MainTex ("Base (RGB) Trans (A)", 2D) = "white" {} +} + +CGINCLUDE + + #pragma multi_compile __ TBT_LINEAR_TARGET + + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + sampler2D _MainTex; + float4 _MainTex_ST; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float3 normal : NORMAL; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + v2f vertInflate (appdata_t v, float inflate) + { + + v2f o; + v.vertex.xyz += v.normal.xyz * inflate; + o.vertex = UnityObjectToClipPos(v.vertex); + o.color = v.color; + o.color.a = 1; + o.color.xyz += v.normal.y *.2; + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + return o; + } + + v2f vert (appdata_t v) + { + return vertInflate(v,0); + } + + v2f vertEdge (appdata_t v) + { + // As the scale goes up, we want the outline to be smaller, almost as if it's in screenspace + // however we don't want the outline to be a constant size, it should get smaller as the + // stroke gets further from camera, to avoid distant strokes turning into a big black mess. + float scale = length(mul(xf_I_CS, float3(0.05, 0, 0))); + return vertInflate(v, scale); + } + + fixed4 fragBlack (v2f i) : SV_Target + { + return float4(0,0,0,1); + } + + fixed4 fragColor (v2f i) : SV_Target + { + return i.color; + } + +ENDCG + + + +SubShader { + Cull Back + Pass{ + CGPROGRAM + #pragma vertex vert + #pragma fragment fragBlack + ENDCG + } + + Cull Front + Pass{ + CGPROGRAM + #pragma vertex vertEdge + #pragma fragment fragColor + ENDCG + } + } +Fallback "Diffuse" +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta new file mode 100644 index 00000000..4c07e6b1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ceb199b0f4e9d4be4a55978cfb864132 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset new file mode 100644 index 00000000..1c360297 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TubeToonInverted_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 9871385a-df73-4396-9e33-31e4e4930b27 + m_DurableName: TubeToonInverted + m_Material: {fileID: 2100000, guid: 9871385adf7343969e3331e4e4930b27, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta new file mode 100644 index 00000000..026bb9c0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3fd7519544b911b50a0f5ace4d3bbb50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat new file mode 100644 index 00000000..e4766a1c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat @@ -0,0 +1,37 @@ +%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: TubeToonInverted_16 + m_Shader: {fileID: 4800000, guid: ceb199b0f4e9d4be4a55978cfb864132, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta new file mode 100644 index 00000000..1e36904d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9871385adf7343969e3331e4e4930b27 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset index 84b05eb5..9b81b94c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: UnlitHull m_Material: {fileID: 2100000, guid: a8fea537da7c4d4b817f24f074725d6d, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset.meta index 33f6f9d4..d49f1981 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: e6226d3ece719e15aae431e9b1bacf2d -timeCreated: 1529443780 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat index e5c430bb..cee9c167 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat @@ -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: UnlitHull_16 m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat.meta index a4d3064b..d177bb00 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: a8fea537da7c4d4b817f24f074725d6d -timeCreated: 1498761536 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset index baeab07d..f85b67d9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset.meta index c41a8632..7251247e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 5398e778cce3fdf469bbfa388aa46d5d -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat index e097abeb..7bc81400 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat @@ -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: VelvetInk m_Shader: {fileID: 4800000, guid: bfa82537bb6dcf94a8d673eb2ac036f0, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat.meta index c4327b8c..63566e5a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d229d335c334495aa801660ac8a87360 -timeCreated: 1481917487 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader index 7489d3ec..04413c4f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -32,8 +32,10 @@ Category { #pragma fragment frag #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -45,7 +47,7 @@ Category { }; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -66,15 +68,16 @@ Category { #else o.color = TbVertToNative(v.color); #endif - o.vertex = UnityObjectToClipPos(v.vertex); - + o.pos = UnityObjectToClipPos(v.vertex); return o; } - fixed4 frag (v2f i) : SV_Target + fixed4 frag (v2f i) : COLOR { half4 c = tex2D(_MainTex, i.texcoord ); - return i.color * c; + c = i.color * c; + FRAG_MOBILESELECT(c) + return c; } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader.meta index e6d0b87b..fce1f6df 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: bfa82537bb6dcf94a8d673eb2ac036f0 -timeCreated: 1468367742 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset new file mode 100644 index 00000000..c81df8dc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: VelvetInk_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d229d335-c334-495a-a801-660ac8a87360 + m_DurableName: VelvetInk + m_Material: {fileID: 2100000, guid: d229d335c334495aa801660ac8a87360, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset.meta new file mode 100644 index 00000000..11ca4a8b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca1b285cd96d183408d1a0e25bda4982 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat new file mode 100644 index 00000000..82be31b4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat @@ -0,0 +1,27 @@ +%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: VelvetInk_16 + m_Shader: {fileID: 4800000, guid: bfa82537bb6dcf94a8d673eb2ac036f0, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 23f34828bab17994180c05cba4679802, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] + m_Colors: [] diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat.meta new file mode 100644 index 00000000..810b9de8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c29e1d6575a8336448bc09a0a42a412a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/maintexture.png.meta index d249c2a4..bacece6b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/maintexture.png.meta @@ -1,55 +1,121 @@ fileFormatVersion: 2 guid: 23f34828bab17994180c05cba4679802 -timeCreated: 1440714585 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset index b9c10d54..b5dcb296 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset.meta index 770c25e9..806037ba 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: ebe8a9d99afbd6b46909ea24a9896258 -timeCreated: 1495162083 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat index 4f6ad65d..911cab98 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat @@ -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: Waveform m_Shader: {fileID: 4800000, guid: 9296f4d6e8a59fa4b86aa34b80d895ba, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat.meta index fb057adb..3eb415fd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 10201aa3ebc242d884b72e63f6eeb8ab -timeCreated: 1481917488 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader index 23d158d2..8ca35b54 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -36,9 +36,11 @@ Category { #pragma multi_compile_particles #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; float4 _MainTex_ST; @@ -51,7 +53,7 @@ Category { }; struct v2f { - float4 vertex : SV_POSITION; + float4 pos : POSITION; float4 color : COLOR; float2 texcoord : TEXCOORD0; float4 unbloomedColor : TEXCOORD1; @@ -62,7 +64,7 @@ Category { v.color = TbVertToSrgb(v.color); v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); + o.pos = UnityObjectToClipPos(v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); o.color = bloomColor(v.color, _EmissionGain); o.unbloomedColor = v.color; @@ -70,7 +72,7 @@ Category { } // Input colors are srgb - fixed4 frag (v2f i) : SV_Target + fixed4 frag (v2f i) : COLOR { // Envelope float envelope = sin(i.texcoord.x * 3.14159); @@ -90,6 +92,7 @@ Category { color = i.color * color; color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); + FRAG_MOBILESELECT(color) return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader.meta index c4646055..f5802dbe 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 9296f4d6e8a59fa4b86aa34b80d895ba -timeCreated: 1456355323 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset new file mode 100644 index 00000000..59958a78 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Waveform_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 10201aa3-ebc2-42d8-84b7-2e63f6eeb8ab + m_DurableName: Waveform + m_Material: {fileID: 2100000, guid: 10201aa3ebc242d884b72e63f6eeb8ab, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset.meta new file mode 100644 index 00000000..a4fd1311 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47b2b5bdc01fa7a40a157c51c0712a34 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat new file mode 100644 index 00000000..2116f64a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat @@ -0,0 +1,36 @@ +%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: Waveform_16 + m_Shader: {fileID: 4800000, guid: 9296f4d6e8a59fa4b86aa34b80d895ba, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 2e1a7d5cb3753244e97923f78cc37197, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _EmissionGain: 0.51785713 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat.meta new file mode 100644 index 00000000..be34aae6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2096de12452497441b911d5e967737ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/waveform.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/waveform.png.meta index 6f5a144b..56d48281 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/waveform.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/waveform.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 2e1a7d5cb3753244e97923f78cc37197 -timeCreated: 1440714594 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,68 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 64 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 2 - mipBias: -1 - wrapMode: 0 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta new file mode 100644 index 00000000..905400aa --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce4257954f47ef54eb6152c074d5ff63 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader new file mode 100644 index 00000000..7d11336c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader @@ -0,0 +1,96 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Visualizer/WaveformFFT" { +Properties { + _MainTex ("Particle Texture", 2D) = "white" {} + _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 +} + +Category { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One // SrcAlpha One + BlendOp Add, Min + AlphaTest Greater .01 + ColorMask RGBA + Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 3.0 + #pragma multi_compile_particles + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + float _EmissionGain; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + float4 color : COLOR; + float2 texcoord : TEXCOORD0; + float4 unbloomedColor : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + o.color = bloomColor(v.color, _EmissionGain); + o.unbloomedColor = v.color; + return o; + } + + fixed4 frag (v2f i) : COLOR + { + // Envelope + float envelope = 1; //sin(i.texcoord.x * 3.14159); + +#ifdef AUDIO_REACTIVE + float waveform = (tex2D(_FFTTex, float2(.5 - i.texcoord.x,0)).b); +#else + float waveform = .15 * sin( -30 * i.unbloomedColor.r * _Time.w + i.texcoord.x * 100 * i.unbloomedColor.r); + waveform += .15 * sin( -40 * i.unbloomedColor.g * _Time.w + i.texcoord.x * 100 * i.unbloomedColor.g); + waveform += .15 * sin( -50 * i.unbloomedColor.b * _Time.w + i.texcoord.x * 100 * i.unbloomedColor.b); +#endif + + float pinch = (1 - envelope) * 40 + 20; + //float procedural_line = saturate(1 - pinch*abs(i.texcoord.y + -waveform * envelope)); + float procedural_line = abs(i.texcoord.y - .5) > waveform ? 0 : waveform ; //saturate(1 - pinch*abs(i.texcoord.y + -waveform * envelope)); + float4 color = 1; + color.rgb *= envelope * procedural_line; + color = i.color * color; + return float4(color.rgb * color.a, 1.0); + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta new file mode 100644 index 00000000..391d3e64 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 9f5c12f3acbb626408e96c20bb9f072a +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset new file mode 100644 index 00000000..f3dcaf91 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: WaveformFFT_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d120944d-772f-4062-99c6-46a6f219eeaf + m_DurableName: WaveformFFT + m_Material: {fileID: 2100000, guid: d120944d772f406299c646a6f219eeaf, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta new file mode 100644 index 00000000..aac2a72d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af3d0280849bf6a5989c2223b37ac07b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat new file mode 100644 index 00000000..bd5b598e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat @@ -0,0 +1,36 @@ +%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: WaveformFFT_16 + m_Shader: {fileID: 4800000, guid: 9f5c12f3acbb626408e96c20bb9f072a, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 2e1a7d5cb3753244e97923f78cc37197, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _EmissionGain: 0.51785713 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta new file mode 100644 index 00000000..3d625c37 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d120944d772f406299c646a6f219eeaf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta new file mode 100644 index 00000000..921ade88 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36a848a37abb52a41a413f024c6c07cb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader new file mode 100644 index 00000000..b9aff339 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader @@ -0,0 +1,109 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Visualizer/WaveformParticles" { +Properties { + _TintColor ("Tint Color", Color) = (0.5,0.5,0.5,0.5) + _MainTex ("Particle Texture", 2D) = "white" {} +} + +Category { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One + BlendOp Add, Min + AlphaTest Greater .01 + ColorMask RGBA + Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 3.0 + #pragma glsl + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/Math.cginc" + + sampler2D _MainTex; + fixed4 _TintColor; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float4 texcoord1 : TEXCOORD1; + float3 tangent : TANGENT; + }; + + struct v2f { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float3 worldPos : TEXCOORD1; + float lifetime : TEXCOORD2; + }; + + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + + v2f o; + float4 worldPos = mul(unity_ObjectToWorld, v.vertex); + float3 perVertOffset = v.texcoord1.xyz; + float lifetime = _Time.y - v.texcoord1.w; + o.lifetime = lifetime; + float release = saturate(lifetime * .1); + float3 localMidpointPos = v.vertex.xyz - perVertOffset; + float4 worldMidpointPos = mul(unity_ObjectToWorld, localMidpointPos); + +#ifdef AUDIO_REACTIVE + lifetime = -lifetime*.1 + _BeatOutputAccum.x; + +#endif + + float time = lifetime; + float d = 10 + v.color.g * 3; + float freq = 1.5 + v.color.r; + float3 disp = float3(1,0,0) * curlX(worldMidpointPos.xyz * freq + time, d); + disp += float3(0,1,0) * curlY(worldMidpointPos.xyz * freq +time, d); + disp += float3(0,0,1) * curlZ(worldMidpointPos.xyz * freq + time, d); + + worldMidpointPos.xyz += release * disp * 10; + worldPos.xyz = worldMidpointPos.xyz + perVertOffset; + + o.vertex = mul(UNITY_MATRIX_VP, worldPos); + o.color = v.color; + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + o.worldPos = worldPos.xyz; + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + + float4 c = i.color * _TintColor * tex2D(_MainTex, i.texcoord); + return float4(c.rgb * c.a, 1.0); + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta new file mode 100644 index 00000000..9628e55f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e12e59eb54a018044abc88e7ccf3d195 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset new file mode 100644 index 00000000..d3eae740 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: WaveformParticles_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 6a1cf9f9-032c-45ec-9b6e-a6680bee30f7 + m_DurableName: WaveformParticles + m_Material: {fileID: 2100000, guid: 6a1cf9f9032c45ec9b6ea6680bee30f7, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 4 + m_uv1Semantic: 2 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta new file mode 100644 index 00000000..bb8a203f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8beca0f9aca87a57b219b821606fcaa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat new file mode 100644 index 00000000..6a4525f4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat @@ -0,0 +1,39 @@ +%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: WaveformParticles_16 + m_Shader: {fileID: 4800000, guid: e12e59eb54a018044abc88e7ccf3d195, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: b5cd5e924951cf4499488769052fedfe, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BaseGain: 0.4 + - _EmissionGain: 1 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + - _WaveformFreq: 0.2 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} + - _WaveformIntensity: {r: 0, g: 0.3, b: 0, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta new file mode 100644 index 00000000..2efc3bac --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a1cf9f9032c45ec9b6ea6680bee30f7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png new file mode 100644 index 0000000000000000000000000000000000000000..865095df5f223d15090f12f387144604538b0010 GIT binary patch literal 16908 zcmeI4UuYaf7{DiKG-=X52Z9DIx?H7L=-uw#-|TX^Cb>(SfR~0Ok`y9jZ+9+Pa<_Zk z-87eikVQWMF|m;# z%#vjG`@Z?UnfcAkH@gp;mj(xp?rwd&6#%fizb`oiKm)pM04)!rV%&H;V@u}H(H?MV zY2R%m?9BHaHvwpS#Qtpn7hi8j%4VxS)!Y1CbIXoH!Gmx88bhiPt9Q&gqGlm8Amt!P zh~uUqk6Y>SZqtO8IX(nUea4WXIo@N;m{WEsnW{WKDxHKG-N+3}hNa3`q|ZsJX2F6r zV?cjio17b8S_B|=OC1@r#!}CUvYzuxik^o4LN1RQMz+I+yd+OUi%G*tRqOQL{rD3v zqbi-=(Qt}Or5Zjc#E4KfMcfK1pQ@yT2y%0vY}AC5*t(L+pt->7BByyvVY%v$Ou$pkFs8SzZtXmJ6_ffDhI1nRA*Y6?~ex z-w9HVlZ2*hsCi4(HO7uBrS%!B)9bYxs$8XUTGpcHeK5HI~vA9chzN^t-QnFwit;dj$=X`u*ghz`pCb5H8WR^5kXGqXC#1Pgv5~Gj^V0_$3Xi>kt}ILQQUQ1aTHm!6N6;M)tod5 zS(FQ6Y*p#1Sy@$LLeJ_3>K2R#V{AQjU9bK`V$jetD0#(EdSvYM=k|7)>$)d(dB)xq z-5N@7Xf93H9HW^o?)x5Ta;>&($f|KC>nOUcDq^+I=}eeYlv;#wCxbp3s> zB@Dsi^FV9SdC(~NB_)BTHCTklZb zidn0D=5V5tH_n#LoU;Sh=D_l4P@6Mj_VbvC@-5o`QZdi*F}6lmT{BMoF*|Q&XNvWs z0S;X(Z~ra1y3M%jak8u1jJsAnpVL$;jt=i)M=`a_%YJBdo@j>A`wfhvq2VgL_MlpT z*|DUG9!E?&>j%P-k`r#J>v?=#PnV_S=}eUCJ*0SOIa>6VgI=)M${SYAc~&`Xw(_Pr zq^*pK#iEU1K*%D+MdpK9DJ~2MS){ngd@w7;g#jUp6c?EfW~I0=AY_r^BJ;tl6c+}B zEK*!#KA4r_!hn!Pii^w#vr=3b5VA;dk@;X&iVFim7AY<=AIwT|VL-?t#YN_WSt%|I z2w9}K$b2v>#f1SOixd}`4`!vfFd$@+;v)0GtP~dpge+2AWImXc;=+KCMT(2e2eVRK z7!a~Zagq68R*DM)LKZ15G9S!JabZBnBE?1KgIOsq3^{ZL$#m* zhG+87K%XsMzjpZ+08NkfC%Z=qH}BlMn(FBWy*HY#upb0&?|S#j-A1)*^oKWw7Y`kn zi@x{T7bo_8nR_*Nui@a2xu=%36pYNZ;l2Ubk1+Wk0t0ZgDSon<#)v@ewXTbwYPDCSq5h&N8GGT`i9r?9)RQGe9% z{)%JCe-p)LpgrESV`9~_Yknocp+HyvQ^oH)23H>b>alk&9I^jjLVxc-@>0*li+=<5 CTRfxy literal 0 HcmV?d00001 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta new file mode 100644 index 00000000..365d5618 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: b5cd5e924951cf4499488769052fedfe +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader index 701eaa1a..3153095e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -13,58 +13,78 @@ // limitations under the License. Shader "Brush/Visualizer/WaveformPulse" { + Properties { _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 } - SubShader { - Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } - Blend One One - Cull off ZWrite Off +SubShader { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One + Cull Off ZWrite Off + + CGPROGRAM + #pragma target 4.0 + #pragma surface surf StandardSpecular vertex:vert + + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON + // Faster compiles + #pragma skip_variants INSTANCING_ON - CGPROGRAM - #pragma target 3.0 - #pragma surface surf StandardSpecular vertex:vert - #pragma multi_compile __ AUDIO_REACTIVE - #pragma multi_compile __ TBT_LINEAR_TARGET - #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" - struct Input { - float4 color : Color; - float2 tex : TEXCOORD0; - float3 viewDir; - float3 worldNormal; - INTERNAL_DATA - }; + struct appdata { + float4 vertex : POSITION; + float3 texcoord : TEXCOORD0; + float3 texcoord1 : TEXCOORD1; + float3 texcoord2 : TEXCOORD2; + half3 normal : NORMAL; + fixed4 color : COLOR; + float4 tangent : TANGENT; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; - float _EmissionGain; + struct Input { + float4 color : Color; + float2 tex : TEXCOORD0; + float3 viewDir; + float3 worldNormal; + INTERNAL_DATA + }; - void vert (inout appdata_full i, out Input o) { - UNITY_INITIALIZE_OUTPUT(Input, o); - o.color = TbVertToSrgb(o.color); - o.tex = i.texcoord; - } + float _EmissionGain; - // Input color is srgb - void surf (Input IN, inout SurfaceOutputStandardSpecular o) { - o.Smoothness = .8; - o.Specular = .05; - float audioMultiplier = 1; + void vert (inout appdata i, out Input o) { + UNITY_INITIALIZE_OUTPUT(Input, o); + o.color = TbVertToSrgb(o.color); + o.tex = i.texcoord; + } + + // Input color is srgb + void surf (Input IN, inout SurfaceOutputStandardSpecular o) { + o.Smoothness = .8; + o.Specular = .05; + float audioMultiplier = 1; #ifdef AUDIO_REACTIVE - audioMultiplier += audioMultiplier * _BeatOutput.x; - IN.tex.x -= _BeatOutputAccum.z; - IN.color += IN.color * _BeatOutput.w * .25; + audioMultiplier += audioMultiplier * _BeatOutput.x; + IN.tex.x -= _BeatOutputAccum.z; + IN.color += IN.color * _BeatOutput.w * .25; #else - IN.tex.x -= _Time.x*15; + IN.tex.x -= _Time.x*15; #endif - IN.tex.x = fmod( abs(IN.tex.x),1); - float neon = saturate(pow( 10 * saturate(.2 - IN.tex.x),5) * audioMultiplier); - float4 bloom = bloomColor(IN.color, _EmissionGain); - float3 n = WorldNormalVector (IN, o.Normal); - half rim = 1.0 - saturate(dot (normalize(IN.viewDir), n)); - bloom *= pow(1-rim,5); - o.Emission = SrgbToNative(bloom * neon); - } - ENDCG - } -} + IN.tex.x = fmod( abs(IN.tex.x),1); + float neon = saturate(pow( 10 * saturate(.2 - IN.tex.x),5) * audioMultiplier); + float4 bloom = bloomColor(IN.color, _EmissionGain); + float3 n = WorldNormalVector (IN, o.Normal); + half rim = 1.0 - saturate(dot (normalize(IN.viewDir), n)); + bloom *= pow(1-rim,5); + o.Emission = SrgbToNative(bloom * neon); + SURF_FRAG_MOBILESELECT(o); + } + ENDCG +} // SubShader + +} // Shader diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader.meta index d8ce7c82..50e9fd1b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 39f9ec0559d25f44bad64ce4dbc8a0c4 -timeCreated: 1457493617 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/main.png.meta index 827e01a8..93617eb3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/main.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 7c9e2c33abd01d5468b670b8d02d6925 -timeCreated: 1457494445 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 32 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta new file mode 100644 index 00000000..1bdebb28 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 811945857d8db654ba8ac8482fbe47a6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader new file mode 100644 index 00000000..7965924f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader @@ -0,0 +1,83 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Visualizer/WaveformTube" { +Properties { + _MainTex ("Particle Texture", 2D) = "white" {} + _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 +} + +Category { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One //SrcAlpha One + BlendOp Add, Min + AlphaTest Greater .01 + ColorMask RGBA + Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile_particles + #pragma multi_compile __ TBT_LINEAR_TARGET + + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + float _EmissionGain; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + float4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + v2f vert (appdata_t v) + { + + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + + o.color = bloomColor(v.color, _EmissionGain); + return o; + } + + fixed4 frag (v2f i) : COLOR + { + i.texcoord.x -= _BeatOutputAccum.x; + i.texcoord.y += i.texcoord.x; + i.texcoord.x *= .25; + + float wav = (tex2D(_WaveFormTex, float2(i.texcoord.x,0)).r - .5f); + i.texcoord.y += wav; + float4 c = i.color * tex2D(_MainTex, i.texcoord); + return float4(c.rgb * c.a, 1.0); + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta new file mode 100644 index 00000000..2e7cf2e1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d1e570f96a7a4f54fb9dc544cbfa5cbf +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset new file mode 100644 index 00000000..a544f79c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: WaveformTube_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 0f5820df-cb6b-4a6c-960e-56e4c8000eda + m_DurableName: WaveformTube + m_Material: {fileID: 2100000, guid: 0f5820dfcb6b4a6c960e56e4c8000eda, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta new file mode 100644 index 00000000..efe7bfe1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c4479051e46c7a65fbb4a51ad2eb5910 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat new file mode 100644 index 00000000..ffac978c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat @@ -0,0 +1,36 @@ +%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: WaveformTube_16 + m_Shader: {fileID: 4800000, guid: d1e570f96a7a4f54fb9dc544cbfa5cbf, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7c5b7a5849a78d74594c537e2592bca7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _EmissionGain: 0.51785713 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta new file mode 100644 index 00000000..051b8a01 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f5820dfcb6b4a6c960e56e4c8000eda +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png new file mode 100644 index 0000000000000000000000000000000000000000..b37f3214b164d8242526873747af807500168a26 GIT binary patch literal 16401 zcmeI3du$ZP9mmhK6{*#TGy+P&k*?LY7LLi}$5Dhg>ancJou7i1mGzdC- zZ;#IdZHTH$v+`qq^PBH)c0cpm-|YS|8>_4Czq4>*p-!i}vvQ@cMyD%)rv*HM+7v(dixuXukz>w|L88<7~Au=%4-GtOeh&EI+^GTXSL4 zeAQpC281xsS8)-b>)_f!lO#t>QL*{z-|NFVo$E=Vu3oJVu3~v9V&XzlBQV7xQ7DDJ zvRIVkTY;)?1kHlzHcSi*8uUWQZCGs!nuAd$$~=Xx7z+bL zfXeA(k+7(+F}EQRmxbqAGiA^xx~Q#gL%BAfzCKv3_ewI*+e~&NZ?>1}OPwa#R$6K; zU9M-$w2d-bD2v(1SXir>wKDqDVek~fGnX7{VrzVX)Ns&p8(LH~%2HHEM~A7yVv^)$ zigr4kl$oIz#t3^Dl}=IRVn$IZP6kQG@d1UGg{Ue>qF#&3HA-!&+hEWJ${eZtibOL5 ziAstcq)5fMC`FshR6bFN&uF4;ayW5mA)W$Z5CNj9KpmY|2ayJY8EM|(B9XjGMfJDC zJ4g}9t5oVbqkyUbiqt0az~2t9q&VNjM_VLSQd*=L?mOe2@$OZjDLXk+E=BXqC<8HJ z2ASqb$`YxNoFNy4#d>AHsghhLNnuYi%c|2?ulITrS*5>kwIGJ14rQr}LM7Sx&PD@1 zP6ZyAk5(gXHqw?lnqlFO&1p23vSxEmkYrCJMiAzHh*P-ohGBE0)51O|3$R{s;ha9&mH#K<^Msf- z%t}Fl8P=JTc`*MH)u`ZNI!L%GL)$@nkMn^vK+6~BM+~o zGzhtyC|)0hlMX-0u;D>em?w`n!_PQbxW1*T(fjcDcL$Te(u%duFj>sG_i1{f|Zj? ztPr$|n%0(c(+OX_w&H}_68-Jw#6i*8zmzuDk7^rkqRsWA+N|`uqM&-1)Nn|1j!JvC zOQu9E{0specynkI+PhkafpEP~fbSHFwqi0idrE|Q@+uo4T@Fu~9=Yx0&E(8ePB)IT=5HG=n0KuCC7oHE|CAbhEc$475^Fh1>7Xk!t z5?pvbh?n3(fZ$Dn3(p7f5?lxnyotqCnB7_oM7W>018yAN_S45raMSSuZO3wLYEzgF z*|}*w+SLsE%+dO+mIW2ay4toVkm0_MLkD*a>vXgBRQk&6V(*Th9;hm&=jz^$Ev_lK zUVQggZrqsHu&~fm9IXH2&--4za=vki_kl0R=bms~+xz;JQ`V2#wGGd=bc{Uw>8?kI zHt*f=;{Hn?JTbEO(zoGW?Q4hTZ1o`WUtEp<2x&si$47SV9~>OqzyJBS;x!L+_imAQ zyd7WNd$N5^>kF?e?KwTZuV=@Wnj`yq28Mgw8{^&UtqbNUqus}fR=C3BzTu*^16^z7 zQ+#XpD$`wq{TqtvkFPqu;yRShF_#3kJ@dr(#ts}fFgiN=Vmv-5N&N#4uUl17B`*?8 zn=j4>FCTlv(fHxvU#>ZRqHFi2Kfk%`-uWvo$-Rx+kF5Ju+dPHpyn}vC)IYR%KDWL1 z!G?Q^2iQ0E{&RBALsw63{^7qC4*hk*x*u=j-|yS=H{*xm*`YHR@4mrEi#|K*e(B7S zzZ^cjd+f6>o!WkIXF*uqeb2}4vGYe;`qrHJQ~bKhe(>m$iIaU>{Yyc^*3Rwx_rF9OIGs&`&n{+%;#{iCyM$?%C2je*=6O4&eX* literal 0 HcmV?d00001 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta new file mode 100644 index 00000000..d8efdd34 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 7c5b7a5849a78d74594c537e2592bca7 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 64 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset index bc08f936..4a83a4db 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset.meta index 90317f08..d4ba38ae 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: cb620f38d66c44f559d8abd0efa6a295 -timeCreated: 1529443783 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat index 3ea1256a..9c9d45d8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat @@ -4,11 +4,12 @@ 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: WetPaint_16 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: SELECTION_EDGING _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -66,6 +67,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SelectionEdging: 1 - _Shininess: 0.85 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat.meta index 138c436f..42ec57e7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: b67c0e81ce6d40a8aeb0ef036b081aa3 -timeCreated: 1496701463 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/main.png.meta index d313f5db..db8315a3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/main.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 5e3fee17e4e859e499de57ab74599628 -timeCreated: 1496701421 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: -1 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/normal.png.meta index e5fc22d9..49a8cfbf 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/normal.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 2dc1a52e6c8e9734dbc80815d8732e8a -timeCreated: 1496701421 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.03 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 1 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 51 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset new file mode 100644 index 00000000..526d1b5f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: WetPaint_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: dea67637-cd1a-27e4-c9b1-52f4bbcb84e5 + m_DurableName: WetPaint + m_Material: {fileID: 2100000, guid: dea67637cd1a27e4c9b152f4bbcb84e5, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset.meta new file mode 100644 index 00000000..735412fd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c546c4baee4eba441a31a3e3e6fb516a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat new file mode 100644 index 00000000..c2cd52f6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat @@ -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: WetPaint_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 2dc1a52e6c8e9734dbc80815d8732e8a, type: 3} + 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: 5e3fee17e4e859e499de57ab74599628, 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.3 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.85 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.1397059, g: 0.1397059, b: 0.1397059, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat.meta new file mode 100644 index 00000000..f07dc9d8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db604f386e77aee418f0cc4434989db9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader index b43decc9..e5e7b21c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader @@ -1,10 +1,10 @@ -// Copyright 2017 Google Inc. +// Copyright 2020 The Tilt Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -23,25 +23,41 @@ Shader "Brush/Special/WigglyGraphiteDoubleSided" { Cull Off CGPROGRAM - #pragma target 3.0 - #pragma surface surf StandardSpecular vertex:vert alphatest:_Cutoff addshadow + #pragma target 4.0 + #pragma surface surf StandardSpecular vertex:vert addshadow #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON + // Faster compiles + #pragma skip_variants INSTANCING_ON #include "../../../Shaders/Include/Brush.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" + + struct appdata { + float4 vertex : POSITION; + float2 texcoord : TEXCOORD0; + float2 texcoord1 : TEXCOORD1; + float2 texcoord2 : TEXCOORD2; + half3 normal : NORMAL; + fixed4 color : COLOR; + float4 tangent : TANGENT; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; struct Input { float2 uv_MainTex; float4 color : Color; - float2 texcoord1 : TEXCOORD1; fixed vface : VFACE; }; sampler2D _MainTex; + float _Cutoff; - void vert(inout appdata_full i) { - i.color = TbVertToSrgb(i.color); + void vert(inout appdata i, out Input o) { + UNITY_INITIALIZE_OUTPUT(Input, o); + o.color = TbVertToSrgb(i.color); } void surf(Input IN, inout SurfaceOutputStandardSpecular o) { @@ -60,7 +76,13 @@ Shader "Brush/Special/WigglyGraphiteDoubleSided" { o.Smoothness = 0; o.Albedo = IN.color.rgb; o.Alpha = tex2D(_MainTex, scrollUV).w * IN.color.a; + if (o.Alpha < _Cutoff) { + discard; + } + o.Alpha = 1; o.Normal.z *= IN.vface; + + SURF_FRAG_MOBILESELECT(o); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader.meta index 0cc5699c..522f08e5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 5e1540b883dd10647a305c0ec4ae14ed -timeCreated: 1488504258 -licenseType: Pro ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader new file mode 100644 index 00000000..5afe5df3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader @@ -0,0 +1,73 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Special/WigglyGraphiteSingleSided" { + Properties{ + _MainTex("Main Texture", 2D) = "white" {} + _SecondaryTex("Diffuse Tex", 2D) = "white" {} + _Cutoff("Alpha cutoff", Range(0,1)) = 0.5 + } + SubShader{ + Tags {"Queue"="AlphaTest" "IgnoreProjector"="True" "RenderType"="TransparentCutout"} + LOD 200 + Cull Back + + CGPROGRAM + #pragma target 3.0 + #pragma surface surf StandardSpecular vertex:vert alphatest:_Cutoff addshadow + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + + #include "../../../Shaders/Include/Brush.cginc" + #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + + struct Input { + float2 uv_MainTex; + float2 uv_SecondaryTex; + float4 color : Color; + float2 texcoord1 : TEXCOORD1; + }; + + sampler2D _MainTex; + sampler2D _SecondaryTex; + + void vert(inout appdata_full i) { + i.color = TbVertToSrgb(i.color); + } + + void surf(Input IN, inout SurfaceOutputStandardSpecular o) { + fixed2 scrollUV = IN.uv_MainTex; + + // Animate flipbook motion. Currently tuned to taste. + float anim = fmod(_Time.y * 12, 6); + anim = ceil(anim); + scrollUV.x += anim; + scrollUV.x *= 1.1; + + float3 secondary_tex = tex2D(_MainTex, IN.uv_SecondaryTex ).rgb; + + // Apply the alpha mask + float primary_tex = tex2D(_MainTex, scrollUV).w; + + float3 tex = secondary_tex * primary_tex; + + o.Specular = 0; + o.Smoothness = 0; + o.Albedo = IN.color.rgb; + o.Alpha = tex * IN.color.a; + } + ENDCG + } + FallBack "Diffuse" +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader.meta new file mode 100644 index 00000000..23c29dba --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 06a41f8d9deb2264c9e9b067bbaae02a +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset index 1ac04c64..93074625 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset.meta index d03c4be2..7b6bbd0c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: b250a068d80bad858be65c3d4675b50d -timeCreated: 1529443784 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat index 05b0db7e..22e58b07 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat @@ -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: WigglyGraphite_16 m_Shader: {fileID: 4800000, guid: 5e1540b883dd10647a305c0ec4ae14ed, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat.meta index 64a3dce2..b1dc070e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 5347acf0a8e247b6834630c70719d763 -timeCreated: 1488504943 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/main.png.meta index 1472eaee..17a35cd1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/main.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: dcae52156c7b5af40bcf91076a87a6b5 -timeCreated: 1442276315 -licenseType: Pro TextureImporter: fileIDToRecycleName: {} - serializedVersion: 2 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,39 +21,101 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -1 - wrapMode: 0 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: -1 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset new file mode 100644 index 00000000..27fd56d8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: WigglyGraphite_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: e814fef1-97fd-7194-4a2f-50c2bb918be2 + m_DurableName: WigglyGraphite + m_Material: {fileID: 2100000, guid: e814fef197fd71944a2f50c2bb918be2, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset.meta new file mode 100644 index 00000000..5eb7f7b8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c869d93d31fc61a4c866ada41aa85f3a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat new file mode 100644 index 00000000..e850c30f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat @@ -0,0 +1,91 @@ +%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: WigglyGraphite_16 + m_Shader: {fileID: 4800000, guid: 06a41f8d9deb2264c9e9b067bbaae02a, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 4dc8839531391124e843ac89670b8ad7, type: 3} + 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: dcae52156c7b5af40bcf91076a87a6b5, 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} + - _SecondaryTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _CellAmount: 4 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 1 + - _SrcBlend: 1 + - _TexWidth: 1024 + - _UVSec: 0 + - _XScrollAmount: 1 + - _XScrollSpeed: 0 + - _YScrollAmount: 1 + - _YScrollSpeed: 10 + - _ZWrite: 1 + - _xScrollSpeed: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat.meta new file mode 100644 index 00000000..579f28bd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64c5ce17cf5a85c4697f04413bed6a2c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta new file mode 100644 index 00000000..a1b42ddd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80cf4a814b51dbe4baefa884bea2432a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset new file mode 100644 index 00000000..ae9c8de9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Wind_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 7136a729-1aab-bd24-f8b2-ca88b6adfb67 + m_DurableName: Wind + m_Material: {fileID: 2100000, guid: 7136a7291aabbd24f8b2ca88b6adfb67, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta new file mode 100644 index 00000000..a696e612 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99fe8738f2e0bea53a4370be40a8aaa4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat new file mode 100644 index 00000000..e71b4426 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat @@ -0,0 +1,82 @@ +%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: Wind_16 + m_Shader: {fileID: 4800000, guid: 33864871272a015428871ed0e1c4073f, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaMask: + m_Texture: {fileID: 2800000, guid: b0396e66243f48449a3710f12f224199, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: f5f96a7864561b24abd0b9166b083174, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta new file mode 100644 index 00000000..a12853ab --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7136a7291aabbd24f8b2ca88b6adfb67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset index d03510b1..e677f8f4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -16,8 +17,8 @@ MonoBehaviour: m_DurableName: Wire m_Material: {fileID: 2100000, guid: 4391385acf8343969e3331e4e4930b27, type: 2} m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 + m_uv0Size: 3 + m_uv0Semantic: 3 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset.meta index c37aaa99..2e6b7846 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 3a72bd3c1fe3d784ab8896ec9fdfd058 -timeCreated: 1495162082 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat index b464ca9b..e0e80286 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat @@ -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: Wire m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat.meta index e32fab28..4b615348 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 4391385acf8343969e3331e4e4930b27 -timeCreated: 1481917482 -licenseType: Pro NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset new file mode 100644 index 00000000..96de60f7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Wire_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 4391385a-cf83-4396-9e33-31e4e4930b27 + m_DurableName: Wire + m_Material: {fileID: 2100000, guid: 4391385acf8343969e3331e4e4930b27, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset.meta new file mode 100644 index 00000000..bf301d85 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58f17ed358c05fb4590f1f6821d2e9c2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat new file mode 100644 index 00000000..5b1463e4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat @@ -0,0 +1,77 @@ +%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: Wire_16 + m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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.067 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat.meta new file mode 100644 index 00000000..433d0538 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 73f36413d77035b409f04f40d32d7289 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta new file mode 100644 index 00000000..7ace0d69 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a714e38afc4ceac4fb65bc943b0da3cf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader new file mode 100644 index 00000000..42b287ac --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader @@ -0,0 +1,83 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Special/Wireframe" { +Properties { +} + +Category { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One + AlphaTest Greater .01 + Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ ODS_RENDER + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float3 normal : NORMAL; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + + v2f o; + + o.texcoord = v.texcoord; + o.color = v.color; + o.vertex = UnityObjectToClipPos(v.vertex); + return o; + } + + fixed4 frag (v2f i) : COLOR + { + + half w = 0; +#ifdef AUDIO_REACTIVE + float waveform = (tex2D(_WaveFormTex, float2(i.texcoord.y,0)).r - .5f); + float envelope = sin(i.texcoord.y * 3.141569); + i.texcoord.x += waveform * envelope; + w = ( abs(i.texcoord.x - .5) > .5) ? 1 : 0; +#else + w = ( abs(i.texcoord.x - .5) > .45) ? 1 : 0; + w += ( abs(i.texcoord.y - .5) > .45) ? 1 : 0; +#endif + //float angle = atan2(i.texcoord.x, i.texcoord.y); + //w += ( abs(angle - (3.14/4.0)) < .05) ? 1 : 0; + return i.color * w; + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta new file mode 100644 index 00000000..da388601 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 62214494f4cd16a4db9c53337309f0e6 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset new file mode 100644 index 00000000..2a5f8032 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Wireframe_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 2c1a6a63-6552-4d23-86d7-58f6fba8581b + m_DurableName: Wireframe + m_Material: {fileID: 2100000, guid: 2c1a6a6365524d2386d758f6fba8581b, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta new file mode 100644 index 00000000..98a50aa9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5cc686c70856a215e8f8fea06ce5e8f1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat new file mode 100644 index 00000000..9dd5a2ae --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat @@ -0,0 +1,33 @@ +%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: Wireframe_16 + m_Shader: {fileID: 4800000, guid: 62214494f4cd16a4db9c53337309f0e6, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + 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: + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta new file mode 100644 index 00000000..bd84a41c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c1a6a6365524d2386d758f6fba8581b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Packages/manifest.json b/UnitySDK/Packages/manifest.json index 94fb9b8b..786b3f6c 100644 --- a/UnitySDK/Packages/manifest.json +++ b/UnitySDK/Packages/manifest.json @@ -1,11 +1,35 @@ { "dependencies": { "com.unity.package-manager-ui": "2.0.8", + "com.unity.textmeshpro": "1.4.1", + "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" } } diff --git a/UnitySDK/ProjectSettings/AudioManager.asset b/UnitySDK/ProjectSettings/AudioManager.asset index da611257..4f31e744 100644 --- a/UnitySDK/ProjectSettings/AudioManager.asset +++ b/UnitySDK/ProjectSettings/AudioManager.asset @@ -8,7 +8,7 @@ AudioManager: Doppler Factor: 1 Default Speaker Mode: 2 m_SampleRate: 0 - m_DSPBufferSize: 0 + m_DSPBufferSize: 1024 m_VirtualVoiceCount: 512 m_RealVoiceCount: 32 m_SpatializerPlugin: diff --git a/UnitySDK/ProjectSettings/DynamicsManager.asset b/UnitySDK/ProjectSettings/DynamicsManager.asset index 78992f08..b3c263d3 100644 --- a/UnitySDK/ProjectSettings/DynamicsManager.asset +++ b/UnitySDK/ProjectSettings/DynamicsManager.asset @@ -3,7 +3,7 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 8 m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 @@ -19,7 +19,8 @@ PhysicsManager: m_ContactsGeneration: 1 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 - m_AutoSyncTransforms: 1 + m_AutoSyncTransforms: 0 + m_ReuseCollisionCallbacks: 1 m_ClothInterCollisionSettingsToggle: 0 m_ContactPairsMode: 0 m_BroadphaseType: 0 diff --git a/UnitySDK/ProjectSettings/EditorBuildSettings.asset b/UnitySDK/ProjectSettings/EditorBuildSettings.asset index 6dc24f7d..0147887e 100644 --- a/UnitySDK/ProjectSettings/EditorBuildSettings.asset +++ b/UnitySDK/ProjectSettings/EditorBuildSettings.asset @@ -5,3 +5,4 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: [] + m_configObjects: {} diff --git a/UnitySDK/ProjectSettings/EditorSettings.asset b/UnitySDK/ProjectSettings/EditorSettings.asset index c1ce8ebc..de17694c 100644 --- a/UnitySDK/ProjectSettings/EditorSettings.asset +++ b/UnitySDK/ProjectSettings/EditorSettings.asset @@ -6,16 +6,18 @@ EditorSettings: serializedVersion: 7 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 - m_LineEndingsForNewScripts: 1 + m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 0 - m_SpritePackerMode: 2 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} + m_SpritePackerMode: 0 m_SpritePackerPaddingPower: 1 - m_EtcTextureCompressorBehavior: 0 - m_EtcTextureFastCompressor: 2 + m_EtcTextureCompressorBehavior: 1 + m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 - m_EtcTextureBestCompressor: 5 + m_EtcTextureBestCompressor: 4 m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInPlayMode: 1 diff --git a/UnitySDK/ProjectSettings/Physics2DSettings.asset b/UnitySDK/ProjectSettings/Physics2DSettings.asset index 132ee6bc..57760e2e 100644 --- a/UnitySDK/ProjectSettings/Physics2DSettings.asset +++ b/UnitySDK/ProjectSettings/Physics2DSettings.asset @@ -3,7 +3,7 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 3 + serializedVersion: 4 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 @@ -24,7 +24,8 @@ Physics2DSettings: m_QueriesStartInColliders: 1 m_ChangeStopsCallbacks: 0 m_CallbacksOnDisable: 1 - m_AutoSyncTransforms: 1 + m_ReuseCollisionCallbacks: 1 + m_AutoSyncTransforms: 0 m_AlwaysShowColliders: 0 m_ShowColliderSleep: 1 m_ShowColliderContacts: 0 diff --git a/UnitySDK/ProjectSettings/PresetManager.asset b/UnitySDK/ProjectSettings/PresetManager.asset index 636a595b..820e662d 100644 --- a/UnitySDK/ProjectSettings/PresetManager.asset +++ b/UnitySDK/ProjectSettings/PresetManager.asset @@ -3,4 +3,25 @@ --- !u!1386491679 &1 PresetManager: m_ObjectHideFlags: 0 - m_DefaultList: [] + m_DefaultList: + - type: + m_NativeTypeID: 108 + m_ManagedTypePPtr: {fileID: 0} + m_ManagedTypeFallback: + defaultPresets: + - m_Preset: {fileID: 2655988077585873504, guid: c1cf8506f04ef2c4a88b64b6c4202eea, + type: 2} + - type: + m_NativeTypeID: 1020 + m_ManagedTypePPtr: {fileID: 0} + m_ManagedTypeFallback: + defaultPresets: + - m_Preset: {fileID: 2655988077585873504, guid: 0cd792cc87e492d43b4e95b205fc5cc6, + type: 2} + - type: + m_NativeTypeID: 1006 + m_ManagedTypePPtr: {fileID: 0} + m_ManagedTypeFallback: + defaultPresets: + - m_Preset: {fileID: 2655988077585873504, guid: 7a99f8aa944efe94cb9bd74562b7d5f9, + type: 2} diff --git a/UnitySDK/ProjectSettings/ProjectSettings.asset b/UnitySDK/ProjectSettings/ProjectSettings.asset index 2c8051aa..1eb46cab 100644 --- a/UnitySDK/ProjectSettings/ProjectSettings.asset +++ b/UnitySDK/ProjectSettings/ProjectSettings.asset @@ -3,8 +3,8 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 - productGUID: 2a2397b6cada1470a9610a9d71038ccd + serializedVersion: 18 + productGUID: 477c21248f028bc41a0be9a4b4cc1a40 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 @@ -12,12 +12,12 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: Google - productName: Tilt Brush Toolkit + companyName: Icosa + productName: Open Brush Toolkit defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 @@ -52,8 +52,8 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 - displayResolutionDialog: 2 + displayResolutionDialog: 1 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -105,7 +105,7 @@ PlayerSettings: xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 xboxOnePresentImmediateThreshold: 0 - switchQueueCommandMemory: 1048576 + switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 switchQueueComputeMemory: 262144 switchNVNShaderPoolsGranularity: 33554432 @@ -118,13 +118,13 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.0 + bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 - xboxOneDisableKinectGpuReservation: 0 - xboxOneEnable7thCore: 0 + xboxOneDisableKinectGpuReservation: 1 + xboxOneEnable7thCore: 1 isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: @@ -139,10 +139,13 @@ PlayerSettings: maximumSupportedHeadTracking: 1 hololens: depthFormat: 1 - depthBufferSharingEnabled: 0 + depthBufferSharingEnabled: 1 oculus: - sharedDepthBuffer: 0 - dashSupport: 0 + sharedDepthBuffer: 1 + dashSupport: 1 + lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 0 enable360StereoCapture: 0 protectGraphicsMemory: 0 enableFrameTimingStats: 0 @@ -153,11 +156,11 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.Company.ProductName - Standalone: unity.Google.Tilt Brush Toolkit - Tizen: com.Company.ProductName - iOS: com.Company.ProductName - tvOS: com.Company.ProductName + Android: com.icosa.openbrushtoolkit + Standalone: unity.Icosa.Open Brush Toolkit + Tizen: com.icosa.openbrushtoolkit + iOS: com.icosa.openbrushtoolkit + tvOS: com.icosa.openbrushtoolkit buildNumber: iOS: 0 AndroidBundleVersionCode: 1 @@ -173,8 +176,8 @@ PlayerSettings: CreateWallpaper: 0 APKExpansionFiles: 0 keepLoadedShadersAlive: 0 - StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: 214 + StripUnusedMeshComponents: 1 + VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 iOSTargetOSVersionString: 9.0 tvOSSdkVersion: 0 @@ -233,7 +236,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 - iOSRenderExtraFrameOnPause: 1 + iOSRenderExtraFrameOnPause: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -243,9 +246,9 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 - clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: + clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea + templatePackageId: com.unity.template.3d@1.3.0 + templateDefaultScene: Assets/Scenes/SampleScene.unity AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -263,86 +266,52 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: - - m_BuildTarget: - m_Icons: - - serializedVersion: 2 - m_Icon: {fileID: 0} - m_Width: 128 - m_Height: 128 - m_Kind: 60463 + m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] - m_BuildTargetBatching: [] - m_BuildTargetGraphicsAPIs: [] - m_BuildTargetVRSettings: + m_BuildTargetBatching: + - m_BuildTarget: Standalone + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: tvOS + m_StaticBatching: 1 + m_DynamicBatching: 0 - m_BuildTarget: Android - m_Enabled: 0 - m_Devices: - - Oculus - - m_BuildTarget: Metro - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: N3DS - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: PS3 - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: PS4 - m_Enabled: 0 - m_Devices: - - PlayStationVR - - m_BuildTarget: PSM - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: PSP2 - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: SamsungTV - m_Enabled: 0 - m_Devices: [] + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: iPhone + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: WebGL + m_StaticBatching: 0 + m_DynamicBatching: 0 + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: AndroidPlayer + m_APIs: 0b00000008000000 + m_Automatic: 1 + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 + - m_BuildTarget: AppleTVSupport + m_APIs: 10000000 + m_Automatic: 0 + - m_BuildTarget: WebGLSupport + m_APIs: 0b000000 + m_Automatic: 1 + m_BuildTargetVRSettings: - m_BuildTarget: Standalone m_Enabled: 0 m_Devices: + - Oculus - OpenVR - - m_BuildTarget: Tizen - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: WebGL - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: WebPlayer - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: WiiU - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: Xbox360 - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: XboxOne - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: iOS - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: tvOS - m_Enabled: 0 - m_Devices: [] m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 m_TemplateCustomTags: {} mobileMTRendering: + Android: 1 iPhone: 1 tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: - - m_BuildTarget: Standalone - m_EncodingQuality: 1 - - m_BuildTarget: XboxOne - m_EncodingQuality: 1 - - m_BuildTarget: PS4 - m_EncodingQuality: 1 + m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 @@ -485,7 +454,7 @@ PlayerSettings: ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: - ps4ParentalLevel: 1 + ps4ParentalLevel: 11 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 @@ -495,7 +464,7 @@ PlayerSettings: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 - ps4VideoOutReprojectionRate: 120 + ps4VideoOutReprojectionRate: 60 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: @@ -520,7 +489,7 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 - ps4Passcode: 9wQj99nsQzldVI5ZuGXbEWRK5RhRXdCd + ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 @@ -533,7 +502,7 @@ PlayerSettings: ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 ps4SocialScreenEnabled: 0 - ps4ScriptOptimizationLevel: 3 + ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 ps4PatchPkgPath: @@ -557,7 +526,7 @@ PlayerSettings: webGLMemorySize: 256 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 - webGLDataCaching: 0 + webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: webGLModulesDirectory: @@ -567,40 +536,26 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - scriptingDefineSymbols: - 1: - 2: CROSS_PLATFORM_INPUT - 4: CROSS_PLATFORM_INPUT;MOBILE_INPUT - 7: CROSS_PLATFORM_INPUT;MOBILE_INPUT - 14: MOBILE_INPUT - 15: CROSS_PLATFORM_INPUT;MOBILE_INPUT - 17: MOBILE_INPUT - 20: MOBILE_INPUT - 22: MOBILE_INPUT + scriptingDefineSymbols: {} platformArchitecture: {} - scriptingBackend: - Android: 0 - Standalone: 0 - WebGL: 1 - WebPlayer: 0 + scriptingBackend: {} il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 - apiCompatibilityLevelPerPlatform: - Standalone: 3 + apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: sequencer 535 + metroPackageName: Template_3D metroPackageVersion: metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: sequencer 535 + metroApplicationDescription: Template_3D wsaImages: {} metroTileShortName: metroTileShowName: 0 @@ -610,11 +565,11 @@ PlayerSettings: metroSupportStreamingInstall: 0 metroLastRequiredScene: 0 metroDefaultTileSize: 1 - metroTileForegroundText: 1 + metroTileForegroundText: 2 metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} - metroSplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, + metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} - metroSplashScreenUseBackgroundColor: 1 + metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -639,28 +594,20 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 - XboxOneEnableGPUVariability: 0 + XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 0 + xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} cloudServicesEnabled: - Analytics: 0 - Build: 0 - Collab: 0 - ErrorHub: 0 - Game_Performance: 0 - Hub: 0 - Purchasing: 0 - UNet: 0 - Unity_Ads: 0 + UNet: 1 luminIcon: m_Name: m_ModelFolderPath: @@ -687,4 +634,4 @@ PlayerSettings: cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 - legacyClampBlendShapeWeights: 1 + legacyClampBlendShapeWeights: 0 diff --git a/UnitySDK/ProjectSettings/QualitySettings.asset b/UnitySDK/ProjectSettings/QualitySettings.asset index 515c1e6f..0621bef1 100644 --- a/UnitySDK/ProjectSettings/QualitySettings.asset +++ b/UnitySDK/ProjectSettings/QualitySettings.asset @@ -4,22 +4,22 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 3 + m_CurrentQuality: 4 m_QualitySettings: - serializedVersion: 2 - name: Graphing Calculator + name: Very Low pixelLightCount: 0 shadows: 0 shadowResolution: 0 shadowProjection: 1 shadowCascades: 1 shadowDistance: 15 - shadowNearPlaneOffset: 2 + shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 blendWeights: 1 - textureQuality: 0 + textureQuality: 1 anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 @@ -31,46 +31,46 @@ QualitySettings: maximumLODLevel: 0 particleRaycastBudget: 4 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 - name: Low Performance Desktop + name: Low pixelLightCount: 0 shadows: 0 shadowResolution: 0 shadowProjection: 1 shadowCascades: 1 - shadowDistance: 30 - shadowNearPlaneOffset: 2 + shadowDistance: 20 + shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 blendWeights: 2 textureQuality: 0 - anisotropicTextures: 1 + anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: 0.7 + lodBias: 0.4 maximumLODLevel: 0 - particleRaycastBudget: 64 + particleRaycastBudget: 16 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 - name: High Performance Desktop - pixelLightCount: 0 + name: Medium + pixelLightCount: 1 shadows: 1 - shadowResolution: 2 + shadowResolution: 0 shadowProjection: 1 shadowCascades: 1 - shadowDistance: 30 - shadowNearPlaneOffset: 2 + shadowDistance: 20 + shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 @@ -79,52 +79,112 @@ QualitySettings: anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 - softVegetation: 1 + softVegetation: 0 realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + vSyncCount: 1 + lodBias: 0.7 + maximumLODLevel: 0 + particleRaycastBudget: 64 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: High + pixelLightCount: 2 + shadows: 2 + shadowResolution: 1 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 40 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + blendWeights: 2 + textureQuality: 0 + anisotropicTextures: 1 + antiAliasing: 2 + softParticles: 0 + softVegetation: 1 + realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 0 + vSyncCount: 1 lodBias: 1 maximumLODLevel: 0 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 - name: Future Desktops - pixelLightCount: 0 + name: Very High + pixelLightCount: 3 shadows: 2 - shadowResolution: 3 + shadowResolution: 2 shadowProjection: 1 - shadowCascades: 4 - shadowDistance: 50 - shadowNearPlaneOffset: 2 + shadowCascades: 2 + shadowDistance: 40 + shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.19999999, z: 0.46666664} + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 blendWeights: 4 textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 0 - softParticles: 0 + anisotropicTextures: 1 + antiAliasing: 4 + softParticles: 1 softVegetation: 1 - realtimeReflectionProbes: 0 + realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 0 + vSyncCount: 1 lodBias: 1.5 maximumLODLevel: 0 particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Ultra + pixelLightCount: 4 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 4 + shadowDistance: 150 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + blendWeights: 4 + textureQuality: 0 + anisotropicTextures: 1 + antiAliasing: 4 + softParticles: 1 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + vSyncCount: 1 + lodBias: 2 + maximumLODLevel: 0 + particleRaycastBudget: 4096 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: - Android: 0 - BlackBerry: 0 - Samsung TV: 0 - Standalone: 0 - WP8: 0 - Web: 0 - WebGL: 0 - Windows Store Apps: 0 - iPhone: 0 + Android: 2 + Nintendo 3DS: 5 + Nintendo Switch: 5 + PS4: 5 + PSP2: 2 + Standalone: 5 + Tizen: 2 + WebGL: 3 + WiiU: 5 + Windows Store Apps: 5 + XboxOne: 5 + iPhone: 2 + tvOS: 2 diff --git a/UnitySDK/ProjectSettings/TagManager.asset b/UnitySDK/ProjectSettings/TagManager.asset index 1c92a784..17cb8036 100644 --- a/UnitySDK/ProjectSettings/TagManager.asset +++ b/UnitySDK/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - UI - - - - + - PostProcessing - - - diff --git a/UnitySDK/ProjectSettings/UnityConnectSettings.asset b/UnitySDK/ProjectSettings/UnityConnectSettings.asset index 3da14d5b..fa0b1465 100644 --- a/UnitySDK/ProjectSettings/UnityConnectSettings.asset +++ b/UnitySDK/ProjectSettings/UnityConnectSettings.asset @@ -3,25 +3,25 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 + serializedVersion: 1 m_Enabled: 0 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events + m_EventUrl: https://cdp.cloud.unity3d.com/v1/events + m_ConfigUrl: https://config.uca.cloud.unity3d.com m_TestInitMode: 0 CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes - m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate + m_EventUrl: https://perf-events.cloud.unity3d.com m_Enabled: 0 + m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 UnityAnalyticsSettings: m_Enabled: 0 - m_InitializeOnStartup: 1 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_InitializeOnStartup: 1 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 From cafd92b4b5bcdf3aad536076b5a394b5ba570607 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Tue, 10 Aug 2021 15:51:04 +0100 Subject: [PATCH 2/8] Revert "Try adding experimental brushes" This reverts commit 89b75dd3ea48e732219a5351a6cf8425df1b044e. --- .../TiltBrush/Assets/Brushes/AllBrushes.asset | 114 +------ .../Assets/Brushes/Basic/BlocksGem.meta | 8 - .../Brushes/Basic/BlocksGem/BlocksGem.asset | 26 -- .../Basic/BlocksGem/BlocksGem.asset.meta | 8 - .../Brushes/Basic/BlocksGem/BlocksGem.mat | 88 ----- .../Basic/BlocksGem/BlocksGem.mat.meta | 8 - .../Basic/BlocksGem/BlocksGem_16.asset | 26 -- .../Basic/BlocksGem/BlocksGem_16.asset.meta | 8 - .../Brushes/Basic/BlocksGem/BlocksGem_16.mat | 88 ----- .../Basic/BlocksGem/BlocksGem_16.mat.meta | 8 - .../Assets/Brushes/Basic/BlocksGlass.meta | 8 - .../Basic/BlocksGlass/BlocksGlass.asset | 26 -- .../Basic/BlocksGlass/BlocksGlass.asset.meta | 8 - .../Brushes/Basic/BlocksGlass/BlocksGlass.mat | 86 ----- .../Basic/BlocksGlass/BlocksGlass.mat.meta | 8 - .../Basic/BlocksGlass/BlocksGlass_16.asset | 26 -- .../BlocksGlass/BlocksGlass_16.asset.meta | 8 - .../Basic/BlocksGlass/BlocksGlass_16.mat | 86 ----- .../Basic/BlocksGlass/BlocksGlass_16.mat.meta | 8 - .../Assets/Brushes/Basic/BlocksPaper.meta | 8 - .../Basic/BlocksPaper/BlocksBasic_16.asset | 26 -- .../BlocksPaper/BlocksBasic_16.asset.meta | 8 - .../Basic/BlocksPaper/BlocksBasic_16.mat | 79 ----- .../Basic/BlocksPaper/BlocksBasic_16.mat.meta | 8 - .../Basic/BlocksPaper/BlocksPaper.asset | 26 -- .../Basic/BlocksPaper/BlocksPaper.asset.meta | 8 - .../Brushes/Basic/BlocksPaper/BlocksPaper.mat | 79 ----- .../Basic/BlocksPaper/BlocksPaper.mat.meta | 8 - .../Assets/Brushes/Basic/BubbleWand.meta | 8 - .../Basic/BubbleWand/BubbleWand_16.asset | 26 -- .../Basic/BubbleWand/BubbleWand_16.asset.meta | 8 - .../Basic/BubbleWand/BubbleWand_16.mat | 51 --- .../Basic/BubbleWand/BubbleWand_16.mat.meta | 8 - .../Brushes/Basic/Bubbles/Bubbles.asset | 5 +- .../Brushes/Basic/Bubbles/Bubbles.asset.meta | 2 + .../Assets/Brushes/Basic/Bubbles/Bubbles.mat | 5 +- .../Brushes/Basic/Bubbles/Bubbles.mat.meta | 4 +- .../Brushes/Basic/Bubbles/Bubbles.shader | 15 +- .../Brushes/Basic/Bubbles/Bubbles.shader.meta | 4 +- .../Brushes/Basic/Bubbles/Bubbles_16.asset | 26 -- .../Basic/Bubbles/Bubbles_16.asset.meta | 8 - .../Brushes/Basic/Bubbles/Bubbles_16.mat | 90 ----- .../Brushes/Basic/Bubbles/Bubbles_16.mat.meta | 8 - .../Basic/Bubbles/maintexture.png.meta | 89 +---- .../Assets/Brushes/Basic/CandyCane.meta | 8 - .../Basic/CandyCane/CandyCane_16.asset | 26 -- .../Basic/CandyCane/CandyCane_16.asset.meta | 8 - .../Brushes/Basic/CandyCane/CandyCane_16.mat | 37 -- .../Basic/CandyCane/CandyCane_16.mat.meta | 8 - .../Brushes/Basic/CelVinyl/CelVinyl.shader | 18 +- .../Basic/CelVinyl/CelVinyl.shader.meta | 4 +- .../Brushes/Basic/CelVinyl/CelVinyl_16.asset | 5 +- .../Basic/CelVinyl/CelVinyl_16.asset.meta | 2 + .../Brushes/Basic/CelVinyl/CelVinyl_16.mat | 5 +- .../Basic/CelVinyl/CelVinyl_16.mat.meta | 4 +- .../Brushes/Basic/CelVinyl/main.png.meta | 92 +---- .../Assets/Brushes/Basic/Charcoal.meta | 8 - .../Brushes/Basic/Charcoal/Charcoal_16.asset | 26 -- .../Basic/Charcoal/Charcoal_16.asset.meta | 8 - .../Brushes/Basic/Charcoal/Charcoal_16.mat | 79 ----- .../Basic/Charcoal/Charcoal_16.mat.meta | 8 - .../Basic/ChromaticWave/ChromaticWave.asset | 9 +- .../ChromaticWave/ChromaticWave.asset.meta | 2 + .../Basic/ChromaticWave/ChromaticWave.mat | 5 +- .../ChromaticWave/ChromaticWave.mat.meta | 4 +- .../Basic/ChromaticWave/ChromaticWave.shader | 13 +- .../ChromaticWave/ChromaticWave.shader.meta | 4 +- .../ChromaticWave/ChromaticWave_16.asset | 26 -- .../ChromaticWave/ChromaticWave_16.asset.meta | 8 - .../Basic/ChromaticWave/ChromaticWave_16.mat | 85 ----- .../ChromaticWave/ChromaticWave_16.mat.meta | 8 - .../CoarseBristles/CoarseBristles_15.asset | 5 +- .../CoarseBristles_15.asset.meta | 2 + .../CoarseBristles/CoarseBristles_15.mat | 8 +- .../CoarseBristles/CoarseBristles_15.mat.meta | 4 +- .../CoarseBristles/CoarseBristles_16.asset | 26 -- .../CoarseBristles_16.asset.meta | 8 - .../CoarseBristles/CoarseBristles_16.mat | 78 ----- .../CoarseBristles/CoarseBristles_16.mat.meta | 8 - .../Basic/CoarseBristles/leaves.png.meta | 96 +----- .../CoarseBristles_0.asset | 5 +- .../CoarseBristles_0.asset.meta | 2 + .../CoarseBristles_0.mat | 5 +- .../CoarseBristles_0.mat.meta | 4 +- .../CoarseBristles_16.asset | 26 -- .../CoarseBristles_16.asset.meta | 8 - .../CoarseBristles_16.mat | 77 ----- .../CoarseBristles_16.mat.meta | 8 - .../Assets/Brushes/Basic/Comet/Comet.shader | 15 +- .../Brushes/Basic/Comet/Comet.shader.meta | 4 +- .../Assets/Brushes/Basic/Comet/Comet_16.asset | 5 +- .../Brushes/Basic/Comet/Comet_16.asset.meta | 2 + .../Assets/Brushes/Basic/Comet/Comet_16.mat | 5 +- .../Brushes/Basic/Comet/Comet_16.mat.meta | 4 +- .../Brushes/Basic/Comet/gradient.png.meta | 88 +---- .../Assets/Brushes/Basic/Comet/main.png.meta | 88 +---- .../Assets/Brushes/Basic/ConcaveHull.meta | 8 - .../Basic/ConcaveHull/ConcaveHull_16.asset | 26 -- .../ConcaveHull/ConcaveHull_16.asset.meta | 8 - .../Basic/ConcaveHull/ConcaveHull_16.mat | 102 ------ .../Basic/ConcaveHull/ConcaveHull_16.mat.meta | 8 - .../Assets/Brushes/Basic/DanceFloor.meta | 8 - .../Basic/DanceFloor/DanceFloor.shader | 107 ------ .../Basic/DanceFloor/DanceFloor.shader.meta | 9 - .../Basic/DanceFloor/DanceFloor_16.asset | 26 -- .../Basic/DanceFloor/DanceFloor_16.asset.meta | 8 - .../Basic/DanceFloor/DanceFloor_16.mat | 39 --- .../Basic/DanceFloor/DanceFloor_16.mat.meta | 8 - .../Brushes/Basic/DanceFloor/maintexture.png | Bin 26563 -> 0 bytes .../Basic/DanceFloor/maintexture.png.meta | 121 ------- .../Basic/DiamondHull/DiamondHull.shader | 13 +- .../Basic/DiamondHull/DiamondHull.shader.meta | 4 +- .../Basic/DiamondHull/DiamondHull_16.asset | 9 +- .../DiamondHull/DiamondHull_16.asset.meta | 2 + .../Basic/DiamondHull/DiamondHull_16.mat | 5 +- .../Basic/DiamondHull/DiamondHull_16.mat.meta | 4 +- .../Brushes/Basic/DiamondHull/main.png.meta | 56 +--- .../Assets/Brushes/Basic/Digital.meta | 8 - .../Brushes/Basic/Digital/Digital_16.asset | 26 -- .../Basic/Digital/Digital_16.asset.meta | 8 - .../Brushes/Basic/Digital/Digital_16.mat | 28 -- .../Brushes/Basic/Digital/Digital_16.mat.meta | 8 - .../Assets/Brushes/Basic/Disco/Disco.asset | 5 +- .../Brushes/Basic/Disco/Disco.asset.meta | 2 + .../Assets/Brushes/Basic/Disco/Disco.mat | 5 +- .../Assets/Brushes/Basic/Disco/Disco.mat.meta | 4 +- .../Assets/Brushes/Basic/Disco/Disco.shader | 10 +- .../Brushes/Basic/Disco/Disco.shader.meta | 4 +- .../Assets/Brushes/Basic/Disco/Disco_16.asset | 26 -- .../Brushes/Basic/Disco/Disco_16.asset.meta | 8 - .../Assets/Brushes/Basic/Disco/Disco_16.mat | 43 --- .../Brushes/Basic/Disco/Disco_16.mat.meta | 8 - .../Brushes/Basic/DotMarker/DotMarker.asset | 5 +- .../Basic/DotMarker/DotMarker.asset.meta | 2 + .../Brushes/Basic/DotMarker/DotMarker.mat | 8 +- .../Basic/DotMarker/DotMarker.mat.meta | 4 +- .../Basic/DotMarker/DotMarker_16.asset | 26 -- .../Basic/DotMarker/DotMarker_16.asset.meta | 8 - .../Brushes/Basic/DotMarker/DotMarker_16.mat | 78 ----- .../Basic/DotMarker/DotMarker_16.mat.meta | 8 - .../Basic/DotMarker/maintexture.png.meta | 92 +---- .../Assets/Brushes/Basic/Dots/Dots.asset | 5 +- .../Assets/Brushes/Basic/Dots/Dots.asset.meta | 2 + .../Assets/Brushes/Basic/Dots/Dots.mat | 5 +- .../Assets/Brushes/Basic/Dots/Dots.mat.meta | 4 +- .../Assets/Brushes/Basic/Dots/Dots.shader | 14 +- .../Brushes/Basic/Dots/Dots.shader.meta | 4 +- .../Assets/Brushes/Basic/Dots/Dots_16.asset | 26 -- .../Brushes/Basic/Dots/Dots_16.asset.meta | 8 - .../Assets/Brushes/Basic/Dots/Dots_16.mat | 84 ----- .../Brushes/Basic/Dots/Dots_16.mat.meta | 8 - .../Brushes/Basic/Dots/maintexture.png.meta | 89 +---- .../Assets/Brushes/Basic/DoubleFlat.meta | 8 - .../Basic/DoubleFlat/DoubleFlat_16.asset | 26 -- .../Basic/DoubleFlat/DoubleFlat_16.asset.meta | 8 - .../Basic/DoubleFlat/DoubleFlat_16.mat | 77 ----- .../Basic/DoubleFlat/DoubleFlat_16.mat.meta | 8 - .../DiffuseNoTextureDoubleSided.shader | 12 +- .../DiffuseNoTextureDoubleSided.shader.meta | 4 +- .../DoubleTaperedFlat/DoubleTaperedFlat.asset | 5 +- .../DoubleTaperedFlat.asset.meta | 2 + .../DoubleTaperedFlat/DoubleTaperedFlat.mat | 8 +- .../DoubleTaperedFlat.mat.meta | 4 +- .../DoubleTaperedFlat_16.asset | 26 -- .../DoubleTaperedFlat_16.asset.meta | 8 - .../DoubleTaperedFlat_16.mat | 49 --- .../DoubleTaperedFlat_16.mat.meta | 8 - .../DoubleTaperedMarker.asset | 5 +- .../DoubleTaperedMarker.asset.meta | 2 + .../DoubleTaperedMarker.mat | 6 +- .../DoubleTaperedMarker.mat.meta | 4 +- .../DoubleTaperedMarker.shader | 22 +- .../DoubleTaperedMarker.shader.meta | 4 +- .../DoubleTaperedMarker_16.asset | 26 -- .../DoubleTaperedMarker_16.asset.meta | 8 - .../DoubleTaperedMarker_16.mat | 48 --- .../DoubleTaperedMarker_16.mat.meta | 8 - .../Assets/Brushes/Basic/Drafting.meta | 8 - .../Brushes/Basic/Drafting/Drafting_16.asset | 26 -- .../Basic/Drafting/Drafting_16.asset.meta | 8 - .../Brushes/Basic/Drafting/Drafting_16.mat | 34 -- .../Basic/Drafting/Drafting_16.mat.meta | 8 - .../Assets/Brushes/Basic/DryBrush.meta | 8 - .../Assets/Brushes/Basic/DryBrush/_16.asset | 26 -- .../Brushes/Basic/DryBrush/_16.asset.meta | 8 - .../Assets/Brushes/Basic/DryBrush/_16.mat | 79 ----- .../Brushes/Basic/DryBrush/_16.mat.meta | 8 - .../Brushes/Basic/DuctTape/DuctTape_15.asset | 5 +- .../Basic/DuctTape/DuctTape_15.asset.meta | 2 + .../Brushes/Basic/DuctTape/DuctTape_15.mat | 8 +- .../Basic/DuctTape/DuctTape_15.mat.meta | 4 +- .../Brushes/Basic/DuctTape/DuctTape_16.asset | 26 -- .../Basic/DuctTape/DuctTape_16.asset.meta | 8 - .../Brushes/Basic/DuctTape/DuctTape_16.mat | 80 ----- .../Basic/DuctTape/DuctTape_16.mat.meta | 8 - .../Brushes/Basic/DuctTape/main.png.meta | 96 +----- .../Brushes/Basic/DuctTape/normal.png.meta | 94 +----- .../Brushes/Basic/DuctTapeGeometry.meta | 8 - .../Brushes/Basic/DuctTapeGeometry/_16.asset | 26 -- .../Basic/DuctTapeGeometry/_16.asset.meta | 8 - .../Brushes/Basic/DuctTapeGeometry/_16.mat | 80 ----- .../Basic/DuctTapeGeometry/_16.mat.meta | 8 - .../DuctTapeSingleSided/DuctTape_0.asset | 5 +- .../DuctTapeSingleSided/DuctTape_0.asset.meta | 2 + .../Basic/DuctTapeSingleSided/DuctTape_0.mat | 8 +- .../DuctTapeSingleSided/DuctTape_0.mat.meta | 4 +- .../DuctTapeSingleSided/DuctTape_16.asset | 26 -- .../DuctTape_16.asset.meta | 8 - .../Basic/DuctTapeSingleSided/DuctTape_16.mat | 80 ----- .../DuctTapeSingleSided/DuctTape_16.mat.meta | 8 - .../Basic/Electricity/Electricity.asset | 5 +- .../Basic/Electricity/Electricity.asset.meta | 2 + .../Brushes/Basic/Electricity/Electricity.mat | 5 +- .../Basic/Electricity/Electricity.mat.meta | 4 +- .../Basic/Electricity/Electricity.shader | 63 +--- .../Basic/Electricity/Electricity.shader.meta | 4 +- .../Basic/Electricity/Electricity_16.asset | 26 -- .../Electricity/Electricity_16.asset.meta | 8 - .../Basic/Electricity/Electricity_16.mat | 47 --- .../Basic/Electricity/Electricity_16.mat.meta | 8 - .../Assets/Brushes/Basic/Embers/Embers.asset | 5 +- .../Brushes/Basic/Embers/Embers.asset.meta | 2 + .../Assets/Brushes/Basic/Embers/Embers.mat | 5 +- .../Brushes/Basic/Embers/Embers.mat.meta | 4 +- .../Assets/Brushes/Basic/Embers/Embers.shader | 30 +- .../Brushes/Basic/Embers/Embers.shader.meta | 4 +- .../Brushes/Basic/Embers/Embers_16.asset | 26 -- .../Brushes/Basic/Embers/Embers_16.asset.meta | 8 - .../Assets/Brushes/Basic/Embers/Embers_16.mat | 90 ----- .../Brushes/Basic/Embers/Embers_16.mat.meta | 8 - .../Brushes/Basic/Embers/maintexture.png | Bin 8219 -> 21353 bytes .../Brushes/Basic/Embers/maintexture.png.meta | 91 +---- .../Assets/Brushes/Basic/FacetedTube.meta | 8 - .../Basic/FacetedTube/FacetedTube_16.asset | 26 -- .../FacetedTube/FacetedTube_16.asset.meta | 8 - .../Basic/FacetedTube/FacetedTube_16.mat | 37 -- .../Basic/FacetedTube/FacetedTube_16.mat.meta | 8 - .../TiltBrush/Assets/Brushes/Basic/Fairy.meta | 8 - .../Assets/Brushes/Basic/Fairy/Fairy_16.asset | 26 -- .../Brushes/Basic/Fairy/Fairy_16.asset.meta | 8 - .../Assets/Brushes/Basic/Fairy/Fairy_16.mat | 78 ----- .../Brushes/Basic/Fairy/Fairy_16.mat.meta | 8 - .../Assets/Brushes/Basic/Feather.meta | 8 - .../Brushes/Basic/Feather/Feather_16.asset | 26 -- .../Basic/Feather/Feather_16.asset.meta | 8 - .../Brushes/Basic/Feather/Feather_16.mat | 78 ----- .../Brushes/Basic/Feather/Feather_16.mat.meta | 8 - .../Assets/Brushes/Basic/Fire/Fire.asset | 5 +- .../Assets/Brushes/Basic/Fire/Fire.asset.meta | 2 + .../Assets/Brushes/Basic/Fire/Fire.mat | 5 +- .../Assets/Brushes/Basic/Fire/Fire.mat.meta | 4 - .../Assets/Brushes/Basic/Fire/Fire.shader | 19 +- .../Brushes/Basic/Fire/Fire.shader.meta | 4 - .../Assets/Brushes/Basic/Fire/Fire_16.asset | 26 -- .../Brushes/Basic/Fire/Fire_16.asset.meta | 8 - .../Assets/Brushes/Basic/Fire/Fire_16.mat | 37 -- .../Brushes/Basic/Fire/Fire_16.mat.meta | 8 - .../Assets/Brushes/Basic/Fire/fire.png.meta | 89 +---- .../TiltBrush/Assets/Brushes/Basic/Fire2.meta | 8 - .../Assets/Brushes/Basic/Fire2/Fire2_16.asset | 26 -- .../Brushes/Basic/Fire2/Fire2_16.asset.meta | 8 - .../Assets/Brushes/Basic/Fire2/Fire2_16.mat | 47 --- .../Brushes/Basic/Fire2/Fire2_16.mat.meta | 8 - .../Assets/Brushes/Basic/Flat/Flat_15.asset | 5 +- .../Brushes/Basic/Flat/Flat_15.asset.meta | 2 + .../Assets/Brushes/Basic/Flat/Flat_15.mat | 8 +- .../Brushes/Basic/Flat/Flat_15.mat.meta | 4 +- .../Assets/Brushes/Basic/Flat/Flat_16.asset | 26 -- .../Brushes/Basic/Flat/Flat_16.asset.meta | 8 - .../Assets/Brushes/Basic/Flat/Flat_16.mat | 78 ----- .../Brushes/Basic/Flat/Flat_16.mat.meta | 8 - .../Basic/FlatDeprecated/FlatDeprecated.asset | 5 +- .../FlatDeprecated/FlatDeprecated.asset.meta | 2 + .../Basic/FlatDeprecated/FlatDeprecated.mat | 5 +- .../FlatDeprecated/FlatDeprecated.mat.meta | 4 +- .../FlatDeprecated/FlatDeprecated_16.asset | 26 -- .../FlatDeprecated_16.asset.meta | 8 - .../FlatDeprecated/FlatDeprecated_16.mat | 77 ----- .../FlatDeprecated/FlatDeprecated_16.mat.meta | 8 - .../Basic/FlatSingleSided/Flat_0.asset | 5 +- .../Basic/FlatSingleSided/Flat_0.asset.meta | 2 + .../Brushes/Basic/FlatSingleSided/Flat_0.mat | 5 +- .../Basic/FlatSingleSided/Flat_0.mat.meta | 4 +- .../Basic/FlatSingleSided/Flat_16.asset | 26 -- .../Basic/FlatSingleSided/Flat_16.asset.meta | 8 - .../Brushes/Basic/FlatSingleSided/Flat_16.mat | 77 ----- .../Basic/FlatSingleSided/Flat_16.mat.meta | 8 - .../Assets/Brushes/Basic/Gouache.meta | 8 - .../Brushes/Basic/Gouache/Gouache_16.asset | 26 -- .../Basic/Gouache/Gouache_16.asset.meta | 8 - .../Brushes/Basic/Gouache/Gouache_16.mat | 79 ----- .../Brushes/Basic/Gouache/Gouache_16.mat.meta | 8 - .../Brushes/Basic/GouacheSingleSided.meta | 8 - .../Basic/GouacheSingleSided/Gouache_16.asset | 26 -- .../GouacheSingleSided/Gouache_16.asset.meta | 8 - .../Basic/GouacheSingleSided/Gouache_16.mat | 79 ----- .../GouacheSingleSided/Gouache_16.mat.meta | 8 - .../TiltBrush/Assets/Brushes/Basic/Guts.meta | 8 - .../Assets/Brushes/Basic/Guts/Guts_16.asset | 26 -- .../Brushes/Basic/Guts/Guts_16.asset.meta | 8 - .../Assets/Brushes/Basic/Guts/Guts_16.mat | 83 ----- .../Brushes/Basic/Guts/Guts_16.mat.meta | 8 - .../Basic/Highlighter/AdditiveCutout.shader | 17 +- .../Highlighter/AdditiveCutout.shader.meta | 4 +- .../Basic/Highlighter/Highlighter.asset | 5 +- .../Basic/Highlighter/Highlighter.asset.meta | 2 + .../Brushes/Basic/Highlighter/Highlighter.mat | 9 +- .../Basic/Highlighter/Highlighter.mat.meta | 4 +- .../Basic/Highlighter/Highlighter_16.asset | 26 -- .../Highlighter/Highlighter_16.asset.meta | 8 - .../Basic/Highlighter/Highlighter_16.mat | 50 --- .../Basic/Highlighter/Highlighter_16.mat.meta | 8 - .../Basic/Highlighter/maintexture.png.meta | 96 +----- .../Assets/Brushes/Basic/HolidayTree.meta | 8 - .../Basic/HolidayTree/HolidayTree_16.asset | 26 -- .../HolidayTree/HolidayTree_16.asset.meta | 8 - .../Basic/HolidayTree/HolidayTree_16.mat | 37 -- .../Basic/HolidayTree/HolidayTree_16.mat.meta | 8 - .../Brushes/Basic/HyperGrid/HyperGrid.asset | 5 +- .../Basic/HyperGrid/HyperGrid.asset.meta | 2 + .../Brushes/Basic/HyperGrid/HyperGrid.mat | 5 +- .../Basic/HyperGrid/HyperGrid.mat.meta | 4 +- .../Brushes/Basic/HyperGrid/HyperGrid.shader | 11 +- .../Basic/HyperGrid/HyperGrid.shader.meta | 4 +- .../Basic/HyperGrid/HyperGrid_16.asset | 26 -- .../Basic/HyperGrid/HyperGrid_16.asset.meta | 8 - .../Brushes/Basic/HyperGrid/HyperGrid_16.mat | 39 --- .../Basic/HyperGrid/HyperGrid_16.mat.meta | 8 - .../Basic/HyperGrid/maintexture.png.meta | 92 +---- .../Hypercolor/HypercolorDoubleSided.shader | 34 +- .../HypercolorDoubleSided.shader.meta | 4 +- .../Hypercolor/HypercolorSingleSided.shader | 4 +- .../HypercolorSingleSided.shader.meta | 4 +- .../Basic/Hypercolor/Hypercolor_15.asset | 5 +- .../Basic/Hypercolor/Hypercolor_15.asset.meta | 2 + .../Basic/Hypercolor/Hypercolor_15.mat | 5 +- .../Basic/Hypercolor/Hypercolor_15.mat.meta | 4 +- .../Basic/Hypercolor/Hypercolor_16.asset | 26 -- .../Basic/Hypercolor/Hypercolor_16.asset.meta | 8 - .../Basic/Hypercolor/Hypercolor_16.mat | 46 --- .../Basic/Hypercolor/Hypercolor_16.mat.meta | 8 - .../Brushes/Basic/Hypercolor/main.png.meta | 89 +---- .../Brushes/Basic/Hypercolor/normal.png.meta | 94 +----- .../HypercolorSingleSided/Hypercolor_0.asset | 5 +- .../Hypercolor_0.asset.meta | 2 + .../HypercolorSingleSided/Hypercolor_0.mat | 5 +- .../Hypercolor_0.mat.meta | 4 +- .../HypercolorSingleSided/Hypercolor_16.asset | 26 -- .../Hypercolor_16.asset.meta | 8 - .../HypercolorSingleSided/Hypercolor_16.mat | 46 --- .../Hypercolor_16.mat.meta | 8 - .../Assets/Brushes/Basic/Icing/Icing_16.asset | 9 +- .../Brushes/Basic/Icing/Icing_16.asset.meta | 2 + .../Assets/Brushes/Basic/Icing/Icing_16.mat | 5 +- .../Brushes/Basic/Icing/Icing_16.mat.meta | 4 +- .../Brushes/Basic/Icing/normal.png.meta | 87 +---- .../Assets/Brushes/Basic/Ink/Ink_15.asset | 5 +- .../Brushes/Basic/Ink/Ink_15.asset.meta | 2 + .../Assets/Brushes/Basic/Ink/Ink_15.mat | 8 +- .../Assets/Brushes/Basic/Ink/Ink_15.mat.meta | 4 +- .../Assets/Brushes/Basic/Ink/Ink_16.asset | 26 -- .../Brushes/Basic/Ink/Ink_16.asset.meta | 8 - .../Assets/Brushes/Basic/Ink/Ink_16.mat | 80 ----- .../Assets/Brushes/Basic/Ink/Ink_16.mat.meta | 8 - .../Brushes/Basic/Ink/maintexture.png.meta | 96 +----- .../Basic/Ink/maintexture_normal.png.meta | 94 +----- .../Assets/Brushes/Basic/InkGeometry.meta | 8 - .../Brushes/Basic/InkGeometry/_16.asset | 26 -- .../Brushes/Basic/InkGeometry/_16.asset.meta | 8 - .../Assets/Brushes/Basic/InkGeometry/_16.mat | 80 ----- .../Brushes/Basic/InkGeometry/_16.mat.meta | 8 - .../Brushes/Basic/InkSingleSided/Ink_0.asset | 5 +- .../Basic/InkSingleSided/Ink_0.asset.meta | 2 + .../Brushes/Basic/InkSingleSided/Ink_0.mat | 8 +- .../Basic/InkSingleSided/Ink_0.mat.meta | 4 +- .../Brushes/Basic/InkSingleSided/Ink_16.asset | 26 -- .../Basic/InkSingleSided/Ink_16.asset.meta | 8 - .../Brushes/Basic/InkSingleSided/Ink_16.mat | 80 ----- .../Basic/InkSingleSided/Ink_16.mat.meta | 8 - .../Assets/Brushes/Basic/KeijiroTube.meta | 8 - .../Basic/KeijiroTube/KeijiroTube_16.asset | 26 -- .../KeijiroTube/KeijiroTube_16.asset.meta | 8 - .../Basic/KeijiroTube/KeijiroTube_16.mat | 79 ----- .../Basic/KeijiroTube/KeijiroTube_16.mat.meta | 8 - .../Assets/Brushes/Basic/Lacewing.meta | 8 - .../Brushes/Basic/Lacewing/Lacewing_16.asset | 26 -- .../Basic/Lacewing/Lacewing_16.asset.meta | 8 - .../Brushes/Basic/Lacewing/Lacewing_16.mat | 87 ----- .../Basic/Lacewing/Lacewing_16.mat.meta | 8 - .../Assets/Brushes/Basic/LeakyPen.meta | 8 - .../Assets/Brushes/Basic/LeakyPen/_16.asset | 26 -- .../Brushes/Basic/LeakyPen/_16.asset.meta | 8 - .../Assets/Brushes/Basic/LeakyPen/_16.mat | 90 ----- .../Brushes/Basic/LeakyPen/_16.mat.meta | 8 - .../Brushes/Basic/Leaves/leaves.png.meta | 94 +----- .../Brushes/Basic/Leaves/normal.png.meta | 94 +----- .../Assets/Brushes/Basic/Leaves2.meta | 8 - .../Brushes/Basic/Leaves2/Leaves2_16.asset | 26 -- .../Basic/Leaves2/Leaves2_16.asset.meta | 8 - .../Brushes/Basic/Leaves2/Leaves2_16.mat | 80 ----- .../Brushes/Basic/Leaves2/Leaves2_16.mat.meta | 8 - .../Basic/LeavesSingleSided/Leaves_0.asset | 5 +- .../LeavesSingleSided/Leaves_0.asset.meta | 2 + .../Basic/LeavesSingleSided/Leaves_0.mat | 8 +- .../Basic/LeavesSingleSided/Leaves_0.mat.meta | 4 +- .../Basic/LeavesSingleSided/Leaves_16.asset | 26 -- .../LeavesSingleSided/Leaves_16.asset.meta | 8 - .../Basic/LeavesSingleSided/Leaves_16.mat | 80 ----- .../LeavesSingleSided/Leaves_16.mat.meta | 8 - .../Assets/Brushes/Basic/Light/Light.asset | 5 +- .../Brushes/Basic/Light/Light.asset.meta | 2 + .../Assets/Brushes/Basic/Light/Light.mat | 5 +- .../Assets/Brushes/Basic/Light/Light.mat.meta | 4 +- .../Assets/Brushes/Basic/Light/Light_16.asset | 26 -- .../Brushes/Basic/Light/Light_16.asset.meta | 8 - .../Assets/Brushes/Basic/Light/Light_16.mat | 78 ----- .../Brushes/Basic/Light/Light_16.mat.meta | 8 - .../Brushes/Basic/Light/maintexture.png.meta | 89 +---- .../Brushes/Basic/LightWire/LightWire.asset | 5 +- .../Basic/LightWire/LightWire.asset.meta | 2 + .../Brushes/Basic/LightWire/LightWire.mat | 5 +- .../Basic/LightWire/LightWire.mat.meta | 4 +- .../Brushes/Basic/LightWire/LightWire.shader | 16 +- .../Basic/LightWire/LightWire.shader.meta | 4 +- .../Basic/LightWire/LightWire_16.asset | 26 -- .../Basic/LightWire/LightWire_16.asset.meta | 8 - .../Brushes/Basic/LightWire/LightWire_16.mat | 43 --- .../Basic/LightWire/LightWire_16.mat.meta | 8 - .../Basic/LightWire/maintexture.png.meta | 92 +---- .../Assets/Brushes/Basic/LitWire.meta | 8 - .../Brushes/Basic/LitWire/Wire (Lit)_16.asset | 26 -- .../Basic/LitWire/Wire (Lit)_16.asset.meta | 8 - .../Brushes/Basic/LitWire/Wire (Lit)_16.mat | 79 ----- .../Basic/LitWire/Wire (Lit)_16.mat.meta | 8 - .../Brushes/Basic/Lofted/Lofted_16.asset | 9 +- .../Brushes/Basic/Lofted/Lofted_16.asset.meta | 2 + .../Assets/Brushes/Basic/Lofted/Lofted_16.mat | 5 +- .../Brushes/Basic/Lofted/Lofted_16.mat.meta | 4 +- .../Assets/Brushes/Basic/LoftedHueShift.meta | 8 - .../Lofted (Hue Shift)_16.asset | 26 -- .../Lofted (Hue Shift)_16.asset.meta | 8 - .../LoftedHueShift/Lofted (Hue Shift)_16.mat | 43 --- .../Lofted (Hue Shift)_16.mat.meta | 8 - .../Assets/Brushes/Basic/MarbledRainbow.meta | 8 - .../MarbledRainbow/Marbled Rainbow_16.asset | 26 -- .../Marbled Rainbow_16.asset.meta | 8 - .../MarbledRainbow/Marbled Rainbow_16.mat | 87 ----- .../Marbled Rainbow_16.mat.meta | 8 - .../Assets/Brushes/Basic/Marker/Marker.asset | 5 +- .../Brushes/Basic/Marker/Marker.asset.meta | 2 + .../Assets/Brushes/Basic/Marker/Marker.mat | 9 +- .../Brushes/Basic/Marker/Marker.mat.meta | 4 +- .../Brushes/Basic/Marker/Marker_16.asset | 26 -- .../Brushes/Basic/Marker/Marker_16.asset.meta | 8 - .../Assets/Brushes/Basic/Marker/Marker_16.mat | 79 ----- .../Brushes/Basic/Marker/Marker_16.mat.meta | 8 - .../Brushes/Basic/Marker/maintexture.png.meta | 96 +----- .../Basic/MatteHull/MatteHull_16.asset | 9 +- .../Basic/MatteHull/MatteHull_16.asset.meta | 2 + .../Brushes/Basic/MatteHull/MatteHull_16.mat | 5 +- .../Basic/MatteHull/MatteHull_16.mat.meta | 4 +- .../Assets/Brushes/Basic/Muscle.meta | 8 - .../Brushes/Basic/Muscle/Muscle_16.asset | 26 -- .../Brushes/Basic/Muscle/Muscle_16.asset.meta | 8 - .../Assets/Brushes/Basic/Muscle/Muscle_16.mat | 83 ----- .../Brushes/Basic/Muscle/Muscle_16.mat.meta | 8 - .../Assets/Brushes/Basic/MylarTube.meta | 8 - .../Basic/MylarTube/MylarTube_16.asset | 26 -- .../Basic/MylarTube/MylarTube_16.asset.meta | 8 - .../Brushes/Basic/MylarTube/MylarTube_16.mat | 54 --- .../Basic/MylarTube/MylarTube_16.mat.meta | 8 - .../Brushes/Basic/NeonPulse/NeonPulse.asset | 9 +- .../Basic/NeonPulse/NeonPulse.asset.meta | 2 + .../Brushes/Basic/NeonPulse/NeonPulse.mat | 5 +- .../Basic/NeonPulse/NeonPulse.mat.meta | 4 +- .../Basic/NeonPulse/NeonPulse_16.asset | 26 -- .../Basic/NeonPulse/NeonPulse_16.asset.meta | 8 - .../Brushes/Basic/NeonPulse/NeonPulse_16.mat | 36 -- .../Basic/NeonPulse/NeonPulse_16.mat.meta | 8 - .../Brushes/Basic/OilPaint/OilPaint_15.asset | 5 +- .../Basic/OilPaint/OilPaint_15.asset.meta | 2 + .../Brushes/Basic/OilPaint/OilPaint_15.mat | 8 +- .../Basic/OilPaint/OilPaint_15.mat.meta | 4 +- .../Brushes/Basic/OilPaint/OilPaint_16.asset | 26 -- .../Basic/OilPaint/OilPaint_16.asset.meta | 8 - .../Brushes/Basic/OilPaint/OilPaint_16.mat | 80 ----- .../Basic/OilPaint/OilPaint_16.mat.meta | 8 - .../Brushes/Basic/OilPaint/main.png.meta | 96 +----- .../Brushes/Basic/OilPaint/normal.png.meta | 94 +----- .../OilPaintSingleSided/OilPaint_0.asset | 5 +- .../OilPaintSingleSided/OilPaint_0.asset.meta | 2 + .../Basic/OilPaintSingleSided/OilPaint_0.mat | 8 +- .../OilPaintSingleSided/OilPaint_0.mat.meta | 4 +- .../OilPaintSingleSided/OilPaint_16.asset | 26 -- .../OilPaint_16.asset.meta | 8 - .../Basic/OilPaintSingleSided/OilPaint_16.mat | 80 ----- .../OilPaintSingleSided/OilPaint_16.mat.meta | 8 - .../Assets/Brushes/Basic/Paper/Paper_15.asset | 5 +- .../Brushes/Basic/Paper/Paper_15.asset.meta | 2 + .../Assets/Brushes/Basic/Paper/Paper_15.mat | 8 +- .../Brushes/Basic/Paper/Paper_15.mat.meta | 4 +- .../Assets/Brushes/Basic/Paper/Paper_16.asset | 26 -- .../Brushes/Basic/Paper/Paper_16.asset.meta | 8 - .../Assets/Brushes/Basic/Paper/Paper_16.mat | 80 ----- .../Brushes/Basic/Paper/Paper_16.mat.meta | 8 - .../Assets/Brushes/Basic/Paper/bump.png.meta | 54 +-- .../Assets/Brushes/Basic/Paper/main.png.meta | 96 +----- .../Basic/PaperSingleSided/Paper_0.asset | 5 +- .../Basic/PaperSingleSided/Paper_0.asset.meta | 2 + .../Basic/PaperSingleSided/Paper_0.mat | 8 +- .../Basic/PaperSingleSided/Paper_0.mat.meta | 4 +- .../Basic/PaperSingleSided/Paper_16.asset | 26 -- .../PaperSingleSided/Paper_16.asset.meta | 8 - .../Basic/PaperSingleSided/Paper_16.mat | 80 ----- .../Basic/PaperSingleSided/Paper_16.mat.meta | 8 - .../Assets/Brushes/Basic/Petal/Petal.shader | 14 +- .../Brushes/Basic/Petal/Petal.shader.meta | 4 +- .../Assets/Brushes/Basic/Petal/Petal_16.asset | 9 +- .../Brushes/Basic/Petal/Petal_16.asset.meta | 2 + .../Assets/Brushes/Basic/Petal/Petal_16.mat | 5 +- .../Brushes/Basic/Petal/Petal_16.mat.meta | 4 +- .../TiltBrush/Assets/Brushes/Basic/Plait.meta | 8 - .../Brushes/Basic/Plait/Braid3_16.asset | 26 -- .../Brushes/Basic/Plait/Braid3_16.asset.meta | 8 - .../Assets/Brushes/Basic/Plait/Braid3_16.mat | 37 -- .../Brushes/Basic/Plait/Braid3_16.mat.meta | 8 - .../Assets/Brushes/Basic/Plasma/Plasma.asset | 5 +- .../Brushes/Basic/Plasma/Plasma.asset.meta | 2 + .../Assets/Brushes/Basic/Plasma/Plasma.mat | 5 +- .../Brushes/Basic/Plasma/Plasma.mat.meta | 4 +- .../Assets/Brushes/Basic/Plasma/Plasma.shader | 13 +- .../Brushes/Basic/Plasma/Plasma.shader.meta | 4 +- .../Brushes/Basic/Plasma/Plasma_16.asset | 26 -- .../Brushes/Basic/Plasma/Plasma_16.asset.meta | 8 - .../Assets/Brushes/Basic/Plasma/Plasma_16.mat | 47 --- .../Brushes/Basic/Plasma/Plasma_16.mat.meta | 8 - .../Assets/Brushes/Basic/Plasma/main.png.meta | 96 +----- .../TiltBrush/Assets/Brushes/Basic/Race.meta | 8 - .../Assets/Brushes/Basic/Race/Race_16.asset | 26 -- .../Brushes/Basic/Race/Race_16.asset.meta | 8 - .../Assets/Brushes/Basic/Race/Race_16.mat | 28 -- .../Brushes/Basic/Race/Race_16.mat.meta | 8 - .../TiltBrush/Assets/Brushes/Basic/Rain.meta | 8 - .../Assets/Brushes/Basic/Rain/Rain_16.asset | 26 -- .../Brushes/Basic/Rain/Rain_16.asset.meta | 8 - .../Assets/Brushes/Basic/Rain/Rain_16.mat | 88 ----- .../Brushes/Basic/Rain/Rain_16.mat.meta | 8 - .../Brushes/Basic/Rainbow/Rainbow.asset | 5 +- .../Brushes/Basic/Rainbow/Rainbow.asset.meta | 2 + .../Assets/Brushes/Basic/Rainbow/Rainbow.mat | 5 +- .../Brushes/Basic/Rainbow/Rainbow.mat.meta | 3 - .../Brushes/Basic/Rainbow/Rainbow.shader | 317 ++++++++---------- .../Brushes/Basic/Rainbow/Rainbow.shader.meta | 3 - .../Brushes/Basic/Rainbow/Rainbow_16.asset | 26 -- .../Basic/Rainbow/Rainbow_16.asset.meta | 8 - .../Brushes/Basic/Rainbow/Rainbow_16.mat | 85 ----- .../Brushes/Basic/Rainbow/Rainbow_16.mat.meta | 8 - .../Assets/Brushes/Basic/RisingBubbles.meta | 8 - .../RisingBubbles/Rising Bubbles_16.asset | 26 -- .../Rising Bubbles_16.asset.meta | 8 - .../Basic/RisingBubbles/Rising Bubbles_16.mat | 91 ----- .../RisingBubbles/Rising Bubbles_16.mat.meta | 8 - .../Basic/ShinyHull/ShinyHull_16.asset | 9 +- .../Basic/ShinyHull/ShinyHull_16.asset.meta | 2 + .../Brushes/Basic/ShinyHull/ShinyHull_16.mat | 5 +- .../Basic/ShinyHull/ShinyHull_16.mat.meta | 4 +- .../Assets/Brushes/Basic/SingleSided.meta | 8 - .../Basic/SingleSided/SingleSided_16.asset | 26 -- .../SingleSided/SingleSided_16.asset.meta | 8 - .../Basic/SingleSided/SingleSided_16.mat | 77 ----- .../Basic/SingleSided/SingleSided_16.mat.meta | 8 - .../Assets/Brushes/Basic/Smoke/Smoke.asset | 5 +- .../Brushes/Basic/Smoke/Smoke.asset.meta | 2 + .../Assets/Brushes/Basic/Smoke/Smoke.mat | 5 +- .../Assets/Brushes/Basic/Smoke/Smoke.mat.meta | 4 +- .../Assets/Brushes/Basic/Smoke/Smoke.shader | 15 +- .../Brushes/Basic/Smoke/Smoke.shader.meta | 4 +- .../Assets/Brushes/Basic/Smoke/Smoke_16.asset | 26 -- .../Brushes/Basic/Smoke/Smoke_16.asset.meta | 8 - .../Assets/Brushes/Basic/Smoke/Smoke_16.mat | 90 ----- .../Brushes/Basic/Smoke/Smoke_16.mat.meta | 8 - .../Brushes/Basic/Smoke/maintexture.png | Bin 65492 -> 68701 bytes .../Brushes/Basic/Smoke/maintexture.png.meta | 89 +---- .../Assets/Brushes/Basic/SmoothHull.meta | 8 - .../Basic/SmoothHull/SmoothHull_16.asset | 26 -- .../Basic/SmoothHull/SmoothHull_16.asset.meta | 8 - .../Basic/SmoothHull/SmoothHull_16.mat | 94 ------ .../Basic/SmoothHull/SmoothHull_16.mat.meta | 8 - .../Assets/Brushes/Basic/Snow/Snow.asset | 5 +- .../Assets/Brushes/Basic/Snow/Snow.asset.meta | 2 + .../Assets/Brushes/Basic/Snow/Snow.mat | 5 +- .../Assets/Brushes/Basic/Snow/Snow.mat.meta | 4 +- .../Assets/Brushes/Basic/Snow/Snow.shader | 14 +- .../Brushes/Basic/Snow/Snow.shader.meta | 4 +- .../Assets/Brushes/Basic/Snow/Snow_16.asset | 26 -- .../Brushes/Basic/Snow/Snow_16.asset.meta | 8 - .../Assets/Brushes/Basic/Snow/Snow_16.mat | 90 ----- .../Brushes/Basic/Snow/Snow_16.mat.meta | 8 - .../Brushes/Basic/Snow/maintexture.png.meta | 96 +----- .../Assets/Brushes/Basic/Snowflake.meta | 8 - .../Basic/Snowflake/Snowflake_16.asset | 26 -- .../Basic/Snowflake/Snowflake_16.asset.meta | 8 - .../Brushes/Basic/Snowflake/Snowflake_16.mat | 37 -- .../Basic/Snowflake/Snowflake_16.mat.meta | 8 - .../SoftHighlighter/SoftHighlighter.asset | 5 +- .../SoftHighlighter.asset.meta | 2 + .../Basic/SoftHighlighter/SoftHighlighter.mat | 5 +- .../SoftHighlighter/SoftHighlighter.mat.meta | 4 +- .../SoftHighlighter/SoftHighlighter.shader | 21 +- .../SoftHighlighter.shader.meta | 4 +- .../SoftHighlighter/SoftHighlighter_16.asset | 26 -- .../SoftHighlighter_16.asset.meta | 8 - .../SoftHighlighter/SoftHighlighter_16.mat | 33 -- .../SoftHighlighter_16.mat.meta | 8 - .../SoftHighlighter/maintexture.png.meta | 92 +---- .../TiltBrush/Assets/Brushes/Basic/Space.meta | 8 - .../Assets/Brushes/Basic/Space/Space_16.asset | 26 -- .../Brushes/Basic/Space/Space_16.asset.meta | 8 - .../Assets/Brushes/Basic/Space/Space_16.mat | 28 -- .../Brushes/Basic/Space/Space_16.mat.meta | 8 - .../Assets/Brushes/Basic/Sparks.meta | 8 - .../Brushes/Basic/Sparks/Sparks_16.asset | 26 -- .../Brushes/Basic/Sparks/Sparks_16.asset.meta | 8 - .../Assets/Brushes/Basic/Sparks/Sparks_16.mat | 83 ----- .../Brushes/Basic/Sparks/Sparks_16.mat.meta | 8 - .../Brushes/Basic/Spikes/Spikes_16.asset | 9 +- .../Brushes/Basic/Spikes/Spikes_16.asset.meta | 2 + .../Assets/Brushes/Basic/Spikes/Spikes_16.mat | 5 +- .../Brushes/Basic/Spikes/Spikes_16.mat.meta | 4 +- .../Brushes/Basic/Splatter/Splatter_15.asset | 5 +- .../Basic/Splatter/Splatter_15.asset.meta | 2 + .../Brushes/Basic/Splatter/Splatter_15.mat | 5 +- .../Basic/Splatter/Splatter_15.mat.meta | 4 +- .../Brushes/Basic/Splatter/Splatter_16.asset | 26 -- .../Basic/Splatter/Splatter_16.asset.meta | 8 - .../Brushes/Basic/Splatter/Splatter_16.mat | 77 ----- .../Basic/Splatter/Splatter_16.mat.meta | 8 - .../Brushes/Basic/Splatter/main.png.meta | 96 +----- .../SplatterSingleSided/Splatter_0.asset | 5 +- .../SplatterSingleSided/Splatter_0.asset.meta | 2 + .../Basic/SplatterSingleSided/Splatter_0.mat | 5 +- .../SplatterSingleSided/Splatter_0.mat.meta | 4 +- .../SplatterSingleSided/Splatter_16.asset | 26 -- .../Splatter_16.asset.meta | 8 - .../Basic/SplatterSingleSided/Splatter_16.mat | 77 ----- .../SplatterSingleSided/Splatter_16.mat.meta | 8 - .../Brushes/Basic/Square3DPrintBrush.meta | 8 - .../3D Printing Brush_16.asset | 26 -- .../3D Printing Brush_16.asset.meta | 8 - .../3D Printing Brush_16.mat | 50 --- .../3D Printing Brush_16.mat.meta | 8 - .../Assets/Brushes/Basic/SquarePaper.meta | 8 - .../Basic/SquarePaper/SquarePaper_16.asset | 26 -- .../SquarePaper/SquarePaper_16.asset.meta | 8 - .../Basic/SquarePaper/SquarePaper_16.mat | 79 ----- .../Basic/SquarePaper/SquarePaper_16.mat.meta | 8 - .../Assets/Brushes/Basic/Stars/Stars.asset | 5 +- .../Brushes/Basic/Stars/Stars.asset.meta | 2 + .../Assets/Brushes/Basic/Stars/Stars.mat | 5 +- .../Assets/Brushes/Basic/Stars/Stars.mat.meta | 4 +- .../Assets/Brushes/Basic/Stars/Stars.shader | 13 +- .../Brushes/Basic/Stars/Stars.shader.meta | 4 +- .../Assets/Brushes/Basic/Stars/Stars_16.asset | 26 -- .../Brushes/Basic/Stars/Stars_16.asset.meta | 8 - .../Assets/Brushes/Basic/Stars/Stars_16.mat | 86 ----- .../Brushes/Basic/Stars/Stars_16.mat.meta | 8 - .../Brushes/Basic/Stars/maintexture.png | Bin 39241 -> 48941 bytes .../Brushes/Basic/Stars/maintexture.png.meta | 104 +----- .../Brushes/Basic/Streamers/Streamers.asset | 5 +- .../Basic/Streamers/Streamers.asset.meta | 2 + .../Brushes/Basic/Streamers/Streamers.mat | 5 +- .../Basic/Streamers/Streamers.mat.meta | 4 +- .../Brushes/Basic/Streamers/Streamers.shader | 15 +- .../Basic/Streamers/Streamers.shader.meta | 4 +- .../Basic/Streamers/Streamers_16.asset | 26 -- .../Basic/Streamers/Streamers_16.asset.meta | 8 - .../Brushes/Basic/Streamers/Streamers_16.mat | 37 -- .../Basic/Streamers/Streamers_16.mat.meta | 8 - .../Brushes/Basic/Streamers/main.png.meta | 42 +-- .../Assets/Brushes/Basic/Taffy/Taffy.asset | 5 +- .../Brushes/Basic/Taffy/Taffy.asset.meta | 2 + .../Assets/Brushes/Basic/Taffy/Taffy.mat | 8 +- .../Assets/Brushes/Basic/Taffy/Taffy.mat.meta | 4 +- .../Assets/Brushes/Basic/Taffy/Taffy_16.asset | 26 -- .../Brushes/Basic/Taffy/Taffy_16.asset.meta | 8 - .../Assets/Brushes/Basic/Taffy/Taffy_16.mat | 78 ----- .../Brushes/Basic/Taffy/Taffy_16.mat.meta | 8 - .../Assets/Brushes/Basic/Taffy/main.png.meta | 96 +----- .../Basic/TaperedFlat/TaperedFlat_15.asset | 5 +- .../TaperedFlat/TaperedFlat_15.asset.meta | 2 + .../Basic/TaperedFlat/TaperedFlat_15.mat | 8 +- .../Basic/TaperedFlat/TaperedFlat_15.mat.meta | 4 +- .../Basic/TaperedFlat/TaperedFlat_16.asset | 26 -- .../TaperedFlat/TaperedFlat_16.asset.meta | 8 - .../Basic/TaperedFlat/TaperedFlat_16.mat | 78 ----- .../Basic/TaperedFlat/TaperedFlat_16.mat.meta | 8 - .../Basic/TaperedFlat/maintexture.png.meta | 92 +---- .../TaperedFlat_0.asset | 5 +- .../TaperedFlat_0.asset.meta | 2 + .../TaperedFlatSingleSided/TaperedFlat_0.mat | 5 +- .../TaperedFlat_0.mat.meta | 4 +- .../TaperedFlat_16.asset | 26 -- .../TaperedFlat_16.asset.meta | 8 - .../TaperedFlatSingleSided/TaperedFlat_16.mat | 77 ----- .../TaperedFlat_16.mat.meta | 8 - .../Assets/Brushes/Basic/TaperedHueShift.meta | 8 - .../TaperedHueShift/TaperedHueShift_16.asset | 26 -- .../TaperedHueShift_16.asset.meta | 8 - .../TaperedHueShift/TaperedHueShift_16.mat | 78 ----- .../TaperedHueShift_16.mat.meta | 8 - .../Basic/TaperedMarker/TaperedMarker.asset | 5 +- .../TaperedMarker/TaperedMarker.asset.meta | 2 + .../Basic/TaperedMarker/TaperedMarker.mat | 9 +- .../TaperedMarker/TaperedMarker.mat.meta | 4 +- .../TaperedMarker/TaperedMarker_16.asset | 26 -- .../TaperedMarker/TaperedMarker_16.asset.meta | 8 - .../Basic/TaperedMarker/TaperedMarker_16.mat | 79 ----- .../TaperedMarker/TaperedMarker_16.mat.meta | 8 - .../Basic/TaperedMarker/maintexture.png.meta | 92 +---- .../TaperedMarker_Flat.asset | 5 +- .../TaperedMarker_Flat.asset.meta | 2 + .../TaperedMarker_Flat/TaperedMarker_Flat.mat | 5 +- .../TaperedMarker_Flat.mat.meta | 4 +- .../TaperedMarker_Flat_16.asset | 26 -- .../TaperedMarker_Flat_16.asset.meta | 8 - .../TaperedMarker_Flat_16.mat | 77 ----- .../TaperedMarker_Flat_16.mat.meta | 8 - .../Assets/Brushes/Basic/TaperedWire.meta | 8 - .../Basic/TaperedWire/TaperedWire_16.asset | 26 -- .../TaperedWire/TaperedWire_16.asset.meta | 8 - .../Basic/TaperedWire/TaperedWire_16.mat | 79 ----- .../Basic/TaperedWire/TaperedWire_16.mat.meta | 8 - .../Assets/Brushes/Basic/ThickGeometry.meta | 8 - .../ThickGeometry/ThickGeometry_16.asset | 26 -- .../ThickGeometry/ThickGeometry_16.asset.meta | 8 - .../Basic/ThickGeometry/ThickGeometry_16.mat | 80 ----- .../ThickGeometry/ThickGeometry_16.mat.meta | 8 - .../Basic/ThickPaint/ThickPaint_15.asset | 5 +- .../Basic/ThickPaint/ThickPaint_15.asset.meta | 2 + .../Basic/ThickPaint/ThickPaint_15.mat | 8 +- .../Basic/ThickPaint/ThickPaint_15.mat.meta | 4 +- .../Basic/ThickPaint/ThickPaint_16.asset | 26 -- .../Basic/ThickPaint/ThickPaint_16.asset.meta | 8 - .../Basic/ThickPaint/ThickPaint_16.mat | 80 ----- .../Basic/ThickPaint/ThickPaint_16.mat.meta | 8 - .../Basic/ThickPaint/streakystroke.png.meta | 85 +---- .../ThickPaint/streakystroke_bump.png.meta | 87 +---- .../ThickPaintSingleSided/ThickPaint_0.asset | 5 +- .../ThickPaint_0.asset.meta | 2 + .../ThickPaintSingleSided/ThickPaint_0.mat | 8 +- .../ThickPaint_0.mat.meta | 4 +- .../ThickPaintSingleSided/ThickPaint_16.asset | 26 -- .../ThickPaint_16.asset.meta | 8 - .../ThickPaintSingleSided/ThickPaint_16.mat | 80 ----- .../ThickPaint_16.mat.meta | 8 - .../Assets/Brushes/Basic/Toon/Toon.asset | 5 +- .../Assets/Brushes/Basic/Toon/Toon.asset.meta | 2 + .../Assets/Brushes/Basic/Toon/Toon.mat | 5 +- .../Assets/Brushes/Basic/Toon/Toon.mat.meta | 4 +- .../Assets/Brushes/Basic/Toon/Toon.shader | 34 +- .../Brushes/Basic/Toon/Toon.shader.meta | 4 +- .../Assets/Brushes/Basic/Toon/Toon_16.asset | 26 -- .../Brushes/Basic/Toon/Toon_16.asset.meta | 8 - .../Assets/Brushes/Basic/Toon/Toon_16.mat | 37 -- .../Brushes/Basic/Toon/Toon_16.mat.meta | 8 - .../Assets/Brushes/Basic/TubeAdditive.meta | 8 - .../Basic/TubeAdditive/TubeAdditive_16.asset | 26 -- .../TubeAdditive/TubeAdditive_16.asset.meta | 8 - .../Basic/TubeAdditive/TubeAdditive_16.mat | 34 -- .../TubeAdditive/TubeAdditive_16.mat.meta | 8 - .../Brushes/Basic/TubeToonInverted.meta | 8 - .../TubeToonInverted/TubeToonInverted.shader | 102 ------ .../TubeToonInverted.shader.meta | 9 - .../TubeToonInverted_16.asset | 26 -- .../TubeToonInverted_16.asset.meta | 8 - .../TubeToonInverted/TubeToonInverted_16.mat | 37 -- .../TubeToonInverted_16.mat.meta | 8 - .../Basic/UnlitHull/UnlitHull_16.asset | 9 +- .../Basic/UnlitHull/UnlitHull_16.asset.meta | 2 + .../Brushes/Basic/UnlitHull/UnlitHull_16.mat | 5 +- .../Basic/UnlitHull/UnlitHull_16.mat.meta | 4 +- .../Brushes/Basic/VelvetInk/VelvetInk.asset | 5 +- .../Basic/VelvetInk/VelvetInk.asset.meta | 2 + .../Brushes/Basic/VelvetInk/VelvetInk.mat | 5 +- .../Basic/VelvetInk/VelvetInk.mat.meta | 4 +- .../Brushes/Basic/VelvetInk/VelvetInk.shader | 17 +- .../Basic/VelvetInk/VelvetInk.shader.meta | 4 +- .../Basic/VelvetInk/VelvetInk_16.asset | 26 -- .../Basic/VelvetInk/VelvetInk_16.asset.meta | 8 - .../Brushes/Basic/VelvetInk/VelvetInk_16.mat | 27 -- .../Basic/VelvetInk/VelvetInk_16.mat.meta | 8 - .../Basic/VelvetInk/maintexture.png.meta | 96 +----- .../Brushes/Basic/Waveform/Waveform.asset | 5 +- .../Basic/Waveform/Waveform.asset.meta | 2 + .../Brushes/Basic/Waveform/Waveform.mat | 5 +- .../Brushes/Basic/Waveform/Waveform.mat.meta | 4 +- .../Brushes/Basic/Waveform/Waveform.shader | 13 +- .../Basic/Waveform/Waveform.shader.meta | 4 +- .../Brushes/Basic/Waveform/Waveform_16.asset | 26 -- .../Basic/Waveform/Waveform_16.asset.meta | 8 - .../Brushes/Basic/Waveform/Waveform_16.mat | 36 -- .../Basic/Waveform/Waveform_16.mat.meta | 8 - .../Brushes/Basic/Waveform/waveform.png.meta | 59 +--- .../Assets/Brushes/Basic/WaveformFFT.meta | 8 - .../Basic/WaveformFFT/WaveformFFT.shader | 96 ------ .../Basic/WaveformFFT/WaveformFFT.shader.meta | 9 - .../Basic/WaveformFFT/WaveformFFT_16.asset | 26 -- .../WaveformFFT/WaveformFFT_16.asset.meta | 8 - .../Basic/WaveformFFT/WaveformFFT_16.mat | 36 -- .../Basic/WaveformFFT/WaveformFFT_16.mat.meta | 8 - .../Brushes/Basic/WaveformParticles.meta | 8 - .../WaveformParticles.shader | 109 ------ .../WaveformParticles.shader.meta | 9 - .../WaveformParticles_16.asset | 26 -- .../WaveformParticles_16.asset.meta | 8 - .../WaveformParticles_16.mat | 39 --- .../WaveformParticles_16.mat.meta | 8 - .../Basic/WaveformParticles/maintexture.png | Bin 16908 -> 0 bytes .../WaveformParticles/maintexture.png.meta | 121 ------- .../Basic/WaveformPulse/NeonPulse.shader | 110 +++--- .../Basic/WaveformPulse/NeonPulse.shader.meta | 4 +- .../Brushes/Basic/WaveformPulse/main.png.meta | 92 +---- .../Assets/Brushes/Basic/WaveformTube.meta | 8 - .../Basic/WaveformTube/WaveformTube.shader | 83 ----- .../WaveformTube/WaveformTube.shader.meta | 9 - .../Basic/WaveformTube/WaveformTube_16.asset | 26 -- .../WaveformTube/WaveformTube_16.asset.meta | 8 - .../Basic/WaveformTube/WaveformTube_16.mat | 36 -- .../WaveformTube/WaveformTube_16.mat.meta | 8 - .../Brushes/Basic/WaveformTube/waveform.png | Bin 16401 -> 0 bytes .../Basic/WaveformTube/waveform.png.meta | 88 ----- .../Brushes/Basic/WetPaint/WetPaint_16.asset | 5 +- .../Basic/WetPaint/WetPaint_16.asset.meta | 2 + .../Brushes/Basic/WetPaint/WetPaint_16.mat | 8 +- .../Basic/WetPaint/WetPaint_16.mat.meta | 4 +- .../Brushes/Basic/WetPaint/main.png.meta | 89 +---- .../Brushes/Basic/WetPaint/normal.png.meta | 87 +---- .../WetPaintSingleSided/WetPaint_16.asset | 26 -- .../WetPaint_16.asset.meta | 8 - .../Basic/WetPaintSingleSided/WetPaint_16.mat | 80 ----- .../WetPaintSingleSided/WetPaint_16.mat.meta | 8 - .../WigglyGraphiteDoubleSided.shader | 36 +- .../WigglyGraphiteDoubleSided.shader.meta | 4 +- .../WigglyGraphiteSingleSided.shader | 73 ---- .../WigglyGraphiteSingleSided.shader.meta | 9 - .../WigglyGraphite/WigglyGraphite_16.asset | 5 +- .../WigglyGraphite_16.asset.meta | 2 + .../WigglyGraphite/WigglyGraphite_16.mat | 5 +- .../WigglyGraphite/WigglyGraphite_16.mat.meta | 4 +- .../Basic/WigglyGraphite/main.png.meta | 89 +---- .../WigglyGraphite_16.asset | 26 -- .../WigglyGraphite_16.asset.meta | 8 - .../WigglyGraphite_16.mat | 91 ----- .../WigglyGraphite_16.mat.meta | 8 - .../TiltBrush/Assets/Brushes/Basic/Wind.meta | 8 - .../Assets/Brushes/Basic/Wind/Wind_16.asset | 26 -- .../Brushes/Basic/Wind/Wind_16.asset.meta | 8 - .../Assets/Brushes/Basic/Wind/Wind_16.mat | 82 ----- .../Brushes/Basic/Wind/Wind_16.mat.meta | 8 - .../Assets/Brushes/Basic/Wire/Wire.asset | 9 +- .../Assets/Brushes/Basic/Wire/Wire.asset.meta | 2 + .../Assets/Brushes/Basic/Wire/Wire.mat | 5 +- .../Assets/Brushes/Basic/Wire/Wire.mat.meta | 4 +- .../Assets/Brushes/Basic/Wire/Wire_16.asset | 26 -- .../Brushes/Basic/Wire/Wire_16.asset.meta | 8 - .../Assets/Brushes/Basic/Wire/Wire_16.mat | 77 ----- .../Brushes/Basic/Wire/Wire_16.mat.meta | 8 - .../Assets/Brushes/Basic/Wireframe.meta | 8 - .../Brushes/Basic/Wireframe/Wireframe.shader | 83 ----- .../Basic/Wireframe/Wireframe.shader.meta | 9 - .../Basic/Wireframe/Wireframe_16.asset | 26 -- .../Basic/Wireframe/Wireframe_16.asset.meta | 8 - .../Brushes/Basic/Wireframe/Wireframe_16.mat | 33 -- .../Basic/Wireframe/Wireframe_16.mat.meta | 8 - UnitySDK/Packages/manifest.json | 26 +- UnitySDK/ProjectSettings/AudioManager.asset | 2 +- .../ProjectSettings/DynamicsManager.asset | 5 +- .../ProjectSettings/EditorBuildSettings.asset | 1 - UnitySDK/ProjectSettings/EditorSettings.asset | 14 +- .../ProjectSettings/Physics2DSettings.asset | 5 +- UnitySDK/ProjectSettings/PresetManager.asset | 23 +- .../ProjectSettings/ProjectSettings.asset | 209 +++++++----- .../ProjectSettings/QualitySettings.asset | 144 +++----- UnitySDK/ProjectSettings/TagManager.asset | 2 +- .../UnityConnectSettings.asset | 14 +- 885 files changed, 1790 insertions(+), 18424 deletions(-) delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snow/Snow_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SoftHighlighter/SoftHighlighter_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Splatter/Splatter_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SplatterSingleSided/Splatter_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/Stars_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat delete mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/AllBrushes.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/AllBrushes.asset index ebc001a1..c0d2e093 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/AllBrushes.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/AllBrushes.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -13,181 +12,72 @@ MonoBehaviour: m_Name: AllBrushes m_EditorClassIdentifier: m_Brushes: - - {fileID: 11400000, guid: d77ea36785d5a7b419ab8e161de8f8ca, type: 2} - - {fileID: 11400000, guid: 0c0e3228224d5864a93d61026d354d00, type: 2} - - {fileID: 11400000, guid: 705442d8f410e5d4090de2d415ed53a8, type: 2} - - {fileID: 11400000, guid: 36477b2a7b4be2241a2044dc90fdfe24, type: 2} - - {fileID: 11400000, guid: f615a7800dfaf0a40ba36e5347d25c3d, type: 2} - - {fileID: 11400000, guid: 016d62951ae551d4482d68b5e3f3fd98, type: 2} - {fileID: 11400000, guid: cadc04d18daae874aa63168911a19ba6, type: 2} - - {fileID: 11400000, guid: c37f30529c327e5469e5a8f79331bdb0, type: 2} - - {fileID: 11400000, guid: 6e7af0f6547124b549b0e6cd1382e09d, type: 2} - - {fileID: 11400000, guid: 6caf73c57b041b15aa8be4416ce94539, type: 2} - {fileID: 11400000, guid: 94e865ca3b92ee5568334254825adac1, type: 2} - - {fileID: 11400000, guid: b10752a9c95c62c53bb7746fec40de88, type: 2} - {fileID: 11400000, guid: 58575cce2727fec449fd95b38f249b39, type: 2} - - {fileID: 11400000, guid: bd0a10bbb8ec79f4aa47556fc9888118, type: 2} - {fileID: 11400000, guid: d654adeb77b0e4e57be9d81558a4eab8, type: 2} - - {fileID: 11400000, guid: 480c909c605dbc04687a61b47e5b0b78, type: 2} - {fileID: 11400000, guid: 07ab675df8bcbd148809e406fcd485fd, type: 2} - - {fileID: 11400000, guid: e89827c6fdba0244d97001ab8f7048bd, type: 2} - {fileID: 11400000, guid: ac595c6b6de2ec859a96231504448d7c, type: 2} - - {fileID: 11400000, guid: 48bbb35d5d49b315d9b442fc6745f631, type: 2} - - {fileID: 11400000, guid: dae3fdb8756823f5da4e8b5637689dce, type: 2} - {fileID: 11400000, guid: c6fa15292ff30d25f819be478121d74e, type: 2} - - {fileID: 11400000, guid: c77e0f00fa715965884077fd916bcad2, type: 2} - {fileID: 11400000, guid: d4d57e30cdd022945b067d76b7ded1c7, type: 2} - - {fileID: 11400000, guid: 1016614611341384a97cdb6b75474c6a, type: 2} - {fileID: 11400000, guid: 89d06e0e0a68a1c488e9eb9bc2ca3abc, type: 2} - - {fileID: 11400000, guid: 196fe7771f9f9a14fbf47b7ebadcb378, type: 2} - {fileID: 11400000, guid: 7f2dcdb5c7d9fc94db14b323331d5860, type: 2} - - {fileID: 11400000, guid: e43bb1c4b2255c141a10b5aff3a4c521, type: 2} - - {fileID: 11400000, guid: 091ec3bb464eb8c59b355450492173d5, type: 2} - {fileID: 11400000, guid: f4ed52160dfaf694ea666a6294e38f42, type: 2} - - {fileID: 11400000, guid: 65433607e003d134eaa467eabd2f003e, type: 2} - {fileID: 11400000, guid: c2b9f7e0f4fb54b41b7dbeb23b117551, type: 2} - - {fileID: 11400000, guid: 33912e297edc2234daead69ef39cf936, type: 2} - - {fileID: 11400000, guid: 0afc2cbbd5388dd5c9edea230b9878f6, type: 2} - - {fileID: 11400000, guid: ca487b7672ab3a452ac3e54a6b4438e9, type: 2} - {fileID: 11400000, guid: 1087726a0694716539a6894556a3a557, type: 2} - - {fileID: 11400000, guid: 00d3fab5731a7e449b1bd525c88629b7, type: 2} - - {fileID: 11400000, guid: 78a794d54b7adc55c8069dac327af9b5, type: 2} - {fileID: 11400000, guid: 6d014762200f4014fa8a87bcfaa038fe, type: 2} - - {fileID: 11400000, guid: edcdd7f6ba80d6f4a9814acfe5be99d7, type: 2} - {fileID: 11400000, guid: 6e268406bbadd084a825dda73d24387a, type: 2} - - {fileID: 11400000, guid: 93ec1af6c3122d04cb342c379dc2dd64, type: 2} - {fileID: 11400000, guid: 9f45a29bbed9af6479948c03267fe239, type: 2} - - {fileID: 11400000, guid: 980867b687111b64d84af77dcff37963, type: 2} - - {fileID: 11400000, guid: 811c48395a037e651a901d38ff989b7f, type: 2} - - {fileID: 11400000, guid: 66fb653e1d4373957b0c0fa8573c322d, type: 2} - - {fileID: 11400000, guid: 1fef1d9521b15395c9ec46fe58b33955, type: 2} - {fileID: 11400000, guid: 3c7ec9f584dd60e4a9308abe95b9f22e, type: 2} - - {fileID: 11400000, guid: 124ef0e473e7c4748b73c65209b43ace, type: 2} - - {fileID: 11400000, guid: 026e014eee7f6bf5c8e1787b57ebaefc, type: 2} - {fileID: 11400000, guid: de779677f45c66b5bb80d8fdc8604238, type: 2} - - {fileID: 11400000, guid: 0de450cbc920f1940b8b8321cc716bfa, type: 2} - {fileID: 11400000, guid: 969b71c814f75e9408602593d4e10e3e, type: 2} - - {fileID: 11400000, guid: 48988924b98c9d94183824f4f58e12a7, type: 2} - {fileID: 11400000, guid: a97674f9669261b48a61cfed32378345, type: 2} - - {fileID: 11400000, guid: 4af48b7f339a4ca4e9f1c9a7658aebcd, type: 2} - - {fileID: 11400000, guid: 2b04662a6e713b0578030ffa3d74d5dc, type: 2} - - {fileID: 11400000, guid: 55d97626500acb15394a5c4604f100cc, type: 2} - - {fileID: 11400000, guid: 5316e81a637acfe58aa970f605fa1618, type: 2} - {fileID: 11400000, guid: 0cfb52fb947fb6e4786ed9f2bdc5328c, type: 2} - - {fileID: 11400000, guid: 9707c937e62b19849928a8dc2cd5a6a0, type: 2} - - {fileID: 11400000, guid: dd353eba365eee252b6e8be44267c191, type: 2} - {fileID: 11400000, guid: b22741da3567d9353a0ccc88393d8c8e, type: 2} - - {fileID: 11400000, guid: a455d846f69efbd4da961d2a0cd90bd9, type: 2} - {fileID: 11400000, guid: 3251442494b7f6c43aa51c2ede6c409e, type: 2} - - {fileID: 11400000, guid: 9642984e79fd55b43ab26d97ce89ca0d, type: 2} - {fileID: 11400000, guid: 88ecf340d7ce92a4bada6eac937e887a, type: 2} - - {fileID: 11400000, guid: 89666103549d60b4b854b5bbb8d2ee50, type: 2} - {fileID: 11400000, guid: 4fcc165667ef68c5780910cc28494a38, type: 2} - {fileID: 11400000, guid: f83c05f7491995a53af9be352980ef25, type: 2} - - {fileID: 11400000, guid: c0a85870efa4ab545ac3bd845b0f53b7, type: 2} - - {fileID: 11400000, guid: fd102dbcd22fb8c5a92659c58182d7aa, type: 2} - {fileID: 11400000, guid: 6c27caca67a732d4f9d59b028c4dd9a8, type: 2} - - {fileID: 11400000, guid: 2d801113f2492244ea287404fda275fd, type: 2} - - {fileID: 11400000, guid: f9e50c54c7ace8a5b88473c447fdbf8e, type: 2} - - {fileID: 11400000, guid: 78b2b9b4f4a66d855b5ff47423606d67, type: 2} - - {fileID: 11400000, guid: 92ff03b2bb2a29a5e9d6a4f1a713c69d, type: 2} - - {fileID: 11400000, guid: 242adf01c508b5253aefe5c5bab9cd42, type: 2} - {fileID: 11400000, guid: 362043fe9dab1704fa0f912c4f1e0d09, type: 2} - - {fileID: 11400000, guid: baf111a6ab075664cbad82455f9dd517, type: 2} - {fileID: 11400000, guid: 54a30b55c2e961643a7701bedc663c88, type: 2} - - {fileID: 11400000, guid: 44810a6fc26cce84d9f618d2da2584c7, type: 2} - {fileID: 11400000, guid: 4f55fba4b64913b419cf4a17ba5d489b, type: 2} - - {fileID: 11400000, guid: 16b56a1a0e1590147a104e9abc851e36, type: 2} - - {fileID: 11400000, guid: bfc9ec097bc4a445383f719c6602584d, type: 2} - {fileID: 11400000, guid: 1d8b02cc1233fee5fae7728123e6257d, type: 2} - - {fileID: 11400000, guid: ddfae286c35c87e54a394a983cad0491, type: 2} - - {fileID: 11400000, guid: 658eed08dfd4e5850b642d22cd495b97, type: 2} - {fileID: 11400000, guid: 3fd505f4dc669fe4c86c80d009ec2efd, type: 2} - - {fileID: 11400000, guid: 585b99ab356f38d44bfa0bca89166410, type: 2} - {fileID: 11400000, guid: cc8a936db644b835cb1d6ac3836f65f2, type: 2} - - {fileID: 11400000, guid: 66eaa331dac132e588b955c39ede2701, type: 2} - - {fileID: 11400000, guid: 0ab8a65ca50e7bf5897129432ea7e033, type: 2} - {fileID: 11400000, guid: 71228caab923caf46a89c3275938564a, type: 2} - - {fileID: 11400000, guid: 3bd18e27f9d1cc44c9c7552284201e11, type: 2} - {fileID: 11400000, guid: 542d61ce63831da52a2faf8cb6e2d161, type: 2} - - {fileID: 11400000, guid: 4125a45648abee64eb549c7c003b1fe2, type: 2} - {fileID: 11400000, guid: d7ada22e6a436e742910a7553f159550, type: 2} - - {fileID: 11400000, guid: 6b210bd5b0128ec4aa57a8bc87e26e00, type: 2} - {fileID: 11400000, guid: 4c750113c587a7e5c97a5627a917967e, type: 2} - - {fileID: 11400000, guid: 8c7c475a7169a5a478e5520ec7f9284f, type: 2} - {fileID: 11400000, guid: 9b77a7cd7bb6c0244bca8ab8221af846, type: 2} - - {fileID: 11400000, guid: 575b9a60acc02e94e813b4b603315c8c, type: 2} - {fileID: 11400000, guid: a8f488f387b09e35dba50b6e9904301b, type: 2} - - {fileID: 11400000, guid: dd29338e13ec5265cb0cc4ee30d69155, type: 2} - {fileID: 11400000, guid: 7e6a9b8a0ad82cf4da20e86f1a326040, type: 2} - - {fileID: 11400000, guid: 5df1efb0a9f5a4b449cd34f5c9fbb232, type: 2} - - {fileID: 11400000, guid: 606ebb8edb618d15ebfb4adfa5a9b189, type: 2} - - {fileID: 11400000, guid: a9da63d3165051050aee14877ccd42d1, type: 2} - {fileID: 11400000, guid: d75833fb286458e468c00cc5b0ac5f4d, type: 2} - - {fileID: 11400000, guid: 40a77d8708a5f444fb776b8bbdbfadfd, type: 2} - - {fileID: 11400000, guid: ecab58a919952a75794e6a35e44ce78c, type: 2} - {fileID: 11400000, guid: aaaca97d63dd3d156ad1632b76baaf8d, type: 2} - - {fileID: 11400000, guid: 2b5f408092403755e919f0fc824bf6a3, type: 2} - {fileID: 11400000, guid: 84e07a49ce756cf44ab7ea2dbdc064c4, type: 2} - - {fileID: 11400000, guid: 223b21ecc1428d44d93e74389a965196, type: 2} - - {fileID: 11400000, guid: 0021c46bddf53615c9b1d1c49d3e5d37, type: 2} - {fileID: 11400000, guid: 7ccf5a61af1914e409b526a98d43354b, type: 2} - - {fileID: 11400000, guid: 302cd9feddaee0240a038004cb3e49ca, type: 2} - - {fileID: 11400000, guid: 60bf941436447e8599139730ce08379d, type: 2} - {fileID: 11400000, guid: bf5c0e36bc63d7b418af3ac347cfdcfd, type: 2} - - {fileID: 11400000, guid: f2cf6894b64c09445b05dcc8e6963e61, type: 2} - - {fileID: 11400000, guid: 322b8ef424dc2f45ea8442ca3ed14cf0, type: 2} - - {fileID: 11400000, guid: 295b9c80a6eebfd5c9e5c6e0615dac3b, type: 2} - {fileID: 11400000, guid: aa162493b08406a5a82822709c50af77, type: 2} - {fileID: 11400000, guid: 20e65e1c9af17105b8a58d0d04ad41c8, type: 2} - - {fileID: 11400000, guid: 6e90179fa3f1c1348b1adb8caa139704, type: 2} - {fileID: 11400000, guid: 402a078d5db9ad0468dda690396443bc, type: 2} - - {fileID: 11400000, guid: 629992284a019b445a3dd2b35644033a, type: 2} - - {fileID: 11400000, guid: 08d130e1f5140755eb770be7a61f79e4, type: 2} - - {fileID: 11400000, guid: 4d5095d2aa98e0c5d8b5e0a06c3240cf, type: 2} - {fileID: 11400000, guid: b1626af60ae7a31419a1c40afb39c5ed, type: 2} - - {fileID: 11400000, guid: e171f1fbc1bb36847b42a2427fb49f44, type: 2} - {fileID: 11400000, guid: 12b98790c761f47429559af03b6669d2, type: 2} - - {fileID: 11400000, guid: d77a6ccba6197d5429b222f034992612, type: 2} - {fileID: 11400000, guid: 38f5be2edab11fa429b090756d26d000, type: 2} - - {fileID: 11400000, guid: 56c831cfe8253c8499b7ea534671c9d9, type: 2} - {fileID: 11400000, guid: a713e4e48dc9bed57b2da96e510f3770, type: 2} - - {fileID: 11400000, guid: 4a18a2a26afe5df49a448b0a1446b987, type: 2} - {fileID: 11400000, guid: e7ec06c48c590ea4ebe400ce6a278efe, type: 2} - - {fileID: 11400000, guid: 93785a02ac6b05d459886fbf637434b1, type: 2} - - {fileID: 11400000, guid: 8c461ae8fae1efd5082fa32f46219e26, type: 2} - {fileID: 11400000, guid: b39f584eb1440404289d9461a0973e35, type: 2} - - {fileID: 11400000, guid: 6e625fa844480314da97f6513b4f369a, type: 2} - {fileID: 11400000, guid: 26d7464425c0b84479a8a21a695b194c, type: 2} - - {fileID: 11400000, guid: 14dd5597756a2a74da022c5ea3c5d81b, type: 2} - - {fileID: 11400000, guid: 2c9e9a86997c0a75184dfed9299d2664, type: 2} - - {fileID: 11400000, guid: b4ce13e091416ef5ea08f0fd3df1156c, type: 2} - {fileID: 11400000, guid: de4112b6c3a19ae5bb03397212a78339, type: 2} - - {fileID: 11400000, guid: ecfcc5034e7fb7347b5a07c5743a9e1b, type: 2} - {fileID: 11400000, guid: 94cb84ebeec44c540bb15b32797e5a98, type: 2} - - {fileID: 11400000, guid: 302e0cbfcebefbb4fa956278fa38973c, type: 2} - {fileID: 11400000, guid: b8a2349e67797ea4593639454ef74543, type: 2} - - {fileID: 11400000, guid: dffc61528de4c4f4d90eb8b7e03c70eb, type: 2} - - {fileID: 11400000, guid: 53ec6eb494e328f5dafde9b5de65f9c8, type: 2} - - {fileID: 11400000, guid: 3fd7519544b911b50a0f5ace4d3bbb50, type: 2} - {fileID: 11400000, guid: e6226d3ece719e15aae431e9b1bacf2d, type: 2} - {fileID: 11400000, guid: 5398e778cce3fdf469bbfa388aa46d5d, type: 2} - - {fileID: 11400000, guid: ca1b285cd96d183408d1a0e25bda4982, type: 2} - {fileID: 11400000, guid: ebe8a9d99afbd6b46909ea24a9896258, type: 2} - - {fileID: 11400000, guid: 47b2b5bdc01fa7a40a157c51c0712a34, type: 2} - - {fileID: 11400000, guid: af3d0280849bf6a5989c2223b37ac07b, type: 2} - - {fileID: 11400000, guid: e8beca0f9aca87a57b219b821606fcaa, type: 2} - - {fileID: 11400000, guid: c4479051e46c7a65fbb4a51ad2eb5910, type: 2} - {fileID: 11400000, guid: cb620f38d66c44f559d8abd0efa6a295, type: 2} - - {fileID: 11400000, guid: c546c4baee4eba441a31a3e3e6fb516a, type: 2} - {fileID: 11400000, guid: 979dc653ba7d1d358a1a3c25bf5d033f, type: 2} - {fileID: 11400000, guid: b250a068d80bad858be65c3d4675b50d, type: 2} - - {fileID: 11400000, guid: c869d93d31fc61a4c866ada41aa85f3a, type: 2} - {fileID: 11400000, guid: 34192af8b5bb56258ba49d0cf281f850, type: 2} - - {fileID: 11400000, guid: 99fe8738f2e0bea53a4370be40a8aaa4, type: 2} - {fileID: 11400000, guid: 3a72bd3c1fe3d784ab8896ec9fdfd058, type: 2} - - {fileID: 11400000, guid: 58f17ed358c05fb4590f1f6821d2e9c2, type: 2} - - {fileID: 11400000, guid: 5cc686c70856a215e8f8fea06ce5e8f1, type: 2} - {fileID: 11400000, guid: 71dc5ead67382b75789dd72c8058d553, type: 2} - {fileID: 11400000, guid: 185ca6407d6d6095e95d6695d994a12b, type: 2} - {fileID: 11400000, guid: d6f6de76308b4b05386f187491479d94, type: 2} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem.meta deleted file mode 100644 index b7ef8218..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d9c66a2647cd4644fad23abb10418c19 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset deleted file mode 100644 index a4b23fda..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: BlocksGem - m_EditorClassIdentifier: - m_Guid: - m_storage: 232998f8-d357-47a2-993a-53415df9be10 - m_DurableName: BlocksGem - m_Material: {fileID: 2100000, guid: 232998f8d35747a2993a53415df9be10, type: 2} - m_IsParticle: 0 - m_uv0Size: 0 - m_uv0Semantic: 0 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset.meta deleted file mode 100644 index 369e68d7..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d77ea36785d5a7b419ab8e161de8f8ca -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat deleted file mode 100644 index abeaf7d9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat +++ /dev/null @@ -1,88 +0,0 @@ -%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: BlocksGem - m_Shader: {fileID: 4800000, guid: cd72ccec010118e44bcae69ab6186eb4, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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: - - _Amp: 2.5 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _FacetSize: 0.05 - - _Frequency: 2 - - _Gain: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.8 - - _GlossyReflections: 1 - - _Jitter: 1 - - _Lacunarity: 0 - - _Metallic: 0.853 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _RimIntensity: 0.5 - - _RimPower: 2 - - _Shininess: 0.9 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Transmission: 0.357 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat.meta deleted file mode 100644 index 422cbad9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 88c1fdd2979c6f242b9344bbcc3c452f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset deleted file mode 100644 index 5d326986..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: BlocksGem_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 232998f8-d357-47a2-993a-53415df9be10 - m_DurableName: BlocksGem - m_Material: {fileID: 2100000, guid: 232998f8d35747a2993a53415df9be10, type: 2} - m_IsParticle: 0 - m_uv0Size: 0 - m_uv0Semantic: 0 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset.meta deleted file mode 100644 index 7ad04814..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c0e3228224d5864a93d61026d354d00 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat deleted file mode 100644 index de09566c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat +++ /dev/null @@ -1,88 +0,0 @@ -%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: BlocksGem_16 - m_Shader: {fileID: 4800000, guid: cd72ccec010118e44bcae69ab6186eb4, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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: - - _Amp: 2.5 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _FacetSize: 0.05 - - _Frequency: 2 - - _Gain: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.8 - - _GlossyReflections: 1 - - _Jitter: 1 - - _Lacunarity: 0 - - _Metallic: 0.853 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _RimIntensity: 0.5 - - _RimPower: 2 - - _Shininess: 0.9 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Transmission: 0.357 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat.meta deleted file mode 100644 index 2fc71d1f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGem/BlocksGem_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2e73902e44ec6844982cbde48359c46e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass.meta deleted file mode 100644 index 823d3aa4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8874b860b24e9054b91a724fb52d306c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset deleted file mode 100644 index bc6db42e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: BlocksGlass - m_EditorClassIdentifier: - m_Guid: - m_storage: 3d813d82-5839-4450-8ddc-8e889ecd96c7 - m_DurableName: BlocksGlass - m_Material: {fileID: 2100000, guid: 3d813d82583944508ddc8e889ecd96c7, type: 2} - m_IsParticle: 0 - m_uv0Size: 0 - m_uv0Semantic: 0 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset.meta deleted file mode 100644 index e0dc0681..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 705442d8f410e5d4090de2d415ed53a8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat deleted file mode 100644 index 081f8a6a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat +++ /dev/null @@ -1,86 +0,0 @@ -%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: BlocksGlass - m_Shader: {fileID: 4800000, guid: 7fbe2fe7dc7c2a64a9b2abac67b85b54, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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} - - _Noise: - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.8 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _RimIntensity: 0.7 - - _RimPower: 4 - - _Shininess: 0.8 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Transmission: 0.5 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat.meta deleted file mode 100644 index 99fd0266..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5b9c98887e736894a8265228fa36186f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset deleted file mode 100644 index f1eb9bb9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: BlocksGlass_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 3d813d82-5839-4450-8ddc-8e889ecd96c7 - m_DurableName: BlocksGlass - m_Material: {fileID: 2100000, guid: 3d813d82583944508ddc8e889ecd96c7, type: 2} - m_IsParticle: 0 - m_uv0Size: 0 - m_uv0Semantic: 0 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset.meta deleted file mode 100644 index 4cb613cf..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 36477b2a7b4be2241a2044dc90fdfe24 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat deleted file mode 100644 index 23d724f7..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat +++ /dev/null @@ -1,86 +0,0 @@ -%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: BlocksGlass_16 - m_Shader: {fileID: 4800000, guid: 7fbe2fe7dc7c2a64a9b2abac67b85b54, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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} - - _Noise: - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.8 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _RimIntensity: 0.7 - - _RimPower: 4 - - _Shininess: 0.8 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Transmission: 0.5 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat.meta deleted file mode 100644 index cf911615..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksGlass/BlocksGlass_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 61592719810538f4888eedfc3747c986 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper.meta deleted file mode 100644 index 60347a2a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f0efa8ea0d6bb8d43843350bb3ec901d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset deleted file mode 100644 index 204be60f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: BlocksBasic_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 0e87b49c-6546-3a34-3a44-8a556d7d6c3e - m_DurableName: BlocksBasic - m_Material: {fileID: 2100000, guid: 0e87b49c65463a343a448a556d7d6c3e, type: 2} - m_IsParticle: 0 - m_uv0Size: 0 - m_uv0Semantic: 0 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset.meta deleted file mode 100644 index e6801f21..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f615a7800dfaf0a40ba36e5347d25c3d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat deleted file mode 100644 index 49485d5a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: BlocksBasic_16 - m_Shader: {fileID: 4800000, guid: 50d409e7765e3e8489865238cdf646e7, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.2 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat.meta deleted file mode 100644 index 3d7f0993..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksBasic_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 789f00718c1e7794b86b6f178f9688fb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset deleted file mode 100644 index 691bb85a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: BlocksPaper - m_EditorClassIdentifier: - m_Guid: - m_storage: 0e87b49c-6546-3a34-3a44-8a556d7d6c3e - m_DurableName: BlocksBasic - m_Material: {fileID: 2100000, guid: 0e87b49c65463a343a448a556d7d6c3e, type: 2} - m_IsParticle: 0 - m_uv0Size: 0 - m_uv0Semantic: 0 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset.meta deleted file mode 100644 index 34e2f11c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 016d62951ae551d4482d68b5e3f3fd98 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat deleted file mode 100644 index 64bc3a21..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: BlocksPaper - m_Shader: {fileID: 4800000, guid: 50d409e7765e3e8489865238cdf646e7, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.2 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat.meta deleted file mode 100644 index 2edd1fe4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BlocksPaper/BlocksPaper.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4a9410ad3e50bf1498134c69c66e91e9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta deleted file mode 100644 index 9fa309da..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 25cfc524cc091b340ada42975b5496c3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset deleted file mode 100644 index ba14a104..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: BubbleWand_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: EBA3F993-F9A1-4D35-B84E-BB08F48981A4 - m_DurableName: BubbleWand - m_Material: {fileID: 2100000, guid: eba3f993f9a14d35b84ebb08f48981a4, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta deleted file mode 100644 index 6b2448ef..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6e7af0f6547124b549b0e6cd1382e09d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat deleted file mode 100644 index c67e2d83..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat +++ /dev/null @@ -1,51 +0,0 @@ -%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: BubbleWand_16 - m_Shader: {fileID: 4800000, guid: 0291fdb46401c4826bc02d7ec6d76cbb, 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} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 7a23cfe16e9d8cf4b820c79d8d2b9c5a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _DisplacementIntensity: 0.1 - - _EmissionGain: 0.25 - - _InvFade: 1 - - _Scroll1: 2 - - _Scroll2: -2 - - _ScrollJitterFrequency: 1 - - _ScrollJitterIntensity: 3 - - _ScrollRate: -0.54 - - _Smoothness: 0.078125 - - _Strength: 0.5 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta deleted file mode 100644 index 6ed5d69e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eba3f993f9a14d35b84ebb08f48981a4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset index bb21278e..0a19e942 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset.meta index b7c2128d..5fc7279a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: cadc04d18daae874aa63168911a19ba6 +timeCreated: 1495127967 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat index 4ffdd851..91b111df 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Bubbles m_Shader: {fileID: 4800000, guid: ecfbf36005cdcc94d881047728719bd8, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat.meta index d3e35c1e..db033a9b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 89d104cdd012426bb5b3bbaee63ac43c +timeCreated: 1495148312 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader index 61d0ca54..2646b520 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -37,13 +37,11 @@ Category { #pragma multi_compile_particles #pragma target 3.0 #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "../../../Shaders/Include/Particles.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; @@ -114,14 +112,7 @@ Category { float3 highlightcolor = tex.a; float4 color = float4(basecolor + highlightcolor, 1); - color = SrgbToNative(color); - -#if SELECTION_ON - color.rgb = GetSelectionColor() * tex.r; - color.a = tex.a; -#endif - - return color; + return SrgbToNative(color); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader.meta index 59c3f42a..eb27173e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: ecfbf36005cdcc94d881047728719bd8 +timeCreated: 1467773228 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset deleted file mode 100644 index be668363..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Bubbles_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 89d104cd-d012-426b-b5b3-bbaee63ac43c - m_DurableName: Bubbles - m_Material: {fileID: 2100000, guid: 89d104cdd012426bb5b3bbaee63ac43c, type: 2} - m_IsParticle: 1 - m_uv0Size: 4 - m_uv0Semantic: 5 - m_uv1Size: 3 - m_uv1Semantic: 1 - m_bUseNormals: 1 - m_normalSemantic: 1 - m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset.meta deleted file mode 100644 index 005fe0dd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c37f30529c327e5469e5a8f79331bdb0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat deleted file mode 100644 index 5640a031..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat +++ /dev/null @@ -1,90 +0,0 @@ -%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: Bubbles_16 - m_Shader: {fileID: 4800000, guid: ecfbf36005cdcc94d881047728719bd8, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: ed9b3d77606ffd840bbc7ae1adfedced, 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: - - _BaseGain: 0.4 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EmissionGain: 300 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ScrollJitterFrequency: 0.2 - - _ScrollJitterIntensity: 0.02 - - _ScrollRate: 0.5 - - _Shininess: 0.078125 - - _SmoothnessTextureChannel: 0 - - _SparkleRate: 2.5 - - _SpecularHighlights: 1 - - _SpreadSize: 1.25 - - _SrcBlend: 1 - - _UVSec: 0 - - _WaveformFreq: 0.1 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _ScrollDistance: {r: 2, g: 6, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} - - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat.meta deleted file mode 100644 index 95bab597..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/Bubbles_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 526efb3b927b8a44aace63e692f437de -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/maintexture.png.meta index 11fc97ba..016fdb50 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Bubbles/maintexture.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: ed9b3d77606ffd840bbc7ae1adfedced +timeCreated: 1440714591 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 1 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,39 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: 2 aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: 1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: 5 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta deleted file mode 100644 index 57bd9b32..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d50656153893eec47bf4cf51aed2c1cb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset deleted file mode 100644 index 1eded37c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: CandyCane_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 61d2ef63-ed60-49b3-85fb-7267b7d234f2 - m_DurableName: CandyCane - m_Material: {fileID: 2100000, guid: 61d2ef63ed6049b385fb7267b7d234f2, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 0 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta deleted file mode 100644 index 846a942b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6caf73c57b041b15aa8be4416ce94539 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat deleted file mode 100644 index fa48ed29..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat +++ /dev/null @@ -1,37 +0,0 @@ -%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: CandyCane_16 - m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Illum: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _EmissionGain: 0.5 - - _EmissionLM: 0 - - _InvFade: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta deleted file mode 100644 index 4f611b17..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 61d2ef63ed6049b385fb7267b7d234f2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader index ffab3241..21088a22 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -31,10 +31,8 @@ Shader "Brush/Special/CelVinyl" { #pragma fragment frag #pragma multi_compile __ TBT_LINEAR_TARGET #pragma multi_compile_fog - #pragma multi_compile __ SELECTION_ON #include "../../../Shaders/Include/Brush.cginc" #include "UnityCG.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" #pragma target 3.0 sampler2D _MainTex; @@ -49,7 +47,7 @@ Shader "Brush/Special/CelVinyl" { }; struct v2f { - float4 pos : POSITION; + float4 vertex : SV_POSITION; float2 texcoord : TEXCOORD0; float4 color : COLOR; UNITY_FOG_COORDS(1) @@ -60,14 +58,14 @@ Shader "Brush/Special/CelVinyl" { v2f o; - o.pos = UnityObjectToClipPos(v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.texcoord = v.texcoord; o.color = TbVertToNative(v.color); - UNITY_TRANSFER_FOG(o, o.pos); + UNITY_TRANSFER_FOG(o, o.vertex); return o; } - fixed4 frag (v2f i) : COLOR + fixed4 frag (v2f i) : SV_Target { fixed4 tex = tex2D(_MainTex, i.texcoord) * i.color; UNITY_APPLY_FOG(i.fogCoord, tex); @@ -76,8 +74,6 @@ Shader "Brush/Special/CelVinyl" { if (tex.a < _Cutoff) { discard; } - tex.a = 1; - FRAG_MOBILESELECT(tex) return tex; } @@ -86,4 +82,4 @@ Shader "Brush/Special/CelVinyl" { } Fallback "Unlit/Diffuse" -} +} \ No newline at end of file diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader.meta index 63143ea6..7680fa1c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8ece14794d9fb9c42a263008101ca435 +timeCreated: 1496853657 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset index 1020d70d..7a3e52f8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset.meta index 934cd73f..b605f757 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 94e865ca3b92ee5568334254825adac1 +timeCreated: 1529443736 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat index b61db455..31c8b8b9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: CelVinyl_16 m_Shader: {fileID: 4800000, guid: 8ece14794d9fb9c42a263008101ca435, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat.meta index 76d1f8ed..fedc62f8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/CelVinyl_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 700f3aa89a7c23848b8aea028905dd8c +timeCreated: 1496858561 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/main.png.meta index 2fdc8f94..8e03ab19 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CelVinyl/main.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 8aecb07e1a668d24f89309f1e2dab649 +timeCreated: 1440714585 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,38 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: 2 aniso: 4 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: 1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta deleted file mode 100644 index 41100861..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b3b367f7865ee1e48aa234c1de07f2fb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset deleted file mode 100644 index 318332a8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Charcoal_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: fde6e778-0f7a-e584-38d6-89d44cee59f6 - m_DurableName: Charcoal - m_Material: {fileID: 2100000, guid: fde6e7780f7ae58438d689d44cee59f6, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta deleted file mode 100644 index 6b39b73c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b10752a9c95c62c53bb7746fec40de88 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat deleted file mode 100644 index cf7d923a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: Charcoal_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 9bdb8bc5360ddc148bfcb994ca09401f, type: 3} - 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: 2e3b6862a2aeea04780ff5a7350b6132, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.01 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta deleted file mode 100644 index 5c52d259..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fde6e7780f7ae58438d689d44cee59f6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset index 1675a163..cce8aaf8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -17,8 +16,8 @@ MonoBehaviour: m_DurableName: ChromaticWave m_Material: {fileID: 2100000, guid: 0f0ff7b2a67745eba7d60cd7206f4816, type: 2} m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 + m_uv0Size: 2 + m_uv0Semantic: 5 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset.meta index 56bcb89d..2197aaf5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 58575cce2727fec449fd95b38f249b39 +timeCreated: 1495162082 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat index cd5bfb42..e4455c35 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: ChromaticWave m_Shader: {fileID: 4800000, guid: 89cb52de98c379048bcf61a01a3c5f18, type: 3} m_ShaderKeywords: _LIGHTMAPPING_REALTIME diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat.meta index 8b74da98..91a0b2d0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 0f0ff7b2a67745eba7d60cd7206f4816 +timeCreated: 1481917492 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader index a7f238c5..242b25b5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -35,12 +35,10 @@ Category { #pragma multi_compile_particles #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #pragma target 3.0 #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" float _EmissionGain; @@ -51,7 +49,7 @@ Category { }; struct v2f { - float4 pos : POSITION; + float4 vertex : SV_POSITION; float4 color : COLOR; float2 texcoord : TEXCOORD0; float4 unbloomedColor : TEXCOORD1; @@ -61,7 +59,7 @@ Category { { v.color = TbVertToSrgb(v.color); v2f o; - o.pos = UnityObjectToClipPos(v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.texcoord = v.texcoord; o.color = bloomColor(v.color, _EmissionGain); o.unbloomedColor = v.color; @@ -69,7 +67,7 @@ Category { } // Input color is srgb - fixed4 frag (v2f i) : COLOR + fixed4 frag (v2f i) : SV_Target { // Envelope float envelope = sin(i.texcoord.x * 3.14159); @@ -93,7 +91,6 @@ Category { color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); - FRAG_MOBILESELECT(color) return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader.meta index ea9526d5..0a42ec5a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 89cb52de98c379048bcf61a01a3c5f18 +timeCreated: 1457578865 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset deleted file mode 100644 index cfe6a1fe..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: ChromaticWave_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 0f0ff7b2-a677-45eb-a7d6-0cd7206f4816 - m_DurableName: ChromaticWave - m_Material: {fileID: 2100000, guid: 0f0ff7b2a67745eba7d60cd7206f4816, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset.meta deleted file mode 100644 index 0698af0a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bd0a10bbb8ec79f4aa47556fc9888118 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat deleted file mode 100644 index dd451f89..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat +++ /dev/null @@ -1,85 +0,0 @@ -%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: ChromaticWave_16 - m_Shader: {fileID: 4800000, guid: 89cb52de98c379048bcf61a01a3c5f18, type: 3} - m_ShaderKeywords: _LIGHTMAPPING_REALTIME - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - 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} - - _Illum: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EmissionGain: 0.45 - - _EmissionLM: 0 - - _EmissionScaleUI: 0 - - _Glossiness: 0.38 - - _InvFade: 1 - - _Lightmapping: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Scroll1: 13 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat.meta deleted file mode 100644 index d4c20654..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ChromaticWave/ChromaticWave_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9588564d59c101e4fa91109550d6ba9f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset index f6b5fcc7..4f80d6c0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset.meta index 0c6f8f5c..f5ae0736 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: d654adeb77b0e4e57be9d81558a4eab8 +timeCreated: 1529443738 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat index 62136cfb..b2bae2b5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: CoarseBristles_15 m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat.meta index f4b5820e..fa24d6f2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 1161af8250cf47db97060c3576d43c43 +timeCreated: 1496878118 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset deleted file mode 100644 index 8c4a2bae..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: CoarseBristles_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 1161af82-50cf-47db-9706-0c3576d43c43 - m_DurableName: CoarseBristles - m_Material: {fileID: 2100000, guid: 1161af8250cf47db97060c3576d43c43, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset.meta deleted file mode 100644 index 9c5d941d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 480c909c605dbc04687a61b47e5b0b78 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat deleted file mode 100644 index 94160f46..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat +++ /dev/null @@ -1,78 +0,0 @@ -%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: CoarseBristles_16 - m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - 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: 511e136566fbfc241b63ff2207dbcafe, 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.25 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat.meta deleted file mode 100644 index 6717f97c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3f99647b79f185e4aa0c09df2f3d5d8b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/leaves.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/leaves.png.meta index bd8ff321..e442c645 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/leaves.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/leaves.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 511e136566fbfc241b63ff2207dbcafe +timeCreated: 1440714585 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset index 097766a8..ec5d8d3e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset.meta index 6a02b8c8..8be28e98 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 07ab675df8bcbd148809e406fcd485fd +timeCreated: 1529443739 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat index b7aa27c4..6d902efe 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: CoarseBristles_0 m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat.meta index 5bec9aa6..ab151c34 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 79168f106961464a8be157ed364c5600 +timeCreated: 1496878118 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset deleted file mode 100644 index e89e9f33..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: CoarseBristles_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 79168f10-6961-464a-8be1-57ed364c5600 - m_DurableName: CoarseBristles - m_Material: {fileID: 2100000, guid: 79168f106961464a8be157ed364c5600, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset.meta deleted file mode 100644 index 675d1fef..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e89827c6fdba0244d97001ab8f7048bd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat deleted file mode 100644 index e4e2e468..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat +++ /dev/null @@ -1,77 +0,0 @@ -%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: CoarseBristles_16 - m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 511e136566fbfc241b63ff2207dbcafe, 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.25 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat.meta deleted file mode 100644 index 3d751614..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristlesSingleSided/CoarseBristles_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e32ecc6605b5bc9429a994a47379195f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader index dc239f57..0d09f749 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -35,10 +35,8 @@ Category { #pragma fragment frag #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; sampler2D _AlphaMask; @@ -55,7 +53,7 @@ Category { }; struct v2f { - float4 pos : POSITION; + float4 vertex : POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -73,7 +71,8 @@ Category { saturate((1.0 - smoothstep(0, .3, v.texcoord.x)) * v.texcoord.z); v.vertex.xyz += displacement; #endif - o.pos = UnityObjectToClipPos(v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); + return o; } @@ -108,9 +107,7 @@ Category { float falloff = max((0.2 - i.texcoord.x) * 5, 0); float tex = tex2D(_AlphaMask, saturate(gradient_lookup_value + falloff)).r; - float4 color = float4((tex * i.color).rgb , 1.0); - FRAG_MOBILESELECT(color) - return color; + return float4((tex * i.color).rgb , 1.0); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader.meta index 526768f7..58191ace 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8224f6980454ee9448eaf50da5fc3ca4 +timeCreated: 1497652398 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset index 71c27875..b9d39217 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset.meta index 7a8651af..9b1ab50e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: ac595c6b6de2ec859a96231504448d7c +timeCreated: 1529443740 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat index c29ba364..294b53e6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Comet_16 m_Shader: {fileID: 4800000, guid: 8224f6980454ee9448eaf50da5fc3ca4, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat.meta index 73ba8b4b..0466bda5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 1caa6d7df0153f543a4b8b5354d39f81 +timeCreated: 1497650213 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/gradient.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/gradient.png.meta index bee60c3d..042fb372 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/gradient.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/gradient.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: b0396e66243f48449a3710f12f224199 +timeCreated: 1497653637 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,44 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: 1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL + textureType: 5 + buildTargetSettings: + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 7 compressionQuality: 50 - crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/main.png.meta index aec6bfc0..6f0fe2ed 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/main.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 5115e6d4283754649a847abe8d481dbc +timeCreated: 1497661871 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,44 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: 0 - wrapV: 0 - wrapW: 0 + mipBias: -1 + wrapMode: 0 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL + textureType: 5 + buildTargetSettings: + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 5 compressionQuality: 50 - crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta deleted file mode 100644 index bed87911..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0a83e25e0d151e346b0138b1cf16aafa -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset deleted file mode 100644 index 6b31a970..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: ConcaveHull_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 7ae1f880-a517-44a0-99f9-1cab654498c6 - m_DurableName: ConcaveHull - m_Material: {fileID: 2100000, guid: 7ae1f880a51744a099f91cab654498c6, type: 2} - m_IsParticle: 0 - m_uv0Size: 0 - m_uv0Semantic: 0 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta deleted file mode 100644 index e372647f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 48bbb35d5d49b315d9b442fc6745f631 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat deleted file mode 100644 index 423664bc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat +++ /dev/null @@ -1,102 +0,0 @@ -%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: ConcaveHull_16 - m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Bottom: - 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} - 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: 0} - 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} - - _Side: - m_Texture: {fileID: 2800000, guid: 006eb4ee45e4eee4b84cf30d54b01889, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Top: - m_Texture: {fileID: 2800000, guid: 640eb58bac1e8c349b8aef55f817627b, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BottomScale: 2 - - _Bulge: 2.25 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EmissionGain: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _NumSides: 5 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ScrollJitterFrequency: 1 - - _ScrollJitterIntensity: 1 - - _ScrollRate: 1 - - _Shininess: 0.078125 - - _SideScale: 0.2 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _Speed: 1 - - _SpreadRate: 1.539 - - _SrcBlend: 1 - - _TopScale: 0.3 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta deleted file mode 100644 index 4d8b10bd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ae1f880a51744a099f91cab654498c6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta deleted file mode 100644 index 3c38d6fc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 57310860c5180594fbc8da76d0e5cfe7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader deleted file mode 100644 index b1ded660..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright 2020 The Tilt Brush Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -Shader "Brush/Special/DanceFloor" { -Properties { - _TintColor ("Tint Color", Color) = (0.5,0.5,0.5,0.5) - _MainTex ("Particle Texture", 2D) = "white" {} -} - -Category { - //Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } - //Blend One One - //BlendOp Add, Min - //AlphaTest Greater .01 -// ColorMask RGBA - Cull Off Lighting Off ZWrite On Fog { Color (0,0,0,0) } - - SubShader { - Pass { - - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma target 3.0 - #pragma glsl - #pragma multi_compile __ AUDIO_REACTIVE - #pragma multi_compile __ TBT_LINEAR_TARGET - #include "UnityCG.cginc" - #include "../../../Shaders/Include/Brush.cginc" - #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - - sampler2D _MainTex; - fixed4 _TintColor; - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - float4 texcoord1 : TEXCOORD1; - float3 normal : NORMAL; - }; - - struct v2f { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - float3 worldPos : TEXCOORD1; - }; - - float4 _MainTex_ST; - - v2f vert (appdata_t v) - { - v2f o; - float4 worldPos = mul(unity_ObjectToWorld, v.vertex); - float waveform = 0; - - float lifetime = _Time.y - v.texcoord1.w; - float release = saturate(lifetime); - - -#ifdef AUDIO_REACTIVE - //worldPos.y -= release * fmod(_BeatOutputAccum.x * 2 - v.texcoord1.w, 5); - //worldPos.y += .3 * release * pow(sin(_BeatOutputAccum.x * 5 + worldPos.x),5); - lifetime = v.texcoord1.w * 10 + _BeatOutputAccum.x; - o.color += tex2Dlod(_WaveFormTex, float4(lifetime * 5,0, 0, 0)).r - .5; - -#endif - - v.color.xyz = pow(fmod(lifetime,1),3) * v.color.xyz; // * saturate(sin(lifetime * 10)) + v.color.zxy * saturate(cos(lifetime * 7)); - - // Quantize vertices - float q = 5; - float3 quantPos = ceil(worldPos.xyz * q) / q; - worldPos.xyz = quantPos; - worldPos.xyz += v.normal * pow(fmod(lifetime,1),3) * .1; - o.vertex = mul(UNITY_MATRIX_VP, worldPos); - o.color = 2 * v.color + v.color.yzxw * _BeatOutput.x; - o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); - o.worldPos = worldPos.xyz; - return o; - } - - fixed4 frag (v2f i) : SV_Target - { - - //float waveform = tex2D(_WaveFormTex, float2(fmod(i.worldPos.x * 0.1f + _Time.y,1),0) ).r - .5f; - //i.texcoord.y += waveform; - float4 c = i.color * _TintColor * tex2D(_MainTex, i.texcoord); - return float4(c.rgb * c.a, 1.0); - } - ENDCG - } - } -} -} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta deleted file mode 100644 index cfdf76b3..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 14968e66fc8cfe441b31a7c23a07897c -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset deleted file mode 100644 index 6b1a03c9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: DanceFloor_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 6a1cf9f9-032c-45ec-311e-a6680bee32e9 - m_DurableName: DanceFloor - m_Material: {fileID: 2100000, guid: 6a1cf9f9032c45ec311ea6680bee32e9, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 4 - m_uv1Semantic: 2 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta deleted file mode 100644 index 311ddf05..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dae3fdb8756823f5da4e8b5637689dce -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat deleted file mode 100644 index 568f0c65..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat +++ /dev/null @@ -1,39 +0,0 @@ -%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: DanceFloor_16 - m_Shader: {fileID: 4800000, guid: 14968e66fc8cfe441b31a7c23a07897c, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: a376d2141060ffb4c80eb5f3d39ceb07, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BaseGain: 0.4 - - _EmissionGain: 1 - - _InvFade: 1 - - _ScrollSpeed: 0 - - _VertexDisplacement: 0 - - _WaveformFreq: 0.2 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} - - _WaveformIntensity: {r: 0, g: 0.3, b: 0, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta deleted file mode 100644 index 03f20ef1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6a1cf9f9032c45ec311ea6680bee32e9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png deleted file mode 100644 index 3757a9c54a4e960919fcac4d07cb1ac2c0b015d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26563 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 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta deleted file mode 100644 index 6cc32a05..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta +++ /dev/null @@ -1,121 +0,0 @@ -fileFormatVersion: 2 -guid: a376d2141060ffb4c80eb5f3d39ceb07 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader index 865df881..3db94e58 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -24,14 +24,12 @@ Shader "Brush/Special/DiamondHull" { Fog{ Mode Off } CGPROGRAM - #pragma target 4.0 + #pragma target 3.0 #pragma surface surf StandardSpecular vertex:vert nofog #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "../../../Shaders/Include/Brush.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -126,7 +124,7 @@ Shader "Brush/Special/DiamondHull" { const float nmedium = 1; const float nfilm = 1.3; const float ninternal = 1; - + const float cos0 = abs(dot(I, N)); //float3 thickTex = texture(thickness, u, v); @@ -155,7 +153,7 @@ Shader "Brush/Special/DiamondHull" { // Calculate rim half rim = 1.0 - abs(dot(normalize(IN.viewDir), IN.worldNormal)); rim *= 1-pow(rim,5); - + const float3 I = (_WorldSpaceCameraPos - IN.worldPos); rim = lerp(rim, 150, 1 - saturate(abs(dot(normalize(I), IN.worldNormal)) / .1)); @@ -164,7 +162,6 @@ Shader "Brush/Special/DiamondHull" { diffraction = GetDiffraction(diffraction, o.Normal, normalize(IN.viewDir)); o.Emission = rim * IN.color * diffraction * .5 + rim * diffraction * .25; - SURF_FRAG_MOBILESELECT(o); o.Specular = SrgbToNative(IN.color).rgb * clamp(diffraction, .0, 1); } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader.meta index cb40ffc8..f1ef0b8f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8521b049d4675f340a0d50e4bd78cd0d +timeCreated: 1452563229 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset index 62e69eb3..b57eb09f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -17,8 +16,8 @@ MonoBehaviour: m_DurableName: DiamondHull m_Material: {fileID: 2100000, guid: c8313697256347fc832e290f4c04b901, type: 2} m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 + m_uv0Size: 2 + m_uv0Semantic: 0 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset.meta index a7624ed0..e477fa41 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: c6fa15292ff30d25f819be478121d74e +timeCreated: 1529443740 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat index d2c7f5a9..861786f1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: DiamondHull_16 m_Shader: {fileID: 4800000, guid: 8521b049d4675f340a0d50e4bd78cd0d, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat.meta index ec04611d..26a62528 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/DiamondHull_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: c8313697256347fc832e290f4c04b901 +timeCreated: 1498761536 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/main.png.meta index 51eb9f72..39822363 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DiamondHull/main.png.meta @@ -1,9 +1,11 @@ fileFormatVersion: 2 guid: 2a6e5a1bbfe8dd240ba16ff658d95cd3 +timeCreated: 1525713743 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 9 + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -21,8 +23,6 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 + mipBias: -1 wrapU: -1 wrapV: -1 wrapW: -1 @@ -45,54 +45,18 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -107,15 +71,7 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta deleted file mode 100644 index afc2cf71..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 72e82b63fa3c0d240a59dd8ed2172de3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset deleted file mode 100644 index 15eb5c03..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Digital_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 30cb9af6-be41-4872-8f3e-cbff63fe3db8 - m_DurableName: Digital - m_Material: {fileID: 2100000, guid: 30cb9af6be4148728f3ecbff63fe3db8, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta deleted file mode 100644 index 81715e2e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c77e0f00fa715965884077fd916bcad2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat deleted file mode 100644 index c450945d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat +++ /dev/null @@ -1,28 +0,0 @@ -%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: Digital_16 - m_Shader: {fileID: 4800000, guid: c8def03accc4e8341b9fa2db8eb6ff87, 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: - - _EmissionGain: 0.5 - m_Colors: [] diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta deleted file mode 100644 index 65854bbc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 30cb9af6be4148728f3ecbff63fe3db8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset index a6f03b2f..6897d8c8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset.meta index 0bdb8777..5d184978 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: d4d57e30cdd022945b067d76b7ded1c7 +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat index 2b1b909b..4af6eb59 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Disco m_Shader: {fileID: 4800000, guid: 2d606fd47b43446739974645ed823957, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat.meta index 65b5625f..355951b8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 4391aaaadf7343969e3331e4e4930b27 +timeCreated: 1481917491 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader index 991f7468..ae4ebd58 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -27,9 +27,7 @@ Shader "Brush/Disco" { #pragma surface surf StandardSpecular vertex:vert noshadow #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" struct Input { float2 uv_MainTex; @@ -43,8 +41,7 @@ Shader "Brush/Disco" { fixed4 _Color; half _Shininess; - void vert (inout appdata_full v, out Input o) { - UNITY_INITIALIZE_OUTPUT(Input, o); + void vert (inout appdata_full v) { v.color = TbVertToNative(v.color); float t, uTileRate, waveIntensity; @@ -84,7 +81,6 @@ Shader "Brush/Disco" { // Add a fake "disco ball" hot spot float fakeLight = pow( abs(dot(worldNormal, float3(0,1,0))),100); o.Emission = IN.color.rgb * fakeLight * 200; - SURF_FRAG_MOBILESELECT(o); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader.meta index 401339ed..3b5bd2a1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 2d606fd47b43446739974645ed823957 +timeCreated: 1466956512 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset deleted file mode 100644 index d2f5d631..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Disco_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 4391aaaa-df73-4396-9e33-31e4e4930b27 - m_DurableName: Disco - m_Material: {fileID: 2100000, guid: 4391aaaadf7343969e3331e4e4930b27, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset.meta deleted file mode 100644 index 485f240b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1016614611341384a97cdb6b75474c6a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat deleted file mode 100644 index 65cae25a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat +++ /dev/null @@ -1,43 +0,0 @@ -%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: Disco_16 - m_Shader: {fileID: 4800000, guid: 2d606fd47b43446739974645ed823957, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 - 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} - - _Illum: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _EmissionGain: 0.5 - - _EmissionLM: 0 - - _InvFade: 1 - - _Shininess: 0.65 - m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5147059, g: 0.5147059, b: 0.5147059, a: 0} - - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat.meta deleted file mode 100644 index 2fbb6849..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Disco/Disco_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 93e1baa66dea95e40912c4e1034c3ae2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset index 9a41125a..d94905f0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset.meta index c3dac0a9..85a01f7b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 89d06e0e0a68a1c488e9eb9bc2ca3abc +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat index 6a00e9f7..4c88fd55 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: DotMarker m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat.meta index 2a6a4c04..8f8e844f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d1d991f2e7a04cf1b328f57e915e6260 +timeCreated: 1481917493 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset deleted file mode 100644 index d6d48efe..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: DotMarker_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: d1d991f2-e7a0-4cf1-b328-f57e915e6260 - m_DurableName: DotMarker - m_Material: {fileID: 2100000, guid: d1d991f2e7a04cf1b328f57e915e6260, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset.meta deleted file mode 100644 index ece79216..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 196fe7771f9f9a14fbf47b7ebadcb378 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat deleted file mode 100644 index b7392b31..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat +++ /dev/null @@ -1,78 +0,0 @@ -%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: DotMarker_16 - m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - 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: e4cba7db327fac04f9f443913ee51fc0, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat.meta deleted file mode 100644 index f1936d8d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/DotMarker_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f35a3db45d0b93541b5bd34cf128111b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/maintexture.png.meta index 890d522d..d1a397ec 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DotMarker/maintexture.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: e4cba7db327fac04f9f443913ee51fc0 +timeCreated: 1462479037 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,38 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 128 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 128 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 128 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 128 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset index f3a54a5d..6bea7fe8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset.meta index 41f26ad3..8059ca78 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 7f2dcdb5c7d9fc94db14b323331d5860 +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat index d190d6e1..11291ec8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Dots m_Shader: {fileID: 4800000, guid: 732f16cce31764a49a67b2c782bf444a, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat.meta index 3edc5f1f..a8b5324b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 6a1cf9f9032c45ec9b1da6680bee30f7 +timeCreated: 1495148315 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader index 7f0a476a..0aa7258b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -40,12 +40,10 @@ Category { #pragma glsl #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "../../../Shaders/Include/Particles.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; @@ -77,7 +75,7 @@ Category { #ifdef AUDIO_REACTIVE float4 dispVec = float4(0,0,0,0); float4 corner_WS = mul(unity_ObjectToWorld, corner); - // TODO: worldspace is almost certainly incorrect: use scene or object? + // TODO(pld): worldspace is almost certainly incorrect: use scene or object? waveform = tex2Dlod(_FFTTex, float4(fmod(corner_WS.x * _WaveformFreq + _BeatOutputAccum.z*.5,1),0,0,0) ).b * .25; dispVec.xyz += waveform * _WaveformIntensity.xyz; corner = corner + dispVec; @@ -106,11 +104,7 @@ Category { c.rgb += c.rgb * c.a * _EmissionGain; c.a = 1; c = SrgbToNative(c); - c = float4(c.rgb, 1.0); -#if SELECTION_ON - c.rgb = GetSelectionColor() * tex.r; -#endif - return c; + return float4(c.rgb, 1.0); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader.meta index c86a4906..228f6823 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 732f16cce31764a49a67b2c782bf444a +timeCreated: 1467773228 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset deleted file mode 100644 index 5af6ca8d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Dots_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 6a1cf9f9-032c-45ec-9b1d-a6680bee30f7 - m_DurableName: Dots - m_Material: {fileID: 2100000, guid: 6a1cf9f9032c45ec9b1da6680bee30f7, type: 2} - m_IsParticle: 1 - m_uv0Size: 4 - m_uv0Semantic: 5 - m_uv1Size: 3 - m_uv1Semantic: 1 - m_bUseNormals: 1 - m_normalSemantic: 1 - m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset.meta deleted file mode 100644 index 70b24c7f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e43bb1c4b2255c141a10b5aff3a4c521 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat deleted file mode 100644 index 1bfc8fd4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat +++ /dev/null @@ -1,84 +0,0 @@ -%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: Dots_16 - m_Shader: {fileID: 4800000, guid: 732f16cce31764a49a67b2c782bf444a, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: f54d138cbc195f142a9994593db7876a, 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: - - _BaseGain: 0.4 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EmissionGain: 300 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.078125 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _WaveformFreq: 0.1 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} - - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat.meta deleted file mode 100644 index 39faa8a7..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/Dots_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5cb1c5fc336ff8c468c03b5f00c3db64 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/maintexture.png.meta index 6c70d3dc..70f58201 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Dots/maintexture.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: f54d138cbc195f142a9994593db7876a +timeCreated: 1467773228 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,39 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: 1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: 5 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta deleted file mode 100644 index 7683bd4b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9b79b104f5d077248ace6fa64abc6f00 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset deleted file mode 100644 index 8fd857f0..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: DoubleFlat_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: f4a0550c-332a-4e1a-9793-b71508f4a454 - m_DurableName: DoubleFlat - m_Material: {fileID: 2100000, guid: f4a0550c332a4e1a9793b71508f4a454, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta deleted file mode 100644 index 8a558b02..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 091ec3bb464eb8c59b355450492173d5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat deleted file mode 100644 index 711fb933..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat +++ /dev/null @@ -1,77 +0,0 @@ -%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: DoubleFlat_16 - m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 7c22e3178fa6e2d49a7c323bd3001eff, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta deleted file mode 100644 index 45a0c9ba..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f4a0550c332a4e1a9793b71508f4a454 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader index 76c8be69..0616a8e1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -25,11 +25,7 @@ SubShader { #pragma surface surf Lambert vertex:vert addshadow #pragma target 3.0 #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON - // Faster compiles - #pragma skip_variants INSTANCING_ON #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" fixed4 _Color; @@ -39,9 +35,8 @@ SubShader { float3 normal : NORMAL; float4 tangent : TANGENT; float2 texcoord0 : TEXCOORD0; - float3 texcoord1 : TEXCOORD1; + float4 texcoord1 : TEXCOORD1; float4 texcoord2 : TEXCOORD2; - UNITY_VERTEX_INPUT_INSTANCE_ID }; @@ -69,7 +64,6 @@ SubShader { fixed4 c = _Color; o.Normal = float3(0,0,IN.vface); o.Albedo = c.rgb * IN.color.rgb; - SURF_FRAG_MOBILESELECT(o); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader.meta index d2464660..eebfbecb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DiffuseNoTextureDoubleSided.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 4496a9baf3f2fc446bbaff38336003df +timeCreated: 1467133606 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset index c6732585..847ec117 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset.meta index a58b229d..2e3342c9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: f4ed52160dfaf694ea666a6294e38f42 +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat index 5f29ea16..294b3f61 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: DoubleTaperedFlat m_Shader: {fileID: 4800000, guid: 4496a9baf3f2fc446bbaff38336003df, type: 3} - m_ShaderKeywords: SELECTION_EDGING + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -37,7 +36,6 @@ Material: - _Scroll1: 20 - _Scroll2: 50 - _Scroll3: 0.05 - - _SelectionEdging: 1 - _UVTile1: 1 - _UVTile2: 1 - _UVTile3: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat.meta index 3bbc1a87..21153792 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 0d3889f33ede470c8af4f44813306126 +timeCreated: 1481917485 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset deleted file mode 100644 index 82e681bc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: DoubleTaperedFlat_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 0d3889f3-3ede-470c-8af4-f44813306126 - m_DurableName: DoubleTaperedFlat - m_Material: {fileID: 2100000, guid: 0d3889f33ede470c8af4f44813306126, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 3 - m_uv1Semantic: 2 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset.meta deleted file mode 100644 index 1bd2273a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 65433607e003d134eaa467eabd2f003e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat deleted file mode 100644 index eb663a7d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat +++ /dev/null @@ -1,49 +0,0 @@ -%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: DoubleTaperedFlat_16 - m_Shader: {fileID: 4800000, guid: 4496a9baf3f2fc446bbaff38336003df, type: 3} - m_ShaderKeywords: SELECTION_EDGING - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 0.1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 0.5, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _DisplacementIntensity: 0.2 - - _EmissionGain: 0.5 - - _EmissionScroll1: 15 - - _EmissionScroll2: -10 - - _InvFade: 1 - - _Scroll1: 20 - - _Scroll2: 50 - - _Scroll3: 0.05 - - _SelectionEdging: 1 - - _UVTile1: 1 - - _UVTile2: 1 - - _UVTile3: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat.meta deleted file mode 100644 index 03b2a1fd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedFlat/DoubleTaperedFlat_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a92ed282c42137640a0350a6d839054a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset index df2f1460..b8727025 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset.meta index b7d37466..7d5857e0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: c2b9f7e0f4fb54b41b7dbeb23b117551 +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat index 6f88d1be..52219d45 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: DoubleTaperedMarker m_Shader: {fileID: 4800000, guid: e412fb1c98a347b4ab08429cbf1d0894, type: 3} m_ShaderKeywords: @@ -36,7 +35,6 @@ Material: - _Scroll1: 20 - _Scroll2: 50 - _Scroll3: 0.05 - - _SelectAmplifyEdges: 1 - _UVTile1: 1 - _UVTile2: 1 - _UVTile3: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat.meta index c854c061..17d9f29e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 0d3889f33ede470c8af4de4813306126 +timeCreated: 1481917483 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader index 0e67629f..0edd6b27 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -30,11 +30,9 @@ Category { #pragma multi_compile_particles #pragma multi_compile_fog #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -46,7 +44,7 @@ Category { }; struct v2f { - float4 pos : POSITION; + float4 vertex : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; UNITY_FOG_COORDS(1) @@ -56,26 +54,26 @@ Category { { // - // XXX - THIS SHADER SHOULD BE DELETED AFTER TAPERING IS DONE IN THE GEOMETRY GENERATION + // XXX - THIS SHADER SHOULD BE DELETED AFTER WE TAPERING IS DONE IN THE GEOMETRY GENERATION // v2f o; float envelope = sin(v.texcoord0.x * 3.14159); float widthMultiplier = 1 - envelope; v.vertex.xyz += -v.texcoord1 * widthMultiplier; - o.pos = UnityObjectToClipPos(v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.color = TbVertToNative(v.color); o.texcoord = v.texcoord0; - UNITY_TRANSFER_FOG(o, o.pos); + UNITY_TRANSFER_FOG(o, o.vertex); return o; } - fixed4 frag (v2f i) : COLOR + fixed4 frag (v2f i) : SV_Target { + UNITY_APPLY_FOG(i.fogCoord, i.color.rgb); - float4 color = float4(i.color.rgb, 1); - FRAG_MOBILESELECT(color) - return color; + return float4(i.color.rgb, 1); + } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader.meta index 31b29d6b..ffc9fd82 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: e412fb1c98a347b4ab08429cbf1d0894 +timeCreated: 1466535959 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset deleted file mode 100644 index f76ed376..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: DoubleTaperedMarker_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 0d3889f3-3ede-470c-8af4-de4813306126 - m_DurableName: DoubleTaperedMarker - m_Material: {fileID: 2100000, guid: 0d3889f33ede470c8af4de4813306126, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 3 - m_uv1Semantic: 2 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset.meta deleted file mode 100644 index faf12dbd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 33912e297edc2234daead69ef39cf936 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat deleted file mode 100644 index ac8fa7b4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat +++ /dev/null @@ -1,48 +0,0 @@ -%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: DoubleTaperedMarker_16 - m_Shader: {fileID: 4800000, guid: e412fb1c98a347b4ab08429cbf1d0894, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 0.1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 0.5, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _DisplacementIntensity: 0.2 - - _EmissionGain: 0.5 - - _EmissionScroll1: 15 - - _EmissionScroll2: -10 - - _InvFade: 1 - - _Scroll1: 20 - - _Scroll2: 50 - - _Scroll3: 0.05 - - _SelectAmplifyEdges: 1 - - _UVTile1: 1 - - _UVTile2: 1 - - _UVTile3: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat.meta deleted file mode 100644 index 07caa8c2..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleTaperedMarker/DoubleTaperedMarker_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 17b4808f70082264fa86e2d013398980 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta deleted file mode 100644 index 0edd65c6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 206b124be661f3146841d8a39e00524f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset deleted file mode 100644 index 66894e57..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Drafting_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 492b36ff-b337-436a-ba5f-1e87ee86747e - m_DurableName: Drafting - m_Material: {fileID: 2100000, guid: 492b36ffb337436aba5f1e87ee86747e, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta deleted file mode 100644 index 55760cc8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0afc2cbbd5388dd5c9edea230b9878f6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat deleted file mode 100644 index 3d10bda7..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat +++ /dev/null @@ -1,34 +0,0 @@ -%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: Drafting_16 - m_Shader: {fileID: 4800000, guid: b8dd2d296c760ad4dba8f0d9ec26d921, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 95c96bad81d7efa45b4fa690f0b520c3, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _InvFade: 1 - - _Visibility01: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta deleted file mode 100644 index 85623c97..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 492b36ffb337436aba5f1e87ee86747e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta deleted file mode 100644 index 38f1b06b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ef4e935153c6cbb4bab61f3d11d52871 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset deleted file mode 100644 index 50f81953..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: _16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 725f4c6a-6427-6524-29ab-da371924adab - m_DurableName: - m_Material: {fileID: 2100000, guid: 725f4c6a6427652429abda371924adab, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta deleted file mode 100644 index 38925b54..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ca487b7672ab3a452ac3e54a6b4438e9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat deleted file mode 100644 index 21475d3c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: _16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 3d0bfa733a1992c4484952a4e71fc67f, type: 3} - 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: 576a5ce02d271ad46a5c2c0d90fd9543, 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.2 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.05 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta deleted file mode 100644 index 2b5220cf..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 725f4c6a6427652429abda371924adab -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset index 19e02efc..a399ff10 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset.meta index 6bf74d20..d95f10d3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 1087726a0694716539a6894556a3a557 +timeCreated: 1529443745 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat index eaa57d03..95b26aee 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: DuctTape_15 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.414 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat.meta index 1199ae8c..b7a3ceba 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d0262945853c44819cbd88586bed93cb +timeCreated: 1496877848 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset deleted file mode 100644 index 6593dd5d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: DuctTape_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: d0262945-853c-4481-9cbd-88586bed93cb - m_DurableName: DuctTape - m_Material: {fileID: 2100000, guid: d0262945853c44819cbd88586bed93cb, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset.meta deleted file mode 100644 index fc26d833..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 00d3fab5731a7e449b1bd525c88629b7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat deleted file mode 100644 index 45cd9dbc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: DuctTape_16 - m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3} - 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: 1819abb411411e243b701e7dd664ac9a, 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.2 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.414 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat.meta deleted file mode 100644 index 475082ca..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/DuctTape_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9916b54fff7366a4a96a67a78f5ad366 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/main.png.meta index c7e70f6a..0b0f6c47 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/main.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 1819abb411411e243b701e7dd664ac9a +timeCreated: 1442276315 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 512 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -100 - wrapU: 0 - wrapV: 0 - wrapW: 0 + mipBias: -1 + wrapMode: 0 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/normal.png.meta index cc5682a9..f9a7a319 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTape/normal.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 23192df5929e8904ba29a31ec2c68e46 +timeCreated: 1442278035 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 1 externalNormalMap: 1 - heightScale: 0.011 + heightScale: .0109999999 normalMapFilter: 1 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 512 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -100 - wrapU: 0 - wrapV: 0 - wrapW: 0 + mipBias: -1 + wrapMode: 0 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 textureType: 1 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta deleted file mode 100644 index d0f65ab0..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 57927278325276f4c9a831c4eecafab2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset deleted file mode 100644 index 93499a44..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: _16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 84d5bbb2-6634-8434-f8a7-681b576b4664 - m_DurableName: - m_Material: {fileID: 2100000, guid: 84d5bbb266348434f8a7681b576b4664, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta deleted file mode 100644 index 6967c46d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 78a794d54b7adc55c8069dac327af9b5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat deleted file mode 100644 index 7f0a1156..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: _16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3} - 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: 1819abb411411e243b701e7dd664ac9a, 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.2 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.414 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta deleted file mode 100644 index f6e9331d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 84d5bbb266348434f8a7681b576b4664 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset index 18a6c83f..0bb625a3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset.meta index 96436ed4..f195f597 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 6d014762200f4014fa8a87bcfaa038fe +timeCreated: 1529443745 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat index 303c8be4..df9ab1cd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: DuctTape_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.414 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat.meta index e1a09546..6253746e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 3ca16e2fbdcd4da28631dcef342f40f1 +timeCreated: 1496877848 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset deleted file mode 100644 index 13fd09e8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: DuctTape_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 3ca16e2f-bdcd-4da2-8631-dcef342f40f1 - m_DurableName: DuctTape - m_Material: {fileID: 2100000, guid: 3ca16e2fbdcd4da28631dcef342f40f1, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset.meta deleted file mode 100644 index 69b6ec14..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: edcdd7f6ba80d6f4a9814acfe5be99d7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat deleted file mode 100644 index fc0c00a1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: DuctTape_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3} - 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: 1819abb411411e243b701e7dd664ac9a, 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.2 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.414 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat.meta deleted file mode 100644 index eae951a0..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeSingleSided/DuctTape_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7b32d0f1504bce346975433df2b7a7c1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset index ec9c4113..4c2036f4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset.meta index c35ff07f..eb802825 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 6e268406bbadd084a825dda73d24387a +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat index a9187042..bb32a66a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Electricity m_Shader: {fileID: 4800000, guid: 698f6f8dc012a8b4e9d6f36db04f0dd3, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat.meta index b5ad4aff..89f52998 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: f6e85de36dcc4e7f87fdcee8c3d25d51 +timeCreated: 1481917490 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader index 01b189c0..d4266f6c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -20,17 +20,9 @@ Properties { } CGINCLUDE - #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" - - #ifdef SHADER_API_D3D11 - # define SHARP_AND_BLOOMY 1 - #else - # define SHARP_AND_BLOOMY 0 - #endif struct appdata_t { float4 vertex : POSITION; @@ -46,7 +38,7 @@ CGINCLUDE half _EmissionGain; struct v2f { - float4 vertex : POSITION; + float4 vertex : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -91,30 +83,16 @@ CGINCLUDE disp.y += waveform * .1; v.color = v.color*.5 + v.color*_BeatOutput.z*.5; #endif - - // Slightly thicken the line on mobile to accommodate the softer interior line. This reduces artifacts - // from the low resolution. -#if SHARP_AND_BLOOMY - float widthScale = 1.0; -#else - float widthScale = 1.6; -#endif - // This recreates the standard ribbon position with some tapering at edges - v.vertex.xyz = midpointPos_CS + offsetFromMiddleToEdge_CS * envelopePow * widthScale; + v.vertex.xyz = midpointPos_CS + offsetFromMiddleToEdge_CS * envelopePow; // This adds curl noise v.vertex.xyz += disp * _DisplacementIntensity * envelopePow; o.vertex = UnityObjectToClipPos(v.vertex); - // TODO(b/123094204) bloom is turned off on mobile as it completely broke the shader - // for still-unknown reasons. -#if SHARP_AND_BLOOMY o.color = bloomColor(v.color, _EmissionGain); -#else - o.color = v.color; -#endif o.texcoord = v.texcoord0; + return o; } @@ -134,32 +112,15 @@ CGINCLUDE } // Input color is srgb - fixed4 frag (v2f i) : COLOR + fixed4 frag (v2f i) : SV_Target { // interior procedural line -#if SHARP_AND_BLOOMY - // Step function: 3 in [.4, .6], 1 elsewhere - float procedural = ( abs(i.texcoord.y - 0.5) < .1 ) ? 3 : 1; -#else - // The lack of AA and low resolution on mobile is really visible, so instead use a - // softer interior line. This has a lot more brightness, so it's good that the - // vertex color isn't also blown out. - - float edginess = ( abs(i.texcoord.y - 0.5) * 2.0 ); // in [0, 1] - // Smooth ramp from 2 in the middle to 1 on the edge - float procedural = lerp(2.0, 1.0, edginess); -#endif - - // Ignore incoming i.color.a -#if SELECTION_ON - float3 unencoded = GetSelectionColor() * (0.5 * procedural); -#else - float3 unencoded = i.color.rgb * (procedural * procedural); -#endif - - // It doesn't matter which of these is first since they can't both be active at the same time; - // but only one ordering will compile because of the return types. - return SrgbToNative(float4(unencoded), 1.0); + float procedural = ( abs(i.texcoord.y - 0.5) < .1 ) ? 2 : 0; + i.color.a = 1; // kill any other alpha values that may come into this brush + float4 c = i.color + i.color * procedural; + c = float4(c.rgb * c.a, 1.0); + c = SrgbToNative(c); + return c; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader.meta index cf6814e4..bf85e6af 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 698f6f8dc012a8b4e9d6f36db04f0dd3 +timeCreated: 1466532907 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset deleted file mode 100644 index 4d5b8808..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Electricity_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: f6e85de3-6dcc-4e7f-87fd-cee8c3d25d51 - m_DurableName: Electricity - m_Material: {fileID: 2100000, guid: f6e85de36dcc4e7f87fdcee8c3d25d51, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 3 - m_uv1Semantic: 2 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset.meta deleted file mode 100644 index 32410089..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 93ec1af6c3122d04cb342c379dc2dd64 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat deleted file mode 100644 index 76f6015b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat +++ /dev/null @@ -1,47 +0,0 @@ -%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: Electricity_16 - m_Shader: {fileID: 4800000, guid: 698f6f8dc012a8b4e9d6f36db04f0dd3, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 0.1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 8036ea6d636847a429e2def5bf99ffe0, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _DisplacementIntensity: 2 - - _EmissionGain: 0.2 - - _EmissionScroll1: 15 - - _EmissionScroll2: -10 - - _InvFade: 1 - - _Scroll1: 20 - - _Scroll2: 50 - - _Scroll3: 0.05 - - _UVTile1: 1 - - _UVTile2: 1 - - _UVTile3: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat.meta deleted file mode 100644 index d61cc737..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Electricity/Electricity_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1fdc5d3156b0985449ff13686c7f81ca -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset index a433ee88..fc883299 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset.meta index 02d433ea..d4d820ef 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 9f45a29bbed9af6479948c03267fe239 +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat index a85f2692..c914f77c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Embers m_Shader: {fileID: 4800000, guid: f62b84c7d6bc5f24487edcd3a458ce88, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat.meta index 68b3bf4a..9d57c6aa 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 02ffb8667fb24d15b7611012cefb1360 +timeCreated: 1495148303 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader index 3dca8127..df69491b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -39,14 +39,12 @@ Category { #pragma multi_compile_particles #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #pragma target 3.0 #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "../../../Shaders/Include/Particles.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; @@ -71,31 +69,21 @@ Category { // t01 is a time value in [0, 1] float3 ComputeDisplacement(float3 pos, float seed, float t01) { float t2 = _Time.y; - float floatUpTime01 = t01; - -#if SELECTION_ON - t01 = 0; - t2 = 0; -#endif // Animate the motion of the embers // Accumulate all displacement into a common, pre-transformed space. float4 dispVec = float4(_ScrollDistance, 0.0) * t01; dispVec.x += sin(t01 * _ScrollJitterFrequency + seed * 100 + t2 + pos.z) * _ScrollJitterIntensity; - dispVec.y += (fmod(seed * 100, 1) - 0.5) * _ScrollDistance.y * floatUpTime01; + dispVec.y += (fmod(seed * 100, 1) - 0.5) * _ScrollDistance.y * t01; dispVec.z += cos(t01 * _ScrollJitterFrequency + seed * 100 + t2 + pos.x) * _ScrollJitterIntensity; #ifdef AUDIO_REACTIVE float fft = (tex2Dlod(_FFTTex, float4(pos.y,0,0,0)).b)*2 + .1; dispVec.y += fft; #endif - -#if SELECTION_ON - dispVec.y = abs(dispVec.y * 0.2); - dispVec *= 0.5; -#endif - return dispVec * kDecimetersToWorldUnits; + // Allow scaling to affect particle speed and distance in toolkit + return dispVec * kDecimetersToWorldUnits * length(unity_ObjectToWorld[0].xyz); } v2f vert (ParticleVertexWithSpread_t v) { @@ -138,6 +126,7 @@ Category { float4 corner_WS = OrientParticle_WS(center_WS.xyz, halfSize, v.vid, rotation); o.vertex = mul(UNITY_MATRIX_VP, corner_WS); #else + // TODO(pld): convince drew to use this version // Displacement is in canvas space // Note that we assume object space == canvas space (which it is, for TB) center = center + float4(disp.xyz, 0); @@ -147,19 +136,16 @@ Category { o.color = v.color; o.texcoord = TRANSFORM_TEX(v.texcoord.xy,_MainTex); + return o; } // i.color is srgb fixed4 frag (v2f i) : SV_Target { - float4 texCol = tex2D(_MainTex, i.texcoord); - float4 color = 2.0f * i.color * _TintColor * texCol; + float4 color = 2.0f * i.color * _TintColor * tex2D(_MainTex, i.texcoord); color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); -#if SELECTION_ON - color.rgb = GetSelectionColor() * texCol.a; -#endif return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader.meta index 43e8c873..20ded7bf 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: f62b84c7d6bc5f24487edcd3a458ce88 +timeCreated: 1467773228 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset deleted file mode 100644 index c560fde4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Embers_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 02ffb866-7fb2-4d15-b761-1012cefb1360 - m_DurableName: Embers - m_Material: {fileID: 2100000, guid: 02ffb8667fb24d15b7611012cefb1360, type: 2} - m_IsParticle: 1 - m_uv0Size: 4 - m_uv0Semantic: 5 - m_uv1Size: 3 - m_uv1Semantic: 1 - m_bUseNormals: 1 - m_normalSemantic: 1 - m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset.meta deleted file mode 100644 index d2cf311a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 980867b687111b64d84af77dcff37963 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat deleted file mode 100644 index f45c00bd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat +++ /dev/null @@ -1,90 +0,0 @@ -%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: Embers_16 - m_Shader: {fileID: 4800000, guid: f62b84c7d6bc5f24487edcd3a458ce88, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: b7d6447f2b229224fadf587c59f88775, 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: - - _BaseGain: 0.4 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EmissionGain: 300 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ScrollJitterFrequency: 5 - - _ScrollJitterIntensity: 0.3 - - _ScrollRate: 0.6 - - _Shininess: 0.078125 - - _SmoothnessTextureChannel: 0 - - _SparkleRate: 2.5 - - _SpecularHighlights: 1 - - _SpreadSize: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _WaveformFreq: 0.1 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _ScrollDistance: {r: 2, g: 6, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} - - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat.meta deleted file mode 100644 index 91dc480b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/Embers_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9ad90888a38f27c4980540e491c48164 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Embers/maintexture.png index 8075e75e04db7107312660568d7ecff7c12cec38..03a994c359868304dc8833a279b19cfdb618204d 100644 GIT binary patch literal 21353 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 JDl{F={TKBx+CBgP literal 8219 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 40 centroid float2 texcoord : TEXCOORD0; @@ -81,7 +79,7 @@ Category { v2f o; o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); o.color = bloomColor(v.color, _EmissionGain); - o.pos = UnityObjectToClipPos(v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.worldPos = mul(unity_ObjectToWorld, v.vertex); return o; } @@ -110,19 +108,16 @@ Category { //procedural_line = pow(procedural_line, i.texcoord.x* 10); #else - displacement = tex2D(_MainTex, i.texcoord + half2(-_Time.x * _Scroll1, 0) ).a; + displacement = tex2D(_MainTex, i.texcoord + half2(-_Time.x * _Scroll1, 0) ).a; #endif - half4 tex = tex2D(_MainTex, i.texcoord + half2(-_Time.x * _Scroll2, 0) - displacement * _DisplacementIntensity); - tex.xyz *= step(0.01, tex.xyz); - + half4 tex = tex2D(_MainTex, i.texcoord + half2(-_Time.x * _Scroll2, 0) - displacement * _DisplacementIntensity); #ifdef AUDIO_REACTIVE tex = tex * .5 + 2 * procedural_line * ( envelope * envelopeHalf); #endif float4 color = i.color * tex; color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); - FRAG_MOBILESELECT(color) return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader.meta index 31e1f4ac..f0beb7d0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire.shader.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 guid: aed6c5abd15318e448cc6f01d2ac0dd1 ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset deleted file mode 100644 index 93a69bc6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Fire_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: cb92b597-94ca-4255-b017-0e3f42f12f9e - m_DurableName: Fire - m_Material: {fileID: 2100000, guid: cb92b59794ca4255b0170e3f42f12f9e, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset.meta deleted file mode 100644 index 35fcbcbf..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 124ef0e473e7c4748b73c65209b43ace -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat deleted file mode 100644 index e1a6e9c6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat +++ /dev/null @@ -1,37 +0,0 @@ -%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: Fire_16 - m_Shader: {fileID: 4800000, guid: aed6c5abd15318e448cc6f01d2ac0dd1, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 7fd085260938914449a4cdca9398e8d1, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _DisplacementIntensity: 0.1 - - _EmissionGain: 0.5 - - _InvFade: 1 - - _Scroll1: 20 - - _Scroll2: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat.meta deleted file mode 100644 index e08cc447..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/Fire_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d2bb539dcdc15cd468d39a419770d923 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/fire.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/fire.png.meta index 4a711f0d..d2caacf9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/fire.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire/fire.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 7fd085260938914449a4cdca9398e8d1 +timeCreated: 1440714590 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,39 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 3 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: 5 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta deleted file mode 100644 index 032aae34..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 78241a9546dbb6b4fa1e8ba8f2e079fd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset deleted file mode 100644 index 9eeb09b9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Fire2_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 53d753ef-083c-45e1-98e7-4459b4471219 - m_DurableName: Fire2 - m_Material: {fileID: 2100000, guid: 53d753ef083c45e198e74459b4471219, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta deleted file mode 100644 index 982d8613..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 026e014eee7f6bf5c8e1787b57ebaefc -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat deleted file mode 100644 index cfadd867..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat +++ /dev/null @@ -1,47 +0,0 @@ -%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: Fire2_16 - m_Shader: {fileID: 4800000, guid: fb1ab3f9ab465f54eb58155e74965fd3, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _DisplaceTex: - m_Texture: {fileID: 2800000, guid: 81848e33c61a3044488261d77f876538, type: 3} - m_Scale: {x: 2.45, y: 1} - m_Offset: {x: 0, y: 0} - - _DisplaceTex2: - m_Texture: {fileID: 2800000, guid: 40f5f7fe2711abc49996d6c0b10f65eb, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 3e1013826bb3a0c458492e9d6bede944, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _DisplacementIntensity: 0.04 - - _EmissionGain: 0.405 - - _FlameFadeMax: 30 - - _FlameFadeMin: 8.53 - - _InvFade: 1 - - _Scroll1: 15 - - _Scroll2: 8 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta deleted file mode 100644 index d71c0dab..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 53d753ef083c45e198e74459b4471219 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset index 77e32d16..5e3d5021 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset.meta index 7b976c4a..d1b41bdc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: de779677f45c66b5bb80d8fdc8604238 +timeCreated: 1529443748 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat index 77ab9afc..50a708ca 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Flat_15 m_Shader: {fileID: 4800000, guid: 86ab46f12486fa446b99415e1f4785ca, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat.meta index c364e1c3..9042208c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 2d35bcf0e4d8452c97b13311be063130 +timeCreated: 1496877550 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset deleted file mode 100644 index 78adf2c6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Flat_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 2d35bcf0-e4d8-452c-97b1-3311be063130 - m_DurableName: Flat - m_Material: {fileID: 2100000, guid: 2d35bcf0e4d8452c97b13311be063130, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset.meta deleted file mode 100644 index d85c610c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0de450cbc920f1940b8b8321cc716bfa -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat deleted file mode 100644 index 1436d47e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat +++ /dev/null @@ -1,78 +0,0 @@ -%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: Flat_16 - m_Shader: {fileID: 4800000, guid: 86ab46f12486fa446b99415e1f4785ca, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat.meta deleted file mode 100644 index 4659c580..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Flat/Flat_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 121e942829f7f734bbd2015d15dc508d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset index 4ee52b64..a63b41a6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset.meta index 447076e9..35c9d084 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 969b71c814f75e9408602593d4e10e3e +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat index 525e99bd..d557358e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: FlatDeprecated m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat.meta index b1b9956c..a715b878 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 55303bc4c7494a7298d9d23e68e76e18 +timeCreated: 1481917494 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset deleted file mode 100644 index f6eee813..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: FlatDeprecated_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 55303bc4-c749-4a72-98d9-d23e68e76e18 - m_DurableName: FlatDeprecated - m_Material: {fileID: 2100000, guid: 55303bc4c7494a7298d9d23e68e76e18, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset.meta deleted file mode 100644 index cba0e169..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 48988924b98c9d94183824f4f58e12a7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat deleted file mode 100644 index e098bbde..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat +++ /dev/null @@ -1,77 +0,0 @@ -%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: FlatDeprecated_16 - m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat.meta deleted file mode 100644 index 228bd746..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatDeprecated/FlatDeprecated_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cc0144a19a6931341a74641d79c3bd59 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset index 94fa7c1f..ce6590cd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset.meta index 364fe17f..f823c6e4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: a97674f9669261b48a61cfed32378345 +timeCreated: 1529443749 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat index 56401ffc..2e673525 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Flat_0 m_Shader: {fileID: 4800000, guid: fc163d24473ddd04881e4fc188ed5802, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat.meta index b3fcc733..33b478fe 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 280c0a7aaad8416ca7d2df63d129ca70 +timeCreated: 1496877550 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset deleted file mode 100644 index a456e454..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Flat_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 280c0a7a-aad8-416c-a7d2-df63d129ca70 - m_DurableName: Flat - m_Material: {fileID: 2100000, guid: 280c0a7aaad8416ca7d2df63d129ca70, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset.meta deleted file mode 100644 index 2b74d1fe..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4af48b7f339a4ca4e9f1c9a7658aebcd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat deleted file mode 100644 index 41a65a1e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat +++ /dev/null @@ -1,77 +0,0 @@ -%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: Flat_16 - m_Shader: {fileID: 4800000, guid: fc163d24473ddd04881e4fc188ed5802, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat.meta deleted file mode 100644 index baed3eb5..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FlatSingleSided/Flat_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b2b4fe4f8cd68db4482658b112edb77c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta deleted file mode 100644 index 60d87cbc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ac17f035faddb8d4191f4be44d737220 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset deleted file mode 100644 index ca3262a6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Gouache_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 1b897b7e-9b76-425a-b031-a867c48df409 - m_DurableName: Gouache - m_Material: {fileID: 2100000, guid: 1b897b7e9b76425ab031a867c48df409, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta deleted file mode 100644 index 245aebeb..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2b04662a6e713b0578030ffa3d74d5dc -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat deleted file mode 100644 index 8964f513..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: Gouache_16 - m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 3a1bfa901a032c94e9a3e4adb6952d0f, type: 3} - 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: 6c1cf6c0ae3c96846946d476a0b86a09, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.01 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta deleted file mode 100644 index 903acafb..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1b897b7e9b76425ab031a867c48df409 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta deleted file mode 100644 index 64742b33..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b68cd706e4e6cc2408ed2ce7a4647021 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset deleted file mode 100644 index 1d001e4e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Gouache_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 4465b5ef-3605-bec4-2b3e-6b04508ddb6b - m_DurableName: Gouache - m_Material: {fileID: 2100000, guid: 4465b5ef3605bec42b3e6b04508ddb6b, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta deleted file mode 100644 index fe5a5de3..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 55d97626500acb15394a5c4604f100cc -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat deleted file mode 100644 index c673aff0..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: Gouache_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 3a1bfa901a032c94e9a3e4adb6952d0f, type: 3} - 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: 6c1cf6c0ae3c96846946d476a0b86a09, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.01 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta deleted file mode 100644 index 16bd56b0..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4465b5ef3605bec42b3e6b04508ddb6b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta deleted file mode 100644 index 6dba8e03..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c2435ebd91affb647b2ccd4c9d56201c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset deleted file mode 100644 index 317dff39..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Guts_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 99aafe96-1645-44cd-99bd-979bc6ef37c5 - m_DurableName: Guts - m_Material: {fileID: 2100000, guid: 99aafe96164544cd99bd979bc6ef37c5, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta deleted file mode 100644 index d03a3b84..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5316e81a637acfe58aa970f605fa1618 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat deleted file mode 100644 index f1ae5823..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat +++ /dev/null @@ -1,83 +0,0 @@ -%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: Guts_16 - m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: _EMISSION _NORMALMAP - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: d03c44c5f6a1b194ea104833f9ba840d, type: 3} - m_Scale: {x: 0.15, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 0.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: 0.1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: ccfef80c6153521489f5745b0d4dffec, type: 3} - m_Scale: {x: 0.15, 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} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.3 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.305 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.743 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.23745675, g: 0.2579406, b: 0.2647059, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta deleted file mode 100644 index 810bd184..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 99aafe96164544cd99bd979bc6ef37c5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader index 6094a664..0c1f54c1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -16,6 +16,7 @@ Shader "Brush/Special/AdditiveCutout" { Properties { _MainTex ("Texture", 2D) = "white" {} _Cutoff ("Alpha cutoff", Range(0,1)) = 0.5 + } Category { @@ -32,10 +33,8 @@ Category { #pragma vertex vert #pragma fragment frag #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; uniform float _Cutoff; @@ -47,7 +46,7 @@ Category { }; struct v2f { - float4 pos : POSITION; + float4 vertex : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -58,22 +57,20 @@ Category { { v2f o; - o.pos = UnityObjectToClipPos(v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); o.color = TbVertToNative(v.color); return o; } - fixed4 frag (v2f i) : COLOR + fixed4 frag (v2f i) : SV_Target { half4 c = tex2D(_MainTex, i.texcoord ); // Cutoff the alpha value based on the incoming vertex alpha i.color.a = (i.color.a * c.a < _Cutoff) ? 0 : 1; - float4 col = i.color * float4(c.rgb,1); - FRAG_MOBILESELECT(col) - return col; + return i.color * float4(c.rgb,1); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader.meta index d2b8adf0..8c773240 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/AdditiveCutout.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: e2d9c195722354e42a5a45e5b73a9f19 +timeCreated: 1449195007 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset index 5c19afda..a757fea4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset.meta index e21cdccf..3a7a1591 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 0cfb52fb947fb6e4786ed9f2bdc5328c +timeCreated: 1495162082 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat index 779883c9..7d6acac7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Highlighter m_Shader: {fileID: 4800000, guid: e2d9c195722354e42a5a45e5b73a9f19, type: 3} - m_ShaderKeywords: SELECTION_EDGING + m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,14 +31,12 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - SelectAmplifyEdges: 1 - _Cutoff: 0.12 - _DisplacementIntensity: 0.1 - _EmissionGain: 0.25 - _InvFade: 1 - _Scroll1: 2 - _Scroll2: -2 - - _SelectionEdging: 1 - _Smoothness: 0.078125 - _Strength: 0.5 m_Colors: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat.meta index 771cc5cc..6575de10 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: cf019139d41c4eb0a1d05cf54b0a42f3 +timeCreated: 1481917484 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset deleted file mode 100644 index c8bd1a35..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Highlighter_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: cf019139-d41c-4eb0-a1d0-5cf54b0a42f3 - m_DurableName: Highlighter - m_Material: {fileID: 2100000, guid: cf019139d41c4eb0a1d05cf54b0a42f3, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset.meta deleted file mode 100644 index c6dcf467..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9707c937e62b19849928a8dc2cd5a6a0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat deleted file mode 100644 index c64b160e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat +++ /dev/null @@ -1,50 +0,0 @@ -%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: Highlighter_16 - m_Shader: {fileID: 4800000, guid: e2d9c195722354e42a5a45e5b73a9f19, type: 3} - m_ShaderKeywords: SELECTION_EDGING - 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} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 2a6e115fa9494f2479d7a5284cbe2d3b, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - SelectAmplifyEdges: 1 - - _Cutoff: 0.12 - - _DisplacementIntensity: 0.1 - - _EmissionGain: 0.25 - - _InvFade: 1 - - _Scroll1: 2 - - _Scroll2: -2 - - _SelectionEdging: 1 - - _Smoothness: 0.078125 - - _Strength: 0.5 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat.meta deleted file mode 100644 index de510e10..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/Highlighter_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bbc9990a3d7b7b9429a62ea359ad65e4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/maintexture.png.meta index cdca3152..7aad0d55 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Highlighter/maintexture.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 2a6e115fa9494f2479d7a5284cbe2d3b +timeCreated: 1440714585 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta deleted file mode 100644 index 2690a88f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f8ee14578eb601843851b75dbe1d50a2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset deleted file mode 100644 index b84d89fd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: HolidayTree_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 20a0bf1a-a96e-44e5-84ac-9823d2d65023 - m_DurableName: HolidayTree - m_Material: {fileID: 2100000, guid: 20a0bf1aa96e44e584ac9823d2d65023, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 0 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta deleted file mode 100644 index 3a118df1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dd353eba365eee252b6e8be44267c191 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat deleted file mode 100644 index da59ca5d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat +++ /dev/null @@ -1,37 +0,0 @@ -%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: HolidayTree_16 - m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Illum: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _EmissionGain: 0.5 - - _EmissionLM: 0 - - _InvFade: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta deleted file mode 100644 index 4dd42b60..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 20a0bf1aa96e44e584ac9823d2d65023 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset index 14caa119..6b6a3cc9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset.meta index 600c37f6..fe47671a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 88ecf340d7ce92a4bada6eac937e887a +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat index 172938b6..71cd184a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: HyperGrid m_Shader: {fileID: 4800000, guid: a2fa29912c23a774898a1b8b236ed79d, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat.meta index 7ede3ac4..600c1a3e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 6a1cf9f9032c45ec9b6ea6680bee32e9 +timeCreated: 1481917492 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader index d75a0304..19474872 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -36,11 +36,9 @@ Category { #pragma glsl #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; @@ -53,7 +51,7 @@ Category { }; struct v2f { - float4 pos : SV_POSITION; + float4 vertex : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -85,7 +83,7 @@ Category { float3 quantPos = ceil(worldPos.xyz * q) / q; worldPos.xyz = quantPos; worldPos = mul(xf_CS, worldPos); - o.pos = mul(UNITY_MATRIX_VP, worldPos); + o.vertex = mul(UNITY_MATRIX_VP, worldPos); o.color = 2 * v.color + v.color.yzxw * _BeatOutput.x; o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); @@ -98,7 +96,6 @@ Category { float4 c = i.color * _TintColor * tex2D(_MainTex, i.texcoord); c = float4(c.rgb * c.a, 1.0); c = SrgbToNative(c); - FRAG_MOBILESELECT(c) return c; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader.meta index 0903860c..7f1f9da4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: a2fa29912c23a774898a1b8b236ed79d +timeCreated: 1467942564 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset deleted file mode 100644 index a1bdd060..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: HyperGrid_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 6a1cf9f9-032c-45ec-9b6e-a6680bee32e9 - m_DurableName: HyperGrid - m_Material: {fileID: 2100000, guid: 6a1cf9f9032c45ec9b6ea6680bee32e9, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 4 - m_uv1Semantic: 2 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset.meta deleted file mode 100644 index 87484f95..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 89666103549d60b4b854b5bbb8d2ee50 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat deleted file mode 100644 index 9c3b656e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat +++ /dev/null @@ -1,39 +0,0 @@ -%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: HyperGrid_16 - m_Shader: {fileID: 4800000, guid: a2fa29912c23a774898a1b8b236ed79d, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: b8757e27137f3ba4da9ad36c95d82bb4, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BaseGain: 0.4 - - _EmissionGain: 1 - - _InvFade: 1 - - _ScrollSpeed: 0 - - _VertexDisplacement: 0 - - _WaveformFreq: 0.2 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} - - _WaveformIntensity: {r: 0, g: 0.3, b: 0, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat.meta deleted file mode 100644 index 0585cefc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/HyperGrid_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2763ab2e38683ba40a0738c5822ce037 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/maintexture.png.meta index 94cb3258..18eebee6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HyperGrid/maintexture.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: b8757e27137f3ba4da9ad36c95d82bb4 +timeCreated: 1467942564 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,38 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: 1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader index a8b13309..2cc25131 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -27,26 +27,11 @@ Properties { LOD 100 CGPROGRAM - #pragma target 4.0 - #pragma surface surf StandardSpecular vertex:vert addshadow + #pragma target 3.0 + #pragma surface surf StandardSpecular vertex:vert alphatest:_Cutoff addshadow #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON - // Faster compiles - #pragma skip_variants INSTANCING_ON #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" - - struct appdata { - float4 vertex : POSITION; - float3 texcoord : TEXCOORD0; - float3 texcoord1 : TEXCOORD1; - float3 texcoord2 : TEXCOORD2; - half3 normal : NORMAL; - fixed4 color : COLOR; - float4 tangent : TANGENT; - UNITY_VERTEX_INPUT_INSTANCE_ID - }; struct Input { float2 uv_MainTex; @@ -60,10 +45,8 @@ Properties { sampler2D _BumpMap; fixed4 _Color; half _Shininess; - fixed _Cutoff; - void vert (inout appdata v, out Input o) { - UNITY_INITIALIZE_OUTPUT(Input, o); + void vert (inout appdata_full v) { v.color = TbVertToSrgb(v.color); float t = 0.0; @@ -105,17 +88,14 @@ Properties { o.Specular = SrgbToNative(_SpecColor * tex).rgb; o.Normal = UnpackNormal(tex2D(_BumpMap, IN.uv_BumpMap)); o.Alpha = tex.a * IN.color.a; - if (o.Alpha < _Cutoff) { - discard; - } - o.Alpha = 1; #ifdef AUDIO_REACTIVE o.Emission = o.Albedo; o.Albedo = .2; o.Specular *= .5; #endif - SURF_FRAG_MOBILESELECT(o); + o.Normal.z *= IN.vface; + } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader.meta index 4625779b..4f654260 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorDoubleSided.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 9a1f8894d4b051a43a120f0b237cd2f8 +timeCreated: 1443582864 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader index 7389bfe8..c2985329 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader.meta index 8e5c9258..95d45aab 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/HypercolorSingleSided.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: ea5570411cfab2d4b9b3f053e5497f0a +timeCreated: 1443582864 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset index 03ec13f5..ac8b69e8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset.meta index 2ab28a62..91d77851 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: b22741da3567d9353a0ccc88393d8c8e +timeCreated: 1529443751 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat index d035e10c..30b1289c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Hypercolor_15 m_Shader: {fileID: 4800000, guid: 9a1f8894d4b051a43a120f0b237cd2f8, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat.meta index d8bc54a0..752ee998 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: dce872c27b494684b59bc45387949c5c +timeCreated: 1443583622 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset deleted file mode 100644 index 44055ddd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Hypercolor_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: dce872c2-7b49-4684-b59b-c45387949c5c - m_DurableName: Hypercolor - m_Material: {fileID: 2100000, guid: dce872c27b494684b59bc45387949c5c, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset.meta deleted file mode 100644 index 0ff4c84c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a455d846f69efbd4da961d2a0cd90bd9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat deleted file mode 100644 index 94ffc3dc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat +++ /dev/null @@ -1,46 +0,0 @@ -%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: Hypercolor_16 - m_Shader: {fileID: 4800000, guid: 9a1f8894d4b051a43a120f0b237cd2f8, 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: 2800000, guid: 7c4d1ee0e90a536468404363fb2bef1d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: df7c592ef1f278543b4de38471df9994, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _DisplacementIntensity: 0.1 - - _EmissionGain: 0.5 - - _EmissionScroll1: 0 - - _EmissionScroll2: 0 - - _InvFade: 1 - - _Scroll1: 20 - - _Scroll2: 0 - - _Shininess: 0.5 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _SpecColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 1} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat.meta deleted file mode 100644 index 3f57f626..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/Hypercolor_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 61f5c55851cf5ed419b7fa2936f1daa4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/main.png.meta index 0cde5688..85f7e2bd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/main.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: df7c592ef1f278543b4de38471df9994 +timeCreated: 1442276315 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,39 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: 1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: 5 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/normal.png.meta index 0180b9c0..ce1c9e6d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Hypercolor/normal.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 7c4d1ee0e90a536468404363fb2bef1d +timeCreated: 1443584492 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 1 externalNormalMap: 1 - heightScale: 0.066 + heightScale: .0659999996 normalMapFilter: 1 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 textureType: 1 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset index ca5b9734..196ca3f7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset.meta index fea29614..724280cf 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 3251442494b7f6c43aa51c2ede6c409e +timeCreated: 1529443752 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat index d348feea..221c7ffe 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Hypercolor_0 m_Shader: {fileID: 4800000, guid: ea5570411cfab2d4b9b3f053e5497f0a, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat.meta index 00730f4b..dafc35ac 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: e8ef32b1baa8460a9c2c9cf8506794f5 +timeCreated: 1443583622 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset deleted file mode 100644 index fa3010f9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Hypercolor_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: e8ef32b1-baa8-460a-9c2c-9cf8506794f5 - m_DurableName: Hypercolor - m_Material: {fileID: 2100000, guid: e8ef32b1baa8460a9c2c9cf8506794f5, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset.meta deleted file mode 100644 index fd41c691..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9642984e79fd55b43ab26d97ce89ca0d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat deleted file mode 100644 index 11df1b08..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat +++ /dev/null @@ -1,46 +0,0 @@ -%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: Hypercolor_16 - m_Shader: {fileID: 4800000, guid: ea5570411cfab2d4b9b3f053e5497f0a, 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: 2800000, guid: 7c4d1ee0e90a536468404363fb2bef1d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: df7c592ef1f278543b4de38471df9994, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _DisplacementIntensity: 0.1 - - _EmissionGain: 0.5 - - _EmissionScroll1: 0 - - _EmissionScroll2: 0 - - _InvFade: 1 - - _Scroll1: 20 - - _Scroll2: 0 - - _Shininess: 0.5 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _SpecColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 1} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat.meta deleted file mode 100644 index bf1d1f10..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HypercolorSingleSided/Hypercolor_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8e9ed8655025ad646814db8ec882fe92 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset index 31e9d409..dc7e0b85 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -17,8 +16,8 @@ MonoBehaviour: m_DurableName: Icing m_Material: {fileID: 2100000, guid: 2f212815f4d3c1a4681afeeaf9c6dc37, type: 2} m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 + m_uv0Size: 2 + m_uv0Semantic: 5 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset.meta index b0ef955f..a22dad81 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 4fcc165667ef68c5780910cc28494a38 +timeCreated: 1529443753 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat index 6a8e0d02..3efb8401 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Icing_16 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat.meta index e3bb9115..03b582fb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/Icing_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 2f212815f4d3c1a4681afeeaf9c6dc37 +timeCreated: 1496358003 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/normal.png.meta index 8415c719..518e0880 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Icing/normal.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 5130495e7534a264da464eec3b7c43d2 +timeCreated: 1496279801 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,39 @@ TextureImporter: heightScale: 0.02 normalMapFilter: 1 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 1 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset index fb976418..26a69d0d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset.meta index 1e9ff05e..679c3a6c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: f83c05f7491995a53af9be352980ef25 +timeCreated: 1529443754 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat index 015493b0..4d069180 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Ink_15 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat.meta index b5601fac..c1df8fd7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: f5c336cf51084b40ade9c687504385ab +timeCreated: 1496877187 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset deleted file mode 100644 index da76b567..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Ink_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: f5c336cf-5108-4b40-ade9-c687504385ab - m_DurableName: Ink - m_Material: {fileID: 2100000, guid: f5c336cf51084b40ade9c687504385ab, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset.meta deleted file mode 100644 index ebb45f64..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c0a85870efa4ab545ac3bd845b0f53b7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat deleted file mode 100644 index b37ac78c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: Ink_16 - m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3} - 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: 31a0dba64c25fa442a02171bc2131ccc, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.4 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat.meta deleted file mode 100644 index 0116eaec..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/Ink_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4aca275abc907af40bec616a3e23dce0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture.png.meta index e9ca4ab8..e493f8a3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 31a0dba64c25fa442a02171bc2131ccc +timeCreated: 1440714585 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture_normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture_normal.png.meta index e25b669f..e84e99bc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture_normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Ink/maintexture_normal.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 599e16957e2a8a84c81e8e72b55312d7 +timeCreated: 1440714587 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 1 externalNormalMap: 1 - heightScale: 0.089 + heightScale: .0890000015 normalMapFilter: 1 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 textureType: 1 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta deleted file mode 100644 index 5f1a5984..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cc6a175fdcdb9144fa0c9407283da447 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset deleted file mode 100644 index 1a5986a1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: _16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 7c972c27-d3c2-8af4-7bf8-5d9db8f0b7bb - m_DurableName: - m_Material: {fileID: 2100000, guid: 7c972c27d3c28af47bf85d9db8f0b7bb, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta deleted file mode 100644 index 66905094..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fd102dbcd22fb8c5a92659c58182d7aa -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat deleted file mode 100644 index ece816f1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: _16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3} - 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: 31a0dba64c25fa442a02171bc2131ccc, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.4 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta deleted file mode 100644 index 0dd2cd1a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7c972c27d3c28af47bf85d9db8f0b7bb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset index f11290f7..0a9c9482 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset.meta index d6e16bcf..0bf8a885 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 6c27caca67a732d4f9d59b028c4dd9a8 +timeCreated: 1529443755 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat index 1a229c31..66d687e2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Ink_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat.meta index 9cfe8d0c..1f975256 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: c00120953ffd40408ee1fc180d346eaa +timeCreated: 1496877187 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset deleted file mode 100644 index 2ee2378d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Ink_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: c0012095-3ffd-4040-8ee1-fc180d346eaa - m_DurableName: Ink - m_Material: {fileID: 2100000, guid: c00120953ffd40408ee1fc180d346eaa, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset.meta deleted file mode 100644 index 9c118fb8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2d801113f2492244ea287404fda275fd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat deleted file mode 100644 index 5ab9551b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: Ink_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3} - 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: 31a0dba64c25fa442a02171bc2131ccc, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.4 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat.meta deleted file mode 100644 index 739990d2..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkSingleSided/Ink_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d9f51eb8d2e128248ae1e9b0091c7af8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta deleted file mode 100644 index 10c893e0..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 493376b5db3b75b438e87799459aa1a2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset deleted file mode 100644 index 1f4945a8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: KeijiroTube_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: f8ba3d18-01fc-4d7b-b2d9-b99d10b8e7cf - m_DurableName: KeijiroTube - m_Material: {fileID: 2100000, guid: f8ba3d1801fc4d7bb2d9b99d10b8e7cf, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta deleted file mode 100644 index e0e21616..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f9e50c54c7ace8a5b88473c447fdbf8e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat deleted file mode 100644 index bd7bbdfb..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: KeijiroTube_16 - m_Shader: {fileID: 4800000, guid: 54cf55a2c62eff1458edd3f1e68d0f0a, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.432 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.75735295, g: 0.75735295, b: 0.75735295, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta deleted file mode 100644 index 4608364d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f8ba3d1801fc4d7bb2d9b99d10b8e7cf -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta deleted file mode 100644 index 8c90dd7e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6b85b1d9f9232be40ad5fc76b828daac -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset deleted file mode 100644 index 0a11484d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Lacewing_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 1cf94f63-f57a-4a1a-ad14-295af4f5ab5c - m_DurableName: Lacewing - m_Material: {fileID: 2100000, guid: 1cf94f63f57a4a1aad14295af4f5ab5c, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta deleted file mode 100644 index 5f6f5d66..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 78b2b9b4f4a66d855b5ff47423606d67 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat deleted file mode 100644 index 458a620d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat +++ /dev/null @@ -1,87 +0,0 @@ -%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: Lacewing_16 - m_Shader: {fileID: 4800000, guid: 7e1a0dadd1e4c4d4188e90445d167319, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _EMISSION _NORMALMAP _SPECGLOSSMAP - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: dc24e2075b423f943aaa744cbccf20c9, type: 3} - 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: 8eb8288ae9ead3741a090cdc7940f161, 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} - - _SpecGlossMap: - m_Texture: {fileID: 2800000, guid: 9f5fc705fe72374448bf9e0f1203beb3, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecTex: - m_Texture: {fileID: 2800000, guid: 9f5fc705fe72374448bf9e0f1203beb3, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.9 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 0.741 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.8 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.14705884, g: 0.14705884, b: 0.14705884, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta deleted file mode 100644 index be894a78..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1cf94f63f57a4a1aad14295af4f5ab5c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta deleted file mode 100644 index c3ee3e88..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 817db968ed74e2241918e00ba3c5cac7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset deleted file mode 100644 index 78dac412..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: _16 - m_EditorClassIdentifier: - m_Guid: - m_storage: ddda8745-4bb5-ac54-88b6-d1480370583e - m_DurableName: - m_Material: {fileID: 2100000, guid: ddda87454bb5ac5488b6d1480370583e, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta deleted file mode 100644 index e91f93b7..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 92ff03b2bb2a29a5e9d6a4f1a713c69d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat deleted file mode 100644 index 4b150dc2..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat +++ /dev/null @@ -1,90 +0,0 @@ -%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: _16 - m_Shader: {fileID: 4800000, guid: 6bb8cf7337b1ff743819661ccd6cbb61, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BGTex: - m_Texture: {fileID: 2800000, guid: 05eafee566d1a0246aa955fe3b5c71e2, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 5748e3a43c5fac54684f79a6f855b2f6, type: 3} - 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: 69d2e7612c71ad14298c0f84c741c1e5, type: 3} - m_Scale: {x: 0.3, y: 0.5} - 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} - - _SecondaryTex: - m_Texture: {fileID: 2800000, guid: 69d2e7612c71ad14298c0f84c741c1e5, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Ratio: 0.57 - - _Shininess: 0.01 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SqueezeAmount: 0.9 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.44117647, g: 0.44117647, b: 0.44117647, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _LineColor: {r: 0.15158093, g: 0.62766045, b: 0.9411765, a: 1} - - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta deleted file mode 100644 index b6d4499f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ddda87454bb5ac5488b6d1480370583e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/leaves.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/leaves.png.meta index 5e5c03db..dc6c5b8e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/leaves.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/leaves.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 3743071a0f034424390b1aa53dda0d60 +timeCreated: 1440714585 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/normal.png.meta index 4b53f7ec..f1ffde5e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves/normal.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 735a5f2fd14c4764682ef32fc6822de5 +timeCreated: 1443655891 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 1 externalNormalMap: 1 - heightScale: 0.046 + heightScale: .0460000001 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 textureType: 1 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta deleted file mode 100644 index 893c1e9f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e9c5cdaa4f512f040a381f1e2a0d41af -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset deleted file mode 100644 index 21eb2a3e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Leaves2_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 7259cce5-41c1-ec74-c885-78af28a31d95 - m_DurableName: Leaves2 - m_Material: {fileID: 2100000, guid: 7259cce541c1ec74c88578af28a31d95, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta deleted file mode 100644 index 0bd02b4b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 242adf01c508b5253aefe5c5bab9cd42 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat deleted file mode 100644 index 976899fb..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: Leaves2_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 735a5f2fd14c4764682ef32fc6822de5, type: 3} - 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: 3743071a0f034424390b1aa53dda0d60, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.395 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta deleted file mode 100644 index 57a107fd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7259cce541c1ec74c88578af28a31d95 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset index 2febf5d0..7a6d2193 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset.meta index 99a79038..f2b8c6dc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 362043fe9dab1704fa0f912c4f1e0d09 +timeCreated: 1529443756 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat index 48b1902b..45770823 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Leaves_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.395 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat.meta index 4641defd..d1a7e956 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: ea19de07d0c04484919818489a3c1487 +timeCreated: 1496879712 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset deleted file mode 100644 index 13ca845d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Leaves_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: ea19de07-d0c0-4484-9198-18489a3c1487 - m_DurableName: Leaves - m_Material: {fileID: 2100000, guid: ea19de07d0c04484919818489a3c1487, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset.meta deleted file mode 100644 index 324d38eb..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: baf111a6ab075664cbad82455f9dd517 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat deleted file mode 100644 index 023a64da..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: Leaves_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 735a5f2fd14c4764682ef32fc6822de5, type: 3} - 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: 3743071a0f034424390b1aa53dda0d60, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.395 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat.meta deleted file mode 100644 index d42b2826..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeavesSingleSided/Leaves_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dfd791f59a9944f498dbf0bc0fe018fc -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset index 035e8ad2..572a1606 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset.meta index 77be0916..417e8292 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 54a30b55c2e961643a7701bedc663c88 +timeCreated: 1495162082 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat index 0451be73..0d269fb7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Light m_Shader: {fileID: 4800000, guid: 3623f1b71da7dda49b588a77c984e1de, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat.meta index 1c550fe5..9ff557cd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 2241cd328ba248a59ee72caef7e9ed62 +timeCreated: 1481917485 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset deleted file mode 100644 index 711c1828..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Light_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 2241cd32-8ba2-48a5-9ee7-2caef7e9ed62 - m_DurableName: Light - m_Material: {fileID: 2100000, guid: 2241cd328ba248a59ee72caef7e9ed62, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset.meta deleted file mode 100644 index 75412d1f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 44810a6fc26cce84d9f618d2da2584c7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat deleted file mode 100644 index eb1f6b1e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat +++ /dev/null @@ -1,78 +0,0 @@ -%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: Light_16 - m_Shader: {fileID: 4800000, guid: 3623f1b71da7dda49b588a77c984e1de, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0e093d6c79a128746b77cc289ed425a7, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EmissionGain: 0.45 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat.meta deleted file mode 100644 index bfd736d4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/Light_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9e6ce78101b8d554d9eefc2822e5a4aa -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/maintexture.png.meta index 938d295a..52362130 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Light/maintexture.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 0e093d6c79a128746b77cc289ed425a7 +timeCreated: 1440714584 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,39 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: 5 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset index c5bf79a0..59582c87 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset.meta index 5a298188..c3ce6c74 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 4f55fba4b64913b419cf4a17ba5d489b +timeCreated: 1495162082 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat index 4b04ba41..2b5552dd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: LightWire m_Shader: {fileID: 4800000, guid: 3b4cc34a39a839049b4387ce42e3b56c, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat.meta index ca05ffb3..7e1a64be 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 4391aaaadf8143969e3331e4e4930b27 +timeCreated: 1481917492 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader index 2ea76d30..71666d5e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -23,17 +23,18 @@ Shader "Brush/Special/LightWire" { SubShader { Cull Back CGPROGRAM - #pragma target 4.0 + #pragma target 3.0 #pragma surface surf StandardSpecular vertex:vert noshadow #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" struct Input { float2 uv_MainTex; + float2 uv_BumpMap; float4 color : Color; + float3 worldPos; + float3 viewDir; }; sampler2D _MainTex; @@ -41,8 +42,7 @@ Shader "Brush/Special/LightWire" { fixed4 _Color; half _Shininess; - void vert (inout appdata_full v, out Input o) { - UNITY_INITIALIZE_OUTPUT(Input, o); + void vert (inout appdata_full v) { v.color = TbVertToSrgb(v.color); // Radius is stored in texcoord (used to be tangent.w) @@ -100,8 +100,6 @@ Shader "Brush/Special/LightWire" { o.Albedo = SrgbToNative3(o.Albedo); o.Emission = SrgbToNative3(o.Emission); o.Specular = SrgbToNative3(o.Specular); - - SURF_FRAG_MOBILESELECT(o); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader.meta index 598b844d..74c60897 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 3b4cc34a39a839049b4387ce42e3b56c +timeCreated: 1468009950 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset deleted file mode 100644 index 18a20de6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: LightWire_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 4391aaaa-df81-4396-9e33-31e4e4930b27 - m_DurableName: LightWire - m_Material: {fileID: 2100000, guid: 4391aaaadf8143969e3331e4e4930b27, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset.meta deleted file mode 100644 index f56e5ddd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 16b56a1a0e1590147a104e9abc851e36 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat deleted file mode 100644 index 57ba82f1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat +++ /dev/null @@ -1,43 +0,0 @@ -%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: LightWire_16 - m_Shader: {fileID: 4800000, guid: 3b4cc34a39a839049b4387ce42e3b56c, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - 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} - - _Illum: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: ea466d6b6f5981a418210cf0db7aee16, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _EmissionGain: 0.5 - - _EmissionLM: 0 - - _InvFade: 1 - - _Shininess: 0.81 - m_Colors: - - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat.meta deleted file mode 100644 index abbd51fa..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/LightWire_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b60fdd5b9e3ca984c8aeecfd0b13748f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/maintexture.png.meta index cbf909f1..be99fcd2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LightWire/maintexture.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: ea466d6b6f5981a418210cf0db7aee16 +timeCreated: 1468011076 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,38 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: 5 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta deleted file mode 100644 index 69fa211a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 30f17350ba549c04d9327268e159f550 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset deleted file mode 100644 index 61777b50..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Wire (Lit)_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 62fef968-e842-3224-4a0e-1fdb7cfb745c - m_DurableName: Wire (Lit) - m_Material: {fileID: 2100000, guid: 62fef968e84232244a0e1fdb7cfb745c, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta deleted file mode 100644 index ae106eac..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bfc9ec097bc4a445383f719c6602584d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat deleted file mode 100644 index d9687a6f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: Wire (Lit)_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.078125 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta deleted file mode 100644 index a2744718..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 62fef968e84232244a0e1fdb7cfb745c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset index ee6b49ad..91f924cd 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -17,8 +16,8 @@ MonoBehaviour: m_DurableName: Lofted m_Material: {fileID: 2100000, guid: d381e0f53def4a0d885331e9200bcbda, type: 2} m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 + m_uv0Size: 2 + m_uv0Semantic: 5 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset.meta index 2d8c9d80..c2ef52c4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 1d8b02cc1233fee5fae7728123e6257d +timeCreated: 1529443758 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat index d10cfdeb..336e58b8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Lofted_16 m_Shader: {fileID: 4800000, guid: fc163d24473ddd04881e4fc188ed5802, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat.meta index 4425df59..544cdf41 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lofted/Lofted_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d381e0f53def4a0d885331e9200bcbda +timeCreated: 1480279860 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta deleted file mode 100644 index a7e493fb..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3f2569232895ece4b84f369068b9fdca -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset deleted file mode 100644 index 34e792f3..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Lofted (Hue Shift)_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: c5da2e70-a6e4-63a4-898c-5cfedef09c97 - m_DurableName: Lofted (Hue Shift) - m_Material: {fileID: 2100000, guid: c5da2e70a6e463a4898c5cfedef09c97, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta deleted file mode 100644 index c486273b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ddfae286c35c87e54a394a983cad0491 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat deleted file mode 100644 index 3b7cde56..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat +++ /dev/null @@ -1,43 +0,0 @@ -%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: Lofted (Hue Shift)_16 - m_Shader: {fileID: 4800000, guid: 9c338a5b76b34404c95b237822b3bd21, 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} - - _Illum: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _EmissionGain: 0.5 - - _EmissionLM: 0 - - _InvFade: 1 - - _Shininess: 0.4 - m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.13235295, g: 0.13235295, b: 0.13235295, a: 0} - - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta deleted file mode 100644 index 2b662205..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c5da2e70a6e463a4898c5cfedef09c97 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta deleted file mode 100644 index 007fe670..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5d264e7e8e8b1984d97c7d4b596ece1c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset deleted file mode 100644 index 6e751457..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Marbled Rainbow_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: c86c058d-1bda-2e94-08db-f3d6a96ac4a1 - m_DurableName: Marbled Rainbow - m_Material: {fileID: 2100000, guid: c86c058d1bda2e9408dbf3d6a96ac4a1, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta deleted file mode 100644 index 6e23bcb6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 658eed08dfd4e5850b642d22cd495b97 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat deleted file mode 100644 index 118a0f60..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat +++ /dev/null @@ -1,87 +0,0 @@ -%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: Marbled Rainbow_16 - m_Shader: {fileID: 4800000, guid: 2734c8c206f6a5f408615a5ab03a6e6d, type: 3} - m_ShaderKeywords: _ALPHATEST_ON _EMISSION _NORMALMAP _SPECGLOSSMAP - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 70738dc9310ce1a4f88400c683a47494, type: 3} - 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: 795b3993927f0fa4d88e29f4596b1d2b, 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} - - _SpecGlossMap: - m_Texture: {fileID: 2800000, guid: 9f5fc705fe72374448bf9e0f1203beb3, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecTex: - m_Texture: {fileID: 2800000, guid: 6697d3cba218276429328ca416628c75, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 0.741 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.8 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.2205882, g: 0.2205882, b: 0.2205882, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta deleted file mode 100644 index e01d5a4a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c86c058d1bda2e9408dbf3d6a96ac4a1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset index 5ac3bdfa..0b77a90b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset.meta index 2b440c3d..0afe43d2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 3fd505f4dc669fe4c86c80d009ec2efd +timeCreated: 1495162082 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat index 902ba989..985b7703 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Marker m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: EDGING_ON SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -60,7 +59,6 @@ Material: - _Cutoff: 0.067 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Edging: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -68,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat.meta index af7c5f32..224b0051 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 429ed64a4e97446684d3145a861ef684 +timeCreated: 1481917483 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset deleted file mode 100644 index 40909e43..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Marker_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 429ed64a-4e97-4466-84d3-145a861ef684 - m_DurableName: Marker - m_Material: {fileID: 2100000, guid: 429ed64a4e97446684d3145a861ef684, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset.meta deleted file mode 100644 index a6716bbf..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 585b99ab356f38d44bfa0bca89166410 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat deleted file mode 100644 index e39a3f8b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: Marker_16 - m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: EDGING_ON SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - 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: a5e21dec06724194490cbe6156ac19d2, 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.067 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _Edging: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat.meta deleted file mode 100644 index afd7fade..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/Marker_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 02bf69f0523f4884097212f649440707 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/maintexture.png.meta index da9c385d..9d1986c7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Marker/maintexture.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: a5e21dec06724194490cbe6156ac19d2 +timeCreated: 1449103567 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset index 43e128a6..9db8860e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -17,8 +16,8 @@ MonoBehaviour: m_DurableName: MatteHull m_Material: {fileID: 2100000, guid: 79348357432d47468e290e25c112e3aa, type: 2} m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 + m_uv0Size: 2 + m_uv0Semantic: 0 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset.meta index 2fa0b886..12d5550c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: cc8a936db644b835cb1d6ac3836f65f2 +timeCreated: 1529443760 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat index de62174b..0739e2fa 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: MatteHull_16 m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat.meta index 165328dc..ac7f2481 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MatteHull/MatteHull_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 79348357432d47468e290e25c112e3aa +timeCreated: 1498761536 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta deleted file mode 100644 index eaf7763d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8829dc4033451184e8c2e803035d45a5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset deleted file mode 100644 index b41000e1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Muscle_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: f28c395c-a57d-464b-8f0b-558c59478fa3 - m_DurableName: Muscle - m_Material: {fileID: 2100000, guid: f28c395ca57d464b8f0b558c59478fa3, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta deleted file mode 100644 index 41b1d279..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 66eaa331dac132e588b955c39ede2701 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat deleted file mode 100644 index 2b7f6b18..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat +++ /dev/null @@ -1,83 +0,0 @@ -%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: Muscle_16 - m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: _EMISSION _NORMALMAP - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: d72cc108e6b8e2b459e9399f8217b7e1, type: 3} - m_Scale: {x: 0.25, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 0.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: 0.1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 8bb9cbfa02bae984fba39bb96a916591, type: 3} - m_Scale: {x: 0.25, 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} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.3 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.305 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.57 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.08088237, g: 0.08088237, b: 0.08088237, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta deleted file mode 100644 index 360270c1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f28c395ca57d464b8f0b558c59478fa3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta deleted file mode 100644 index 9cb14c6f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ea685b76f3faae942865cadea282aa5e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset deleted file mode 100644 index ecb0c721..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: MylarTube_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 8e58ceea-7830-49b4-aba9-6215104ab52a - m_DurableName: MylarTube - m_Material: {fileID: 2100000, guid: 8e58ceea783049b4aba96215104ab52a, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta deleted file mode 100644 index 618c76fc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0ab8a65ca50e7bf5897129432ea7e033 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat deleted file mode 100644 index 29f9ee31..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat +++ /dev/null @@ -1,54 +0,0 @@ -%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: MylarTube_16 - m_Shader: {fileID: 4800000, guid: 073d6ba13e511e24bb3ba4f7c8f744ee, 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} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 7a23cfe16e9d8cf4b820c79d8d2b9c5a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _DisplacementIntensity: 0.1 - - _EmissionGain: 0.25 - - _InvFade: 1 - - _Scroll1: 2 - - _Scroll2: -2 - - _ScrollJitterFrequency: 1 - - _ScrollJitterIntensity: 3 - - _ScrollRate: -0.54 - - _Shininess: 0.68 - - _Smoothness: 0.078125 - - _SqueezeAmount: 0.873 - - _Strength: 0.5 - m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.75, g: 0.75, b: 0.75, a: 0} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta deleted file mode 100644 index 59009c41..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8e58ceea783049b4aba96215104ab52a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset index 9c269160..c34a919d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -17,8 +16,8 @@ MonoBehaviour: m_DurableName: NeonPulse m_Material: {fileID: 2100000, guid: b2ffef01eaaa4ab5aa6495a2c4f5dbc6, type: 2} m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 + m_uv0Size: 2 + m_uv0Semantic: 5 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset.meta index c15ca7aa..a7e7896d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 71228caab923caf46a89c3275938564a +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat index 7ff435d1..42c4f79f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: NeonPulse m_Shader: {fileID: 4800000, guid: 39f9ec0559d25f44bad64ce4dbc8a0c4, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat.meta index 7c068dac..217e4ed6 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: b2ffef01eaaa4ab5aa6495a2c4f5dbc6 +timeCreated: 1481917491 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset deleted file mode 100644 index 2ce3a4e0..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: NeonPulse_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: b2ffef01-eaaa-4ab5-aa64-95a2c4f5dbc6 - m_DurableName: NeonPulse - m_Material: {fileID: 2100000, guid: b2ffef01eaaa4ab5aa6495a2c4f5dbc6, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset.meta deleted file mode 100644 index c33b8245..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3bd18e27f9d1cc44c9c7552284201e11 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat deleted file mode 100644 index bf7033fd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat +++ /dev/null @@ -1,36 +0,0 @@ -%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: NeonPulse_16 - m_Shader: {fileID: 4800000, guid: 39f9ec0559d25f44bad64ce4dbc8a0c4, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 7c9e2c33abd01d5468b670b8d02d6925, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _EmissionGain: 0.5 - - _InvFade: 1 - - _ScrollSpeed: 0 - - _VertexDisplacement: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat.meta deleted file mode 100644 index d208cdb9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/NeonPulse/NeonPulse_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 207010d5701a4144fa6743f421a5b7ef -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset index 6d403569..ef30e365 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset.meta index 31c6e5c6..d99cc2be 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 542d61ce63831da52a2faf8cb6e2d161 +timeCreated: 1529443761 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat index 804a63f4..60c379e7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: OilPaint_15 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat.meta index 267cc1e3..5db939d5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: f72ec0e7a8444e3882e3140c44772699 +timeCreated: 1496877084 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset deleted file mode 100644 index 47b1fb9f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: OilPaint_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: f72ec0e7-a844-4e38-82e3-140c44772699 - m_DurableName: OilPaint - m_Material: {fileID: 2100000, guid: f72ec0e7a8444e3882e3140c44772699, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset.meta deleted file mode 100644 index 8f1489cb..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4125a45648abee64eb549c7c003b1fe2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat deleted file mode 100644 index 0c68f26e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: OilPaint_16 - m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 432d5c408cd625945ab19bb572a6f8e4, type: 3} - 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: d986b523673bfdb4f8325bc62054d06b, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.4 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat.meta deleted file mode 100644 index 8d2f2966..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/OilPaint_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c84564e3cf2f384dadf0104d158f7ab -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/main.png.meta index fb44722f..bfdb54ad 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/main.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: d986b523673bfdb4f8325bc62054d06b +timeCreated: 1442276315 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: 1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/normal.png.meta index eed12905..111176e2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaint/normal.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 432d5c408cd625945ab19bb572a6f8e4 +timeCreated: 1442278035 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 1 externalNormalMap: 1 - heightScale: 0.018 + heightScale: .0179999992 normalMapFilter: 1 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -100 - wrapU: 0 - wrapV: 0 - wrapW: 0 + mipBias: -1 + wrapMode: 0 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 textureType: 1 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset index e06beee3..a75f3d98 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset.meta index f7596083..ae340641 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: d7ada22e6a436e742910a7553f159550 +timeCreated: 1529443762 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat index 686529b2..76b7d10d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: OilPaint_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat.meta index c39cd454..3ff0b7a5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: c515dad74393468181ad162ef052241b +timeCreated: 1496877084 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset deleted file mode 100644 index 0be58919..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: OilPaint_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: c515dad7-4393-4681-81ad-162ef052241b - m_DurableName: OilPaint - m_Material: {fileID: 2100000, guid: c515dad74393468181ad162ef052241b, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset.meta deleted file mode 100644 index d48ff4bd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6b210bd5b0128ec4aa57a8bc87e26e00 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat deleted file mode 100644 index f31c8579..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: OilPaint_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 432d5c408cd625945ab19bb572a6f8e4, type: 3} - 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: d986b523673bfdb4f8325bc62054d06b, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.4 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat.meta deleted file mode 100644 index e6678612..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/OilPaintSingleSided/OilPaint_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b8e69efefcca1b041bd44e4d73bffb2e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset index 29b20813..00e1bf3f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset.meta index 29442ddd..bae4bb5d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 4c750113c587a7e5c97a5627a917967e +timeCreated: 1529443763 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat index c60f7717..8cad7e8f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Paper_15 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.145 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat.meta index 9a45c062..277a9611 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: f1114e2eeb8d4fde915a6e653b54e9f5 +timeCreated: 1496878249 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset deleted file mode 100644 index 5fe98bd4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Paper_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: f1114e2e-eb8d-4fde-915a-6e653b54e9f5 - m_DurableName: Paper - m_Material: {fileID: 2100000, guid: f1114e2eeb8d4fde915a6e653b54e9f5, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset.meta deleted file mode 100644 index 5ce2b2d7..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8c7c475a7169a5a478e5520ec7f9284f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat deleted file mode 100644 index 84384326..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: Paper_16 - m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 72b554b36eb21d445a97a119717a00e9, type: 3} - 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: d2267f6b367938a49abf5cf6e5daab14, 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.16 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.145 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat.meta deleted file mode 100644 index f8d75e52..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/Paper_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ae64161a82c58c41ab424b4bf0a71a1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/bump.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/bump.png.meta index b39df78f..8b9a6d06 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/bump.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/bump.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 72b554b36eb21d445a97a119717a00e9 +timeCreated: 1491944683 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,68 +20,39 @@ TextureImporter: heightScale: 0.05 normalMapFilter: 1 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 1 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/main.png.meta index b28cded5..65b29677 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Paper/main.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: d2267f6b367938a49abf5cf6e5daab14 +timeCreated: 1442276315 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -100 - wrapU: 0 - wrapV: 0 - wrapW: 0 + mipBias: -1 + wrapMode: 0 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset index bc82d5fa..a0de2262 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset.meta index fd73af2a..c5e72894 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 9b77a7cd7bb6c0244bca8ab8221af846 +timeCreated: 1529443764 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat index 6a997681..74294140 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Paper_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.145 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat.meta index 7389038b..cbcdab8e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 759f1ebd20cd47208d41234e0da63716 +timeCreated: 1496878249 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset deleted file mode 100644 index 3dac5f4d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Paper_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 759f1ebd-20cd-4720-8d41-234e0da63716 - m_DurableName: Paper - m_Material: {fileID: 2100000, guid: 759f1ebd20cd47208d41234e0da63716, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset.meta deleted file mode 100644 index 8b940eef..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 575b9a60acc02e94e813b4b603315c8c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat deleted file mode 100644 index 0c3d96f8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: Paper_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 72b554b36eb21d445a97a119717a00e9, type: 3} - 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: d2267f6b367938a49abf5cf6e5daab14, 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.16 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.145 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat.meta deleted file mode 100644 index bab0d334..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/PaperSingleSided/Paper_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 06adbfd29b8789a41b50d6fa5be1cc4d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader index 40239109..db582ed3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -23,13 +23,12 @@ Shader "Brush/Special/Petal" { Cull Off CGPROGRAM - #pragma target 4.0 + #pragma target 3.0 #pragma surface surf StandardSpecular vertex:vert addshadow #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ ODS_RENDER - #pragma multi_compile __ SELECTION_ON + #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" struct Input { float2 uv_MainTex; @@ -39,8 +38,7 @@ Shader "Brush/Special/Petal" { half _Shininess; - void vert(inout appdata_full i, out Input o) { - UNITY_INITIALIZE_OUTPUT(Input, o); + void vert(inout appdata_full i) { i.color = TbVertToNative(i.color); } @@ -55,8 +53,6 @@ Shader "Brush/Special/Petal" { o.Smoothness = _Shininess; o.Specular = _SpecColor * fAO; o.Alpha = 1; - - SURF_FRAG_MOBILESELECT(o); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader.meta index 46dbbd65..a4f14f4d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 542a05b67e6a6ef4c994b08f44143639 +timeCreated: 1498166764 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset index cc0a29d6..8e993c7d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -17,8 +16,8 @@ MonoBehaviour: m_DurableName: Petal m_Material: {fileID: 2100000, guid: e0abbc800f80e85449708924a0863dcc, type: 2} m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 + m_uv0Size: 2 + m_uv0Semantic: 5 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset.meta index 071eddb6..a954a67c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: a8f488f387b09e35dba50b6e9904301b +timeCreated: 1529443765 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat index aead96d4..79ac23b4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Petal_16 m_Shader: {fileID: 4800000, guid: 542a05b67e6a6ef4c994b08f44143639, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat.meta index 732894ec..f6abb3b0 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Petal/Petal_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: e0abbc800f80e85449708924a0863dcc +timeCreated: 1498166756 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta deleted file mode 100644 index 5e581aab..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2bd52a144173c1742a9054c8f9fce194 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset deleted file mode 100644 index 7b76ef6d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Braid3_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 22d4f434-23e4-49d9-a9bd-05798aa21e58 - m_DurableName: Braid3 - m_Material: {fileID: 2100000, guid: 22d4f43423e449d9a9bd05798aa21e58, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 0 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta deleted file mode 100644 index 0fc4c551..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dd29338e13ec5265cb0cc4ee30d69155 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat deleted file mode 100644 index 68e6c4d4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat +++ /dev/null @@ -1,37 +0,0 @@ -%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: Braid3_16 - m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Illum: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _EmissionGain: 0.5 - - _EmissionLM: 0 - - _InvFade: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta deleted file mode 100644 index b74ca39f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 22d4f43423e449d9a9bd05798aa21e58 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset index 8889aeac..f4307cfb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset.meta index ed939a13..f984c7b4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 7e6a9b8a0ad82cf4da20e86f1a326040 +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat index 85cc06dc..13e75ce2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Plasma m_Shader: {fileID: 4800000, guid: 0417065cc2dc3244588be4534f9bbd91, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat.meta index 2574c058..0a52839e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: c33714d1b2f9412ebd501884c9d46336 +timeCreated: 1481917493 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader index 48f4b9e4..e6c3fbbc 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -42,13 +42,11 @@ Category { #pragma fragment frag #pragma target 3.0 #pragma multi_compile_particles - #pragma multi_compile __ SELECTION_ON #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -61,7 +59,7 @@ Category { }; struct v2f { - float4 vertex : POSITION; + float4 vertex : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; float3 worldPos : TEXCOORD1; @@ -92,7 +90,7 @@ Category { return abs(noise.x + noise.y) * 0.5; } - fixed4 frag (v2f i) : COLOR + fixed4 frag (v2f i) : SV_Target { // Workaround for b/30500118, caused by b/30504121 i.color.a = saturate(i.color.a); @@ -136,9 +134,6 @@ Category { i.color.a = 1; // kill any other alpha values that may come into this brush float4 c = i.color * tex; -#if SELECTION_ON - c.rgb = GetSelectionColor() * tex; -#endif return float4(c.rgb * c.a, 1.0); } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader.meta index 2be9b57a..37b0a45e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 0417065cc2dc3244588be4534f9bbd91 +timeCreated: 1442704399 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset deleted file mode 100644 index 83b1c1ac..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Plasma_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: c33714d1-b2f9-412e-bd50-1884c9d46336 - m_DurableName: Plasma - m_Material: {fileID: 2100000, guid: c33714d1b2f9412ebd501884c9d46336, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset.meta deleted file mode 100644 index d31c7855..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5df1efb0a9f5a4b449cd34f5c9fbb232 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat deleted file mode 100644 index 69c18ea0..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat +++ /dev/null @@ -1,47 +0,0 @@ -%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: Plasma_16 - m_Shader: {fileID: 4800000, guid: 0417065cc2dc3244588be4534f9bbd91, 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: 0.1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 164c6b5add812494f8f5395410e84ac8, type: 3} - m_Scale: {x: 0.5, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _DisplacementIntensity: 0.2 - - _EmissionGain: 0.5 - - _EmissionScroll1: 15 - - _EmissionScroll2: -10 - - _InvFade: 1 - - _Scroll1: 20 - - _Scroll2: 50 - - _Scroll3: 0.05 - - _UVTile1: 1 - - _UVTile2: 1 - - _UVTile3: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat.meta deleted file mode 100644 index 7319ea49..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/Plasma_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 509ee817edc14f5449875a2d7cb64ebe -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/main.png.meta index 5fcbe2bf..8d7541a5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plasma/main.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 164c6b5add812494f8f5395410e84ac8 +timeCreated: 1442535682 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: 5 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta deleted file mode 100644 index f2da950a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 92b4321d2e0ef1f4aac54629a7f54781 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset deleted file mode 100644 index 7f221e00..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Race_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: abfbb2aa-70b4-4a5c-8126-8eedda2b3628 - m_DurableName: Race - m_Material: {fileID: 2100000, guid: abfbb2aa70b44a5c81268eedda2b3628, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta deleted file mode 100644 index 8ee1a5b9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 606ebb8edb618d15ebfb4adfa5a9b189 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat deleted file mode 100644 index a32637f7..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat +++ /dev/null @@ -1,28 +0,0 @@ -%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: Race_16 - m_Shader: {fileID: 4800000, guid: 66d9ab24e044638439b322295d3afa8e, 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: - - _EmissionGain: 0.5 - m_Colors: [] diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta deleted file mode 100644 index 4c63abf8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: abfbb2aa70b44a5c81268eedda2b3628 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta deleted file mode 100644 index 2fb30139..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 158e241b2cec58d4fa1ea8b6128c87c7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset deleted file mode 100644 index 28e73685..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Rain_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 03a529e1-f519-3dd4-582d-2d5cd92c3f4f - m_DurableName: Rain - m_Material: {fileID: 2100000, guid: 03a529e1f5193dd4582d2d5cd92c3f4f, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta deleted file mode 100644 index 090e3f8a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a9da63d3165051050aee14877ccd42d1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat deleted file mode 100644 index 3891dc97..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat +++ /dev/null @@ -1,88 +0,0 @@ -%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: Rain_16 - m_Shader: {fileID: 4800000, guid: a7b2cc37e7b92574483d5e8e4d08ecb7, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaMask: - m_Texture: {fileID: 2800000, guid: d6a5bd2db2f9407499d2c40e01d0fd06, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _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: d6a5bd2db2f9407499d2c40e01d0fd06, type: 3} - m_Scale: {x: 4, 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.5 - - _DetailNormalMapScale: 1 - - _DisplacementIntensity: 0.1 - - _DstBlend: 0 - - _EmissionGain: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _NumSides: 6 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Scroll1: 2 - - _Scroll2: 3 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _Speed: 4 - - _SrcBlend: 1 - - _StretchDistortionExponent: 3 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta deleted file mode 100644 index 2fccad95..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 03a529e1f5193dd4582d2d5cd92c3f4f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset index e42bd320..bc712d8c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset.meta index 38f77e35..a280f09a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: d75833fb286458e468c00cc5b0ac5f4d +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat index 99d06029..12641a25 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Rainbow m_Shader: {fileID: 4800000, guid: 2427d50c8f9a5c04592a6dbb537bfa0d, type: 3} m_ShaderKeywords: _LIGHTMAPPING_REALTIME diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat.meta index 52b9beea..1dccd0f3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.mat.meta @@ -1,8 +1,5 @@ fileFormatVersion: 2 guid: ad1ad43776e2450da23ae17f8310b960 NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader index 89e7dcca..604fdbc5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -15,190 +15,159 @@ Shader "Brush/Special/Rainbow" { Properties { _MainTex ("Particle Texture", 2D) = "white" {} - _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 + _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 } Category { Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } Blend One One // SrcAlpha One + BlendOp Add, Min ColorMask RGBA Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } - // Split into two different LOD passes as the 200 lod (mobile) needs to use a different - // blend mode than standard. - CGINCLUDE - #pragma multi_compile __ AUDIO_REACTIVE - #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON - - #pragma target 3.0 - #include "UnityCG.cginc" - #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" - - sampler2D _MainTex; - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float3 normal : NORMAL; - float2 texcoord : TEXCOORD0; - }; - - struct v2f { - float4 pos : POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - float4 _MainTex_ST; - half _EmissionGain; - - v2f vert (appdata_t v) - { - v.color = TbVertToSrgb(v.color); - - v2f o; - o.pos = UnityObjectToClipPos(v.vertex); - o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); - o.color = v.color; - return o; - } - - float4 GetRainbowColor( half2 texcoord) - { - texcoord = saturate(texcoord); - // Create parametric UV's - half2 uvs = texcoord; - float row_id = floor(uvs.y * 5); - uvs.y *= 5; - - // Create parametric colors - half4 tex = float4(0,0,0,1); - half row_y = fmod(uvs.y,1); - - float time = frac( _Time.z * 0.2 ) * 5; - float rowOffset = floor( time ); - - row_id += rowOffset; - row_id = floor(fmod( row_id, 5) + 0.1); - - tex.rgb = row_id == 0 ? float3(1,0,0) : tex.rgb; - tex.rgb = row_id == 1 ? float3(.7,.3,0) : tex.rgb; - tex.rgb = row_id == 2 ? float3(0,1,.0) : tex.rgb; - tex.rgb = row_id == 3 ? float3(0,.2,1) : tex.rgb; - tex.rgb = row_id == 4 ? float3(.4,0,1.2) : tex.rgb; - - // Make rainbow lines pulse - tex.rgb *= pow( (sin(row_id * 1 + _Time.z) + 1)/2,5); - - // Make rainbow lines thin - tex.rgb *= saturate(pow(row_y * (1 - row_y) * 5, 50)); - - return tex; - } - - float4 GetAudioReactiveRainbowColor( half2 texcoord) - { - texcoord = saturate(texcoord); - // Create parametric UV's - half2 uvs = texcoord; - float row_id = floor(uvs.y * 5); - uvs.y *= 5; - - // Create parametric colors - half4 tex = float4(0,0,0,1); - half row_y = fmod(uvs.y,1); - - row_id = ceil(fmod(row_id + _BeatOutputAccum.x*3,5)) - 1; - - tex.rgb = row_id == 0 ? float3(1,0,0) : tex.rgb; - tex.rgb = row_id == 1 ? float3(.7,.3,0) : tex.rgb; - tex.rgb = row_id == 2 ? float3(0,1,.0) : tex.rgb; - tex.rgb = row_id == 3 ? float3(0,.2,1) : tex.rgb; - tex.rgb = row_id == 4 ? float3(.4,0,1.2) : tex.rgb; - - // Make rainbow lines pulse - // tex.rgb *= pow( (sin(row_id * 1 + _BeatOutputAccum.x*10) + 1)/2,5); - - // Make rainbow lines thin - tex.rgb *= saturate(pow(row_y * (1 - row_y) * 5, 50)); - - return tex; - } - - float4 GetAudioReactiveColor( half2 texcoord) - { - texcoord = texcoord.yx; - texcoord.y *= 2; - - // Create parametric UV's - float quantizedMotion = ceil((_BeatOutputAccum.z*.1) / 10); - float row_id = abs(texcoord.y * 12 + quantizedMotion); - - // Create parametric colors - float4 tex = float4(0,0,0,1); - float row_y = fmod(abs(row_id),1.0); - - row_id = ceil(fmod(row_id, 8)); - - float bandlevels = tex2D(_FFTTex, float2(row_id/8,0) ).w; - bandlevels = max(bandlevels, .1); - tex.rgb = abs(texcoord.x - .5) < bandlevels * .5 ? float3(1,1,1) : tex.rgb; - - // Make rainbow lines pulse - tex.rgb *= tex.rgb * .5 + tex.rgb * _BeatOutput.y; - - // Make rainbow lines thin - tex.rgb *= saturate(20 - abs(row_y - .5)*50); - return tex; - } - - - - // Input color is srgb - fixed4 frag (v2f i) : COLOR - { - i.color.a = 1; //ignore incoming vert alpha -#ifdef AUDIO_REACTIVE - float4 tex = GetAudioReactiveRainbowColor(i.texcoord.xy); - tex *= GetAudioReactiveColor(i.texcoord.xy); - tex = i.color * tex * exp(_EmissionGain * 2.5f); -#else - float4 tex = GetRainbowColor(i.texcoord.xy); - tex = i.color * tex * exp(_EmissionGain * 3.0f); -#endif - float4 color = float4(tex.rgb * tex.a, 1.0); - color = SrgbToNative(color); - FRAG_MOBILESELECT(color) - return color; - } - - - ENDCG - - // PC (Uses 'Add' blend mode for RGB) - SubShader { - LOD 201 - Pass { - BlendOp Add, Min - - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - ENDCG - } - } - - // Mobile (Uses 'Max' blend mode for RGB) SubShader { - LOD 150 Pass { - BlendOp Max, Min CGPROGRAM - #pragma vertex vert - #pragma fragment frag + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + + #pragma target 3.0 + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + + sampler2D _MainTex; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float3 normal : NORMAL; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + float4 _MainTex_ST; + half _EmissionGain; + + v2f vert (appdata_t v) + { + v.color = TbVertToSrgb(v.color); + + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + o.color = v.color; + return o; + } + + float4 GetRainbowColor( half2 texcoord) + { + texcoord = saturate(texcoord); + // Create parametric UV's + half2 uvs = texcoord; + float row_id = floor(uvs.y * 5); + uvs.y *= 5; + + // Create parametric colors + half4 tex = float4(0,0,0,1); + half row_y = fmod(uvs.y,1); + + row_id = ceil(fmod(row_id + _Time.z,5)) - 1; + + tex.rgb = row_id == 0 ? float3(1,0,0) : tex.rgb; + tex.rgb = row_id == 1 ? float3(.7,.3,0) : tex.rgb; + tex.rgb = row_id == 2 ? float3(0,1,.0) : tex.rgb; + tex.rgb = row_id == 3 ? float3(0,.2,1) : tex.rgb; + tex.rgb = row_id == 4 ? float3(.4,0,1.2) : tex.rgb; + + // Make rainbow lines pulse + tex.rgb *= pow( (sin(row_id * 1 + _Time.z) + 1)/2,5); + + // Make rainbow lines thin + tex.rgb *= saturate(pow(row_y * (1 - row_y) * 5, 50)); + + return tex; + } + + float4 GetAudioReactiveRainbowColor( half2 texcoord) + { + texcoord = saturate(texcoord); + // Create parametric UV's + half2 uvs = texcoord; + float row_id = floor(uvs.y * 5); + uvs.y *= 5; + + // Create parametric colors + half4 tex = float4(0,0,0,1); + half row_y = fmod(uvs.y,1); + + row_id = ceil(fmod(row_id + _BeatOutputAccum.x*3,5)) - 1; + + tex.rgb = row_id == 0 ? float3(1,0,0) : tex.rgb; + tex.rgb = row_id == 1 ? float3(.7,.3,0) : tex.rgb; + tex.rgb = row_id == 2 ? float3(0,1,.0) : tex.rgb; + tex.rgb = row_id == 3 ? float3(0,.2,1) : tex.rgb; + tex.rgb = row_id == 4 ? float3(.4,0,1.2) : tex.rgb; + + // Make rainbow lines pulse + // tex.rgb *= pow( (sin(row_id * 1 + _BeatOutputAccum.x*10) + 1)/2,5); + + // Make rainbow lines thin + tex.rgb *= saturate(pow(row_y * (1 - row_y) * 5, 50)); + + return tex; + } + + float4 GetAudioReactiveColor( half2 texcoord) + { + texcoord = texcoord.yx; + texcoord.y *= 2; + + // Create parametric UV's + float quantizedMotion = ceil((_BeatOutputAccum.z*.1) / 10); + float row_id = abs(texcoord.y * 12 + quantizedMotion); + + // Create parametric colors + float4 tex = float4(0,0,0,1); + float row_y = fmod(abs(row_id),1.0); + + row_id = ceil(fmod(row_id, 8)); + + float bandlevels = tex2D(_FFTTex, float2(row_id/8,0) ).w; + bandlevels = max(bandlevels, .1); + tex.rgb = abs(texcoord.x - .5) < bandlevels * .5 ? float3(1,1,1) : tex.rgb; + + // Make rainbow lines pulse + tex.rgb *= tex.rgb * .5 + tex.rgb * _BeatOutput.y; + + // Make rainbow lines thin + tex.rgb *= saturate(20 - abs(row_y - .5)*50); + return tex; + } + + // Input color is srgb + fixed4 frag (v2f i) : SV_Target + { + i.color.a = 1; //ignore incoming vert alpha +#ifdef AUDIO_REACTIVE + float4 tex = GetAudioReactiveRainbowColor(i.texcoord.xy); + tex *= GetAudioReactiveColor(i.texcoord.xy); + tex = i.color * tex * exp(_EmissionGain * 2.5f); +#else + float4 tex = GetRainbowColor(i.texcoord.xy); + tex = i.color * tex * exp(_EmissionGain * 3.0f); +#endif + float4 color = float4(tex.rgb * tex.a, 1.0); + color = SrgbToNative(color); + return color; + } ENDCG } } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader.meta index e5e7ff2d..21388c29 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow.shader.meta @@ -1,9 +1,6 @@ fileFormatVersion: 2 guid: 2427d50c8f9a5c04592a6dbb537bfa0d ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset deleted file mode 100644 index 199eb4a7..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Rainbow_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: ad1ad437-76e2-450d-a23a-e17f8310b960 - m_DurableName: Rainbow - m_Material: {fileID: 2100000, guid: ad1ad43776e2450da23ae17f8310b960, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset.meta deleted file mode 100644 index 39cff194..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 40a77d8708a5f444fb776b8bbdbfadfd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat deleted file mode 100644 index d112d753..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat +++ /dev/null @@ -1,85 +0,0 @@ -%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: Rainbow_16 - m_Shader: {fileID: 4800000, guid: 2427d50c8f9a5c04592a6dbb537bfa0d, type: 3} - m_ShaderKeywords: _LIGHTMAPPING_REALTIME - 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} - - _Illum: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EmissionGain: 0.65 - - _EmissionLM: 0 - - _EmissionScaleUI: 0 - - _Glossiness: 0.38 - - _InvFade: 1 - - _Lightmapping: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Scroll1: 13 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat.meta deleted file mode 100644 index 3d411541..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rainbow/Rainbow_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 66d0a14afd8191844bf0efc9795f39ec -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta deleted file mode 100644 index ecd298fc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4c7c0f95392e47245a0b3342453ff48b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset deleted file mode 100644 index fda03a63..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Rising Bubbles_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: a8147ce1-005e-abe4-88e8-09a1eaadcc89 - m_DurableName: Rising Bubbles - m_Material: {fileID: 2100000, guid: a8147ce1005eabe488e809a1eaadcc89, type: 2} - m_IsParticle: 1 - m_uv0Size: 4 - m_uv0Semantic: 5 - m_uv1Size: 3 - m_uv1Semantic: 1 - m_bUseNormals: 1 - m_normalSemantic: 1 - m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta deleted file mode 100644 index 21233849..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ecab58a919952a75794e6a35e44ce78c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat deleted file mode 100644 index 78005016..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat +++ /dev/null @@ -1,91 +0,0 @@ -%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: Rising Bubbles_16 - m_Shader: {fileID: 4800000, guid: c4285dcf87bf5b84d8d4bbec752f1883, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 6092e34c8de5a054bad8c1f4824f959a, 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: - - _BaseGain: 0.4 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EmissionGain: 300 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ScrollJitterFrequency: 5 - - _ScrollJitterIntensity: 0.2 - - _ScrollRate: 0.1 - - _Shininess: 0.078125 - - _SmoothnessTextureChannel: 0 - - _SparkleRate: 2.5 - - _SpecularHighlights: 1 - - _SpreadRate: 1.25 - - _SpreadSize: 1.25 - - _SrcBlend: 1 - - _UVSec: 0 - - _WaveformFreq: 0.1 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _ScrollDistance: {r: 0.5, g: 5, b: 0, a: 0.5} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} - - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta deleted file mode 100644 index 07b461b3..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a8147ce1005eabe488e809a1eaadcc89 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset index df955828..975e3b2d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -17,8 +16,8 @@ MonoBehaviour: m_DurableName: ShinyHull m_Material: {fileID: 2100000, guid: faaa4d44fcfb417796be753ac0421ba3, type: 2} m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 + m_uv0Size: 2 + m_uv0Semantic: 0 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset.meta index 595474d4..663e117f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: aaaca97d63dd3d156ad1632b76baaf8d +timeCreated: 1529443767 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat index 5cd52e22..ae38c483 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: ShinyHull_16 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat.meta index 874e86ee..29639b46 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ShinyHull/ShinyHull_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: faaa4d44fcfb417796be753ac0421ba3 +timeCreated: 1498761536 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta deleted file mode 100644 index e0e7e1d4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 26ae29c30ecc3fa469b49325b6a6006f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset deleted file mode 100644 index 8d3278e3..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: SingleSided_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: f0a2298a-be80-432c-9fee-a86dcc06f4f9 - m_DurableName: SingleSided - m_Material: {fileID: 2100000, guid: f0a2298abe80432c9feea86dcc06f4f9, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta deleted file mode 100644 index d484fd03..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2b5f408092403755e919f0fc824bf6a3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat deleted file mode 100644 index 1f88a6a6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat +++ /dev/null @@ -1,77 +0,0 @@ -%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: SingleSided_16 - m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: dc60a5efa113ed54392f4ba836fbedd8, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta deleted file mode 100644 index 6823c9d3..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f0a2298abe80432c9feea86dcc06f4f9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset index b398bdb4..7279d835 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset.meta index 54c0be23..44f8ed52 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 84e07a49ce756cf44ab7ea2dbdc064c4 +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat index 0168be38..a6e7cd7b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Smoke m_Shader: {fileID: 4800000, guid: b00f8a3e2356b6144b32fe4a62905a7b, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat.meta index 77e9597b..5ccb5f46 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 70d79ccab1594f35990cf02193947fe8 +timeCreated: 1495148303 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader index 2e3e9ff1..07abbdc2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -35,19 +35,17 @@ Category { #pragma multi_compile_particles #pragma target 3.0 #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "../../../Shaders/Include/Particles.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; fixed4 _TintColor; struct v2f { - float4 pos : SV_POSITION; + float4 vertex : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -100,7 +98,7 @@ Category { center_WS.xyz += mul(xf_CS, float4(disp, 0)); float4 corner = OrientParticle_WS(center_WS.xyz, halfSize, v.vid, rotation); - o.pos = mul(UNITY_MATRIX_VP, corner); + o.vertex = mul(UNITY_MATRIX_VP, corner); o.color = v.color; v.color.a = 1; @@ -114,11 +112,6 @@ Category { float4 c = tex2D(_MainTex, i.texcoord); c *= i.color * _TintColor; c = SrgbToNative(c); -#if SELECTION_ON - float strength = length(c.rgb * c.a) * 3; - FRAG_MOBILESELECT(c) - c.rgb *= strength; -#endif return c; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader.meta index 7d73cf3a..0ca5e12e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: b00f8a3e2356b6144b32fe4a62905a7b +timeCreated: 1467773228 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset deleted file mode 100644 index d7f6f1ec..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Smoke_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 70d79cca-b159-4f35-990c-f02193947fe8 - m_DurableName: Smoke - m_Material: {fileID: 2100000, guid: 70d79ccab1594f35990cf02193947fe8, type: 2} - m_IsParticle: 1 - m_uv0Size: 4 - m_uv0Semantic: 5 - m_uv1Size: 3 - m_uv1Semantic: 1 - m_bUseNormals: 1 - m_normalSemantic: 1 - m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset.meta deleted file mode 100644 index 5fe2aa1b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 223b21ecc1428d44d93e74389a965196 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat deleted file mode 100644 index 3479d582..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat +++ /dev/null @@ -1,90 +0,0 @@ -%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: Smoke_16 - m_Shader: {fileID: 4800000, guid: b00f8a3e2356b6144b32fe4a62905a7b, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 5a1c975bb724e2a4ebdde0f9e9674023, 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: - - _BaseGain: 0.4 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EmissionGain: 300 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ScrollJitterFrequency: 0.2 - - _ScrollJitterIntensity: 0.02 - - _ScrollRate: 0.75 - - _Shininess: 0.078125 - - _SmoothnessTextureChannel: 0 - - _SparkleRate: 2.5 - - _SpecularHighlights: 1 - - _SpreadSize: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _WaveformFreq: 0.1 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _ScrollDistance: {r: 2, g: 6, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} - - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat.meta deleted file mode 100644 index 13d39645..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/Smoke_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8fded50f2c7e3ff4aa60d767631e7e66 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Smoke/maintexture.png index ea875d034f6cd6d88d3c3fbc4cbb55a499bb8cc4..4cb98e6f62b346df322e9e2c5786bb5965f466cb 100644 GIT binary patch literal 68701 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

&FVBdU3ay~dU2xvyqp%b#OL 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 literal 65492 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 Rew$FQ> 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 literal 39241 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 OfUVU9%VKknnEwH3^5^sb diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/maintexture.png.meta index 94f07b67..01d0aaa9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Stars/maintexture.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: e336afde05c4832408da68507aa57261 +timeCreated: 1440714591 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 1 - enableMipMap: 1 - sRGBTexture: 0 + enableMipMap: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 - borderMipMap: 1 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 + borderMipMap: 0 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,112 +20,39 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: 5 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset index 11de7ec9..a20ad278 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset.meta index 1d99263e..3ec12483 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 12b98790c761f47429559af03b6669d2 +timeCreated: 1495162082 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat index 8329b882..5c3f3878 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Streamers m_Shader: {fileID: 4800000, guid: d3f113ebb941b344eab871b7ff555989, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat.meta index c6a09a1a..6b78ff17 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 44bb800afbc34592842694ecb05ddec3 +timeCreated: 1481917490 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader index ca45b5fc..1f9fd1e7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -18,7 +18,7 @@ Properties { _Scroll1 ("Scroll1", Float) = 0 _Scroll2 ("Scroll2", Float) = 0 _DisplacementIntensity("Displacement", Float) = .1 - _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 + _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 } Category { @@ -38,12 +38,10 @@ Category { #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile_particles #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #pragma target 3.0 // Required -> compiler error: too many instructions for SM 2.0 #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -55,7 +53,7 @@ Category { }; struct v2f { - float4 pos : POSITION; + float4 vertex : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; float4 worldPos : TEXCOORD1; @@ -73,7 +71,7 @@ Category { v2f o; o.worldPos = mul(unity_ObjectToWorld, v.vertex); - o.pos = UnityObjectToClipPos(v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); o.color = v.color; return o; @@ -86,7 +84,7 @@ Category { } // Input color is srgb - fixed4 frag (v2f i) : COLOR + fixed4 frag (v2f i) : SV_Target { // Create parametric flowing UV's half2 uvs = i.texcoord; @@ -126,7 +124,6 @@ Category { float4 color = i.color * tex * exp(_EmissionGain * 5.0f); color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); - FRAG_MOBILESELECT(color) return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader.meta index de935bf1..9c0eaec4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: d3f113ebb941b344eab871b7ff555989 +timeCreated: 1443567489 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset deleted file mode 100644 index 0595ae50..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Streamers_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 44bb800a-fbc3-4592-8426-94ecb05ddec3 - m_DurableName: Streamers - m_Material: {fileID: 2100000, guid: 44bb800afbc34592842694ecb05ddec3, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset.meta deleted file mode 100644 index 143c006e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d77a6ccba6197d5429b222f034992612 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat deleted file mode 100644 index 7ab393fb..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat +++ /dev/null @@ -1,37 +0,0 @@ -%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: Streamers_16 - m_Shader: {fileID: 4800000, guid: d3f113ebb941b344eab871b7ff555989, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 448c9093ac3aecc41a1b6ab64a727073, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _DisplacementIntensity: 0.02 - - _EmissionGain: 0.4 - - _InvFade: 1 - - _Scroll1: 1 - - _Scroll2: 3 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat.meta deleted file mode 100644 index adc3f6ee..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/Streamers_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b2b018de7ec2bbb4fb261deb7171fa19 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/main.png.meta index 58559db6..bbca9919 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Streamers/main.png.meta @@ -1,9 +1,11 @@ fileFormatVersion: 2 guid: 448c9093ac3aecc41a1b6ab64a727073 +timeCreated: 1440714585 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 9 + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -11,7 +13,7 @@ TextureImporter: linearTexture: 1 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 + mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 @@ -21,8 +23,6 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 5 - mipBias: -100 + mipBias: -1 wrapU: -1 wrapV: -1 wrapW: -1 @@ -45,21 +45,18 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -69,8 +66,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -80,19 +76,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL + - buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -107,15 +91,7 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset index bcbf86bd..fe1390ae 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset.meta index 7bd4433b..5b4fe37f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 38f5be2edab11fa429b090756d26d000 +timeCreated: 1495162082 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat index cd836120..9303e545 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Taffy m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat.meta index bf920a73..6eefc56f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 0077f88cd93a42f3b59bb31c50cdb414 +timeCreated: 1481917494 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset deleted file mode 100644 index cc3d5d03..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Taffy_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 0077f88c-d93a-42f3-b59b-b31c50cdb414 - m_DurableName: Taffy - m_Material: {fileID: 2100000, guid: 0077f88cd93a42f3b59bb31c50cdb414, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset.meta deleted file mode 100644 index 1dd67117..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 56c831cfe8253c8499b7ea534671c9d9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat deleted file mode 100644 index 73cb099a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat +++ /dev/null @@ -1,78 +0,0 @@ -%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: Taffy_16 - m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - 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: 0758becf0979c9c42a2419c32260227b, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat.meta deleted file mode 100644 index 00e51dc5..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/Taffy_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: be043f2fcc85c764c9498d6c07ea2f4c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/main.png.meta index 7ee4dfdd..17b96685 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Taffy/main.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 0758becf0979c9c42a2419c32260227b +timeCreated: 1442276315 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: 1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset index 80edf87f..39b4043d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset.meta index 7c78fb3e..d5c4967c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: a713e4e48dc9bed57b2da96e510f3770 +timeCreated: 1529443775 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat index 95c29fc3..1af62f83 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: TaperedFlat_15 m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat.meta index ebfbdbf0..3fb2c60e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: b468c1fbf25441ed8ec957030bc5660c +timeCreated: 1496877602 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset deleted file mode 100644 index 7d410bc6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: TaperedFlat_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: b468c1fb-f254-41ed-8ec9-57030bc5660c - m_DurableName: TaperedFlat - m_Material: {fileID: 2100000, guid: b468c1fbf25441ed8ec957030bc5660c, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset.meta deleted file mode 100644 index ad09399b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4a18a2a26afe5df49a448b0a1446b987 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat deleted file mode 100644 index 76912811..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat +++ /dev/null @@ -1,78 +0,0 @@ -%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: TaperedFlat_16 - m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - 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: f3edc2a3ac909e640b160e04d7c1f116, 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.067 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat.meta deleted file mode 100644 index c4080f72..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/TaperedFlat_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e08e38fd0a6e35e4784a9d6a0f3af64d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/maintexture.png.meta index f05c4757..13d62136 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlat/maintexture.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: f3edc2a3ac909e640b160e04d7c1f116 +timeCreated: 1440714585 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,38 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: 2 aniso: 4 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: 1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset index 4bcf5251..30242d56 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset.meta index fe79b1fb..89699269 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: e7ec06c48c590ea4ebe400ce6a278efe +timeCreated: 1529443776 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat index a0213e37..4445fc2f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: TaperedFlat_0 m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat.meta index 2559e830..330fd8a7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: c8ccb53dae1345ef8afbb730d81394eb +timeCreated: 1496877602 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset deleted file mode 100644 index 02837d7d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: TaperedFlat_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: c8ccb53d-ae13-45ef-8afb-b730d81394eb - m_DurableName: TaperedFlat - m_Material: {fileID: 2100000, guid: c8ccb53dae1345ef8afbb730d81394eb, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset.meta deleted file mode 100644 index eace6633..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 93785a02ac6b05d459886fbf637434b1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat deleted file mode 100644 index 5229fd0c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat +++ /dev/null @@ -1,77 +0,0 @@ -%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: TaperedFlat_16 - m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: f3edc2a3ac909e640b160e04d7c1f116, 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.067 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat.meta deleted file mode 100644 index 87fe0c4e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedFlatSingleSided/TaperedFlat_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 873fce4e50d20484bac6467dfe3eb28d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta deleted file mode 100644 index 178458bb..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5f5e705a9ac3e8f41ba3debd2f46f385 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset deleted file mode 100644 index dae9bf0d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: TaperedHueShift_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 3d9755da-56c7-7294-9b1d-5ec349975f52 - m_DurableName: TaperedHueShift - m_Material: {fileID: 2100000, guid: 3d9755da56c772949b1d5ec349975f52, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta deleted file mode 100644 index 2b787832..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8c461ae8fae1efd5082fa32f46219e26 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat deleted file mode 100644 index e9e3fd57..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat +++ /dev/null @@ -1,78 +0,0 @@ -%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: TaperedHueShift_16 - m_Shader: {fileID: 4800000, guid: 8ba0f3c594b3c3243a67d6b96370de7b, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: cfe8e241b4edafc4dbcaaf50726d253d, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EmissionGain: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta deleted file mode 100644 index 8cd5c634..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3d9755da56c772949b1d5ec349975f52 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset index 0bc144e4..4301199c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset.meta index 538eb6dd..2466b72d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: b39f584eb1440404289d9461a0973e35 +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat index d6a6a98b..10598a0c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: TaperedMarker m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: EDGING_ON SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -60,7 +59,6 @@ Material: - _Cutoff: 0.067 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Edging: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -68,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat.meta index 5ba7ac16..50791072 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d90c6ad8af0f4b54b422e0f92abe1b3c +timeCreated: 1481917483 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset deleted file mode 100644 index e7ed5271..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: TaperedMarker_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: d90c6ad8-af0f-4b54-b422-e0f92abe1b3c - m_DurableName: TaperedMarker - m_Material: {fileID: 2100000, guid: d90c6ad8af0f4b54b422e0f92abe1b3c, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset.meta deleted file mode 100644 index bb77069c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6e625fa844480314da97f6513b4f369a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat deleted file mode 100644 index 6a67bb2e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: TaperedMarker_16 - m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: EDGING_ON SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - 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: 12b1499f1adf4d545a80f2ec18204030, 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.067 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _Edging: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat.meta deleted file mode 100644 index 5e51cfd1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/TaperedMarker_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b35c518ded57f54439e6298df8067e77 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/maintexture.png.meta index 789a3f3b..7df9a133 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker/maintexture.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 12b1499f1adf4d545a80f2ec18204030 +timeCreated: 1440714585 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,38 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: 2 aniso: 4 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + mipBias: -1 + wrapMode: 1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset index 6f1bd3a0..c4e83b03 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset.meta index 9eb79b22..b9489212 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 26d7464425c0b84479a8a21a695b194c +timeCreated: 1495162082 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat index 83685271..657efc6f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: TaperedMarker_Flat m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat.meta index 7e0946f6..99612faa 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 1a26b8c08a074f8a9facd2ef36e0cad0 +timeCreated: 1481917495 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset deleted file mode 100644 index b0cce09a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: TaperedMarker_Flat_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 1a26b8c0-8a07-4f8a-9fac-d2ef36e0cad0 - m_DurableName: TaperedMarker_Flat - m_Material: {fileID: 2100000, guid: 1a26b8c08a074f8a9facd2ef36e0cad0, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset.meta deleted file mode 100644 index ece417ad..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 14dd5597756a2a74da022c5ea3c5d81b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat deleted file mode 100644 index de755be8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat +++ /dev/null @@ -1,77 +0,0 @@ -%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: TaperedMarker_Flat_16 - m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 12b1499f1adf4d545a80f2ec18204030, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat.meta deleted file mode 100644 index 4832b71a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedMarker_Flat/TaperedMarker_Flat_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 652f3175541845346b6f58ca8101964a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta deleted file mode 100644 index 424efd69..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8da6609618250b541ba7ead1a2ea358a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset deleted file mode 100644 index 7c82b22e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: TaperedWire_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 9568870f-8594-60f4-1b20-dfbc8a5eac0e - m_DurableName: TaperedWire - m_Material: {fileID: 2100000, guid: 9568870f859460f41b20dfbc8a5eac0e, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta deleted file mode 100644 index b591eb91..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c9e9a86997c0a75184dfed9299d2664 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat deleted file mode 100644 index c8fa5333..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat +++ /dev/null @@ -1,79 +0,0 @@ -%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: TaperedWire_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 35c509404b758af4fb07fb3dc1ca76f0, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.09558821, g: 0.09558821, b: 0.09558821, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta deleted file mode 100644 index f44e9dc9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9568870f859460f41b20dfbc8a5eac0e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta deleted file mode 100644 index 39961c09..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 805dfe4251b6e57429e137dd7ab2ac59 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset deleted file mode 100644 index be4325f5..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: ThickGeometry_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 39ee7377-7a9e-47a7-a0f8-0c77712f75d3 - m_DurableName: ThickGeometry - m_Material: {fileID: 2100000, guid: 39ee73777a9e47a7a0f80c77712f75d3, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 0 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta deleted file mode 100644 index a6d47647..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b4ce13e091416ef5ea08f0fd3df1156c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat deleted file mode 100644 index 08bd0d59..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: ThickGeometry_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3} - 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: 1819abb411411e243b701e7dd664ac9a, 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.2 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.414 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta deleted file mode 100644 index 815b19ba..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 39ee73777a9e47a7a0f80c77712f75d3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset index e2317f78..bafadb5c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset.meta index 3648c109..0000519b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: de4112b6c3a19ae5bb03397212a78339 +timeCreated: 1529443778 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat index a0d5f0a2..abfbcf68 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: ThickPaint_15 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat.meta index 83944dfb..040af02f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_15.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 75b32cf0fdd64d89a64be2a00b247b0f +timeCreated: 1496877269 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset deleted file mode 100644 index dc32afab..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: ThickPaint_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 75b32cf0-fdd6-4d89-a64b-e2a00b247b0f - m_DurableName: ThickPaint - m_Material: {fileID: 2100000, guid: 75b32cf0fdd64d89a64be2a00b247b0f, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset.meta deleted file mode 100644 index eb8d56be..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ecfcc5034e7fb7347b5a07c5743a9e1b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat deleted file mode 100644 index 363a935b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: ThickPaint_16 - m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: adae364a85e64564f8a75e1c0c9958e7, type: 3} - 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: b0bde6581a3229a4aa4a2d294da9d00f, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.4 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat.meta deleted file mode 100644 index 863bf764..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/ThickPaint_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 76ce22899a154a44ca89150f84e94fe1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke.png.meta index 87df5740..39f005c7 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke.png.meta @@ -1,110 +1,55 @@ fileFormatVersion: 2 guid: b0bde6581a3229a4aa4a2d294da9d00f +timeCreated: 1440714592 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke_bump.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke_bump.png.meta index 9e0e3405..ec6178e3 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke_bump.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaint/streakystroke_bump.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: adae364a85e64564f8a75e1c0c9958e7 +timeCreated: 1491942709 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,39 @@ TextureImporter: heightScale: 0.1 normalMapFilter: 1 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 1 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset index 057d8bee..877d59f2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset.meta index 7fa5b032..47019a67 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 94cb84ebeec44c540bb15b32797e5a98 +timeCreated: 1529443779 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat index fc69fa4f..e637d55b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: ThickPaint_0 m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat.meta index d49ac5bd..1183b84b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_0.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: fdf0326ac0d14fedb1019db0ff6d071f +timeCreated: 1496877269 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset deleted file mode 100644 index 611864b3..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: ThickPaint_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: fdf0326a-c0d1-4fed-b101-9db0ff6d071f - m_DurableName: ThickPaint - m_Material: {fileID: 2100000, guid: fdf0326ac0d14fedb1019db0ff6d071f, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset.meta deleted file mode 100644 index 77c707d3..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 302e0cbfcebefbb4fa956278fa38973c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat deleted file mode 100644 index dda3b145..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: ThickPaint_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: adae364a85e64564f8a75e1c0c9958e7, type: 3} - 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: b0bde6581a3229a4aa4a2d294da9d00f, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.4 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat.meta deleted file mode 100644 index 914e609b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickPaintSingleSided/ThickPaint_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4f036576123be68408c2e7cf73788386 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset index 8cbdec49..f3060669 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset.meta index 146e8bad..ed67ee9a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: b8a2349e67797ea4593639454ef74543 +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat index 4111032c..9fcb44eb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Toon m_Shader: {fileID: 4800000, guid: f642cb91c8b664571967bdb587334e76, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat.meta index c83e0017..837f9723 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 4391385adf7343969e3331e4e4930b27 +timeCreated: 1481917489 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader index f86cdde1..73efff32 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -22,11 +22,9 @@ CGINCLUDE #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET #pragma multi_compile_fog - #pragma multi_compile __ SELECTION_ON #pragma target 3.0 sampler2D _MainTex; float4 _MainTex_ST; @@ -40,7 +38,7 @@ CGINCLUDE }; struct v2f { - float4 pos : SV_POSITION; + float4 vertex : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; UNITY_FOG_COORDS(1) @@ -67,11 +65,11 @@ CGINCLUDE // Technically these are not yet in NDC because they haven't been divided by W, so their // range is currently [-W, W]. - o.pos = UnityObjectToClipPos(float4(v.vertex.xyz + v.normal.xyz * bulge, v.vertex.w)); + o.vertex = UnityObjectToClipPos(float4(v.vertex.xyz + v.normal.xyz * bulge, v.vertex.w)); float4 outline_NDC = UnityObjectToClipPos(float4(v.vertex.xyz + v.normal.xyz * inflate, v.vertex.w)); // Displacement in proper NDC coords (e.g. [-1, 1]) - float3 disp = outline_NDC.xyz / outline_NDC.w - o.pos.xyz / o.pos.w; + float3 disp = outline_NDC.xyz / outline_NDC.w - o.vertex.xyz / o.vertex.w; // Magnitude is a scaling factor to shrink large outlines down to a max width, in NDC space. // Notice here we're only measuring 2D displacment in X and Y. @@ -83,19 +81,19 @@ CGINCLUDE // component so both sides of the += operator below are in the same space. Also note // that the w component is a function of depth, so modifying X and Y independent of Z // should mean that the original w value remains valid. - o.pos.xyz += float3(disp.xy * mag, disp.z) * o.pos.w * outlineEnabled; + o.vertex.xyz += float3(disp.xy * mag, disp.z) * o.vertex.w * outlineEnabled; // Push Z back to avoid z-fighting when scaled very small. This is not legit, // mathematically speaking and likely causes crazy surface derivitives. - o.pos.z -= disp.z * o.pos.w * outlineEnabled; - - o.color = v.color; - o.color.a = 1; - o.color.xyz += worldNormal.y *.2; - o.color.xyz = max(0, o.color.xyz); - o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); - UNITY_TRANSFER_FOG(o, o.pos); - return o; + o.vertex.z -= disp.z * o.vertex.w * outlineEnabled; + + o.color = v.color; + o.color.a = 1; + o.color.xyz += worldNormal.y *.2; + o.color.xyz = max(0, o.color.xyz); + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + UNITY_TRANSFER_FOG(o, o.vertex); + return o; } v2f vert (appdata_t v) @@ -114,14 +112,12 @@ CGINCLUDE { float4 color = float4(0,0,0,1); UNITY_APPLY_FOG(i.fogCoord, color); - FRAG_MOBILESELECT(color) return color; } fixed4 fragColor (v2f i) : SV_Target { UNITY_APPLY_FOG(i.fogCoord, i.color); - FRAG_MOBILESELECT(i.color) return i.color; } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader.meta index 7d1978c9..b6d1db0f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: f642cb91c8b664571967bdb587334e76 +timeCreated: 1466953084 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset deleted file mode 100644 index da40d909..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Toon_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 4391385a-df73-4396-9e33-31e4e4930b27 - m_DurableName: Toon - m_Material: {fileID: 2100000, guid: 4391385adf7343969e3331e4e4930b27, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset.meta deleted file mode 100644 index a8bfaf6e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dffc61528de4c4f4d90eb8b7e03c70eb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat deleted file mode 100644 index f31ea5fd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat +++ /dev/null @@ -1,37 +0,0 @@ -%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: Toon_16 - m_Shader: {fileID: 4800000, guid: f642cb91c8b664571967bdb587334e76, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Illum: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _EmissionGain: 0.5 - - _EmissionLM: 0 - - _InvFade: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat.meta deleted file mode 100644 index e24fd500..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Toon/Toon_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 60a0a1db78bcd9d49b4a785d0f680762 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta deleted file mode 100644 index 0a492d98..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b7f4c966e56705948becbdfcf4f9cccf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset deleted file mode 100644 index 59d4a2ed..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: TubeAdditive_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: c1c9b26d-673a-4dc6-b373-51715654ab96 - m_DurableName: TubeAdditive - m_Material: {fileID: 2100000, guid: c1c9b26d673a4dc6b37351715654ab96, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta deleted file mode 100644 index 5fc46ff0..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 53ec6eb494e328f5dafde9b5de65f9c8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat deleted file mode 100644 index de643298..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat +++ /dev/null @@ -1,34 +0,0 @@ -%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: TubeAdditive_16 - m_Shader: {fileID: 4800000, guid: 884e980aab67a7e429223bbe0b9a91f6, type: 3} - m_ShaderKeywords: SELECTION_EDGING - m_LightmapFlags: 5 - 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: - - _InvFade: 1 - - _SelectionEdging: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta deleted file mode 100644 index c0c2c059..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c1c9b26d673a4dc6b37351715654ab96 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta deleted file mode 100644 index 6743c052..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 66d3539f85fd39049983df3b263c1346 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader deleted file mode 100644 index c41d48cd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright 2020 The Tilt Brush Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -Shader "Brush/Special/TubeToonInverted" { -Properties { - _MainTex ("Base (RGB) Trans (A)", 2D) = "white" {} -} - -CGINCLUDE - - #pragma multi_compile __ TBT_LINEAR_TARGET - - #include "UnityCG.cginc" - #include "../../../Shaders/Include/Brush.cginc" - #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - sampler2D _MainTex; - float4 _MainTex_ST; - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float3 normal : NORMAL; - float2 texcoord : TEXCOORD0; - }; - - struct v2f { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - v2f vertInflate (appdata_t v, float inflate) - { - - v2f o; - v.vertex.xyz += v.normal.xyz * inflate; - o.vertex = UnityObjectToClipPos(v.vertex); - o.color = v.color; - o.color.a = 1; - o.color.xyz += v.normal.y *.2; - o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); - return o; - } - - v2f vert (appdata_t v) - { - return vertInflate(v,0); - } - - v2f vertEdge (appdata_t v) - { - // As the scale goes up, we want the outline to be smaller, almost as if it's in screenspace - // however we don't want the outline to be a constant size, it should get smaller as the - // stroke gets further from camera, to avoid distant strokes turning into a big black mess. - float scale = length(mul(xf_I_CS, float3(0.05, 0, 0))); - return vertInflate(v, scale); - } - - fixed4 fragBlack (v2f i) : SV_Target - { - return float4(0,0,0,1); - } - - fixed4 fragColor (v2f i) : SV_Target - { - return i.color; - } - -ENDCG - - - -SubShader { - Cull Back - Pass{ - CGPROGRAM - #pragma vertex vert - #pragma fragment fragBlack - ENDCG - } - - Cull Front - Pass{ - CGPROGRAM - #pragma vertex vertEdge - #pragma fragment fragColor - ENDCG - } - } -Fallback "Diffuse" -} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta deleted file mode 100644 index 4c07e6b1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: ceb199b0f4e9d4be4a55978cfb864132 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset deleted file mode 100644 index 1c360297..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: TubeToonInverted_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 9871385a-df73-4396-9e33-31e4e4930b27 - m_DurableName: TubeToonInverted - m_Material: {fileID: 2100000, guid: 9871385adf7343969e3331e4e4930b27, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta deleted file mode 100644 index 026bb9c0..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3fd7519544b911b50a0f5ace4d3bbb50 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat deleted file mode 100644 index e4766a1c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat +++ /dev/null @@ -1,37 +0,0 @@ -%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: TubeToonInverted_16 - m_Shader: {fileID: 4800000, guid: ceb199b0f4e9d4be4a55978cfb864132, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Illum: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.5 - - _EmissionGain: 0.5 - - _EmissionLM: 0 - - _InvFade: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta deleted file mode 100644 index 1e36904d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9871385adf7343969e3331e4e4930b27 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset index 9b81b94c..84b05eb5 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -17,8 +16,8 @@ MonoBehaviour: m_DurableName: UnlitHull m_Material: {fileID: 2100000, guid: a8fea537da7c4d4b817f24f074725d6d, type: 2} m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 + m_uv0Size: 2 + m_uv0Semantic: 0 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset.meta index d49f1981..33f6f9d4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: e6226d3ece719e15aae431e9b1bacf2d +timeCreated: 1529443780 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat index cee9c167..e5c430bb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: UnlitHull_16 m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat.meta index d177bb00..a4d3064b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/UnlitHull/UnlitHull_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: a8fea537da7c4d4b817f24f074725d6d +timeCreated: 1498761536 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset index f85b67d9..baeab07d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset.meta index 7251247e..c41a8632 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 5398e778cce3fdf469bbfa388aa46d5d +timeCreated: 1495162082 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat index 7bc81400..e097abeb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: VelvetInk m_Shader: {fileID: 4800000, guid: bfa82537bb6dcf94a8d673eb2ac036f0, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat.meta index 63566e5a..c4327b8c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: d229d335c334495aa801660ac8a87360 +timeCreated: 1481917487 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader index 04413c4f..7489d3ec 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -32,10 +32,8 @@ Category { #pragma fragment frag #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; @@ -47,7 +45,7 @@ Category { }; struct v2f { - float4 pos : POSITION; + float4 vertex : SV_POSITION; fixed4 color : COLOR; float2 texcoord : TEXCOORD0; }; @@ -68,16 +66,15 @@ Category { #else o.color = TbVertToNative(v.color); #endif - o.pos = UnityObjectToClipPos(v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); + return o; } - fixed4 frag (v2f i) : COLOR + fixed4 frag (v2f i) : SV_Target { half4 c = tex2D(_MainTex, i.texcoord ); - c = i.color * c; - FRAG_MOBILESELECT(c) - return c; + return i.color * c; } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader.meta index fce1f6df..e6d0b87b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: bfa82537bb6dcf94a8d673eb2ac036f0 +timeCreated: 1468367742 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset deleted file mode 100644 index c81df8dc..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: VelvetInk_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: d229d335-c334-495a-a801-660ac8a87360 - m_DurableName: VelvetInk - m_Material: {fileID: 2100000, guid: d229d335c334495aa801660ac8a87360, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset.meta deleted file mode 100644 index 11ca4a8b..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ca1b285cd96d183408d1a0e25bda4982 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat deleted file mode 100644 index 82be31b4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat +++ /dev/null @@ -1,27 +0,0 @@ -%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: VelvetInk_16 - m_Shader: {fileID: 4800000, guid: bfa82537bb6dcf94a8d673eb2ac036f0, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 23f34828bab17994180c05cba4679802, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: [] - m_Colors: [] diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat.meta deleted file mode 100644 index 810b9de8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/VelvetInk_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c29e1d6575a8336448bc09a0a42a412a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/maintexture.png.meta index bacece6b..d249c2a4 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/maintexture.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/VelvetInk/maintexture.png.meta @@ -1,121 +1,55 @@ fileFormatVersion: 2 guid: 23f34828bab17994180c05cba4679802 +timeCreated: 1440714585 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset index b5dcb296..b9c10d54 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset.meta index 806037ba..770c25e9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: ebe8a9d99afbd6b46909ea24a9896258 +timeCreated: 1495162083 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat index 911cab98..4f6ad65d 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Waveform m_Shader: {fileID: 4800000, guid: 9296f4d6e8a59fa4b86aa34b80d895ba, type: 3} m_ShaderKeywords: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat.meta index 3eb415fd..fb057adb 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 10201aa3ebc242d884b72e63f6eeb8ab +timeCreated: 1481917488 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader index 8ca35b54..23d158d2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -36,11 +36,9 @@ Category { #pragma multi_compile_particles #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON #include "UnityCG.cginc" #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" sampler2D _MainTex; float4 _MainTex_ST; @@ -53,7 +51,7 @@ Category { }; struct v2f { - float4 pos : POSITION; + float4 vertex : SV_POSITION; float4 color : COLOR; float2 texcoord : TEXCOORD0; float4 unbloomedColor : TEXCOORD1; @@ -64,7 +62,7 @@ Category { v.color = TbVertToSrgb(v.color); v2f o; - o.pos = UnityObjectToClipPos(v.vertex); + o.vertex = UnityObjectToClipPos(v.vertex); o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); o.color = bloomColor(v.color, _EmissionGain); o.unbloomedColor = v.color; @@ -72,7 +70,7 @@ Category { } // Input colors are srgb - fixed4 frag (v2f i) : COLOR + fixed4 frag (v2f i) : SV_Target { // Envelope float envelope = sin(i.texcoord.x * 3.14159); @@ -92,7 +90,6 @@ Category { color = i.color * color; color = float4(color.rgb * color.a, 1.0); color = SrgbToNative(color); - FRAG_MOBILESELECT(color) return color; } ENDCG diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader.meta index f5802dbe..c4646055 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 9296f4d6e8a59fa4b86aa34b80d895ba +timeCreated: 1456355323 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset deleted file mode 100644 index 59958a78..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Waveform_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 10201aa3-ebc2-42d8-84b7-2e63f6eeb8ab - m_DurableName: Waveform - m_Material: {fileID: 2100000, guid: 10201aa3ebc242d884b72e63f6eeb8ab, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset.meta deleted file mode 100644 index a4fd1311..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 47b2b5bdc01fa7a40a157c51c0712a34 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat deleted file mode 100644 index 2116f64a..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat +++ /dev/null @@ -1,36 +0,0 @@ -%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: Waveform_16 - m_Shader: {fileID: 4800000, guid: 9296f4d6e8a59fa4b86aa34b80d895ba, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 2e1a7d5cb3753244e97923f78cc37197, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _EmissionGain: 0.51785713 - - _InvFade: 1 - - _ScrollSpeed: 0 - - _VertexDisplacement: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat.meta deleted file mode 100644 index be34aae6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/Waveform_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2096de12452497441b911d5e967737ba -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/waveform.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/waveform.png.meta index 56d48281..6f5a144b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/waveform.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Waveform/waveform.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 2e1a7d5cb3753244e97923f78cc37197 +timeCreated: 1440714594 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,68 +20,38 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 64 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 2 - mipBias: -100 - wrapU: 0 - wrapV: 0 - wrapW: 0 + mipBias: -1 + wrapMode: 0 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 64 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: 5 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta deleted file mode 100644 index 905400aa..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ce4257954f47ef54eb6152c074d5ff63 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader deleted file mode 100644 index 7d11336c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2020 The Tilt Brush Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -Shader "Brush/Visualizer/WaveformFFT" { -Properties { - _MainTex ("Particle Texture", 2D) = "white" {} - _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 -} - -Category { - Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } - Blend One One // SrcAlpha One - BlendOp Add, Min - AlphaTest Greater .01 - ColorMask RGBA - Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } - - SubShader { - Pass { - - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma target 3.0 - #pragma multi_compile_particles - #pragma multi_compile __ AUDIO_REACTIVE - #pragma multi_compile __ TBT_LINEAR_TARGET - - #include "UnityCG.cginc" - #include "../../../Shaders/Include/Brush.cginc" - - sampler2D _MainTex; - float4 _MainTex_ST; - float _EmissionGain; - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - struct v2f { - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - float4 unbloomedColor : TEXCOORD1; - }; - - v2f vert (appdata_t v) - { - - v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); - o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); - o.color = bloomColor(v.color, _EmissionGain); - o.unbloomedColor = v.color; - return o; - } - - fixed4 frag (v2f i) : COLOR - { - // Envelope - float envelope = 1; //sin(i.texcoord.x * 3.14159); - -#ifdef AUDIO_REACTIVE - float waveform = (tex2D(_FFTTex, float2(.5 - i.texcoord.x,0)).b); -#else - float waveform = .15 * sin( -30 * i.unbloomedColor.r * _Time.w + i.texcoord.x * 100 * i.unbloomedColor.r); - waveform += .15 * sin( -40 * i.unbloomedColor.g * _Time.w + i.texcoord.x * 100 * i.unbloomedColor.g); - waveform += .15 * sin( -50 * i.unbloomedColor.b * _Time.w + i.texcoord.x * 100 * i.unbloomedColor.b); -#endif - - float pinch = (1 - envelope) * 40 + 20; - //float procedural_line = saturate(1 - pinch*abs(i.texcoord.y + -waveform * envelope)); - float procedural_line = abs(i.texcoord.y - .5) > waveform ? 0 : waveform ; //saturate(1 - pinch*abs(i.texcoord.y + -waveform * envelope)); - float4 color = 1; - color.rgb *= envelope * procedural_line; - color = i.color * color; - return float4(color.rgb * color.a, 1.0); - } - ENDCG - } - } -} -} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta deleted file mode 100644 index 391d3e64..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 9f5c12f3acbb626408e96c20bb9f072a -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset deleted file mode 100644 index f3dcaf91..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: WaveformFFT_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: d120944d-772f-4062-99c6-46a6f219eeaf - m_DurableName: WaveformFFT - m_Material: {fileID: 2100000, guid: d120944d772f406299c646a6f219eeaf, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta deleted file mode 100644 index aac2a72d..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: af3d0280849bf6a5989c2223b37ac07b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat deleted file mode 100644 index bd5b598e..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat +++ /dev/null @@ -1,36 +0,0 @@ -%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: WaveformFFT_16 - m_Shader: {fileID: 4800000, guid: 9f5c12f3acbb626408e96c20bb9f072a, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 2e1a7d5cb3753244e97923f78cc37197, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _EmissionGain: 0.51785713 - - _InvFade: 1 - - _ScrollSpeed: 0 - - _VertexDisplacement: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta deleted file mode 100644 index 3d625c37..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d120944d772f406299c646a6f219eeaf -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta deleted file mode 100644 index 921ade88..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 36a848a37abb52a41a413f024c6c07cb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader deleted file mode 100644 index b9aff339..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright 2020 The Tilt Brush Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -Shader "Brush/Visualizer/WaveformParticles" { -Properties { - _TintColor ("Tint Color", Color) = (0.5,0.5,0.5,0.5) - _MainTex ("Particle Texture", 2D) = "white" {} -} - -Category { - Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } - Blend One One - BlendOp Add, Min - AlphaTest Greater .01 - ColorMask RGBA - Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } - - SubShader { - Pass { - - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma target 3.0 - #pragma glsl - #pragma multi_compile __ AUDIO_REACTIVE - #pragma multi_compile __ TBT_LINEAR_TARGET - #include "UnityCG.cginc" - #include "../../../Shaders/Include/Brush.cginc" - #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - #include "../../../Shaders/Include/Math.cginc" - - sampler2D _MainTex; - fixed4 _TintColor; - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - float4 texcoord1 : TEXCOORD1; - float3 tangent : TANGENT; - }; - - struct v2f { - float4 vertex : SV_POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - float3 worldPos : TEXCOORD1; - float lifetime : TEXCOORD2; - }; - - float4 _MainTex_ST; - - v2f vert (appdata_t v) - { - - v2f o; - float4 worldPos = mul(unity_ObjectToWorld, v.vertex); - float3 perVertOffset = v.texcoord1.xyz; - float lifetime = _Time.y - v.texcoord1.w; - o.lifetime = lifetime; - float release = saturate(lifetime * .1); - float3 localMidpointPos = v.vertex.xyz - perVertOffset; - float4 worldMidpointPos = mul(unity_ObjectToWorld, localMidpointPos); - -#ifdef AUDIO_REACTIVE - lifetime = -lifetime*.1 + _BeatOutputAccum.x; - -#endif - - float time = lifetime; - float d = 10 + v.color.g * 3; - float freq = 1.5 + v.color.r; - float3 disp = float3(1,0,0) * curlX(worldMidpointPos.xyz * freq + time, d); - disp += float3(0,1,0) * curlY(worldMidpointPos.xyz * freq +time, d); - disp += float3(0,0,1) * curlZ(worldMidpointPos.xyz * freq + time, d); - - worldMidpointPos.xyz += release * disp * 10; - worldPos.xyz = worldMidpointPos.xyz + perVertOffset; - - o.vertex = mul(UNITY_MATRIX_VP, worldPos); - o.color = v.color; - o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); - o.worldPos = worldPos.xyz; - return o; - } - - fixed4 frag (v2f i) : SV_Target - { - - float4 c = i.color * _TintColor * tex2D(_MainTex, i.texcoord); - return float4(c.rgb * c.a, 1.0); - } - ENDCG - } - } -} -} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta deleted file mode 100644 index 9628e55f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: e12e59eb54a018044abc88e7ccf3d195 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset deleted file mode 100644 index d3eae740..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: WaveformParticles_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 6a1cf9f9-032c-45ec-9b6e-a6680bee30f7 - m_DurableName: WaveformParticles - m_Material: {fileID: 2100000, guid: 6a1cf9f9032c45ec9b6ea6680bee30f7, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 4 - m_uv1Semantic: 2 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta deleted file mode 100644 index bb8a203f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e8beca0f9aca87a57b219b821606fcaa -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat deleted file mode 100644 index 6a4525f4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat +++ /dev/null @@ -1,39 +0,0 @@ -%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: WaveformParticles_16 - m_Shader: {fileID: 4800000, guid: e12e59eb54a018044abc88e7ccf3d195, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: b5cd5e924951cf4499488769052fedfe, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BaseGain: 0.4 - - _EmissionGain: 1 - - _InvFade: 1 - - _ScrollSpeed: 0 - - _VertexDisplacement: 0 - - _WaveformFreq: 0.2 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} - - _WaveformIntensity: {r: 0, g: 0.3, b: 0, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta deleted file mode 100644 index 2efc3bac..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6a1cf9f9032c45ec9b6ea6680bee30f7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png deleted file mode 100644 index 865095df5f223d15090f12f387144604538b0010..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16908 zcmeI4UuYaf7{DiKG-=X52Z9DIx?H7L=-uw#-|TX^Cb>(SfR~0Ok`y9jZ+9+Pa<_Zk z-87eikVQWMF|m;# z%#vjG`@Z?UnfcAkH@gp;mj(xp?rwd&6#%fizb`oiKm)pM04)!rV%&H;V@u}H(H?MV zY2R%m?9BHaHvwpS#Qtpn7hi8j%4VxS)!Y1CbIXoH!Gmx88bhiPt9Q&gqGlm8Amt!P zh~uUqk6Y>SZqtO8IX(nUea4WXIo@N;m{WEsnW{WKDxHKG-N+3}hNa3`q|ZsJX2F6r zV?cjio17b8S_B|=OC1@r#!}CUvYzuxik^o4LN1RQMz+I+yd+OUi%G*tRqOQL{rD3v zqbi-=(Qt}Or5Zjc#E4KfMcfK1pQ@yT2y%0vY}AC5*t(L+pt->7BByyvVY%v$Ou$pkFs8SzZtXmJ6_ffDhI1nRA*Y6?~ex z-w9HVlZ2*hsCi4(HO7uBrS%!B)9bYxs$8XUTGpcHeK5HI~vA9chzN^t-QnFwit;dj$=X`u*ghz`pCb5H8WR^5kXGqXC#1Pgv5~Gj^V0_$3Xi>kt}ILQQUQ1aTHm!6N6;M)tod5 zS(FQ6Y*p#1Sy@$LLeJ_3>K2R#V{AQjU9bK`V$jetD0#(EdSvYM=k|7)>$)d(dB)xq z-5N@7Xf93H9HW^o?)x5Ta;>&($f|KC>nOUcDq^+I=}eeYlv;#wCxbp3s> zB@Dsi^FV9SdC(~NB_)BTHCTklZb zidn0D=5V5tH_n#LoU;Sh=D_l4P@6Mj_VbvC@-5o`QZdi*F}6lmT{BMoF*|Q&XNvWs z0S;X(Z~ra1y3M%jak8u1jJsAnpVL$;jt=i)M=`a_%YJBdo@j>A`wfhvq2VgL_MlpT z*|DUG9!E?&>j%P-k`r#J>v?=#PnV_S=}eUCJ*0SOIa>6VgI=)M${SYAc~&`Xw(_Pr zq^*pK#iEU1K*%D+MdpK9DJ~2MS){ngd@w7;g#jUp6c?EfW~I0=AY_r^BJ;tl6c+}B zEK*!#KA4r_!hn!Pii^w#vr=3b5VA;dk@;X&iVFim7AY<=AIwT|VL-?t#YN_WSt%|I z2w9}K$b2v>#f1SOixd}`4`!vfFd$@+;v)0GtP~dpge+2AWImXc;=+KCMT(2e2eVRK z7!a~Zagq68R*DM)LKZ15G9S!JabZBnBE?1KgIOsq3^{ZL$#m* zhG+87K%XsMzjpZ+08NkfC%Z=qH}BlMn(FBWy*HY#upb0&?|S#j-A1)*^oKWw7Y`kn zi@x{T7bo_8nR_*Nui@a2xu=%36pYNZ;l2Ubk1+Wk0t0ZgDSon<#)v@ewXTbwYPDCSq5h&N8GGT`i9r?9)RQGe9% z{)%JCe-p)LpgrESV`9~_Yknocp+HyvQ^oH)23H>b>alk&9I^jjLVxc-@>0*li+=<5 CTRfxy diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta deleted file mode 100644 index 365d5618..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta +++ /dev/null @@ -1,121 +0,0 @@ -fileFormatVersion: 2 -guid: b5cd5e924951cf4499488769052fedfe -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader index 3153095e..701eaa1a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -13,78 +13,58 @@ // limitations under the License. Shader "Brush/Visualizer/WaveformPulse" { - Properties { _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 } -SubShader { - Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } - Blend One One - Cull Off ZWrite Off - - CGPROGRAM - #pragma target 4.0 - #pragma surface surf StandardSpecular vertex:vert - - #pragma multi_compile __ AUDIO_REACTIVE - #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON - // Faster compiles - #pragma skip_variants INSTANCING_ON + SubShader { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One + Cull off ZWrite Off - #include "../../../Shaders/Include/Brush.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" + CGPROGRAM + #pragma target 3.0 + #pragma surface surf StandardSpecular vertex:vert + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + #include "../../../Shaders/Include/Brush.cginc" - struct appdata { - float4 vertex : POSITION; - float3 texcoord : TEXCOORD0; - float3 texcoord1 : TEXCOORD1; - float3 texcoord2 : TEXCOORD2; - half3 normal : NORMAL; - fixed4 color : COLOR; - float4 tangent : TANGENT; - UNITY_VERTEX_INPUT_INSTANCE_ID - }; + struct Input { + float4 color : Color; + float2 tex : TEXCOORD0; + float3 viewDir; + float3 worldNormal; + INTERNAL_DATA + }; - struct Input { - float4 color : Color; - float2 tex : TEXCOORD0; - float3 viewDir; - float3 worldNormal; - INTERNAL_DATA - }; + float _EmissionGain; - float _EmissionGain; + void vert (inout appdata_full i, out Input o) { + UNITY_INITIALIZE_OUTPUT(Input, o); + o.color = TbVertToSrgb(o.color); + o.tex = i.texcoord; + } - void vert (inout appdata i, out Input o) { - UNITY_INITIALIZE_OUTPUT(Input, o); - o.color = TbVertToSrgb(o.color); - o.tex = i.texcoord; - } - - // Input color is srgb - void surf (Input IN, inout SurfaceOutputStandardSpecular o) { - o.Smoothness = .8; - o.Specular = .05; - float audioMultiplier = 1; + // Input color is srgb + void surf (Input IN, inout SurfaceOutputStandardSpecular o) { + o.Smoothness = .8; + o.Specular = .05; + float audioMultiplier = 1; #ifdef AUDIO_REACTIVE - audioMultiplier += audioMultiplier * _BeatOutput.x; - IN.tex.x -= _BeatOutputAccum.z; - IN.color += IN.color * _BeatOutput.w * .25; + audioMultiplier += audioMultiplier * _BeatOutput.x; + IN.tex.x -= _BeatOutputAccum.z; + IN.color += IN.color * _BeatOutput.w * .25; #else - IN.tex.x -= _Time.x*15; + IN.tex.x -= _Time.x*15; #endif - IN.tex.x = fmod( abs(IN.tex.x),1); - float neon = saturate(pow( 10 * saturate(.2 - IN.tex.x),5) * audioMultiplier); - float4 bloom = bloomColor(IN.color, _EmissionGain); - float3 n = WorldNormalVector (IN, o.Normal); - half rim = 1.0 - saturate(dot (normalize(IN.viewDir), n)); - bloom *= pow(1-rim,5); - o.Emission = SrgbToNative(bloom * neon); - SURF_FRAG_MOBILESELECT(o); - } - ENDCG -} // SubShader - -} // Shader + IN.tex.x = fmod( abs(IN.tex.x),1); + float neon = saturate(pow( 10 * saturate(.2 - IN.tex.x),5) * audioMultiplier); + float4 bloom = bloomColor(IN.color, _EmissionGain); + float3 n = WorldNormalVector (IN, o.Normal); + half rim = 1.0 - saturate(dot (normalize(IN.viewDir), n)); + bloom *= pow(1-rim,5); + o.Emission = SrgbToNative(bloom * neon); + } + ENDCG + } +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader.meta index 50e9fd1b..d8ce7c82 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/NeonPulse.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 39f9ec0559d25f44bad64ce4dbc8a0c4 +timeCreated: 1457493617 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/main.png.meta index 93617eb3..827e01a8 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformPulse/main.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 7c9e2c33abd01d5468b670b8d02d6925 +timeCreated: 1457494445 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,38 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 32 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: 5 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta deleted file mode 100644 index 1bdebb28..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 811945857d8db654ba8ac8482fbe47a6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader deleted file mode 100644 index 7965924f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright 2020 The Tilt Brush Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -Shader "Brush/Visualizer/WaveformTube" { -Properties { - _MainTex ("Particle Texture", 2D) = "white" {} - _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 -} - -Category { - Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } - Blend One One //SrcAlpha One - BlendOp Add, Min - AlphaTest Greater .01 - ColorMask RGBA - Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } - - SubShader { - Pass { - - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma multi_compile_particles - #pragma multi_compile __ TBT_LINEAR_TARGET - - #include "UnityCG.cginc" - #include "../../../Shaders/Include/Brush.cginc" - - sampler2D _MainTex; - float4 _MainTex_ST; - float _EmissionGain; - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - struct v2f { - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - v2f vert (appdata_t v) - { - - v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); - o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); - - o.color = bloomColor(v.color, _EmissionGain); - return o; - } - - fixed4 frag (v2f i) : COLOR - { - i.texcoord.x -= _BeatOutputAccum.x; - i.texcoord.y += i.texcoord.x; - i.texcoord.x *= .25; - - float wav = (tex2D(_WaveFormTex, float2(i.texcoord.x,0)).r - .5f); - i.texcoord.y += wav; - float4 c = i.color * tex2D(_MainTex, i.texcoord); - return float4(c.rgb * c.a, 1.0); - } - ENDCG - } - } -} -} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta deleted file mode 100644 index 2e7cf2e1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: d1e570f96a7a4f54fb9dc544cbfa5cbf -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset deleted file mode 100644 index a544f79c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: WaveformTube_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 0f5820df-cb6b-4a6c-960e-56e4c8000eda - m_DurableName: WaveformTube - m_Material: {fileID: 2100000, guid: 0f5820dfcb6b4a6c960e56e4c8000eda, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta deleted file mode 100644 index efe7bfe1..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c4479051e46c7a65fbb4a51ad2eb5910 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat deleted file mode 100644 index ffac978c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat +++ /dev/null @@ -1,36 +0,0 @@ -%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: WaveformTube_16 - m_Shader: {fileID: 4800000, guid: d1e570f96a7a4f54fb9dc544cbfa5cbf, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 7c5b7a5849a78d74594c537e2592bca7, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _EmissionGain: 0.51785713 - - _InvFade: 1 - - _ScrollSpeed: 0 - - _VertexDisplacement: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta deleted file mode 100644 index 051b8a01..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0f5820dfcb6b4a6c960e56e4c8000eda -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png deleted file mode 100644 index b37f3214b164d8242526873747af807500168a26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16401 zcmeI3du$ZP9mmhK6{*#TGy+P&k*?LY7LLi}$5Dhg>ancJou7i1mGzdC- zZ;#IdZHTH$v+`qq^PBH)c0cpm-|YS|8>_4Czq4>*p-!i}vvQ@cMyD%)rv*HM+7v(dixuXukz>w|L88<7~Au=%4-GtOeh&EI+^GTXSL4 zeAQpC281xsS8)-b>)_f!lO#t>QL*{z-|NFVo$E=Vu3oJVu3~v9V&XzlBQV7xQ7DDJ zvRIVkTY;)?1kHlzHcSi*8uUWQZCGs!nuAd$$~=Xx7z+bL zfXeA(k+7(+F}EQRmxbqAGiA^xx~Q#gL%BAfzCKv3_ewI*+e~&NZ?>1}OPwa#R$6K; zU9M-$w2d-bD2v(1SXir>wKDqDVek~fGnX7{VrzVX)Ns&p8(LH~%2HHEM~A7yVv^)$ zigr4kl$oIz#t3^Dl}=IRVn$IZP6kQG@d1UGg{Ue>qF#&3HA-!&+hEWJ${eZtibOL5 ziAstcq)5fMC`FshR6bFN&uF4;ayW5mA)W$Z5CNj9KpmY|2ayJY8EM|(B9XjGMfJDC zJ4g}9t5oVbqkyUbiqt0az~2t9q&VNjM_VLSQd*=L?mOe2@$OZjDLXk+E=BXqC<8HJ z2ASqb$`YxNoFNy4#d>AHsghhLNnuYi%c|2?ulITrS*5>kwIGJ14rQr}LM7Sx&PD@1 zP6ZyAk5(gXHqw?lnqlFO&1p23vSxEmkYrCJMiAzHh*P-ohGBE0)51O|3$R{s;ha9&mH#K<^Msf- z%t}Fl8P=JTc`*MH)u`ZNI!L%GL)$@nkMn^vK+6~BM+~o zGzhtyC|)0hlMX-0u;D>em?w`n!_PQbxW1*T(fjcDcL$Te(u%duFj>sG_i1{f|Zj? ztPr$|n%0(c(+OX_w&H}_68-Jw#6i*8zmzuDk7^rkqRsWA+N|`uqM&-1)Nn|1j!JvC zOQu9E{0specynkI+PhkafpEP~fbSHFwqi0idrE|Q@+uo4T@Fu~9=Yx0&E(8ePB)IT=5HG=n0KuCC7oHE|CAbhEc$475^Fh1>7Xk!t z5?pvbh?n3(fZ$Dn3(p7f5?lxnyotqCnB7_oM7W>018yAN_S45raMSSuZO3wLYEzgF z*|}*w+SLsE%+dO+mIW2ay4toVkm0_MLkD*a>vXgBRQk&6V(*Th9;hm&=jz^$Ev_lK zUVQggZrqsHu&~fm9IXH2&--4za=vki_kl0R=bms~+xz;JQ`V2#wGGd=bc{Uw>8?kI zHt*f=;{Hn?JTbEO(zoGW?Q4hTZ1o`WUtEp<2x&si$47SV9~>OqzyJBS;x!L+_imAQ zyd7WNd$N5^>kF?e?KwTZuV=@Wnj`yq28Mgw8{^&UtqbNUqus}fR=C3BzTu*^16^z7 zQ+#XpD$`wq{TqtvkFPqu;yRShF_#3kJ@dr(#ts}fFgiN=Vmv-5N&N#4uUl17B`*?8 zn=j4>FCTlv(fHxvU#>ZRqHFi2Kfk%`-uWvo$-Rx+kF5Ju+dPHpyn}vC)IYR%KDWL1 z!G?Q^2iQ0E{&RBALsw63{^7qC4*hk*x*u=j-|yS=H{*xm*`YHR@4mrEi#|K*e(B7S zzZ^cjd+f6>o!WkIXF*uqeb2}4vGYe;`qrHJQ~bKhe(>m$iIaU>{Yyc^*3Rwx_rF9OIGs&`&n{+%;#{iCyM$?%C2je*=6O4&eX* diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta deleted file mode 100644 index d8efdd34..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 7c5b7a5849a78d74594c537e2592bca7 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 64 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: 2 - mipBias: -100 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 64 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset index 4a83a4db..bc08f936 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset.meta index d4ba38ae..90317f08 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: cb620f38d66c44f559d8abd0efa6a295 +timeCreated: 1529443783 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat index 9c9d45d8..3ea1256a 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: WetPaint_16 m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,7 +66,6 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SelectionEdging: 1 - _Shininess: 0.85 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat.meta index 42ec57e7..138c436f 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/WetPaint_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: b67c0e81ce6d40a8aeb0ef036b081aa3 +timeCreated: 1496701463 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/main.png.meta index db8315a3..d313f5db 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/main.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 5e3fee17e4e859e499de57ab74599628 +timeCreated: 1496701421 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,39 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/normal.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/normal.png.meta index 49a8cfbf..e5fc22d9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/normal.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaint/normal.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: 2dc1a52e6c8e9734dbc80815d8732e8a +timeCreated: 1496701421 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,39 @@ TextureImporter: heightScale: 0.03 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 1 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset deleted file mode 100644 index 526d1b5f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: WetPaint_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: dea67637-cd1a-27e4-c9b1-52f4bbcb84e5 - m_DurableName: WetPaint - m_Material: {fileID: 2100000, guid: dea67637cd1a27e4c9b152f4bbcb84e5, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset.meta deleted file mode 100644 index 735412fd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c546c4baee4eba441a31a3e3e6fb516a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat deleted file mode 100644 index c2cd52f6..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat +++ /dev/null @@ -1,80 +0,0 @@ -%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: WetPaint_16 - m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} - m_ShaderKeywords: SELECTION_EDGING _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 2dc1a52e6c8e9734dbc80815d8732e8a, type: 3} - 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: 5e3fee17e4e859e499de57ab74599628, 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.3 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SelectionEdging: 1 - - _Shininess: 0.85 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.1397059, g: 0.1397059, b: 0.1397059, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat.meta deleted file mode 100644 index f07dc9d8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WetPaintSingleSided/WetPaint_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: db604f386e77aee418f0cc4434989db9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader index e5e7b21c..b43decc9 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader @@ -1,10 +1,10 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -23,41 +23,25 @@ Shader "Brush/Special/WigglyGraphiteDoubleSided" { Cull Off CGPROGRAM - #pragma target 4.0 - #pragma surface surf StandardSpecular vertex:vert addshadow + #pragma target 3.0 + #pragma surface surf StandardSpecular vertex:vert alphatest:_Cutoff addshadow #pragma multi_compile __ AUDIO_REACTIVE #pragma multi_compile __ TBT_LINEAR_TARGET - #pragma multi_compile __ SELECTION_ON - // Faster compiles - #pragma skip_variants INSTANCING_ON #include "../../../Shaders/Include/Brush.cginc" #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - #include "../../../Shaders/Include/MobileSelection.cginc" - - struct appdata { - float4 vertex : POSITION; - float2 texcoord : TEXCOORD0; - float2 texcoord1 : TEXCOORD1; - float2 texcoord2 : TEXCOORD2; - half3 normal : NORMAL; - fixed4 color : COLOR; - float4 tangent : TANGENT; - UNITY_VERTEX_INPUT_INSTANCE_ID - }; struct Input { float2 uv_MainTex; float4 color : Color; + float2 texcoord1 : TEXCOORD1; fixed vface : VFACE; }; sampler2D _MainTex; - float _Cutoff; - void vert(inout appdata i, out Input o) { - UNITY_INITIALIZE_OUTPUT(Input, o); - o.color = TbVertToSrgb(i.color); + void vert(inout appdata_full i) { + i.color = TbVertToSrgb(i.color); } void surf(Input IN, inout SurfaceOutputStandardSpecular o) { @@ -76,13 +60,7 @@ Shader "Brush/Special/WigglyGraphiteDoubleSided" { o.Smoothness = 0; o.Albedo = IN.color.rgb; o.Alpha = tex2D(_MainTex, scrollUV).w * IN.color.a; - if (o.Alpha < _Cutoff) { - discard; - } - o.Alpha = 1; o.Normal.z *= IN.vface; - - SURF_FRAG_MOBILESELECT(o); } ENDCG } diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader.meta index 522f08e5..0cc5699c 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteDoubleSided.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 5e1540b883dd10647a305c0ec4ae14ed +timeCreated: 1488504258 +licenseType: Pro ShaderImporter: - externalObjects: {} defaultTextures: [] - nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader deleted file mode 100644 index 5afe5df3..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2020 The Tilt Brush Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -Shader "Brush/Special/WigglyGraphiteSingleSided" { - Properties{ - _MainTex("Main Texture", 2D) = "white" {} - _SecondaryTex("Diffuse Tex", 2D) = "white" {} - _Cutoff("Alpha cutoff", Range(0,1)) = 0.5 - } - SubShader{ - Tags {"Queue"="AlphaTest" "IgnoreProjector"="True" "RenderType"="TransparentCutout"} - LOD 200 - Cull Back - - CGPROGRAM - #pragma target 3.0 - #pragma surface surf StandardSpecular vertex:vert alphatest:_Cutoff addshadow - #pragma multi_compile __ AUDIO_REACTIVE - #pragma multi_compile __ TBT_LINEAR_TARGET - - #include "../../../Shaders/Include/Brush.cginc" - #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" - - struct Input { - float2 uv_MainTex; - float2 uv_SecondaryTex; - float4 color : Color; - float2 texcoord1 : TEXCOORD1; - }; - - sampler2D _MainTex; - sampler2D _SecondaryTex; - - void vert(inout appdata_full i) { - i.color = TbVertToSrgb(i.color); - } - - void surf(Input IN, inout SurfaceOutputStandardSpecular o) { - fixed2 scrollUV = IN.uv_MainTex; - - // Animate flipbook motion. Currently tuned to taste. - float anim = fmod(_Time.y * 12, 6); - anim = ceil(anim); - scrollUV.x += anim; - scrollUV.x *= 1.1; - - float3 secondary_tex = tex2D(_MainTex, IN.uv_SecondaryTex ).rgb; - - // Apply the alpha mask - float primary_tex = tex2D(_MainTex, scrollUV).w; - - float3 tex = secondary_tex * primary_tex; - - o.Specular = 0; - o.Smoothness = 0; - o.Albedo = IN.color.rgb; - o.Alpha = tex * IN.color.a; - } - ENDCG - } - FallBack "Diffuse" -} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader.meta deleted file mode 100644 index 23c29dba..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphiteSingleSided.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 06a41f8d9deb2264c9e9b067bbaae02a -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset index 93074625..1ac04c64 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset.meta index 7b6bbd0c..d03c4be2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: b250a068d80bad858be65c3d4675b50d +timeCreated: 1529443784 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat index 22e58b07..05b0db7e 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: WigglyGraphite_16 m_Shader: {fileID: 4800000, guid: 5e1540b883dd10647a305c0ec4ae14ed, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat.meta index b1dc070e..64a3dce2 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/WigglyGraphite_16.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 5347acf0a8e247b6834630c70719d763 +timeCreated: 1488504943 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/main.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/main.png.meta index 17a35cd1..1472eaee 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/main.png.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphite/main.png.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 guid: dcae52156c7b5af40bcf91076a87a6b5 +timeCreated: 1442276315 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 1 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,101 +20,39 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: 4 - mipBias: -100 - wrapU: 0 - wrapV: 0 - wrapW: 0 + mipBias: -1 + wrapMode: 0 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 1024 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset deleted file mode 100644 index 27fd56d8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: WigglyGraphite_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: e814fef1-97fd-7194-4a2f-50c2bb918be2 - m_DurableName: WigglyGraphite - m_Material: {fileID: 2100000, guid: e814fef197fd71944a2f50c2bb918be2, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset.meta deleted file mode 100644 index 5eb7f7b8..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c869d93d31fc61a4c866ada41aa85f3a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat deleted file mode 100644 index e850c30f..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat +++ /dev/null @@ -1,91 +0,0 @@ -%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: WigglyGraphite_16 - m_Shader: {fileID: 4800000, guid: 06a41f8d9deb2264c9e9b067bbaae02a, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 4dc8839531391124e843ac89670b8ad7, type: 3} - 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: dcae52156c7b5af40bcf91076a87a6b5, 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} - - _SecondaryTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _CellAmount: 4 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Shininess: 0.078125 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _Speed: 1 - - _SrcBlend: 1 - - _TexWidth: 1024 - - _UVSec: 0 - - _XScrollAmount: 1 - - _XScrollSpeed: 0 - - _YScrollAmount: 1 - - _YScrollSpeed: 10 - - _ZWrite: 1 - - _xScrollSpeed: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat.meta deleted file mode 100644 index 579f28bd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WigglyGraphiteSingleSided/WigglyGraphite_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 64c5ce17cf5a85c4697f04413bed6a2c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta deleted file mode 100644 index a1b42ddd..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 80cf4a814b51dbe4baefa884bea2432a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset deleted file mode 100644 index ae9c8de9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Wind_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 7136a729-1aab-bd24-f8b2-ca88b6adfb67 - m_DurableName: Wind - m_Material: {fileID: 2100000, guid: 7136a7291aabbd24f8b2ca88b6adfb67, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta deleted file mode 100644 index a696e612..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 99fe8738f2e0bea53a4370be40a8aaa4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat deleted file mode 100644 index e71b4426..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat +++ /dev/null @@ -1,82 +0,0 @@ -%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: Wind_16 - m_Shader: {fileID: 4800000, guid: 33864871272a015428871ed0e1c4073f, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaMask: - m_Texture: {fileID: 2800000, guid: b0396e66243f48449a3710f12f224199, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _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: f5f96a7864561b24abd0b9166b083174, 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.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _Speed: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta deleted file mode 100644 index a12853ab..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7136a7291aabbd24f8b2ca88b6adfb67 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset index e677f8f4..d03510b1 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -17,8 +16,8 @@ MonoBehaviour: m_DurableName: Wire m_Material: {fileID: 2100000, guid: 4391385acf8343969e3331e4e4930b27, type: 2} m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 + m_uv0Size: 2 + m_uv0Semantic: 5 m_uv1Size: 0 m_uv1Semantic: 0 m_bUseNormals: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset.meta index 2e6b7846..c37aaa99 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 3a72bd3c1fe3d784ab8896ec9fdfd058 +timeCreated: 1495162082 +licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat index e0e80286..b464ca9b 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat @@ -4,9 +4,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Wire m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} m_ShaderKeywords: _EMISSION diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat.meta index 4b615348..e32fab28 100644 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat.meta +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 4391385acf8343969e3331e4e4930b27 +timeCreated: 1481917482 +licenseType: Pro NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset deleted file mode 100644 index 96de60f7..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Wire_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 4391385a-cf83-4396-9e33-31e4e4930b27 - m_DurableName: Wire - m_Material: {fileID: 2100000, guid: 4391385acf8343969e3331e4e4930b27, type: 2} - m_IsParticle: 0 - m_uv0Size: 3 - m_uv0Semantic: 3 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset.meta deleted file mode 100644 index bf301d85..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 58f17ed358c05fb4590f1f6821d2e9c2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat deleted file mode 100644 index 5b1463e4..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat +++ /dev/null @@ -1,77 +0,0 @@ -%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: Wire_16 - m_Shader: {fileID: 4800000, guid: 0688c89ab91f95a49a7395fe0da3a0a6, type: 3} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - 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: 0} - 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.067 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat.meta deleted file mode 100644 index 433d0538..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wire/Wire_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 73f36413d77035b409f04f40d32d7289 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta deleted file mode 100644 index 7ace0d69..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a714e38afc4ceac4fb65bc943b0da3cf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader deleted file mode 100644 index 42b287ac..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright 2020 The Tilt Brush Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -Shader "Brush/Special/Wireframe" { -Properties { -} - -Category { - Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } - Blend One One - AlphaTest Greater .01 - Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } - - SubShader { - Pass { - - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma multi_compile __ AUDIO_REACTIVE - #pragma multi_compile __ ODS_RENDER - #include "UnityCG.cginc" - #include "../../../Shaders/Include/Brush.cginc" - - struct appdata_t { - float4 vertex : POSITION; - fixed4 color : COLOR; - float3 normal : NORMAL; - float2 texcoord : TEXCOORD0; - }; - - struct v2f { - float4 vertex : POSITION; - fixed4 color : COLOR; - float2 texcoord : TEXCOORD0; - }; - - float4 _MainTex_ST; - - v2f vert (appdata_t v) - { - - v2f o; - - o.texcoord = v.texcoord; - o.color = v.color; - o.vertex = UnityObjectToClipPos(v.vertex); - return o; - } - - fixed4 frag (v2f i) : COLOR - { - - half w = 0; -#ifdef AUDIO_REACTIVE - float waveform = (tex2D(_WaveFormTex, float2(i.texcoord.y,0)).r - .5f); - float envelope = sin(i.texcoord.y * 3.141569); - i.texcoord.x += waveform * envelope; - w = ( abs(i.texcoord.x - .5) > .5) ? 1 : 0; -#else - w = ( abs(i.texcoord.x - .5) > .45) ? 1 : 0; - w += ( abs(i.texcoord.y - .5) > .45) ? 1 : 0; -#endif - //float angle = atan2(i.texcoord.x, i.texcoord.y); - //w += ( abs(angle - (3.14/4.0)) < .05) ? 1 : 0; - return i.color * w; - } - ENDCG - } - } -} -} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta deleted file mode 100644 index da388601..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 62214494f4cd16a4db9c53337309f0e6 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset deleted file mode 100644 index 2a5f8032..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} - m_Name: Wireframe_16 - m_EditorClassIdentifier: - m_Guid: - m_storage: 2c1a6a63-6552-4d23-86d7-58f6fba8581b - m_DurableName: Wireframe - m_Material: {fileID: 2100000, guid: 2c1a6a6365524d2386d758f6fba8581b, type: 2} - m_IsParticle: 0 - m_uv0Size: 2 - m_uv0Semantic: 5 - m_uv1Size: 0 - m_uv1Semantic: 0 - m_bUseNormals: 1 - m_normalSemantic: 0 - m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta deleted file mode 100644 index 98a50aa9..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5cc686c70856a215e8f8fea06ce5e8f1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat deleted file mode 100644 index 9dd5a2ae..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat +++ /dev/null @@ -1,33 +0,0 @@ -%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: Wireframe_16 - m_Shader: {fileID: 4800000, guid: 62214494f4cd16a4db9c53337309f0e6, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - 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: - - _InvFade: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} ---- !u!1002 &2100001 -EditorExtensionImpl: - serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta deleted file mode 100644 index bd84a41c..00000000 --- a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c1a6a6365524d2386d758f6fba8581b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnitySDK/Packages/manifest.json b/UnitySDK/Packages/manifest.json index 786b3f6c..94fb9b8b 100644 --- a/UnitySDK/Packages/manifest.json +++ b/UnitySDK/Packages/manifest.json @@ -1,35 +1,11 @@ { "dependencies": { "com.unity.package-manager-ui": "2.0.8", - "com.unity.textmeshpro": "1.4.1", - "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" + "com.unity.modules.particlesystem": "1.0.0" } } diff --git a/UnitySDK/ProjectSettings/AudioManager.asset b/UnitySDK/ProjectSettings/AudioManager.asset index 4f31e744..da611257 100644 --- a/UnitySDK/ProjectSettings/AudioManager.asset +++ b/UnitySDK/ProjectSettings/AudioManager.asset @@ -8,7 +8,7 @@ AudioManager: Doppler Factor: 1 Default Speaker Mode: 2 m_SampleRate: 0 - m_DSPBufferSize: 1024 + m_DSPBufferSize: 0 m_VirtualVoiceCount: 512 m_RealVoiceCount: 32 m_SpatializerPlugin: diff --git a/UnitySDK/ProjectSettings/DynamicsManager.asset b/UnitySDK/ProjectSettings/DynamicsManager.asset index b3c263d3..78992f08 100644 --- a/UnitySDK/ProjectSettings/DynamicsManager.asset +++ b/UnitySDK/ProjectSettings/DynamicsManager.asset @@ -3,7 +3,7 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 7 m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 @@ -19,8 +19,7 @@ PhysicsManager: m_ContactsGeneration: 1 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 - m_AutoSyncTransforms: 0 - m_ReuseCollisionCallbacks: 1 + m_AutoSyncTransforms: 1 m_ClothInterCollisionSettingsToggle: 0 m_ContactPairsMode: 0 m_BroadphaseType: 0 diff --git a/UnitySDK/ProjectSettings/EditorBuildSettings.asset b/UnitySDK/ProjectSettings/EditorBuildSettings.asset index 0147887e..6dc24f7d 100644 --- a/UnitySDK/ProjectSettings/EditorBuildSettings.asset +++ b/UnitySDK/ProjectSettings/EditorBuildSettings.asset @@ -5,4 +5,3 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: [] - m_configObjects: {} diff --git a/UnitySDK/ProjectSettings/EditorSettings.asset b/UnitySDK/ProjectSettings/EditorSettings.asset index de17694c..c1ce8ebc 100644 --- a/UnitySDK/ProjectSettings/EditorSettings.asset +++ b/UnitySDK/ProjectSettings/EditorSettings.asset @@ -6,18 +6,16 @@ EditorSettings: serializedVersion: 7 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 - m_LineEndingsForNewScripts: 2 + m_LineEndingsForNewScripts: 1 m_DefaultBehaviorMode: 0 - m_PrefabRegularEnvironment: {fileID: 0} - m_PrefabUIEnvironment: {fileID: 0} - m_SpritePackerMode: 0 + m_SpritePackerMode: 2 m_SpritePackerPaddingPower: 1 - m_EtcTextureCompressorBehavior: 1 - m_EtcTextureFastCompressor: 1 + m_EtcTextureCompressorBehavior: 0 + m_EtcTextureFastCompressor: 2 m_EtcTextureNormalCompressor: 2 - m_EtcTextureBestCompressor: 4 + m_EtcTextureBestCompressor: 5 m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef m_ProjectGenerationRootNamespace: + m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 - m_EnableTextureStreamingInPlayMode: 1 diff --git a/UnitySDK/ProjectSettings/Physics2DSettings.asset b/UnitySDK/ProjectSettings/Physics2DSettings.asset index 57760e2e..132ee6bc 100644 --- a/UnitySDK/ProjectSettings/Physics2DSettings.asset +++ b/UnitySDK/ProjectSettings/Physics2DSettings.asset @@ -3,7 +3,7 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 4 + serializedVersion: 3 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 @@ -24,8 +24,7 @@ Physics2DSettings: m_QueriesStartInColliders: 1 m_ChangeStopsCallbacks: 0 m_CallbacksOnDisable: 1 - m_ReuseCollisionCallbacks: 1 - m_AutoSyncTransforms: 0 + m_AutoSyncTransforms: 1 m_AlwaysShowColliders: 0 m_ShowColliderSleep: 1 m_ShowColliderContacts: 0 diff --git a/UnitySDK/ProjectSettings/PresetManager.asset b/UnitySDK/ProjectSettings/PresetManager.asset index 820e662d..636a595b 100644 --- a/UnitySDK/ProjectSettings/PresetManager.asset +++ b/UnitySDK/ProjectSettings/PresetManager.asset @@ -3,25 +3,4 @@ --- !u!1386491679 &1 PresetManager: m_ObjectHideFlags: 0 - m_DefaultList: - - type: - m_NativeTypeID: 108 - m_ManagedTypePPtr: {fileID: 0} - m_ManagedTypeFallback: - defaultPresets: - - m_Preset: {fileID: 2655988077585873504, guid: c1cf8506f04ef2c4a88b64b6c4202eea, - type: 2} - - type: - m_NativeTypeID: 1020 - m_ManagedTypePPtr: {fileID: 0} - m_ManagedTypeFallback: - defaultPresets: - - m_Preset: {fileID: 2655988077585873504, guid: 0cd792cc87e492d43b4e95b205fc5cc6, - type: 2} - - type: - m_NativeTypeID: 1006 - m_ManagedTypePPtr: {fileID: 0} - m_ManagedTypeFallback: - defaultPresets: - - m_Preset: {fileID: 2655988077585873504, guid: 7a99f8aa944efe94cb9bd74562b7d5f9, - type: 2} + m_DefaultList: [] diff --git a/UnitySDK/ProjectSettings/ProjectSettings.asset b/UnitySDK/ProjectSettings/ProjectSettings.asset index 1eb46cab..2c8051aa 100644 --- a/UnitySDK/ProjectSettings/ProjectSettings.asset +++ b/UnitySDK/ProjectSettings/ProjectSettings.asset @@ -3,8 +3,8 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 18 - productGUID: 477c21248f028bc41a0be9a4b4cc1a40 + serializedVersion: 15 + productGUID: 2a2397b6cada1470a9610a9d71038ccd AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 @@ -12,12 +12,12 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: Icosa - productName: Open Brush Toolkit + companyName: Google + productName: Tilt Brush Toolkit defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashScreen: 0 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 @@ -52,8 +52,8 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - displayResolutionDialog: 1 - iosUseCustomAppBackgroundBehavior: 0 + iosAppInBackgroundBehavior: 0 + displayResolutionDialog: 2 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -105,7 +105,7 @@ PlayerSettings: xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 xboxOnePresentImmediateThreshold: 0 - switchQueueCommandMemory: 0 + switchQueueCommandMemory: 1048576 switchQueueControlMemory: 16384 switchQueueComputeMemory: 262144 switchNVNShaderPoolsGranularity: 33554432 @@ -118,13 +118,13 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 - xboxOneDisableKinectGpuReservation: 1 - xboxOneEnable7thCore: 1 + xboxOneDisableKinectGpuReservation: 0 + xboxOneEnable7thCore: 0 isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: @@ -139,13 +139,10 @@ PlayerSettings: maximumSupportedHeadTracking: 1 hololens: depthFormat: 1 - depthBufferSharingEnabled: 1 + depthBufferSharingEnabled: 0 oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 0 + sharedDepthBuffer: 0 + dashSupport: 0 enable360StereoCapture: 0 protectGraphicsMemory: 0 enableFrameTimingStats: 0 @@ -156,11 +153,11 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.icosa.openbrushtoolkit - Standalone: unity.Icosa.Open Brush Toolkit - Tizen: com.icosa.openbrushtoolkit - iOS: com.icosa.openbrushtoolkit - tvOS: com.icosa.openbrushtoolkit + Android: com.Company.ProductName + Standalone: unity.Google.Tilt Brush Toolkit + Tizen: com.Company.ProductName + iOS: com.Company.ProductName + tvOS: com.Company.ProductName buildNumber: iOS: 0 AndroidBundleVersionCode: 1 @@ -176,8 +173,8 @@ PlayerSettings: CreateWallpaper: 0 APKExpansionFiles: 0 keepLoadedShadersAlive: 0 - StripUnusedMeshComponents: 1 - VertexChannelCompressionMask: 4054 + StripUnusedMeshComponents: 0 + VertexChannelCompressionMask: 214 iPhoneSdkVersion: 988 iOSTargetOSVersionString: 9.0 tvOSSdkVersion: 0 @@ -236,7 +233,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 - iOSRenderExtraFrameOnPause: 0 + iOSRenderExtraFrameOnPause: 1 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -246,9 +243,9 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 - clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea - templatePackageId: com.unity.template.3d@1.3.0 - templateDefaultScene: Assets/Scenes/SampleScene.unity + clonedFromGUID: 00000000000000000000000000000000 + templatePackageId: + templateDefaultScene: AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -266,52 +263,86 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 128 + m_Height: 128 + m_Kind: 60463 m_BuildTargetPlatformIcons: [] - m_BuildTargetBatching: - - m_BuildTarget: Standalone - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: tvOS - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: Android - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: iPhone - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: WebGL - m_StaticBatching: 0 - m_DynamicBatching: 0 - m_BuildTargetGraphicsAPIs: - - m_BuildTarget: AndroidPlayer - m_APIs: 0b00000008000000 - m_Automatic: 1 - - m_BuildTarget: iOSSupport - m_APIs: 10000000 - m_Automatic: 1 - - m_BuildTarget: AppleTVSupport - m_APIs: 10000000 - m_Automatic: 0 - - m_BuildTarget: WebGLSupport - m_APIs: 0b000000 - m_Automatic: 1 + m_BuildTargetBatching: [] + m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: - - m_BuildTarget: Standalone + - m_BuildTarget: Android m_Enabled: 0 m_Devices: - Oculus + - m_BuildTarget: Metro + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: N3DS + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: PS3 + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: PS4 + m_Enabled: 0 + m_Devices: + - PlayStationVR + - m_BuildTarget: PSM + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: PSP2 + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: SamsungTV + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: Standalone + m_Enabled: 0 + m_Devices: - OpenVR + - m_BuildTarget: Tizen + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: WebGL + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: WebPlayer + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: WiiU + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: Xbox360 + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: XboxOne + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: iOS + m_Enabled: 0 + m_Devices: [] + - m_BuildTarget: tvOS + m_Enabled: 0 + m_Devices: [] m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 m_TemplateCustomTags: {} mobileMTRendering: - Android: 1 iPhone: 1 tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupLightmapEncodingQuality: + - m_BuildTarget: Standalone + m_EncodingQuality: 1 + - m_BuildTarget: XboxOne + m_EncodingQuality: 1 + - m_BuildTarget: PS4 + m_EncodingQuality: 1 m_BuildTargetGroupLightmapSettings: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 @@ -454,7 +485,7 @@ PlayerSettings: ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: - ps4ParentalLevel: 11 + ps4ParentalLevel: 1 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 @@ -464,7 +495,7 @@ PlayerSettings: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 - ps4VideoOutReprojectionRate: 60 + ps4VideoOutReprojectionRate: 120 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: @@ -489,7 +520,7 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 - ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ + ps4Passcode: 9wQj99nsQzldVI5ZuGXbEWRK5RhRXdCd ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 @@ -502,7 +533,7 @@ PlayerSettings: ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 ps4SocialScreenEnabled: 0 - ps4ScriptOptimizationLevel: 0 + ps4ScriptOptimizationLevel: 3 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 ps4PatchPkgPath: @@ -526,7 +557,7 @@ PlayerSettings: webGLMemorySize: 256 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 - webGLDataCaching: 1 + webGLDataCaching: 0 webGLDebugSymbols: 0 webGLEmscriptenArgs: webGLModulesDirectory: @@ -536,26 +567,40 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + 1: + 2: CROSS_PLATFORM_INPUT + 4: CROSS_PLATFORM_INPUT;MOBILE_INPUT + 7: CROSS_PLATFORM_INPUT;MOBILE_INPUT + 14: MOBILE_INPUT + 15: CROSS_PLATFORM_INPUT;MOBILE_INPUT + 17: MOBILE_INPUT + 20: MOBILE_INPUT + 22: MOBILE_INPUT platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Android: 0 + Standalone: 0 + WebGL: 1 + WebPlayer: 0 il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 - apiCompatibilityLevelPerPlatform: {} + apiCompatibilityLevelPerPlatform: + Standalone: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: Template_3D + metroPackageName: sequencer 535 metroPackageVersion: metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: Template_3D + metroApplicationDescription: sequencer 535 wsaImages: {} metroTileShortName: metroTileShowName: 0 @@ -565,11 +610,11 @@ PlayerSettings: metroSupportStreamingInstall: 0 metroLastRequiredScene: 0 metroDefaultTileSize: 1 - metroTileForegroundText: 2 + metroTileForegroundText: 1 metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} - metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, + metroSplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 1} - metroSplashScreenUseBackgroundColor: 0 + metroSplashScreenUseBackgroundColor: 1 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -594,20 +639,28 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 - XboxOneEnableGPUVariability: 1 + XboxOneEnableGPUVariability: 0 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 1 + xboxOneScriptCompiler: 0 XboxOneOverrideIdentityName: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} cloudServicesEnabled: - UNet: 1 + Analytics: 0 + Build: 0 + Collab: 0 + ErrorHub: 0 + Game_Performance: 0 + Hub: 0 + Purchasing: 0 + UNet: 0 + Unity_Ads: 0 luminIcon: m_Name: m_ModelFolderPath: @@ -634,4 +687,4 @@ PlayerSettings: cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 - legacyClampBlendShapeWeights: 0 + legacyClampBlendShapeWeights: 1 diff --git a/UnitySDK/ProjectSettings/QualitySettings.asset b/UnitySDK/ProjectSettings/QualitySettings.asset index 0621bef1..515c1e6f 100644 --- a/UnitySDK/ProjectSettings/QualitySettings.asset +++ b/UnitySDK/ProjectSettings/QualitySettings.asset @@ -4,22 +4,22 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 4 + m_CurrentQuality: 3 m_QualitySettings: - serializedVersion: 2 - name: Very Low + name: Graphing Calculator pixelLightCount: 0 shadows: 0 shadowResolution: 0 shadowProjection: 1 shadowCascades: 1 shadowDistance: 15 - shadowNearPlaneOffset: 3 + shadowNearPlaneOffset: 2 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 blendWeights: 1 - textureQuality: 1 + textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 @@ -31,46 +31,46 @@ QualitySettings: maximumLODLevel: 0 particleRaycastBudget: 4 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 + asyncUploadBufferSize: 4 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 - name: Low + name: Low Performance Desktop pixelLightCount: 0 shadows: 0 shadowResolution: 0 shadowProjection: 1 shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 + shadowDistance: 30 + shadowNearPlaneOffset: 2 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 blendWeights: 2 textureQuality: 0 - anisotropicTextures: 0 + anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: 0.4 + lodBias: 0.7 maximumLODLevel: 0 - particleRaycastBudget: 16 + particleRaycastBudget: 64 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 + asyncUploadBufferSize: 4 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 - name: Medium - pixelLightCount: 1 + name: High Performance Desktop + pixelLightCount: 0 shadows: 1 - shadowResolution: 0 + shadowResolution: 2 shadowProjection: 1 shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 + shadowDistance: 30 + shadowNearPlaneOffset: 2 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 @@ -79,112 +79,52 @@ QualitySettings: anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 0.7 - maximumLODLevel: 0 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: High - pixelLightCount: 2 - shadows: 2 - shadowResolution: 1 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 40 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 2 - softParticles: 0 softVegetation: 1 - realtimeReflectionProbes: 1 + realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 1 maximumLODLevel: 0 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 + asyncUploadBufferSize: 4 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 - name: Very High - pixelLightCount: 3 + name: Future Desktops + pixelLightCount: 0 shadows: 2 - shadowResolution: 2 + shadowResolution: 3 shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 40 - shadowNearPlaneOffset: 3 + shadowCascades: 4 + shadowDistance: 50 + shadowNearPlaneOffset: 2 shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowCascade4Split: {x: 0.06666667, y: 0.19999999, z: 0.46666664} shadowmaskMode: 1 blendWeights: 4 textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 4 - softParticles: 1 + anisotropicTextures: 2 + antiAliasing: 0 + softParticles: 0 softVegetation: 1 - realtimeReflectionProbes: 1 + realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 1.5 maximumLODLevel: 0 particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Ultra - pixelLightCount: 4 - shadows: 2 - shadowResolution: 2 - shadowProjection: 1 - shadowCascades: 4 - shadowDistance: 150 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 4 - softParticles: 1 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 2 - maximumLODLevel: 0 - particleRaycastBudget: 4096 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 + asyncUploadBufferSize: 4 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: - Android: 2 - Nintendo 3DS: 5 - Nintendo Switch: 5 - PS4: 5 - PSP2: 2 - Standalone: 5 - Tizen: 2 - WebGL: 3 - WiiU: 5 - Windows Store Apps: 5 - XboxOne: 5 - iPhone: 2 - tvOS: 2 + Android: 0 + BlackBerry: 0 + Samsung TV: 0 + Standalone: 0 + WP8: 0 + Web: 0 + WebGL: 0 + Windows Store Apps: 0 + iPhone: 0 diff --git a/UnitySDK/ProjectSettings/TagManager.asset b/UnitySDK/ProjectSettings/TagManager.asset index 17cb8036..1c92a784 100644 --- a/UnitySDK/ProjectSettings/TagManager.asset +++ b/UnitySDK/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - UI - - - - PostProcessing + - - - - diff --git a/UnitySDK/ProjectSettings/UnityConnectSettings.asset b/UnitySDK/ProjectSettings/UnityConnectSettings.asset index fa0b1465..3da14d5b 100644 --- a/UnitySDK/ProjectSettings/UnityConnectSettings.asset +++ b/UnitySDK/ProjectSettings/UnityConnectSettings.asset @@ -3,25 +3,25 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 - serializedVersion: 1 m_Enabled: 0 m_TestMode: 0 - m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events - m_EventUrl: https://cdp.cloud.unity3d.com/v1/events - m_ConfigUrl: https://config.uca.cloud.unity3d.com + m_TestEventUrl: + m_TestConfigUrl: m_TestInitMode: 0 CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com + m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes + m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate m_Enabled: 0 - m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 UnityAnalyticsSettings: m_Enabled: 0 - m_TestMode: 0 m_InitializeOnStartup: 1 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 From 0b020d7a2ac27a64d8bc871e6a359d92aa081b99 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Wed, 11 Aug 2021 11:29:10 +0100 Subject: [PATCH 3/8] Project settings taken from vanilla 2018.4.11f1 project --- .gitignore | 3 +- UnitySDK/Packages/manifest.json | 26 ++- UnitySDK/ProjectSettings/AudioManager.asset | 2 +- .../ProjectSettings/DynamicsManager.asset | 5 +- .../ProjectSettings/EditorBuildSettings.asset | 1 + UnitySDK/ProjectSettings/EditorSettings.asset | 14 +- .../ProjectSettings/Physics2DSettings.asset | 5 +- UnitySDK/ProjectSettings/PresetManager.asset | 23 +- .../ProjectSettings/ProjectSettings.asset | 209 +++++++----------- .../ProjectSettings/QualitySettings.asset | 144 ++++++++---- UnitySDK/ProjectSettings/TagManager.asset | 2 +- .../UnityConnectSettings.asset | 14 +- 12 files changed, 253 insertions(+), 195 deletions(-) diff --git a/.gitignore b/.gitignore index e3b2e50e..aaff3fd2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc -*.DS_Store \ No newline at end of file +*.DS_Store +UnitySDK/.idea/* diff --git a/UnitySDK/Packages/manifest.json b/UnitySDK/Packages/manifest.json index 94fb9b8b..786b3f6c 100644 --- a/UnitySDK/Packages/manifest.json +++ b/UnitySDK/Packages/manifest.json @@ -1,11 +1,35 @@ { "dependencies": { "com.unity.package-manager-ui": "2.0.8", + "com.unity.textmeshpro": "1.4.1", + "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" } } diff --git a/UnitySDK/ProjectSettings/AudioManager.asset b/UnitySDK/ProjectSettings/AudioManager.asset index da611257..4f31e744 100644 --- a/UnitySDK/ProjectSettings/AudioManager.asset +++ b/UnitySDK/ProjectSettings/AudioManager.asset @@ -8,7 +8,7 @@ AudioManager: Doppler Factor: 1 Default Speaker Mode: 2 m_SampleRate: 0 - m_DSPBufferSize: 0 + m_DSPBufferSize: 1024 m_VirtualVoiceCount: 512 m_RealVoiceCount: 32 m_SpatializerPlugin: diff --git a/UnitySDK/ProjectSettings/DynamicsManager.asset b/UnitySDK/ProjectSettings/DynamicsManager.asset index 78992f08..b3c263d3 100644 --- a/UnitySDK/ProjectSettings/DynamicsManager.asset +++ b/UnitySDK/ProjectSettings/DynamicsManager.asset @@ -3,7 +3,7 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 8 m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 @@ -19,7 +19,8 @@ PhysicsManager: m_ContactsGeneration: 1 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 - m_AutoSyncTransforms: 1 + m_AutoSyncTransforms: 0 + m_ReuseCollisionCallbacks: 1 m_ClothInterCollisionSettingsToggle: 0 m_ContactPairsMode: 0 m_BroadphaseType: 0 diff --git a/UnitySDK/ProjectSettings/EditorBuildSettings.asset b/UnitySDK/ProjectSettings/EditorBuildSettings.asset index 6dc24f7d..0147887e 100644 --- a/UnitySDK/ProjectSettings/EditorBuildSettings.asset +++ b/UnitySDK/ProjectSettings/EditorBuildSettings.asset @@ -5,3 +5,4 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: [] + m_configObjects: {} diff --git a/UnitySDK/ProjectSettings/EditorSettings.asset b/UnitySDK/ProjectSettings/EditorSettings.asset index c1ce8ebc..de17694c 100644 --- a/UnitySDK/ProjectSettings/EditorSettings.asset +++ b/UnitySDK/ProjectSettings/EditorSettings.asset @@ -6,16 +6,18 @@ EditorSettings: serializedVersion: 7 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 - m_LineEndingsForNewScripts: 1 + m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 0 - m_SpritePackerMode: 2 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} + m_SpritePackerMode: 0 m_SpritePackerPaddingPower: 1 - m_EtcTextureCompressorBehavior: 0 - m_EtcTextureFastCompressor: 2 + m_EtcTextureCompressorBehavior: 1 + m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 - m_EtcTextureBestCompressor: 5 + m_EtcTextureBestCompressor: 4 m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInPlayMode: 1 diff --git a/UnitySDK/ProjectSettings/Physics2DSettings.asset b/UnitySDK/ProjectSettings/Physics2DSettings.asset index 132ee6bc..57760e2e 100644 --- a/UnitySDK/ProjectSettings/Physics2DSettings.asset +++ b/UnitySDK/ProjectSettings/Physics2DSettings.asset @@ -3,7 +3,7 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 3 + serializedVersion: 4 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 @@ -24,7 +24,8 @@ Physics2DSettings: m_QueriesStartInColliders: 1 m_ChangeStopsCallbacks: 0 m_CallbacksOnDisable: 1 - m_AutoSyncTransforms: 1 + m_ReuseCollisionCallbacks: 1 + m_AutoSyncTransforms: 0 m_AlwaysShowColliders: 0 m_ShowColliderSleep: 1 m_ShowColliderContacts: 0 diff --git a/UnitySDK/ProjectSettings/PresetManager.asset b/UnitySDK/ProjectSettings/PresetManager.asset index 636a595b..820e662d 100644 --- a/UnitySDK/ProjectSettings/PresetManager.asset +++ b/UnitySDK/ProjectSettings/PresetManager.asset @@ -3,4 +3,25 @@ --- !u!1386491679 &1 PresetManager: m_ObjectHideFlags: 0 - m_DefaultList: [] + m_DefaultList: + - type: + m_NativeTypeID: 108 + m_ManagedTypePPtr: {fileID: 0} + m_ManagedTypeFallback: + defaultPresets: + - m_Preset: {fileID: 2655988077585873504, guid: c1cf8506f04ef2c4a88b64b6c4202eea, + type: 2} + - type: + m_NativeTypeID: 1020 + m_ManagedTypePPtr: {fileID: 0} + m_ManagedTypeFallback: + defaultPresets: + - m_Preset: {fileID: 2655988077585873504, guid: 0cd792cc87e492d43b4e95b205fc5cc6, + type: 2} + - type: + m_NativeTypeID: 1006 + m_ManagedTypePPtr: {fileID: 0} + m_ManagedTypeFallback: + defaultPresets: + - m_Preset: {fileID: 2655988077585873504, guid: 7a99f8aa944efe94cb9bd74562b7d5f9, + type: 2} diff --git a/UnitySDK/ProjectSettings/ProjectSettings.asset b/UnitySDK/ProjectSettings/ProjectSettings.asset index 2c8051aa..1eb46cab 100644 --- a/UnitySDK/ProjectSettings/ProjectSettings.asset +++ b/UnitySDK/ProjectSettings/ProjectSettings.asset @@ -3,8 +3,8 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 - productGUID: 2a2397b6cada1470a9610a9d71038ccd + serializedVersion: 18 + productGUID: 477c21248f028bc41a0be9a4b4cc1a40 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 @@ -12,12 +12,12 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: Google - productName: Tilt Brush Toolkit + companyName: Icosa + productName: Open Brush Toolkit defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 @@ -52,8 +52,8 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 - displayResolutionDialog: 2 + displayResolutionDialog: 1 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -105,7 +105,7 @@ PlayerSettings: xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 xboxOnePresentImmediateThreshold: 0 - switchQueueCommandMemory: 1048576 + switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 switchQueueComputeMemory: 262144 switchNVNShaderPoolsGranularity: 33554432 @@ -118,13 +118,13 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.0 + bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 - xboxOneDisableKinectGpuReservation: 0 - xboxOneEnable7thCore: 0 + xboxOneDisableKinectGpuReservation: 1 + xboxOneEnable7thCore: 1 isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: @@ -139,10 +139,13 @@ PlayerSettings: maximumSupportedHeadTracking: 1 hololens: depthFormat: 1 - depthBufferSharingEnabled: 0 + depthBufferSharingEnabled: 1 oculus: - sharedDepthBuffer: 0 - dashSupport: 0 + sharedDepthBuffer: 1 + dashSupport: 1 + lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 0 enable360StereoCapture: 0 protectGraphicsMemory: 0 enableFrameTimingStats: 0 @@ -153,11 +156,11 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.Company.ProductName - Standalone: unity.Google.Tilt Brush Toolkit - Tizen: com.Company.ProductName - iOS: com.Company.ProductName - tvOS: com.Company.ProductName + Android: com.icosa.openbrushtoolkit + Standalone: unity.Icosa.Open Brush Toolkit + Tizen: com.icosa.openbrushtoolkit + iOS: com.icosa.openbrushtoolkit + tvOS: com.icosa.openbrushtoolkit buildNumber: iOS: 0 AndroidBundleVersionCode: 1 @@ -173,8 +176,8 @@ PlayerSettings: CreateWallpaper: 0 APKExpansionFiles: 0 keepLoadedShadersAlive: 0 - StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: 214 + StripUnusedMeshComponents: 1 + VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 iOSTargetOSVersionString: 9.0 tvOSSdkVersion: 0 @@ -233,7 +236,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 - iOSRenderExtraFrameOnPause: 1 + iOSRenderExtraFrameOnPause: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -243,9 +246,9 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 - clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: + clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea + templatePackageId: com.unity.template.3d@1.3.0 + templateDefaultScene: Assets/Scenes/SampleScene.unity AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -263,86 +266,52 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: - - m_BuildTarget: - m_Icons: - - serializedVersion: 2 - m_Icon: {fileID: 0} - m_Width: 128 - m_Height: 128 - m_Kind: 60463 + m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] - m_BuildTargetBatching: [] - m_BuildTargetGraphicsAPIs: [] - m_BuildTargetVRSettings: + m_BuildTargetBatching: + - m_BuildTarget: Standalone + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: tvOS + m_StaticBatching: 1 + m_DynamicBatching: 0 - m_BuildTarget: Android - m_Enabled: 0 - m_Devices: - - Oculus - - m_BuildTarget: Metro - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: N3DS - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: PS3 - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: PS4 - m_Enabled: 0 - m_Devices: - - PlayStationVR - - m_BuildTarget: PSM - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: PSP2 - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: SamsungTV - m_Enabled: 0 - m_Devices: [] + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: iPhone + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: WebGL + m_StaticBatching: 0 + m_DynamicBatching: 0 + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: AndroidPlayer + m_APIs: 0b00000008000000 + m_Automatic: 1 + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 + - m_BuildTarget: AppleTVSupport + m_APIs: 10000000 + m_Automatic: 0 + - m_BuildTarget: WebGLSupport + m_APIs: 0b000000 + m_Automatic: 1 + m_BuildTargetVRSettings: - m_BuildTarget: Standalone m_Enabled: 0 m_Devices: + - Oculus - OpenVR - - m_BuildTarget: Tizen - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: WebGL - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: WebPlayer - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: WiiU - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: Xbox360 - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: XboxOne - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: iOS - m_Enabled: 0 - m_Devices: [] - - m_BuildTarget: tvOS - m_Enabled: 0 - m_Devices: [] m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 m_TemplateCustomTags: {} mobileMTRendering: + Android: 1 iPhone: 1 tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: - - m_BuildTarget: Standalone - m_EncodingQuality: 1 - - m_BuildTarget: XboxOne - m_EncodingQuality: 1 - - m_BuildTarget: PS4 - m_EncodingQuality: 1 + m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 @@ -485,7 +454,7 @@ PlayerSettings: ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: - ps4ParentalLevel: 1 + ps4ParentalLevel: 11 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 @@ -495,7 +464,7 @@ PlayerSettings: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 - ps4VideoOutReprojectionRate: 120 + ps4VideoOutReprojectionRate: 60 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: @@ -520,7 +489,7 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 - ps4Passcode: 9wQj99nsQzldVI5ZuGXbEWRK5RhRXdCd + ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 @@ -533,7 +502,7 @@ PlayerSettings: ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 ps4SocialScreenEnabled: 0 - ps4ScriptOptimizationLevel: 3 + ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 ps4PatchPkgPath: @@ -557,7 +526,7 @@ PlayerSettings: webGLMemorySize: 256 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 - webGLDataCaching: 0 + webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: webGLModulesDirectory: @@ -567,40 +536,26 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - scriptingDefineSymbols: - 1: - 2: CROSS_PLATFORM_INPUT - 4: CROSS_PLATFORM_INPUT;MOBILE_INPUT - 7: CROSS_PLATFORM_INPUT;MOBILE_INPUT - 14: MOBILE_INPUT - 15: CROSS_PLATFORM_INPUT;MOBILE_INPUT - 17: MOBILE_INPUT - 20: MOBILE_INPUT - 22: MOBILE_INPUT + scriptingDefineSymbols: {} platformArchitecture: {} - scriptingBackend: - Android: 0 - Standalone: 0 - WebGL: 1 - WebPlayer: 0 + scriptingBackend: {} il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 - apiCompatibilityLevelPerPlatform: - Standalone: 3 + apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: sequencer 535 + metroPackageName: Template_3D metroPackageVersion: metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: sequencer 535 + metroApplicationDescription: Template_3D wsaImages: {} metroTileShortName: metroTileShowName: 0 @@ -610,11 +565,11 @@ PlayerSettings: metroSupportStreamingInstall: 0 metroLastRequiredScene: 0 metroDefaultTileSize: 1 - metroTileForegroundText: 1 + metroTileForegroundText: 2 metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} - metroSplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, + metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} - metroSplashScreenUseBackgroundColor: 1 + metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -639,28 +594,20 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 - XboxOneEnableGPUVariability: 0 + XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 0 + xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} cloudServicesEnabled: - Analytics: 0 - Build: 0 - Collab: 0 - ErrorHub: 0 - Game_Performance: 0 - Hub: 0 - Purchasing: 0 - UNet: 0 - Unity_Ads: 0 + UNet: 1 luminIcon: m_Name: m_ModelFolderPath: @@ -687,4 +634,4 @@ PlayerSettings: cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 - legacyClampBlendShapeWeights: 1 + legacyClampBlendShapeWeights: 0 diff --git a/UnitySDK/ProjectSettings/QualitySettings.asset b/UnitySDK/ProjectSettings/QualitySettings.asset index 515c1e6f..0621bef1 100644 --- a/UnitySDK/ProjectSettings/QualitySettings.asset +++ b/UnitySDK/ProjectSettings/QualitySettings.asset @@ -4,22 +4,22 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 3 + m_CurrentQuality: 4 m_QualitySettings: - serializedVersion: 2 - name: Graphing Calculator + name: Very Low pixelLightCount: 0 shadows: 0 shadowResolution: 0 shadowProjection: 1 shadowCascades: 1 shadowDistance: 15 - shadowNearPlaneOffset: 2 + shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 blendWeights: 1 - textureQuality: 0 + textureQuality: 1 anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 @@ -31,46 +31,46 @@ QualitySettings: maximumLODLevel: 0 particleRaycastBudget: 4 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 - name: Low Performance Desktop + name: Low pixelLightCount: 0 shadows: 0 shadowResolution: 0 shadowProjection: 1 shadowCascades: 1 - shadowDistance: 30 - shadowNearPlaneOffset: 2 + shadowDistance: 20 + shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 blendWeights: 2 textureQuality: 0 - anisotropicTextures: 1 + anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: 0.7 + lodBias: 0.4 maximumLODLevel: 0 - particleRaycastBudget: 64 + particleRaycastBudget: 16 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 - name: High Performance Desktop - pixelLightCount: 0 + name: Medium + pixelLightCount: 1 shadows: 1 - shadowResolution: 2 + shadowResolution: 0 shadowProjection: 1 shadowCascades: 1 - shadowDistance: 30 - shadowNearPlaneOffset: 2 + shadowDistance: 20 + shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 @@ -79,52 +79,112 @@ QualitySettings: anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 - softVegetation: 1 + softVegetation: 0 realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + vSyncCount: 1 + lodBias: 0.7 + maximumLODLevel: 0 + particleRaycastBudget: 64 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: High + pixelLightCount: 2 + shadows: 2 + shadowResolution: 1 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 40 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + blendWeights: 2 + textureQuality: 0 + anisotropicTextures: 1 + antiAliasing: 2 + softParticles: 0 + softVegetation: 1 + realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 0 + vSyncCount: 1 lodBias: 1 maximumLODLevel: 0 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 - name: Future Desktops - pixelLightCount: 0 + name: Very High + pixelLightCount: 3 shadows: 2 - shadowResolution: 3 + shadowResolution: 2 shadowProjection: 1 - shadowCascades: 4 - shadowDistance: 50 - shadowNearPlaneOffset: 2 + shadowCascades: 2 + shadowDistance: 40 + shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.19999999, z: 0.46666664} + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 blendWeights: 4 textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 0 - softParticles: 0 + anisotropicTextures: 1 + antiAliasing: 4 + softParticles: 1 softVegetation: 1 - realtimeReflectionProbes: 0 + realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 0 + vSyncCount: 1 lodBias: 1.5 maximumLODLevel: 0 particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Ultra + pixelLightCount: 4 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 4 + shadowDistance: 150 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + blendWeights: 4 + textureQuality: 0 + anisotropicTextures: 1 + antiAliasing: 4 + softParticles: 1 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + vSyncCount: 1 + lodBias: 2 + maximumLODLevel: 0 + particleRaycastBudget: 4096 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: - Android: 0 - BlackBerry: 0 - Samsung TV: 0 - Standalone: 0 - WP8: 0 - Web: 0 - WebGL: 0 - Windows Store Apps: 0 - iPhone: 0 + Android: 2 + Nintendo 3DS: 5 + Nintendo Switch: 5 + PS4: 5 + PSP2: 2 + Standalone: 5 + Tizen: 2 + WebGL: 3 + WiiU: 5 + Windows Store Apps: 5 + XboxOne: 5 + iPhone: 2 + tvOS: 2 diff --git a/UnitySDK/ProjectSettings/TagManager.asset b/UnitySDK/ProjectSettings/TagManager.asset index 1c92a784..17cb8036 100644 --- a/UnitySDK/ProjectSettings/TagManager.asset +++ b/UnitySDK/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - UI - - - - + - PostProcessing - - - diff --git a/UnitySDK/ProjectSettings/UnityConnectSettings.asset b/UnitySDK/ProjectSettings/UnityConnectSettings.asset index 3da14d5b..fa0b1465 100644 --- a/UnitySDK/ProjectSettings/UnityConnectSettings.asset +++ b/UnitySDK/ProjectSettings/UnityConnectSettings.asset @@ -3,25 +3,25 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 + serializedVersion: 1 m_Enabled: 0 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events + m_EventUrl: https://cdp.cloud.unity3d.com/v1/events + m_ConfigUrl: https://config.uca.cloud.unity3d.com m_TestInitMode: 0 CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes - m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate + m_EventUrl: https://perf-events.cloud.unity3d.com m_Enabled: 0 + m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 UnityAnalyticsSettings: m_Enabled: 0 - m_InitializeOnStartup: 1 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_InitializeOnStartup: 1 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 From 307f72dd4ce1a8f7d848d2b42ccd390e95e9d4f2 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Wed, 11 Aug 2021 11:29:59 +0100 Subject: [PATCH 4/8] Experimental brushes --- .../Assets/Brushes/Basic/BubbleWand.meta | 8 + .../Basic/BubbleWand/BubbleWand_16.asset | 26 +++ .../Basic/BubbleWand/BubbleWand_16.asset.meta | 8 + .../Basic/BubbleWand/BubbleWand_16.mat | 51 +++++ .../Basic/BubbleWand/BubbleWand_16.mat.meta | 8 + .../Assets/Brushes/Basic/CandyCane.meta | 8 + .../Basic/CandyCane/CandyCane_16.asset | 26 +++ .../Basic/CandyCane/CandyCane_16.asset.meta | 8 + .../Brushes/Basic/CandyCane/CandyCane_16.mat | 37 ++++ .../Basic/CandyCane/CandyCane_16.mat.meta | 8 + .../Assets/Brushes/Basic/Charcoal.meta | 8 + .../Brushes/Basic/Charcoal/Charcoal_16.asset | 26 +++ .../Basic/Charcoal/Charcoal_16.asset.meta | 8 + .../Brushes/Basic/Charcoal/Charcoal_16.mat | 79 ++++++++ .../Basic/Charcoal/Charcoal_16.mat.meta | 8 + .../Assets/Brushes/Basic/ConcaveHull.meta | 8 + .../Basic/ConcaveHull/ConcaveHull_16.asset | 26 +++ .../ConcaveHull/ConcaveHull_16.asset.meta | 8 + .../Basic/ConcaveHull/ConcaveHull_16.mat | 102 ++++++++++ .../Basic/ConcaveHull/ConcaveHull_16.mat.meta | 8 + .../Assets/Brushes/Basic/DanceFloor.meta | 8 + .../Basic/DanceFloor/DanceFloor.shader | 107 ++++++++++ .../Basic/DanceFloor/DanceFloor.shader.meta | 9 + .../Basic/DanceFloor/DanceFloor_16.asset | 26 +++ .../Basic/DanceFloor/DanceFloor_16.asset.meta | 8 + .../Basic/DanceFloor/DanceFloor_16.mat | 39 ++++ .../Basic/DanceFloor/DanceFloor_16.mat.meta | 8 + .../Brushes/Basic/DanceFloor/maintexture.png | Bin 0 -> 26563 bytes .../Basic/DanceFloor/maintexture.png.meta | 121 ++++++++++++ .../Assets/Brushes/Basic/Digital.meta | 8 + .../Brushes/Basic/Digital/Digital_16.asset | 26 +++ .../Basic/Digital/Digital_16.asset.meta | 8 + .../Brushes/Basic/Digital/Digital_16.mat | 28 +++ .../Brushes/Basic/Digital/Digital_16.mat.meta | 8 + .../Assets/Brushes/Basic/DoubleFlat.meta | 8 + .../Basic/DoubleFlat/DoubleFlat_16.asset | 26 +++ .../Basic/DoubleFlat/DoubleFlat_16.asset.meta | 8 + .../Basic/DoubleFlat/DoubleFlat_16.mat | 77 ++++++++ .../Basic/DoubleFlat/DoubleFlat_16.mat.meta | 8 + .../Assets/Brushes/Basic/Drafting.meta | 8 + .../Brushes/Basic/Drafting/Drafting_16.asset | 26 +++ .../Basic/Drafting/Drafting_16.asset.meta | 8 + .../Brushes/Basic/Drafting/Drafting_16.mat | 34 ++++ .../Basic/Drafting/Drafting_16.mat.meta | 8 + .../Assets/Brushes/Basic/DryBrush.meta | 8 + .../Assets/Brushes/Basic/DryBrush/_16.asset | 26 +++ .../Brushes/Basic/DryBrush/_16.asset.meta | 8 + .../Assets/Brushes/Basic/DryBrush/_16.mat | 79 ++++++++ .../Brushes/Basic/DryBrush/_16.mat.meta | 8 + .../Brushes/Basic/DuctTapeGeometry.meta | 8 + .../Brushes/Basic/DuctTapeGeometry/_16.asset | 26 +++ .../Basic/DuctTapeGeometry/_16.asset.meta | 8 + .../Brushes/Basic/DuctTapeGeometry/_16.mat | 80 ++++++++ .../Basic/DuctTapeGeometry/_16.mat.meta | 8 + .../Assets/Brushes/Basic/FacetedTube.meta | 8 + .../Basic/FacetedTube/FacetedTube_16.asset | 26 +++ .../FacetedTube/FacetedTube_16.asset.meta | 8 + .../Basic/FacetedTube/FacetedTube_16.mat | 37 ++++ .../Basic/FacetedTube/FacetedTube_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Fairy.meta | 8 + .../Assets/Brushes/Basic/Fairy/Fairy_16.asset | 26 +++ .../Brushes/Basic/Fairy/Fairy_16.asset.meta | 8 + .../Assets/Brushes/Basic/Fairy/Fairy_16.mat | 78 ++++++++ .../Brushes/Basic/Fairy/Fairy_16.mat.meta | 8 + .../Assets/Brushes/Basic/Feather.meta | 8 + .../Brushes/Basic/Feather/Feather_16.asset | 26 +++ .../Basic/Feather/Feather_16.asset.meta | 8 + .../Brushes/Basic/Feather/Feather_16.mat | 78 ++++++++ .../Brushes/Basic/Feather/Feather_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Fire2.meta | 8 + .../Assets/Brushes/Basic/Fire2/Fire2_16.asset | 26 +++ .../Brushes/Basic/Fire2/Fire2_16.asset.meta | 8 + .../Assets/Brushes/Basic/Fire2/Fire2_16.mat | 47 +++++ .../Brushes/Basic/Fire2/Fire2_16.mat.meta | 8 + .../Assets/Brushes/Basic/Gouache.meta | 8 + .../Brushes/Basic/Gouache/Gouache_16.asset | 26 +++ .../Basic/Gouache/Gouache_16.asset.meta | 8 + .../Brushes/Basic/Gouache/Gouache_16.mat | 79 ++++++++ .../Brushes/Basic/Gouache/Gouache_16.mat.meta | 8 + .../Brushes/Basic/GouacheSingleSided.meta | 8 + .../Basic/GouacheSingleSided/Gouache_16.asset | 26 +++ .../GouacheSingleSided/Gouache_16.asset.meta | 8 + .../Basic/GouacheSingleSided/Gouache_16.mat | 79 ++++++++ .../GouacheSingleSided/Gouache_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Guts.meta | 8 + .../Assets/Brushes/Basic/Guts/Guts_16.asset | 26 +++ .../Brushes/Basic/Guts/Guts_16.asset.meta | 8 + .../Assets/Brushes/Basic/Guts/Guts_16.mat | 83 ++++++++ .../Brushes/Basic/Guts/Guts_16.mat.meta | 8 + .../Assets/Brushes/Basic/HolidayTree.meta | 8 + .../Basic/HolidayTree/HolidayTree_16.asset | 26 +++ .../HolidayTree/HolidayTree_16.asset.meta | 8 + .../Basic/HolidayTree/HolidayTree_16.mat | 37 ++++ .../Basic/HolidayTree/HolidayTree_16.mat.meta | 8 + .../Assets/Brushes/Basic/InkGeometry.meta | 8 + .../Brushes/Basic/InkGeometry/_16.asset | 26 +++ .../Brushes/Basic/InkGeometry/_16.asset.meta | 8 + .../Assets/Brushes/Basic/InkGeometry/_16.mat | 80 ++++++++ .../Brushes/Basic/InkGeometry/_16.mat.meta | 8 + .../Assets/Brushes/Basic/KeijiroTube.meta | 8 + .../Basic/KeijiroTube/KeijiroTube_16.asset | 26 +++ .../KeijiroTube/KeijiroTube_16.asset.meta | 8 + .../Basic/KeijiroTube/KeijiroTube_16.mat | 79 ++++++++ .../Basic/KeijiroTube/KeijiroTube_16.mat.meta | 8 + .../Assets/Brushes/Basic/Lacewing.meta | 8 + .../Brushes/Basic/Lacewing/Lacewing_16.asset | 26 +++ .../Basic/Lacewing/Lacewing_16.asset.meta | 8 + .../Brushes/Basic/Lacewing/Lacewing_16.mat | 87 ++++++++ .../Basic/Lacewing/Lacewing_16.mat.meta | 8 + .../Assets/Brushes/Basic/LeakyPen.meta | 8 + .../Assets/Brushes/Basic/LeakyPen/_16.asset | 26 +++ .../Brushes/Basic/LeakyPen/_16.asset.meta | 8 + .../Assets/Brushes/Basic/LeakyPen/_16.mat | 90 +++++++++ .../Brushes/Basic/LeakyPen/_16.mat.meta | 8 + .../Assets/Brushes/Basic/Leaves2.meta | 8 + .../Brushes/Basic/Leaves2/Leaves2_16.asset | 26 +++ .../Basic/Leaves2/Leaves2_16.asset.meta | 8 + .../Brushes/Basic/Leaves2/Leaves2_16.mat | 80 ++++++++ .../Brushes/Basic/Leaves2/Leaves2_16.mat.meta | 8 + .../Assets/Brushes/Basic/LitWire.meta | 8 + .../Brushes/Basic/LitWire/Wire (Lit)_16.asset | 26 +++ .../Basic/LitWire/Wire (Lit)_16.asset.meta | 8 + .../Brushes/Basic/LitWire/Wire (Lit)_16.mat | 79 ++++++++ .../Basic/LitWire/Wire (Lit)_16.mat.meta | 8 + .../Assets/Brushes/Basic/LoftedHueShift.meta | 8 + .../Lofted (Hue Shift)_16.asset | 26 +++ .../Lofted (Hue Shift)_16.asset.meta | 8 + .../LoftedHueShift/Lofted (Hue Shift)_16.mat | 43 ++++ .../Lofted (Hue Shift)_16.mat.meta | 8 + .../Assets/Brushes/Basic/MarbledRainbow.meta | 8 + .../MarbledRainbow/Marbled Rainbow_16.asset | 26 +++ .../Marbled Rainbow_16.asset.meta | 8 + .../MarbledRainbow/Marbled Rainbow_16.mat | 87 ++++++++ .../Marbled Rainbow_16.mat.meta | 8 + .../Assets/Brushes/Basic/Muscle.meta | 8 + .../Brushes/Basic/Muscle/Muscle_16.asset | 26 +++ .../Brushes/Basic/Muscle/Muscle_16.asset.meta | 8 + .../Assets/Brushes/Basic/Muscle/Muscle_16.mat | 83 ++++++++ .../Brushes/Basic/Muscle/Muscle_16.mat.meta | 8 + .../Assets/Brushes/Basic/MylarTube.meta | 8 + .../Basic/MylarTube/MylarTube_16.asset | 26 +++ .../Basic/MylarTube/MylarTube_16.asset.meta | 8 + .../Brushes/Basic/MylarTube/MylarTube_16.mat | 54 +++++ .../Basic/MylarTube/MylarTube_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Plait.meta | 8 + .../Brushes/Basic/Plait/Braid3_16.asset | 26 +++ .../Brushes/Basic/Plait/Braid3_16.asset.meta | 8 + .../Assets/Brushes/Basic/Plait/Braid3_16.mat | 37 ++++ .../Brushes/Basic/Plait/Braid3_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Race.meta | 8 + .../Assets/Brushes/Basic/Race/Race_16.asset | 26 +++ .../Brushes/Basic/Race/Race_16.asset.meta | 8 + .../Assets/Brushes/Basic/Race/Race_16.mat | 28 +++ .../Brushes/Basic/Race/Race_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Rain.meta | 8 + .../Assets/Brushes/Basic/Rain/Rain_16.asset | 26 +++ .../Brushes/Basic/Rain/Rain_16.asset.meta | 8 + .../Assets/Brushes/Basic/Rain/Rain_16.mat | 88 +++++++++ .../Brushes/Basic/Rain/Rain_16.mat.meta | 8 + .../Assets/Brushes/Basic/RisingBubbles.meta | 8 + .../RisingBubbles/Rising Bubbles_16.asset | 26 +++ .../Rising Bubbles_16.asset.meta | 8 + .../Basic/RisingBubbles/Rising Bubbles_16.mat | 91 +++++++++ .../RisingBubbles/Rising Bubbles_16.mat.meta | 8 + .../Assets/Brushes/Basic/SingleSided.meta | 8 + .../Basic/SingleSided/SingleSided_16.asset | 26 +++ .../SingleSided/SingleSided_16.asset.meta | 8 + .../Basic/SingleSided/SingleSided_16.mat | 77 ++++++++ .../Basic/SingleSided/SingleSided_16.mat.meta | 8 + .../Assets/Brushes/Basic/SmoothHull.meta | 8 + .../Basic/SmoothHull/SmoothHull_16.asset | 26 +++ .../Basic/SmoothHull/SmoothHull_16.asset.meta | 8 + .../Basic/SmoothHull/SmoothHull_16.mat | 94 +++++++++ .../Basic/SmoothHull/SmoothHull_16.mat.meta | 8 + .../Assets/Brushes/Basic/Snowflake.meta | 8 + .../Basic/Snowflake/Snowflake_16.asset | 26 +++ .../Basic/Snowflake/Snowflake_16.asset.meta | 8 + .../Brushes/Basic/Snowflake/Snowflake_16.mat | 37 ++++ .../Basic/Snowflake/Snowflake_16.mat.meta | 8 + .../TiltBrush/Assets/Brushes/Basic/Space.meta | 8 + .../Assets/Brushes/Basic/Space/Space_16.asset | 26 +++ .../Brushes/Basic/Space/Space_16.asset.meta | 8 + .../Assets/Brushes/Basic/Space/Space_16.mat | 28 +++ .../Brushes/Basic/Space/Space_16.mat.meta | 8 + .../Assets/Brushes/Basic/Sparks.meta | 8 + .../Brushes/Basic/Sparks/Sparks_16.asset | 26 +++ .../Brushes/Basic/Sparks/Sparks_16.asset.meta | 8 + .../Assets/Brushes/Basic/Sparks/Sparks_16.mat | 83 ++++++++ .../Brushes/Basic/Sparks/Sparks_16.mat.meta | 8 + .../Brushes/Basic/Square3DPrintBrush.meta | 8 + .../3D Printing Brush_16.asset | 26 +++ .../3D Printing Brush_16.asset.meta | 8 + .../3D Printing Brush_16.mat | 50 +++++ .../3D Printing Brush_16.mat.meta | 8 + .../Assets/Brushes/Basic/SquarePaper.meta | 8 + .../Basic/SquarePaper/SquarePaper_16.asset | 26 +++ .../SquarePaper/SquarePaper_16.asset.meta | 8 + .../Basic/SquarePaper/SquarePaper_16.mat | 79 ++++++++ .../Basic/SquarePaper/SquarePaper_16.mat.meta | 8 + .../Assets/Brushes/Basic/TaperedHueShift.meta | 8 + .../TaperedHueShift/TaperedHueShift_16.asset | 26 +++ .../TaperedHueShift_16.asset.meta | 8 + .../TaperedHueShift/TaperedHueShift_16.mat | 78 ++++++++ .../TaperedHueShift_16.mat.meta | 8 + .../Assets/Brushes/Basic/TaperedWire.meta | 8 + .../Basic/TaperedWire/TaperedWire_16.asset | 26 +++ .../TaperedWire/TaperedWire_16.asset.meta | 8 + .../Basic/TaperedWire/TaperedWire_16.mat | 79 ++++++++ .../Basic/TaperedWire/TaperedWire_16.mat.meta | 8 + .../Assets/Brushes/Basic/ThickGeometry.meta | 8 + .../ThickGeometry/ThickGeometry_16.asset | 26 +++ .../ThickGeometry/ThickGeometry_16.asset.meta | 8 + .../Basic/ThickGeometry/ThickGeometry_16.mat | 80 ++++++++ .../ThickGeometry/ThickGeometry_16.mat.meta | 8 + .../Assets/Brushes/Basic/TubeAdditive.meta | 8 + .../Basic/TubeAdditive/TubeAdditive_16.asset | 26 +++ .../TubeAdditive/TubeAdditive_16.asset.meta | 8 + .../Basic/TubeAdditive/TubeAdditive_16.mat | 34 ++++ .../TubeAdditive/TubeAdditive_16.mat.meta | 8 + .../Brushes/Basic/TubeToonInverted.meta | 8 + .../TubeToonInverted/TubeToonInverted.shader | 102 ++++++++++ .../TubeToonInverted.shader.meta | 9 + .../TubeToonInverted_16.asset | 26 +++ .../TubeToonInverted_16.asset.meta | 8 + .../TubeToonInverted/TubeToonInverted_16.mat | 37 ++++ .../TubeToonInverted_16.mat.meta | 8 + .../Assets/Brushes/Basic/WaveformFFT.meta | 8 + .../Basic/WaveformFFT/WaveformFFT.shader | 96 +++++++++ .../Basic/WaveformFFT/WaveformFFT.shader.meta | 9 + .../Basic/WaveformFFT/WaveformFFT_16.asset | 26 +++ .../WaveformFFT/WaveformFFT_16.asset.meta | 8 + .../Basic/WaveformFFT/WaveformFFT_16.mat | 36 ++++ .../Basic/WaveformFFT/WaveformFFT_16.mat.meta | 8 + .../Brushes/Basic/WaveformParticles.meta | 8 + .../WaveformParticles.shader | 109 ++++++++++ .../WaveformParticles.shader.meta | 9 + .../WaveformParticles_16.asset | 26 +++ .../WaveformParticles_16.asset.meta | 8 + .../WaveformParticles_16.mat | 39 ++++ .../WaveformParticles_16.mat.meta | 8 + .../Basic/WaveformParticles/maintexture.png | Bin 0 -> 16908 bytes .../WaveformParticles/maintexture.png.meta | 121 ++++++++++++ .../Assets/Brushes/Basic/WaveformTube.meta | 8 + .../Basic/WaveformTube/WaveformTube.shader | 83 ++++++++ .../WaveformTube/WaveformTube.shader.meta | 9 + .../Basic/WaveformTube/WaveformTube_16.asset | 26 +++ .../WaveformTube/WaveformTube_16.asset.meta | 8 + .../Basic/WaveformTube/WaveformTube_16.mat | 36 ++++ .../WaveformTube/WaveformTube_16.mat.meta | 8 + .../Brushes/Basic/WaveformTube/waveform.png | Bin 0 -> 16401 bytes .../Basic/WaveformTube/waveform.png.meta | 88 +++++++++ .../TiltBrush/Assets/Brushes/Basic/Wind.meta | 8 + .../Assets/Brushes/Basic/Wind/Wind_16.asset | 26 +++ .../Brushes/Basic/Wind/Wind_16.asset.meta | 8 + .../Assets/Brushes/Basic/Wind/Wind_16.mat | 82 ++++++++ .../Brushes/Basic/Wind/Wind_16.mat.meta | 8 + .../Assets/Brushes/Basic/Wireframe.meta | 8 + .../Brushes/Basic/Wireframe/Wireframe.shader | 83 ++++++++ .../Basic/Wireframe/Wireframe.shader.meta | 9 + .../Basic/Wireframe/Wireframe_16.asset | 26 +++ .../Basic/Wireframe/Wireframe_16.asset.meta | 8 + .../Brushes/Basic/Wireframe/Wireframe_16.mat | 33 ++++ .../Basic/Wireframe/Wireframe_16.mat.meta | 8 + .../Brushes/Shared/Shaders/Additive.shader | 86 ++++++++ .../Shared/Shaders/Additive.shader.meta | 9 + .../Brushes/Shared/Shaders/Special.meta | 8 + .../Shared/Shaders/Special/Faceted.shader | 70 +++++++ .../Shaders/Special/Faceted.shader.meta | 9 + .../TiltBrush/Assets/Shaders/FlatLit.shader | 161 +++++++++++++++ .../Assets/Shaders/FlatLit.shader.meta | 9 + .../Assets/Shaders/Include/ColorSpace.cginc | 187 ++++++++++++++++++ .../Shaders/Include/ColorSpace.cginc.meta | 9 + .../Assets/Shaders/Include/Math.cginc | 152 ++++++++++++++ .../Assets/Shaders/Include/Math.cginc.meta | 9 + .../Shaders/Include/MobileSelection.cginc | 48 +++++ .../Include/MobileSelection.cginc.meta | 9 + .../Assets/TiltBrush/Assets/Textures.meta | 8 + .../TiltBrush/Assets/Textures/white.png | Bin 0 -> 151 bytes .../TiltBrush/Assets/Textures/white.png.meta | 88 +++++++++ UnitySDK/Assets/TiltBrush/Assets/X.meta | 8 + .../Assets/TiltBrush/Assets/X/Brushes.meta | 8 + .../Assets/X/Brushes/BubbleWand.meta | 8 + .../X/Brushes/BubbleWand/BubbleWand.shader | 107 ++++++++++ .../Brushes/BubbleWand/BubbleWand.shader.meta | 9 + .../Assets/X/Brushes/BubbleWand/main.png | Bin 0 -> 58436 bytes .../Assets/X/Brushes/BubbleWand/main.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Charcoal.meta | 8 + .../Assets/X/Brushes/Charcoal/main.png | Bin 0 -> 125028 bytes .../Assets/X/Brushes/Charcoal/main.png.meta | 88 +++++++++ .../Assets/X/Brushes/Charcoal/normal.png | Bin 0 -> 138897 bytes .../Assets/X/Brushes/Charcoal/normal.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Digital.meta | 8 + .../Assets/X/Brushes/Digital/Digital.shader | 171 ++++++++++++++++ .../X/Brushes/Digital/Digital.shader.meta | 9 + .../Assets/X/Brushes/DoubleFlat.meta | 8 + .../X/Brushes/DoubleFlat/maintexture.png | Bin 0 -> 1006 bytes .../X/Brushes/DoubleFlat/maintexture.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Drafting.meta | 8 + .../Assets/X/Brushes/Drafting/Drafting.shader | 73 +++++++ .../X/Brushes/Drafting/Drafting.shader.meta | 9 + .../Assets/X/Brushes/Drafting/maintexture.png | Bin 0 -> 73934 bytes .../X/Brushes/Drafting/maintexture.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/DryBrush.meta | 8 + .../Assets/X/Brushes/DryBrush/main.png | Bin 0 -> 559391 bytes .../Assets/X/Brushes/DryBrush/main.png.meta | 88 +++++++++ .../Assets/X/Brushes/DryBrush/normal.jpg | Bin 0 -> 165705 bytes .../Assets/X/Brushes/DryBrush/normal.jpg.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Fairy.meta | 8 + .../Assets/X/Brushes/Fairy/Fairy.shader | 148 ++++++++++++++ .../Assets/X/Brushes/Fairy/Fairy.shader.meta | 9 + .../TiltBrush/Assets/X/Brushes/Feather.meta | 8 + .../X/Brushes/Feather/Feather_Texture.png | Bin 0 -> 513310 bytes .../Brushes/Feather/Feather_Texture.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Fire 2.meta | 8 + .../Assets/X/Brushes/Fire 2/Fire2.shader | 140 +++++++++++++ .../Assets/X/Brushes/Fire 2/Fire2.shader.meta | 9 + .../Assets/X/Brushes/Fire 2/distortion.png | Bin 0 -> 178012 bytes .../X/Brushes/Fire 2/distortion.png.meta | 88 +++++++++ .../Assets/X/Brushes/Fire 2/flame_map.png | Bin 0 -> 504900 bytes .../X/Brushes/Fire 2/flame_map.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Gouache.meta | 8 + .../Assets/X/Brushes/Gouache/main.png | Bin 0 -> 132859 bytes .../Assets/X/Brushes/Gouache/main.png.meta | 88 +++++++++ .../Assets/X/Brushes/Gouache/normal.png | Bin 0 -> 282631 bytes .../Assets/X/Brushes/Gouache/normal.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Guts.meta | 8 + .../TiltBrush/Assets/X/Brushes/Guts/color.png | Bin 0 -> 25852 bytes .../Assets/X/Brushes/Guts/color.png.meta | 88 +++++++++ .../Assets/X/Brushes/Guts/normal.png | Bin 0 -> 259614 bytes .../Assets/X/Brushes/Guts/normal.png.meta | 99 ++++++++++ .../Assets/X/Brushes/KeijiroTube.meta | 8 + .../X/Brushes/KeijiroTube/KeijiroTube.shader | 65 ++++++ .../KeijiroTube/KeijiroTube.shader.meta | 9 + .../TiltBrush/Assets/X/Brushes/Lacewing.meta | 8 + .../Assets/X/Brushes/Lacewing/Lacewing.shader | 106 ++++++++++ .../X/Brushes/Lacewing/Lacewing.shader.meta | 9 + .../Assets/X/Brushes/Lacewing/main.png | Bin 0 -> 16152 bytes .../Assets/X/Brushes/Lacewing/main.png.meta | 88 +++++++++ .../Assets/X/Brushes/Lacewing/normal.png | Bin 0 -> 28771 bytes .../Assets/X/Brushes/Lacewing/normal.png.meta | 88 +++++++++ .../Assets/X/Brushes/Lacewing/specular.png | Bin 0 -> 49041 bytes .../X/Brushes/Lacewing/specular.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/LeakyPen.meta | 8 + .../Assets/X/Brushes/LeakyPen/LeakyPen.shader | 65 ++++++ .../X/Brushes/LeakyPen/LeakyPen.shader.meta | 9 + .../Assets/X/Brushes/LeakyPen/main.psd | Bin 0 -> 248276 bytes .../Assets/X/Brushes/LeakyPen/main.psd.meta | 88 +++++++++ .../Assets/X/Brushes/LoftedHueShift.meta | 8 + .../LoftedHueShift/LoftedHueShift.shader | 63 ++++++ .../LoftedHueShift/LoftedHueShift.shader.meta | 9 + .../Assets/X/Brushes/MarbledRainbow.meta | 8 + .../MarbledRainbow/MarbledRainbow.shader | 88 +++++++++ .../MarbledRainbow/MarbledRainbow.shader.meta | 9 + .../Assets/X/Brushes/MarbledRainbow/main.png | Bin 0 -> 75992 bytes .../X/Brushes/MarbledRainbow/main.png.meta | 88 +++++++++ .../X/Brushes/MarbledRainbow/normal.png | Bin 0 -> 61687 bytes .../X/Brushes/MarbledRainbow/normal.png.meta | 88 +++++++++ .../X/Brushes/MarbledRainbow/specular.png | Bin 0 -> 253971 bytes .../Brushes/MarbledRainbow/specular.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Muscle.meta | 8 + .../Assets/X/Brushes/Muscle/muscle_color.png | Bin 0 -> 358729 bytes .../X/Brushes/Muscle/muscle_color.png.meta | 88 +++++++++ .../Assets/X/Brushes/Muscle/muscle_normal.png | Bin 0 -> 893508 bytes .../X/Brushes/Muscle/muscle_normal.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/MylarTube.meta | 8 + .../X/Brushes/MylarTube/MylarTube.shader | 84 ++++++++ .../X/Brushes/MylarTube/MylarTube.shader.meta | 9 + .../TiltBrush/Assets/X/Brushes/Race.meta | 8 + .../Assets/X/Brushes/Race/Race.shader | 171 ++++++++++++++++ .../Assets/X/Brushes/Race/Race.shader.meta | 9 + .../TiltBrush/Assets/X/Brushes/Rain.meta | 8 + .../Assets/X/Brushes/Rain/Rain.shader | 150 ++++++++++++++ .../Assets/X/Brushes/Rain/Rain.shader.meta | 9 + .../TiltBrush/Assets/X/Brushes/Rain/main.png | Bin 0 -> 8205 bytes .../Assets/X/Brushes/Rain/main.png.meta | 88 +++++++++ .../Assets/X/Brushes/RisingBubbles.meta | 8 + .../RisingBubbles/RisingBubbles.shader | 144 ++++++++++++++ .../RisingBubbles/RisingBubbles.shader.meta | 9 + .../X/Brushes/RisingBubbles/maintexture.png | Bin 0 -> 132651 bytes .../RisingBubbles/maintexture.png.meta | 88 +++++++++ .../Assets/X/Brushes/SingleSided.meta | 8 + .../X/Brushes/SingleSided/maintexture.png | Bin 0 -> 1006 bytes .../Brushes/SingleSided/maintexture.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Space.meta | 8 + .../Assets/X/Brushes/Space/Space.shader | 132 +++++++++++++ .../Assets/X/Brushes/Space/Space.shader.meta | 9 + .../TiltBrush/Assets/X/Brushes/Sparks.meta | 8 + .../Assets/X/Brushes/Sparks/Sparks.shader | 162 +++++++++++++++ .../X/Brushes/Sparks/Sparks.shader.meta | 9 + .../Assets/X/Brushes/Sparks/maintexture.png | Bin 0 -> 22176 bytes .../X/Brushes/Sparks/maintexture.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Square.meta | 8 + .../Assets/X/Brushes/Square/main.png | Bin 0 -> 486884 bytes .../Assets/X/Brushes/Square/main.png.meta | 88 +++++++++ .../Assets/X/Brushes/Square/normal.png | Bin 0 -> 668760 bytes .../Assets/X/Brushes/Square/normal.png.meta | 88 +++++++++ .../Assets/X/Brushes/TaperedHueShift.meta | 8 + .../TaperedHueShift/TaperedHueShift.shader | 94 +++++++++ .../TaperedHueShift.shader.meta | 9 + .../Assets/X/Brushes/TaperedHueShift/main.png | Bin 0 -> 25985 bytes .../X/Brushes/TaperedHueShift/main.png.meta | 88 +++++++++ .../TiltBrush/Assets/X/Brushes/Wind.meta | 8 + .../Assets/X/Brushes/Wind/Wind.shader | 84 ++++++++ .../Assets/X/Brushes/Wind/Wind.shader.meta | 9 + .../TiltBrush/Assets/X/Brushes/Wind/main.png | Bin 0 -> 110351 bytes .../Assets/X/Brushes/Wind/main.png.meta | 88 +++++++++ 406 files changed, 12568 insertions(+) create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Additive.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Additive.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special/Faceted.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special/Faceted.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Shaders/FlatLit.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Shaders/FlatLit.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/ColorSpace.cginc create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/ColorSpace.cginc.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/Math.cginc create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/Math.cginc.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/MobileSelection.cginc create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/MobileSelection.cginc.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Textures.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Textures/white.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/Textures/white.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/BubbleWand.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/BubbleWand.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/main.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/main.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Charcoal.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Charcoal/main.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Charcoal/main.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Charcoal/normal.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Charcoal/normal.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Digital.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Digital/Digital.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Digital/Digital.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/DoubleFlat.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/DoubleFlat/maintexture.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/DoubleFlat/maintexture.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Drafting.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Drafting/Drafting.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Drafting/Drafting.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Drafting/maintexture.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Drafting/maintexture.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/DryBrush.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/DryBrush/main.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/DryBrush/main.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/DryBrush/normal.jpg create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/DryBrush/normal.jpg.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Fairy.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Fairy/Fairy.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Fairy/Fairy.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Feather.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Feather/Feather_Texture.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Feather/Feather_Texture.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Fire 2.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Fire 2/Fire2.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Fire 2/Fire2.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Fire 2/distortion.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Fire 2/distortion.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Fire 2/flame_map.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Fire 2/flame_map.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Gouache.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Gouache/main.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Gouache/main.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Gouache/normal.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Gouache/normal.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Guts.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Guts/color.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Guts/color.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Guts/normal.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Guts/normal.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/KeijiroTube.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/KeijiroTube/KeijiroTube.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/KeijiroTube/KeijiroTube.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Lacewing.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Lacewing/Lacewing.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Lacewing/Lacewing.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Lacewing/main.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Lacewing/main.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Lacewing/normal.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Lacewing/normal.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Lacewing/specular.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Lacewing/specular.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/LeakyPen.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/LeakyPen/LeakyPen.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/LeakyPen/LeakyPen.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/LeakyPen/main.psd create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/LeakyPen/main.psd.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/LoftedHueShift.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/LoftedHueShift/LoftedHueShift.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/LoftedHueShift/LoftedHueShift.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MarbledRainbow.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MarbledRainbow/MarbledRainbow.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MarbledRainbow/MarbledRainbow.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MarbledRainbow/main.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MarbledRainbow/main.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MarbledRainbow/normal.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MarbledRainbow/normal.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MarbledRainbow/specular.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MarbledRainbow/specular.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Muscle.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Muscle/muscle_color.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Muscle/muscle_color.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Muscle/muscle_normal.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Muscle/muscle_normal.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MylarTube.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MylarTube/MylarTube.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/MylarTube/MylarTube.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Race.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Race/Race.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Race/Race.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Rain.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Rain/Rain.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Rain/Rain.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Rain/main.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Rain/main.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/RisingBubbles.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/RisingBubbles/RisingBubbles.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/RisingBubbles/RisingBubbles.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/RisingBubbles/maintexture.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/RisingBubbles/maintexture.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/SingleSided.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/SingleSided/maintexture.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/SingleSided/maintexture.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Space.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Space/Space.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Space/Space.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Sparks.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Sparks/Sparks.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Sparks/Sparks.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Sparks/maintexture.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Sparks/maintexture.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Square.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Square/main.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Square/main.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Square/normal.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Square/normal.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/TaperedHueShift.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/TaperedHueShift/TaperedHueShift.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/TaperedHueShift/TaperedHueShift.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/TaperedHueShift/main.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/TaperedHueShift/main.png.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Wind.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Wind/Wind.shader create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Wind/Wind.shader.meta create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Wind/main.png create mode 100644 UnitySDK/Assets/TiltBrush/Assets/X/Brushes/Wind/main.png.meta diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta new file mode 100644 index 00000000..9fa309da --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25cfc524cc091b340ada42975b5496c3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset new file mode 100644 index 00000000..ba14a104 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: BubbleWand_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: EBA3F993-F9A1-4D35-B84E-BB08F48981A4 + m_DurableName: BubbleWand + m_Material: {fileID: 2100000, guid: eba3f993f9a14d35b84ebb08f48981a4, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta new file mode 100644 index 00000000..6b2448ef --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e7af0f6547124b549b0e6cd1382e09d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat new file mode 100644 index 00000000..c67e2d83 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat @@ -0,0 +1,51 @@ +%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: BubbleWand_16 + m_Shader: {fileID: 4800000, guid: 0291fdb46401c4826bc02d7ec6d76cbb, 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} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a23cfe16e9d8cf4b820c79d8d2b9c5a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _DisplacementIntensity: 0.1 + - _EmissionGain: 0.25 + - _InvFade: 1 + - _Scroll1: 2 + - _Scroll2: -2 + - _ScrollJitterFrequency: 1 + - _ScrollJitterIntensity: 3 + - _ScrollRate: -0.54 + - _Smoothness: 0.078125 + - _Strength: 0.5 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta new file mode 100644 index 00000000..6ed5d69e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/BubbleWand/BubbleWand_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eba3f993f9a14d35b84ebb08f48981a4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta new file mode 100644 index 00000000..57bd9b32 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d50656153893eec47bf4cf51aed2c1cb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset new file mode 100644 index 00000000..1eded37c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: CandyCane_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 61d2ef63-ed60-49b3-85fb-7267b7d234f2 + m_DurableName: CandyCane + m_Material: {fileID: 2100000, guid: 61d2ef63ed6049b385fb7267b7d234f2, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 0 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta new file mode 100644 index 00000000..846a942b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6caf73c57b041b15aa8be4416ce94539 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat new file mode 100644 index 00000000..fa48ed29 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat @@ -0,0 +1,37 @@ +%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: CandyCane_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta new file mode 100644 index 00000000..4f611b17 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CandyCane/CandyCane_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61d2ef63ed6049b385fb7267b7d234f2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta new file mode 100644 index 00000000..41100861 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b3b367f7865ee1e48aa234c1de07f2fb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset new file mode 100644 index 00000000..318332a8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Charcoal_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: fde6e778-0f7a-e584-38d6-89d44cee59f6 + m_DurableName: Charcoal + m_Material: {fileID: 2100000, guid: fde6e7780f7ae58438d689d44cee59f6, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta new file mode 100644 index 00000000..6b39b73c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b10752a9c95c62c53bb7746fec40de88 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat new file mode 100644 index 00000000..cf7d923a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat @@ -0,0 +1,79 @@ +%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: Charcoal_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 9bdb8bc5360ddc148bfcb994ca09401f, type: 3} + 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: 2e3b6862a2aeea04780ff5a7350b6132, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.01 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta new file mode 100644 index 00000000..5c52d259 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Charcoal/Charcoal_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fde6e7780f7ae58438d689d44cee59f6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta new file mode 100644 index 00000000..bed87911 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a83e25e0d151e346b0138b1cf16aafa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset new file mode 100644 index 00000000..6b31a970 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: ConcaveHull_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 7ae1f880-a517-44a0-99f9-1cab654498c6 + m_DurableName: ConcaveHull + m_Material: {fileID: 2100000, guid: 7ae1f880a51744a099f91cab654498c6, type: 2} + m_IsParticle: 0 + m_uv0Size: 0 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta new file mode 100644 index 00000000..e372647f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 48bbb35d5d49b315d9b442fc6745f631 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat new file mode 100644 index 00000000..423664bc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat @@ -0,0 +1,102 @@ +%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: ConcaveHull_16 + m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Bottom: + 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} + 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: 0} + 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} + - _Side: + m_Texture: {fileID: 2800000, guid: 006eb4ee45e4eee4b84cf30d54b01889, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Top: + m_Texture: {fileID: 2800000, guid: 640eb58bac1e8c349b8aef55f817627b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BottomScale: 2 + - _Bulge: 2.25 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _NumSides: 5 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ScrollJitterFrequency: 1 + - _ScrollJitterIntensity: 1 + - _ScrollRate: 1 + - _Shininess: 0.078125 + - _SideScale: 0.2 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 1 + - _SpreadRate: 1.539 + - _SrcBlend: 1 + - _TopScale: 0.3 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta new file mode 100644 index 00000000..4d8b10bd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ConcaveHull/ConcaveHull_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ae1f880a51744a099f91cab654498c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta new file mode 100644 index 00000000..3c38d6fc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57310860c5180594fbc8da76d0e5cfe7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader new file mode 100644 index 00000000..b1ded660 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader @@ -0,0 +1,107 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Special/DanceFloor" { +Properties { + _TintColor ("Tint Color", Color) = (0.5,0.5,0.5,0.5) + _MainTex ("Particle Texture", 2D) = "white" {} +} + +Category { + //Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + //Blend One One + //BlendOp Add, Min + //AlphaTest Greater .01 +// ColorMask RGBA + Cull Off Lighting Off ZWrite On Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 3.0 + #pragma glsl + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + + sampler2D _MainTex; + fixed4 _TintColor; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float4 texcoord1 : TEXCOORD1; + float3 normal : NORMAL; + }; + + struct v2f { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float3 worldPos : TEXCOORD1; + }; + + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + v2f o; + float4 worldPos = mul(unity_ObjectToWorld, v.vertex); + float waveform = 0; + + float lifetime = _Time.y - v.texcoord1.w; + float release = saturate(lifetime); + + +#ifdef AUDIO_REACTIVE + //worldPos.y -= release * fmod(_BeatOutputAccum.x * 2 - v.texcoord1.w, 5); + //worldPos.y += .3 * release * pow(sin(_BeatOutputAccum.x * 5 + worldPos.x),5); + lifetime = v.texcoord1.w * 10 + _BeatOutputAccum.x; + o.color += tex2Dlod(_WaveFormTex, float4(lifetime * 5,0, 0, 0)).r - .5; + +#endif + + v.color.xyz = pow(fmod(lifetime,1),3) * v.color.xyz; // * saturate(sin(lifetime * 10)) + v.color.zxy * saturate(cos(lifetime * 7)); + + // Quantize vertices + float q = 5; + float3 quantPos = ceil(worldPos.xyz * q) / q; + worldPos.xyz = quantPos; + worldPos.xyz += v.normal * pow(fmod(lifetime,1),3) * .1; + o.vertex = mul(UNITY_MATRIX_VP, worldPos); + o.color = 2 * v.color + v.color.yzxw * _BeatOutput.x; + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + o.worldPos = worldPos.xyz; + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + + //float waveform = tex2D(_WaveFormTex, float2(fmod(i.worldPos.x * 0.1f + _Time.y,1),0) ).r - .5f; + //i.texcoord.y += waveform; + float4 c = i.color * _TintColor * tex2D(_MainTex, i.texcoord); + return float4(c.rgb * c.a, 1.0); + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta new file mode 100644 index 00000000..cfdf76b3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 14968e66fc8cfe441b31a7c23a07897c +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset new file mode 100644 index 00000000..6b1a03c9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: DanceFloor_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 6a1cf9f9-032c-45ec-311e-a6680bee32e9 + m_DurableName: DanceFloor + m_Material: {fileID: 2100000, guid: 6a1cf9f9032c45ec311ea6680bee32e9, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 4 + m_uv1Semantic: 2 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta new file mode 100644 index 00000000..311ddf05 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dae3fdb8756823f5da4e8b5637689dce +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat new file mode 100644 index 00000000..568f0c65 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat @@ -0,0 +1,39 @@ +%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: DanceFloor_16 + m_Shader: {fileID: 4800000, guid: 14968e66fc8cfe441b31a7c23a07897c, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: a376d2141060ffb4c80eb5f3d39ceb07, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BaseGain: 0.4 + - _EmissionGain: 1 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + - _WaveformFreq: 0.2 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} + - _WaveformIntensity: {r: 0, g: 0.3, b: 0, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta new file mode 100644 index 00000000..03f20ef1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/DanceFloor_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a1cf9f9032c45ec311ea6680bee32e9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png new file mode 100644 index 0000000000000000000000000000000000000000..3757a9c54a4e960919fcac4d07cb1ac2c0b015d7 GIT binary patch literal 26563 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 literal 0 HcmV?d00001 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta new file mode 100644 index 00000000..6cc32a05 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DanceFloor/maintexture.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: a376d2141060ffb4c80eb5f3d39ceb07 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta new file mode 100644 index 00000000..afc2cf71 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 72e82b63fa3c0d240a59dd8ed2172de3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset new file mode 100644 index 00000000..15eb5c03 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Digital_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 30cb9af6-be41-4872-8f3e-cbff63fe3db8 + m_DurableName: Digital + m_Material: {fileID: 2100000, guid: 30cb9af6be4148728f3ecbff63fe3db8, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta new file mode 100644 index 00000000..81715e2e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c77e0f00fa715965884077fd916bcad2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat new file mode 100644 index 00000000..c450945d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat @@ -0,0 +1,28 @@ +%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: Digital_16 + m_Shader: {fileID: 4800000, guid: c8def03accc4e8341b9fa2db8eb6ff87, 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: + - _EmissionGain: 0.5 + m_Colors: [] diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta new file mode 100644 index 00000000..65854bbc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Digital/Digital_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30cb9af6be4148728f3ecbff63fe3db8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta new file mode 100644 index 00000000..7683bd4b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b79b104f5d077248ace6fa64abc6f00 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset new file mode 100644 index 00000000..8fd857f0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: DoubleFlat_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f4a0550c-332a-4e1a-9793-b71508f4a454 + m_DurableName: DoubleFlat + m_Material: {fileID: 2100000, guid: f4a0550c332a4e1a9793b71508f4a454, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta new file mode 100644 index 00000000..8a558b02 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 091ec3bb464eb8c59b355450492173d5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat new file mode 100644 index 00000000..711fb933 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat @@ -0,0 +1,77 @@ +%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: DoubleFlat_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 7c22e3178fa6e2d49a7c323bd3001eff, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta new file mode 100644 index 00000000..45a0c9ba --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DoubleFlat/DoubleFlat_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4a0550c332a4e1a9793b71508f4a454 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta new file mode 100644 index 00000000..0edd65c6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 206b124be661f3146841d8a39e00524f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset new file mode 100644 index 00000000..66894e57 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Drafting_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 492b36ff-b337-436a-ba5f-1e87ee86747e + m_DurableName: Drafting + m_Material: {fileID: 2100000, guid: 492b36ffb337436aba5f1e87ee86747e, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta new file mode 100644 index 00000000..55760cc8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0afc2cbbd5388dd5c9edea230b9878f6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat new file mode 100644 index 00000000..3d10bda7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat @@ -0,0 +1,34 @@ +%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: Drafting_16 + m_Shader: {fileID: 4800000, guid: b8dd2d296c760ad4dba8f0d9ec26d921, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 95c96bad81d7efa45b4fa690f0b520c3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _InvFade: 1 + - _Visibility01: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta new file mode 100644 index 00000000..85623c97 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Drafting/Drafting_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 492b36ffb337436aba5f1e87ee86747e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta new file mode 100644 index 00000000..38f1b06b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef4e935153c6cbb4bab61f3d11d52871 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset new file mode 100644 index 00000000..50f81953 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: _16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 725f4c6a-6427-6524-29ab-da371924adab + m_DurableName: + m_Material: {fileID: 2100000, guid: 725f4c6a6427652429abda371924adab, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta new file mode 100644 index 00000000..38925b54 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca487b7672ab3a452ac3e54a6b4438e9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat new file mode 100644 index 00000000..21475d3c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat @@ -0,0 +1,79 @@ +%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: _16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 3d0bfa733a1992c4484952a4e71fc67f, type: 3} + 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: 576a5ce02d271ad46a5c2c0d90fd9543, 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.2 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.05 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta new file mode 100644 index 00000000..2b5220cf --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DryBrush/_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 725f4c6a6427652429abda371924adab +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta new file mode 100644 index 00000000..d0f65ab0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57927278325276f4c9a831c4eecafab2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset new file mode 100644 index 00000000..93499a44 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: _16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 84d5bbb2-6634-8434-f8a7-681b576b4664 + m_DurableName: + m_Material: {fileID: 2100000, guid: 84d5bbb266348434f8a7681b576b4664, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta new file mode 100644 index 00000000..6967c46d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78a794d54b7adc55c8069dac327af9b5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat new file mode 100644 index 00000000..7f0a1156 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat @@ -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: _16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3} + 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: 1819abb411411e243b701e7dd664ac9a, 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.2 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.414 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta new file mode 100644 index 00000000..f6e9331d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/DuctTapeGeometry/_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84d5bbb266348434f8a7681b576b4664 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube.meta new file mode 100644 index 00000000..19c94537 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bdc489579fffcb4ca43bf5041afb19f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset new file mode 100644 index 00000000..4e435c9a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: FacetedTube_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 4391ffaa-df73-4396-9e33-31e4e4930b27 + m_DurableName: FacetedTube + m_Material: {fileID: 2100000, guid: 4391ffaadf7343969e3331e4e4930b27, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset.meta new file mode 100644 index 00000000..df626f62 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 811c48395a037e651a901d38ff989b7f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat new file mode 100644 index 00000000..ff23ddf3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat @@ -0,0 +1,37 @@ +%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: FacetedTube_16 + m_Shader: {fileID: 4800000, guid: 387f4f61bc82c4e5f813ad7caa1f394a, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat.meta new file mode 100644 index 00000000..c7ff6a26 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/FacetedTube/FacetedTube_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4391ffaadf7343969e3331e4e4930b27 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy.meta new file mode 100644 index 00000000..b7c1d4c3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ef69ad5ade0bb547a1e57a2938b54a7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset new file mode 100644 index 00000000..8fde5b20 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Fairy_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d9cc5e99-ace1-4d12-96e0-4a7c18c99cfc + m_DurableName: Fairy + m_Material: {fileID: 2100000, guid: d9cc5e99ace14d1296e04a7c18c99cfc, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset.meta new file mode 100644 index 00000000..bd60a595 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66fb653e1d4373957b0c0fa8573c322d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat new file mode 100644 index 00000000..2aa7eeb9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat @@ -0,0 +1,78 @@ +%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: Fairy_16 + m_Shader: {fileID: 4800000, guid: 2ff11252cfff6694db314e548417a3f3, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat.meta new file mode 100644 index 00000000..c2c03790 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fairy/Fairy_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9cc5e99ace14d1296e04a7c18c99cfc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather.meta new file mode 100644 index 00000000..068f82bf --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff414b7d7ef5e084295dd53c4b92a474 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset new file mode 100644 index 00000000..51f031f3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Feather_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: a555b809-2017-46cb-ac26-e63173d8f45e + m_DurableName: Feather + m_Material: {fileID: 2100000, guid: a555b809201746cbac26e63173d8f45e, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset.meta new file mode 100644 index 00000000..84b1971e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fef1d9521b15395c9ec46fe58b33955 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat new file mode 100644 index 00000000..76c7d460 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat @@ -0,0 +1,78 @@ +%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: Feather_16 + m_Shader: {fileID: 4800000, guid: 63ee81a0fbf19bc44bec7e2ca3ba73e1, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 8b8ab8aee175c7944adfbff2011ee7ad, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat.meta new file mode 100644 index 00000000..44f59923 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Feather/Feather_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a555b809201746cbac26e63173d8f45e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta new file mode 100644 index 00000000..032aae34 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78241a9546dbb6b4fa1e8ba8f2e079fd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset new file mode 100644 index 00000000..9eeb09b9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Fire2_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 53d753ef-083c-45e1-98e7-4459b4471219 + m_DurableName: Fire2 + m_Material: {fileID: 2100000, guid: 53d753ef083c45e198e74459b4471219, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta new file mode 100644 index 00000000..982d8613 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 026e014eee7f6bf5c8e1787b57ebaefc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat new file mode 100644 index 00000000..cfadd867 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat @@ -0,0 +1,47 @@ +%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: Fire2_16 + m_Shader: {fileID: 4800000, guid: fb1ab3f9ab465f54eb58155e74965fd3, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _DisplaceTex: + m_Texture: {fileID: 2800000, guid: 81848e33c61a3044488261d77f876538, type: 3} + m_Scale: {x: 2.45, y: 1} + m_Offset: {x: 0, y: 0} + - _DisplaceTex2: + m_Texture: {fileID: 2800000, guid: 40f5f7fe2711abc49996d6c0b10f65eb, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 3e1013826bb3a0c458492e9d6bede944, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _DisplacementIntensity: 0.04 + - _EmissionGain: 0.405 + - _FlameFadeMax: 30 + - _FlameFadeMin: 8.53 + - _InvFade: 1 + - _Scroll1: 15 + - _Scroll2: 8 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta new file mode 100644 index 00000000..d71c0dab --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Fire2/Fire2_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53d753ef083c45e198e74459b4471219 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta new file mode 100644 index 00000000..60d87cbc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac17f035faddb8d4191f4be44d737220 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset new file mode 100644 index 00000000..ca3262a6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Gouache_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 1b897b7e-9b76-425a-b031-a867c48df409 + m_DurableName: Gouache + m_Material: {fileID: 2100000, guid: 1b897b7e9b76425ab031a867c48df409, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta new file mode 100644 index 00000000..245aebeb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b04662a6e713b0578030ffa3d74d5dc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat new file mode 100644 index 00000000..8964f513 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat @@ -0,0 +1,79 @@ +%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: Gouache_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 3a1bfa901a032c94e9a3e4adb6952d0f, type: 3} + 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: 6c1cf6c0ae3c96846946d476a0b86a09, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.01 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta new file mode 100644 index 00000000..903acafb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Gouache/Gouache_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b897b7e9b76425ab031a867c48df409 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta new file mode 100644 index 00000000..64742b33 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b68cd706e4e6cc2408ed2ce7a4647021 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset new file mode 100644 index 00000000..1d001e4e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Gouache_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 4465b5ef-3605-bec4-2b3e-6b04508ddb6b + m_DurableName: Gouache + m_Material: {fileID: 2100000, guid: 4465b5ef3605bec42b3e6b04508ddb6b, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta new file mode 100644 index 00000000..fe5a5de3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55d97626500acb15394a5c4604f100cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat new file mode 100644 index 00000000..c673aff0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat @@ -0,0 +1,79 @@ +%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: Gouache_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 3a1bfa901a032c94e9a3e4adb6952d0f, type: 3} + 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: 6c1cf6c0ae3c96846946d476a0b86a09, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.01 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta new file mode 100644 index 00000000..16bd56b0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/GouacheSingleSided/Gouache_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4465b5ef3605bec42b3e6b04508ddb6b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta new file mode 100644 index 00000000..6dba8e03 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c2435ebd91affb647b2ccd4c9d56201c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset new file mode 100644 index 00000000..317dff39 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Guts_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 99aafe96-1645-44cd-99bd-979bc6ef37c5 + m_DurableName: Guts + m_Material: {fileID: 2100000, guid: 99aafe96164544cd99bd979bc6ef37c5, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta new file mode 100644 index 00000000..d03a3b84 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5316e81a637acfe58aa970f605fa1618 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat new file mode 100644 index 00000000..f1ae5823 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat @@ -0,0 +1,83 @@ +%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: Guts_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: _EMISSION _NORMALMAP + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: d03c44c5f6a1b194ea104833f9ba840d, type: 3} + m_Scale: {x: 0.15, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 0.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: 0.1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ccfef80c6153521489f5745b0d4dffec, type: 3} + m_Scale: {x: 0.15, 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.3 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.305 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.743 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.23745675, g: 0.2579406, b: 0.2647059, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta new file mode 100644 index 00000000..810bd184 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Guts/Guts_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99aafe96164544cd99bd979bc6ef37c5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta new file mode 100644 index 00000000..2690a88f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8ee14578eb601843851b75dbe1d50a2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset new file mode 100644 index 00000000..b84d89fd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: HolidayTree_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 20a0bf1a-a96e-44e5-84ac-9823d2d65023 + m_DurableName: HolidayTree + m_Material: {fileID: 2100000, guid: 20a0bf1aa96e44e584ac9823d2d65023, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 0 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta new file mode 100644 index 00000000..3a118df1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd353eba365eee252b6e8be44267c191 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat new file mode 100644 index 00000000..da59ca5d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat @@ -0,0 +1,37 @@ +%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: HolidayTree_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta new file mode 100644 index 00000000..4dd42b60 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/HolidayTree/HolidayTree_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20a0bf1aa96e44e584ac9823d2d65023 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta new file mode 100644 index 00000000..5f1a5984 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc6a175fdcdb9144fa0c9407283da447 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset new file mode 100644 index 00000000..1a5986a1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: _16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 7c972c27-d3c2-8af4-7bf8-5d9db8f0b7bb + m_DurableName: + m_Material: {fileID: 2100000, guid: 7c972c27d3c28af47bf85d9db8f0b7bb, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta new file mode 100644 index 00000000..66905094 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd102dbcd22fb8c5a92659c58182d7aa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat new file mode 100644 index 00000000..ece816f1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat @@ -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: _16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3} + 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: 31a0dba64c25fa442a02171bc2131ccc, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.4 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _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} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta new file mode 100644 index 00000000..0dd2cd1a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/InkGeometry/_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c972c27d3c28af47bf85d9db8f0b7bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta new file mode 100644 index 00000000..10c893e0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 493376b5db3b75b438e87799459aa1a2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset new file mode 100644 index 00000000..1f4945a8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: KeijiroTube_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f8ba3d18-01fc-4d7b-b2d9-b99d10b8e7cf + m_DurableName: KeijiroTube + m_Material: {fileID: 2100000, guid: f8ba3d1801fc4d7bb2d9b99d10b8e7cf, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta new file mode 100644 index 00000000..e0e21616 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f9e50c54c7ace8a5b88473c447fdbf8e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat new file mode 100644 index 00000000..bd7bbdfb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat @@ -0,0 +1,79 @@ +%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: KeijiroTube_16 + m_Shader: {fileID: 4800000, guid: 54cf55a2c62eff1458edd3f1e68d0f0a, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.432 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.75735295, g: 0.75735295, b: 0.75735295, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta new file mode 100644 index 00000000..4608364d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/KeijiroTube/KeijiroTube_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8ba3d1801fc4d7bb2d9b99d10b8e7cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta new file mode 100644 index 00000000..8c90dd7e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b85b1d9f9232be40ad5fc76b828daac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset new file mode 100644 index 00000000..0a11484d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Lacewing_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 1cf94f63-f57a-4a1a-ad14-295af4f5ab5c + m_DurableName: Lacewing + m_Material: {fileID: 2100000, guid: 1cf94f63f57a4a1aad14295af4f5ab5c, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta new file mode 100644 index 00000000..5f6f5d66 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78b2b9b4f4a66d855b5ff47423606d67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat new file mode 100644 index 00000000..458a620d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat @@ -0,0 +1,87 @@ +%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: Lacewing_16 + m_Shader: {fileID: 4800000, guid: 7e1a0dadd1e4c4d4188e90445d167319, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION _NORMALMAP _SPECGLOSSMAP + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: dc24e2075b423f943aaa744cbccf20c9, type: 3} + 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: 8eb8288ae9ead3741a090cdc7940f161, 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} + - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: 9f5fc705fe72374448bf9e0f1203beb3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecTex: + m_Texture: {fileID: 2800000, guid: 9f5fc705fe72374448bf9e0f1203beb3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.9 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 0.741 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.8 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.14705884, g: 0.14705884, b: 0.14705884, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta new file mode 100644 index 00000000..be894a78 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Lacewing/Lacewing_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1cf94f63f57a4a1aad14295af4f5ab5c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta new file mode 100644 index 00000000..c3ee3e88 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 817db968ed74e2241918e00ba3c5cac7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset new file mode 100644 index 00000000..78dac412 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: _16 + m_EditorClassIdentifier: + m_Guid: + m_storage: ddda8745-4bb5-ac54-88b6-d1480370583e + m_DurableName: + m_Material: {fileID: 2100000, guid: ddda87454bb5ac5488b6d1480370583e, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta new file mode 100644 index 00000000..e91f93b7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92ff03b2bb2a29a5e9d6a4f1a713c69d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat new file mode 100644 index 00000000..4b150dc2 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat @@ -0,0 +1,90 @@ +%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: _16 + m_Shader: {fileID: 4800000, guid: 6bb8cf7337b1ff743819661ccd6cbb61, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BGTex: + m_Texture: {fileID: 2800000, guid: 05eafee566d1a0246aa955fe3b5c71e2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 5748e3a43c5fac54684f79a6f855b2f6, type: 3} + 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: 69d2e7612c71ad14298c0f84c741c1e5, type: 3} + m_Scale: {x: 0.3, y: 0.5} + 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} + - _SecondaryTex: + m_Texture: {fileID: 2800000, guid: 69d2e7612c71ad14298c0f84c741c1e5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Ratio: 0.57 + - _Shininess: 0.01 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SqueezeAmount: 0.9 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.44117647, g: 0.44117647, b: 0.44117647, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _LineColor: {r: 0.15158093, g: 0.62766045, b: 0.9411765, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta new file mode 100644 index 00000000..b6d4499f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LeakyPen/_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ddda87454bb5ac5488b6d1480370583e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta new file mode 100644 index 00000000..893c1e9f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9c5cdaa4f512f040a381f1e2a0d41af +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset new file mode 100644 index 00000000..21eb2a3e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Leaves2_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 7259cce5-41c1-ec74-c885-78af28a31d95 + m_DurableName: Leaves2 + m_Material: {fileID: 2100000, guid: 7259cce541c1ec74c88578af28a31d95, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta new file mode 100644 index 00000000..0bd02b4b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 242adf01c508b5253aefe5c5bab9cd42 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat new file mode 100644 index 00000000..976899fb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat @@ -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: Leaves2_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 735a5f2fd14c4764682ef32fc6822de5, type: 3} + 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: 3743071a0f034424390b1aa53dda0d60, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.395 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta new file mode 100644 index 00000000..57a107fd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Leaves2/Leaves2_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7259cce541c1ec74c88578af28a31d95 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta new file mode 100644 index 00000000..69fa211a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30f17350ba549c04d9327268e159f550 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset new file mode 100644 index 00000000..61777b50 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Wire (Lit)_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 62fef968-e842-3224-4a0e-1fdb7cfb745c + m_DurableName: Wire (Lit) + m_Material: {fileID: 2100000, guid: 62fef968e84232244a0e1fdb7cfb745c, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta new file mode 100644 index 00000000..ae106eac --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bfc9ec097bc4a445383f719c6602584d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat new file mode 100644 index 00000000..d9687a6f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat @@ -0,0 +1,79 @@ +%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: Wire (Lit)_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0} + 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta new file mode 100644 index 00000000..a2744718 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LitWire/Wire (Lit)_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62fef968e84232244a0e1fdb7cfb745c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta new file mode 100644 index 00000000..a7e493fb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f2569232895ece4b84f369068b9fdca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset new file mode 100644 index 00000000..34e792f3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Lofted (Hue Shift)_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: c5da2e70-a6e4-63a4-898c-5cfedef09c97 + m_DurableName: Lofted (Hue Shift) + m_Material: {fileID: 2100000, guid: c5da2e70a6e463a4898c5cfedef09c97, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta new file mode 100644 index 00000000..c486273b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ddfae286c35c87e54a394a983cad0491 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat new file mode 100644 index 00000000..3b7cde56 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat @@ -0,0 +1,43 @@ +%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: Lofted (Hue Shift)_16 + m_Shader: {fileID: 4800000, guid: 9c338a5b76b34404c95b237822b3bd21, 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} + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + - _Shininess: 0.4 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.13235295, g: 0.13235295, b: 0.13235295, a: 0} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta new file mode 100644 index 00000000..2b662205 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/LoftedHueShift/Lofted (Hue Shift)_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5da2e70a6e463a4898c5cfedef09c97 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta new file mode 100644 index 00000000..007fe670 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d264e7e8e8b1984d97c7d4b596ece1c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset new file mode 100644 index 00000000..6e751457 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Marbled Rainbow_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: c86c058d-1bda-2e94-08db-f3d6a96ac4a1 + m_DurableName: Marbled Rainbow + m_Material: {fileID: 2100000, guid: c86c058d1bda2e9408dbf3d6a96ac4a1, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta new file mode 100644 index 00000000..6e23bcb6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 658eed08dfd4e5850b642d22cd495b97 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat new file mode 100644 index 00000000..118a0f60 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat @@ -0,0 +1,87 @@ +%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: Marbled Rainbow_16 + m_Shader: {fileID: 4800000, guid: 2734c8c206f6a5f408615a5ab03a6e6d, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION _NORMALMAP _SPECGLOSSMAP + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 70738dc9310ce1a4f88400c683a47494, type: 3} + 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: 795b3993927f0fa4d88e29f4596b1d2b, 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} + - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: 9f5fc705fe72374448bf9e0f1203beb3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecTex: + m_Texture: {fileID: 2800000, guid: 6697d3cba218276429328ca416628c75, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 0.741 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.8 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2205882, g: 0.2205882, b: 0.2205882, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta new file mode 100644 index 00000000..e01d5a4a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MarbledRainbow/Marbled Rainbow_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c86c058d1bda2e9408dbf3d6a96ac4a1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta new file mode 100644 index 00000000..eaf7763d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8829dc4033451184e8c2e803035d45a5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset new file mode 100644 index 00000000..b41000e1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Muscle_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f28c395c-a57d-464b-8f0b-558c59478fa3 + m_DurableName: Muscle + m_Material: {fileID: 2100000, guid: f28c395ca57d464b8f0b558c59478fa3, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta new file mode 100644 index 00000000..41b1d279 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66eaa331dac132e588b955c39ede2701 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat new file mode 100644 index 00000000..2b7f6b18 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat @@ -0,0 +1,83 @@ +%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: Muscle_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: _EMISSION _NORMALMAP + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: d72cc108e6b8e2b459e9399f8217b7e1, type: 3} + m_Scale: {x: 0.25, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 0.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: 0.1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 8bb9cbfa02bae984fba39bb96a916591, type: 3} + m_Scale: {x: 0.25, 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.3 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.305 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.57 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.08088237, g: 0.08088237, b: 0.08088237, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta new file mode 100644 index 00000000..360270c1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Muscle/Muscle_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f28c395ca57d464b8f0b558c59478fa3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta new file mode 100644 index 00000000..9cb14c6f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea685b76f3faae942865cadea282aa5e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset new file mode 100644 index 00000000..ecb0c721 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: MylarTube_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 8e58ceea-7830-49b4-aba9-6215104ab52a + m_DurableName: MylarTube + m_Material: {fileID: 2100000, guid: 8e58ceea783049b4aba96215104ab52a, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta new file mode 100644 index 00000000..618c76fc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ab8a65ca50e7bf5897129432ea7e033 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat new file mode 100644 index 00000000..29f9ee31 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat @@ -0,0 +1,54 @@ +%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: MylarTube_16 + m_Shader: {fileID: 4800000, guid: 073d6ba13e511e24bb3ba4f7c8f744ee, 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} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a23cfe16e9d8cf4b820c79d8d2b9c5a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _DisplacementIntensity: 0.1 + - _EmissionGain: 0.25 + - _InvFade: 1 + - _Scroll1: 2 + - _Scroll2: -2 + - _ScrollJitterFrequency: 1 + - _ScrollJitterIntensity: 3 + - _ScrollRate: -0.54 + - _Shininess: 0.68 + - _Smoothness: 0.078125 + - _SqueezeAmount: 0.873 + - _Strength: 0.5 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.75, g: 0.75, b: 0.75, a: 0} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta new file mode 100644 index 00000000..59009c41 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/MylarTube/MylarTube_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e58ceea783049b4aba96215104ab52a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta new file mode 100644 index 00000000..5e581aab --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bd52a144173c1742a9054c8f9fce194 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset new file mode 100644 index 00000000..7b76ef6d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Braid3_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 22d4f434-23e4-49d9-a9bd-05798aa21e58 + m_DurableName: Braid3 + m_Material: {fileID: 2100000, guid: 22d4f43423e449d9a9bd05798aa21e58, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 0 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta new file mode 100644 index 00000000..0fc4c551 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd29338e13ec5265cb0cc4ee30d69155 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat new file mode 100644 index 00000000..68e6c4d4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat @@ -0,0 +1,37 @@ +%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: Braid3_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta new file mode 100644 index 00000000..b74ca39f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Plait/Braid3_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22d4f43423e449d9a9bd05798aa21e58 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta new file mode 100644 index 00000000..f2da950a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92b4321d2e0ef1f4aac54629a7f54781 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset new file mode 100644 index 00000000..7f221e00 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Race_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: abfbb2aa-70b4-4a5c-8126-8eedda2b3628 + m_DurableName: Race + m_Material: {fileID: 2100000, guid: abfbb2aa70b44a5c81268eedda2b3628, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta new file mode 100644 index 00000000..8ee1a5b9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 606ebb8edb618d15ebfb4adfa5a9b189 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat new file mode 100644 index 00000000..a32637f7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat @@ -0,0 +1,28 @@ +%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: Race_16 + m_Shader: {fileID: 4800000, guid: 66d9ab24e044638439b322295d3afa8e, 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: + - _EmissionGain: 0.5 + m_Colors: [] diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta new file mode 100644 index 00000000..4c63abf8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Race/Race_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: abfbb2aa70b44a5c81268eedda2b3628 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta new file mode 100644 index 00000000..2fb30139 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 158e241b2cec58d4fa1ea8b6128c87c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset new file mode 100644 index 00000000..28e73685 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Rain_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 03a529e1-f519-3dd4-582d-2d5cd92c3f4f + m_DurableName: Rain + m_Material: {fileID: 2100000, guid: 03a529e1f5193dd4582d2d5cd92c3f4f, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta new file mode 100644 index 00000000..090e3f8a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9da63d3165051050aee14877ccd42d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat new file mode 100644 index 00000000..3891dc97 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat @@ -0,0 +1,88 @@ +%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: Rain_16 + m_Shader: {fileID: 4800000, guid: a7b2cc37e7b92574483d5e8e4d08ecb7, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaMask: + m_Texture: {fileID: 2800000, guid: d6a5bd2db2f9407499d2c40e01d0fd06, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: d6a5bd2db2f9407499d2c40e01d0fd06, type: 3} + m_Scale: {x: 4, 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.5 + - _DetailNormalMapScale: 1 + - _DisplacementIntensity: 0.1 + - _DstBlend: 0 + - _EmissionGain: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _NumSides: 6 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Scroll1: 2 + - _Scroll2: 3 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 4 + - _SrcBlend: 1 + - _StretchDistortionExponent: 3 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta new file mode 100644 index 00000000..2fccad95 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Rain/Rain_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03a529e1f5193dd4582d2d5cd92c3f4f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta new file mode 100644 index 00000000..ecd298fc --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c7c0f95392e47245a0b3342453ff48b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset new file mode 100644 index 00000000..fda03a63 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Rising Bubbles_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: a8147ce1-005e-abe4-88e8-09a1eaadcc89 + m_DurableName: Rising Bubbles + m_Material: {fileID: 2100000, guid: a8147ce1005eabe488e809a1eaadcc89, type: 2} + m_IsParticle: 1 + m_uv0Size: 4 + m_uv0Semantic: 5 + m_uv1Size: 3 + m_uv1Semantic: 1 + m_bUseNormals: 1 + m_normalSemantic: 1 + m_bFbxExportNormalAsTexcoord1: 1 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta new file mode 100644 index 00000000..21233849 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ecab58a919952a75794e6a35e44ce78c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat new file mode 100644 index 00000000..78005016 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat @@ -0,0 +1,91 @@ +%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: Rising Bubbles_16 + m_Shader: {fileID: 4800000, guid: c4285dcf87bf5b84d8d4bbec752f1883, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 6092e34c8de5a054bad8c1f4824f959a, 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: + - _BaseGain: 0.4 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 300 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ScrollJitterFrequency: 5 + - _ScrollJitterIntensity: 0.2 + - _ScrollRate: 0.1 + - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SparkleRate: 2.5 + - _SpecularHighlights: 1 + - _SpreadRate: 1.25 + - _SpreadSize: 1.25 + - _SrcBlend: 1 + - _UVSec: 0 + - _WaveformFreq: 0.1 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _ScrollDistance: {r: 0.5, g: 5, b: 0, a: 0.5} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} + - _WaveformIntensity: {r: 0, g: 15, b: 0, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta new file mode 100644 index 00000000..07b461b3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/RisingBubbles/Rising Bubbles_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8147ce1005eabe488e809a1eaadcc89 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta new file mode 100644 index 00000000..e0e7e1d4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26ae29c30ecc3fa469b49325b6a6006f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset new file mode 100644 index 00000000..8d3278e3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: SingleSided_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: f0a2298a-be80-432c-9fee-a86dcc06f4f9 + m_DurableName: SingleSided + m_Material: {fileID: 2100000, guid: f0a2298abe80432c9feea86dcc06f4f9, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta new file mode 100644 index 00000000..d484fd03 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b5f408092403755e919f0fc824bf6a3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat new file mode 100644 index 00000000..1f88a6a6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat @@ -0,0 +1,77 @@ +%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: SingleSided_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: dc60a5efa113ed54392f4ba836fbedd8, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta new file mode 100644 index 00000000..6823c9d3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SingleSided/SingleSided_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0a2298abe80432c9feea86dcc06f4f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull.meta new file mode 100644 index 00000000..a8db1463 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 73d77c00047575d459069c5bdc983ade +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset new file mode 100644 index 00000000..1f78aa51 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: SmoothHull_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 355b3579-bf1d-4ff5-a200-704437fe684b + m_DurableName: SmoothHull + m_Material: {fileID: 2100000, guid: 355b3579bf1d4ff5a200704437fe684b, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset.meta new file mode 100644 index 00000000..02a03b8e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0021c46bddf53615c9b1d1c49d3e5d37 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat new file mode 100644 index 00000000..69dc862d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat @@ -0,0 +1,94 @@ +%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: SmoothHull_16 + m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Bottom: + m_Texture: {fileID: 2800000, guid: 36752f6114447a844a013406d30a3c29, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: 0} + 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} + - _Side: + m_Texture: {fileID: 2800000, guid: 31a0dba64c25fa442a02171bc2131ccc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Top: + m_Texture: {fileID: 2800000, guid: 36752f6114447a844a013406d30a3c29, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BottomScale: 0.3 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.574 + - _SideScale: 5.21 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _TopScale: 0.3 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.29411763, g: 0.29411763, b: 0.29411763, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat.meta new file mode 100644 index 00000000..064dc018 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SmoothHull/SmoothHull_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 355b3579bf1d4ff5a200704437fe684b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake.meta new file mode 100644 index 00000000..9aca46d4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51e1d0cac0401e64c95c830c0845b4e5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset new file mode 100644 index 00000000..b36851d5 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Snowflake_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 2b65cd94-9259-4f10-99d2-d54b6664ac33 + m_DurableName: Snowflake + m_Material: {fileID: 2100000, guid: 2b65cd9492594f1099d2d54b6664ac33, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 0 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset.meta new file mode 100644 index 00000000..c55de901 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60bf941436447e8599139730ce08379d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat new file mode 100644 index 00000000..9f25f925 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat @@ -0,0 +1,37 @@ +%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: Snowflake_16 + m_Shader: {fileID: 4800000, guid: 561cd39ab4e063843a09f5c11c3a8531, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat.meta new file mode 100644 index 00000000..75c51573 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Snowflake/Snowflake_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b65cd9492594f1099d2d54b6664ac33 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space.meta new file mode 100644 index 00000000..f28fe7df --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a1196cc2efe96243a2eb1bc4afe417f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset new file mode 100644 index 00000000..3642580c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Space_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: bdf65db2-1fb7-4202-b5e0-c6b5e3ea851e + m_DurableName: Space + m_Material: {fileID: 2100000, guid: bdf65db21fb74202b5e0c6b5e3ea851e, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset.meta new file mode 100644 index 00000000..504858c3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 322b8ef424dc2f45ea8442ca3ed14cf0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat new file mode 100644 index 00000000..70105d31 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat @@ -0,0 +1,28 @@ +%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: Space_16 + m_Shader: {fileID: 4800000, guid: 4712a5a85cfe9144190e6dbb83cbb62e, 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: + - _EmissionGain: 0.5 + m_Colors: [] diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat.meta new file mode 100644 index 00000000..66142467 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Space/Space_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bdf65db21fb74202b5e0c6b5e3ea851e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks.meta new file mode 100644 index 00000000..c7e90d37 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab5b1caa7011d5d468de7989837b2055 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset new file mode 100644 index 00000000..33966182 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Sparks_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 50e99447-3861-05f4-697d-a1b96e771b98 + m_DurableName: Sparks + m_Material: {fileID: 2100000, guid: 50e99447386105f4697da1b96e771b98, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset.meta new file mode 100644 index 00000000..dd787664 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 295b9c80a6eebfd5c9e5c6e0615dac3b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat new file mode 100644 index 00000000..ae8312d8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat @@ -0,0 +1,83 @@ +%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: Sparks_16 + m_Shader: {fileID: 4800000, guid: f10b4ff7ab4b8bc49b4cabd89f56378f, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 0c1a21747a147e64ca86bb92080382ab, 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.5 + - _DetailNormalMapScale: 1 + - _DisplacementAmount: 1.45 + - _DisplacementExponent: 2.84 + - _DstBlend: 0 + - _EmissionGain: 0.723 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _NumSides: 4 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 11.78 + - _SrcBlend: 1 + - _StretchDistortionExponent: 1.73 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat.meta new file mode 100644 index 00000000..efdb269a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Sparks/Sparks_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50e99447386105f4697da1b96e771b98 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush.meta new file mode 100644 index 00000000..403977c3 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 746c62bb4f0dfa8419fa0784cdd5770a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset new file mode 100644 index 00000000..b8a8257f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: 3D Printing Brush_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d3f3b18a-da03-f694-b838-28ba8e749a98 + m_DurableName: 3D Printing Brush + m_Material: {fileID: 2100000, guid: d3f3b18ada03f694b83828ba8e749a98, type: 2} + m_IsParticle: 0 + m_uv0Size: 0 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 0 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset.meta new file mode 100644 index 00000000..30b2ea16 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08d130e1f5140755eb770be7a61f79e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat new file mode 100644 index 00000000..3313291b --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat @@ -0,0 +1,50 @@ +%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: 3D Printing Brush_16 + m_Shader: {fileID: 4800000, guid: 096108490caa83c46b96a1e171214c8b, 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} + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + - _Metallic: 0 + - _Shininess: 0.4 + - _Smoothness: 1 + - _VertOrder: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.13235295, g: 0.13235295, b: 0.13235295, a: 0} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat.meta new file mode 100644 index 00000000..6fa8e4ba --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Square3DPrintBrush/3D Printing Brush_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d3f3b18ada03f694b83828ba8e749a98 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper.meta new file mode 100644 index 00000000..835107f9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cafc7b356725b92479d84bbd60a714ab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset new file mode 100644 index 00000000..9f361ea9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: SquarePaper_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 2e03b1bf-3ebd-4609-9d7e-f4cafadc4dfa + m_DurableName: SquarePaper + m_Material: {fileID: 2100000, guid: 2e03b1bf3ebd46099d7ef4cafadc4dfa, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset.meta new file mode 100644 index 00000000..cf8a49b0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d5095d2aa98e0c5d8b5e0a06c3240cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat new file mode 100644 index 00000000..336c9431 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat @@ -0,0 +1,79 @@ +%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: SquarePaper_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 7f06e0457ba1c9140b95991692f69cef, type: 3} + 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: c83c06260e6378044b0981215b4531fa, 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.16 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.145 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat.meta new file mode 100644 index 00000000..eb52b056 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/SquarePaper/SquarePaper_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e03b1bf3ebd46099d7ef4cafadc4dfa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta new file mode 100644 index 00000000..178458bb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f5e705a9ac3e8f41ba3debd2f46f385 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset new file mode 100644 index 00000000..dae9bf0d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TaperedHueShift_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 3d9755da-56c7-7294-9b1d-5ec349975f52 + m_DurableName: TaperedHueShift + m_Material: {fileID: 2100000, guid: 3d9755da56c772949b1d5ec349975f52, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta new file mode 100644 index 00000000..2b787832 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c461ae8fae1efd5082fa32f46219e26 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat new file mode 100644 index 00000000..e9e3fd57 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat @@ -0,0 +1,78 @@ +%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: TaperedHueShift_16 + m_Shader: {fileID: 4800000, guid: 8ba0f3c594b3c3243a67d6b96370de7b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: cfe8e241b4edafc4dbcaaf50726d253d, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta new file mode 100644 index 00000000..8cd5c634 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedHueShift/TaperedHueShift_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d9755da56c772949b1d5ec349975f52 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta new file mode 100644 index 00000000..424efd69 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8da6609618250b541ba7ead1a2ea358a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset new file mode 100644 index 00000000..7c82b22e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TaperedWire_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 9568870f-8594-60f4-1b20-dfbc8a5eac0e + m_DurableName: TaperedWire + m_Material: {fileID: 2100000, guid: 9568870f859460f41b20dfbc8a5eac0e, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta new file mode 100644 index 00000000..b591eb91 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c9e9a86997c0a75184dfed9299d2664 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat new file mode 100644 index 00000000..c8fa5333 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat @@ -0,0 +1,79 @@ +%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: TaperedWire_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + 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: 35c509404b758af4fb07fb3dc1ca76f0, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Shininess: 0.1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.09558821, g: 0.09558821, b: 0.09558821, a: 0} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta new file mode 100644 index 00000000..f44e9dc9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TaperedWire/TaperedWire_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9568870f859460f41b20dfbc8a5eac0e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta new file mode 100644 index 00000000..39961c09 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 805dfe4251b6e57429e137dd7ab2ac59 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset new file mode 100644 index 00000000..be4325f5 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: ThickGeometry_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 39ee7377-7a9e-47a7-a0f8-0c77712f75d3 + m_DurableName: ThickGeometry + m_Material: {fileID: 2100000, guid: 39ee73777a9e47a7a0f80c77712f75d3, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 0 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta new file mode 100644 index 00000000..a6d47647 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4ce13e091416ef5ea08f0fd3df1156c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat new file mode 100644 index 00000000..08bd0d59 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat @@ -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: ThickGeometry_16 + m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3} + m_ShaderKeywords: SELECTION_EDGING _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3} + 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: 1819abb411411e243b701e7dd664ac9a, 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.2 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SelectionEdging: 1 + - _Shininess: 0.414 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta new file mode 100644 index 00000000..815b19ba --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/ThickGeometry/ThickGeometry_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39ee73777a9e47a7a0f80c77712f75d3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta new file mode 100644 index 00000000..0a492d98 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7f4c966e56705948becbdfcf4f9cccf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset new file mode 100644 index 00000000..59d4a2ed --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TubeAdditive_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: c1c9b26d-673a-4dc6-b373-51715654ab96 + m_DurableName: TubeAdditive + m_Material: {fileID: 2100000, guid: c1c9b26d673a4dc6b37351715654ab96, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta new file mode 100644 index 00000000..5fc46ff0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53ec6eb494e328f5dafde9b5de65f9c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat new file mode 100644 index 00000000..de643298 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat @@ -0,0 +1,34 @@ +%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: TubeAdditive_16 + m_Shader: {fileID: 4800000, guid: 884e980aab67a7e429223bbe0b9a91f6, type: 3} + m_ShaderKeywords: SELECTION_EDGING + m_LightmapFlags: 5 + 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: + - _InvFade: 1 + - _SelectionEdging: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta new file mode 100644 index 00000000..c0c2c059 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeAdditive/TubeAdditive_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1c9b26d673a4dc6b37351715654ab96 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta new file mode 100644 index 00000000..6743c052 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66d3539f85fd39049983df3b263c1346 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader new file mode 100644 index 00000000..c41d48cd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader @@ -0,0 +1,102 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Special/TubeToonInverted" { +Properties { + _MainTex ("Base (RGB) Trans (A)", 2D) = "white" {} +} + +CGINCLUDE + + #pragma multi_compile __ TBT_LINEAR_TARGET + + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + sampler2D _MainTex; + float4 _MainTex_ST; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float3 normal : NORMAL; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + v2f vertInflate (appdata_t v, float inflate) + { + + v2f o; + v.vertex.xyz += v.normal.xyz * inflate; + o.vertex = UnityObjectToClipPos(v.vertex); + o.color = v.color; + o.color.a = 1; + o.color.xyz += v.normal.y *.2; + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + return o; + } + + v2f vert (appdata_t v) + { + return vertInflate(v,0); + } + + v2f vertEdge (appdata_t v) + { + // As the scale goes up, we want the outline to be smaller, almost as if it's in screenspace + // however we don't want the outline to be a constant size, it should get smaller as the + // stroke gets further from camera, to avoid distant strokes turning into a big black mess. + float scale = length(mul(xf_I_CS, float3(0.05, 0, 0))); + return vertInflate(v, scale); + } + + fixed4 fragBlack (v2f i) : SV_Target + { + return float4(0,0,0,1); + } + + fixed4 fragColor (v2f i) : SV_Target + { + return i.color; + } + +ENDCG + + + +SubShader { + Cull Back + Pass{ + CGPROGRAM + #pragma vertex vert + #pragma fragment fragBlack + ENDCG + } + + Cull Front + Pass{ + CGPROGRAM + #pragma vertex vertEdge + #pragma fragment fragColor + ENDCG + } + } +Fallback "Diffuse" +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta new file mode 100644 index 00000000..4c07e6b1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ceb199b0f4e9d4be4a55978cfb864132 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset new file mode 100644 index 00000000..1c360297 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: TubeToonInverted_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 9871385a-df73-4396-9e33-31e4e4930b27 + m_DurableName: TubeToonInverted + m_Material: {fileID: 2100000, guid: 9871385adf7343969e3331e4e4930b27, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta new file mode 100644 index 00000000..026bb9c0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3fd7519544b911b50a0f5ace4d3bbb50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat new file mode 100644 index 00000000..e4766a1c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat @@ -0,0 +1,37 @@ +%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: TubeToonInverted_16 + m_Shader: {fileID: 4800000, guid: ceb199b0f4e9d4be4a55978cfb864132, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Illum: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.5 + - _EmissionGain: 0.5 + - _EmissionLM: 0 + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.5441177, g: 0.16886412, b: 0, a: 0.5019608} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta new file mode 100644 index 00000000..1e36904d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/TubeToonInverted/TubeToonInverted_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9871385adf7343969e3331e4e4930b27 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta new file mode 100644 index 00000000..905400aa --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce4257954f47ef54eb6152c074d5ff63 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader new file mode 100644 index 00000000..7d11336c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader @@ -0,0 +1,96 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Visualizer/WaveformFFT" { +Properties { + _MainTex ("Particle Texture", 2D) = "white" {} + _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 +} + +Category { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One // SrcAlpha One + BlendOp Add, Min + AlphaTest Greater .01 + ColorMask RGBA + Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 3.0 + #pragma multi_compile_particles + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + float _EmissionGain; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + float4 color : COLOR; + float2 texcoord : TEXCOORD0; + float4 unbloomedColor : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + o.color = bloomColor(v.color, _EmissionGain); + o.unbloomedColor = v.color; + return o; + } + + fixed4 frag (v2f i) : COLOR + { + // Envelope + float envelope = 1; //sin(i.texcoord.x * 3.14159); + +#ifdef AUDIO_REACTIVE + float waveform = (tex2D(_FFTTex, float2(.5 - i.texcoord.x,0)).b); +#else + float waveform = .15 * sin( -30 * i.unbloomedColor.r * _Time.w + i.texcoord.x * 100 * i.unbloomedColor.r); + waveform += .15 * sin( -40 * i.unbloomedColor.g * _Time.w + i.texcoord.x * 100 * i.unbloomedColor.g); + waveform += .15 * sin( -50 * i.unbloomedColor.b * _Time.w + i.texcoord.x * 100 * i.unbloomedColor.b); +#endif + + float pinch = (1 - envelope) * 40 + 20; + //float procedural_line = saturate(1 - pinch*abs(i.texcoord.y + -waveform * envelope)); + float procedural_line = abs(i.texcoord.y - .5) > waveform ? 0 : waveform ; //saturate(1 - pinch*abs(i.texcoord.y + -waveform * envelope)); + float4 color = 1; + color.rgb *= envelope * procedural_line; + color = i.color * color; + return float4(color.rgb * color.a, 1.0); + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta new file mode 100644 index 00000000..391d3e64 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 9f5c12f3acbb626408e96c20bb9f072a +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset new file mode 100644 index 00000000..f3dcaf91 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: WaveformFFT_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: d120944d-772f-4062-99c6-46a6f219eeaf + m_DurableName: WaveformFFT + m_Material: {fileID: 2100000, guid: d120944d772f406299c646a6f219eeaf, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta new file mode 100644 index 00000000..aac2a72d --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af3d0280849bf6a5989c2223b37ac07b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat new file mode 100644 index 00000000..bd5b598e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat @@ -0,0 +1,36 @@ +%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: WaveformFFT_16 + m_Shader: {fileID: 4800000, guid: 9f5c12f3acbb626408e96c20bb9f072a, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 2e1a7d5cb3753244e97923f78cc37197, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _EmissionGain: 0.51785713 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta new file mode 100644 index 00000000..3d625c37 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformFFT/WaveformFFT_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d120944d772f406299c646a6f219eeaf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta new file mode 100644 index 00000000..921ade88 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36a848a37abb52a41a413f024c6c07cb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader new file mode 100644 index 00000000..b9aff339 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader @@ -0,0 +1,109 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Visualizer/WaveformParticles" { +Properties { + _TintColor ("Tint Color", Color) = (0.5,0.5,0.5,0.5) + _MainTex ("Particle Texture", 2D) = "white" {} +} + +Category { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One + BlendOp Add, Min + AlphaTest Greater .01 + ColorMask RGBA + Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 3.0 + #pragma glsl + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + #include "../../../Shaders/Include/Math.cginc" + + sampler2D _MainTex; + fixed4 _TintColor; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float4 texcoord1 : TEXCOORD1; + float3 tangent : TANGENT; + }; + + struct v2f { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float3 worldPos : TEXCOORD1; + float lifetime : TEXCOORD2; + }; + + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + + v2f o; + float4 worldPos = mul(unity_ObjectToWorld, v.vertex); + float3 perVertOffset = v.texcoord1.xyz; + float lifetime = _Time.y - v.texcoord1.w; + o.lifetime = lifetime; + float release = saturate(lifetime * .1); + float3 localMidpointPos = v.vertex.xyz - perVertOffset; + float4 worldMidpointPos = mul(unity_ObjectToWorld, localMidpointPos); + +#ifdef AUDIO_REACTIVE + lifetime = -lifetime*.1 + _BeatOutputAccum.x; + +#endif + + float time = lifetime; + float d = 10 + v.color.g * 3; + float freq = 1.5 + v.color.r; + float3 disp = float3(1,0,0) * curlX(worldMidpointPos.xyz * freq + time, d); + disp += float3(0,1,0) * curlY(worldMidpointPos.xyz * freq +time, d); + disp += float3(0,0,1) * curlZ(worldMidpointPos.xyz * freq + time, d); + + worldMidpointPos.xyz += release * disp * 10; + worldPos.xyz = worldMidpointPos.xyz + perVertOffset; + + o.vertex = mul(UNITY_MATRIX_VP, worldPos); + o.color = v.color; + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + o.worldPos = worldPos.xyz; + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + + float4 c = i.color * _TintColor * tex2D(_MainTex, i.texcoord); + return float4(c.rgb * c.a, 1.0); + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta new file mode 100644 index 00000000..9628e55f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e12e59eb54a018044abc88e7ccf3d195 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset new file mode 100644 index 00000000..d3eae740 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: WaveformParticles_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 6a1cf9f9-032c-45ec-9b6e-a6680bee30f7 + m_DurableName: WaveformParticles + m_Material: {fileID: 2100000, guid: 6a1cf9f9032c45ec9b6ea6680bee30f7, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 4 + m_uv1Semantic: 2 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta new file mode 100644 index 00000000..bb8a203f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8beca0f9aca87a57b219b821606fcaa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat new file mode 100644 index 00000000..6a4525f4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat @@ -0,0 +1,39 @@ +%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: WaveformParticles_16 + m_Shader: {fileID: 4800000, guid: e12e59eb54a018044abc88e7ccf3d195, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: b5cd5e924951cf4499488769052fedfe, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BaseGain: 0.4 + - _EmissionGain: 1 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + - _WaveformFreq: 0.2 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} + - _WaveformIntensity: {r: 0, g: 0.3, b: 0, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta new file mode 100644 index 00000000..2efc3bac --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/WaveformParticles_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a1cf9f9032c45ec9b6ea6680bee30f7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png new file mode 100644 index 0000000000000000000000000000000000000000..865095df5f223d15090f12f387144604538b0010 GIT binary patch literal 16908 zcmeI4UuYaf7{DiKG-=X52Z9DIx?H7L=-uw#-|TX^Cb>(SfR~0Ok`y9jZ+9+Pa<_Zk z-87eikVQWMF|m;# z%#vjG`@Z?UnfcAkH@gp;mj(xp?rwd&6#%fizb`oiKm)pM04)!rV%&H;V@u}H(H?MV zY2R%m?9BHaHvwpS#Qtpn7hi8j%4VxS)!Y1CbIXoH!Gmx88bhiPt9Q&gqGlm8Amt!P zh~uUqk6Y>SZqtO8IX(nUea4WXIo@N;m{WEsnW{WKDxHKG-N+3}hNa3`q|ZsJX2F6r zV?cjio17b8S_B|=OC1@r#!}CUvYzuxik^o4LN1RQMz+I+yd+OUi%G*tRqOQL{rD3v zqbi-=(Qt}Or5Zjc#E4KfMcfK1pQ@yT2y%0vY}AC5*t(L+pt->7BByyvVY%v$Ou$pkFs8SzZtXmJ6_ffDhI1nRA*Y6?~ex z-w9HVlZ2*hsCi4(HO7uBrS%!B)9bYxs$8XUTGpcHeK5HI~vA9chzN^t-QnFwit;dj$=X`u*ghz`pCb5H8WR^5kXGqXC#1Pgv5~Gj^V0_$3Xi>kt}ILQQUQ1aTHm!6N6;M)tod5 zS(FQ6Y*p#1Sy@$LLeJ_3>K2R#V{AQjU9bK`V$jetD0#(EdSvYM=k|7)>$)d(dB)xq z-5N@7Xf93H9HW^o?)x5Ta;>&($f|KC>nOUcDq^+I=}eeYlv;#wCxbp3s> zB@Dsi^FV9SdC(~NB_)BTHCTklZb zidn0D=5V5tH_n#LoU;Sh=D_l4P@6Mj_VbvC@-5o`QZdi*F}6lmT{BMoF*|Q&XNvWs z0S;X(Z~ra1y3M%jak8u1jJsAnpVL$;jt=i)M=`a_%YJBdo@j>A`wfhvq2VgL_MlpT z*|DUG9!E?&>j%P-k`r#J>v?=#PnV_S=}eUCJ*0SOIa>6VgI=)M${SYAc~&`Xw(_Pr zq^*pK#iEU1K*%D+MdpK9DJ~2MS){ngd@w7;g#jUp6c?EfW~I0=AY_r^BJ;tl6c+}B zEK*!#KA4r_!hn!Pii^w#vr=3b5VA;dk@;X&iVFim7AY<=AIwT|VL-?t#YN_WSt%|I z2w9}K$b2v>#f1SOixd}`4`!vfFd$@+;v)0GtP~dpge+2AWImXc;=+KCMT(2e2eVRK z7!a~Zagq68R*DM)LKZ15G9S!JabZBnBE?1KgIOsq3^{ZL$#m* zhG+87K%XsMzjpZ+08NkfC%Z=qH}BlMn(FBWy*HY#upb0&?|S#j-A1)*^oKWw7Y`kn zi@x{T7bo_8nR_*Nui@a2xu=%36pYNZ;l2Ubk1+Wk0t0ZgDSon<#)v@ewXTbwYPDCSq5h&N8GGT`i9r?9)RQGe9% z{)%JCe-p)LpgrESV`9~_Yknocp+HyvQ^oH)23H>b>alk&9I^jjLVxc-@>0*li+=<5 CTRfxy literal 0 HcmV?d00001 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta new file mode 100644 index 00000000..365d5618 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformParticles/maintexture.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: b5cd5e924951cf4499488769052fedfe +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 1 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta new file mode 100644 index 00000000..1bdebb28 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 811945857d8db654ba8ac8482fbe47a6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader new file mode 100644 index 00000000..7965924f --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader @@ -0,0 +1,83 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Visualizer/WaveformTube" { +Properties { + _MainTex ("Particle Texture", 2D) = "white" {} + _EmissionGain ("Emission Gain", Range(0, 1)) = 0.5 +} + +Category { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One //SrcAlpha One + BlendOp Add, Min + AlphaTest Greater .01 + ColorMask RGBA + Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile_particles + #pragma multi_compile __ TBT_LINEAR_TARGET + + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + float _EmissionGain; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + float4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + v2f vert (appdata_t v) + { + + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + + o.color = bloomColor(v.color, _EmissionGain); + return o; + } + + fixed4 frag (v2f i) : COLOR + { + i.texcoord.x -= _BeatOutputAccum.x; + i.texcoord.y += i.texcoord.x; + i.texcoord.x *= .25; + + float wav = (tex2D(_WaveFormTex, float2(i.texcoord.x,0)).r - .5f); + i.texcoord.y += wav; + float4 c = i.color * tex2D(_MainTex, i.texcoord); + return float4(c.rgb * c.a, 1.0); + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta new file mode 100644 index 00000000..2e7cf2e1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d1e570f96a7a4f54fb9dc544cbfa5cbf +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset new file mode 100644 index 00000000..a544f79c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: WaveformTube_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 0f5820df-cb6b-4a6c-960e-56e4c8000eda + m_DurableName: WaveformTube + m_Material: {fileID: 2100000, guid: 0f5820dfcb6b4a6c960e56e4c8000eda, type: 2} + m_IsParticle: 0 + m_uv0Size: 3 + m_uv0Semantic: 3 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta new file mode 100644 index 00000000..efe7bfe1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c4479051e46c7a65fbb4a51ad2eb5910 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat new file mode 100644 index 00000000..ffac978c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat @@ -0,0 +1,36 @@ +%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: WaveformTube_16 + m_Shader: {fileID: 4800000, guid: d1e570f96a7a4f54fb9dc544cbfa5cbf, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7c5b7a5849a78d74594c537e2592bca7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _EmissionGain: 0.51785713 + - _InvFade: 1 + - _ScrollSpeed: 0 + - _VertexDisplacement: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta new file mode 100644 index 00000000..051b8a01 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/WaveformTube_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f5820dfcb6b4a6c960e56e4c8000eda +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png new file mode 100644 index 0000000000000000000000000000000000000000..b37f3214b164d8242526873747af807500168a26 GIT binary patch literal 16401 zcmeI3du$ZP9mmhK6{*#TGy+P&k*?LY7LLi}$5Dhg>ancJou7i1mGzdC- zZ;#IdZHTH$v+`qq^PBH)c0cpm-|YS|8>_4Czq4>*p-!i}vvQ@cMyD%)rv*HM+7v(dixuXukz>w|L88<7~Au=%4-GtOeh&EI+^GTXSL4 zeAQpC281xsS8)-b>)_f!lO#t>QL*{z-|NFVo$E=Vu3oJVu3~v9V&XzlBQV7xQ7DDJ zvRIVkTY;)?1kHlzHcSi*8uUWQZCGs!nuAd$$~=Xx7z+bL zfXeA(k+7(+F}EQRmxbqAGiA^xx~Q#gL%BAfzCKv3_ewI*+e~&NZ?>1}OPwa#R$6K; zU9M-$w2d-bD2v(1SXir>wKDqDVek~fGnX7{VrzVX)Ns&p8(LH~%2HHEM~A7yVv^)$ zigr4kl$oIz#t3^Dl}=IRVn$IZP6kQG@d1UGg{Ue>qF#&3HA-!&+hEWJ${eZtibOL5 ziAstcq)5fMC`FshR6bFN&uF4;ayW5mA)W$Z5CNj9KpmY|2ayJY8EM|(B9XjGMfJDC zJ4g}9t5oVbqkyUbiqt0az~2t9q&VNjM_VLSQd*=L?mOe2@$OZjDLXk+E=BXqC<8HJ z2ASqb$`YxNoFNy4#d>AHsghhLNnuYi%c|2?ulITrS*5>kwIGJ14rQr}LM7Sx&PD@1 zP6ZyAk5(gXHqw?lnqlFO&1p23vSxEmkYrCJMiAzHh*P-ohGBE0)51O|3$R{s;ha9&mH#K<^Msf- z%t}Fl8P=JTc`*MH)u`ZNI!L%GL)$@nkMn^vK+6~BM+~o zGzhtyC|)0hlMX-0u;D>em?w`n!_PQbxW1*T(fjcDcL$Te(u%duFj>sG_i1{f|Zj? ztPr$|n%0(c(+OX_w&H}_68-Jw#6i*8zmzuDk7^rkqRsWA+N|`uqM&-1)Nn|1j!JvC zOQu9E{0specynkI+PhkafpEP~fbSHFwqi0idrE|Q@+uo4T@Fu~9=Yx0&E(8ePB)IT=5HG=n0KuCC7oHE|CAbhEc$475^Fh1>7Xk!t z5?pvbh?n3(fZ$Dn3(p7f5?lxnyotqCnB7_oM7W>018yAN_S45raMSSuZO3wLYEzgF z*|}*w+SLsE%+dO+mIW2ay4toVkm0_MLkD*a>vXgBRQk&6V(*Th9;hm&=jz^$Ev_lK zUVQggZrqsHu&~fm9IXH2&--4za=vki_kl0R=bms~+xz;JQ`V2#wGGd=bc{Uw>8?kI zHt*f=;{Hn?JTbEO(zoGW?Q4hTZ1o`WUtEp<2x&si$47SV9~>OqzyJBS;x!L+_imAQ zyd7WNd$N5^>kF?e?KwTZuV=@Wnj`yq28Mgw8{^&UtqbNUqus}fR=C3BzTu*^16^z7 zQ+#XpD$`wq{TqtvkFPqu;yRShF_#3kJ@dr(#ts}fFgiN=Vmv-5N&N#4uUl17B`*?8 zn=j4>FCTlv(fHxvU#>ZRqHFi2Kfk%`-uWvo$-Rx+kF5Ju+dPHpyn}vC)IYR%KDWL1 z!G?Q^2iQ0E{&RBALsw63{^7qC4*hk*x*u=j-|yS=H{*xm*`YHR@4mrEi#|K*e(B7S zzZ^cjd+f6>o!WkIXF*uqeb2}4vGYe;`qrHJQ~bKhe(>m$iIaU>{Yyc^*3Rwx_rF9OIGs&`&n{+%;#{iCyM$?%C2je*=6O4&eX* literal 0 HcmV?d00001 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta new file mode 100644 index 00000000..d8efdd34 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/WaveformTube/waveform.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 7c5b7a5849a78d74594c537e2592bca7 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 64 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta new file mode 100644 index 00000000..a1b42ddd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80cf4a814b51dbe4baefa884bea2432a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset new file mode 100644 index 00000000..ae9c8de9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Wind_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 7136a729-1aab-bd24-f8b2-ca88b6adfb67 + m_DurableName: Wind + m_Material: {fileID: 2100000, guid: 7136a7291aabbd24f8b2ca88b6adfb67, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta new file mode 100644 index 00000000..a696e612 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99fe8738f2e0bea53a4370be40a8aaa4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat new file mode 100644 index 00000000..e71b4426 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat @@ -0,0 +1,82 @@ +%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: Wind_16 + m_Shader: {fileID: 4800000, guid: 33864871272a015428871ed0e1c4073f, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaMask: + m_Texture: {fileID: 2800000, guid: b0396e66243f48449a3710f12f224199, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: f5f96a7864561b24abd0b9166b083174, 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.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta new file mode 100644 index 00000000..a12853ab --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wind/Wind_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7136a7291aabbd24f8b2ca88b6adfb67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta new file mode 100644 index 00000000..7ace0d69 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a714e38afc4ceac4fb65bc943b0da3cf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader new file mode 100644 index 00000000..42b287ac --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader @@ -0,0 +1,83 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Special/Wireframe" { +Properties { +} + +Category { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One + AlphaTest Greater .01 + Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ ODS_RENDER + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float3 normal : NORMAL; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + + v2f o; + + o.texcoord = v.texcoord; + o.color = v.color; + o.vertex = UnityObjectToClipPos(v.vertex); + return o; + } + + fixed4 frag (v2f i) : COLOR + { + + half w = 0; +#ifdef AUDIO_REACTIVE + float waveform = (tex2D(_WaveFormTex, float2(i.texcoord.y,0)).r - .5f); + float envelope = sin(i.texcoord.y * 3.141569); + i.texcoord.x += waveform * envelope; + w = ( abs(i.texcoord.x - .5) > .5) ? 1 : 0; +#else + w = ( abs(i.texcoord.x - .5) > .45) ? 1 : 0; + w += ( abs(i.texcoord.y - .5) > .45) ? 1 : 0; +#endif + //float angle = atan2(i.texcoord.x, i.texcoord.y); + //w += ( abs(angle - (3.14/4.0)) < .05) ? 1 : 0; + return i.color * w; + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta new file mode 100644 index 00000000..da388601 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 62214494f4cd16a4db9c53337309f0e6 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset new file mode 100644 index 00000000..2a5f8032 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 103cd3480fe93f646be28a7da5812871, type: 3} + m_Name: Wireframe_16 + m_EditorClassIdentifier: + m_Guid: + m_storage: 2c1a6a63-6552-4d23-86d7-58f6fba8581b + m_DurableName: Wireframe + m_Material: {fileID: 2100000, guid: 2c1a6a6365524d2386d758f6fba8581b, type: 2} + m_IsParticle: 0 + m_uv0Size: 2 + m_uv0Semantic: 5 + m_uv1Size: 0 + m_uv1Semantic: 0 + m_bUseNormals: 1 + m_normalSemantic: 0 + m_bFbxExportNormalAsTexcoord1: 0 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta new file mode 100644 index 00000000..98a50aa9 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5cc686c70856a215e8f8fea06ce5e8f1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat new file mode 100644 index 00000000..9dd5a2ae --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat @@ -0,0 +1,33 @@ +%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: Wireframe_16 + m_Shader: {fileID: 4800000, guid: 62214494f4cd16a4db9c53337309f0e6, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + 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: + - _InvFade: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.61764705, g: 0.61764705, b: 0.61764705, a: 1} +--- !u!1002 &2100001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta new file mode 100644 index 00000000..bd84a41c --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Wireframe/Wireframe_16.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c1a6a6365524d2386d758f6fba8581b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Additive.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Additive.shader new file mode 100644 index 00000000..65aa90ea --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Additive.shader @@ -0,0 +1,86 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Additive" { +Properties { + _MainTex ("Texture", 2D) = "white" {} +} + +Category { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One // SrcAlpha One + BlendOp Add, Min + AlphaTest Greater .01 + ColorMask RGBA + Cull Off Lighting Off ZWrite Off Fog { Color (0,0,0,0) } + + SubShader { + Pass { + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + #pragma multi_compile __ SELECTION_ON + #include "UnityCG.cginc" + #include "../../../Shaders/Include/Brush.cginc" + #include "../../../Shaders/Include/MobileSelection.cginc" + + sampler2D _MainTex; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float3 normal : NORMAL; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 pos : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + v2f o; + + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); +#ifdef AUDIO_REACTIVE + o.color = musicReactiveColor(v.color, _BeatOutput.w); + v.vertex = musicReactiveAnimation(v.vertex, v.color, _BeatOutput.w, o.texcoord.x); +#else + o.color = v.color; +#endif + o.pos = UnityObjectToClipPos(v.vertex); + + return o; + + } + + fixed4 frag (v2f i) : COLOR + { + half4 c = tex2D(_MainTex, i.texcoord); + c = i.color * c; + FRAG_MOBILESELECT(c) + return float4(c.rgb * c.a, 1.0); + } + ENDCG + } + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Additive.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Additive.shader.meta new file mode 100644 index 00000000..aeb09740 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Additive.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 884e980aab67a7e429223bbe0b9a91f6 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special.meta new file mode 100644 index 00000000..307875bb --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c9db660ebdaa3c44a89e7bfa74e71741 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special/Faceted.shader b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special/Faceted.shader new file mode 100644 index 00000000..947da8e0 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special/Faceted.shader @@ -0,0 +1,70 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Special/Faceted" { +Properties { + _MainTex ("Base (RGB) Trans (A)", 2D) = "white" {} +} + +SubShader { + Cull Back + Pass{ + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 3.0 + #pragma multi_compile __ TBT_LINEAR_TARGET + + #include "UnityCG.cginc" + #include "../../../../Shaders/Include/Brush.cginc" + #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + sampler2D _MainTex; + float4 _MainTex_ST; + + struct appdata_t { + float4 vertex : POSITION; + fixed4 color : COLOR; + float3 normal : NORMAL; + float2 texcoord : TEXCOORD0; + }; + + struct v2f { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float3 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.color = v.color; + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + o.worldPos = mul(unity_ObjectToWorld, v.vertex).xyz; + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + float3 n = normalize(cross(ddy(i.worldPos), ddx(i.worldPos))); + i.color.xyz = n.xyz; + return i.color; + } + + ENDCG + } + } +Fallback "Diffuse" +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special/Faceted.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special/Faceted.shader.meta new file mode 100644 index 00000000..9c7464b7 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Brushes/Shared/Shaders/Special/Faceted.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 387f4f61bc82c4e5f813ad7caa1f394a +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Shaders/FlatLit.shader b/UnitySDK/Assets/TiltBrush/Assets/Shaders/FlatLit.shader new file mode 100644 index 00000000..f0960b0a --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Shaders/FlatLit.shader @@ -0,0 +1,161 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Shader calculates normals per triangle using a geometry shader. +// Uses Blinn-Phong lighting model for the main directional light and SH +// for all additional lighting. +Shader "Brush/FlatLit" { + +Properties { + _MainTex("Texture", 2D) = "white" {} + _Smoothness("Smoothness", Range(0, 1)) = 0.5 + _Metallic("Metallic", Range(0, 1)) = 0 +} + +SubShader { + Pass { + Tags { "LightMode" = "ForwardBase" } + Blend SrcAlpha OneMinusSrcAlpha + + CGPROGRAM + + #pragma vertex vert + #pragma geometry geom + #pragma fragment frag + #pragma multi_compile _ SHADOWS_SCREEN + #pragma target 4.0 + + #include "AutoLight.cginc" + #include "UnityPBSLighting.cginc" + + float _Smoothness; + float _Metallic; + sampler2D _MainTex; + float4 _MainTex_ST; + + struct appdata { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + float4 color : Color; + }; + + struct v2f { + float4 pos : SV_POSITION; + float2 uv : TEXCOORD0; + float3 normal : TEXCOORD1; + float3 worldPos : TEXCOORD2; + float4 color : TEXCOORD3; + SHADOW_COORDS(5) + }; + + v2f vert(appdata v) { + v2f o; + o.uv = v.uv * _MainTex_ST.xy + _MainTex_ST.zw; + o.pos = UnityObjectToClipPos(v.vertex); + o.worldPos = mul(unity_ObjectToWorld, v.vertex); + o.color = v.color; + TRANSFER_SHADOW(o); + + // normal is set in geom method + + return o; + } + + // Called once per triangle primitive, values outputted to triangle's + // pixels' frag methods. + [maxvertexcount(3)] + void geom(triangle v2f i[3], inout TriangleStream stream) { + float3 p0 = i[0].worldPos.xyz; + float3 p1 = i[1].worldPos.xyz; + float3 p2 = i[2].worldPos.xyz; + + float3 v0 = p1 - p0; + float3 v1 = p2 - p0; + + float3 triangleNormal = normalize(cross(v0, v1)); + + i[0].normal = triangleNormal; + i[1].normal = triangleNormal; + i[2].normal = triangleNormal; + + stream.Append(i[0]); + stream.Append(i[1]); + stream.Append(i[2]); + } + + float4 frag(v2f i) : SV_TARGET { + // Apply shadows + UNITY_LIGHT_ATTENUATION(attenuation, i, i.worldPos); + float3 lightColor = _LightColor0.rgb * attenuation; + + // Add main directional light's effect. + + // Calculate vectors to be used in lighting model. + float3 normal = i.normal; + float3 lightDir = _WorldSpaceLightPos0.xyz; + float3 viewDir = normalize(_WorldSpaceCameraPos - i.worldPos); + float3 halfDir = normalize(lightDir + viewDir); + float nDotl = DotClamped(normal, normalize(lightDir)); + + float3 albedo = tex2D(_MainTex, i.uv).rgb * (1 - _Metallic); + // This is an oversimplification, even pure dielectrics can have some specular + // reflection, but its good enough for this purpose (and can be toggled in inspector). + float3 specularTint = albedo * (_Metallic); + + // Blinn-Phong model + float3 diffuse = albedo * lightColor * nDotl; + float3 specular = specularTint * lightColor * + pow(DotClamped(halfDir, i.normal), _Smoothness * 100); + float3 lighting = diffuse + specular; + + // Add all other lights in scene. + + // Reduce this component to minimize double counting of main directional light. + lighting += float3(ShadeSH9(half4(normal, 1.0))) * 0.5; + + return float4(lighting * i.color.rgb, i.color.a); + } + + ENDCG + } + + // Cast shadows + Pass { + Tags { "LightMode" = "ShadowCaster"} + + CGPROGRAM + + #pragma target 4.0 + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata { + float4 position : POSITION; + }; + + float4 vert(appdata v) : SV_POSITION { + float4 position = UnityObjectToClipPos(v.position); + return UnityApplyLinearShadowBias(position); + } + + half4 frag() : SV_TARGET { + return 0; + } + + ENDCG + } +} +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Shaders/FlatLit.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/Shaders/FlatLit.shader.meta new file mode 100644 index 00000000..f608e800 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Shaders/FlatLit.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 096108490caa83c46b96a1e171214c8b +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/ColorSpace.cginc b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/ColorSpace.cginc new file mode 100644 index 00000000..f114c3bd --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/ColorSpace.cginc @@ -0,0 +1,187 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// -*- c -*- + +// hue06 is in [0,6] +float3 hue06_to_base_rgb(in float hue06) { + float r = -1 + abs(hue06 - 3); + float g = 2 - abs(hue06 - 2); + float b = 2 - abs(hue06 - 4); + return saturate(float3(r, g, b)); +} + +// hue33 is in [-3,3] +float3 hue33_to_base_rgb(in float hue33) { + float r = -abs(hue33 ) + 2; + float g = abs(hue33+1) - 1; + float b = abs(hue33-1) - 1; + return saturate(float3(r, g, b)); +} + +// Like sl_to_rgb, but takes chroma instead of saturation. The difference is: +// - saturation is 1 at the edge of the cone +// - chroma is 1 at the edge of the cylinder +// If the chroma value is outside the cone, returns value with a=0. +float4 cl_to_rgb(in float3 base_rgb, float chroma, float lightness) { + float max_chroma = (1 - abs(2 * lightness - 1)); + float3 rgb = (base_rgb - 0.5) * chroma + lightness; + return chroma > max_chroma ? float4(0,0,0,0) : float4(rgb,1); +} + +// HSL to RGB. Get base_rgb from xxx_to_base_rgb. +half3 sl_to_rgb(in float3 base_rgb, float saturation, float lightness) { + float max_chroma = (1 - abs(2 * lightness - 1)); + float chroma = max_chroma * saturation; + return (base_rgb - 0.5) * chroma + lightness; +} + +// HSV to RGB. Get base_rgb from xxx_to_base_rgb. +float3 sv_to_rgb(in float3 base_rgb, float saturation, float value) { + return ((base_rgb - 1) * saturation + 1) * value; +} + +// Chroma-Luma to rgb. This is like HSL but with the bottom cone pushed flat +// (kind of like HSV is HSL with the top cone pushed flat), plus some work +// to try and make it perceptually-linear +float3 g_max_luma = float3(0.299, 0.587, 0.114); +float3 cy_to_rgb(in float3 base_rgb, in float chroma, in float luma) { + float rgb_luma = dot(base_rgb, g_max_luma); + if (luma < rgb_luma) { + chroma *= luma / rgb_luma; + } else if (luma < 1) { + chroma *= (1 - luma) / (1 - rgb_luma); + } + return (base_rgb - rgb_luma) * chroma + luma; +} + +// Helper for converting uv to polar coordinates +// Return radius in [0,1] , and angle in [-.5, .5] +float2 xy_to_polar(float2 xy) { + float pi = 3.141592653589793; + float2 centered = xy * 2 - 1; + float radius = length(centered); + float angle = atan2(centered.y, centered.x) * (.5 / pi); + return float2(radius, angle); +} + +// unoptimized +float3 HSVToRGB(in float3 hsv) +{ + float3 fullySaturatedRgb; + float hue = hsv.x * 6.0f; + float chroma = hsv.y * hsv.z; + if (hue < 1.0f) + { + fullySaturatedRgb.x = hsv.y; + fullySaturatedRgb.y = hue * hsv.y; + fullySaturatedRgb.z = 0.0f; + } + else if (hue < 2.0f) + { + fullySaturatedRgb.x = (2.0f - hue) * hsv.y; + fullySaturatedRgb.y = hsv.y; + fullySaturatedRgb.z = 0.0f; + } + else if (hue < 3.0f) + { + fullySaturatedRgb.x = 0.0f; + fullySaturatedRgb.y = hsv.y; + fullySaturatedRgb.z = (hue - 2.0f) * hsv.y; + } + else if (hue < 4.0f) + { + fullySaturatedRgb.x = 0.0f; + fullySaturatedRgb.y = (4.0f - hue) * hsv.y; + fullySaturatedRgb.z = hsv.y; + } + else if (hue < 5.0f) + { + fullySaturatedRgb.x = (hue - 4.0f) * hsv.y; + fullySaturatedRgb.y = 0.0f; + fullySaturatedRgb.z = hsv.y; + } + else + { + fullySaturatedRgb.x = hsv.y; + fullySaturatedRgb.y = 0.0f; + fullySaturatedRgb.z = (6.0f - hue) * hsv.y; + } + + float m = hsv.z - chroma; + return fullySaturatedRgb + float3(m, m, m); +} + +// unoptimized +float3 RGBtoHSV(in float3 rgb) +{ + float epsilon = 1e-10; + float minRgb = min(min(rgb.x, rgb.y), rgb.z); + float maxRgb = max(max(rgb.x, rgb.y), rgb.z); + float chroma = maxRgb - minRgb; + float hue; + if (maxRgb == rgb.x) + { + // prevent divide by 0 by adding epsilon (numerator will also be 0 in this case) + hue = (rgb.y - rgb.z) / (chroma + epsilon); + if (hue < 0) hue += 6.0f; + } + else if (maxRgb == rgb.y) + { + hue = (rgb.z - rgb.x) / chroma + 2.0f; + } + else + { + hue = (rgb.x - rgb.y) / chroma + 4.0f; + } + float value = maxRgb; + float3 hsv; + hsv.x = hue / 6.0f; + hsv.y = chroma / (value + epsilon); + hsv.z = value; + return hsv; +} + +// less-optimized +#if 0 +// c is a periodic value in [-6, 6), with period 6 +float hue_to_rgb_component(float c, float t1, float t2) { + // normalize to [0, 6) + c += (c < 0) ? 6 : 0; + // if (c < 0) c += 6; + if (c < 1) return t1 + (t2 - t1) * c; + else if (c < 3) return t2; + else if (c < 4) return t1 + (t2 - t1) * (4 - c); + else return t1; +} + +// hue6 is in [-3,3] +float3 hsl_to_rgb(float hue6, float saturation, float lightness) { + float t2; + if (lightness < 0.5) { + t2 = lightness * (1 + saturation); + } else { + t2 = lerp(saturation, 1, lightness); + } + float t1 = 2 * lightness - t2; + + float tr = hue6 + 2; // in [-1, 5] + float tg = hue6; // in [-3, 3] + float tb = hue6 - 2; // in [-5, 1] + return float3( + hue_to_rgb_component(tr, t1, t2), + hue_to_rgb_component(tg, t1, t2), + hue_to_rgb_component(tb, t1, t2)); +} +#endif diff --git a/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/ColorSpace.cginc.meta b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/ColorSpace.cginc.meta new file mode 100644 index 00000000..d3c2c026 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/ColorSpace.cginc.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 8bab3f9dd01474c458a3659d0ef1d087 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/Math.cginc b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/Math.cginc new file mode 100644 index 00000000..d761dafa --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/Math.cginc @@ -0,0 +1,152 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// -*- c -*- + +// Factors a transform matrix into rotation and localScale. This +// assumes the transform's scale is only local (ie, shear-free). +void factorRotationAndLocalScale( + float3x3 transform, + out float3x3 rotate, + out float3 localScale) { + // We can extract the pure rotation of a non-skew 3x3 matrix by + // factoring out the scale. The scale can be determined by the + // fact that the first upper left 3x3 matrix is the rotation + // matrix R multiplied by the scale matrix S and the fact that + // (R * S)^T * (R * S) = S * S. + + // Calculate the scale squared matrix. + float3x3 scaleSquaredMatrix = mul(transpose(transform), transform); + + // Calculate the inverse scale diagonal. + float3 scaleSquaredDiagonal = float3( + scaleSquaredMatrix[0][0], + scaleSquaredMatrix[1][1], + scaleSquaredMatrix[2][2]); + float3 inverseScaleDiagonal = rsqrt(scaleSquaredDiagonal); + + // The rotate matrix is the unscaled version of the original transform. + rotate = float3x3( + transform[0] * inverseScaleDiagonal, + transform[1] * inverseScaleDiagonal, + transform[2] * inverseScaleDiagonal); + + // Calculate the local scale. + localScale = scaleSquaredDiagonal * inverseScaleDiagonal; +} + +// The inverse of a matrix should almost never be calculated inside a shader +// because it's too computationally expensive. But it may be useful as for +// testing. +float4x4 inverseSlow(float4x4 input) { + #define minor(a, b, c) determinant(float3x3(input.a, input.b, input.c)) + float4x4 cofactors = float4x4( + minor(_22_23_24, _32_33_34, _42_43_44), + -minor(_21_23_24, _31_33_34, _41_43_44), + minor(_21_22_24, _31_32_34, _41_42_44), + -minor(_21_22_23, _31_32_33, _41_42_43), + + -minor(_12_13_14, _32_33_34, _42_43_44), + minor(_11_13_14, _31_33_34, _41_43_44), + -minor(_11_12_14, _31_32_34, _41_42_44), + minor(_11_12_13, _31_32_33, _41_42_43), + + minor(_12_13_14, _22_23_24, _42_43_44), + -minor(_11_13_14, _21_23_24, _41_43_44), + minor(_11_12_14, _21_22_24, _41_42_44), + -minor(_11_12_13, _21_22_23, _41_42_43), + + -minor(_12_13_14, _22_23_24, _32_33_34), + minor(_11_13_14, _21_23_24, _31_33_34), + -minor(_11_12_14, _21_22_24, _31_32_34), + minor(_11_12_13, _21_22_23, _31_32_33) + ); + #undef minor + return transpose(cofactors) / determinant(input); +} + +// The inverse of a matrix should almost never be calculated inside a shader +// because it's too computationally expensive. But it may be useful as for +// testing. +float3x3 inverseSlow(float3x3 input) { + #define minor(a, b) determinant(float2x2(input.a, input.b)) + float3x3 cofactors = float3x3( + minor(_22_23, _32_33), + -minor(_21_23, _31_33), + minor(_21_22, _31_32), + + -minor(_12_13, _32_33), + minor(_11_13, _31_33), + -minor(_11_12, _31_32), + + minor(_12_13, _22_23), + -minor(_11_13, _21_23), + minor(_11_12, _21_22) + ); + #undef minor + return transpose(cofactors) / determinant(input); +} + +// +// Quaternion HLSL +// Taken from -> http://www.geeks3d.com/20141201/how-to-rotate-a-vertex-by-a-quaternion-in-glsl/ +// + +float4 quat_from_axis_angle(float3 axis, float angle) { + float4 qr; + float half_angle = (angle * 0.5) * 3.14159 / 180.0; + qr.x = axis.x * sin(half_angle); + qr.y = axis.y * sin(half_angle); + qr.z = axis.z * sin(half_angle); + qr.w = cos(half_angle); + return qr; +} + +float4 quat_conj(float4 q) { + return float4(-q.x, -q.y, -q.z, q.w); +} + +float4 quat_mult(float4 q1, float4 q2) { + float4 qr; + qr.x = (q1.w * q2.x) + (q1.x * q2.w) + (q1.y * q2.z) - (q1.z * q2.y); + qr.y = (q1.w * q2.y) - (q1.x * q2.z) + (q1.y * q2.w) + (q1.z * q2.x); + qr.z = (q1.w * q2.z) + (q1.x * q2.y) - (q1.y * q2.x) + (q1.z * q2.w); + qr.w = (q1.w * q2.w) - (q1.x * q2.x) - (q1.y * q2.y) - (q1.z * q2.z); + return qr; +} + +float3 rotate_vertex_position(float3 position, float3 axis, float angle) { + float4 qr = quat_from_axis_angle(axis, angle); + float4 qr_conj = quat_conj(qr); + float4 q_pos = float4(position.x, position.y, position.z, 0); + + float4 q_tmp = quat_mult(qr, q_pos); + qr = quat_mult(q_tmp, qr_conj); + + return float3(qr.x, qr.y, qr.z); +} + +// remaps x from the range [x1, x2] to the range [y1, y2] +float remap(float x1,float x2,float y1,float y2, float x) +{ + float t = (x-x1)/(x2-x1); + return lerp(y1,y2,t); +} + +// remaps x from the range [x1, x2] to the range [y1, y2] and clamps it to the range +float clampedRemap(float x1,float x2,float y1,float y2, float x) +{ + float t = clamp(x1,x2,x); + return remap(x1,x2,y1,y2,t); +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/Math.cginc.meta b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/Math.cginc.meta new file mode 100644 index 00000000..5bbbf4b6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/Math.cginc.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: be3eaad66d6c94590852ab221e7dbc21 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/MobileSelection.cginc b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/MobileSelection.cginc new file mode 100644 index 00000000..cb3bacb6 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/MobileSelection.cginc @@ -0,0 +1,48 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Used to provide the selection pattern used to show selected strokes on mobile. + +float4 _LeftEyeSelectionColor; +float4 _RightEyeSelectionColor; +float4x4 _InverseLimitedScaleSceneMatrix; +float _PatternSpeed; +float4 _BrushColor; + +// Gets the appropriate selection color depending on the eye being rendered. +float4 GetSelectionColor() { + return unity_StereoEyeIndex * _RightEyeSelectionColor + + (1 - unity_StereoEyeIndex) * _LeftEyeSelectionColor; +} + +// Given the current material color, override with selection noise if necessary. +float4 AddSelectColor(float4 inColor) { +#if SELECTION_ON + float4 color = GetSelectionColor(); +#else + float4 color = _BrushColor; +#endif + return inColor * 0.5 + color * 0.5; +} + +#if SELECTION_ON || HIGHLIGHT_ON + // Macro to put in fragment shader functions + #define FRAG_MOBILESELECT(color) \ + #define SURF_FRAG_MOBILESELECT(output) \ + output.Emission += AddSelectColor(0); +#else +#endif + + + diff --git a/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/MobileSelection.cginc.meta b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/MobileSelection.cginc.meta new file mode 100644 index 00000000..41ab0fab --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Shaders/Include/MobileSelection.cginc.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4f96b1a23b45448439648fc17adb17c4 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Textures.meta b/UnitySDK/Assets/TiltBrush/Assets/Textures.meta new file mode 100644 index 00000000..d43ed2e1 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa29600441b3a804da659d384429d16a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/Textures/white.png b/UnitySDK/Assets/TiltBrush/Assets/Textures/white.png new file mode 100644 index 0000000000000000000000000000000000000000..174204e74a574aa74c84c50e859b6c1f3d633170 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f;yfqjv*f2Z_gSsG8pi%Ec|8ucj|#DZw(II h-pHi202w___}v})WtqYETeU!a44$rjF6*2UngA2UEk^(V literal 0 HcmV?d00001 diff --git a/UnitySDK/Assets/TiltBrush/Assets/Textures/white.png.meta b/UnitySDK/Assets/TiltBrush/Assets/Textures/white.png.meta new file mode 100644 index 00000000..7091aa48 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/Textures/white.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 35c509404b758af4fb07fb3dc1ca76f0 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/X.meta b/UnitySDK/Assets/TiltBrush/Assets/X.meta new file mode 100644 index 00000000..8d15a9c4 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/X.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ce629080413f1f4d837f0043e4be18a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/X/Brushes.meta b/UnitySDK/Assets/TiltBrush/Assets/X/Brushes.meta new file mode 100644 index 00000000..9aa86d5e --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/X/Brushes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8412108de095394daf1d16f3c609de7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand.meta b/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand.meta new file mode 100644 index 00000000..8c3af4e8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50b11da1ce0be4e4791d41dd971e0b86 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/BubbleWand.shader b/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/BubbleWand.shader new file mode 100644 index 00000000..87114e14 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/BubbleWand.shader @@ -0,0 +1,107 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +Shader "Brush/Special/BubbleWand" { +Properties { + _MainTex ("Texture", 2D) = "white" {} + _ScrollRate("Scroll Rate", Float) = 1.0 + _ScrollJitterIntensity("Scroll Jitter Intensity", Float) = 1.0 + _ScrollJitterFrequency("Scroll Jitter Frequency", Float) = 1.0 +} + + SubShader { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Blend One One + Cull off ZWrite Off + + CGPROGRAM + #pragma target 3.0 + #pragma surface surf StandardSpecular vertex:vert + #pragma multi_compile __ AUDIO_REACTIVE + #pragma multi_compile __ TBT_LINEAR_TARGET + #include "../../../Shaders/Include/Brush.cginc" + #include "Assets/ThirdParty/Noise/Shaders/Noise.cginc" + + sampler2D _MainTex; + float _EmissionGain; + float _ScrollRate; + float _ScrollJitterIntensity; + float _ScrollJitterFrequency; + + float4 displace(float4 pos, float timeOffset) { + float t = _Time.y*_ScrollRate + timeOffset; + + pos.x += sin(t + _Time.y + pos.z * _ScrollJitterFrequency) * _ScrollJitterIntensity; + pos.z += cos(t + _Time.y + pos.x * _ScrollJitterFrequency) * _ScrollJitterIntensity; + pos.y += cos(t * 1.2 + _Time.y + pos.x * _ScrollJitterFrequency) * _ScrollJitterIntensity; + + float time = _Time.x; + float d = 30; + float freq = .1; + float3 disp = float3(1,0,0) * curlX(pos.xyz * freq + time, d); + disp += float3(0,1,0) * curlY(pos.xyz * freq +time, d); + disp += float3(0,0,1) * curlZ(pos.xyz * freq + time, d); + pos.xyz = _ScrollJitterIntensity * disp * kDecimetersToWorldUnits; + return pos; + } + + struct Input { + float4 color : Color; + float2 tex : TEXCOORD0; + float3 viewDir; + INTERNAL_DATA + }; + + void vert (inout appdata_full v, out Input o) { + + float radius = v.texcoord.z; + + // Bulge displacement + float wave = sin(v.texcoord.x*3.14159); + float3 wave_displacement = radius * v.normal.xyz * wave; + v.vertex.xyz += wave_displacement; + + // Noise displacement + // TO DO: Need to make this scale invariant + float4 displacement = displace(v.vertex,0); + v.vertex.xyz += displacement.xyz; + + // Perturb normal + v.normal = normalize(v.normal + displacement.xyz * 2.5 + wave_displacement * 2.5); + + o.color = TbVertToSrgb(o.color); + UNITY_INITIALIZE_OUTPUT(Input, o); + o.tex = v.texcoord.xy; + } + + // Input color is srgb + void surf (Input IN, inout SurfaceOutputStandardSpecular o) { + // Hardcode some shiny specular values + o.Smoothness = .9; + o.Specular = .6 * SrgbToNative(IN.color).rgb; + o.Albedo = 0; + + // Calculate rim + float3 n = WorldNormalVector (IN, o.Normal); + half rim = 1.0 - abs(dot (normalize(IN.viewDir), n)); + rim *= 1-pow(rim,5); + + //Thin slit diffraction texture ramp lookup + float3 diffraction = tex2D(_MainTex, half2(rim + _Time.x + o.Normal.y, rim + o.Normal.y)).xyz; + o.Emission = rim*(.25 * diffraction * rim + .75 * diffraction * IN.color); + + } + ENDCG + } +} diff --git a/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/BubbleWand.shader.meta b/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/BubbleWand.shader.meta new file mode 100644 index 00000000..ffebacc8 --- /dev/null +++ b/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/BubbleWand.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 0291fdb46401c4826bc02d7ec6d76cbb +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/main.png b/UnitySDK/Assets/TiltBrush/Assets/X/Brushes/BubbleWand/main.png new file mode 100644 index 0000000000000000000000000000000000000000..2d3ee0282c917b3d8feca58c09b14de6bec4a6f6 GIT binary patch literal 58436 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