Merge branch 'main' of github.com:LeGall29/GGJ2024
This commit is contained in:
commit
d15c0f3949
BIN
Assets/Audio SFX/incorrect-buzzer-sound-147336.mp3
(Stored with Git LFS)
Normal file
BIN
Assets/Audio SFX/incorrect-buzzer-sound-147336.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
23
Assets/Audio SFX/incorrect-buzzer-sound-147336.mp3.meta
Normal file
23
Assets/Audio SFX/incorrect-buzzer-sound-147336.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6a8e3f6dace40f549802ccbfb7b9cb4e
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -10,6 +10,7 @@ public class CameraManager : MonoBehaviour
|
|||||||
public Button resumeButton;
|
public Button resumeButton;
|
||||||
public RawImage photoBox;
|
public RawImage photoBox;
|
||||||
private Texture2D photo;
|
private Texture2D photo;
|
||||||
|
private int numberOfWebcams;
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void OnEnable()
|
void OnEnable()
|
||||||
@ -26,6 +27,7 @@ void OnDisable()
|
|||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
wDevice = WebCamTexture.devices.FirstOrDefault(x => x.isFrontFacing == false);
|
wDevice = WebCamTexture.devices.FirstOrDefault(x => x.isFrontFacing == false);
|
||||||
|
numberOfWebcams = WebCamTexture.devices.Count();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
@ -126,7 +128,7 @@ public Texture2D GetPhoto()
|
|||||||
return photo;
|
return photo;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wTexture || WebCamTexture.devices.Count() < 1)
|
if (!wTexture || numberOfWebcams < 1)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user