fix walls for the 5th fucking time

merge
fix assets for lighting
2023-01-26 15:18:48 +01:00 · 2023-01-26 15:16:56 +01:00 · 2023-01-26 15:14:34 +01:00
13 changed files with 736 additions and 569 deletions
--- a/Assets/Models/Blender/Base_Station.blend.meta
+++ b/Assets/Models/Blender/Base_Station.blend.meta
@ -32,7 +32,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 1
+    isReadable: 0
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/shelf.blend.meta
+++ b/Assets/Models/Blender/shelf.blend.meta
@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: 7872fdb3a4e3059189918ec37835ceaf
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    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: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/laser_cutter
+++ b/Assets/Models/laser_cutter
@ -0,0 +1,120 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &4313590370818001808
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1.2375174
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 5.514353
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -15.980917
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_Materials.Array.data[6]
+      value: 
+      objectReference: {fileID: 1379711075021050917, guid: 5418bb5e5c84f514a8af64db2f8d7445, type: 3}
+    - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_Materials.Array.data[7]
+      value: 
+      objectReference: {fileID: -1362402942781197322, guid: 5418bb5e5c84f514a8af64db2f8d7445, type: 3}
+    - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_Materials.Array.data[8]
+      value: 
+      objectReference: {fileID: -7252675926552702154, guid: 5418bb5e5c84f514a8af64db2f8d7445, type: 3}
+    - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_Materials.Array.data[9]
+      value: 
+      objectReference: {fileID: 2100000, guid: e7f8455d46288cb12b49d5367b543018, type: 2}
+    - target: {fileID: 919132149155446097, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_Name
+      value: laser_cutter Variant
+      objectReference: {fileID: 0}
+    - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.305
+      objectReference: {fileID: 0}
+    - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.356
+      objectReference: {fileID: 0}
+    - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.70710677
+      objectReference: {fileID: 0}
+    - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+--- !u!1 &3971500078747236033 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f094d17760f73b04cadf055698f721fd, type: 3}
+  m_PrefabInstance: {fileID: 4313590370818001808}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1703295072119626799
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3971500078747236033}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  combinedBounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  wallMount: 0
--- a/Assets/Models/laser_cutter
+++ b/Assets/Models/laser_cutter
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b193c053d289cac43b3ddd2b6c501447
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/FabLab/FabLab.unity
+++ b/Assets/Scenes/FabLab/FabLab.unity
--- a/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png.meta
+++ b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png.meta
@ -7,7 +7,7 @@ TextureImporter:
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
-    sRGBTexture: 0
+    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
  ignoreMasterTextureLimit: 0
@ -34,11 +34,11 @@ TextureImporter:
  textureSettings:
    serializedVersion: 2
    filterMode: 1
-    aniso: 3
+    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
@ -53,7 +53,7 @@ TextureImporter:
  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 12
+  textureType: 0
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
@ -70,7 +70,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 2
+    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@ -113,18 +113,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    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: WebGL
    maxTextureSize: 2048
@ -137,18 +125,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    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: []
--- a/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr.meta
+++ b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr.meta
@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
  ignoreMasterTextureLimit: 0
@ -34,11 +34,11 @@ TextureImporter:
  textureSettings:
    serializedVersion: 2
    filterMode: 1
-    aniso: 3
+    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
@ -50,10 +50,10 @@ TextureImporter:
  spritePixelsToUnits: 100
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
+  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 6
+  textureType: 0
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
@ -70,7 +70,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 2
+    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@ -113,18 +113,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    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: WebGL
    maxTextureSize: 2048
@ -137,18 +125,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    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: []
--- a/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png.meta
+++ b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png.meta
@ -7,7 +7,7 @@ TextureImporter:
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
-    sRGBTexture: 0
+    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
  ignoreMasterTextureLimit: 0
@ -34,11 +34,11 @@ TextureImporter:
  textureSettings:
    serializedVersion: 2
    filterMode: 1
-    aniso: 3
+    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
@ -53,7 +53,7 @@ TextureImporter:
  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 12
+  textureType: 0
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
@ -70,7 +70,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 2
+    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@ -113,18 +113,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    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: WebGL
    maxTextureSize: 2048
@ -137,18 +125,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    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: []
--- a/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr.meta
+++ b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr.meta
@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
  ignoreMasterTextureLimit: 0
@ -34,11 +34,11 @@ TextureImporter:
  textureSettings:
    serializedVersion: 2
    filterMode: 1
-    aniso: 3
+    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
@ -50,10 +50,10 @@ TextureImporter:
  spritePixelsToUnits: 100
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
+  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 6
+  textureType: 0
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
@ -70,7 +70,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 2
+    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@ -113,18 +113,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    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: WebGL
    maxTextureSize: 2048
@ -137,18 +125,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    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: []
--- a/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png.meta
+++ b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png.meta
@ -7,7 +7,7 @@ TextureImporter:
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
-    sRGBTexture: 0
+    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
  ignoreMasterTextureLimit: 0
@ -34,11 +34,11 @@ TextureImporter:
  textureSettings:
    serializedVersion: 2
    filterMode: 1
-    aniso: 3
+    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
@ -53,7 +53,7 @@ TextureImporter:
  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 12
+  textureType: 0
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
@ -70,7 +70,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 2
+    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@ -113,18 +113,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    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: WebGL
    maxTextureSize: 2048
@ -137,18 +125,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    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: []
--- a/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr.meta
+++ b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr.meta
@ -21,7 +21,7 @@ TextureImporter:
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
  ignoreMasterTextureLimit: 0
@ -34,11 +34,11 @@ TextureImporter:
  textureSettings:
    serializedVersion: 2
    filterMode: 1
-    aniso: 3
+    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
@ -50,10 +50,10 @@ TextureImporter:
  spritePixelsToUnits: 100
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
+  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 6
+  textureType: 0
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
@ -70,7 +70,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 2
+    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@ -113,18 +113,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    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: WebGL
    maxTextureSize: 2048
@ -137,18 +125,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    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: []
--- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta
+++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta
@ -27,18 +27,18 @@ TextureImporter:
  ignoreMasterTextureLimit: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
+  cubemapConvolution: 0
+  seamlessCubemap: 0
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
+    filterMode: 1
+    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
@ -54,7 +54,7 @@ TextureImporter:
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
  textureType: 0
-  textureShape: 2
+  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
  flipbookColumns: 1
@ -71,7 +71,7 @@ TextureImporter:
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
-    compressionQuality: 100
+    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
@ -113,18 +113,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    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: WebGL
    maxTextureSize: 2048
@ -137,18 +125,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    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: []
--- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr.meta
+++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr.meta
@ -27,18 +27,18 @@ TextureImporter:
  ignoreMasterTextureLimit: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
+  cubemapConvolution: 0
+  seamlessCubemap: 0
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
+    filterMode: 1
+    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
@ -54,7 +54,7 @@ TextureImporter:
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
  textureType: 0
-  textureShape: 2
+  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
  flipbookColumns: 1
@ -71,7 +71,7 @@ TextureImporter:
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
-    compressionQuality: 100
+    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
@ -113,18 +113,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    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: WebGL
    maxTextureSize: 2048
@ -137,18 +125,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    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: []
Author	SHA1	Message	Date
Legonzaur	7bd6a33505	fix walls for the 5th fucking time	2023-01-26 15:18:48 +01:00
Legonzaur	8337bfc714	merge	2023-01-26 15:16:56 +01:00
Legonzaur	f62db944f5	fix assets for lighting	2023-01-26 15:14:34 +01:00