Merge branch 'master' into WindowEvent

TestApp1/TestApp1.cpp

@@ -19,50 +19,35 @@ public:
 		window->Activate();
 
 		window->AddEventHandler(this,
-			DKFunction([this](const DKWindow::WindowEvent& e)
-			{
-				DKLog("WindowEvent: %d, origin:(%.1f, %.1f), size:(%.1f x %.1f), content:(%.1f, %.1f), scale:%f",
-					  e.type,
-					  e.windowRect.origin.x, e.windowRect.origin.y,
-					  e.windowRect.size.width, e.windowRect.size.height,
-					  e.contentRect.size.width, e.contentRect.size.height,
-					  e.contentScaleFactor);
-				if (e.type == DKWindow::WindowEvent::WindowClosed)
-					DKApplication::Instance()->Terminate(0);
-			}),
-			DKFunction([this](const DKWindow::KeyboardEvent& e)
-			{
-				if (e.type == DKWindow::KeyboardEvent::KeyUp)
-				{
-					if (e.key == DKVK_ENTER || e.key == DKVK_RETURN)
-					{
-						window->SetTextInputEnabled(0, !window->IsTextInputEnabled(0));
-						DKLog("TextInput: %d", window->IsTextInputEnabled(0));
-					}
-					else if (e.key == DKVK_ESCAPE)
-					{
-						window->HoldMouse(0, !window->IsMouseHeld(0));
-						DKLog("HoldMouse: %d", window->IsMouseHeld(0));
-					}
-				}
-				DKLog("KeyboardEvent: %d, %ls, %ls",
-					  e.type,
-					  (const wchar_t*)DKWindow::GetVKName(e.key),
-					  (const wchar_t*)e.text);
-			}),
-			DKFunction([this](const DKWindow::MouseEvent& e)
-			{
-				if (e.type != DKWindow::MouseEvent::Move || window->IsMouseHeld(0))
-				{
-					DKLog("MouseEvent: %d, btn:%d, location:%.1f, %.1f, delta:%.1f, %.1f",
-						e.type, e.buttonId, e.location.x, e.location.y, e.delta.x, e.delta.y);
-				}
-			})
-		);
+			DKFunction([this](const DKWindow::WindowEvent& e) {
+			if (e.type == DKWindow::WindowEvent::WindowClosed)
+				DKApplication::Instance()->Terminate(0);
+		}),
+			NULL, NULL);
+
 	}
 	void OnTerminate(void) override
 	{
 		DKLog("%s", DKGL_FUNCTION_NAME);
+		DKLog("Memory Pool Statistics");
+		size_t numBuckets = DKMemoryPoolNumberOfBuckets();
+		DKMemoryPoolBucketStatus* buckets = new DKMemoryPoolBucketStatus[numBuckets];
+		DKMemoryPoolQueryAllocationStatus(buckets, numBuckets);
+		size_t usedBytes = 0;
+		for (int i = 0; i < numBuckets; ++i)
+		{
+			if (buckets[i].totalChunks > 0)
+			{
+				DKLog("--> %lu: allocated:%lu, reserved:%.1fKB. (usage:%.1f%%)",
+					buckets[i].chunkSize,
+					buckets[i].chunkSize * buckets[i].usedChunks,
+					double(buckets[i].chunkSize * (buckets[i].totalChunks - buckets[i].usedChunks)) / 1024.0,
+					double(buckets[i].usedChunks) / double(buckets[i].totalChunks) * 100.0);
+				usedBytes += buckets[i].chunkSize * buckets[i].usedChunks;
+			}
+		}
+		DKLog("MemoryPool Usage: %.1fMB / %.1fMB", double(usedBytes) / (1024 * 1024), double(DKMemoryPoolSize()) / (1024 * 1024));
+		delete[] buckets;
 	}
 };