some unity metadata

Merge remote-tracking branch 'origin/Assets' into Assets
# Conflicts: # Assets/Materials/LaserCutter.meta # Assets/Materials/LaserCutter/laser_cutter-Body.mat.meta # Assets/Materials/LaserCutter/laser_cutter-Posts.mat.meta # Assets/Materials/LaserCutter/laser_cutter-Wheels.mat.meta # Assets/Models/Blender/laser_cutter.mtl.meta # Assets/Models/Blender/laser_cutter.obj.meta # Assets/Texture/LaserCutter/LaserCutterInteriorBack.jpg.meta # Assets/Texture/LaserCutter/LaserCutterInteriorLeft.jpg.meta # Assets/Texture/LaserCutter/LaserCutterInteriorRight.jpg.meta
2023-01-23 10:51:12 +01:00 · 2023-01-23 10:45:24 +01:00 · 2023-01-23 10:44:35 +01:00
18 changed files with 255 additions and 126 deletions
--- a/Assets/Materials/LaserCutter.meta
+++ b/Assets/Materials/LaserCutter.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e6583a9499943774c9d6db21359da11d
+guid: 0565ce66c9d0e571680122f9395ec89a
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Materials/LaserCutter/laser_cutter-Body.mat.meta
+++ b/Assets/Materials/LaserCutter/laser_cutter-Body.mat.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ed4f1cda98d0c7e4c8f23c623b560696
+guid: 42876ddafe2b30a498b3c25c28ef24b0
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Materials/LaserCutter/laser_cutter-ButtonPanel.mat
+++ b/Assets/Materials/LaserCutter/laser_cutter-ButtonPanel.mat
@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: laser_cutter-ButtonPanel
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/Materials/LaserCutter/laser_cutter-ButtonPanel.mat.meta
+++ b/Assets/Materials/LaserCutter/laser_cutter-ButtonPanel.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8507992916c343d8883329a9d21f0928
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Materials/LaserCutter/laser_cutter-Posts.mat.meta
+++ b/Assets/Materials/LaserCutter/laser_cutter-Posts.mat.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5ce3110ad503ad646ac8cd8304b5dbf0
+guid: 690bb451a1ce88241b56ed6e641247af
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Materials/LaserCutter/laser_cutter-Wheels.mat.meta
+++ b/Assets/Materials/LaserCutter/laser_cutter-Wheels.mat.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fed0ddc1cad7a7848a49aeeae1239658
+guid: e91f3f2b6e33e17b9993af2a1124fd9f
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Models/Blender/laser_cutter.blend
+++ b/Assets/Models/Blender/laser_cutter.blend
--- a/Assets/Models/Blender/laser_cutter.mtl.meta
+++ b/Assets/Models/Blender/laser_cutter.mtl.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ad85f65860b9f4340a9d8a2cd711ff6f
+guid: 5b32d84d1cbba4290aa6b01ea9377c2e
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Models/Blender/laser_cutter.obj
+++ b/Assets/Models/Blender/laser_cutter.obj
--- a/Assets/Models/Blender/laser_cutter.obj.meta
+++ b/Assets/Models/Blender/laser_cutter.obj.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f094d17760f73b04cadf055698f721fd
+guid: cf47aef537859b89ea97b522c1589dbf
 ModelImporter:
  serializedVersion: 21300
  internalIDToNameTable: []
--- a/Assets/Models/laser_cutter.prefab
+++ b/Assets/Models/laser_cutter.prefab
@ -0,0 +1,126 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2678859593160277280
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3343615099775969178}
+  m_Layer: 0
+  m_Name: laser_cutter
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3343615099775969178
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2678859593160277280}
+  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2744622938996758210}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6386371981697369593
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2744622938996758210}
+  - component: {fileID: 1063398551191056264}
+  - component: {fileID: 4603885499710130972}
+  m_Layer: 0
+  m_Name: default
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2744622938996758210
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6386371981697369593}
+  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3343615099775969178}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1063398551191056264
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6386371981697369593}
+  m_Mesh: {fileID: -2432090755550338912, guid: cf47aef537859b89ea97b522c1589dbf, type: 3}
+--- !u!23 &4603885499710130972
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6386371981697369593}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: -9103484930961366303, guid: cf47aef537859b89ea97b522c1589dbf, type: 3}
+  - {fileID: 6983278257085874902, guid: cf47aef537859b89ea97b522c1589dbf, type: 3}
+  - {fileID: 8046040744853828366, guid: cf47aef537859b89ea97b522c1589dbf, type: 3}
+  - {fileID: 5226861938231596223, guid: cf47aef537859b89ea97b522c1589dbf, type: 3}
+  - {fileID: 8895646964708682677, guid: cf47aef537859b89ea97b522c1589dbf, type: 3}
+  - {fileID: 4648280614667006464, guid: cf47aef537859b89ea97b522c1589dbf, type: 3}
+  - {fileID: 2100000, guid: 690bb451a1ce88241b56ed6e641247af, type: 2}
+  - {fileID: 2100000, guid: e91f3f2b6e33e17b9993af2a1124fd9f, type: 2}
+  - {fileID: 2100000, guid: 8507992916c343d8883329a9d21f0928, type: 2}
+  - {fileID: 2100000, guid: e7f8455d46288cb12b49d5367b543018, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
--- a/Assets/Materials/LaserCutter/Circuitboard.meta
+++ b/Assets/Materials/LaserCutter/Circuitboard.meta
@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: 0c4061bc82225b74489c77b544450c46
-folderAsset: yes
-DefaultImporter:
+guid: 892394266f9599a7794a3f6fc9f867fb
+PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/Texture/LaserCutter/LaserCutterInteriorBack.jpg.meta
+++ b/Assets/Texture/LaserCutter/LaserCutterInteriorBack.jpg.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: efb0b5fe55ed0a546aa22d62baed71ac
+guid: f034897ff47e0b5ae9a69dc5c75ff1b6
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@ -101,30 +101,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    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: 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 +113,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/Texture/LaserCutter/LaserCutterInteriorLeft.jpg.meta
+++ b/Assets/Texture/LaserCutter/LaserCutterInteriorLeft.jpg.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 99a369249920b2941a991b5afe4d47ae
+guid: b234aae5e2d520c7aa5481be0a9f83f7
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@ -101,30 +101,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    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: 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 +113,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/Texture/LaserCutter/LaserCutterInteriorRight.jpg.meta
+++ b/Assets/Texture/LaserCutter/LaserCutterInteriorRight.jpg.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e11462d80a13afe41b8664f7e6f5f9f7
+guid: 77e57837406920d1b95be1431cfb35c8
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@ -101,30 +101,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    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: 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 +113,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/Texture/Pot_Occlusion.png.meta
+++ b/Assets/Texture/Pot_Occlusion.png.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 90a94831c54b1d94c809633460b7cd23
+guid: b7f9cc649b0b9e4c0ae43f26dfdb638f
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@ -101,6 +101,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    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/Texture/Ultimaker_occlusion.png.meta
+++ b/Assets/Texture/Ultimaker_occlusion.png.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3f329616a16a9b54bb92813ac2048319
+guid: 7c2d32ad24dd6c3549d1abbab448e26e
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@ -101,6 +101,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    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/XR/Settings/Open
+++ b/Assets/XR/Settings/Open
@ -18,6 +18,6 @@ MonoBehaviour:
  StereoRenderingMode: 1
  InitializationType: 1
  EditorAppKey: application.generated.unity.unity3dtemplate.exe
-  ActionManifestFileRelativeFilePath: StreamingAssets\SteamVR\actions.json
+  ActionManifestFileRelativeFilePath: StreamingAssets/SteamVR/actions.json
  MirrorView: 2
  HasCopiedDefaults: 0