Skip to content

Commit

Permalink
"Minor" bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@amelted
amelted authored Sep 25, 2020
1 parent e3e2bf4 commit 3775864
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 20 deletions.
8 changes: 4 additions & 4 deletions QuickNoodle/Form1.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 25 additions & 16 deletions QuickNoodle/Form1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,18 +416,19 @@ public void newProcessing(float[] reds, float[] blues, float[] worldRotation, fl
{
dynamic _event = map._events[i];
float _time = _event._time;
if (isNull)
continue;
if (!_event.ContainsKey("_customData"))
{
_event.Add(new JProperty("_customData", new JObject()));
}
if (_event._type == 12 || _event._type == 13)
continue;
if (time <= _time /* if time of bookmark is less than time of note && _time < _nextTime*/)
{

switch (_event._value)
if (isNull)
continue;
if (!_event.ContainsKey("_customData"))
{
_event.Add(new JProperty("_customData", new JObject()));
}
if (_event._type == 12 || _event._type == 13)
continue;

switch (int.Parse(_event._value.ToString()))
{
case 1:
if (!_event._customData.ContainsKey("_color"))
Expand All @@ -436,8 +437,10 @@ public void newProcessing(float[] reds, float[] blues, float[] worldRotation, fl
}
else
{
_event._customData._color = blues;
_event._customData._color = new JArray(blues);
}
map._events[i] = _event;
Console.WriteLine(_event._customData.ContainsKey("_color"));
break;
case 2:
if (!_event._customData.ContainsKey("_color"))
Expand All @@ -446,8 +449,9 @@ public void newProcessing(float[] reds, float[] blues, float[] worldRotation, fl
}
else
{
_event._customData._color = blues;
_event._customData._color = new JArray(blues);
}
map._events[i] = _event;
break;
case 3:
if (!_event._customData.ContainsKey("_color"))
Expand All @@ -456,8 +460,9 @@ public void newProcessing(float[] reds, float[] blues, float[] worldRotation, fl
}
else
{
_event._customData._color = blues;
_event._customData._color = new JArray(blues);
}
map._events[i] = _event;
break;
case 5:
if (!_event._customData.ContainsKey("_color"))
Expand All @@ -466,8 +471,9 @@ public void newProcessing(float[] reds, float[] blues, float[] worldRotation, fl
}
else
{
_event._customData._color = reds;
_event._customData._color = new JArray(reds);
}
map._events[i] = _event;
break;
case 6:
if (!_event._customData.ContainsKey("_color"))
Expand All @@ -476,8 +482,9 @@ public void newProcessing(float[] reds, float[] blues, float[] worldRotation, fl
}
else
{
_event._customData._color = reds;
_event._customData._color = new JArray(reds);
}
map._events[i] = _event;
break;
case 7:
if (!_event._customData.ContainsKey("_color"))
Expand All @@ -486,11 +493,13 @@ public void newProcessing(float[] reds, float[] blues, float[] worldRotation, fl
}
else
{
_event._customData._color = reds;
_event._customData._color = new JArray(reds);
}
map._events[i] = _event;
break;
}
map._events[i] = _event;


}


Expand Down
Binary file modified QuickNoodle/bin/Debug/QuickNoodle.exe
View file
Binary file not shown.
Binary file modified QuickNoodle/bin/Debug/QuickNoodle.pdb
View file
Binary file not shown.
Binary file added QuickNoodle/bin/QuickNoodle.zip
View file
Binary file not shown.

0 comments on commit 3775864

Please sign in to comment.