Commit de07a511 authored by Sarah's avatar Sarah

added UI Scene, Shader Graph, VFX Graph

parent a414b0b2
fileFormatVersion: 2
guid: 2f159187856e25343a0d6479b90b338c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: c6e1962a49af49249a11a991c5676efc
ModelImporter:
serializedVersion: 19300
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 64677355665b5684c822c245cb6a495b
timeCreated: 1507629404
licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 7889f43895f96014d8f543c9ae87f935
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5ce7687eae563534baf8ba8aac1d8e54
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class MeshShader : MonoBehaviour
{
[SerializeField]
GameObject m_Mesh;
[SerializeField]
Slider m_Slider;
Material m_material;
// Start is called before the first frame update
void Start()
{
m_material = m_Mesh.GetComponent<MeshRenderer>().material;
ValueChangeCheck();
}
// Invoked when the value of the slider changes.
public void ValueChangeCheck()
{
if (m_Slider.value> 0)
{
m_Mesh.SetActive(true);
m_material.SetFloat("Shader_Power", m_Slider.value);
} else
{
m_Mesh.SetActive(false);
}
}
}
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Scripts/UI/MeshShader.cs.meta
guid: 0dbab83ad2edd96409c97581b112ed10
=======
<<<<<<< Updated upstream
guid: c2616ac269f37f14297bd2f12926f45f
=======
guid: b2a9d9e3f752e3943abdac282e54ba6c
>>>>>>> Stashed changes
>>>>>>> 3753c29126b3bc1770269aeb101d803487eeb22a:Assets/testestest.cs.meta
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.VFX;
using UnityEngine.UI.Extensions;
public class VFXShader : MonoBehaviour
{
[SerializeField] Slider m_SpawnSlider;
[SerializeField] Slider m_XScale;
//[SerializeField] Slider m_YScale;
//[SerializeField] Slider m_MaxSpeed;
[SerializeField] RangeSlider m_rangeSlider;
[SerializeField] Dropdown m_BlendModeDropDown;
[SerializeField] Text m_BlendModeText;
[SerializeField] Dropdown m_TextureDropDown;
[SerializeField] Text m_TextureText;
[SerializeField] Dropdown m_ColorDropDown;
[SerializeField] Text m_ColorText;
[SerializeField] GameObject m_vfx;
[SerializeField] Texture2D[] m_TextureArray;
VisualEffect m_vea;
// Start is called before the first frame update
void Start()
{
m_vea = m_vfx.GetComponent<VisualEffect>();
//Initialise the Text to say the first value of the Dropdown
m_BlendModeText.text = "First Value : " + m_BlendModeDropDown.value;
m_TextureText.text = "First Value :" + m_TextureDropDown.value;
m_ColorText.text = "First Value :" + m_ColorDropDown.value;
ValueChangeCheckSpawn();
ValueChangeCheckXYScale();
ValueChangeCheckTexture();
ValueChangeCheckColor();
//ValueChangeCheckMaxSpeed();
ValueChangeCheckRangeSlider();
}
// Invoked when the value of the slider changes.
public void ValueChangeCheckSpawn()
{
m_vea.SetFloat("SpawnRate", m_SpawnSlider.value);
}
public void ValueChangeCheckBlendMode()
{
}
public void ValueChangeCheckTexture()
{
m_vea.SetTexture("Texture", m_TextureArray[m_TextureDropDown.value]);
}
public void ValueChangeCheckColor()
{
m_vea.SetFloat("Colorscheme 1", m_ColorDropDown.value);
}
public void ValueChangeCheckXYScale()
{
m_vea.SetVector3("Scale", new Vector3 (m_XScale.value, m_XScale.value, m_XScale.value));
}
/*public void ValueChangeCheckMaxSpeed()
{
m_vea.SetFloat("MaxSpeed", m_MaxSpeed.value);
}*/
public void ValueChangeCheckRangeSlider()
{
m_vea.SetFloat("MinSpeed", m_rangeSlider.LowValue);
m_vea.SetFloat("MaxSpeed", m_rangeSlider.HighValue);
Debug.Log(m_rangeSlider.MaxValue);
}
}
fileFormatVersion: 2
guid: 9b13ebb77e0d8b24b989a9563c220679
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 74ee5231f1add0a428e1f8a1a9769fe4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class TestVF : MonoBehaviour
{
[Texture3DPreview] [SerializeField] Texture3D VFFile;
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}
fileFormatVersion: 2
guid: 593a4bf897740c2408a5f0f794566f8d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 585039c4254aa394b82dc69baf156968
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f027d97ce458d124eb87f7aafbe629d3
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -74,7 +74,7 @@ public class Texture3DEditor : Editor
EditorGUILayout.LabelField("Quality", GUILayout.MaxWidth(50));
_samplingIterations = EditorGUILayout.IntPopup(_samplingIterations, new string[] { "16", "32", "64", "128", "256", "512" }, new int[] { 16, 32, 64, 128, 256, 512 }, GUILayout.MaxWidth(50));
EditorGUILayout.LabelField("Density", GUILayout.MaxWidth(50));
_density = EditorGUILayout.Slider(_density, 0, 500, GUILayout.MaxWidth(200));
_density = EditorGUILayout.Slider(_density, 0, 5, GUILayout.MaxWidth(200));
EditorGUILayout.EndHorizontal();
}
......
fileFormatVersion: 2
guid: f3bbb33fa5398f74483d898aad55886f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: cacfd45ed02642840836b231a69f7e5d
VisualEffectImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 776ee4065329b9f4a82ae4b27cb58e47
guid: ca6eba1cc13d646438ab1f1bdc3f35e5
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
......@@ -7,9 +7,4 @@ ScriptedImporter:
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 336709e79a7c5ad4f8611c5f160d050b, type: 3}
outputFormat: 0
wrapMode: 0
filterMode: 2
generateMipMaps: 0
anisoLevel: 1
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
%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: Shader Graphs_BPR Shader Graph 1
m_Shader: {fileID: -6465566751694194690, guid: ca6eba1cc13d646438ab1f1bdc3f35e5,
type: 3}
m_ShaderKeywords: BOOLEAN_4B72046_ON _BLENDMODE_ALPHA _ENABLE_FOG_ON_TRANSPARENT
_SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
MotionVector: User
RenderType: Transparent
disabledShaderPasses:
- TransparentBackface
- MOTIONVECTORS
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Floats:
- BOOLEAN_4B72046: 1
- Shader_Power: 1
- Vector1_2C56B319: 3.17
- Vector1_4E00F0FD: 0
- _AlphaCutoffEnable: 0
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _BlendMode: 0
- _CullMode: 2
- _CullModeForward: 2
- _DoubleSidedEnable: 0