Skip to content

Commit

Permalink
Brush fixes
Browse files Browse the repository at this point in the history 
More brush fixes, some cleanup.
  • Loading branch information
@kijai
kijai committed Sep 22, 2021
1 parent 9871f72 commit 68bceb3
Show file tree
Hide file tree
Showing 26 changed files with 1,590 additions and 2,393 deletions.
176 changes: 5 additions & 171 deletions UnitySDK/Assets/Scenes/SampleScene.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ RenderSettings:
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientSkyColor: {r: 0.161208, g: 0.18923302, b: 0.24528301, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
Expand All @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18370472, g: 0.22913565, b: 0.30487072, a: 1}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -123,75 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &587767914
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalScale.x
value: 9.1826
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalScale.y
value: 9.1826
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalScale.z
value: 9.1826
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalPosition.x
value: 1.5056
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalPosition.y
value: 2.36
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalPosition.z
value: -0.98555
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8963598758226775581, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4948014801900331812, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
propertyPath: m_Name
value: Untitled_1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: -4770717420272714671, guid: ee9548e6cff5a2d47aec181faf396ea2, type: 3}
--- !u!1 &677856533
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -219,7 +150,6 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1193229770}
- {fileID: 1064435840}
m_Father: {fileID: 0}
m_RootOrder: 0
Expand Down Expand Up @@ -315,101 +245,5 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 677856534}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 32.791, y: -41.949, z: -15.092}
--- !u!1 &1193229766
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1193229770}
- component: {fileID: 1193229769}
- component: {fileID: 1193229768}
- component: {fileID: 1193229767}
m_Layer: 14
m_Name: Plane
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!64 &1193229767
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1193229766}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1193229768
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1193229766}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1193229769
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1193229766}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1193229770
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1193229766}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.219, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 677856534}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 32.791, y: -41.949, z: -15.092}
Binary file added UnitySDK/Assets/Tests/tiltbrushbrushesall_blue.fbx
View file
Binary file not shown.
102 changes: 102 additions & 0 deletions UnitySDK/Assets/Tests/tiltbrushbrushesall_blue.fbx.meta
View file

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

7 changes: 5 additions & 2 deletions UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: CoarseBristles_15
m_Shader: {fileID: -6465566751694194690, guid: 52520deaab18aa84986e102463fa4a65, type: 3}
m_ShaderKeywords: _EMISSION
m_ShaderKeywords: BOOLEAN_558E5EF25C8D4948A5D9D1DE3E880584_ON BOOLEAN_D7D1D6E73B7F4A4C9F775CE255B2222F_ON
_EMISSION
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -76,12 +77,14 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- BOOLEAN_558E5EF25C8D4948A5D9D1DE3E880584: 1
- BOOLEAN_D7D1D6E73B7F4A4C9F775CE255B2222F: 1
- Boolean_10f7618faac4429f94d7ab2e78dfebba: 1
- Boolean_420d47fff25e4551842d5543b683d9d9: 1
- Vector1_43d512ab2ecd4b68a10ca02a004c7f3a: 0
- Vector1_7683367b3a324d5397407217add23608: 1
- Vector1_7e140da91b024369b3c2752f10e96ce6: 0
- Vector1_9ad13ac4dc80418d801a917ac39565b0: 0.25
- Vector1_9ad13ac4dc80418d801a917ac39565b0: 0.111
- _BumpScale: 1
- _Cutoff: 0.25
- _DetailNormalMapScale: 1
Expand Down
5 changes: 4 additions & 1 deletion UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Properties {
_AlphaMask("Alpha Mask", 2D) = "white" {}
_Speed ("Animation Speed", Range (0,1)) = 1
_EmissionGain ("Emission Gain", Range(0, 1)) = 0.5
_Intensity("Color Intensity", Range(0.1, 5.0)) = 1.0
}

Category {
Expand All @@ -43,6 +44,7 @@ Category {
float4 _MainTex_ST;
float4 _AlphaMask_ST;
float _Speed;
float _Intensity;
half _EmissionGain;

struct appdata_t {
Expand All @@ -64,7 +66,8 @@ Category {
v2f o;

o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex);
o.color = TbVertToNative(v.color);
o.color = v.color * _Intensity;
//o.color = TbVertToNative(v.color);

#ifdef AUDIO_REACTIVE
float3 displacement = _BeatOutput.y * v.normal *
Expand Down
5 changes: 3 additions & 2 deletions UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/Comet/Comet_16.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,18 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EmissionGain: 0.532
- _EmissionGain: 0.5
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Intensity: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _Speed: 0.811
- _Speed: 0.779
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
Expand Down
Loading

0 comments on commit 68bceb3

Please sign in to comment.