fix enviroment and config issue again; faster ipc
This commit is contained in:
parent
53eb751418
commit
bfa9df38b5
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 4136947632
|
CRC: 4001995838
|
||||||
AssetBundleManifest:
|
AssetBundleManifest:
|
||||||
AssetBundleInfos:
|
AssetBundleInfos:
|
||||||
Info_0:
|
Info_0:
|
||||||
|
Binary file not shown.
@ -1,12 +1,12 @@
|
|||||||
ManifestFileVersion: 0
|
ManifestFileVersion: 0
|
||||||
CRC: 1307084116
|
CRC: 981639292
|
||||||
Hashes:
|
Hashes:
|
||||||
AssetFileHash:
|
AssetFileHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 636dd6476d15f862bf5bdf3377f13ad7
|
Hash: 1ec9c86ef6ddffc2b367e48d719ac5de
|
||||||
TypeTreeHash:
|
TypeTreeHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: f21949c02115747e8ce077b6c850c7ab
|
Hash: bfd8e95edd014885b20c6ff1e66ce84b
|
||||||
HashAppended: 0
|
HashAppended: 0
|
||||||
ClassTypes:
|
ClassTypes:
|
||||||
- Class: 1
|
- Class: 1
|
||||||
@ -37,6 +37,8 @@ ClassTypes:
|
|||||||
Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||||
- Class: 114
|
- Class: 114
|
||||||
Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
|
Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
|
||||||
|
- Class: 114
|
||||||
|
Script: {fileID: 11500000, guid: 1886bb2d2d9d85f4b9fc5dfeb8d68f50, type: 3}
|
||||||
- Class: 115
|
- Class: 115
|
||||||
Script: {instanceID: 0}
|
Script: {instanceID: 0}
|
||||||
- Class: 213
|
- Class: 213
|
||||||
@ -48,6 +50,10 @@ ClassTypes:
|
|||||||
- Class: 224
|
- Class: 224
|
||||||
Script: {instanceID: 0}
|
Script: {instanceID: 0}
|
||||||
SerializeReferenceClassIdentifiers:
|
SerializeReferenceClassIdentifiers:
|
||||||
|
- AssemblyName: Essential
|
||||||
|
ClassName: PrefabLightmapData/LightInfo
|
||||||
|
- AssemblyName: Essential
|
||||||
|
ClassName: PrefabLightmapData/RendererInfo
|
||||||
- AssemblyName: UnityEngine.CoreModule
|
- AssemblyName: UnityEngine.CoreModule
|
||||||
ClassName: UnityEngine.Events.PersistentCallGroup
|
ClassName: UnityEngine.Events.PersistentCallGroup
|
||||||
- AssemblyName: UnityEngine.UI
|
- AssemblyName: UnityEngine.UI
|
||||||
|
@ -2592,7 +2592,7 @@ Texture2D:
|
|||||||
m_Name: Orbitron-Black SDF Atlas
|
m_Name: Orbitron-Black SDF Atlas
|
||||||
m_ImageContentsHash:
|
m_ImageContentsHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 00000000000000000000000000000000
|
Hash: 12e870a87de065f6d975ea471d21ff7c
|
||||||
m_ForcedFallbackFormat: 4
|
m_ForcedFallbackFormat: 4
|
||||||
m_DownscaleFallback: 0
|
m_DownscaleFallback: 0
|
||||||
m_IsAlphaChannelOptional: 0
|
m_IsAlphaChannelOptional: 0
|
||||||
|
File diff suppressed because it is too large
Load Diff
24631
Assets/Prefab/WacUnity Variant.prefab
Normal file
24631
Assets/Prefab/WacUnity Variant.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Prefab/WacUnity Variant.prefab.meta
Normal file
7
Assets/Prefab/WacUnity Variant.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 876d870ed83e9364e8a18235dee275b3
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Assets/Scenes/WACVR/ReflectionProbe-1.exr
Normal file
BIN
Assets/Scenes/WACVR/ReflectionProbe-1.exr
Normal file
Binary file not shown.
123
Assets/Scenes/WACVR/ReflectionProbe-1.exr.meta
Normal file
123
Assets/Scenes/WACVR/ReflectionProbe-1.exr.meta
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5c0bdce429832a84e9796ea4125a470e
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 12
|
||||||
|
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
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 1
|
||||||
|
seamlessCubemap: 1
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 2
|
||||||
|
aniso: 0
|
||||||
|
mipBias: 0
|
||||||
|
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: 2
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 100
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Server
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Scenes/WACVR/ReflectionProbe-2.exr
Normal file
BIN
Assets/Scenes/WACVR/ReflectionProbe-2.exr
Normal file
Binary file not shown.
123
Assets/Scenes/WACVR/ReflectionProbe-2.exr.meta
Normal file
123
Assets/Scenes/WACVR/ReflectionProbe-2.exr.meta
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 74505da90ad76cf40b8108c0db311dd7
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 12
|
||||||
|
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
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 1
|
||||||
|
seamlessCubemap: 1
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 2
|
||||||
|
aniso: 0
|
||||||
|
mipBias: 0
|
||||||
|
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: 2
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 100
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Server
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Scenes/WACVR/ReflectionProbe-3.exr
Normal file
BIN
Assets/Scenes/WACVR/ReflectionProbe-3.exr
Normal file
Binary file not shown.
123
Assets/Scenes/WACVR/ReflectionProbe-3.exr.meta
Normal file
123
Assets/Scenes/WACVR/ReflectionProbe-3.exr.meta
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7a78bb7eb8d73364f921839927883715
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 12
|
||||||
|
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
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 1
|
||||||
|
seamlessCubemap: 1
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 2
|
||||||
|
aniso: 0
|
||||||
|
mipBias: 0
|
||||||
|
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: 2
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 100
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Server
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Scenes/WACVR/ReflectionProbe-4.exr
Normal file
BIN
Assets/Scenes/WACVR/ReflectionProbe-4.exr
Normal file
Binary file not shown.
123
Assets/Scenes/WACVR/ReflectionProbe-4.exr.meta
Normal file
123
Assets/Scenes/WACVR/ReflectionProbe-4.exr.meta
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cd18b4e1bf3fa604994c349890f45081
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 12
|
||||||
|
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
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 1
|
||||||
|
seamlessCubemap: 1
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 2
|
||||||
|
aniso: 0
|
||||||
|
mipBias: 0
|
||||||
|
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: 2
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 100
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Server
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Scenes/WACVR/ReflectionProbe-5.exr
Normal file
BIN
Assets/Scenes/WACVR/ReflectionProbe-5.exr
Normal file
Binary file not shown.
123
Assets/Scenes/WACVR/ReflectionProbe-5.exr.meta
Normal file
123
Assets/Scenes/WACVR/ReflectionProbe-5.exr.meta
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9c45e0547bcefa74bba7d1dbc336fc32
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 12
|
||||||
|
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
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 1
|
||||||
|
seamlessCubemap: 1
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 2
|
||||||
|
aniso: 0
|
||||||
|
mipBias: 0
|
||||||
|
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: 2
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 100
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Server
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -20,7 +20,7 @@ public class Config
|
|||||||
public float HandZ = 0;
|
public float HandZ = 0;
|
||||||
public float PlayerHeight = 0;
|
public float PlayerHeight = 0;
|
||||||
public int Skybox = 0;
|
public int Skybox = 0;
|
||||||
public int Enviroment = 0;
|
public int Enviroment = 1;
|
||||||
public float HapticDuration = 0.1f;
|
public float HapticDuration = 0.1f;
|
||||||
public float HapticAmplitude = 0.75f;
|
public float HapticAmplitude = 0.75f;
|
||||||
public int TouchSampleRate = 3;
|
public int TouchSampleRate = 3;
|
||||||
|
@ -44,18 +44,16 @@ public class ConfigManager : MonoBehaviour
|
|||||||
private static void LoadFile()
|
private static void LoadFile()
|
||||||
{
|
{
|
||||||
Debug.Log("Loading config file");
|
Debug.Log("Loading config file");
|
||||||
if (File.Exists(GetFileName()))
|
if (!File.Exists(GetFileName()) || JsonConvert.DeserializeObject<Config>(File.ReadAllText(GetFileName())) == null)
|
||||||
{
|
{
|
||||||
Debug.Log("Config file exists");
|
Debug.Log("Config file does not exist or is corrupted");
|
||||||
config = JsonConvert.DeserializeObject<Config>(File.ReadAllText(GetFileName()));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Debug.Log("Config file does not exist");
|
|
||||||
config = new Config();
|
config = new Config();
|
||||||
SaveFileWait();
|
saveFile();
|
||||||
Debug.Log("Config file created");
|
Debug.Log("Config file created");
|
||||||
}
|
}
|
||||||
|
Debug.Log("Found config file");
|
||||||
|
config = JsonConvert.DeserializeObject<Config>(File.ReadAllText(GetFileName()));
|
||||||
|
Debug.Log("Config file loaded");
|
||||||
}
|
}
|
||||||
public static string GetFileName()
|
public static string GetFileName()
|
||||||
{
|
{
|
||||||
@ -67,7 +65,7 @@ public class ConfigManager : MonoBehaviour
|
|||||||
saverTimer = 0;
|
saverTimer = 0;
|
||||||
//Debug.Log("Saving config file");
|
//Debug.Log("Saving config file");
|
||||||
}
|
}
|
||||||
public void saveFile()
|
public static void saveFile()
|
||||||
{
|
{
|
||||||
File.WriteAllText(GetFileName(), JsonConvert.SerializeObject(config, Formatting.Indented));
|
File.WriteAllText(GetFileName(), JsonConvert.SerializeObject(config, Formatting.Indented));
|
||||||
Debug.Log("Config file saved");
|
Debug.Log("Config file saved");
|
||||||
|
@ -4,7 +4,6 @@ using UnityEngine;
|
|||||||
using TMPro;
|
using TMPro;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
||||||
[RequireComponent(typeof(TMP_Dropdown))]
|
|
||||||
public class EnviromentManager : MonoBehaviour
|
public class EnviromentManager : MonoBehaviour
|
||||||
{
|
{
|
||||||
private TMP_Dropdown Dropdown;
|
private TMP_Dropdown Dropdown;
|
||||||
@ -16,7 +15,8 @@ public class EnviromentManager : MonoBehaviour
|
|||||||
private List<FileInfo> enviromentFiles = new List<FileInfo>();
|
private List<FileInfo> enviromentFiles = new List<FileInfo>();
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
Dropdown = GetComponent<TMP_Dropdown>();
|
var dropdownWidget = ConfigManager.GetConfigPanelWidget("Enviroment");
|
||||||
|
Dropdown = dropdownWidget.GetComponent<TMP_Dropdown>();
|
||||||
AddEnviorments();
|
AddEnviorments();
|
||||||
Dropdown.onValueChanged.AddListener((int value) => {
|
Dropdown.onValueChanged.AddListener((int value) => {
|
||||||
if (value == 0)
|
if (value == 0)
|
||||||
|
287
Assets/Script/Essential/PrefabLightmapData.cs
Normal file
287
Assets/Script/Essential/PrefabLightmapData.cs
Normal file
@ -0,0 +1,287 @@
|
|||||||
|
//Source: https://github.com/Ayfel/PrefabLightmapping
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEditor;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine.SceneManagement;
|
||||||
|
|
||||||
|
[ExecuteAlways]
|
||||||
|
public class PrefabLightmapData : MonoBehaviour
|
||||||
|
{
|
||||||
|
[System.Serializable]
|
||||||
|
struct RendererInfo
|
||||||
|
{
|
||||||
|
public Renderer renderer;
|
||||||
|
public int lightmapIndex;
|
||||||
|
public Vector4 lightmapOffsetScale;
|
||||||
|
}
|
||||||
|
[System.Serializable]
|
||||||
|
struct LightInfo
|
||||||
|
{
|
||||||
|
public Light light;
|
||||||
|
public int lightmapBaketype;
|
||||||
|
public int mixedLightingMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
[SerializeField]
|
||||||
|
RendererInfo[] m_RendererInfo;
|
||||||
|
[SerializeField]
|
||||||
|
Texture2D[] m_Lightmaps;
|
||||||
|
[SerializeField]
|
||||||
|
Texture2D[] m_LightmapsDir;
|
||||||
|
[SerializeField]
|
||||||
|
Texture2D[] m_ShadowMasks;
|
||||||
|
[SerializeField]
|
||||||
|
LightInfo[] m_LightInfo;
|
||||||
|
|
||||||
|
|
||||||
|
void Awake()
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Init()
|
||||||
|
{
|
||||||
|
if (m_RendererInfo == null || m_RendererInfo.Length == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var lightmaps = LightmapSettings.lightmaps;
|
||||||
|
int[] offsetsindexes = new int[m_Lightmaps.Length];
|
||||||
|
int counttotal = lightmaps.Length;
|
||||||
|
List<LightmapData> combinedLightmaps = new List<LightmapData>();
|
||||||
|
|
||||||
|
for (int i = 0; i < m_Lightmaps.Length; i++)
|
||||||
|
{
|
||||||
|
bool exists = false;
|
||||||
|
for (int j = 0; j < lightmaps.Length; j++)
|
||||||
|
{
|
||||||
|
|
||||||
|
if (m_Lightmaps[i] == lightmaps[j].lightmapColor)
|
||||||
|
{
|
||||||
|
exists = true;
|
||||||
|
offsetsindexes[i] = j;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
if (!exists)
|
||||||
|
{
|
||||||
|
offsetsindexes[i] = counttotal;
|
||||||
|
var newlightmapdata = new LightmapData
|
||||||
|
{
|
||||||
|
lightmapColor = m_Lightmaps[i],
|
||||||
|
lightmapDir = m_LightmapsDir.Length == m_Lightmaps.Length ? m_LightmapsDir[i] : default(Texture2D),
|
||||||
|
shadowMask = m_ShadowMasks.Length == m_Lightmaps.Length ? m_ShadowMasks[i] : default(Texture2D),
|
||||||
|
};
|
||||||
|
|
||||||
|
combinedLightmaps.Add(newlightmapdata);
|
||||||
|
|
||||||
|
counttotal += 1;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
var combinedLightmaps2 = new LightmapData[counttotal];
|
||||||
|
|
||||||
|
lightmaps.CopyTo(combinedLightmaps2, 0);
|
||||||
|
combinedLightmaps.ToArray().CopyTo(combinedLightmaps2, lightmaps.Length);
|
||||||
|
|
||||||
|
bool directional=true;
|
||||||
|
|
||||||
|
foreach(Texture2D t in m_LightmapsDir)
|
||||||
|
{
|
||||||
|
if (t == null)
|
||||||
|
{
|
||||||
|
directional = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
LightmapSettings.lightmapsMode = (m_LightmapsDir.Length == m_Lightmaps.Length && directional) ? LightmapsMode.CombinedDirectional : LightmapsMode.NonDirectional;
|
||||||
|
ApplyRendererInfo(m_RendererInfo, offsetsindexes, m_LightInfo);
|
||||||
|
LightmapSettings.lightmaps = combinedLightmaps2;
|
||||||
|
}
|
||||||
|
|
||||||
|
void OnEnable()
|
||||||
|
{
|
||||||
|
|
||||||
|
SceneManager.sceneLoaded += OnSceneLoaded;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// called second
|
||||||
|
void OnSceneLoaded(Scene scene, LoadSceneMode mode)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
}
|
||||||
|
|
||||||
|
// called when the game is terminated
|
||||||
|
void OnDisable()
|
||||||
|
{
|
||||||
|
SceneManager.sceneLoaded -= OnSceneLoaded;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
static void ApplyRendererInfo(RendererInfo[] infos, int[] lightmapOffsetIndex, LightInfo[] lightsInfo)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < infos.Length; i++)
|
||||||
|
{
|
||||||
|
var info = infos[i];
|
||||||
|
|
||||||
|
info.renderer.lightmapIndex = lightmapOffsetIndex[info.lightmapIndex];
|
||||||
|
info.renderer.lightmapScaleOffset = info.lightmapOffsetScale;
|
||||||
|
|
||||||
|
// You have to release shaders.
|
||||||
|
Material[] mat = info.renderer.sharedMaterials;
|
||||||
|
for (int j = 0; j < mat.Length; j++)
|
||||||
|
{
|
||||||
|
if (mat[j] != null && Shader.Find(mat[j].shader.name) != null)
|
||||||
|
mat[j].shader = Shader.Find(mat[j].shader.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < lightsInfo.Length; i++)
|
||||||
|
{
|
||||||
|
LightBakingOutput bakingOutput = new LightBakingOutput();
|
||||||
|
bakingOutput.isBaked = true;
|
||||||
|
bakingOutput.lightmapBakeType = (LightmapBakeType)lightsInfo[i].lightmapBaketype;
|
||||||
|
bakingOutput.mixedLightingMode = (MixedLightingMode)lightsInfo[i].mixedLightingMode;
|
||||||
|
|
||||||
|
lightsInfo[i].light.bakingOutput = bakingOutput;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#if UNITY_EDITOR
|
||||||
|
[UnityEditor.MenuItem("Assets/Bake Prefab Lightmaps")]
|
||||||
|
static void GenerateLightmapInfo()
|
||||||
|
{
|
||||||
|
if (UnityEditor.Lightmapping.giWorkflowMode != UnityEditor.Lightmapping.GIWorkflowMode.OnDemand)
|
||||||
|
{
|
||||||
|
Debug.LogError("ExtractLightmapData requires that you have baked you lightmaps and Auto mode is disabled.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
UnityEditor.Lightmapping.Bake();
|
||||||
|
|
||||||
|
PrefabLightmapData[] prefabs = FindObjectsOfType<PrefabLightmapData>();
|
||||||
|
|
||||||
|
foreach (var instance in prefabs)
|
||||||
|
{
|
||||||
|
var gameObject = instance.gameObject;
|
||||||
|
var rendererInfos = new List<RendererInfo>();
|
||||||
|
var lightmaps = new List<Texture2D>();
|
||||||
|
var lightmapsDir = new List<Texture2D>();
|
||||||
|
var shadowMasks = new List<Texture2D>();
|
||||||
|
var lightsInfos = new List<LightInfo>();
|
||||||
|
|
||||||
|
GenerateLightmapInfo(gameObject, rendererInfos, lightmaps, lightmapsDir, shadowMasks, lightsInfos);
|
||||||
|
|
||||||
|
instance.m_RendererInfo = rendererInfos.ToArray();
|
||||||
|
instance.m_Lightmaps = lightmaps.ToArray();
|
||||||
|
instance.m_LightmapsDir = lightmapsDir.ToArray();
|
||||||
|
instance.m_LightInfo = lightsInfos.ToArray();
|
||||||
|
instance.m_ShadowMasks = shadowMasks.ToArray();
|
||||||
|
#if UNITY_2018_3_OR_NEWER
|
||||||
|
var targetPrefab = PrefabUtility.GetCorrespondingObjectFromOriginalSource(instance.gameObject) as GameObject;
|
||||||
|
if (targetPrefab != null)
|
||||||
|
{
|
||||||
|
GameObject root = PrefabUtility.GetOutermostPrefabInstanceRoot(instance.gameObject);// 根结点
|
||||||
|
//如果当前预制体是是某个嵌套预制体的一部分(IsPartOfPrefabInstance)
|
||||||
|
if (root != null)
|
||||||
|
{
|
||||||
|
GameObject rootPrefab = PrefabUtility.GetCorrespondingObjectFromSource(instance.gameObject);
|
||||||
|
string rootPath = AssetDatabase.GetAssetPath(rootPrefab);
|
||||||
|
//打开根部预制体
|
||||||
|
PrefabUtility.UnpackPrefabInstanceAndReturnNewOutermostRoots(root, PrefabUnpackMode.OutermostRoot);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
//Apply各个子预制体的改变
|
||||||
|
PrefabUtility.ApplyPrefabInstance(instance.gameObject, InteractionMode.AutomatedAction);
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
//重新更新根预制体
|
||||||
|
PrefabUtility.SaveAsPrefabAssetAndConnect(root, rootPath, InteractionMode.AutomatedAction);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
PrefabUtility.ApplyPrefabInstance(instance.gameObject, InteractionMode.AutomatedAction);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
var targetPrefab = UnityEditor.PrefabUtility.GetPrefabParent(gameObject) as GameObject;
|
||||||
|
if (targetPrefab != null)
|
||||||
|
{
|
||||||
|
//UnityEditor.Prefab
|
||||||
|
UnityEditor.PrefabUtility.ReplacePrefab(gameObject, targetPrefab);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
static void GenerateLightmapInfo(GameObject root, List<RendererInfo> rendererInfos, List<Texture2D> lightmaps, List<Texture2D> lightmapsDir, List<Texture2D> shadowMasks, List<LightInfo> lightsInfo)
|
||||||
|
{
|
||||||
|
var renderers = root.GetComponentsInChildren<MeshRenderer>();
|
||||||
|
foreach (MeshRenderer renderer in renderers)
|
||||||
|
{
|
||||||
|
if (renderer.lightmapIndex != -1)
|
||||||
|
{
|
||||||
|
RendererInfo info = new RendererInfo();
|
||||||
|
info.renderer = renderer;
|
||||||
|
|
||||||
|
if (renderer.lightmapScaleOffset != Vector4.zero)
|
||||||
|
{
|
||||||
|
//1ibrium's pointed out this issue : https://docs.unity3d.com/ScriptReference/Renderer-lightmapIndex.html
|
||||||
|
if(renderer.lightmapIndex < 0 || renderer.lightmapIndex == 0xFFFE) continue;
|
||||||
|
info.lightmapOffsetScale = renderer.lightmapScaleOffset;
|
||||||
|
|
||||||
|
Texture2D lightmap = LightmapSettings.lightmaps[renderer.lightmapIndex].lightmapColor;
|
||||||
|
Texture2D lightmapDir = LightmapSettings.lightmaps[renderer.lightmapIndex].lightmapDir;
|
||||||
|
Texture2D shadowMask = LightmapSettings.lightmaps[renderer.lightmapIndex].shadowMask;
|
||||||
|
|
||||||
|
info.lightmapIndex = lightmaps.IndexOf(lightmap);
|
||||||
|
if (info.lightmapIndex == -1)
|
||||||
|
{
|
||||||
|
info.lightmapIndex = lightmaps.Count;
|
||||||
|
lightmaps.Add(lightmap);
|
||||||
|
lightmapsDir.Add(lightmapDir);
|
||||||
|
shadowMasks.Add(shadowMask);
|
||||||
|
}
|
||||||
|
|
||||||
|
rendererInfos.Add(info);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var lights = root.GetComponentsInChildren<Light>(true);
|
||||||
|
|
||||||
|
foreach (Light l in lights)
|
||||||
|
{
|
||||||
|
LightInfo lightInfo = new LightInfo();
|
||||||
|
lightInfo.light = l;
|
||||||
|
lightInfo.lightmapBaketype = (int)l.lightmapBakeType;
|
||||||
|
#if UNITY_2020_1_OR_NEWER
|
||||||
|
lightInfo.mixedLightingMode = (int)UnityEditor.Lightmapping.lightingSettings.mixedBakeMode;
|
||||||
|
#elif UNITY_2018_1_OR_NEWER
|
||||||
|
lightInfo.mixedLightingMode = (int)UnityEditor.LightmapEditorSettings.mixedBakeMode;
|
||||||
|
#else
|
||||||
|
lightInfo.mixedLightingMode = (int)l.bakingOutput.lightmapBakeType;
|
||||||
|
#endif
|
||||||
|
lightsInfo.Add(lightInfo);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
}
|
11
Assets/Script/Essential/PrefabLightmapData.cs.meta
Normal file
11
Assets/Script/Essential/PrefabLightmapData.cs.meta
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1886bb2d2d9d85f4b9fc5dfeb8d68f50
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -6,7 +6,7 @@
|
|||||||
],
|
],
|
||||||
"includePlatforms": [],
|
"includePlatforms": [],
|
||||||
"excludePlatforms": [],
|
"excludePlatforms": [],
|
||||||
"allowUnsafeCode": false,
|
"allowUnsafeCode": true,
|
||||||
"overrideReferences": false,
|
"overrideReferences": false,
|
||||||
"precompiledReferences": [],
|
"precompiledReferences": [],
|
||||||
"autoReferenced": true,
|
"autoReferenced": true,
|
||||||
|
@ -3,6 +3,8 @@ using System.Collections.Generic;
|
|||||||
using System.IO.MemoryMappedFiles;
|
using System.IO.MemoryMappedFiles;
|
||||||
using System.Security.Principal;
|
using System.Security.Principal;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System;
|
||||||
|
|
||||||
public class IPCManager : MonoBehaviour
|
public class IPCManager : MonoBehaviour
|
||||||
{
|
{
|
||||||
@ -46,11 +48,22 @@ public class IPCManager : MonoBehaviour
|
|||||||
public static byte[] GetLightData()
|
public static byte[] GetLightData()
|
||||||
{
|
{
|
||||||
EnsureInitialization();
|
EnsureInitialization();
|
||||||
byte[] bytes = new byte[1920];
|
//byte[] bytes = new byte[1920];
|
||||||
IPCManager.sharedBufferAccessor.ReadArray<byte>(244, bytes, 0, 1920);
|
//IPCManager.sharedBufferAccessor.ReadArray<byte>(244, bytes, 0, 1920);
|
||||||
if (bytes[3] == 0)
|
//if (bytes[3] == 0)
|
||||||
return null;
|
//return null;
|
||||||
return bytes;
|
return ReadBytes(244, 1920);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Source: https://stackoverflow.com/questions/7956167/how-can-i-quickly-read-bytes-from-a-memory-mapped-file-in-net/7956222#7956222
|
||||||
|
private static unsafe byte[] ReadBytes(int offset, int num)
|
||||||
|
{
|
||||||
|
byte[] arr = new byte[num];
|
||||||
|
byte *ptr = (byte*)0;
|
||||||
|
sharedBufferAccessor.SafeMemoryMappedViewHandle.AcquirePointer(ref ptr);
|
||||||
|
Marshal.Copy(IntPtr.Add(new IntPtr(ptr), offset), arr, 0, num);
|
||||||
|
sharedBufferAccessor.SafeMemoryMappedViewHandle.ReleasePointer();
|
||||||
|
return arr;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDestroy() {
|
private void OnDestroy() {
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
],
|
],
|
||||||
"includePlatforms": [],
|
"includePlatforms": [],
|
||||||
"excludePlatforms": [],
|
"excludePlatforms": [],
|
||||||
"allowUnsafeCode": false,
|
"allowUnsafeCode": true,
|
||||||
"overrideReferences": false,
|
"overrideReferences": false,
|
||||||
"precompiledReferences": [],
|
"precompiledReferences": [],
|
||||||
"autoReferenced": true,
|
"autoReferenced": true,
|
||||||
|
@ -57,20 +57,27 @@ public class LightManager : MonoBehaviour
|
|||||||
if (IPCManager.sharedBuffer != null)
|
if (IPCManager.sharedBuffer != null)
|
||||||
{
|
{
|
||||||
GetTextureFromBytes(IPCManager.GetLightData());
|
GetTextureFromBytes(IPCManager.GetLightData());
|
||||||
if (!isIPCIdle)
|
if (isIPCIdle)
|
||||||
UpdateLED();
|
return;
|
||||||
|
UpdateLED();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
isIPCIdle = true;
|
isIPCIdle = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void CheckIPCState(byte[] data)
|
private bool CheckIPCState(byte[] data)
|
||||||
{
|
{
|
||||||
if (data[3] == 0)
|
if (data[3] == 0)
|
||||||
|
{
|
||||||
isIPCIdle = true;
|
isIPCIdle = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
isIPCIdle = false;
|
isIPCIdle = false;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateLED()
|
private void UpdateLED()
|
||||||
@ -90,14 +97,16 @@ public class LightManager : MonoBehaviour
|
|||||||
}
|
}
|
||||||
void GetTextureFromBytes(byte[] bytes)
|
void GetTextureFromBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
if (bytes != null && bytes.Length == 1920)
|
if (bytes == null || bytes.Length != 1920)
|
||||||
{
|
return;
|
||||||
CheckIPCState(bytes);
|
|
||||||
var newbytes = new byte[1920];
|
if (CheckIPCState(bytes))
|
||||||
newbytes = bytes;
|
return;
|
||||||
RGBColor2D.LoadRawTextureData(newbytes);
|
var newbytes = new byte[1920];
|
||||||
RGBColor2D.Apply();
|
newbytes = bytes;
|
||||||
}
|
RGBColor2D.LoadRawTextureData(newbytes);
|
||||||
|
RGBColor2D.Apply();
|
||||||
|
|
||||||
}
|
}
|
||||||
public void UpdateFadeLight(int Area, bool State)
|
public void UpdateFadeLight(int Area, bool State)
|
||||||
{
|
{
|
||||||
|
Binary file not shown.
@ -796,7 +796,7 @@ PlayerSettings:
|
|||||||
managedStrippingLevel: {}
|
managedStrippingLevel: {}
|
||||||
incrementalIl2cppBuild: {}
|
incrementalIl2cppBuild: {}
|
||||||
suppressCommonWarnings: 1
|
suppressCommonWarnings: 1
|
||||||
allowUnsafeCode: 0
|
allowUnsafeCode: 1
|
||||||
useDeterministicCompilation: 1
|
useDeterministicCompilation: 1
|
||||||
enableRoslynAnalyzers: 1
|
enableRoslynAnalyzers: 1
|
||||||
additionalIl2CppArgs:
|
additionalIl2CppArgs:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user