Merge branch 'master' of https://github.com/MinhPhu0304/iDesign into bugfix-filters

Author: KadinHoneyfield

Assets/scripts/FilterTypeBehaviour.cs

@@ -38,8 +38,6 @@ private void GenerateButtons(List<string> foundStrings)
     {
         foreach (string FoundCategory in foundStrings)
         {
-            Debug.Log("Found "+FoundCategory);
-
             GameObject FilterButton = Instantiate(TypePrefab);
 
             FilterButton.GetComponentInChildren<Text>().text = FoundCategory;
@@ -51,9 +49,9 @@ private void GenerateButtons(List<string> foundStrings)
             if (ContentForScroll != null)
             {
                 FilterButton.transform.SetParent(ContentForScroll.transform, false);
-                Debug.Log("IF ACCESSED");
             }
-            else {
+            else
+            {
                 FilterButton.transform.SetParent(ParentPanel.transform, false);
             }
 
@@ -66,8 +64,6 @@ private void ActivateFilter(GameObject ButtonPressed)
         string ButtonText = ButtonPressed.GetComponentInChildren<Text>().text;
 
         GameObject SearchBox = GameObject.Find("InputField");
-        Debug.Log(SearchBox);
-        Debug.Log(ButtonText);
 
         SearchBox.GetComponent<InputField>().text = ButtonText;
         CatalogueScript.showingItems = true;
@@ -83,10 +79,4 @@ private void SetButtonSize(GameObject Button)
         RectTransform rt = Button.GetComponent<RectTransform>();
         rt.sizeDelta = new Vector2(ParentPanel.GetComponent<RectTransform>().rect.width - SIDEGAP, HEIGHT);
     }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }

Assets/scripts/LoadCatalog.cs

@@ -51,7 +51,9 @@ void Start()
         itemManager = GameObject.Find("Item Manager").GetComponent<ItemManager>();
 
         loadedItems = itemManager.GetItemList();
-        GenerateLists();
+
+        GenerateAllListingFromItemManager();
+
         int listingNo = 0;
         foreach (Item itemInList in loadedItems)
         {
@@ -81,9 +83,6 @@ void Start()
             listingNo++;
         }
 
-        Debug.Log($"List<T>: {itemListings.Count}");
-
-
         listingNo = 0;
         foreach (string category in foundCategories)
         {
@@ -207,8 +206,6 @@ public void SearchCatalog()
             return;
         }
 
-        Debug.Log("Searching for: " + search);
-
         List<Item> searchResults = new List<Item>();
 
         foreach (Item foundItem in loadedItems)
@@ -254,7 +251,7 @@ public void SearchCatalog()
 
         }
 
-        hideListings();
+        HideListings();
 
         foreach (Item toShow in searchResults)
         {
@@ -263,7 +260,7 @@ public void SearchCatalog()
     }
 
     //Hides all listings currently visible
-    private void hideListings()
+    private void HideListings()
     {
         List<GameObject> listingsToHide = new List<GameObject>();
 
@@ -287,25 +284,22 @@ private void hideListings()
     //Shows listing that is passed in and updates visible/disabled lists
     private void showListing(Item listing)
     {
-        Debug.Log($"Looking for: Listing: {listing.GetItemID()} {listing.GetName()}");
-
         GameObject content = GameObject.Find("Content");
-        GameObject toShow = content.transform.Find($"Listing: { listing.GetItemID()} { listing.GetName()}").gameObject;
+        GameObject itemFound = content.transform.Find($"Listing: { listing.GetItemID()} { listing.GetName()}").gameObject;
 
-        toShow.SetActive(true);
+        itemFound.SetActive(true);
 
-        visibleListings.Add(toShow);
-        disabledListings.Remove(toShow);
+        visibleListings.Add(itemFound);
+        disabledListings.Remove(itemFound);
         UpdateItemManagerModels();
     }
 
     private void NavigateToInfoScene(Item itemToShow)
     {
-        Debug.Log("Navigate to infoscene");
         itemSceneController.GetComponent<ItemDisplayPanelBehaviour>().SetCurrentItem(itemToShow);
     }
 
-    private void GenerateLists()
+    private void GenerateAllListingFromItemManager()
     {
         foreach (Item item in loadedItems)
         {
@@ -314,11 +308,7 @@ private void GenerateLists()
 
             foreach (string category in itemCategories)
             {
-                if (foundCategories.Contains(category))
-                {
-                    Debug.Log($"Category {category} is already in foundCategories.");
-                }
-                else
+                if (!foundCategories.Contains(category))
                 {
                     foundCategories.Add(category);
                 }
@@ -339,16 +329,13 @@ private void GenerateLists()
         foundCategories.Sort();
         foundBrands.Sort();
         foundDesigners.Sort();
-
-        var result = string.Join(", ", foundCategories.ToArray());
-        Debug.Log($"Categories loaded: {result}");
     }
 
     public void ChangeContentToCategory(string category)
     {
         GameObject content = GameObject.Find("Content");
 
-        hideListings();
+        HideListings();
 
         foreach (Item itemInList in loadedItems)
         {
@@ -360,10 +347,4 @@ public void ChangeContentToCategory(string category)
         }
         showingItems = true;
     }
-
-    // Update is called once per frame
-    void Update()
-    {
-
-    }
 }

Assets/scripts/SwitchToCameraScene.cs

@@ -19,6 +19,6 @@ void Update()
 
     public void SwitchToCamera()
     {
-        SceneManager.LoadScene("ARScene");
+        SceneManager.LoadScene("ARManipulation");
     }
 }