浏览代码

added new scene to test reflection probes

/batch_rendering
Arnaud Carre 8 年前
当前提交
ba4e7090
共有 29 个文件被更改,包括 490 次插入33 次删除
  1. 4
      Assets/BasicRenderBatching/Prefabs/Capsule.prefab
  2. 4
      Assets/BasicRenderBatching/Prefabs/cube.prefab
  3. 4
      Assets/BasicRenderBatching/Prefabs/cylinder.prefab
  4. 4
      Assets/BasicRenderBatching/Prefabs/sphere.prefab
  5. 12
      Assets/TestScenes/HDTest/Editor/Generator.cs
  6. 10
      Assets/TestScenes/HDTest/HDRI/MuirWood - White balanced.exr.meta
  7. 10
      Assets/TestScenes/HDTest/HDRI/Trinitatis Church - White balanced.exr.meta
  8. 4
      ProjectSettings/EditorBuildSettings.asset
  9. 4
      Assets/BasicRenderBatching/LightingBatchingReflectionProbe/ReflectionProbe-0.exr.meta
  10. 9
      Assets/BasicRenderBatching/LightingBatchingReflectionProbe.meta
  11. 8
      Assets/BasicRenderBatching/LightingBatchingReflectionProbe.unity.meta
  12. 162
      Assets/TestScenes/HDTest/Material/BatchingTest/Materials/Chrome.mat
  13. 8
      Assets/TestScenes/HDTest/Material/BatchingTest/Materials/Chrome.mat.meta
  14. 8
      Assets/BasicRenderBatching/LightingBatchingReflectionProbe/LightingData.asset.meta
  15. 17
      Assets/BasicRenderBatching/LightingBatchingReflectionProbe/Lightmap-0_comp_dir.png
  16. 68
      Assets/BasicRenderBatching/LightingBatchingReflectionProbe/Lightmap-0_comp_dir.png.meta
  17. 39
      Assets/BasicRenderBatching/LightingBatchingReflectionProbe/Lightmap-0_comp_light.exr
  18. 68
      Assets/BasicRenderBatching/LightingBatchingReflectionProbe/Lightmap-0_comp_light.exr.meta
  19. 2
      Assets/BasicRenderBatching/LightingBatchingReflectionProbe/ReflectionProbe-0.exr
  20. 69
      Assets/BasicRenderBatching/LightingBatchingReflectionProbe/ReflectionProbe-1.exr.meta
  21. 9
      Assets/BasicRenderBatching/LightingBatchingProbe.meta
  22. 0
      /Assets/BasicRenderBatching/LightingBatchingReflectionProbe/ReflectionProbe-1.exr
  23. 0
      /Assets/BasicRenderBatching/LightingBatchingReflectionProbe/ReflectionProbe-0.exr.meta

4
Assets/BasicRenderBatching/Prefabs/Capsule.prefab


m_CastShadows: 1
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 2
m_Materials:
- {fileID: 2100000, guid: de48705454e39554fb09f6cd7f8e9cdf, type: 2}
m_StaticBatchInfo:

4
Assets/BasicRenderBatching/Prefabs/cube.prefab


m_CastShadows: 1
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 2
m_Materials:
- {fileID: 2100000, guid: de48705454e39554fb09f6cd7f8e9cdf, type: 2}
m_StaticBatchInfo:

4
Assets/BasicRenderBatching/Prefabs/cylinder.prefab


m_CastShadows: 1
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 2
m_Materials:
- {fileID: 2100000, guid: de48705454e39554fb09f6cd7f8e9cdf, type: 2}
m_StaticBatchInfo:

4
Assets/BasicRenderBatching/Prefabs/sphere.prefab


m_CastShadows: 1
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 2
m_Materials:
- {fileID: 2100000, guid: de48705454e39554fb09f6cd7f8e9cdf, type: 2}
m_StaticBatchInfo:

12
Assets/TestScenes/HDTest/Editor/Generator.cs


m_MaterialPrefab[2] = (Material)AssetDatabase.LoadAssetAtPath("Assets/TestScenes/HDTest/Material/BatchingTest/Materials/Iron52.mat", typeof(Material));
m_MaterialPrefab[3] = (Material)AssetDatabase.LoadAssetAtPath("Assets/TestScenes/HDTest/Material/BatchingTest/Materials/Iron53.mat", typeof(Material));
Material chromeMat = (Material)AssetDatabase.LoadAssetAtPath("Assets/TestScenes/HDTest/Material/BatchingTest/Materials/Chrome.mat", typeof(Material));
m_TexturesPrefab[0] = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/BasicRenderBatching/Textures/Glass.tif", typeof(Texture2D));
m_TexturesPrefab[1] = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/BasicRenderBatching/Textures/ColorGrid.png", typeof(Texture2D));
m_TexturesPrefab[2] = (Texture2D)AssetDatabase.LoadAssetAtPath("Assets/BasicRenderBatching/Textures/cookieTest.png", typeof(Texture2D));

Renderer renderer = obj.GetComponent<Renderer>();
int matN = 0; // Random.Range(0, 4)
Material mat = Material.Instantiate(m_MaterialPrefab[matN]);
// int matN = 0; // Random.Range(0, 4)
// Material mat = Material.Instantiate(m_MaterialPrefab[matN]);
Material mat = Material.Instantiate(chromeMat);
mat.SetTexture("_BaseColorMap", m_TexturesPrefab[Random.Range(0, 4)]);
// mat.SetTexture("_BaseColorMap", m_TexturesPrefab[Random.Range(0, 4)]);
renderer.material = mat;

10
Assets/TestScenes/HDTest/HDRI/MuirWood - White balanced.exr.meta


textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
maxTextureSize: 128
textureFormat: -1
textureCompression: 1
compressionQuality: 50

- buildTarget: Standalone
maxTextureSize: 1024
maxTextureSize: 128
textureFormat: -1
textureCompression: 1
compressionQuality: 50

- buildTarget: iPhone
maxTextureSize: 1024
maxTextureSize: 128
textureFormat: -1
textureCompression: 1
compressionQuality: 50

- buildTarget: tvOS
maxTextureSize: 1024
maxTextureSize: 128
textureFormat: -1
textureCompression: 1
compressionQuality: 50

- buildTarget: Windows Store Apps
maxTextureSize: 1024
maxTextureSize: 128
textureFormat: -1
textureCompression: 1
compressionQuality: 50

10
Assets/TestScenes/HDTest/HDRI/Trinitatis Church - White balanced.exr.meta


textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
maxTextureSize: 128
textureFormat: -1
textureCompression: 1
compressionQuality: 50

- buildTarget: Standalone
maxTextureSize: 1024
maxTextureSize: 128
textureFormat: -1
textureCompression: 1
compressionQuality: 50

- buildTarget: iPhone
maxTextureSize: 1024
maxTextureSize: 128
textureFormat: -1
textureCompression: 1
compressionQuality: 50

- buildTarget: tvOS
maxTextureSize: 1024
maxTextureSize: 128
textureFormat: -1
textureCompression: 1
compressionQuality: 50

- buildTarget: Windows Store Apps
maxTextureSize: 1024
maxTextureSize: 128
textureFormat: -1
textureCompression: 1
compressionQuality: 50

4
ProjectSettings/EditorBuildSettings.asset


path: Assets/BasicRenderBatching/LightingBatching.unity
- enabled: 0
path: Assets/BasicRenderBatching/LightingBatchingProbe.unity
- enabled: 1
- enabled: 0
- enabled: 1
path: Assets/BasicRenderBatching/LightingBatchingReflectionProbe.unity

4
Assets/BasicRenderBatching/LightingBatchingReflectionProbe/ReflectionProbe-0.exr.meta


fileFormatVersion: 2
guid: 241bbb3d3d3dca14ca1214aa69196acf
timeCreated: 1485352826
guid: 01012c863d7ee774e88a80dd2da4d452
timeCreated: 1485435735
licenseType: Pro
TextureImporter:
fileIDToRecycleName:

9
Assets/BasicRenderBatching/LightingBatchingReflectionProbe.meta


fileFormatVersion: 2
guid: cfe581fe5bf685e41ae3228a80d81039
folderAsset: yes
timeCreated: 1485435192
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

8
Assets/BasicRenderBatching/LightingBatchingReflectionProbe.unity.meta


fileFormatVersion: 2
guid: 7263ac8f73645cd4cb91ca306ea4c4f8
timeCreated: 1481127663
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

162
Assets/TestScenes/HDTest/Material/BatchingTest/Materials/Chrome.mat


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Chrome
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DEPTHOFFSETENABLE_OFF _DETAIL_MAP_WITH_NORMAL
_DISTORTIONDEPTHTEST_OFF _DISTORTIONENABLE_OFF _DISTORTIONONLY_OFF _EMISSION _METALLICGLOSSMAP
_NORMALMAP_TANGENT_SPACE _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A _SPECGLOSSMAP
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- DistortionVectors
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AnisotropyMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: a1af39b7a0f46c745860b71db5123c8b, 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}
- _DetailMap:
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}
- _DistortionVectorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _EmissiveColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _HeightMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 7e6783f664c496f428ac4d5c50d02625, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0}
- _MaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: a42e904f92cf4d44a81ce95af7dc4ad3, type: 3}
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}
- _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: 7e6783f664c496f428ac4d5c50d02625, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecularOcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SubSurfaceRadiusMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TangentMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaCutoff: 0.5
- _AlphaCutoffEnable: 0
- _Anisotropy: 0
- _BlendMode: 0
- _BumpScale: 1
- _CullMode: 2
- _Cutoff: 0.5
- _DepthOffsetEnable: 0
- _DetailAOScale: 1
- _DetailAlbedoScale: 1
- _DetailHeightScale: 1
- _DetailMapMode: 0
- _DetailNormalMapScale: 1
- _DetailNormalScale: 1
- _DetailSmoothnessScale: 1
- _DistortionDepthTest: 0
- _DistortionEnable: 0
- _DistortionOnly: 0
- _DoubleSidedMode: 0
- _DstBlend: 0
- _EmissiveColorMode: 1
- _EmissiveIntensity: 0
- _GlossMapScale: 1
- _Glossiness: 0.6
- _GlossyReflections: 1
- _HeightBias: 0
- _HeightMapMode: 0
- _HeightScale: 0.01
- _MaterialId: 0
- _Metallic: 1
- _Mode: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Smoothness: 1
- _SmoothnessTextureChannel: 1
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SubSurfaceRadius: 0
- _SurfaceType: 0
- _TexWorldScale: 1
- _UVBase: 0
- _UVDetail: 0
- _UVMappingPlanar: 0
- _UVSec: 0
- _ZTestMode: 8
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

8
Assets/TestScenes/HDTest/Material/BatchingTest/Materials/Chrome.mat.meta


fileFormatVersion: 2
guid: 43a67210f39cca44abad978e6b8d804f
timeCreated: 1474298969
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

8
Assets/BasicRenderBatching/LightingBatchingReflectionProbe/LightingData.asset.meta


fileFormatVersion: 2
guid: 476b660698d4ae3499556a1d3c8dddd9
timeCreated: 1485435736
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

17
Assets/BasicRenderBatching/LightingBatchingReflectionProbe/Lightmap-0_comp_dir.png

之前 之后
宽度: 1024  |  高度: 1024  |  大小: 10 KiB

68
Assets/BasicRenderBatching/LightingBatchingReflectionProbe/Lightmap-0_comp_dir.png.meta


fileFormatVersion: 2
guid: 6eedd774ab545ca418936e0df29606a3
timeCreated: 1485435735
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: 1
aniso: 3
mipBias: 0
wrapMode: 1
nPOTScale: 1
lightmap: 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
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

39
Assets/BasicRenderBatching/LightingBatchingReflectionProbe/Lightmap-0_comp_light.exr
文件差异内容过多而无法显示
查看文件

68
Assets/BasicRenderBatching/LightingBatchingReflectionProbe/Lightmap-0_comp_light.exr.meta


fileFormatVersion: 2
guid: 675a1607b2df0b14486f499ac203a063
timeCreated: 1485435735
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: 1
aniso: 3
mipBias: 0
wrapMode: 1
nPOTScale: 1
lightmap: 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
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

2
Assets/BasicRenderBatching/LightingBatchingReflectionProbe/ReflectionProbe-0.exr
文件差异内容过多而无法显示
查看文件

69
Assets/BasicRenderBatching/LightingBatchingReflectionProbe/ReflectionProbe-1.exr.meta


fileFormatVersion: 2
guid: 4fb6863fa21518243ba8ccdd67ca7eb8
timeCreated: 1485435736
licenseType: Pro
TextureImporter:
fileIDToRecycleName:
8900000: generatedCubemap
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: 2
aniso: 0
mipBias: 0
wrapMode: 1
nPOTScale: 1
lightmap: 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
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

9
Assets/BasicRenderBatching/LightingBatchingProbe.meta


fileFormatVersion: 2
guid: 41f174a20bda91d4a8692d971d52c93f
folderAsset: yes
timeCreated: 1485274825
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

/Assets/BasicRenderBatching/LightingBatchingProxyVolume/ReflectionProbe-0.exr → /Assets/BasicRenderBatching/LightingBatchingReflectionProbe/ReflectionProbe-1.exr

/Assets/BasicRenderBatching/LightingBatchingProxyVolume/ReflectionProbe-0.exr.meta → /Assets/BasicRenderBatching/LightingBatchingReflectionProbe/ReflectionProbe-0.exr.meta

部分文件因为文件数量过多而无法显示

正在加载...
取消
保存