diff --git a/AR-2/Assets/2a1.unity b/AR-2/Assets/2a1.unity index 4612d79..db25b92 100644 --- a/AR-2/Assets/2a1.unity +++ b/AR-2/Assets/2a1.unity @@ -112,34 +112,12 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!21 &248288122 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!4 &112359502 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, + type: 3} + m_PrefabInstance: {fileID: 1413229053} m_PrefabAsset: {fileID: 0} - m_Name: 'terrain_baseMaterial - - -2496' - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: edd08c3a47d840cdb7c05aabb9e1174f, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: [] - m_Colors: - - _Color: {r: 0.9607843, g: 0.10606851, b: 0.050980415, a: 1} --- !u!1 &267688588 GameObject: m_ObjectHideFlags: 0 @@ -155,7 +133,7 @@ GameObject: - component: {fileID: 267688590} - component: {fileID: 267688589} m_Layer: 0 - m_Name: SomeTarget + m_Name: 2a1_target m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -168,7 +146,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 267688588} - m_Mesh: {fileID: 1279876001} + m_Mesh: {fileID: 1195448431} --- !u!23 &267688590 MeshRenderer: m_ObjectHideFlags: 0 @@ -186,7 +164,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 248288122} + - {fileID: 1197159489} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -261,38 +239,10 @@ Transform: m_LocalPosition: {x: 0.0581, y: 0, z: 0.0589} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: - - {fileID: 4507202128414994126} + - {fileID: 112359502} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &832822420 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 'beerMaterial - - -22350' - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 52dd947ab1b748db935aaac414b79715, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: [] - m_Colors: - - _Color: {r: 0.9607843, g: 0.10606851, b: 0.050980415, a: 1} --- !u!1 &1001315648 GameObject: m_ObjectHideFlags: 0 @@ -405,166 +355,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!43 &1070610565 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ImageTargetMesh-22346 - serializedVersion: 9 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.3975076, y: 0, z: 0.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200020001000300 - m_VertexData: - serializedVersion: 2 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 128 - _typelessdata: 1e86cbbe00000000000000bf000000000000803f0000000000000000000000001e86cbbe000000000000003f000000000000803f00000000000000000000803f1e86cb3e00000000000000bf000000000000803f000000000000803f000000001e86cb3e000000000000003f000000000000803f000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.34927696, y: 0, z: 0.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimized: 0 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1 &1164658098 GameObject: m_ObjectHideFlags: 0 @@ -580,7 +370,7 @@ GameObject: - component: {fileID: 1164658100} - component: {fileID: 1164658099} m_Layer: 0 - m_Name: BeerTarget + m_Name: 2a1_BeerTarget m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -593,7 +383,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1164658098} - m_Mesh: {fileID: 1070610565} + m_Mesh: {fileID: 1973742413} --- !u!23 &1164658100 MeshRenderer: m_ObjectHideFlags: 0 @@ -611,7 +401,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 832822420} + - {fileID: 2015498027} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -690,13 +480,13 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &1279876001 +--- !u!43 &1195448431 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ImageTargetMesh-2492 + m_Name: ImageTargetMesh19282 serializedVersion: 9 m_SubMeshes: - serializedVersion: 2 @@ -839,7 +629,7 @@ Mesh: m_UVInfo: 0 m_LocalAABB: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0, z: 0.5} + m_Extent: {x: 0.5, y: 0, z: 0.49869} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -850,6 +640,103 @@ Mesh: offset: 0 size: 0 path: +--- !u!21 &1197159489 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 'terrain_baseMaterial + + 19292' + m_Shader: {fileID: 4800000, guid: bd60f254bfe034e099e9f70c306d67e7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: edd08c3a47d840cdb7c05aabb9e1174f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] + m_Colors: + - _Color: {r: 0.9607843, g: 0.10606851, b: 0.050980415, a: 1} +--- !u!1001 &1413229053 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 267688594} + m_Modifications: + - target: {fileID: 100002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_Name + value: ruediger_one + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalPosition.y + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalScale.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalScale.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalScale.z + value: 0.2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} --- !u!1 &1778503356 GameObject: m_ObjectHideFlags: 0 @@ -863,7 +750,7 @@ GameObject: - component: {fileID: 1778503359} - component: {fileID: 1778503358} m_Layer: 0 - m_Name: Quad + m_Name: 2a1_Quad m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1079,78 +966,191 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: material: {fileID: 0} ---- !u!1001 &2646610158670304121 -PrefabInstance: +--- !u!43 &1973742413 +Mesh: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 267688594} - m_Modifications: - - target: {fileID: 8736589546794520180, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_Name - value: OptimizedTree - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.01 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3915e8fc8243e427a83acc84292516db, type: 3} ---- !u!4 &4507202128414994126 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - m_PrefabInstance: {fileID: 2646610158670304121} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_Name: ImageTargetMesh19312 + serializedVersion: 9 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.3975076, y: 0, z: 0.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200020001000300 + m_VertexData: + serializedVersion: 2 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 128 + _typelessdata: 1e86cbbe00000000000000bf000000000000803f0000000000000000000000001e86cbbe000000000000003f000000000000803f00000000000000000000803f1e86cb3e00000000000000bf000000000000803f000000000000803f000000001e86cb3e000000000000003f000000000000803f000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.3975076, y: 0, z: 0.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimized: 0 + m_StreamData: + offset: 0 + size: 0 + path: +--- !u!21 &2015498027 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 'beerMaterial + + 19322' + m_Shader: {fileID: 4800000, guid: bd60f254bfe034e099e9f70c306d67e7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 52dd947ab1b748db935aaac414b79715, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] + m_Colors: + - _Color: {r: 0.9607843, g: 0.10606851, b: 0.050980415, a: 1} diff --git a/AR-2/Assets/2a2.unity b/AR-2/Assets/2a2.unity index 22dd0a6..d37af0f 100644 --- a/AR-2/Assets/2a2.unity +++ b/AR-2/Assets/2a2.unity @@ -112,34 +112,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!21 &248288122 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 'terrain_baseMaterial - - -2496' - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: edd08c3a47d840cdb7c05aabb9e1174f, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: [] - m_Colors: - - _Color: {r: 0.9607843, g: 0.10606851, b: 0.050980415, a: 1} --- !u!1 &267688588 GameObject: m_ObjectHideFlags: 0 @@ -155,7 +127,7 @@ GameObject: - component: {fileID: 267688590} - component: {fileID: 267688589} m_Layer: 0 - m_Name: SomeTarget + m_Name: 2a2_SomeTarget m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -168,7 +140,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 267688588} - m_Mesh: {fileID: 1279876001} + m_Mesh: {fileID: 1424588156} --- !u!23 &267688590 MeshRenderer: m_ObjectHideFlags: 0 @@ -186,7 +158,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 248288122} + - {fileID: 605046387} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -261,11 +233,11 @@ Transform: m_LocalPosition: {x: 0.0581, y: 0, z: 0.0589} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: - - {fileID: 4507202128414994126} + - {fileID: 736874037} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &832822420 +--- !u!21 &411919156 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -274,8 +246,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 'beerMaterial - -22350' - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + 19912' + m_Shader: {fileID: 4800000, guid: bd60f254bfe034e099e9f70c306d67e7, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 @@ -293,6 +265,40 @@ Material: m_Floats: [] m_Colors: - _Color: {r: 0.9607843, g: 0.10606851, b: 0.050980415, a: 1} +--- !u!21 &605046387 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 'terrain_baseMaterial + + 19882' + m_Shader: {fileID: 4800000, guid: bd60f254bfe034e099e9f70c306d67e7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: edd08c3a47d840cdb7c05aabb9e1174f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] + m_Colors: + - _Color: {r: 0.9607843, g: 0.10606851, b: 0.050980415, a: 1} +--- !u!4 &736874037 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, + type: 3} + m_PrefabInstance: {fileID: 1450937817} + m_PrefabAsset: {fileID: 0} --- !u!1 &1001315648 GameObject: m_ObjectHideFlags: 0 @@ -405,13 +411,138 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!43 &1070610565 +--- !u!1 &1164658098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1164658104} + - component: {fileID: 1164658103} + - component: {fileID: 1164658102} + - component: {fileID: 1164658101} + - component: {fileID: 1164658100} + - component: {fileID: 1164658099} + m_Layer: 0 + m_Name: 2a2_BeerTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!33 &1164658099 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164658098} + m_Mesh: {fileID: 1204814591} +--- !u!23 &1164658100 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164658098} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 411919156} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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 +--- !u!114 &1164658101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164658098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1770992566, guid: bab6fa851cf5a1a4bba3cec5f191cb8e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1164658102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164658098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a917f0af64a6423093132dab321c15f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1164658103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164658098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1631628248, guid: bab6fa851cf5a1a4bba3cec5f191cb8e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTrackableName: beer + mPreserveChildSize: 0 + mInitializedInEditor: 1 + mDataSetPath: Vuforia/AR-2.xml + mAspectRatio: 1.2578375 + mImageTargetType: 0 + mWidth: 0.08 + mHeight: 0.100627 +--- !u!4 &1164658104 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164658098} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.0685, y: 0, z: 0.0193} + m_LocalScale: {x: 0.100627, y: 0.100627, z: 0.100627} + m_Children: + - {fileID: 1778503357} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1204814591 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ImageTargetMesh-22346 + m_Name: ImageTargetMesh19902 serializedVersion: 9 m_SubMeshes: - serializedVersion: 2 @@ -554,7 +685,7 @@ Mesh: m_UVInfo: 0 m_LocalAABB: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.34927696, y: 0, z: 0.5} + m_Extent: {x: 0.3975076, y: 0, z: 0.5} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -565,138 +696,13 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &1164658098 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1164658104} - - component: {fileID: 1164658103} - - component: {fileID: 1164658102} - - component: {fileID: 1164658101} - - component: {fileID: 1164658100} - - component: {fileID: 1164658099} - m_Layer: 0 - m_Name: BeerTarget - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!33 &1164658099 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_Mesh: {fileID: 1070610565} ---- !u!23 &1164658100 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 832822420} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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 ---- !u!114 &1164658101 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1770992566, guid: bab6fa851cf5a1a4bba3cec5f191cb8e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1164658102 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5a917f0af64a6423093132dab321c15f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1164658103 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1631628248, guid: bab6fa851cf5a1a4bba3cec5f191cb8e, type: 3} - m_Name: - m_EditorClassIdentifier: - mTrackableName: beer - mPreserveChildSize: 0 - mInitializedInEditor: 1 - mDataSetPath: Vuforia/AR-2.xml - mAspectRatio: 1.2578375 - mImageTargetType: 0 - mWidth: 0.08 - mHeight: 0.100627 ---- !u!4 &1164658104 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.0685, y: 0, z: 0.0193} - m_LocalScale: {x: 0.100627, y: 0.100627, z: 0.100627} - m_Children: - - {fileID: 1778503357} - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &1279876001 +--- !u!43 &1424588156 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ImageTargetMesh-2492 + m_Name: ImageTargetMesh19872 serializedVersion: 9 m_SubMeshes: - serializedVersion: 2 @@ -839,7 +845,7 @@ Mesh: m_UVInfo: 0 m_LocalAABB: m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0, z: 0.5} + m_Extent: {x: 0.5, y: 0, z: 0.49869} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -850,6 +856,75 @@ Mesh: offset: 0 size: 0 path: +--- !u!1001 &1450937817 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 267688594} + m_Modifications: + - target: {fileID: 100002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_Name + value: ruediger_one + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalPosition.y + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalScale.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalScale.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} + propertyPath: m_LocalScale.z + value: 0.2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0563e0ca0fd774cfb8f1e866cdc496c6, type: 3} --- !u!1 &1778503356 GameObject: m_ObjectHideFlags: 0 @@ -863,7 +938,7 @@ GameObject: - component: {fileID: 1778503359} - component: {fileID: 1778503358} m_Layer: 0 - m_Name: Quad + m_Name: 2a2_Quad m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1079,78 +1154,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: material: {fileID: 0} ---- !u!1001 &2646610158670304121 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 267688594} - m_Modifications: - - target: {fileID: 8736589546794520180, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_Name - value: OptimizedTree - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.01 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3915e8fc8243e427a83acc84292516db, type: 3} ---- !u!4 &4507202128414994126 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4507202128414994126, guid: 3915e8fc8243e427a83acc84292516db, - type: 3} - m_PrefabInstance: {fileID: 2646610158670304121} - m_PrefabAsset: {fileID: 0} diff --git a/AR-2/Assets/2a3.unity b/AR-2/Assets/2a3.unity index 26a966b..29cdde2 100644 --- a/AR-2/Assets/2a3.unity +++ b/AR-2/Assets/2a3.unity @@ -127,7 +127,7 @@ GameObject: - component: {fileID: 267688590} - component: {fileID: 267688589} m_Layer: 0 - m_Name: SomeTarget + m_Name: 2a3_SomeTarget m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -158,7 +158,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2084716968} + - {fileID: 1108861697} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -509,142 +509,17 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1164658098 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1164658104} - - component: {fileID: 1164658103} - - component: {fileID: 1164658102} - - component: {fileID: 1164658101} - - component: {fileID: 1164658100} - - component: {fileID: 1164658099} - m_Layer: 0 - m_Name: BeerTarget - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!33 &1164658099 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_Mesh: {fileID: 1228208540} ---- !u!23 &1164658100 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 1176146932} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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 ---- !u!114 &1164658101 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1770992566, guid: bab6fa851cf5a1a4bba3cec5f191cb8e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1164658102 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5a917f0af64a6423093132dab321c15f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1164658103 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1631628248, guid: bab6fa851cf5a1a4bba3cec5f191cb8e, type: 3} - m_Name: - m_EditorClassIdentifier: - mTrackableName: beer - mPreserveChildSize: 0 - mInitializedInEditor: 1 - mDataSetPath: Vuforia/AR-2.xml - mAspectRatio: 1.2578375 - mImageTargetType: 0 - mWidth: 0.08 - mHeight: 0.100627 ---- !u!4 &1164658104 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164658098} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.0685, y: 0, z: 0.0193} - m_LocalScale: {x: 0.100627, y: 0.100627, z: 0.100627} - m_Children: - - {fileID: 1778503357} - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &1176146932 +--- !u!21 &1108861697 Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: 'beerMaterial + m_Name: 'terrain_baseMaterial - 15282' - m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0} + 20176' + m_Shader: {fileID: 4800000, guid: bd60f254bfe034e099e9f70c306d67e7, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 m_EnableInstancingVariants: 0 @@ -656,172 +531,12 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 52dd947ab1b748db935aaac414b79715, type: 3} + m_Texture: {fileID: 2800000, guid: edd08c3a47d840cdb7c05aabb9e1174f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: [] m_Colors: - _Color: {r: 0.9607843, g: 0.10606851, b: 0.050980415, a: 1} ---- !u!43 &1228208540 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ImageTargetMesh15272 - serializedVersion: 9 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.3975076, y: 0, z: 0.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200020001000300 - m_VertexData: - serializedVersion: 2 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 128 - _typelessdata: 1e86cbbe00000000000000bf000000000000803f0000000000000000000000001e86cbbe000000000000003f000000000000803f00000000000000000000803f1e86cb3e00000000000000bf000000000000803f000000000000803f000000001e86cb3e000000000000003f000000000000803f000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.3975076, y: 0, z: 0.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimized: 0 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1 &1518837735 GameObject: m_ObjectHideFlags: 0 @@ -914,98 +629,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1518837735} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1778503356 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1778503357} - - component: {fileID: 1778503360} - - component: {fileID: 1778503359} - - component: {fileID: 1778503358} - m_Layer: 0 - m_Name: Quad - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1778503357 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1778503356} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 1, z: 0} - m_Children: [] - m_Father: {fileID: 1164658104} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!64 &1778503358 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1778503356} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Convex: 0 - m_CookingOptions: 14 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1778503359 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1778503356} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: c1b09a382898241f188becffff07082f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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 ---- !u!33 &1778503360 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1778503356} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1846189156 GameObject: m_ObjectHideFlags: 0 @@ -1143,31 +766,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: material: {fileID: 0} ---- !u!21 &2084716968 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 'terrain_baseMaterial - - 15252' - m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: edd08c3a47d840cdb7c05aabb9e1174f, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: [] - m_Colors: - - _Color: {r: 0.9607843, g: 0.10606851, b: 0.050980415, a: 1} diff --git a/AR-2/Assets/Resources/VuforiaConfiguration.asset b/AR-2/Assets/Resources/VuforiaConfiguration.asset index ece773b..123bfdb 100644 --- a/AR-2/Assets/Resources/VuforiaConfiguration.asset +++ b/AR-2/Assets/Resources/VuforiaConfiguration.asset @@ -51,7 +51,7 @@ MonoBehaviour: videoBackgroundShader: {fileID: 4800000, guid: f40623b353e2f1943b1b3ba42975db7a, type: 3} matteShader: {fileID: 4800000, guid: 66d0d78a3000021448b598bb54a3bfdf, type: 3} - videoBackgroundEnabled: 0 + videoBackgroundEnabled: 1 deviceTracker: autoInitTracker: 0 autoStartTracker: 0 diff --git a/AR-2/Assets/SpaceshipMat.mat b/AR-2/Assets/SpaceshipMat.mat new file mode 100644 index 0000000..2977f19 --- /dev/null +++ b/AR-2/Assets/SpaceshipMat.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SpaceshipMat + m_Shader: {fileID: 4800000, guid: a9e6ccf80455a4d9fb7561b1326d0ec9, type: 3} + m_ShaderKeywords: + 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_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} diff --git a/AR-2/Assets/mesh_scene.unity b/AR-2/Assets/mesh_scene.unity index b02c86a..4dec192 100644 --- a/AR-2/Assets/mesh_scene.unity +++ b/AR-2/Assets/mesh_scene.unity @@ -151,7 +151,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 691586813} - m_Mesh: {fileID: 899882856} + m_Mesh: {fileID: 716645583} --- !u!23 &691586816 MeshRenderer: m_ObjectHideFlags: 0 @@ -169,7 +169,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: e3ece29df8639485c97e608daae0c7b1, type: 2} + - {fileID: 2100000, guid: c6a9aa9f161e64baeb0720b4c500b44a, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -203,7 +203,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &899882856 +--- !u!43 &716645583 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -220,8 +220,8 @@ Mesh: firstVertex: 0 vertexCount: 15 localAABB: - m_Center: {x: 1.5, y: 3, z: 0.009999333} - m_Extent: {x: 1.5, y: 3, z: 0.009999333} + m_Center: {x: 1.5, y: 3, z: 0.15446648} + m_Extent: {x: 1.5, y: 3, z: 0.15446648} m_Shapes: vertices: [] shapes: [] @@ -297,7 +297,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 720 - _typelessdata: 0000c03f0000c04000000000000000000000803f0000000000000000000000000000803f9a99993e00000000000000000000803f0000a04000000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000000400000a04000000000000000000000803f0000000000000000000000000000803f0000803f00000000000000000000803f0000804000000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000000400000804000000000000000000000803f0000000000000000000000000000803f0000803f00000000000000000000803f0000404000000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000000400000404000000000000000000000803f0000000000000000000000000000803f0000803f00000000000000000000803f0000004000000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000000400000004000000000000000000000803f0000000000000000000000000000803f0000803f00000000000000000000803f0000803f00000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000000400000803f00000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000040400000803f00000000000000000000803f0000000000000000e5f27f3f00b051390000803f000000000000000000004040000000003ed4a33c00000000000000000000803f00000000000000000000803f0000803f0000000000000000000000000000803f00000000000000000000803f00000000e5f27f3f0000000000b051390000803f000000000000000000000000000000003ed4a33c00000000000000000000803f00000000000000000000803f0000803f0000000000000000 + _typelessdata: 0000c03f0000c04000000000000000000000803f0000000000000000000000000000803f9a99993e00000000000000000000803f0000a04000000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000000400000a04000000000000000000000803f0000000000000000000000000000803f0000803f00000000000000000000803f0000804000000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000000400000804000000000000000000000803f0000000000000000000000000000803f0000803f00000000000000000000803f0000404000000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000000400000404000000000000000000000803f0000000000000000000000000000803f0000803f00000000000000000000803f0000004000000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000000400000004000000000000000000000803f0000000000000000000000000000803f0000803f00000000000000000000803f0000803f00000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000000400000803f00000000000000000000803f0000000000000000000000000000803f0000803f0000000000000000000040400000803f00000000000000000000803f00000000000000003b7a733f505c483d0000803f00000000000000000000404000000000762c9e3e00000000000000000000803f00000000000000000000803f0000803f0000000000000000000000000000803f00000000000000000000803f000000003b7a733f00000000505c483d0000803f00000000000000000000000000000000762c9e3e00000000000000000000803f00000000000000000000803f0000803f0000000000000000 m_CompressedMesh: m_Vertices: m_NumItems: 0 diff --git a/AR-2/Assets/plain.mat b/AR-2/Assets/plain.mat index aa77953..65e2c0a 100644 --- a/AR-2/Assets/plain.mat +++ b/AR-2/Assets/plain.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: plain - m_Shader: {fileID: 4800000, guid: 2099a48cdfdf04ba0851e51953a666c1, type: 3} + m_Shader: {fileID: 4800000, guid: e8ee87b8409744616acc1e8ca974f54a, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0