Skip to content

Commit

Permalink
Seed color changes bloom color. That was too easy. Closes #46
Browse files Browse the repository at this point in the history
  • Loading branch information
derwt committed Dec 3, 2017
1 parent d4292ba commit f175a98
Show file tree
Hide file tree
Showing 7 changed files with 128 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Assets/Terrains.meta → Assets/Packages/Tools.meta

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

30 changes: 18 additions & 12 deletions Assets/Prefabs/VRTK/Flowers/Sunflower.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ GameObject:
- component: {fileID: 23206060800233186}
- component: {fileID: 64179099178580492}
m_Layer: 0
m_Name: Sunflower
m_Name: Leaf Lower
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -82,7 +82,7 @@ GameObject:
- component: {fileID: 23997813459279372}
- component: {fileID: 64689064004429126}
m_Layer: 0
m_Name: Sunflower
m_Name: Bloom
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -100,7 +100,7 @@ GameObject:
- component: {fileID: 23778295401387764}
- component: {fileID: 64680904397958450}
m_Layer: 0
m_Name: Sunflower
m_Name: Stamen
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -118,7 +118,7 @@ GameObject:
- component: {fileID: 23780447910437418}
- component: {fileID: 64770743827284414}
m_Layer: 0
m_Name: Sunflower
m_Name: Leaf Upper
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -136,7 +136,7 @@ GameObject:
- component: {fileID: 23564648708950242}
- component: {fileID: 64475891409369482}
m_Layer: 0
m_Name: Sunflower
m_Name: Stem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -153,7 +153,7 @@ Transform:
m_LocalScale: {x: 2.2173548, y: 2.956473, z: 2.2173548}
m_Children: []
m_Father: {fileID: 4331644278582824}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4259036973078646
Transform:
Expand All @@ -166,7 +166,7 @@ Transform:
m_LocalScale: {x: 21.128536, y: 2.931871, z: 2.1744735}
m_Children: []
m_Father: {fileID: 4331644278582824}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4331644278582824
Transform:
Expand All @@ -175,14 +175,14 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1341620893350032}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.1, y: 0.79, z: -0.4401}
m_LocalPosition: {x: -1.1802173, y: 0.7657552, z: 0.001499981}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4907994752683166}
- {fileID: 4532034301077176}
- {fileID: 4259036973078646}
- {fileID: 4165328751733102}
- {fileID: 4588362978917344}
- {fileID: 4907994752683166}
- {fileID: 4395581133092512}
m_Father: {fileID: 0}
m_RootOrder: 0
Expand Down Expand Up @@ -211,7 +211,7 @@ Transform:
m_LocalScale: {x: 21.818066, y: 3.0275567, z: 2.2454379}
m_Children: []
m_Father: {fileID: 4331644278582824}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4588362978917344
Transform:
Expand All @@ -224,7 +224,7 @@ Transform:
m_LocalScale: {x: 3, y: 4, z: 3}
m_Children: []
m_Father: {fileID: 4331644278582824}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4907994752683166
Transform:
Expand All @@ -237,7 +237,7 @@ Transform:
m_LocalScale: {x: 3, y: 4, z: 3}
m_Children: []
m_Father: {fileID: 4331644278582824}
m_RootOrder: 4
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23206060800233186
MeshRenderer:
Expand Down Expand Up @@ -687,6 +687,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
canBePicked: 0
isAttached: 1
bloom: {fileID: 23997813459279372}
stamen: {fileID: 23778295401387764}
stem: {fileID: 23564648708950242}
leaves:
- {fileID: 23780447910437418}
- {fileID: 23206060800233186}
flowerWorth: 5
--- !u!114 &114926301282557006
MonoBehaviour:
Expand Down
10 changes: 10 additions & 0 deletions Assets/PrimitivePlus/Resources/Materials.meta

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

1 change: 0 additions & 1 deletion Assets/Scripts/Flori_DyeBowl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public class Flori_DyeBowl : MonoBehaviour {
// Use this for intialization
void Start() {

// need to set this correctly to "Dye" GameObject mesh color
dyeColor = dye.GetComponent<MeshRenderer>().material.color;
dyeCounter = dyeingDuration;

Expand Down
33 changes: 33 additions & 0 deletions Assets/Scripts/Flori_Flower.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ public class Flori_Flower : MonoBehaviour {
[Tooltip("Signifies if the flower is attached to a seed")]
public bool isAttached = true;

[Header("Flower Coloring Data")]
[Tooltip("Object mesh in flower bloom to be colored.")]
public MeshRenderer bloom;
[Tooltip("Object mesh in flower stamen to be colored.")]
public MeshRenderer stamen;
[Tooltip("Object mesh of flower stem to be colored.")]
public MeshRenderer stem;
[Tooltip("All object meshes in flower leaves to be colored.")]
public List<MeshRenderer> leaves = new List<MeshRenderer>();

[Header("Flower Data")]
[Tooltip("Amount of money this flower sells for at the market")]
public int flowerWorth = 5;
Expand Down Expand Up @@ -55,4 +65,27 @@ public Flori_Seed GetParentSeed()
return parentSeed;
}

public void SetBloomColor(Color bloomColor)
{
bloom.material.color = bloomColor;
}

public void SetStamenColor(Color stamenColor)
{
stamen.material.color = stamenColor;
}

public void SetLeavesColor(Color leafColor)
{
foreach (MeshRenderer leaf in leaves)
{
leaf.material.color = leafColor;
}
}

public void SetStemColor(Color stemColor)
{
stem.material.color = stemColor;
}

}
17 changes: 17 additions & 0 deletions Assets/Scripts/Flori_Seed.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ public void Sprout()
{
flower = (GameObject)Instantiate (flowerModel, transform);
flower.name = flower.name.TrimEnd (new char[] {'(', 'C', 'l', 'o', 'n', 'e', ')' });

ColorFlower (flower);
SetFlowerComponents (false);

flower.transform.localPosition = Vector3.zero;
Vector3 rotation = flower.transform.localRotation.eulerAngles;
rotation.x = 0;
Expand Down Expand Up @@ -171,4 +174,18 @@ public GameObject GetFlower()
return flower;
}

Color GetSeedColor()
{
return GetComponent<MeshRenderer> ().material.color;
}

public void ColorFlower(GameObject flower)
{
Flori_Flower flori = flower.GetComponent<Flori_Flower> ();
flori.SetBloomColor (GetSeedColor());
// flori.SetLeavesColor ();
// flori.SetStamenColor();
// flori.SetStemColor();
}

}
54 changes: 48 additions & 6 deletions Assets/_Scenes/Main.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1366,7 +1366,7 @@ Transform:
m_Children:
- {fileID: 732218017}
m_Father: {fileID: 2051997747}
m_RootOrder: 4
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &814750384
Prefab:
Expand Down Expand Up @@ -1967,8 +1967,50 @@ Transform:
- {fileID: 2051997747}
- {fileID: 604015810}
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1115260998
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4331644278582824, guid: 4fe1911cb91884844ab2eb6195148565, type: 2}
propertyPath: m_LocalPosition.x
value: -1.1802173
objectReference: {fileID: 0}
- target: {fileID: 4331644278582824, guid: 4fe1911cb91884844ab2eb6195148565, type: 2}
propertyPath: m_LocalPosition.y
value: 0.7657552
objectReference: {fileID: 0}
- target: {fileID: 4331644278582824, guid: 4fe1911cb91884844ab2eb6195148565, type: 2}
propertyPath: m_LocalPosition.z
value: 0.001499981
objectReference: {fileID: 0}
- target: {fileID: 4331644278582824, guid: 4fe1911cb91884844ab2eb6195148565, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4331644278582824, guid: 4fe1911cb91884844ab2eb6195148565, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4331644278582824, guid: 4fe1911cb91884844ab2eb6195148565, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4331644278582824, guid: 4fe1911cb91884844ab2eb6195148565, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4331644278582824, guid: 4fe1911cb91884844ab2eb6195148565, type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 4fe1911cb91884844ab2eb6195148565, type: 2}
m_IsPrefabParent: 0
--- !u!1001 &1170279234
Prefab:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2391,7 +2433,7 @@ Transform:
- {fileID: 69424107}
- {fileID: 605549507}
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1573085298
MonoBehaviour:
Expand Down Expand Up @@ -3236,7 +3278,7 @@ Transform:
- {fileID: 650965177}
- {fileID: 97079004}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2035761632
Prefab:
Expand Down Expand Up @@ -3307,9 +3349,9 @@ Transform:
m_Children:
- {fileID: 1021861724}
- {fileID: 1448518285}
- {fileID: 773125049}
- {fileID: 547266189}
- {fileID: 1523674353}
- {fileID: 773125049}
- {fileID: 722308909}
- {fileID: 1468760453}
- {fileID: 1950226970}
Expand Down Expand Up @@ -3349,7 +3391,7 @@ Transform:
- {fileID: 1039048402}
- {fileID: 647210372}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2133903929
Prefab:
Expand Down

0 comments on commit f175a98

Please sign in to comment.