diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 063bdc5d..46f0b384 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -1,8 +1,6 @@ ### TODO * shape detection: - * shape scanner peenikesemad kiired * shape scanner mitte lihtsalt ontriggerenter ja -exit, sest kui mitu objekti lähevad samal ajal sisse - * shape scanner mustad kiired on halvasti nähtavad pruuni materjali taustal * PC uus mudel, kus enter key liigub õigesti + õige sound effect enter nupul * objektidel ebasobiv layer, kukuvad läbi põranda * archery range: diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index ba3a038b..fd1ff26f 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66024be644e4821c483428c24314f1c9ff5b665f18c278b6ac7f96bcb71b52b0 +oid sha256:f38e1cb365c0bb50efa336d560078653b84701791689ac8737aae17f79669a53 size 2494 diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab index 90ebb0bd..e0f84f12 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab @@ -4411,7 +4411,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 0.1 + m_Radius: 0.06 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5893976019349174190 GameObject: @@ -6732,7 +6732,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 0.1 + m_Radius: 0.06 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7486924273507720172 GameObject: diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/ImageGenerationBox.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/ImageGenerationBox.prefab index bfe7b13b..6e7fccf5 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/ImageGenerationBox.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/ImageGenerationBox.prefab @@ -303,8 +303,6 @@ MonoBehaviour: loadingMaterial: {fileID: 2100000, guid: 33390c6f2eb32df47809c60975868a0c, type: 2} voiceTranscriptionBox: {fileID: 0} imageDisplay: {fileID: 6899506685386251279} - promptSuffix: ', single object, front and side fully visible, realistic style, - plain neutral background, clear details, soft studio lighting, true-to-scale' --- !u!114 &8388680764149718488 MonoBehaviour: m_ObjectHideFlags: 0 @@ -370,9 +368,9 @@ MonoBehaviour: _initializeOrder: 0 _defaultDespawnType: 0 NetworkObserver: {fileID: 0} - k__BackingField: 0 + k__BackingField: 18 k__BackingField: 0 _scenePathHash: 0 k__BackingField: 0 - k__BackingField: 16999457738479142014 + k__BackingField: 7329726112418745078 _sceneNetworkObjects: [] diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/ModelGenerationBox.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/ModelGenerationBox.prefab index 53c6ba29..118668bb 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/ModelGenerationBox.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/ModelGenerationBox.prefab @@ -221,9 +221,9 @@ MonoBehaviour: _initializeOrder: 0 _defaultDespawnType: 0 NetworkObserver: {fileID: 0} - k__BackingField: 0 + k__BackingField: 19 k__BackingField: 0 _scenePathHash: 0 k__BackingField: 0 - k__BackingField: 16834818735520970046 + k__BackingField: 16424558553273032790 _sceneNetworkObjects: [] diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/VoiceTranscriptionBox.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/VoiceTranscriptionBox.prefab index 61174b38..96b1f8db 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/VoiceTranscriptionBox.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Prototypes/VoiceTranscriptionBox.prefab @@ -401,11 +401,11 @@ MonoBehaviour: _initializeOrder: 0 _defaultDespawnType: 0 NetworkObserver: {fileID: 0} - k__BackingField: 0 + k__BackingField: 20 k__BackingField: 0 _scenePathHash: 0 k__BackingField: 0 - k__BackingField: 16717644425602052398 + k__BackingField: 17886704559288870566 _sceneNetworkObjects: [] --- !u!1 &5819114791296431922 GameObject: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index a6a8b71a..4e2eea20 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:e89dad8a995b3678f352d7550599cb779842a58ab68ab5f7cac3ed291694f85c +oid sha256:541468ec40be3492050f4e8f9e9fe7561ba54aefeb8c3d79f4c5a969bf5fd28a size 68519215 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ReleasableButton.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ReleasableButton.cs index d2679e28..832ee6ac 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/ReleasableButton.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ReleasableButton.cs @@ -33,19 +33,21 @@ public class ReleasableButton : MonoBehaviour } - private void OnCollisionEnter(Collision collision) + private void OnTriggerEnter(Collider collider) { - if (!isButtonDown && collision.gameObject.tag.EndsWith("Hand")) + if (!isButtonDown && collider.gameObject.tag.EndsWith("Hand")) { + Debug.Log("collided with: " + collider.gameObject.name); Activate(); OnButtonPressed?.Invoke(); } } - private void OnCollisionExit(Collision collision) + private void OnTriggerExit(Collider collider) { - if (isButtonDown && collision.gameObject.tag.EndsWith("Hand")) + if (isButtonDown && collider.gameObject.tag.EndsWith("Hand")) { + Debug.Log("collider exited: " + collider.gameObject.name); Deactivate(); } }