Merge branch 'master' into programming

2025-05-13 13:22:46 +02:00 · 2025-05-13 13:22:46 +02:00 · f8638091ae
commit f8638091ae
parent 2f7f9b2bec 4a9836f207
23 changed files with 1700357 additions and 1244 deletions
--- a/Viagg-io/Assets/LoadingScreenContent/background-hemisphere-schiefer-1.jpg.meta
+++ b/Viagg-io/Assets/LoadingScreenContent/background-hemisphere-schiefer-1.jpg.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Viagg-io/Assets/Models/textures/RockDark001_COL_VAR1_6K.jpg.meta
+++ b/Viagg-io/Assets/Models/textures/RockDark001_COL_VAR1_6K.jpg.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Viagg-io/Assets/Models/textures/RockDark001_DISP_6K.jpg.meta
+++ b/Viagg-io/Assets/Models/textures/RockDark001_DISP_6K.jpg.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Viagg-io/Assets/Models/textures/RockDark001_GLOSS_6K.jpg.meta
+++ b/Viagg-io/Assets/Models/textures/RockDark001_GLOSS_6K.jpg.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Viagg-io/Assets/Models/textures/RockDark001_NRM_6K.jpg.meta
+++ b/Viagg-io/Assets/Models/textures/RockDark001_NRM_6K.jpg.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Viagg-io/Assets/Models/textures/sbb-monitor-bellinzona.jpg.meta
+++ b/Viagg-io/Assets/Models/textures/sbb-monitor-bellinzona.jpg.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Viagg-io/Assets/Models/textures/sbb-monitor-poschiavo.jpg.meta
+++ b/Viagg-io/Assets/Models/textures/sbb-monitor-poschiavo.jpg.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Viagg-io/Assets/Models/textures/sponsoren-panel.png.meta
+++ b/Viagg-io/Assets/Models/textures/sponsoren-panel.png.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Viagg-io/Assets/Packages/Addons/VrTemplate/Settings/Project
+++ b/Viagg-io/Assets/Packages/Addons/VrTemplate/Settings/Project
@ -20,7 +20,7 @@ MonoBehaviour:
  - {fileID: 11400000, guid: 53a413327819a984d8ab1618c9e90a10, type: 2}
  m_DefaultRendererIndex: 0
  m_RequireDepthTexture: 0
-  m_RequireOpaqueTexture: 1
+  m_RequireOpaqueTexture: 0
  m_OpaqueDownsampling: 1
  m_SupportsTerrainHoles: 0
  m_SupportsHDR: 0
@ -34,7 +34,7 @@ MonoBehaviour:
  m_LODCrossFadeDitheringType: 1
  m_ShEvalMode: 0
  m_MainLightRenderingMode: 1
-  m_MainLightShadowsSupported: 1
+  m_MainLightShadowsSupported: 0
  m_MainLightShadowmapResolution: 4096
  m_AdditionalLightsRenderingMode: 0
  m_AdditionalLightsPerObjectLimit: 1
@ -45,7 +45,7 @@ MonoBehaviour:
  m_AdditionalLightsShadowResolutionTierHigh: 1024
  m_ReflectionProbeBlending: 1
  m_ReflectionProbeBoxProjection: 1
-  m_ShadowDistance: 180
+  m_ShadowDistance: 45
  m_ShadowCascadeCount: 2
  m_Cascade2Split: 0.20172592
  m_Cascade3Split: {x: 0.1, y: 0.3}
@ -82,7 +82,7 @@ MonoBehaviour:
  m_Textures:
    blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
    bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
-  m_PrefilteringModeMainLightShadows: 3
+  m_PrefilteringModeMainLightShadows: 0
  m_PrefilteringModeAdditionalLight: 0
  m_PrefilteringModeAdditionalLightShadows: 0
  m_PrefilterXRKeywords: 0
@ -105,9 +105,9 @@ MonoBehaviour:
  m_PrefilterDBufferMRT2: 1
  m_PrefilterDBufferMRT3: 1
  m_PrefilterSoftShadowsQualityLow: 1
-  m_PrefilterSoftShadowsQualityMedium: 0
+  m_PrefilterSoftShadowsQualityMedium: 1
  m_PrefilterSoftShadowsQualityHigh: 1
-  m_PrefilterSoftShadows: 1
+  m_PrefilterSoftShadows: 0
  m_PrefilterScreenCoord: 1
  m_PrefilterNativeRenderPass: 1
  m_ShaderVariantLogLevel: 0
--- a/Viagg-io/Assets/Prefabs/SBB/VideoSphere.prefab
+++ b/Viagg-io/Assets/Prefabs/SBB/VideoSphere.prefab
@ -147,8 +147,8 @@ MonoBehaviour:
  _renderer: {fileID: 0}
  _materialIndex: -1
  _texturePropertyName: _MainTex
-  _offset: {x: 0, y: 0.06}
-  _scale: {x: 1, y: 2}
+  _offset: {x: 0, y: 0}
+  _scale: {x: 1, y: 1}
 --- !u!1001 &7854512575322228497
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -258,8 +258,8 @@ MonoBehaviour:
  _renderer: {fileID: 0}
  _materialIndex: -1
  _texturePropertyName: _MainTex
-  _offset: {x: 0, y: 0.06}
-  _scale: {x: 1, y: 2}
+  _offset: {x: 0, y: 0}
+  _scale: {x: 1, y: 1}
 --- !u!4 &7677068288581886202 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ae93804f77ffc7248ba7d341d7eaef6d, type: 3}
--- a/Viagg-io/Assets/Scenes/0.0-Menu.unity
+++ b/Viagg-io/Assets/Scenes/0.0-Menu.unity
--- a/Viagg-io/Assets/Scenes/1.0-SBB.unity
+++ b/Viagg-io/Assets/Scenes/1.0-SBB.unity
@ -4149,11 +4149,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 638c870cac4da414fba921606d504407, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _mediaSource: 0
+  _mediaSource: 1
  _mediaReference: {fileID: 11400000, guid: 0d696b76d81c0e640a7dbcc2d148b9ec, type: 2}
  _mediaPath:
    _pathType: 2
-    _path: AVProVideoSamples/BigBuckBunny-360p30-H264.mp4
+    _path: MAYBE01_A003C015_241011NB_CANON_LOOP_SLOWED_STABILIZED.mp4
  _fallbackMediaHints:
    transparency: 0
    alphaPacking: 0
@ -6521,7 +6521,7 @@ MonoBehaviour:
  overrideLogStringDisplay: 0
  overrideDebugInternalActive: 0
  overrideDebugChangesActive: 0
-  instanceID: 271808
+  instanceID: 57378
  __behaviourTreeGenerator: {fileID: 0}
  taskScripts:
  - {fileID: 4900000, guid: e058cb28be8d744b98baf62e50716721, type: 3}
--- a/Viagg-io/Assets/Scenes/2.0-SBB.unity
+++ b/Viagg-io/Assets/Scenes/2.0-SBB.unity
@ -20,7 +20,7 @@ RenderSettings:
  m_FogDensity: 0.01
  m_LinearFogStart: 0
  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 1, g: 0.99328667, b: 0.7012578, a: 1}
+  m_AmbientSkyColor: {r: 1, g: 0.9647059, b: 0.8156863, a: 1}
  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
  m_AmbientIntensity: 0.9
@ -1677,11 +1677,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 638c870cac4da414fba921606d504407, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _mediaSource: 0
+  _mediaSource: 1
  _mediaReference: {fileID: 11400000, guid: 0d696b76d81c0e640a7dbcc2d148b9ec, type: 2}
  _mediaPath:
    _pathType: 2
-    _path: AVProVideoSamples/BigBuckBunny-360p30-H264.mp4
+    _path: MAYBE01_A003C015_241011NB_CANON_LOOP_SLOWED_STABILIZED.mp4
  _fallbackMediaHints:
    transparency: 0
    alphaPacking: 0
@ -3502,7 +3502,7 @@ MonoBehaviour:
  overrideLogStringDisplay: 0
  overrideDebugInternalActive: 0
  overrideDebugChangesActive: 0
-  instanceID: 271186
+  instanceID: 71736
  __behaviourTreeGenerator: {fileID: 0}
  taskScripts:
  - {fileID: 4900000, guid: aceafeb25fe43443aa61f49093d6ed3b, type: 3}
@ -3658,7 +3658,7 @@ SceneRoots:
  - {fileID: 529402241}
  - {fileID: 1724280275}
  - {fileID: 722787125}
-  - {fileID: 1167381564}
  - {fileID: 1773513729}
  - {fileID: 2118801653}
  - {fileID: 1552180139}
+  - {fileID: 1167381564}
--- a/Viagg-io/Assets/Scenes/2.8-SBB.unity
+++ b/Viagg-io/Assets/Scenes/2.8-SBB.unity
@ -20,7 +20,7 @@ RenderSettings:
  m_FogDensity: 0.01
  m_LinearFogStart: 0
  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.97838825, g: 1, b: 0.75786155, a: 1}
+  m_AmbientSkyColor: {r: 1, g: 0.9647059, b: 0.8156863, a: 1}
  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
  m_AmbientIntensity: 1
@ -2162,11 +2162,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 638c870cac4da414fba921606d504407, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _mediaSource: 0
+  _mediaSource: 1
  _mediaReference: {fileID: 11400000, guid: 0d696b76d81c0e640a7dbcc2d148b9ec, type: 2}
  _mediaPath:
    _pathType: 2
-    _path: AVProVideoSamples/BigBuckBunny-360p30-H264.mp4
+    _path: MAYBE01_A003C015_241011NB_CANON_LOOP_SLOWED_STABILIZED.mp4
  _fallbackMediaHints:
    transparency: 0
    alphaPacking: 0
@ -2473,7 +2473,7 @@ MonoBehaviour:
  overrideLogStringDisplay: 0
  overrideDebugInternalActive: 0
  overrideDebugChangesActive: 0
-  instanceID: 272330
+  instanceID: 72118
  __behaviourTreeGenerator: {fileID: 0}
  taskScripts:
  - {fileID: 4900000, guid: f4d47cb853c394ac1a896610e13106d5, type: 3}
@ -2858,8 +2858,8 @@ SceneRoots:
  - {fileID: 709561120}
  - {fileID: 1258175242}
  - {fileID: 19878837}
-  - {fileID: 1821304988}
  - {fileID: 1131933172}
  - {fileID: 1846033373}
  - {fileID: 1543503869}
  - {fileID: 666565130}
+  - {fileID: 1821304988}
--- a/Viagg-io/Assets/Scenes/3.0-SBB.unity
+++ b/Viagg-io/Assets/Scenes/3.0-SBB.unity
@ -20,7 +20,7 @@ RenderSettings:
  m_FogDensity: 0.01
  m_LinearFogStart: 0
  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.9974978, g: 1, b: 0.78930813, a: 1}
+  m_AmbientSkyColor: {r: 1, g: 0.9647059, b: 0.8156863, a: 1}
  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
  m_AmbientIntensity: 1
@ -1951,11 +1951,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 638c870cac4da414fba921606d504407, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _mediaSource: 0
+  _mediaSource: 1
  _mediaReference: {fileID: 11400000, guid: 0d696b76d81c0e640a7dbcc2d148b9ec, type: 2}
  _mediaPath:
    _pathType: 2
-    _path: AVProVideoSamples/BigBuckBunny-360p30-H264.mp4
+    _path: MAYBE01_A003C015_241011NB_CANON_LOOP_SLOWED_STABILIZED.mp4
  _fallbackMediaHints:
    transparency: 0
    alphaPacking: 0
@ -4961,7 +4961,7 @@ MonoBehaviour:
  overrideLogStringDisplay: 0
  overrideDebugInternalActive: 0
  overrideDebugChangesActive: 0
-  instanceID: 275038
+  instanceID: 73386
  __behaviourTreeGenerator: {fileID: 0}
  taskScripts:
  - {fileID: 4900000, guid: bfe72e0c00eb4483c8a777b05838f70e, type: 3}
@ -5205,8 +5205,8 @@ SceneRoots:
  - {fileID: 1351909152}
  - {fileID: 898482089}
  - {fileID: 425881597}
-  - {fileID: 748177972}
  - {fileID: 453867106}
  - {fileID: 1276081600}
  - {fileID: 1953914532}
  - {fileID: 940689511}
+  - {fileID: 748177972}
--- a/Viagg-io/Assets/Scenes/3.2-Grotto.unity
+++ b/Viagg-io/Assets/Scenes/3.2-Grotto.unity
--- a/Viagg-io/Assets/Scenes/Test-Scene-Nick.unity
+++ b/Viagg-io/Assets/Scenes/Test-Scene-Nick.unity
--- a/Viagg-io/Assets/StreamingAssets/MAYBE01_A003C015_241011NB_CANON_LOOP_SLOWED_STABILIZED.mp4
+++ b/Viagg-io/Assets/StreamingAssets/MAYBE01_A003C015_241011NB_CANON_LOOP_SLOWED_STABILIZED.mp4
--- a/Viagg-io/Assets/StreamingAssets/MAYBE01_A003C015_241011NB_CANON_LOOP_SLOWED_STABILIZED.mp4.meta
+++ b/Viagg-io/Assets/StreamingAssets/MAYBE01_A003C015_241011NB_CANON_LOOP_SLOWED_STABILIZED.mp4.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 526d5174ea3e52044836bcbea53460b0
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Viagg-io/ProjectSettings/GraphicsSettings.asset
+++ b/Viagg-io/ProjectSettings/GraphicsSettings.asset
@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 14
+  serializedVersion: 15
  m_Deferred:
    m_Mode: 1
    m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@ -13,9 +13,6 @@ GraphicsSettings:
  m_ScreenSpaceShadows:
    m_Mode: 1
    m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
-  m_LegacyDeferred:
-    m_Mode: 1
-    m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
  m_DepthNormals:
    m_Mode: 1
    m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
@ -42,10 +39,8 @@ GraphicsSettings:
  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
  m_PreloadedShaders: []
  m_PreloadShadersBatchTimeLimit: -1
-  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
-    type: 0}
-  m_CustomRenderPipeline: {fileID: 11400000, guid: fd42a132493b1f143a4963adcd530ef1,
-    type: 2}
+  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_CustomRenderPipeline: {fileID: 11400000, guid: fd42a132493b1f143a4963adcd530ef1, type: 2}
  m_TransparencySortMode: 0
  m_TransparencySortAxis: {x: 0, y: 0, z: 1}
  m_DefaultRenderingPath: 1
@ -54,6 +49,7 @@ GraphicsSettings:
  m_LightmapStripping: 0
  m_FogStripping: 0
  m_InstancingStripping: 0
+  m_BrgStripping: 0
  m_LightmapKeepPlain: 1
  m_LightmapKeepDirCombined: 1
  m_LightmapKeepDynamicPlain: 1
@ -69,5 +65,7 @@ GraphicsSettings:
  m_DefaultRenderingLayerMask: 1
  m_LogWhenShaderIsCompiled: 0
  m_SRPDefaultSettings:
-    UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: b14f41a94dde88c4fa9fed9ae80f7362,
-      type: 2}
+    UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: b14f41a94dde88c4fa9fed9ae80f7362, type: 2}
+  m_LightProbeOutsideHullStrategy: 0
+  m_CameraRelativeLightCulling: 0
+  m_CameraRelativeShadowCulling: 0
--- a/Viagg-io/ProjectSettings/QualitySettings.asset
+++ b/Viagg-io/ProjectSettings/QualitySettings.asset
@ -68,7 +68,7 @@ QualitySettings:
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
    shadowmaskMode: 0
    skinWeights: 2
-    globalTextureMipmapLimit: 0
+    globalTextureMipmapLimit: 1
    textureMipmapLimitSettings: []
    anisotropicTextures: 1
    antiAliasing: 4
--- a/Viagg-io/ProjectSettings/ShaderGraphSettings.asset
+++ b/Viagg-io/ProjectSettings/ShaderGraphSettings.asset
@ -14,4 +14,4 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  shaderVariantLimit: 128
  customInterpolatorErrorThreshold: 32
-  customInterpolatorWarningThreshold: 16
+  customInterpolatorWarningThreshold: 8
--- a/Viagg-io/ProjectSettings/TimeManager.asset
+++ b/Viagg-io/ProjectSettings/TimeManager.asset
@ -3,7 +3,7 @@
 --- !u!5 &1
 TimeManager:
  m_ObjectHideFlags: 0
-  Fixed Timestep: 0.02
+  Fixed Timestep: 0.1
  Maximum Allowed Timestep: 0.33333334
  m_TimeScale: 1
-  Maximum Particle Timestep: 0.03
+  Maximum Particle Timestep: 0.1