Commit cc2cdcec authored by Samantha Straka's avatar Samantha Straka
Browse files

visual angle in Vr passt nun einigermaßen zur desktop variante. Das musst du...

visual angle in Vr passt nun einigermaßen zur desktop variante. Das musst du nochmal anpassen, wenn du genau weißt, wo die probanden sitzen und wie viel platz sie nach vorne haben
parent 6ebe3dff
......@@ -484,7 +484,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 232741935}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: -0.018000007, y: 0.345, z: 0.64045}
m_LocalPosition: {x: -0.018000007, y: 0.292, z: 0.64045}
m_LocalScale: {x: 0.43265, y: 1, z: 0.15224575}
m_Children: []
m_Father: {fileID: 2039606019}
......@@ -1012,6 +1012,169 @@ Transform:
m_Father: {fileID: 1746324682}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!43 &429837542
Mesh:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 24
topology: 0
baseVertex: 0
firstVertex: 0
vertexCount: 8
localAABB:
m_Center: {x: 0, y: 0.01, z: 0}
m_Extent: {x: 1.65, y: 0, z: 1.275}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose: []
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_BonesAABB: []
m_VariableBoneCountWeights:
m_Data:
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexFormat: 0
m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400
m_VertexData:
serializedVersion: 3
m_VertexCount: 8
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 12
format: 0
dimension: 4
- stream: 0
offset: 28
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: 288
_typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f
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.01, z: 0}
m_Extent: {x: 1.65, y: 0, z: 1.275}
m_MeshUsageFlags: 0
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
m_MeshMetrics[0]: 1
m_MeshMetrics[1]: 1
m_MeshOptimizationFlags: 1
m_StreamData:
offset: 0
size: 0
path:
--- !u!1 &467170850 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1000014254142504, guid: 4d293c8e162f3874b982baadd71153d2,
......@@ -2104,169 +2267,6 @@ MonoBehaviour:
standardPuzle: {fileID: 2100000, guid: 8a3d2a52e27a18c4d89f11002f7ee4ed, type: 2}
RightSolvedPuzzle: {fileID: 2100000, guid: 618a583a9f1075d4b9b79d146cb1dd8b, type: 2}
wrongSolvedPuzzle: {fileID: 2100000, guid: 289074c00ccee43428a21ab2b2926c8f, type: 2}
--- !u!43 &893176883
Mesh:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 24
topology: 0
baseVertex: 0
firstVertex: 0
vertexCount: 8
localAABB:
m_Center: {x: 0, y: 0.01, z: 0}
m_Extent: {x: 1.65, y: 0, z: 1.275}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose: []
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_BonesAABB: []
m_VariableBoneCountWeights:
m_Data:
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexFormat: 0
m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400
m_VertexData:
serializedVersion: 3
m_VertexCount: 8
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 12
format: 0
dimension: 4
- stream: 0
offset: 28
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: 288
_typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f
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.01, z: 0}
m_Extent: {x: 1.65, y: 0, z: 1.275}
m_MeshUsageFlags: 0
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
m_MeshMetrics[0]: 1
m_MeshMetrics[1]: 1
m_MeshOptimizationFlags: 1
m_StreamData:
offset: 0
size: 0
path:
--- !u!1 &923016967
GameObject:
m_ObjectHideFlags: 0
......@@ -2294,7 +2294,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 923016967}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.424, y: 0, z: 0.63155}
m_LocalPosition: {x: 0.349, y: 0, z: 0.629}
m_LocalScale: {x: 0.43265, y: 1, z: 0.15224575}
m_Children: []
m_Father: {fileID: 2039606019}
......@@ -2458,7 +2458,7 @@ Camera:
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 26.991467
field of view: 24.9
orthographic: 0
orthographic size: 5
m_Depth: -1
......@@ -2483,13 +2483,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
m_LocalRotation: {x: 0.00016102073, y: 0.99908, z: -0.042881515, w: -0.00064018334}
m_LocalPosition: {x: -0.027, y: 1.121, z: 1.829}
m_LocalRotation: {x: -0.0004991074, y: 0.99895173, z: -0.042878915, w: -0.01601973}
m_LocalPosition: {x: -0.128, y: 1.191, z: 1.436}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 4.9150004, y: 180.07399, z: 0.022000002}
m_LocalEulerAnglesHint: {x: 4.9150004, y: 181.838, z: 0.022000002}
--- !u!1 &1006482946
GameObject:
m_ObjectHideFlags: 0
......@@ -2588,15 +2588,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_LocalPosition.x
value: 0.501
value: 0.064
objectReference: {fileID: 0}
- target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 0.079
objectReference: {fileID: 0}
- target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_LocalPosition.z
value: -0.037
value: 1.457
objectReference: {fileID: 0}
- target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_LocalRotation.x
......@@ -2633,11 +2633,11 @@ PrefabInstance:
- target: {fileID: 3380982, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 893176883}
objectReference: {fileID: 429837542}
- target: {fileID: 2348914, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 1052623437}
objectReference: {fileID: 1673107855}
- target: {fileID: 2348914, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_ReceiveShadows
value: 0
......@@ -2670,6 +2670,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4000013889601590, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 159396, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_TagString
value: GameController
......@@ -2956,40 +2960,6 @@ Light:
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!21 &1052623437
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Sprites/Default
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
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}
m_Floats:
- PixelSnap: 0
- _EnableExternalAlpha: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &1074579211
GameObject:
m_ObjectHideFlags: 0
......@@ -3846,14 +3816,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1438926085}
m_LocalRotation: {x: 0.7056462, y: -0.045425195, z: 0.04542516, w: 0.7056462}
m_LocalPosition: {x: 3.24, y: 2.86, z: -5.94}
m_LocalRotation: {x: 0.52967566, y: -0.46844816, z: 0.4684481, w: 0.5296757}
m_LocalPosition: {x: 5.99, y: 2.86, z: 1.29}
m_LocalScale: {x: 0.52156, y: 0.52156, z: 0.52156}
m_Children:
- {fileID: 839940610}
m_Father: {fileID: 1357098592}
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 90.00001, y: 0, z: 7.3670006}
m_LocalEulerAnglesHint: {x: 90.00001, y: 0, z: 82.979004}
--- !u!64 &1438926087
MeshCollider:
m_ObjectHideFlags: 0
......@@ -4385,6 +4355,40 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1643436730}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!21 &1673107855
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Sprites/Default
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
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}
m_Floats:
- PixelSnap: 0
- _EnableExternalAlpha: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &1681569581
GameObject:
m_ObjectHideFlags: 0
......@@ -5728,7 +5732,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1959603289}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.383, y: 0, z: 0.63155}
m_LocalPosition: {x: -0.344, y: 0, z: 0.633}
m_LocalScale: {x: 0.43265, y: 1, z: 0.15224575}
m_Children: []
m_Father: {fileID: 2039606019}
......@@ -6535,7 +6539,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2129606243}
m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: -0.018000007, y: -0.356, z: 0.64045}
m_LocalPosition: {x: -0.018000007, y: -0.288, z: 0.64045}
m_LocalScale: {x: 0.43265024, y: 1, z: 0.15224575}
m_Children: []
m_Father: {fileID: 2039606019}
......
......@@ -33,7 +33,7 @@ public class GameManager : MonoBehaviour
public GameObject smallAngleModerator;
int condition; //0 is no brand, 1 is poster brand, 2 is puzzle brand, 3 is audio brand
// Start is called before the first frame update
int numberOfcondition = 8; //the number of the condition. Goes up when a puzzle is solved
//int numberOfcondition = 8; //the number of the condition. Goes up when a puzzle is solved
//for visual angle
......@@ -111,6 +111,7 @@ public class GameManager : MonoBehaviour
{
foreach (GameObject c in cubes)
{
if (c.GetComponent<Cube>().atRightLocation())
{
rightCubes++;
......@@ -133,14 +134,7 @@ public class GameManager : MonoBehaviour
allCubesSortedRight = false;
print("correct" + allCubesSortedRight);
foreach (GameObject c in cubes)
{
string mis = "";
mis += c.GetComponent<Cube>().Index.ToString() + "," + c.GetComponent<Cube>().getLocation().GetComponent<PuzzleCubeLocation>().getLocationIndex().ToString();
logfile.Add(mis);
}
rightCubes = 0;
......@@ -157,8 +151,15 @@ public class GameManager : MonoBehaviour
//diese Funktion wird immer dann aufgerufen, wenn ein neuer Cube in das Puzzle gesetzt wird
//print(cubesInPuzzle);
//jedes Mal, wenn ein neuer Würfel eingesetzt wird, wird ein neuer Fehlerlog hinzugefügt
foreach (GameObject c in cubes)
{
string mis = "";
mis += c.GetComponent<Cube>().Index.ToString() + "," + c.GetComponent<Cube>().getLocation().GetComponent<PuzzleCubeLocation>().getLocationIndex().ToString();
logfile.Add(mis);
}
if (cubesInPuzzle == 9)
{
......
......@@ -10,8 +10,8 @@ public class Puzzle : MonoBehaviour
public Material picture; //the displayed picture on the cubes
public GameObject cube1;
public GameObject cube2;
private bool allCube