fix problems with optional oneof object attributes in DataValidator

DX12PixelShader.h

@@ -92,10 +92,10 @@ ret
 
 const BYTE DX12PixelShaderBytes[] =
 {
-     68,  88,  66,  67, 197, 175, 
-    207, 174,  19,  97, 200,  45, 
-     85,  86,  77, 122, 117,  39, 
-    138, 115,   1,   0,   0,   0, 
+     68,  88,  66,  67, 221, 203, 
+    148,  53, 143,   0, 245,  44, 
+     47, 121,   6, 229,  41, 185, 
+    226,  86,   1,   0,   0,   0, 
     184,  91,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      36,   2,   0,   0, 188,   2, 
@@ -688,8 +688,8 @@ const BYTE DX12PixelShaderBytes[] =
       3,   0, 193,  33,   3,   0, 
      65, 185,   2,   0, 140, 239, 
       1,   0, 246,  49,   0,   0, 
-    213, 255,   0,   0, 174,  50, 
-      0,   0, 202, 179,   0,   0, 
+    213, 255,   0,   0, 144, 214, 
+      3,   0, 202, 179,   0,   0, 
       0,  16,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -763,11 +763,11 @@ const BYTE DX12PixelShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1,  34, 196,  69, 103, 
-      1,   0,   0,   0, 126,  55, 
-    179, 138, 188, 175, 188,  79, 
-    132,  86,   6, 117, 108, 151, 
-     55, 147,   0,   0,   0,   0, 
+     49,   1, 158,  79, 186, 103, 
+      1,   0,   0,   0,  27,   3, 
+    212, 237,  33,  55, 239,  65, 
+    172,  89, 248,  60, 177, 224, 
+    132, 170,   0,   0,   0,   0, 
       0,   0,   0,   0,   1,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1873,8 +1873,8 @@ const BYTE DX12PixelShaderBytes[] =
     120, 116, 117, 114, 101,  50, 
      68,  32, 115, 104,  97, 100, 
      27, 226,  48,   1, 128,   0, 
-      0,   0,  53, 151, 105, 205, 
-      1,  64, 219,   1,   1,   0, 
+      0,   0,  29, 216,  17,  35, 
+    121, 133, 219,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1960,8 +1960,8 @@ const BYTE DX12PixelShaderBytes[] =
       0,   0,   4,   0,   0,   0, 
      66,   0,  60,  17,  16,   1, 
       0,   0,   0,   1,  10,   0, 
-      1,   0, 206,   6, 244, 101, 
-     10,   0,   1,   0, 206,   6, 
+      1,   0, 150,   9, 244, 101, 
+     10,   0,   1,   0, 150,   9, 
     244, 101,  77, 105,  99, 114, 
     111, 115, 111, 102, 116,  32, 
      40,  82,  41,  32,  72,  76, 
@@ -2379,7 +2379,7 @@ const BYTE DX12PixelShaderBytes[] =
       0,  24,  21,  15,  16,   0, 
       0,   1,   0,   1,   0,  12, 
       0,  23,  21,  16,  16,   0, 
-      0,  36,   2, 112, 177,   0, 
+      0,  36,   2,  80,  71,   0, 
       0,  10,   0,  24,  21,  17, 
      16,   0,   0,   1,   0,   0, 
       2,   0,   0,   0,   0,   0, 
@@ -3411,7 +3411,7 @@ const BYTE DX12PixelShaderBytes[] =
     255, 255, 255, 255, 119,   9, 
      49,   1,   1,   0,   0,   0, 
      15,   0,  38, 142,  16,   0, 
-    114, 129,  17,   0, 101,   0, 
+    116, 129,  17,   0, 100,   0, 
      76,   0,   0,   0,  32,   0, 
       0,   0,  44,   0,   0,   0, 
      96,   0,   0,   0,   0,   0, 
@@ -3494,10 +3494,10 @@ const BYTE DX12PixelShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-     34, 196,  69, 103,   1,   0, 
-      0,   0, 126,  55, 179, 138, 
-    188, 175, 188,  79, 132,  86, 
-      6, 117, 108, 151,  55, 147, 
+    158,  79, 186, 103,   1,   0, 
+      0,   0,  27,   3, 212, 237, 
+     33,  55, 239,  65, 172,  89, 
+    248,  60, 177, 224, 132, 170, 
     155,   0,   0,   0,  47,  76, 
     105, 110, 107,  73, 110, 102, 
     111,   0,  47,  84,  77,  67, 

DX12VertexShader.h

@@ -131,10 +131,10 @@ ret
 
 const BYTE DX12VertexShaderBytes[] =
 {
-     68,  88,  66,  67,  71,  39, 
-    180, 110,  77, 204, 133, 188, 
-     19, 205, 247, 222, 138,  94, 
-    134,  72,   1,   0,   0,   0, 
+     68,  88,  66,  67, 140,   8, 
+    106,  30,  13, 182, 233, 193, 
+    117,  28,  68,  91,  61,  44, 
+     22,  72,   1,   0,   0,   0, 
     144,  78,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     124,   2,   0,   0,  52,   3, 
@@ -851,7 +851,7 @@ const BYTE DX12VertexShaderBytes[] =
       3,   0, 215,  46,   1,   0, 
     193, 205,   3,   0, 207, 193, 
       1,   0,  62,   3,   3,   0, 
-     97, 101,   3,   0, 118, 199, 
+     77, 220,   0,   0, 118, 199, 
       0,   0,   0,  16,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -923,11 +923,11 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1,  34, 196, 
-     69, 103,   1,   0,   0,   0, 
-    179,  34, 243, 132, 142, 166, 
-    248,  64, 168,  42,  33, 102, 
-    131, 199,  96, 163,   0,   0, 
+    148,  46,  49,   1, 158,  79, 
+    186, 103,   1,   0,   0,   0, 
+    175, 137, 164,  14,  79,  58, 
+    200,  65, 178,  26, 116,  53, 
+    247, 142,  32, 159,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       1,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1692,8 +1692,8 @@ const BYTE DX12VertexShaderBytes[] =
     101,  32, 107,  97, 109, 101, 
     114,  97,  13,  10, 115, 116, 
      27, 226,  48,   1, 128,   0, 
-      0,   0,  84,  98, 129, 205, 
-      1,  64, 219,   1,   1,   0, 
+      0,   0,  20, 225,  41,  35, 
+    121, 133, 219,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1779,8 +1779,8 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0,   4,   0,   0,   0, 
      66,   0,  60,  17,  16,   1, 
       0,   0,   0,   1,  10,   0, 
-      1,   0, 206,   6, 244, 101, 
-     10,   0,   1,   0, 206,   6, 
+      1,   0, 150,   9, 244, 101, 
+     10,   0,   1,   0, 150,   9, 
     244, 101,  77, 105,  99, 114, 
     111, 115, 111, 102, 116,  32, 
      40,  82,  41,  32,  72,  76, 
@@ -2228,7 +2228,7 @@ const BYTE DX12VertexShaderBytes[] =
      21,  18,  16,   0,   0,   1, 
       0,   1,   0,  12,   0,  23, 
      21,  19,  16,   0,   0,  36, 
-      2,  96, 127,   0,   0,  10, 
+      2,  80,  47,   0,   0,  10, 
       0,  24,  21,  20,  16,   0, 
       0,   1,   0,   0,   2,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3144,8 +3144,8 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0,   0,   0, 255, 255, 
     255, 255, 119,   9,  49,   1, 
       1,   0,   0,   0,  15,   0, 
-     38, 142,  16,   0, 114, 129, 
-     17,   0, 101,   0,  76,   0, 
+     38, 142,  16,   0, 116, 129, 
+     17,   0, 100,   0,  76,   0, 
       0,   0,  32,   0,   0,   0, 
      44,   0,   0,   0,  96,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3227,11 +3227,11 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1,  34, 196, 
-     69, 103,   1,   0,   0,   0, 
-    179,  34, 243, 132, 142, 166, 
-    248,  64, 168,  42,  33, 102, 
-    131, 199,  96, 163, 156,   0, 
+    148,  46,  49,   1, 158,  79, 
+    186, 103,   1,   0,   0,   0, 
+    175, 137, 164,  14,  79,  58, 
+    200,  65, 178,  26, 116,  53, 
+    247, 142,  32, 159, 156,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47,  84,  77,  67,  97,  99, 

DataValidator.cpp

@@ -80,7 +80,7 @@ JSON::JSONValue* TypeMissmatch::getValidPart(
             if (!valid
                 && (!expected->hasAttribute("removeInvalidEntries")
                     || !expected->getAttributeValue("removeInvalidEntries")
-                            .istGleich("true")))
+                        .istGleich("true")))
             {
                 if (removedPartsValidationResults)
                 {
@@ -163,7 +163,7 @@ JSON::JSONValue* TypeMissmatch::getValidPart(
             if (!valid
                 && (!expected->hasAttribute("removeInvalidEntries")
                     || !expected->getAttributeValue("removeInvalidEntries")
-                            .istGleich("true")))
+                        .istGleich("true")))
             {
                 if (removedPartsValidationResults)
                 {
@@ -786,6 +786,8 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema() const
     {
         zDefs->release();
     }
+    result->addValue("$schema",
+        new JSON::JSONString("https://json-schema.org/draft-04/schema#"));
     return result;
 }
 
@@ -969,7 +971,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                        zConstraints->getAttributeValue("endsWith").getText())
                        == string.getLength()
                               - zConstraints->getAttributeValue("endsWith")
-                                    .getLength())
+                                  .getLength())
             {
                 return new TypeMissmatch(path,
                     dynamic_cast<AbstractElement*>(zValue->getThis()),
@@ -1092,12 +1094,11 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                     p += ".";
                     p += key;
                     if (!zConstraints->selectChildsByAttribute("name", key)
-                             .exists())
+                            .exists())
                     {
                         if (!zConstraints
-                                 ->getAttributeValue(
-                                     "allowAdditionalAttributes")
-                                 .istGleich("true"))
+                                ->getAttributeValue("allowAdditionalAttributes")
+                                .istGleich("true"))
                         {
                             return new TypeMissmatch(path,
                                 dynamic_cast<AbstractElement*>(
@@ -1129,11 +1130,11 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                 p += ".";
                 p += key;
                 if (!zConstraints->selectChildsByAttribute("name", key)
-                         .exists())
+                        .exists())
                 {
                     if (!zConstraints
-                             ->getAttributeValue("allowAdditionalAttributes")
-                             .istGleich("true"))
+                            ->getAttributeValue("allowAdditionalAttributes")
+                            .istGleich("true"))
                     {
                         return new TypeMissmatch(path,
                             dynamic_cast<AbstractElement*>(zValue->getThis()),
@@ -1173,7 +1174,10 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                     std::function<void(XML::Element*)> checkOptional;
                     checkOptional = [&optional, &checkOptional](
                                         XML::Element* zElement) {
-                        if (zElement->getName().istGleich("oneOf"))
+                        if (zElement->getName().istGleich("oneOf")
+                            && (!zElement->hasAttribute("optional")
+                                || !zElement->getAttributeValue("optional")
+                                    .istGleich("true")))
                         {
                             XML::Editor tmp = zElement->selectChildren();
                             tmp.forEach(checkOptional);
@@ -1375,15 +1379,17 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
             }
             if (zConstraint->hasAttribute("less"))
             {
-                result->addValue("exclusiveMaximum",
+                result->addValue("maximum",
                     new JSON::JSONNumber(
                         (double)zConstraint->getAttributeValue("less")));
+                result->addValue("exclusiveMaximum", new JSON::JSONBool(true));
             }
             if (zConstraint->hasAttribute("greater"))
             {
-                result->addValue("exclusiveMinimum",
+                result->addValue("minimum",
                     new JSON::JSONNumber(
                         (double)zConstraint->getAttributeValue("greater")));
+                result->addValue("exclusiveMinimum", new JSON::JSONBool(true));
             }
         }
     }

DataValidator.h

@@ -556,7 +556,7 @@ namespace Framework
                 return new NumberValidationBuilder<ObjectValidationBuilder<T>>(
                     [this, name](XML::Element& e) {
                         if (!element.selectChildsByAttribute("name", name)
-                                 .exists())
+                                .exists())
                         {
                             XML::Element* attr
                                 = new XML::Element("<value></value>");
@@ -575,7 +575,7 @@ namespace Framework
                 return new StringValidationBuilder<ObjectValidationBuilder<T>>(
                     [this, name](XML::Element& e) {
                         if (!element.selectChildsByAttribute("name", name)
-                                 .exists())
+                                .exists())
                         {
                             XML::Element* attr
                                 = new XML::Element("<value></value>");
@@ -594,7 +594,7 @@ namespace Framework
                 return new BoolValidationBuilder<ObjectValidationBuilder<T>>(
                     [this, name](XML::Element& e) {
                         if (!element.selectChildsByAttribute("name", name)
-                                 .exists())
+                                .exists())
                         {
                             XML::Element* attr
                                 = new XML::Element("<value></value>");
@@ -613,7 +613,7 @@ namespace Framework
                 return new ArrayValidationBuilder<ObjectValidationBuilder<T>>(
                     [this, name](XML::Element& e) {
                         if (!element.selectChildsByAttribute("name", name)
-                                 .exists())
+                                .exists())
                         {
                             XML::Element* attr
                                 = new XML::Element("<value></value>");
@@ -632,7 +632,7 @@ namespace Framework
                 return new ObjectValidationBuilder<ObjectValidationBuilder<T>>(
                     [this, name](XML::Element& e) {
                         if (!element.selectChildsByAttribute("name", name)
-                                 .exists())
+                                .exists())
                         {
                             XML::Element* attr
                                 = new XML::Element("<value></value>");
@@ -709,7 +709,7 @@ namespace Framework
                 Text valueName, Text attributeName)
             {
                 if (!element.selectChildsByAttribute("name", valueName)
-                         .exists())
+                        .exists())
                 {
                     XML::Element* attr = new XML::Element("<value></value>");
                     attr->setAttribute("name", valueName);
@@ -876,7 +876,7 @@ namespace Framework
             {}
 
             StringValidationBuilder<OneOfValidationBuilder<T>>*
-            addAcceptedStringInArray()
+            addAcceptedString()
             {
                 return new StringValidationBuilder<OneOfValidationBuilder<T>>(
                     [this](XML::Element& e) {
@@ -886,7 +886,7 @@ namespace Framework
             }
 
             NumberValidationBuilder<OneOfValidationBuilder<T>>*
-            addAcceptedNumberInArray()
+            addAcceptedNumber()
             {
                 return new NumberValidationBuilder<OneOfValidationBuilder<T>>(
                     [this](XML::Element& e) {
@@ -896,7 +896,7 @@ namespace Framework
             }
 
             BoolValidationBuilder<OneOfValidationBuilder<T>>*
-            addAcceptedBooleanInArray()
+            addAcceptedBoolean()
             {
                 return new BoolValidationBuilder<OneOfValidationBuilder<T>>(
                     [this](XML::Element& e) {
@@ -906,7 +906,7 @@ namespace Framework
             }
 
             ObjectValidationBuilder<OneOfValidationBuilder<T>>*
-            addAcceptedObjectInArray()
+            addAcceptedObject()
             {
                 return new ObjectValidationBuilder<OneOfValidationBuilder<T>>(
                     [this](XML::Element& e) {
@@ -916,7 +916,7 @@ namespace Framework
             }
 
             ArrayValidationBuilder<OneOfValidationBuilder<T>>*
-            addAcceptedArrayInArray()
+            addAcceptedArray()
             {
                 return new ArrayValidationBuilder<OneOfValidationBuilder<T>>(
                     [this](XML::Element& e) {

UIPixelShader.h

@@ -352,10 +352,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67, 166, 217, 
-    218, 204, 174, 205, 165, 222, 
-     42, 178, 240, 251, 157, 198, 
-    194, 145,   1,   0,   0,   0, 
+     68,  88,  66,  67,  62,  33, 
+     19,  55, 157, 179, 142, 244, 
+    128, 150, 188, 212,  53, 132, 
+     78,  70,   1,   0,   0,   0, 
      12, 134,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     140,   6,   0,   0,  28,   7, 
@@ -1805,11 +1805,11 @@ const BYTE UIPixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1,  34, 196,  69, 103, 
-      1,   0,   0,   0, 169,  52, 
-    208,   9, 182,  80,  85,  72, 
-    146, 159,  56, 126, 231, 143, 
-     59, 217,   0,   0,   0,   0, 
+     49,   1, 158,  79, 186, 103, 
+      1,   0,   0,   0, 239, 102, 
+    142, 202,   6,  96, 202,  67, 
+    182,   9, 181,  49,   8, 130, 
+    202, 219,   0,   0,   0,   0, 
       0,   0,   0,   0,   1,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3086,7 +3086,7 @@ const BYTE UIPixelShader[] =
     117, 114, 101,  50,  68,  32, 
     115, 104,  97, 100,  27, 226, 
      48,   1, 128,   0,   0,   0, 
-     82,   3, 147, 205,   1,  64, 
+     22,  29,  60,  35, 121, 133, 
     219,   1,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3173,8 +3173,8 @@ const BYTE UIPixelShader[] =
       4,   0,   0,   0,  66,   0, 
      60,  17,  16,   1,   0,   0, 
       0,   1,  10,   0,   1,   0, 
-    206,   6, 244, 101,  10,   0, 
-      1,   0, 206,   6, 244, 101, 
+    150,   9, 244, 101,  10,   0, 
+      1,   0, 150,   9, 244, 101, 
      77, 105,  99, 114, 111, 115, 
     111, 102, 116,  32,  40,  82, 
      41,  32,  72,  76,  83,  76, 
@@ -5562,8 +5562,8 @@ const BYTE UIPixelShader[] =
       0,   0, 255, 255, 255, 255, 
     119,   9,  49,   1,   1,   0, 
       0,   0,  15,   0,  38, 142, 
-     16,   0, 114, 129,  17,   0, 
-    101,   0,  88,   0,   0,   0, 
+     16,   0, 116, 129,  17,   0, 
+    100,   0,  88,   0,   0,   0, 
      32,   0,   0,   0,  44,   0, 
       0,   0,  96,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -5645,11 +5645,11 @@ const BYTE UIPixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1,  34, 196,  69, 103, 
-      1,   0,   0,   0, 169,  52, 
-    208,   9, 182,  80,  85,  72, 
-    146, 159,  56, 126, 231, 143, 
-     59, 217, 155,   0,   0,   0, 
+     49,   1, 158,  79, 186, 103, 
+      1,   0,   0,   0, 239, 102, 
+    142, 202,   6,  96, 202,  67, 
+    182,   9, 181,  49,   8, 130, 
+    202, 219, 155,   0,   0,   0, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47,  84, 
      77,  67,  97,  99, 104, 101, 

UIVertexShader.h

@@ -121,10 +121,10 @@ ret
 
 const BYTE UIVertexShader[] =
 {
-     68,  88,  66,  67,   4,  93, 
-    117, 107, 118,   6,  96, 219, 
-    189, 208, 169, 155, 166, 181, 
-     88, 200,   1,   0,   0,   0, 
+     68,  88,  66,  67, 182,  83, 
+    139, 228, 125, 133,  89,  42, 
+    178, 129, 122, 101,   0, 115, 
+    173,  57,   1,   0,   0,   0, 
     204,  77,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      20,   2,   0,   0, 204,   2, 
@@ -881,10 +881,10 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-     34, 196,  69, 103,   1,   0, 
-      0,   0, 108, 126, 233,  38, 
-    230, 217, 108,  76, 160, 244, 
-    247, 232, 150, 216,  20,   9, 
+    158,  79, 186, 103,   1,   0, 
+      0,   0, 255, 225,   9,  92, 
+      1, 170,  66,  69, 189, 158, 
+    170, 163,  28, 216,  27, 234, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       1,   0,   0,   0,   0,   0, 
@@ -1649,8 +1649,8 @@ const BYTE UIVertexShader[] =
      32,  32,  13,  10,  47,  47, 
      32,  84,  89,  80,  69,  68, 
      69,  70,  27, 226,  48,   1, 
-    128,   0,   0,   0,   5, 121, 
-    174, 205,   1,  64, 219,   1, 
+    128,   0,   0,   0,   0, 192, 
+     87,  35, 121, 133, 219,   1, 
       1,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1736,9 +1736,9 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   4,   0, 
       0,   0,  66,   0,  60,  17, 
      16,   1,   0,   0,   0,   1, 
-     10,   0,   1,   0, 206,   6, 
+     10,   0,   1,   0, 150,   9, 
     244, 101,  10,   0,   1,   0, 
-    206,   6, 244, 101,  77, 105, 
+    150,   9, 244, 101,  77, 105, 
      99, 114, 111, 115, 111, 102, 
     116,  32,  40,  82,  41,  32, 
      72,  76,  83,  76,  32,  83, 
@@ -3016,8 +3016,8 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0, 255, 255, 
     255, 255, 119,   9,  49,   1, 
       1,   0,   0,   0,  15,   0, 
-     38, 142,  16,   0, 114, 129, 
-     17,   0, 101,   0,  92,   0, 
+     38, 142,  16,   0, 116, 129, 
+     17,   0, 100,   0,  92,   0, 
       0,   0,  32,   0,   0,   0, 
      44,   0,   0,   0,  96,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3099,11 +3099,11 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1,  34, 196, 
-     69, 103,   1,   0,   0,   0, 
-    108, 126, 233,  38, 230, 217, 
-    108,  76, 160, 244, 247, 232, 
-    150, 216,  20,   9, 156,   0, 
+    148,  46,  49,   1, 158,  79, 
+    186, 103,   1,   0,   0,   0, 
+    255, 225,   9,  92,   1, 170, 
+     66,  69, 189, 158, 170, 163, 
+     28, 216,  27, 234, 156,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47,  84,  77,  67,  97,  99,