Commit 3e355949 authored by 魔大农's avatar 魔大农 🍀

Added license file for music and removed non-free song

parent 622405ca
......@@ -3,4 +3,12 @@ A digital version of the [Quarto](https://en.wikipedia.org/wiki/Quarto_%28board_
![Screenshot](https://raw.githubusercontent.com/LucKeyProductions/Quatter/master/Screenshots/Screenshot_Thu_May_26_09_02_54_2016.png)
#### Compiling from source
If the [binary](https://luckeyproductions.itch.io/quatter) is not working you may try compiling by running this line in a terminal:
```
git clone https://github.com/LucKeyProductions/Quatter; cd Quatter; ./install.sh; cd ..; rm -rf Quatter
```
Background image by [Greg Zaal](http://adaptivesamples.com)
\ No newline at end of file
Angelight - The Knowledge River
License: CC-BY | https://creativecommons.org/licenses/by/4.0/)
Source: https://www.jamendo.com/track/1239247/the-knowledge-river
......@@ -27,7 +27,7 @@ EffectMaster::EffectMaster(Context* context) : Master(context)
void EffectMaster::FadeTo(Material* material, Color color, float duration, float delay)
{
Color startColor{material->GetShaderParameter("MatDiffColor").GetColor()};
ValueAnimation* fade{new ValueAnimation(context_)};
ValueAnimation* fade{ new ValueAnimation(context_) };
fade->SetKeyFrame(0.0f, startColor);
if (delay)
......@@ -39,7 +39,7 @@ void EffectMaster::FadeTo(Material* material, Color color, float duration, float
void EffectMaster::FadeTo(Light* light, float brightness, float duration)
{
ValueAnimation* fade{new ValueAnimation(context_)};
ValueAnimation* fade{ new ValueAnimation(context_) };
fade->SetKeyFrame(0.0f, light->GetBrightness());
fade->SetKeyFrame(duration, brightness);
light->SetAttributeAnimation("Brightness Multiplier", fade, WM_ONCE);
......@@ -55,7 +55,7 @@ void EffectMaster::FadeTo(SoundSource* soundSource, float gain, float duration)
}
void EffectMaster::FadeOut(SoundSource* soundSource, float duration)
{
float lastGain{soundSource->GetGain()};
float lastGain{ soundSource->GetGain() };
ValueAnimation* fade{new ValueAnimation(context_)};
fade->SetKeyFrame(0.0f, lastGain);
......@@ -67,12 +67,12 @@ void EffectMaster::FadeOut(SoundSource* soundSource, float duration)
void EffectMaster::TransformTo(Node* node, Vector3 pos, Quaternion rot, float duration)
{
ValueAnimation* posAnim{new ValueAnimation(context_)};
ValueAnimation* posAnim{ new ValueAnimation(context_) };
posAnim->SetKeyFrame(0.0f, node->GetPosition());
posAnim->SetKeyFrame(duration, pos);
node->SetAttributeAnimation("Position", posAnim, WM_ONCE);
ValueAnimation* rotAnim{new ValueAnimation(context_)};
ValueAnimation* rotAnim{ new ValueAnimation(context_) };
rotAnim->SetKeyFrame(0.0f, node->GetRotation());
rotAnim->SetKeyFrame(duration, rot);
node->SetAttributeAnimation("Rotation", rotAnim, WM_ONCE);
......@@ -83,7 +83,8 @@ void EffectMaster::ArchTo(Node* node, Vector3 pos, Quaternion rot, float archHei
ValueAnimation* posAnim{new ValueAnimation(context_)};
posAnim->SetKeyFrame(0.0f, node->GetPosition());
for (int i{0}; i < WAYPOINTS - 1; ++i){
for (int i{0}; i < WAYPOINTS - 1; ++i) {
float t{static_cast<float>(i) / WAYPOINTS};
float t2 = 0.5f * (t + (0.5f + 0.5f * pow(2.0f * (t - 0.5f), 3.0f)));
posAnim->SetKeyFrame(delay + (duration * t2),
......@@ -92,7 +93,7 @@ void EffectMaster::ArchTo(Node* node, Vector3 pos, Quaternion rot, float archHei
posAnim->SetKeyFrame(delay + duration, pos);
node->SetAttributeAnimation("Position", posAnim, WM_ONCE);
ValueAnimation* rotAnim{new ValueAnimation(context_)};
ValueAnimation* rotAnim{ new ValueAnimation(context_) };
rotAnim->SetKeyFrame(0.0f, node->GetRotation());
if (delay != 0.0f)
rotAnim->SetKeyFrame(delay, node->GetRotation());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment