Ver Fonte

Fehler im TextFeld Behoben

Kolja Strohm há 5 anos atrás
pai
commit
4e32e2d271
5 ficheiros alterados com 71 adições e 71 exclusões
  1. 15 15
      DX12PixelShader.h
  2. 19 19
      DX12VertexShader.h
  3. 2 2
      TextFeld.cpp
  4. 16 16
      UIPixelShader.h
  5. 19 19
      UIVertexShader.h

+ 15 - 15
DX12PixelShader.h

@@ -92,10 +92,10 @@ ret
 
 const BYTE DX12PixelShaderBytes[] =
 {
-     68,  88,  66,  67, 124, 209, 
-     78,  51, 204, 106, 235, 188, 
-    103,  50, 203,  52, 186,  79, 
-    120, 232,   1,   0,   0,   0, 
+     68,  88,  66,  67, 162,  87, 
+    246, 169, 127,  73,  96, 252, 
+     44,  51, 112,   4,  21,  13, 
+    157,   3,   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,  29,  60, 113,  92, 
-      1,   0,   0,   0, 142,  23, 
-    215,  73,   7,  29, 102,  76, 
-    136,  31, 139, 223, 226, 241, 
-    228, 162,   0,   0,   0,   0, 
+     49,   1,  72, 146, 118,  92, 
+      1,   0,   0,   0, 135, 237, 
+    167, 157,  16, 115, 104,  75, 
+    147,  31,  33,  38, 134, 108, 
+    242,  49,   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, 
-    168, 149,  83,  24, 115, 203, 
+     52,  34, 101, 101, 161, 206, 
     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, 120, 122,  22,   3, 
+      0,   0, 120, 121,  71,   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, 
-     29,  60, 113,  92,   1,   0, 
-      0,   0, 142,  23, 215,  73, 
-      7,  29, 102,  76, 136,  31, 
-    139, 223, 226, 241, 228, 162, 
+     72, 146, 118,  92,   1,   0, 
+      0,   0, 135, 237, 167, 157, 
+     16, 115, 104,  75, 147,  31, 
+     33,  38, 134, 108, 242,  49, 
     137,   0,   0,   0,  47,  76, 
     105, 110, 107,  73, 110, 102, 
     111,   0,  47, 110,  97, 109, 

+ 19 - 19
DX12VertexShader.h

@@ -129,10 +129,10 @@ ret
 
 const BYTE DX12VertexShaderBytes[] =
 {
-     68,  88,  66,  67, 230, 231, 
-    220, 157, 152, 131, 187,  22, 
-     44, 106, 177,  98,   9, 208, 
-    126, 122,   1,   0,   0,   0, 
+     68,  88,  66,  67,  61, 213, 
+    106, 130,  71, 176,   0,  35, 
+     58, 219, 161, 175, 175, 126, 
+    191, 170,   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,  29,  60, 
-    113,  92,   1,   0,   0,   0, 
-    229, 240, 141,   4, 127,  20, 
-    142,  64, 157,   3, 139,  11, 
-    230, 247, 129, 193,   0,   0, 
+    148,  46,  49,   1,  73, 146, 
+    118,  92,   1,   0,   0,   0, 
+    199, 159,   5, 142,  21,  53, 
+     20,  64, 155, 142, 123, 147, 
+    198, 149,  13,  42,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       1,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1095,7 +1095,7 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0, 103, 159,   1,   0, 
     179, 120,   1,   0, 238,  97, 
       2,   0,  90,  28,   0,   0, 
-     25,  97,   1,   0,  53, 174, 
+     19,  95,   3,   0,  53, 174, 
       3,   0, 206,  21,   0,   0, 
     193, 205,   3,   0, 207, 193, 
       1,   0,  62,   3,   3,   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,  94,  61, 143,  24, 
-    115, 203, 212,   1,   1,   0, 
+      0,   0, 247,  23, 168, 101, 
+    161, 206, 212,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2200,7 +2200,7 @@ const BYTE DX12VertexShaderBytes[] =
      12,  16,   0,   0,   1,   0, 
       1,   0,  14,   0,  23,  21, 
      13,  16,   0,   0,  36,   2, 
-     96, 123,   0,   0, 242, 241, 
+    112, 123,   0,   0, 242, 241, 
      10,   0,  24,  21,  14,  16, 
       0,   0,   1,   0,   0,   2, 
      18,   0,  22,  21,  10,  16, 
@@ -3153,7 +3153,7 @@ const BYTE DX12VertexShaderBytes[] =
       9,   0, 132,   5,   0,   0, 
       0,   0,   0,   0, 236,   2, 
       0,   0,   1,   0,   0,   0, 
-    200, 120, 223,   2,   0,   0, 
+    232, 121, 240,   3,   0,   0, 
       0,   0,   0,   0,   0,   0, 
     109,  97, 105, 110,   0, 110, 
     111, 110, 101,   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,  29,  60, 
-    113,  92,   1,   0,   0,   0, 
-    229, 240, 141,   4, 127,  20, 
-    142,  64, 157,   3, 139,  11, 
-    230, 247, 129, 193, 138,   0, 
+    148,  46,  49,   1,  73, 146, 
+    118,  92,   1,   0,   0,   0, 
+    199, 159,   5, 142,  21,  53, 
+     20,  64, 155, 142, 123, 147, 
+    198, 149,  13,  42, 138,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

+ 2 - 2
TextFeld.cpp

@@ -1246,13 +1246,13 @@ Text *TextFeld::zText() const // gibt den Text zur
 Schrift *TextFeld::getSchrift() const// gint getThis der Schrift Zurück
 {
     tm->resetIteration();
-    return tm->zCurrentRenderer()->getSchrift();
+    return tm->zCurrentRenderer() ? tm->zCurrentRenderer()->getSchrift() : 0;
 }
 
 Schrift *TextFeld::zSchrift() const// gibt die Schrift zurück
 {
     tm->resetIteration();
-    return tm->zCurrentRenderer()->zSchrift();
+    return tm->zCurrentRenderer() ? tm->zCurrentRenderer()->zSchrift() : 0;
 }
 
 // Gibt die Schrift zurück.

+ 16 - 16
UIPixelShader.h

@@ -262,10 +262,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67, 202, 193, 
-    140, 105,  56, 129, 188, 252, 
-    196,  81, 116, 171,  11,   0, 
-    215, 254,   1,   0,   0,   0, 
+     68,  88,  66,  67, 225, 118, 
+    206,   4,  68, 104,  94, 173, 
+    222,  72, 101, 149, 220, 231, 
+      2, 155,   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, 
-     29,  60, 113,  92,   1,   0, 
-      0,   0, 156, 211,  98, 232, 
-      4, 189, 167,  66, 164, 210, 
-      2, 177,  21, 174, 202,  50, 
+     73, 146, 118,  92,   1,   0, 
+      0,   0,  92,   4,  33,  44, 
+    185,  95, 161,  69, 165, 149, 
+     45,  60,  87, 212, 139,  64, 
       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, 252,  33, 181,  24, 
-    115, 203, 212,   1,   1,   0, 
+      0,   0, 233, 246, 207, 101, 
+    161, 206, 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, 
-    104, 120, 244,   2,   0,   0, 
+    168, 123,  90,   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,  29,  60, 
-    113,  92,   1,   0,   0,   0, 
-    156, 211,  98, 232,   4, 189, 
-    167,  66, 164, 210,   2, 177, 
-     21, 174, 202,  50, 137,   0, 
+    148,  46,  49,   1,  73, 146, 
+    118,  92,   1,   0,   0,   0, 
+     92,   4,  33,  44, 185,  95, 
+    161,  69, 165, 149,  45,  60, 
+     87, 212, 139,  64, 137,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

+ 19 - 19
UIVertexShader.h

@@ -119,10 +119,10 @@ ret
 
 const BYTE UIVertexShader[] =
 {
-     68,  88,  66,  67, 184, 138, 
-     54,  11, 118,  95, 192, 105, 
-    150,  89,   0, 181,  93,  14, 
-    245,  23,   1,   0,   0,   0, 
+     68,  88,  66,  67, 134,   8, 
+    245, 230, 181, 235, 236,  38, 
+     86, 233, 124, 199,   8, 145, 
+    108, 165,   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, 
-     30,  60, 113,  92,   1,   0, 
-      0,   0, 132,  42,  75, 233, 
-    251,  40,  83,  65, 166,  74, 
-      1, 104,  87, 144, 223, 192, 
+     73, 146, 118,  92,   1,   0, 
+      0,   0, 242, 233, 193, 126, 
+     96, 183,  77,  71, 180,  88, 
+    177, 188,   4, 214, 189,  55, 
       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,  85, 117, 242,  24, 
-    115, 203, 212,   1,   1,   0, 
+      0,   0, 178, 148,  15, 102, 
+    161, 206, 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, 223, 192, 
+      0,  96,   0,   0, 189,  55, 
       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,  40, 123, 
-    198,   3,   0,   0,   0,   0, 
+      1,   0,   0,   0,  56, 121, 
+      0,   3,   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, 
-    223, 192,   0,   0,   0,   0, 
+    189,  55,   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,  30,  60, 113,  92, 
-      1,   0,   0,   0, 132,  42, 
-     75, 233, 251,  40,  83,  65, 
-    166,  74,   1, 104,  87, 144, 
-    223, 192, 138,   0,   0,   0, 
+     49,   1,  73, 146, 118,  92, 
+      1,   0,   0,   0, 242, 233, 
+    193, 126,  96, 183,  77,  71, 
+    180,  88, 177, 188,   4, 214, 
+    189,  55, 138,   0,   0,   0, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47, 110, 
      97, 109, 101, 115,   0,  47,