diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index b746a28d..2765f01b 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -11,9 +11,6 @@ * "loading" dünaamiline ikoon kui mängija ootab protsessimise järel * shape detection: * objektidel ebasobiv layer, kukuvad läbi põranda - * player saab minna läbi klaasi ja ukse - * prinditud object on kaugel mängijast, võiks plaadiga sõita lähemale - * 3d printeri input auk nähtavamaks, et mängijad ei hakkaks sinna kõrgemale panema pilti * raadio nupp võiks töötada recording mode'is, mitte streamina - kui lased lahti, siis hakkab processima * professor võiks öelda "good job, continue..." pärast esimest successi * kui kõik configurationid tehtud, siis midagi juhtub: uks avaneb, quest marker läheb ukse juurde, professor ütleb "thank you" diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/3DPrinter.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/3DPrinter.prefab index 38f0d05d..396ea34c 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/3DPrinter.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/3DPrinter.prefab @@ -31,6 +31,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 491901686877125991} + - {fileID: 1316718060143461248} m_Father: {fileID: 4545823825065891782} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -275,12 +276,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2829786486647810675} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.241, y: 0.906, z: -0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.035, y: 0.60600007, z: 0.011} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4545823825065891782} + m_Father: {fileID: 6976191064680756496} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &7231162203913049404 @@ -399,6 +400,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9214868600016593565} + - {fileID: 6920554097264155277} m_Father: {fileID: 4545823825065891782} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -452,6 +454,111 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5480178792470247219 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1316718060143461248} + - component: {fileID: 6093464359003343042} + - component: {fileID: 8430123613615464607} + - component: {fileID: 6648624096198318321} + m_Layer: 0 + m_Name: HoleLight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1316718060143461248 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5480178792470247219} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.4844, y: -0.1069, z: -0.069} + m_LocalScale: {x: 0.13507058, y: 0.008995052, z: 0.71525204} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9031063507384316445} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6093464359003343042 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5480178792470247219} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8430123613615464607 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5480178792470247219} + 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: 2100000, guid: 41f12eac51f3a45459e319b9f41ecb1a, 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} +--- !u!65 &6648624096198318321 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5480178792470247219} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.0000004, y: 1, z: 1.0000004} + m_Center: {x: 0.000011444095, y: 0, z: 0.00000047683693} --- !u!1 &6818522947819141277 GameObject: m_ObjectHideFlags: 0 @@ -483,7 +590,6 @@ Transform: m_Children: - {fileID: 9031063507384316445} - {fileID: 6976191064680756496} - - {fileID: 6920554097264155277} m_Father: {fileID: 0} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 80.751, z: 0} @@ -502,3 +608,4 @@ MonoBehaviour: spawnPoint: {fileID: 9214868600016593565} ignorePlayerCollisionLayer: 2 shapeScannerTag: ShapeScannable + printedObjectSize: 0.5 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index ee409bbb..52ff13ec 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3eaaa512e96c1cba12a480370b4e2ea9a011f4607b0a35dee83906774e2b2ee7 -size 68601466 +oid sha256:efbc792a46ca9af3385c212bdd3aba37c5c239821be30e2c5bd11d6429eeb684 +size 68606147