Explorar o código

Einstellungen angepasst

Kolja Strohm %!s(int64=5) %!d(string=hai) anos
pai
achega
d5a060eb1f
Modificáronse 5 ficheiros con 75 adicións e 75 borrados
  1. 15 15
      DX12PixelShader.h
  2. 21 21
      DX12VertexShader.h
  3. 4 4
      Framework Linux.vcxproj
  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,  45,  27, 
-     64,  11,  97,   9, 245, 207, 
-    192, 189, 226, 226,  33,  40, 
-    130, 213,   1,   0,   0,   0, 
+     68,  88,  66,  67, 255, 182, 
+     42,  75,   2,  26, 189,  63, 
+    119,  89,  98, 255,  97,  98, 
+     27, 159,   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,  76, 206, 110,  92, 
-      1,   0,   0,   0, 201, 247, 
-    115, 157, 155, 165, 217,  65, 
-    155, 107, 244, 235,  71, 197, 
-    246,  79,   0,   0,   0,   0, 
+     49,   1,   5, 106, 112,  92, 
+      1,   0,   0,   0,  51,  78, 
+      2,  68, 165, 161, 239,  67, 
+    157, 247, 233, 155, 212, 209, 
+    201, 243,   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, 
-     53, 222, 195, 118,   0, 202, 
+    144,  32, 171, 222, 245, 202, 
     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, 152, 123,  43,   3, 
+      0,   0, 152, 121, 109,   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, 
-     76, 206, 110,  92,   1,   0, 
-      0,   0, 201, 247, 115, 157, 
-    155, 165, 217,  65, 155, 107, 
-    244, 235,  71, 197, 246,  79, 
+      5, 106, 112,  92,   1,   0, 
+      0,   0,  51,  78,   2,  68, 
+    165, 161, 239,  67, 157, 247, 
+    233, 155, 212, 209, 201, 243, 
     137,   0,   0,   0,  47,  76, 
     105, 110, 107,  73, 110, 102, 
     111,   0,  47, 110,  97, 109, 

+ 21 - 21
DX12VertexShader.h

@@ -129,10 +129,10 @@ ret
 
 const BYTE DX12VertexShaderBytes[] =
 {
-     68,  88,  66,  67, 181, 195, 
-    147,  18,  50, 108,  95,  70, 
-      9,  54, 235,  29, 222,  23, 
-    155, 166,   1,   0,   0,   0, 
+     68,  88,  66,  67,  49, 137, 
+    135, 212, 248, 191, 134, 200, 
+    205,  24, 152,  70,  58,  98, 
+      1,  99,   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,  76, 206, 
-    110,  92,   1,   0,   0,   0, 
-     98,  41,  96, 122, 215, 103, 
-    213,  74, 130, 127, 117, 111, 
-    190, 225,  37,  29,   0,   0, 
+    148,  46,  49,   1,   5, 106, 
+    112,  92,   1,   0,   0,   0, 
+     59, 178, 228,  41, 136, 123, 
+    167,  76, 184, 122,  93, 145, 
+    227,  23,  22, 220,   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, 
-     47,  31,   1,   0,  53, 174, 
+    165,  88,   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,  51, 196, 254, 118, 
-      0, 202, 212,   1,   1,   0, 
+      0,   0, 214,  32, 233, 222, 
+    245, 202, 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, 
-     32, 121,   0,   0, 242, 241, 
+    176, 123,   0,   0, 242, 241, 
      10,   0,  24,  21,  14,  16, 
       0,   0,   1,   0,   0,   2, 
      18,   0,  22,  21,  10,  16, 
@@ -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, 
-      0,   0,   0,   0,   0,   0, 
+     22, 220,   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, 
-    136, 123, 139,   3,   0,   0, 
+    248, 123,  23,   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,   0,   0, 
+      0,  96,   0,   0,  22, 220, 
       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,  76, 206, 
-    110,  92,   1,   0,   0,   0, 
-     98,  41,  96, 122, 215, 103, 
-    213,  74, 130, 127, 117, 111, 
-    190, 225,  37,  29, 138,   0, 
+    148,  46,  49,   1,   5, 106, 
+    112,  92,   1,   0,   0,   0, 
+     59, 178, 228,  41, 136, 123, 
+    167,  76, 184, 122,  93, 145, 
+    227,  23,  22, 220, 138,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

+ 4 - 4
Framework Linux.vcxproj

@@ -82,15 +82,15 @@
     <RemoteProjectDir>$(RemoteRootDir)/Framework/debug</RemoteProjectDir>
     <TargetName>libdbgFramework</TargetName>
     <IncludePath>D:\Visual Studio 2017\Common7\IDE\VC\Linux\include\usr\include\c++\5;$(IncludePath)</IncludePath>
-    <OutDir>$(ProjectDir)bin\$(Platform)\debug\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\debug\</IntDir>
+    <OutDir>$(RemoteRootDir)/Framework/debug/</OutDir>
+    <IntDir>$(RemoteRootDir)/Framework/debug/</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetExt>.so</TargetExt>
     <RemoteProjectDir>$(RemoteRootDir)/Framework/release</RemoteProjectDir>
     <TargetName>libFramework</TargetName>
-    <OutDir>$(ProjectDir)bin\$(Platform)\release\</OutDir>
-    <IntDir>$(ProjectDir)obj\$(Platform)\release\</IntDir>
+    <OutDir>$(RemoteRootDir)/Framework/release</OutDir>
+    <IntDir>$(RemoteRootDir)/Framework/release</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <TargetExt>.so</TargetExt>

+ 16 - 16
UIPixelShader.h

@@ -262,10 +262,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67, 193, 239, 
-     69,  21, 240, 172, 105,  15, 
-    164, 121, 210, 223, 219, 157, 
-     17, 138,   1,   0,   0,   0, 
+     68,  88,  66,  67, 106,  41, 
+    221,  45,  13, 150, 146, 167, 
+    215, 104,  52,  17, 139, 191, 
+     79,  78,   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, 
-     76, 206, 110,  92,   1,   0, 
-      0,   0, 154, 228, 128,   4, 
-    159, 123, 186,  79, 145,  53, 
-    105, 199, 153, 180, 207,  59, 
+      5, 106, 112,  92,   1,   0, 
+      0,   0, 220,   7,  76, 190, 
+     20, 180,  42,  73, 129, 107, 
+     46,  22, 124, 167,  44, 110, 
       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, 190, 246,  36, 119, 
-      0, 202, 212,   1,   1,   0, 
+      0,   0,  38, 103,  15, 223, 
+    245, 202, 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, 
-    120, 122,  84,   3,   0,   0, 
+    168, 123,  98,   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,  76, 206, 
-    110,  92,   1,   0,   0,   0, 
-    154, 228, 128,   4, 159, 123, 
-    186,  79, 145,  53, 105, 199, 
-    153, 180, 207,  59, 137,   0, 
+    148,  46,  49,   1,   5, 106, 
+    112,  92,   1,   0,   0,   0, 
+    220,   7,  76, 190,  20, 180, 
+     42,  73, 129, 107,  46,  22, 
+    124, 167,  44, 110, 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,  65, 245, 
-    214, 169,   0, 232,  63, 134, 
-    211, 150, 250,  30, 208,  30, 
-     34, 217,   1,   0,   0,   0, 
+     68,  88,  66,  67, 208, 191, 
+    120,  43,  56,  60, 118, 191, 
+    203,  35,  22,   3,  49, 252, 
+     94, 120,   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, 
-     77, 206, 110,  92,   1,   0, 
-      0,   0,  11, 197, 177,  60, 
-    236, 154, 100,  74, 137, 228, 
-     49, 236, 156, 225,  16,  34, 
+      6, 106, 112,  92,   1,   0, 
+      0,   0, 171,  88, 222, 240, 
+    194,   3, 216,  76, 162,  18, 
+    188, 184, 156, 253, 183, 211, 
       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, 165,  69, 103, 119, 
-      0, 202, 212,   1,   1,   0, 
+      0,   0,  90, 220,  80, 223, 
+    245, 202, 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,  16,  34, 
+      0,  96,   0,   0, 183, 211, 
       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, 168, 123, 
-     63,   3,   0,   0,   0,   0, 
+      1,   0,   0,   0,  40, 122, 
+      5,   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, 
-     16,  34,   0,   0,   0,   0, 
+    183, 211,   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,  77, 206, 110,  92, 
-      1,   0,   0,   0,  11, 197, 
-    177,  60, 236, 154, 100,  74, 
-    137, 228,  49, 236, 156, 225, 
-     16,  34, 138,   0,   0,   0, 
+     49,   1,   6, 106, 112,  92, 
+      1,   0,   0,   0, 171,  88, 
+    222, 240, 194,   3, 216,  76, 
+    162,  18, 188, 184, 156, 253, 
+    183, 211, 138,   0,   0,   0, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47, 110, 
      97, 109, 101, 115,   0,  47,