Fehler behoben

DX12PixelShader.h

@@ -92,10 +92,10 @@ ret
 
 const BYTE DX12PixelShaderBytes[] =
 {
-     68,  88,  66,  67,  68,  25, 
-    107,  17,  17,  44,  24, 237, 
-    176, 117, 130, 176, 175, 126, 
-    211,  86,   1,   0,   0,   0, 
+     68,  88,  66,  67,   0, 190, 
+     20, 178,  20, 101, 246,  76, 
+    181, 208, 197, 227, 230,  26, 
+     53,  84,   1,   0,   0,   0, 
     184,  91,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      36,   2,   0,   0, 188,   2, 
@@ -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, 221, 204, 159,  92, 
-      1,   0,   0,   0, 162, 241, 
-    176,  55, 148, 187,  62,  79, 
-    173, 242,  54,  29, 202,  23, 
-      4, 118,   0,   0,   0,   0, 
+     49,   1, 179,  26, 160,  92, 
+      1,   0,   0,   0, 179,  85, 
+     65,  97, 151, 169,  38,  72, 
+    156,  48,  36, 122,  98, 105, 
+     25,  15,   0,   0,   0,   0, 
       0,   0,   0,   0,   1,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1788,7 +1788,7 @@ const BYTE DX12PixelShaderBytes[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  27, 226, 
      48,   1, 128,   0,   0,   0, 
-     78,  41, 228, 106,  52, 231, 
+    133,  46, 163, 207,  98, 231, 
     212,   1,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3427,7 +3427,7 @@ const BYTE DX12PixelShaderBytes[] =
       2,   0,   9,   0, 220,   4, 
       0,   0,   0,   0,   0,   0, 
     156,   1,   0,   0,   1,   0, 
-      0,   0, 168, 121,  10,   3, 
+      0,   0, 184, 123,  11,   3, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 109,  97, 105, 110, 
       0, 110, 111, 110, 101,   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, 
-    221, 204, 159,  92,   1,   0, 
-      0,   0, 162, 241, 176,  55, 
-    148, 187,  62,  79, 173, 242, 
-     54,  29, 202,  23,   4, 118, 
+    179,  26, 160,  92,   1,   0, 
+      0,   0, 179,  85,  65,  97, 
+    151, 169,  38,  72, 156,  48, 
+     36, 122,  98, 105,  25,  15, 
     137,   0,   0,   0,  47,  76, 
     105, 110, 107,  73, 110, 102, 
     111,   0,  47, 110,  97, 109, 

DX12VertexShader.h

@@ -129,10 +129,10 @@ ret
 
 const BYTE DX12VertexShaderBytes[] =
 {
-     68,  88,  66,  67, 102, 229, 
-    250,  79,   8, 114, 179,  25, 
-      4, 181,  41,  42, 201,  74, 
-    234, 235,   1,   0,   0,   0, 
+     68,  88,  66,  67,  25,  19, 
+    204, 156,  49, 236, 254, 236, 
+     58, 138, 118,  56,  70,  80, 
+    138, 120,   1,   0,   0,   0, 
     108,  78,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     124,   2,   0,   0,  16,   3, 
@@ -915,11 +915,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, 222, 204, 
-    159,  92,   1,   0,   0,   0, 
-     45, 138, 111,  63, 219, 193, 
-     40,  72, 151,  37, 166, 102, 
-    207,   5, 156,  40,   0,   0, 
+    148,  46,  49,   1, 180,  26, 
+    160,  92,   1,   0,   0,   0, 
+    214, 125, 219,  34, 129, 200, 
+     84,  76, 138,  64,  71, 207, 
+    135, 194,  59, 243,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       1,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1684,8 +1684,8 @@ const BYTE DX12VertexShaderBytes[] =
     111, 110,  59,  13,  10, 125, 
      59,  13,  10,  13,  10,  47, 
      27, 226,  48,   1, 128,   0, 
-      0,   0,  56,  85,  35, 107, 
-     52, 231, 212,   1,   1,   0, 
+      0,   0,  83, 208, 235, 207, 
+     98, 231, 212,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3148,19 +3148,19 @@ const BYTE DX12VertexShaderBytes[] =
       1,   0,   0,   0,   0,   0, 
       0,   0,  24,   4,   0,   0, 
      32,   0,   0,  96,   0,   0, 
-    156,  40,   0,   0,   0,   0, 
+     59, 243,   0,   0,   0,   0, 
       0,   0,   0,   0,   2,   0, 
       9,   0, 132,   5,   0,   0, 
       0,   0,   0,   0, 236,   2, 
       0,   0,   1,   0,   0,   0, 
-      8, 124, 166,   2,   0,   0, 
+     56, 123,  45,   3,   0,   0, 
       0,   0,   0,   0,   0,   0, 
     109,  97, 105, 110,   0, 110, 
     111, 110, 101,   0,   0,   0, 
      45, 186,  46, 241,   1,   0, 
       0,   0,   0,   0,   0,   0, 
      24,   4,   0,   0,  32,   0, 
-      0,  96,   0,   0, 156,  40, 
+      0,  96,   0,   0,  59, 243, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   2,   0,   2,   0, 
       7,   0,   0,   0,   0,   0, 
@@ -3219,11 +3219,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, 222, 204, 
-    159,  92,   1,   0,   0,   0, 
-     45, 138, 111,  63, 219, 193, 
-     40,  72, 151,  37, 166, 102, 
-    207,   5, 156,  40, 138,   0, 
+    148,  46,  49,   1, 180,  26, 
+    160,  92,   1,   0,   0,   0, 
+    214, 125, 219,  34, 129, 200, 
+     84,  76, 138,  64,  71, 207, 
+    135, 194,  59, 243, 138,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

UIPixelShader.h

@@ -262,10 +262,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67, 205, 229, 
-    146, 161,  68, 249, 114, 111, 
-     32,  21, 183, 100, 210,  57, 
-     46, 125,   1,   0,   0,   0, 
+     68,  88,  66,  67,  97,  79, 
+      9, 169, 128,  51,  10,  21, 
+     65, 227,   7, 248, 136,  33, 
+    181, 125,   1,   0,   0,   0, 
     136, 104,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     124,   5,   0,   0,  12,   6, 
@@ -1480,10 +1480,10 @@ const BYTE UIPixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-    222, 204, 159,  92,   1,   0, 
-      0,   0,  98, 177,  85, 185, 
-    175, 183,  78,  73, 157, 175, 
-    203,  74,  18,  49, 199,  38, 
+    180,  26, 160,  92,   1,   0, 
+      0,   0,  76,  55, 222, 115, 
+    190, 197, 154,  72, 180,  65, 
+    237, 126,  53,  57, 184, 177, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       1,   0,   0,   0,   0,   0, 
@@ -2419,8 +2419,8 @@ const BYTE UIPixelShader[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  32,  32, 
      27, 226,  48,   1, 128,   0, 
-      0,   0,  45, 109,  71, 107, 
-     52, 231, 212,   1,   1,   0, 
+      0,   0, 233, 181,  29, 208, 
+     98, 231, 212,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4400,7 +4400,7 @@ const BYTE UIPixelShader[] =
       9,   0, 160,   7,   0,   0, 
       0,   0,   0,   0, 244,   9, 
       0,   0,   1,   0,   0,   0, 
-     72, 123, 114,   3,   0,   0, 
+    152, 121,  69,   3,   0,   0, 
       0,   0,   0,   0,   0,   0, 
      84, 101, 120, 116, 117, 114, 
     101,  80, 105, 120, 101, 108, 
@@ -4466,11 +4466,11 @@ const BYTE UIPixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1, 222, 204, 
-    159,  92,   1,   0,   0,   0, 
-     98, 177,  85, 185, 175, 183, 
-     78,  73, 157, 175, 203,  74, 
-     18,  49, 199,  38, 137,   0, 
+    148,  46,  49,   1, 180,  26, 
+    160,  92,   1,   0,   0,   0, 
+     76,  55, 222, 115, 190, 197, 
+    154,  72, 180,  65, 237, 126, 
+     53,  57, 184, 177, 137,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

UIVertexShader.h

@@ -119,10 +119,10 @@ ret
 
 const BYTE UIVertexShader[] =
 {
-     68,  88,  66,  67, 152, 198, 
-    149, 169, 168, 159, 197,   0, 
-    129, 128, 149, 129,  73, 230, 
-    155, 190,   1,   0,   0,   0, 
+     68,  88,  66,  67,  64,  70, 
+     45, 226,  75,  78, 209, 214, 
+     48,  95,  36,  31, 168, 135, 
+    166, 170,   1,   0,   0,   0, 
     168,  77,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      20,   2,   0,   0, 168,   2, 
@@ -873,10 +873,10 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-    222, 204, 159,  92,   1,   0, 
-      0,   0,  98,  27,  93, 145, 
-    119, 239,  41,  66, 187, 252, 
-    232,  99,  70,  94,  26, 171, 
+    181,  26, 160,  92,   1,   0, 
+      0,   0, 196,  86, 111,  28, 
+    113, 127, 218,  67, 132, 196, 
+     90,  30, 248, 175, 170, 230, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       1,   0,   0,   0,   0,   0, 
@@ -1556,8 +1556,8 @@ const BYTE UIVertexShader[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  32,  32, 
      27, 226,  48,   1, 128,   0, 
-      0,   0,  52, 162, 131, 107, 
-     52, 231, 212,   1,   1,   0, 
+      0,   0, 159, 135, 107, 208, 
+     98, 231, 212,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2934,13 +2934,13 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
     196,   3,   0,   0,  32,   0, 
-      0,  96,   0,   0,  26, 171, 
+      0,  96,   0,   0, 170, 230, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   2,   0,   9,   0, 
      80,   5,   0,   0,   0,   0, 
       0,   0, 236,   2,   0,   0, 
-      1,   0,   0,   0, 152, 122, 
-    158,   3,   0,   0,   0,   0, 
+      1,   0,   0,   0, 248, 120, 
+    125,   2,   0,   0,   0,   0, 
       0,   0,   0,   0,  84, 101, 
     120, 116, 117, 114, 101,  86, 
     101, 114, 116, 101, 120,  83, 
@@ -2950,7 +2950,7 @@ const BYTE UIVertexShader[] =
       1,   0,   0,   0,   0,   0, 
       0,   0, 196,   3,   0,   0, 
      32,   0,   0,  96,   0,   0, 
-     26, 171,   0,   0,   0,   0, 
+    170, 230,   0,   0,   0,   0, 
       0,   0,   0,   0,   2,   0, 
       2,   0,   7,   0,   0,   0, 
       0,   0,   1,   0, 255, 255, 
@@ -3006,11 +3006,11 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1, 222, 204, 159,  92, 
-      1,   0,   0,   0,  98,  27, 
-     93, 145, 119, 239,  41,  66, 
-    187, 252, 232,  99,  70,  94, 
-     26, 171, 138,   0,   0,   0, 
+     49,   1, 181,  26, 160,  92, 
+      1,   0,   0,   0, 196,  86, 
+    111,  28, 113, 127, 218,  67, 
+    132, 196,  90,  30, 248, 175, 
+    170, 230, 138,   0,   0,   0, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47, 110, 
      97, 109, 101, 115,   0,  47, 

Zeichnung.cpp

@@ -207,7 +207,7 @@ void Zeichnung::doPublicMausEreignis( MausEreignis & me ) // ruft Mak auf
     me.mx -= pos.x, me.my -= pos.y;
     if( me.insideParent || hatStyle( Style::MEIgnoreParentInside ) )
     {
-        bool userRet = hatStyleNicht( Style::Erlaubt ) || mak( makParam, this, me );
+        bool userRet = hatStyleNicht( Style::Erlaubt ) || ( mak && mak( makParam, this, me ) );
         bool vera = me.verarbeitet;
         doMausEreignis( me, userRet );
         if( nMak && me.verarbeitet && !vera && hatStyle( Style::Erlaubt ) )