no message

TestApp1/TestApp1.cpp

@@ -8,49 +8,85 @@
 #include <DK.h>
 
 
-class TestApp1 : public DKApplication
+void PrintVariant(const DKString& name, const DKVariant& var, int indent = 0)
 {
-	DKObject<DKWindow> window;
-public:
-	void OnInitialize(void) override
+	char ind[1024];
 	{
-		DKLog("%s", DKGL_FUNCTION_NAME);
-		window = DKWindow::Create("DefaultWindow");
-		window->Activate();
-
-		window->AddEventHandler(this,
-			DKFunction([this](const DKWindow::WindowEvent& e) {
-			if (e.type == DKWindow::WindowEvent::WindowClosed)
-				DKApplication::Instance()->Terminate(0);
-		}),
-			NULL, NULL);
-
+		int i = 0;
+		while (i < indent)
+		{
+			ind[i++] = ' ';
+		}
+		ind[i] = 0;
 	}
-	void OnTerminate(void) override
+
+	switch (var.ValueType())
 	{
-		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)
+	case DKVariant::TypeUndefined:
+		DKLog("%s %ls (Undefined)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeInteger:
+		DKLog("%s %ls (Integer) : %lld", ind, (const wchar_t*)name, var.Integer());
+		break;
+	case DKVariant::TypeFloat:
+		DKLog("%s %ls (Float) : %f", ind, (const wchar_t*)name, var.Float());
+		break;
+	case DKVariant::TypeVector2:
+		DKLog("%s %ls (Vector2)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeVector3:
+		DKLog("%s %ls (Vector3)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeVector4:
+		DKLog("%s %ls (Vector4)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeMatrix2:
+		DKLog("%s %ls (Matrix2x2)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeMatrix3:
+		DKLog("%s %ls (Matrix3x3)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeMatrix4:
+		DKLog("%s %ls (Matrix4x4)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeQuaternion:
+		DKLog("%s %ls (Quat)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeRational:
+		DKLog("%s %ls (Rational) %lld / %lld", ind, (const wchar_t*)name, var.Rational().Numerator(), var.Rational().Denominator());
+		break;
+	case DKVariant::TypeString:
+		DKLog("%s %ls (String) : %ls", ind, (const wchar_t*)name, (const wchar_t*)var.String());
+		break;
+	case DKVariant::TypeDateTime:
+		DKLog("%s %ls (DateTime)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeData:
+		DKLog("%s %ls (Data)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeStructData:
+		DKLog("%s %ls (StructData)", ind, (const wchar_t*)name);
+		break;
+	case DKVariant::TypeArray:
+		DKLog("%s %ls (Array)", ind, (const wchar_t*)name);
+		for (int i = 0; i < var.Array().Count(); ++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;
-			}
+			const DKVariant& sub = var.Array().Value(i);
+			PrintVariant(DKString::Format("%ls[%d]", name, i), sub, indent + 4);
 		}
-		DKLog("MemoryPool Usage: %.1fMB / %.1fMB", double(usedBytes) / (1024 * 1024), double(DKMemoryPoolSize()) / (1024 * 1024));
-		delete[] buckets;
+		break;
+	case DKVariant::TypePairs:
+		DKLog("%s %ls (Pairs)", ind, (const wchar_t*)name);
+		var.Pairs().EnumerateForward([indent](const DKVariant::VPairs::Pair& pair)
+		{
+			PrintVariant(pair.key, pair.value, indent+4);
+		});
+		break;
+	default:
+		DKLog("%s %ls (Unknown)");
+		break;
 	}
-};
-
+}
 
 #ifdef _WIN32
 int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
@@ -61,7 +97,19 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 int main(int argc, const char * argv[])
 #endif
 {
-	TestApp1 app;
-	DKPropertySet::SystemConfig().SetValue("AppDelegate", "AppDelegate");
-	return app.Run();
+	DKApplication app;	// for DKLog to console
+
+	DKVariant prop = DKVariant::TypePairs;
+
+	DKVariant::VPairs& root = prop.Pairs();
+	DKVariant::VPairs& sub1 = root.Value("Sub1").Pairs();
+		
+
+	DKVariant::VPairs& sub2 = root.Value("Sub2").Pairs();
+	DKVariant::VInteger& sub3 = root.Value("Sub3").Integer();
+
+	PrintVariant("ROOT", prop);
+
+
+	return 0;
 }