Merry christmas!

0LGL0 · Dec 24, 2022 · 0681a44 · 0681a44
1 parent 0600b24
commit 0681a44
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 5 deletions.
diff --git a/bin-int/Release-x64/OpenGL/OpenGL.tlog/CL.command.1.tlog b/bin-int/Release-x64/OpenGL/OpenGL.tlog/CL.command.1.tlog
diff --git a/bin-int/Release-x64/OpenGL/OpenGL.tlog/CL.read.1.tlog b/bin-int/Release-x64/OpenGL/OpenGL.tlog/CL.read.1.tlog
diff --git a/bin-int/Release-x64/OpenGL/OpenGL.tlog/CL.write.1.tlog b/bin-int/Release-x64/OpenGL/OpenGL.tlog/CL.write.1.tlog
diff --git a/bin-int/Release-x64/OpenGL/OpenGL.tlog/link.write.1.tlog b/bin-int/Release-x64/OpenGL/OpenGL.tlog/link.write.1.tlog
diff --git a/imgui.ini b/imgui.ini
@@ -39,9 +39,9 @@ Size=199,130
 Collapsed=0
 
 [Window][Dear ImGui Demo]
-Pos=141,34
+Pos=263,73
 Size=558,680
-Collapsed=1
+Collapsed=0
 
 [Window][Scene settings]
 Pos=626,65
@@ -70,7 +70,7 @@ Collapsed=0
 
 [Window][Example: Auto-resizing window]
 Pos=89,78
-Size=542,369
+Size=451,267
 Collapsed=0
 
 [Window][Dear ImGui Metrics/Debugger]
@@ -148,6 +148,11 @@ Pos=43,186
 Size=404,234
 Collapsed=0
 
+[Window][Christmas!]
+Pos=183,113
+Size=719,274
+Collapsed=0
+
 [Table][0xD0F0C6E3,2]
 Column 0  Weight=1.0000
 Column 1  Weight=1.0000

diff --git a/src/Engine/Events/UpdateEvents.cpp b/src/Engine/Events/UpdateEvents.cpp
@@ -79,10 +79,10 @@ void Hyko::EUpdates::EventUpdate(Hyko::Time ts)
 
 	////////////////////////////////////////////////////////////////////////////////////////////
 
-	//if (MainEditoreUI.mashIsCreated(HK_TRIANGLE)) {
+	if (MainEditoreUI.mashIsCreated(HK_TRIANGLE)) {
 		entity.render(HK_TRIANGLE);
 		entity.EndDraw();
-	//}
+	}
 
 	c_shader.unUse();
 

diff --git a/src/Engine/UI/Editor/MainEditorUI/EditorToolbar.cpp b/src/Engine/UI/Editor/MainEditorUI/EditorToolbar.cpp
@@ -22,6 +22,12 @@ void Hyko::EToolbar::create_Menu()
 	}
 }
 
+void Hyko::EToolbar::Christmas()
+{
+	ImGui::Text("Merry christmas!");
+	ImGui::Text("Congratulations on the new year 2023");
+}
+
 void Hyko::EToolbar::createEToolbar()
 {
 	ImGuiWindowFlags winFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_MenuBar
@@ -45,6 +51,10 @@ void Hyko::EToolbar::createEToolbar()
 			ImGui::EndMenu();
 		}
 
+		if (ImGui::BeginMenu("Christmas")) {
+			Christmas();
+		}
+
 		ImGui::EndMenuBar();
 	}
 

diff --git a/src/Engine/UI/Editor/MainEditorUI/EditorToolbar.h b/src/Engine/UI/Editor/MainEditorUI/EditorToolbar.h
@@ -13,6 +13,7 @@ namespace Hyko {
 	private:
 		void sceneData_Menu();
 		void create_Menu();
+		void Christmas();
 	public:
 		bool meshIsCreting = false;
 	public: