disabled timer change

uw-cmg · May 18, 2015 · 42fbcd6 · 42fbcd6
1 parent 26b5a3f
commit 42fbcd6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/Assets/Resources/box.txt b/Assets/Resources/box.txt
@@ -1,5 +1,5 @@
 8
-dimer molecule, potential=buckingham, temperature=400, volume=8000, timespeed=normal
+dimer molecule, potential=buckingham, temperature=400, volume=8000, timespeed=slowmotion
 Na	-1	-1	-1	0	0	0
 Cl	+1	-1	-1	0	0	0
 Na	+1	+1	-1	0	0	0

diff --git a/Assets/Resources/sceneloadtest0.txt b/Assets/Resources/sceneloadtest0.txt
@@ -1,5 +1,5 @@
 8
-dimer molecule,potential=lennardjones,temperature=400,volume=1000,timespeed=normal
+dimer molecule,potential=lennardjones,temperature=400,volume=1000,timespeed=slowmotion
 Na	-2	-2	-2	0	0	0
 Cl	+2	-2	-2	0	0	0
 Na	+2	+2	-2	0	0	0

diff --git a/Assets/Scripts/AtomTouchGUI.cs b/Assets/Scripts/AtomTouchGUI.cs
@@ -467,7 +467,19 @@ public static int IntParseFast(string value)
 			volSliderComponent.value = floor * stepSize + stepSize;
 
 	}
+	/*
+	public void ChangeTimerIcon(){
+		RawImage ri = timer.GetComponent<RawImage>();
+		if(currentTimeSpeed == StaticVariables.TimeSpeed.Normal){
+
+		}else if(currentTimeSpeed == StaticVariables.TimeSpeed.Stopped){
 
+		}else if(currentTimeSpeed == StaticVariables.TimeSpeed.SlowMotion){
+
+		}
+	}
+	*/
+	//when clicking on timer
 	public void changeTimer(){
 		RawImage ri = timer.GetComponent<RawImage>();
 		if(currentTimeSpeed == StaticVariables.TimeSpeed.Normal){

diff --git a/Assets/Scripts/CreateEnvironment.cs b/Assets/Scripts/CreateEnvironment.cs
@@ -380,17 +380,20 @@ public void CreatePresetConfiguration(string filename)
 				atomTouchGUI.volSliderComponent.value = sliderVal;
 				atomTouchGUI.SnapVolumeToInterval(0.5f);
 			}
+			/*
 			else if (attr.Equals("timespeed"))
 			{
 				string val = textArray2[1].Trim().ToLower();
-				if (val.Equals("stopped"))
+				if (val.Equals("stopped")){
 					AtomTouchGUI.currentTimeSpeed = StaticVariables.TimeSpeed.Stopped;
-					//change texture
-				if (val.Equals("slowmotion"))
+				}else if (val.Equals("slowmotion")){
 					AtomTouchGUI.currentTimeSpeed = StaticVariables.TimeSpeed.SlowMotion;
-				if (val.Equals("normal"))
+				}else{
 					AtomTouchGUI.currentTimeSpeed = StaticVariables.TimeSpeed.Normal;
+				}
+				atomTouchGUI.changeTimer();
 			}
+			*/
 
 		}