Browse Source

Fehler in den ++ funktionen des array iterators behoben (präfix und postfix ++ verhalten war vertauscht)

Kolja Strohm 5 years ago
parent
commit
746a10606d
5 changed files with 73 additions and 73 deletions
  1. 4 4
      Array.h
  2. 15 15
      DX12PixelShader.h
  3. 19 19
      DX12VertexShader.h
  4. 16 16
      UIPixelShader.h
  5. 19 19
      UIVertexShader.h

+ 4 - 4
Array.h

@@ -136,23 +136,23 @@ namespace Framework
 
         Iterator< TYP > &operator++() // prefix
         {
-            Iterator< TYP > temp( *this );
             do
             {
                 if( current )
                     current = current->next;
             } while( current && !current->set );
-            return temp;
+            return *this;
         }
         
-        Iterator< TYP > &operator++( int ) // postfix
+        Iterator< TYP > operator++( int ) // postfix
         {
+            Iterator< TYP > temp( *this );
             do
             {
                 if( current )
                     current = current->next;
             } while( current && !current->set );
-            return *this;
+            return temp;
         }
         
         TYP operator->()

+ 15 - 15
DX12PixelShader.h

@@ -92,10 +92,10 @@ ret
 
 const BYTE DX12PixelShaderBytes[] =
 {
-     68,  88,  66,  67, 237, 196, 
-    223, 174, 151,  80, 186,  63, 
-    226,   3,  42, 117, 160, 119, 
-    105, 181,   1,   0,   0,   0, 
+     68,  88,  66,  67,  85,  42, 
+    150, 107,  97,  53, 120,   2, 
+    197, 193, 176,  46,  15,  70, 
+    188, 129,   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, 139,  74, 121,  92, 
-      1,   0,   0,   0,  36, 167, 
-     10,  74,  91, 184,  92,  64, 
-    150,  23,  54, 100, 248, 146, 
-    211, 135,   0,   0,   0,   0, 
+     49,   1,  81, 129, 122,  92, 
+      1,   0,   0,   0,  33, 236, 
+    156, 245,  76, 170, 109,  73, 
+    162,  55,  70,  56, 118, 189, 
+    240,  20,   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, 
-    200,  73,  60, 102,  64, 208, 
+     84,  86, 205, 162, 249, 208, 
     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, 123, 147,   3, 
+      0,   0, 104, 122, 158,   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, 
-    139,  74, 121,  92,   1,   0, 
-      0,   0,  36, 167,  10,  74, 
-     91, 184,  92,  64, 150,  23, 
-     54, 100, 248, 146, 211, 135, 
+     81, 129, 122,  92,   1,   0, 
+      0,   0,  33, 236, 156, 245, 
+     76, 170, 109,  73, 162,  55, 
+     70,  56, 118, 189, 240,  20, 
     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,  85,  70, 
-    119, 160, 178,  96,  23,  95, 
-    191,  18, 238, 206, 222, 201, 
-    249, 116,   1,   0,   0,   0, 
+     68,  88,  66,  67,  60, 237, 
+     70,  29, 137,  16, 227, 194, 
+     22, 136, 155, 224, 197,  41, 
+     31, 158,   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, 139,  74, 
-    121,  92,   1,   0,   0,   0, 
-    174,  62, 213,  38,  15,  73, 
-    138,  76, 189,  16, 177, 193, 
-    186,  42, 104, 114,   0,   0, 
+    148,  46,  49,   1,  82, 129, 
+    122,  92,   1,   0,   0,   0, 
+    231, 251,  27, 192, 234,  62, 
+    128,  69, 144, 247, 120,  31, 
+    229, 121, 175, 149,   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, 
-    165,  88,   3,   0,  53, 174, 
+     45, 109,   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, 140,  25, 124, 102, 
-     64, 208, 212,   1,   1,   0, 
+      0,   0,  53,  87,  19, 163, 
+    249, 208, 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, 
-    176, 123,   0,   0, 242, 241, 
+    176, 122,   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, 
-    104, 123,  91,   3,   0,   0, 
+    184, 123, 228,   0,   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, 139,  74, 
-    121,  92,   1,   0,   0,   0, 
-    174,  62, 213,  38,  15,  73, 
-    138,  76, 189,  16, 177, 193, 
-    186,  42, 104, 114, 138,   0, 
+    148,  46,  49,   1,  82, 129, 
+    122,  92,   1,   0,   0,   0, 
+    231, 251,  27, 192, 234,  62, 
+    128,  69, 144, 247, 120,  31, 
+    229, 121, 175, 149, 138,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

+ 16 - 16
UIPixelShader.h

@@ -262,10 +262,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67, 180, 219, 
-    247,  53, 144,  55,  43,  46, 
-     41, 148, 254,   3, 127,   2, 
-    166, 210,   1,   0,   0,   0, 
+     68,  88,  66,  67,  20, 207, 
+    120, 145, 226,  63, 204, 208, 
+    154,  73, 176, 153,  83,  96, 
+    120, 158,   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, 
-    139,  74, 121,  92,   1,   0, 
-      0,   0,   3, 109,  18,   7, 
-    124, 164, 255,  64, 149, 206, 
-     70, 129, 132, 102, 180, 190, 
+     82, 129, 122,  92,   1,   0, 
+      0,   0,  50, 232, 216, 153, 
+     43, 205, 208,  65, 174, 247, 
+     36, 157,  42, 138, 100, 210, 
       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, 186,  42, 167, 102, 
-     64, 208, 212,   1,   1,   0, 
+      0,   0, 122, 243,  54, 163, 
+    249, 208, 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, 121,  17,   3,   0,   0, 
+    232, 120,  22,   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, 139,  74, 
-    121,  92,   1,   0,   0,   0, 
-      3, 109,  18,   7, 124, 164, 
-    255,  64, 149, 206,  70, 129, 
-    132, 102, 180, 190, 137,   0, 
+    148,  46,  49,   1,  82, 129, 
+    122,  92,   1,   0,   0,   0, 
+     50, 232, 216, 153,  43, 205, 
+    208,  65, 174, 247,  36, 157, 
+     42, 138, 100, 210, 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, 155,  78, 
-     31,  52, 183, 148, 206, 206, 
-      8, 126,  16,  97,   1, 179, 
-    136, 201,   1,   0,   0,   0, 
+     68,  88,  66,  67,  91, 113, 
+    224, 138,  14, 197, 235, 235, 
+     43,   0, 244, 217, 191, 227, 
+     73,  63,   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, 
-    140,  74, 121,  92,   1,   0, 
-      0,   0, 116, 101,  70, 200, 
-    168,  31,  86,  71, 184,   8, 
-     85,   4, 200, 196, 113, 216, 
+     82, 129, 122,  92,   1,   0, 
+      0,   0, 196,  55, 148, 169, 
+    207,  54,  98,  68, 191, 233, 
+    156,  99, 109, 164,  20, 249, 
       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,  15, 246, 234, 102, 
-     64, 208, 212,   1,   1,   0, 
+      0,   0, 144, 238, 112, 163, 
+    249, 208, 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, 113, 216, 
+      0,  96,   0,   0,  20, 249, 
       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, 120, 120, 
-     55,   3,   0,   0,   0,   0, 
+      1,   0,   0,   0,  40, 122, 
+    211,   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, 
-    113, 216,   0,   0,   0,   0, 
+     20, 249,   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, 140,  74, 121,  92, 
-      1,   0,   0,   0, 116, 101, 
-     70, 200, 168,  31,  86,  71, 
-    184,   8,  85,   4, 200, 196, 
-    113, 216, 138,   0,   0,   0, 
+     49,   1,  82, 129, 122,  92, 
+      1,   0,   0,   0, 196,  55, 
+    148, 169, 207,  54,  98,  68, 
+    191, 233, 156,  99, 109, 164, 
+     20, 249, 138,   0,   0,   0, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47, 110, 
      97, 109, 101, 115,   0,  47,