cgvr/DeltaVR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General Scene improvements

Browse Source
This commit is contained in:
Toomas Tamm 2021-01-27 20:14:48 +02:00
parent 1f0a201fab
commit ba4b29fcf9
15 changed files with 12186 additions and 10170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/Materials/Building/Classroom_Floor.mat
View File

@ -64,12 +64,27 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1

126
Assets/Materials/Building/Outdoors Light Emissive.mat Normal file
View File

@ -0,0 +1,126 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8227551802945252987
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Outdoors Light Emissive
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _EMISSION _SPECULAR_SETUP
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
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}
- _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}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
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: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 0
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 5.992157, g: 5.992157, b: 5.992157, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

8
Assets/Materials/Building/Outdoors Light Emissive.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f932b5ae1a8597e47bdbca461b915304
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

72
Assets/Objects (Prefabs)/Doors/Static_Indoor_Door Variant.prefab
View File

@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 619810116}
- component: {fileID: 619810118}
- component: {fileID: 619810117}
- component: {fileID: 693215315}
m_Layer: 0
m_Name: Top Wall
m_TagString: Untagged
@ -27,8 +28,8 @@ Transform:
m_GameObject: {fileID: 619810115}
m_LocalRotation: {x: -0.000000119209275, y: 0.00000008115275, z: -0.00000025602202,
w: 1}
m_LocalPosition: {x: 0.001, y: 0.6011, z: -0}
m_LocalScale: {x: 1.01, y: 0.2, z: 7.2}
m_LocalPosition: {x: 0.001, y: 0.6044, z: -0}
m_LocalScale: {x: 1.01, y: 0.215, z: 7.2}
m_Children: []
m_Father: {fileID: 2389456291377549788}
m_RootOrder: 3
@ -82,6 +83,20 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &693215315
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 619810115}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1858704533180397902
GameObject:
m_ObjectHideFlags: 0
@ -93,6 +108,7 @@ GameObject:
- component: {fileID: 7891889436999084938}
- component: {fileID: 34540231478969632}
- component: {fileID: 1331482666335168784}
- component: {fileID: 906220286}
m_Layer: 0
m_Name: Right wall
m_TagString: Untagged
@ -109,8 +125,8 @@ Transform:
m_GameObject: {fileID: 1858704533180397902}
m_LocalRotation: {x: -0.000000119209275, y: 0.00000008115275, z: -0.00000025602202,
w: 1}
m_LocalPosition: {x: 0.58805525, y: 0.101194546, z: 0.00000006009266}
m_LocalScale: {x: 0.17, y: 1.2, z: 7.2}
m_LocalPosition: {x: 0.59098923, y: 0.06190014, z: -0.000003845461}
m_LocalScale: {x: 0.17, y: 1.3, z: 7.2}
m_Children: []
m_Father: {fileID: 2389456291377549788}
m_RootOrder: 2
@ -164,6 +180,20 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &906220286
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1858704533180397902}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &2376408783022628303
GameObject:
m_ObjectHideFlags: 0
@ -218,6 +248,7 @@ GameObject:
- component: {fileID: 1141650349950631806}
- component: {fileID: 6318928237655510687}
- component: {fileID: 8567072198544535915}
- component: {fileID: 932084705}
m_Layer: 0
m_Name: VR-door
m_TagString: Untagged
@ -289,6 +320,20 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &932084705
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7524997068079331246}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &7641886289678632063
GameObject:
m_ObjectHideFlags: 0
@ -381,6 +426,7 @@ GameObject:
- component: {fileID: 8958824632396726195}
- component: {fileID: 412610394335443936}
- component: {fileID: 7884199987669606180}
- component: {fileID: 215482987}
m_Layer: 0
m_Name: Left Wall
m_TagString: Untagged
@ -397,8 +443,8 @@ Transform:
m_GameObject: {fileID: 8583638621924436570}
m_LocalRotation: {x: -0.000000119209275, y: 0.00000008115275, z: -0.00000025602202,
w: 1}
m_LocalPosition: {x: -0.7219705, y: 0.100470245, z: 0.000000030042663}
m_LocalScale: {x: 0.44, y: 1.2, z: 7.2}
m_LocalPosition: {x: -0.7239976, y: 0.061900616, z: -0.000003845461}
m_LocalScale: {x: 0.44, y: 1.3, z: 7.2}
m_Children: []
m_Father: {fileID: 2389456291377549788}
m_RootOrder: 1
@ -452,3 +498,17 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &215482987
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8583638621924436570}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}

5
Assets/Objects (Prefabs)/Furniture_Inside/EM-18_whiteboard.prefab
View File

@ -16,7 +16,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &6305375786439597246
Transform:
@ -55,11 +55,11 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 018552b038f019a4fa80799969502870, type: 2}
- {fileID: 2100000, guid: 018552b038f019a4fa80799969502870, type: 2}
- {fileID: 2100000, guid: d948c8793afe9a24780ad76c0de6bd23, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
@ -81,3 +81,4 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}

BIN
Assets/Other/Delta (Toomas) v0.blend (Stored with Git LFS)
View File

Binary file not shown.

BIN
Assets/Other/Delta (Toomas) v0.blend1
View File

Binary file not shown.

1985
Assets/Scenes/Main_scene.unity
View File

File diff suppressed because it is too large Load Diff

68
Assets/Scenes/Main_scene/Global Volume Profile.asset Normal file
View File

@ -0,0 +1,68 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7690227352939379121
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3}
m_Name: Bloom
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
threshold:
m_OverrideState: 1
m_Value: 4
min: 0
intensity:
m_OverrideState: 1
m_Value: 1
min: 0
scatter:
m_OverrideState: 0
m_Value: 0.276
min: 0
max: 1
clamp:
m_OverrideState: 0
m_Value: 65472
min: 0
tint:
m_OverrideState: 0
m_Value: {r: 1, g: 1, b: 1, a: 1}
hdr: 0
showAlpha: 0
showEyeDropper: 1
highQualityFiltering:
m_OverrideState: 1
m_Value: 1
skipIterations:
m_OverrideState: 0
m_Value: 0
min: 0
max: 16
dirtTexture:
m_OverrideState: 0
m_Value: {fileID: 0}
dirtIntensity:
m_OverrideState: 0
m_Value: 0
min: 0
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: Global Volume Profile
m_EditorClassIdentifier:
components:
- {fileID: -7690227352939379121}

8
Assets/Scenes/Main_scene/Global Volume Profile.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1de6d79d223bab44d837d44a1fc8f706
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/Main_scene/LightingData.asset
View File

Binary file not shown.

20036
Assets/Scenes/Main_scene/OcclusionCullingData.asset
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Scenes/Main_scene/ReflectionProbe-0.exr
View File

Binary file not shown.

27
Assets/URP/UniversalRenderPipelineAsset_Renderer.asset
View File

@ -1,5 +1,27 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-5761594705813018824
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3}
m_Name: ScreenSpaceAmbientOcclusion
m_EditorClassIdentifier:
m_Active: 1
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
m_Settings:
Downsample: 0
Source: 1
NormalSamples: 1
Intensity: 3
DirectLightingStrength: 0.25
Radius: 0.035
SampleCount: 6
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@ -12,8 +34,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
m_Name: UniversalRenderPipelineAsset_Renderer
m_EditorClassIdentifier:
m_RendererFeatures: []
m_RendererFeatureMap:
m_RendererFeatures:
- {fileID: -5761594705813018824}
m_RendererFeatureMap: 38673e2c24b40ab0
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
shaders:

2
Packages/packages-lock.json
View File

@ -196,7 +196,7 @@
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.subsystemregistration": "1.0.6"
"com.unity.subsystemregistration": "1.0.5"
},
"url": "https://packages.unity.com"
},