Browse Source

Correct data type for spawn object counting variable.

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
d37ff60001
1 changed files with 9 additions and 15 deletions
  1. 9 15
      Bin/Data/Scripts/Editor/EditorSpawn.as

+ 9 - 15
Bin/Data/Scripts/Editor/EditorSpawn.as

@@ -13,11 +13,11 @@ Window@ spawnWindow;
 Vector3 randomRotation = Vector3(0, 0, 0);
 Vector3 randomRotation = Vector3(0, 0, 0);
 float randomScaleMin = 1;
 float randomScaleMin = 1;
 float randomScaleMax = 1;
 float randomScaleMax = 1;
-float spawnCount = 1;
+uint spawnCount = 1;
 float spawnRadius = 0;
 float spawnRadius = 0;
 bool useNormal = true;
 bool useNormal = true;
 
 
-int numberSpawnedObjects = 1;
+uint numberSpawnedObjects = 1;
 Array<String> spawnedObjectsNames;
 Array<String> spawnedObjectsNames;
 
 
 void CreateSpawnEditor()
 void CreateSpawnEditor()
@@ -82,7 +82,6 @@ void HideSpawnEditor()
     spawnWindow.visible = false;
     spawnWindow.visible = false;
 }
 }
 
 
-
 void PickSpawnObject()
 void PickSpawnObject()
 {
 {
     @resourcePicker = GetResourcePicker(ShortStringHash("Node"));
     @resourcePicker = GetResourcePicker(ShortStringHash("Node"));
@@ -96,7 +95,6 @@ void PickSpawnObject()
     SubscribeToEvent(uiFileSelector, "FileSelected", "PickSpawnObjectDone");
     SubscribeToEvent(uiFileSelector, "FileSelected", "PickSpawnObjectDone");
 }
 }
 
 
-
 void EditRandomRotation(StringHash eventType, VariantMap& eventData)
 void EditRandomRotation(StringHash eventType, VariantMap& eventData)
 {
 {
     LineEdit@ edit = eventData["Element"].GetPtr();
     LineEdit@ edit = eventData["Element"].GetPtr();
@@ -112,20 +110,16 @@ void EditRandomScale(StringHash eventType, VariantMap& eventData)
     UpdateHierarchyItem(editorScene);
     UpdateHierarchyItem(editorScene);
 }
 }
 
 
-
-
 void ToggleUseNormal(StringHash eventType, VariantMap& eventData)
 void ToggleUseNormal(StringHash eventType, VariantMap& eventData)
 {
 {
     useNormal = cast<CheckBox>(eventData["Element"].GetPtr()).checked;
     useNormal = cast<CheckBox>(eventData["Element"].GetPtr()).checked;
 }
 }
 
 
-
-
 void UpdateNumberSpawnedObjects(StringHash eventType, VariantMap& eventData)
 void UpdateNumberSpawnedObjects(StringHash eventType, VariantMap& eventData)
 {
 {
     LineEdit@ edit = eventData["Element"].GetPtr();
     LineEdit@ edit = eventData["Element"].GetPtr();
-    numberSpawnedObjects = edit.text.ToFloat();
-    edit.text = String(numberSpawnedObjects); 
+    numberSpawnedObjects = edit.text.ToUInt();
+    edit.text = String(numberSpawnedObjects);
     RefreshPickedObjects();
     RefreshPickedObjects();
 }
 }
 
 
@@ -134,10 +128,11 @@ void EditSpawnRadius(StringHash eventType, VariantMap& eventData)
     LineEdit@ edit = eventData["Element"].GetPtr();
     LineEdit@ edit = eventData["Element"].GetPtr();
     spawnRadius = edit.text.ToFloat();
     spawnRadius = edit.text.ToFloat();
 }
 }
+
 void EditSpawnCount(StringHash eventType, VariantMap& eventData)
 void EditSpawnCount(StringHash eventType, VariantMap& eventData)
 {
 {
     LineEdit@ edit = eventData["Element"].GetPtr();
     LineEdit@ edit = eventData["Element"].GetPtr();
-    spawnCount = edit.text.ToFloat();
+    spawnCount = edit.text.ToUInt();
 }
 }
 
 
 void RefreshPickedObjects()
 void RefreshPickedObjects()
@@ -170,9 +165,9 @@ void EditSpawnedObjectName(StringHash eventType, VariantMap& eventData)
 {
 {
     LineEdit@ nameEdit = eventData["Element"].GetPtr();
     LineEdit@ nameEdit = eventData["Element"].GetPtr();
     int index = nameEdit.vars["Index"].GetUInt();
     int index = nameEdit.vars["Index"].GetUInt();
-    String resourceName = nameEdit.text;
-    spawnedObjectsNames[index] = VerifySpawnedObjectFile(resourceName);
-    RefreshPickedObjects();
+    String resourceName = VerifySpawnedObjectFile(nameEdit.text);
+    nameEdit.text = resourceName;
+    spawnedObjectsNames[index] = resourceName;
 }
 }
 
 
 String VerifySpawnedObjectFile(const String&in resourceName)
 String VerifySpawnedObjectFile(const String&in resourceName)
@@ -298,4 +293,3 @@ void SpawnObject()
         }
         }
     }
     }
 }
 }
-