浏览代码

Final Changes and fixes before release v1

/main
Thomas ICHÉ 6 年前
当前提交
695a80fa
共有 14 个文件被更改,包括 870 次插入1966 次删除
  1. 4
      Assets/SampleLoader/SampleLoader.cs
  2. 814
      Assets/Samples/Butterflies/Butterflies.vfx
  3. 16
      Assets/Samples/MorphingFace/MorphingFace.unity
  4. 730
      Assets/Samples/MorphingFace/MorphingFace.vfx
  5. 791
      Assets/Samples/UnityLogo/UnityLogo.vfx
  6. 6
      Packages/manifest.json
  7. 10
      ProjectSettings/ProjectSettings.asset
  8. 2
      ProjectSettings/ProjectVersion.txt
  9. 181
      ProjectSettings/QualitySettings.asset
  10. 162
      Assets/Samples/Butterflies/Mesh/ButterflyBody.mesh
  11. 8
      Assets/Samples/Butterflies/Mesh/ButterflyBody.mesh.meta
  12. 96
      Assets/Samples/Butterflies/Mesh/ButterflyBody.obj.meta
  13. 8
      GIT_CLONE.bat
  14. 8
      GIT_UPDATE.bat

4
Assets/SampleLoader/SampleLoader.cs


[Header("Debug")]
public Text FramerateText;
int index = 0;
bool fading;
bool loading;

// Update is called once per frame
void Update()
{
if (Input.GetKeyDown(KeyCode.Escape))
Application.Quit();
UpdateDebug();
fadeTTL -= Time.unscaledDeltaTime;

814
Assets/Samples/Butterflies/Butterflies.vfx
文件差异内容过多而无法显示
查看文件

16
Assets/Samples/MorphingFace/MorphingFace.unity


m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.080708526, g: 0.07263806, b: 0.06697649, a: 1}
m_IndirectSpecularColor: {r: 0.080708906, g: 0.07263871, b: 0.06697538, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

punctualIntensity: 5000
areaIntensity: 200
enableSpotReflector: 0
luxAtDistance: 1
volumetricDimmer: 1
m_VolumetricDimmer: 1
lightUnit: 0
sunDiskSize: 1
sunHaloSize: 0.1

maxSmoothness: 1
applyRangeAttenuation: 1
useOldInspector: 0
useVolumetric: 1
featuresFoldout: 1
showAdditionalSettings: 0
displayLightIntensity: 5000

punctualIntensity: 5000
areaIntensity: 200
enableSpotReflector: 0
luxAtDistance: 1
volumetricDimmer: 1
m_VolumetricDimmer: 1
lightUnit: 0
sunDiskSize: 1
sunHaloSize: 0.1

maxSmoothness: 1
applyRangeAttenuation: 1
useOldInspector: 0
useVolumetric: 1
featuresFoldout: 1
showAdditionalSettings: 0
displayLightIntensity: 5000

punctualIntensity: 600
areaIntensity: 200
enableSpotReflector: 0
luxAtDistance: 1
volumetricDimmer: 1
m_VolumetricDimmer: 1
lightUnit: 2
sunDiskSize: 1
sunHaloSize: 0.1

maxSmoothness: 1
applyRangeAttenuation: 1
useOldInspector: 0
useVolumetric: 1
featuresFoldout: 1
showAdditionalSettings: 1
displayLightIntensity: 6

runLightListAsync: 1
runSSRAsync: 1
runSSAOAsync: 1
runContactShadowsAsync: 1
runVolumeVoxelizationAsync: 1
lightLoopSettings:
overrides: 0
enableTileAndCluster: 1

730
Assets/Samples/MorphingFace/MorphingFace.vfx
文件差异内容过多而无法显示
查看文件

791
Assets/Samples/UnityLogo/UnityLogo.vfx
文件差异内容过多而无法显示
查看文件

6
Packages/manifest.json


{
"dependencies": {
"com.unity.package-manager-ui": "2.0.3",
"com.unity.render-pipelines.core": "file:../LocalPackages/com.unity.render-pipelines.core",
"com.unity.render-pipelines.high-definition": "file:../LocalPackages/com.unity.render-pipelines.high-definition",
"com.unity.shadergraph": "file:../LocalPackages/com.unity.shadergraph",
"com.unity.visualeffectgraph": "file:../LocalPackages/com.unity.visualeffectgraph",
"com.unity.render-pipelines.high-definition": "4.3.0-preview",
"com.unity.visualeffectgraph": "4.3.0-preview",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",

10
ProjectSettings/ProjectSettings.asset


useOnDemandResources: 0
accelerometerFrequency: 60
companyName: Unity Technologies
productName: Visual Effect Graph Samples
productName: Visual Effect Graph - Samples
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}

width: 1
height: 1
m_SplashScreenLogos: []
m_VirtualRealitySplashScreen: {fileID: 0}
m_VirtualRealitySplashScreen: {fileID: 2800000, guid: bd59a855abc9f6b429e428dfacafe33f,
type: 3}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1024
defaultScreenHeight: 768

16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.1
bundleVersion: 1.0
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0

resolutionScalingMode: 0
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier: {}
applicationIdentifier:
Standalone: com.unity.visualeffectgraph-samples
buildNumber: {}
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 18

2
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2018.3.0b10
m_EditorVersion: 2018.3.0b11

181
ProjectSettings/QualitySettings.asset


QualitySettings:
m_ObjectHideFlags: 0
serializedVersion: 5
m_CurrentQuality: 5
m_CurrentQuality: 0
name: Very Low
pixelLightCount: 0
shadows: 2
shadowResolution: 0
shadowProjection: 1
shadowCascades: 1
shadowDistance: 15
shadowNearPlaneOffset: 3
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
blendWeights: 1
textureQuality: 1
anisotropicTextures: 0
antiAliasing: 0
softParticles: 0
softVegetation: 0
realtimeReflectionProbes: 0
billboardsFaceCameraPosition: 0
vSyncCount: 0
lodBias: 0.3
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 4
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
name: Low
pixelLightCount: 0
shadows: 2
shadowResolution: 0
shadowProjection: 1
shadowCascades: 1
shadowDistance: 20
shadowNearPlaneOffset: 3
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
blendWeights: 2
textureQuality: 0
anisotropicTextures: 0
antiAliasing: 0
softParticles: 0
softVegetation: 0
realtimeReflectionProbes: 0
billboardsFaceCameraPosition: 0
vSyncCount: 0
lodBias: 0.4
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 16
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
name: Medium
pixelLightCount: 1
shadows: 2
shadowResolution: 0
shadowProjection: 1
shadowCascades: 1
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
antiAliasing: 0
softParticles: 0
softVegetation: 0
realtimeReflectionProbes: 0
billboardsFaceCameraPosition: 0
vSyncCount: 0
lodBias: 0.7
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 64
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
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
lodBias: 1
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 256
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
name: Very High
pixelLightCount: 3
shadows: 2
shadowResolution: 2
shadowProjection: 1
shadowCascades: 2
shadowDistance: 40
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: 0
lodBias: 1.5
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 1024
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
name: Ultra
name: Default
pixelLightCount: 4
shadows: 2
shadowResolution: 2

resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
m_PerPlatformDefaultQuality:
Standalone: 5
Standalone: 0

162
Assets/Samples/Butterflies/Mesh/ButterflyBody.mesh


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!43 &4300000
Mesh:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ButterflyBody
serializedVersion: 9
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 48
topology: 0
baseVertex: 0
firstVertex: 0
vertexCount: 12
localAABB:
m_Center: {x: 0, y: -0.1347275, z: 0}
m_Extent: {x: 0.06, y: 0.3047275, z: 0.06}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose: []
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexFormat: 0
m_IndexBuffer: 000001000200000002000300030002000400040002000100000005000100000003000500030004000500040001000500060007000800060008000900090008000a000a000800070006000b000700060009000b0009000a000b000a0007000b00
m_VertexData:
serializedVersion: 2
m_VertexCount: 12
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 12
format: 0
dimension: 3
- stream: 0
offset: 24
format: 0
dimension: 4
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
m_DataSize: 480
_typelessdata: d7b934a108d7233c8fc275bd000000009bb7b43eea856fbf0000803f0000000000000000000080bfbe30f8233e00e1be0000000000000000000080bf000000000000803f0000000000000000000080bf8fc275bd08d7233c00000000ea856fbf9db7b43e000000000000803f0000000000000000000080bf9d229ea2285c8f3d00000000000000000000803f000000000000803f0000000000000000000080bfd7b934a108d7233c8fc2753d000000009cb7b43eea856f3f0000803f0000000000000000000080bf8fc2753d08d7233c00000000ea856f3f9db7b43e000000000000803f0000000000000000000080bf8b7ff8a2ae47e13d8fc275bd0000000000000000000080bf0000803f0000000000000000000080bf4fe861a2cccc4c3d0000000000000000000080bf000000000000803f0000000000000000000080bf8fc275bdae47e13d00000000000080bf00000000000000000000803f0000000000000000000080bf760540a37a142e3e00000000000000000000803f000000000000803f0000000000000000000080bf8b7ff8a2ae47e13d8fc2753d00000000000000000000803f0000803f0000000000000000000080bf8fc2753dae47e13d000000000000803f00000000000000000000803f0000000000000000000080bf
m_CompressedMesh:
m_Vertices:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_UV:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Normals:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Tangents:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Weights:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_NormalSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_TangentSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_FloatColors:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_BoneIndices:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_Triangles:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_UVInfo: 0
m_LocalAABB:
m_Center: {x: 0, y: -0.1347275, z: 0}
m_Extent: {x: 0.06, y: 0.3047275, z: 0.06}
m_MeshUsageFlags: 0
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
m_MeshMetrics[0]: 1
m_MeshMetrics[1]: 1
m_MeshOptimized: 1
m_StreamData:
offset: 0
size: 0
path:

8
Assets/Samples/Butterflies/Mesh/ButterflyBody.mesh.meta


fileFormatVersion: 2
guid: b73b3d8cce4689c42a4994bd3dbfb8d1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4300000
userData:
assetBundleName:
assetBundleVariant:

96
Assets/Samples/Butterflies/Mesh/ButterflyBody.obj.meta


fileFormatVersion: 2
guid: 9b41fa45dbe9e8c4b8f06523a563dff8
ModelImporter:
serializedVersion: 23
fileIDToRecycleName:
100000: //RootNode
100002: default
400000: //RootNode
400002: default
2100000: defaultMat
2300000: default
3300000: default
4300000: default
externalObjects: {}
materials:
importMaterials: 0
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: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 0
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
importAnimation: 0
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

8
GIT_CLONE.bat


@echo off
ECHO Installing SRP/HDRP/VFX Editor...
md LocalPackages
git clone -b release/2018.3 https://github.com/Unity-Technologies/ScriptableRenderPipeline.git ./LocalPackages
pause

8
GIT_UPDATE.bat


@echo off
ECHO Updating SRP/HDRP/VisualEffectGraph...
cd LocalPackages
git reset --hard
git pull origin release/2018.3
pause
正在加载...
取消
保存