From d7c2634bda53b8ce1ce21d4e19d852f8569d6dbe Mon Sep 17 00:00:00 2001 From: henrisel Date: Sat, 28 Feb 2026 11:31:13 +0200 Subject: [PATCH] new table model in archery range, disable buttons at first, play printing sound --- 3d-generation-pipeline/README.md | 3 - .../Models/ModelGeneration/Old/CornerWire.fbx | 3 - .../ModelGeneration/Old/CornerWire.fbx.meta | 108 ------------------ .../ModelGeneration/Old/StraightWire.fbx | 3 - .../ModelGeneration/Old/StraightWire.fbx.meta | 108 ------------------ .../Models/ModelGeneration/Old/TWire.fbx | 3 - .../Models/ModelGeneration/Old/TWire.fbx.meta | 108 ------------------ .../Models/ModelGeneration/Old/Table_old.fbx | 3 - .../ModelGeneration/Old/Table_old.fbx.meta | 108 ------------------ .../_PROJECT/Models/ModelGeneration/Table.fbx | 4 +- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- .../ArcheryRange/ModelDisplay.cs | 20 +++- .../ModeGeneration/NPCs/ArcheryRangeNPC.cs | 13 +-- 13 files changed, 24 insertions(+), 464 deletions(-) delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old/CornerWire.fbx delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old/CornerWire.fbx.meta delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old/StraightWire.fbx delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old/StraightWire.fbx.meta delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old/TWire.fbx delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old/TWire.fbx.meta delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old/Table_old.fbx delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old/Table_old.fbx.meta diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 2f76080a..aba3e215 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -3,7 +3,6 @@ * quest marker peaks jätma nähtavad noolekesed enda liikumise teele * teha build kus archery range'is spawnitud objektid * speech-to-text: - * kasutada suuremat Whisper mudelit, äkki töötab paremini taustamüraga ka? * uurida miks buildis Whisper halvemini töötab * proovida suuremat Whisperi mudelit, äkki töötab mürases keskkonnas paremini * igal pool, kus mängija peab rääkima, peaks olema: @@ -21,12 +20,10 @@ * archery range: * mute/unmute ikooni värv mitte must (muted kollane, roheline) * spawn point kaugemale - * image gen button disable'ida kui pole midagi veel räägitud * mikrofon peaks lõpetama protsessimise ka siis kui mängija läheb ära mikri juurest * mikril ontriggerenter collider peaks olema väiksem kui ontriggerexit collider * võiks jääda kordama viimast instruktsiooni, kui mängija ei progressi edasi * kui archery range läbi, võiks npc öelda "good job, try again..." - * uus Table mudel, kus õiged wire'id * kui midagi laeb (wire aktiivne), siis particle'id võiks voolata mööda toru * highscore json tühjaks * cafe: diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old/CornerWire.fbx b/Assets/_PROJECT/Models/ModelGeneration/Old/CornerWire.fbx deleted file mode 100644 index ab7f3324..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old/CornerWire.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:419202ec3e07592dd045ad42cc1101208437045a397d0b8dec812130a99e9e52 -size 19628 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old/CornerWire.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Old/CornerWire.fbx.meta deleted file mode 100644 index ce4c7e08..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old/CornerWire.fbx.meta +++ /dev/null @@ -1,108 +0,0 @@ -fileFormatVersion: 2 -guid: c335d35d124d55d47a083e4c86ad7b51 -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old/StraightWire.fbx b/Assets/_PROJECT/Models/ModelGeneration/Old/StraightWire.fbx deleted file mode 100644 index 00036704..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old/StraightWire.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aae9a3e614695abc8a63e0384f3d8a7cf8a3f2eb5318242be98dd80fe38eb70a -size 19244 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old/StraightWire.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Old/StraightWire.fbx.meta deleted file mode 100644 index 741a53c4..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old/StraightWire.fbx.meta +++ /dev/null @@ -1,108 +0,0 @@ -fileFormatVersion: 2 -guid: bd70492f76cf8d54ab9404f53896044b -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old/TWire.fbx b/Assets/_PROJECT/Models/ModelGeneration/Old/TWire.fbx deleted file mode 100644 index 40dc198e..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old/TWire.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4ead93249ef35bdbc1391c5a7f9b5018c709b624e72fb9f33ea8013d15ec63b -size 20412 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old/TWire.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Old/TWire.fbx.meta deleted file mode 100644 index e8f27990..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old/TWire.fbx.meta +++ /dev/null @@ -1,108 +0,0 @@ -fileFormatVersion: 2 -guid: 57b2f59a5da481244b62991f926cb992 -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old/Table_old.fbx b/Assets/_PROJECT/Models/ModelGeneration/Old/Table_old.fbx deleted file mode 100644 index 4ffda759..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old/Table_old.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1332319150c313198a063103144ef2078e4757cf20862a87bf7f69958cdee2b0 -size 41596 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old/Table_old.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Old/Table_old.fbx.meta deleted file mode 100644 index b0644d78..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old/Table_old.fbx.meta +++ /dev/null @@ -1,108 +0,0 @@ -fileFormatVersion: 2 -guid: bd6aade83407b0146bc70213528db8e3 -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/Table.fbx b/Assets/_PROJECT/Models/ModelGeneration/Table.fbx index 0855c1d8..26ccf688 100644 --- a/Assets/_PROJECT/Models/ModelGeneration/Table.fbx +++ b/Assets/_PROJECT/Models/ModelGeneration/Table.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:083d20eed964e94e0b507633dbf87c1cfc1d70eab64f664b1b2388b26aaf4bb0 -size 46412 +oid sha256:3f1ac8f531c27f52c4878e45c6b38e9558843bfbebfea2830785d62bc0ac5676 +size 52556 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index c791a66f..f81ec144 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:984cf2ec50b5561784b8c1c22d73ad7a969d9ddae7652f348706b38f7fb6ccae -size 68597899 +oid sha256:a0f6f98a68eee083682e53d4dd567c8cd5cf3636776de614987ffa8241445d9f +size 68602951 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/ModelDisplay.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/ModelDisplay.cs index 5e7f3df2..c8a90afb 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/ModelDisplay.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/ModelDisplay.cs @@ -1,3 +1,4 @@ +using FMOD.Studio; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -7,16 +8,21 @@ public class ModelDisplay : MonoBehaviour public Transform displayPoint; public Transform glassTransform; public Material modelDisplayActiveMaterial; - public Transform wire; + public MeshRenderer[] wires; public Material wireActiveMaterial; public GameObject Model { get; private set; } public float generatedObjectRotationSpeed = 10f; + private EventInstance printingSound; + // Start is called before the first frame update void Start() { - + printingSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.Printing); + printingSound.setParameterByName("3DPrinterPrintingJob", 1); + printingSound.setParameterByName("Occlusion", 0); + printingSound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(displayPoint)); } // Update is called once per frame @@ -28,9 +34,15 @@ public class ModelDisplay : MonoBehaviour } } + public void StartPrinting() + { + printingSound.start(); + printingSound.setParameterByName("3DPrinterPrintingJob", 0); + } + public void DisplayModel(GameObject modelObject) { - foreach (MeshRenderer meshRenderer in wire.GetComponentsInChildren()) + foreach (MeshRenderer meshRenderer in wires) { meshRenderer.material = wireActiveMaterial; } @@ -43,5 +55,7 @@ public class ModelDisplay : MonoBehaviour modelObject.transform.parent = displayPoint; modelObject.transform.position = displayPoint.position; Model = modelObject; + + printingSound.setParameterByName("3DPrinterPrintingJob", 1); } } diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ArcheryRangeNPC.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ArcheryRangeNPC.cs index 66a6f2e7..c8e50015 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ArcheryRangeNPC.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ArcheryRangeNPC.cs @@ -1,7 +1,6 @@ using System; using UnityEngine; using UnityEngine.UI; -using FMOD.Studio; using System.Threading.Tasks; public class ArcheryRangeNPC : NPCController @@ -18,7 +17,6 @@ public class ArcheryRangeNPC : NPCController public Transform startTargetQuestMarkerPoint; private Texture2D GeneratedTexture; - private EventInstance printingSound; // states: // 0 - idle @@ -39,9 +37,6 @@ public class ArcheryRangeNPC : NPCController microphoneStand.OnPlayerFinishedSpeaking += OnPlayerUsedMicrophone; imageGenerationButton.OnButtonPressed += OnImageGenerationButtonPressed; modelGenerationButton.OnButtonPressed += OnModelGenerationButtonPressed; - - printingSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.Printing); - printingSound.setParameterByName("3DPrinterPrintingJob", 1); } protected async override void OnPlayerApproach() @@ -64,7 +59,7 @@ public class ArcheryRangeNPC : NPCController protected override void OnPlayerLeave() { - Debug.Log("Alien NPC: player left"); + } private void OnPlayerUsedMicrophone() @@ -73,6 +68,7 @@ public class ArcheryRangeNPC : NPCController { SpeakVoiceLine(3); questMarker.MoveTo(imageGenerationButton.transform); + imageGenerationButton.Deactivate(); state = 2; } } @@ -106,9 +102,7 @@ public class ArcheryRangeNPC : NPCController state = 4; } - printingSound.start(); - printingSound.setParameterByName("3DPrinterPrintingJob", 0); - + modelDisplay.StartPrinting(); string encodedTexture = Convert.ToBase64String(GeneratedTexture.EncodeToJPG()); byte[] encodedModel = await TrellisClient.Instance.GenerateModel(encodedTexture); @@ -122,7 +116,6 @@ public class ArcheryRangeNPC : NPCController state = 5; } - printingSound.setParameterByName("3DPrinterPrintingJob", 1); modelGenerationButton.Deactivate(); } }