Browse Source

Expanded VariantValue unions to better describe various objects stored inside it.

Lasse Öörni 13 years ago
parent
commit
879d65bd86
1 changed files with 20 additions and 3 deletions
  1. 20 3
      Engine/Core/Variant.h

+ 20 - 3
Engine/Core/Variant.h

@@ -67,9 +67,26 @@ struct VariantValue
         void* ptr_;
         void* ptr_;
     };
     };
     
     
-    float y_;
-    float z_;
-    float w_;
+    union
+    {
+        int int2_;
+        float float2_;
+        void* ptr2_;
+    };
+    
+    union
+    {
+        int int3_;
+        float float3_;
+        void* ptr3_;
+    };
+    
+    union
+    {
+        int int4_;
+        float float4_;
+        void* ptr4_;
+    };
 };
 };
 
 
 /// Typed resource reference.
 /// Typed resource reference.