Skip to content

Commit

Permalink
change colorutils to hftcolorutils
Browse files Browse the repository at this point in the history
  • Loading branch information
greggman committed Jul 9, 2015
1 parent a11e0a4 commit df529fd
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 117 deletions.
Binary file modified Assets/HappyFunTimes/Samples/Prefabs/Character.prefab
Binary file not shown.
Binary file modified Assets/HappyFunTimes/Samples/Prefabs/OrientationPlayer.prefab
Binary file not shown.
4 changes: 2 additions & 2 deletions Assets/HappyFunTimes/Samples/Scripts/BirdScript.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ void SetName(string name)
float satAdjust = (colorNdx & 0x04) != 0 ? -0.5f : 0.0f;

// get the hsva for the baseColor
Vector4 hsva = ColorUtils.ColorToHSVA(baseColor);
Vector4 hsva = HFTColorUtils.ColorToHSVA(baseColor);

// adjust that base color by the amount we picked
hsva.x += hueAdjust;
hsva.y += satAdjust;
hsva.z += valueAdjust;

// now get the adjusted color.
Color playerColor = ColorUtils.HSVAToColor(hsva);
Color playerColor = HFTColorUtils.HSVAToColor(hsva);

// Create a 1 pixel texture for the OnGUI code to draw the label
Color[] pix = new Color[1];
Expand Down
101 changes: 0 additions & 101 deletions Assets/HappyFunTimes/Scripts/ColorUtils.cs

This file was deleted.

12 changes: 0 additions & 12 deletions Assets/HappyFunTimes/Scripts/ColorUtils.cs.meta

This file was deleted.

2 changes: 1 addition & 1 deletion Assets/HappyFunTimes/Scripts/HFTGamepad.cs
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ private class MessageRot : MessageCmdData {
float alpha = 1.0f;

Vector4 hsva = new Vector4(hue, sat, value, alpha);
m_color = ColorUtils.HSVAToColor(hsva);
m_color = HFTColorUtils.HSVAToColor(hsva);
}

void Remove(object sender, System.EventArgs e)
Expand Down
2 changes: 1 addition & 1 deletion Assets/WebPlayerTemplates/HappyFunTimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
},
"name": "HappyFunTimes Gamepad",
"private": false,
"version": "0.0.7"
"version": "0.0.8"
}
Binary file modified ProjectSettings/EditorBuildSettings.asset
Binary file not shown.

0 comments on commit df529fd

Please sign in to comment.