Removed more warnings

ToniPlays · Jan 4, 2022 · bb152b4 · bb152b4
1 parent 005b51e
commit bb152b4
Show file tree

Hide file tree

Showing 18 changed files with 253 additions and 2,435 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Hazard/src/Hazard/Core/Buffer.h b/Hazard/src/Hazard/Core/Buffer.h
@@ -13,7 +13,7 @@ namespace Hazard
 		void Allocate(uint32_t size) 
 		{
 			if(Data != nullptr)
-				delete[] Data;
+				 free(Data);
 
 			Data = nullptr;
 
@@ -24,7 +24,7 @@ namespace Hazard
 		}
 		void Release() 
 		{
-			delete[] Data;
+			free(Data);
 			Data = nullptr;
 			Size = 0;
 		}

diff --git a/HazardEditor/src/GUI/EditorTabWindow.h b/HazardEditor/src/GUI/EditorTabWindow.h
@@ -14,7 +14,7 @@ namespace WindowElement {
 
 		void OnRender() override;
 		virtual void Render() = 0;
-		virtual bool OnEvent(Event& e) = 0;
+		virtual bool OnEvent(Event& e) override = 0;
 
 		const std::vector<RenderableElement*>& GetElements() { return m_Elements; }
 
@@ -53,4 +53,4 @@ namespace WindowElement {
 		std::vector<RenderableElement*> m_Elements = std::vector<RenderableElement*>();
 		std::string m_Title;
 	};
-}
+}
diff --git a/HazardEditor/src/GUI/EditorView.cpp b/HazardEditor/src/GUI/EditorView.cpp
@@ -172,6 +172,8 @@ namespace WindowElement {
 			m_Renderer = new EditorPlatformVulkan(nativeWindow, context);
 			break;
 #endif
+            default:
+                break;
 		}
 	}
 	bool EditorView::OnWindowFocus(WindowFocusEvent& e)

diff --git a/HazardEditor/src/GUI/EditorView.h b/HazardEditor/src/GUI/EditorView.h
@@ -13,10 +13,10 @@ namespace WindowElement {
 		EditorView();
 		~EditorView() = default;
 
-		void Init();
+		void Init() override;
 		void Update() override;
 		void Render() override;
-		bool OnEvent(Hazard::Event& e);
+		bool OnEvent(Hazard::Event& e) override;
 
 		void Close() override;
 
@@ -75,4 +75,4 @@ namespace WindowElement {
 		EditorGuiPlatform* m_Renderer = nullptr;
 		Rendering::RenderContext* m_Context = nullptr;
 	};
-}
+}
diff --git a/HazardEditor/src/GUI/EditorWindow.h b/HazardEditor/src/GUI/EditorWindow.h
@@ -12,11 +12,9 @@ namespace WindowElement {
 
 
 		void OnRender() override;
-		virtual void Init() {};
 		virtual void OnWindowRender() = 0;
 		virtual void OnBeforeRender() {};
 		virtual void OnAfterRender() {};
-		virtual bool OnEvent(Hazard::Event& e) override { return false; };
 
 		bool IsActive() { return m_Active; }
 		bool IsFocused() { return m_Focused; }
@@ -35,4 +33,4 @@ namespace WindowElement {
 
 		ImGuiWindowFlags m_Flags;
 	};
-}
+}
diff --git a/HazardEditor/src/GUI/RenderableElement.h b/HazardEditor/src/GUI/RenderableElement.h
@@ -18,4 +18,4 @@ namespace WindowElement
 		virtual void OnRender() {};
 		virtual bool OnEvent(Hazard::Event& e) { return false; };
 	};
-}
+}
diff --git a/HazardEditor/src/GUI/Window/Editor/WelcomePopup.h b/HazardEditor/src/GUI/Window/Editor/WelcomePopup.h
@@ -11,7 +11,6 @@ namespace WindowElement {
 		~WelcomePopup() = default;
 
 		void OnWindowRender() override;
-		virtual void Init() {};
 		virtual bool OnEvent(Hazard::Event& e) override;
 
 	private:
@@ -20,4 +19,4 @@ namespace WindowElement {
 	private:
 		const char* m_Title = "Popup";
 	};
-}
+}
diff --git a/HazardEditor/src/GUI/Window/Inspect/FileView.cpp b/HazardEditor/src/GUI/Window/Inspect/FileView.cpp
@@ -205,6 +205,7 @@ namespace WindowElement {
 		case Hazard::AssetType::Image:				return Style::ColorAsImVec4(Style::GetStyleColor(ColorType::Critical));
 		case Hazard::AssetType::EnvironmentMap:		return Style::ColorAsImVec4(Style::GetStyleColor(ColorType::Primary));
 		case Hazard::AssetType::PhysicsMaterial:	return Style::ColorAsImVec4(Style::GetStyleColor(ColorType::Primary));
+        default:                                    return Style::ColorAsImVec4(Style::GetStyleColor(ColorType::Text));
 		}
 	}
 	Ref<Rendering::Texture2D> FileView::GetFileImageFromType(const AssetMetadata& metadata)
@@ -218,9 +219,10 @@ namespace WindowElement {
 		case Hazard::AssetType::AudioClip:
 		case Hazard::AssetType::EnvironmentMap:
 		case Hazard::AssetType::PhysicsMaterial:	
-			return m_Images["folder"];
+			return m_Images["logo"];
+        default:
+            return m_Images["logo"];
 		}
-		return m_Images["logo"];
 	}
 	void FileView::UpdateFolderData()
 	{

diff --git a/HazardEditor/src/GUI/Window/Inspect/Properties.h b/HazardEditor/src/GUI/Window/Inspect/Properties.h
@@ -11,7 +11,7 @@ namespace WindowElement {
 		Properties();
 		~Properties() = default;
 
-		void Init();
+		void Init() override;
 		void OnUpdate() override;
 		void OnWindowRender() override;
 		bool OnEvent(Event& e) override;
@@ -24,4 +24,4 @@ namespace WindowElement {
 		Hazard::ECS::Entity m_SelectionContext;
 		bool m_Locked = false;
 	};
-}
+}
diff --git a/HazardEditor/src/Library/DragDropUtils.cpp b/HazardEditor/src/Library/DragDropUtils.cpp
@@ -1,4 +1,3 @@
-#pragma once
 
 #include <hzrpch.h>
 #include "DragDropUtils.h"
@@ -35,4 +34,4 @@ namespace WindowElement
 		if (ext == "obj") return "Mesh";
 		return "HAZARD_NULL";
 	}
-}
+}
diff --git a/HazardEditor/src/Library/Input.cpp b/HazardEditor/src/Library/Input.cpp
@@ -1,4 +1,3 @@
-#pragma once
 
 #include "Input.h"
 #include "Style.h"
@@ -405,7 +404,7 @@ namespace WindowElement {
 
 		if (meta.Has<HeaderAttribute>()) {
 			Style::SelectFont(1);
-			ImGui::Text(meta.Get<HeaderAttribute>().Header.c_str());
+			ImGui::Text("%s", meta.Get<HeaderAttribute>().Header.c_str());
 			ImGui::PopFont();
 		}
 
@@ -417,7 +416,9 @@ namespace WindowElement {
 			if (modified) 
 				field->SetValue<float>(value, runtime);
 		}
+            default:
+                return false;
 		}
 		return modified;
 	}
-}
+}
diff --git a/HazardEditor/src/Library/Layout/ContextMenus.cpp b/HazardEditor/src/Library/Layout/ContextMenus.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 
 #include "ContextMenus.h"
 #include "Layout.h"

diff --git a/HazardEditor/src/Library/Layout/Dockspace.cpp b/HazardEditor/src/Library/Layout/Dockspace.cpp
@@ -1,4 +1,3 @@
-#pragma once
 
 #include "Dockspace.h"
 
@@ -334,4 +333,4 @@ namespace ImGui
 		return TreeNodeWithIcon(icon, window->GetID(label), flags, label, NULL, iconTint);
 	}
 
-}
+}
diff --git a/HazardEditor/src/Library/Layout/Layout.cpp b/HazardEditor/src/Library/Layout/Layout.cpp
@@ -92,11 +92,11 @@ namespace WindowLayout
     }
     void Layout::Text(const std::string& text)
     {
-        ImGui::Text(text.c_str());
+        ImGui::Text("%s", text.c_str());
     }
     void Layout::TextColored(const char* text, const Color& color)
     {
-        ImGui::TextColored(Style::ColorAsImVec4(color), text);
+        ImGui::TextColored(Style::ColorAsImVec4(color), "%s", text);
     }
     void Layout::NextLine(float height)
     {

diff --git a/HazardEditor/src/Library/Layout/Layout.h b/HazardEditor/src/Library/Layout/Layout.h
@@ -88,7 +88,7 @@ namespace WindowLayout
 			ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{ 4, 4 });
 			float lineHeight = GImGui->Font->FontSize + GImGui->Style.FramePadding.y * 2.0f;
 			ImGui::Separator();
-			bool open = ImGui::TreeNodeEx((void*)name, flags, name);
+			bool open = ImGui::TreeNodeEx((void*)name, flags, "%s", name);
 			bool removed = false;
 			ImGui::PopStyleVar();
 

diff --git a/HazardEditor/src/Library/Style.cpp b/HazardEditor/src/Library/Style.cpp
@@ -1,4 +1,3 @@
-#pragma once
 
 #include "Style.h"
 
@@ -63,6 +62,7 @@ ImVec4 Style::AssetTypeColor(Hazard::AssetType type)
 	case AssetType::Mesh:				return ColorAsImVec4(GetStyleColor(ColorType::Info));
 	case AssetType::PhysicsMaterial:	return ColorAsImVec4(GetStyleColor(ColorType::Primary));
 	case AssetType::EnvironmentMap:		return ColorAsImVec4(Style::GetStyleColor(ColorType::Trace));
+    default:                            return ColorAsImVec4(GetStyleColor(ColorType::Text));
 	}
 }
 ImGuiTreeNodeFlags Style::GetTreeNodeDefaultFlags()
-Original file line number
+Diff line change
@@ Expand Up / @@ -172,6 +172,8 @@ namespace WindowElement { @@
     			m_Renderer = new EditorPlatformVulkan(nativeWindow, context);
     			break;
     #endif
+                default:
+                    break;
     		}
     	}
     	bool EditorView::OnWindowFocus(WindowFocusEvent& e)
@@ Expand Down @@