broken but working~

This commit is contained in:
spatialfree 2020-12-13 20:08:30 -08:00
parent ff97981e2a
commit 2df0f39f4c
9 changed files with 72 additions and 7248 deletions

BIN
Assets/Data.dat Normal file

Binary file not shown.

7
Assets/Data.dat.meta Normal file
View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 60c8872365495e24488cce50e413af01
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -12,4 +12,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9979df78c5c6af94ca9d03ad1c89cceb, type: 3}
m_Name: Remember
m_EditorClassIdentifier:
queued: 0
queued: 1

File diff suppressed because it is too large Load diff

View file

@ -8,6 +8,9 @@ public class World
public Logic logic;
public Rig rig;
// public Bounds/Box
// public Snakes?
// public Music?
public void Set(InspectorSetter setter)
{

View file

@ -9,6 +9,8 @@ using TMPro;
public class Main : MonoBehaviour
{
// No need for these events
// given the new architecture of the project
public delegate void GameStart(Main main);
public static event GameStart OnGameStart;
@ -26,7 +28,6 @@ public class Main : MonoBehaviour
public Rig rig;
public AI ai = new AI();
public Game game = new Game();
public BoxUI boxUI;
public LineRenderer tongueLine;
public GraphXData graphXData;

View file

@ -7,8 +7,7 @@ using System.Collections;
[RequireComponent(typeof(AudioSource))]
public class Metro : MonoBehaviour
{
[Header("References")]
public Main main;
public Monolith mono;
public bool tick;
@ -32,7 +31,7 @@ public class Metro : MonoBehaviour
{
if (beat)
{
main.Beat();
mono.Beat();
beat = false;
}
}
@ -44,7 +43,7 @@ public class Metro : MonoBehaviour
gain = tick ? 0.25f : 0f;
double samplesPerTick = sampleRate * 60.0F / (double)main.BPM() * 4.0F / signatureLo;
double samplesPerTick = sampleRate * 60.0F / (double)mono.BPM * 4.0F / signatureLo;
double sample = AudioSettings.dspTime * sampleRate;
int dataLen = data.Length / channels;
int n = 0;

View file

@ -6,6 +6,8 @@ public class Monolith : MonoBehaviour
public Logic logic;
public Render render;
public int BPM = 80;
[Header("Design")]
public float test;
@ -41,4 +43,9 @@ public class Monolith : MonoBehaviour
logic.Update();
render.Update();
}
public void Beat()
{
}
}

View file

@ -22,40 +22,40 @@ public class Music
public void Fade(Main main)
{
if (main.boxUI.active)
{
musicVolumeDelta = -1;
main.musicSource.Pause();
main.musicSource.volume = 0;
}
else if (main.playing && !main.musicSource.isPlaying)
{
musicVolumeDelta = 1;
main.musicSource.Play();
}
// if (main.boxUI.active)
// {
// musicVolumeDelta = -1;
// main.musicSource.Pause();
// main.musicSource.volume = 0;
// }
// else if (main.playing && !main.musicSource.isPlaying)
// {
// musicVolumeDelta = 1;
// main.musicSource.Play();
// }
if (main.boxUI.menuMain.activeInHierarchy || main.boxUI.menuConfig.activeInHierarchy)
{
loopVolumeDelta = 3;
}
else
{
loopVolumeDelta = -3;
}
// if (main.boxUI.menuMain.activeInHierarchy || main.boxUI.menuConfig.activeInHierarchy)
// {
// loopVolumeDelta = 3;
// }
// else
// {
// loopVolumeDelta = -3;
// }
loopVolume = Mathf.Clamp01(loopVolume + Time.deltaTime / loopVolumeDelta);
musicVolume = Mathf.Clamp01(musicVolume + Time.deltaTime / musicVolumeDelta);
// loopVolume = Mathf.Clamp01(loopVolume + Time.deltaTime / loopVolumeDelta);
// musicVolume = Mathf.Clamp01(musicVolume + Time.deltaTime / musicVolumeDelta);
main.loopSource.volume = loopVolume * data.musicVolume;
main.musicSource.volume = musicVolume * data.musicVolume;
// main.loopSource.volume = loopVolume * data.musicVolume;
// main.musicSource.volume = musicVolume * data.musicVolume;
if (main.fastQueue > 0)
{
main.loopSource.pitch = main.musicSource.pitch = 2;
}
else
{
main.loopSource.pitch = main.musicSource.pitch = 1;
}
// if (main.fastQueue > 0)
// {
// main.loopSource.pitch = main.musicSource.pitch = 2;
// }
// else
// {
// main.loopSource.pitch = main.musicSource.pitch = 1;
// }
}
}