فهرست منبع

improved item icon rendering

Kolja Strohm 2 سال پیش
والد
کامیت
0a87646e7d
4فایلهای تغییر یافته به همراه271 افزوده شده و 255 حذف شده
  1. 129 129
      FactoryCraft/CustomUIDX11PixelShader.h
  2. 122 122
      FactoryCraft/CustomUIDX11VertexShader.h
  3. 8 0
      FactoryCraft/Dimension.cpp
  4. 12 4
      FactoryCraft/FactoryClient.cpp

+ 129 - 129
FactoryCraft/CustomUIDX11PixelShader.h

@@ -257,10 +257,10 @@ ret
 
 const BYTE CustomUIDX11PixelShader[] =
 {
-     68,  88,  66,  67,  54, 175, 
-    114,  18,  77,  44,  32,  72, 
-    178, 200, 125, 172, 156,  75, 
-    223, 226,   1,   0,   0,   0, 
+     68,  88,  66,  67, 117,  27, 
+     31, 230, 152, 230, 254, 225, 
+     18, 134,  62,  35,  63, 119, 
+    190,  52,   1,   0,   0,   0, 
     164, 118,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     252,   4,   0,   0, 164,   5, 
@@ -1394,11 +1394,11 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1, 182, 167,  15,  99, 
-      1,   0,   0,   0, 212, 103, 
-     92, 156,  47, 113, 124,  74, 
-    177, 236,  28, 149, 211,  36, 
-    118, 153,   0,   0,   0,   0, 
+     49,   1,  99,  87,  18,  99, 
+      1,   0,   0,   0,  19, 178, 
+    231, 123, 191, 187, 192,  66, 
+    176,  94,  90, 191,  84, 189, 
+     75, 207,   0,   0,   0,   0, 
       0,   0,   0,   0,   1,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1569,10 +1569,10 @@ const BYTE CustomUIDX11PixelShader[] =
       3,   0, 194,  82,   1,   0, 
      43, 236,   3,   0,  28,  19, 
       2,   0,  65,  36,   1,   0, 
-    236, 179,   1,   0, 184, 110, 
-      0,   0, 125,  10,   2,   0, 
-    125, 181,   2,   0, 190, 221, 
-      1,   0, 193,  33,   3,   0, 
+    236, 179,   1,   0,  65,  92, 
+      2,   0, 125,  10,   2,   0, 
+    125, 181,   2,   0,  51, 210, 
+      3,   0, 193,  33,   3,   0, 
      65, 185,   2,   0, 146, 230, 
       3,   0,  53, 174,   3,   0, 
     118,  19,   1,   0,  98, 163, 
@@ -2589,8 +2589,8 @@ const BYTE CustomUIDX11PixelShader[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  32,  32, 
      32,  32,  27, 226,  48,   1, 
-    128,   0,   0,   0,  62,  68, 
-    234,  29, 103, 189, 216,   1, 
+    128,   0,   0,   0, 244, 140, 
+    162,   0,   1, 191, 216,   1, 
       1,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2676,9 +2676,9 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,   0,   0,   4,   0, 
       0,   0,  66,   0,  60,  17, 
      16,   1,   0,   0,   0,   1, 
-     10,   0,   1,   0, 173,   2, 
-     97,  74,  10,   0,   1,   0, 
-    173,   2,  97,  74,  77, 105, 
+     10,   0,   1,   0,   1,   0, 
+     93,  88,  10,   0,   1,   0, 
+      1,   0,  93,  88,  77, 105, 
      99, 114, 111, 115, 111, 102, 
     116,  32,  40,  82,  41,  32, 
      72,  76,  83,  76,  32,  83, 
@@ -3579,14 +3579,14 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,  23,   0,   1,   0, 
       5,  16,   0,   0,  14,   0, 
      23,  21,   0,  16,   0,   0, 
-      3,   2,  96, 181,   0,   0, 
+      3,   2, 208, 163,   0,   0, 
     242, 241,  10,   0,  24,  21, 
       8,  16,   0,   0,   1,   0, 
       1,   0,  10,   0,  24,  21, 
       9,  16,   0,   0,   1,   0, 
       0,   2,  14,   0,  23,  21, 
       0,   0,   0,   0,  10,   2, 
-     96, 181,   0,   0, 242, 241, 
+    208, 163,   0,   0, 242, 241, 
      10,   0,  24,  21,  11,  16, 
       0,   0,   1,   0,   1,   0, 
      10,   0,  24,  21,  12,  16, 
@@ -4807,61 +4807,76 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1, 182, 167, 
-     15,  99,   1,   0,   0,   0, 
-    212, 103,  92, 156,  47, 113, 
-    124,  74, 177, 236,  28, 149, 
-    211,  36, 118, 153, 174,   0, 
-      0,   0,  47,  76, 105, 110, 
-    107,  73, 110, 102, 111,   0, 
-     47, 110,  97, 109, 101, 115, 
-      0,  47, 115, 114,  99,  47, 
-    104, 101,  97, 100, 101, 114, 
-     98, 108, 111,  99, 107,   0, 
-     47, 115, 114,  99,  47, 102, 
-    105, 108, 101, 115,  47,  99, 
-     58,  92, 117, 115, 101, 114, 
-    115,  92, 107, 111, 108, 106, 
-     97,  92, 100, 101, 115, 107, 
-    116, 111, 112,  92, 107, 111, 
-    108, 106,  97,  45, 115, 116, 
-    114, 111, 104, 109,  45, 103, 
-     97, 109, 101, 115,  92, 115, 
-    112, 105, 101, 108, 101,  32, 
-    112, 108,  97, 116, 102, 111, 
-    114, 109,  92, 115, 116,  97, 
-    110, 100,  97, 108, 111, 119, 
-    110,  92, 107, 108, 105, 101, 
-    110, 116,  92, 102,  97,  99, 
-    116, 111, 114, 121,  99, 114, 
-     97, 102, 116,  92, 102,  97, 
-     99, 116, 111, 114, 121,  99, 
-    114,  97, 102, 116,  92, 100, 
-    120,  49,  49,  99, 117, 115, 
-    116, 111, 109, 112, 105, 120, 
-    101, 108, 115, 104,  97, 100, 
-    101, 114,  46, 104, 108, 115, 
-    108,   0,   4,   0,   0,   0, 
-      6,   0,   0,   0,   1,   0, 
-      0,   0,  58,   0,   0,   0, 
-      0,   0,   0,   0,  17,   0, 
-      0,   0,   7,   0,   0,   0, 
-     10,   0,   0,   0,   6,   0, 
+    255, 255, 255, 255, 119,   9, 
+     49,   1,   1,   0,   0,   0, 
+     13,   0,  20, 142,  14,   0, 
+     20, 107,  15,   0,   1,   0, 
+     88,   0,   0,   0,  32,   0, 
+      0,   0,  44,   0,   0,   0, 
+    144,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      5,   0,   0,   0,  34,   0, 
-      0,   0,   8,   0,   0,   0, 
-      0,   0,   0,   0, 220,  81, 
-     51,   1,   0,   0,   0,   0, 
+     22,   0,   0,   0,  25,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,  32,  10, 
+      0,   0,  32,   0,   0,  96, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      2,   0,   9,   0,  76,   7, 
       0,   0,   0,   0,   0,   0, 
+    100,   9,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,  84, 101, 120, 116, 
+    117, 114, 101,  80, 105, 120, 
+    101, 108,  83, 104,  97, 100, 
+    101, 114,   0, 110, 111, 110, 
+    101,   0,  45, 186,  46, 241, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,  32,  10,   0,   0, 
+     32,   0,   0,  96,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      2,   0,   7,   0,   0,   0, 
+      0,   0,   1,   0, 255, 255, 
+    255, 255,   0,   0,   0,   0, 
+     32,  10,   0,   0,   8,   2, 
       0,   0,   0,   0,   0,   0, 
+    255, 255, 255, 255,   0,   0, 
+      0,   0, 255, 255, 255, 255, 
+      1,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+     67,  58,  92,  85, 115, 101, 
+    114, 115,  92, 107, 111, 108, 
+    106,  97,  92,  68, 101, 115, 
+    107, 116, 111, 112,  92,  75, 
+    111, 108, 106,  97,  45,  83, 
+    116, 114, 111, 104, 109,  45, 
+     71,  97, 109, 101, 115,  92, 
+     83, 112, 105, 101, 108, 101, 
+     32,  80, 108,  97, 116, 102, 
+    111, 114, 109,  92,  83, 116, 
+     97, 110, 100,  97, 108, 111, 
+    119, 110,  92,  75, 108, 105, 
+    101, 110, 116,  92,  70,  97, 
+     99, 116, 111, 114, 121,  67, 
+    114,  97, 102, 116,  92,  70, 
+     97,  99, 116, 111, 114, 121, 
+     67, 114,  97, 102, 116,  92, 
+     68,  88,  49,  49,  67, 117, 
+    115, 116, 111, 109,  80, 105, 
+    120, 101, 108,  83, 104,  97, 
+    100, 101, 114,  46, 104, 108, 
+    115, 108,   0,   0,   0,   0, 
+    254, 239, 254, 239,   1,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0, 255, 255, 255, 255, 255, 
+    255, 255, 255, 255, 255,  12, 
+      0, 255, 255, 255, 255, 255, 
+    255, 255, 255, 255, 255,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4874,6 +4889,54 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 148,  46,  49,   1, 
+     99,  87,  18,  99,   1,   0, 
+      0,   0,  19, 178, 231, 123, 
+    191, 187, 192,  66, 176,  94, 
+     90, 191,  84, 189,  75, 207, 
+    174,   0,   0,   0,  47,  76, 
+    105, 110, 107,  73, 110, 102, 
+    111,   0,  47, 110,  97, 109, 
+    101, 115,   0,  47, 115, 114, 
+     99,  47, 104, 101,  97, 100, 
+    101, 114,  98, 108, 111,  99, 
+    107,   0,  47, 115, 114,  99, 
+     47, 102, 105, 108, 101, 115, 
+     47,  99,  58,  92, 117, 115, 
+    101, 114, 115,  92, 107, 111, 
+    108, 106,  97,  92, 100, 101, 
+    115, 107, 116, 111, 112,  92, 
+    107, 111, 108, 106,  97,  45, 
+    115, 116, 114, 111, 104, 109, 
+     45, 103,  97, 109, 101, 115, 
+     92, 115, 112, 105, 101, 108, 
+    101,  32, 112, 108,  97, 116, 
+    102, 111, 114, 109,  92, 115, 
+    116,  97, 110, 100,  97, 108, 
+    111, 119, 110,  92, 107, 108, 
+    105, 101, 110, 116,  92, 102, 
+     97,  99, 116, 111, 114, 121, 
+     99, 114,  97, 102, 116,  92, 
+    102,  97,  99, 116, 111, 114, 
+    121,  99, 114,  97, 102, 116, 
+     92, 100, 120,  49,  49,  99, 
+    117, 115, 116, 111, 109, 112, 
+    105, 120, 101, 108, 115, 104, 
+     97, 100, 101, 114,  46, 104, 
+    108, 115, 108,   0,   4,   0, 
+      0,   0,   6,   0,   0,   0, 
+      1,   0,   0,   0,  58,   0, 
+      0,   0,   0,   0,   0,   0, 
+     17,   0,   0,   0,   7,   0, 
+      0,   0,  10,   0,   0,   0, 
+      6,   0,   0,   0,   0,   0, 
+      0,   0,   5,   0,   0,   0, 
+     34,   0,   0,   0,   8,   0, 
+      0,   0,   0,   0,   0,   0, 
+    220,  81,  51,   1,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4892,77 +4955,14 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0, 255, 255, 255, 255, 
-    119,   9,  49,   1,   1,   0, 
-      0,   0,  13,   0,   0, 142, 
-     14,   0,  63,  92,  15,   0, 
-      0,   0,  88,   0,   0,   0, 
-     32,   0,   0,   0,  44,   0, 
-      0,   0, 144,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,  22,   0,   0,   0, 
-     25,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
-     32,  10,   0,   0,  32,   0, 
-      0,  96,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   2,   0,   9,   0, 
-     76,   7,   0,   0,   0,   0, 
-      0,   0, 100,   9,   0,   0, 
-      1,   0, 249, 164,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  84, 101, 
-    120, 116, 117, 114, 101,  80, 
-    105, 120, 101, 108,  83, 104, 
-     97, 100, 101, 114,   0, 110, 
-    111, 110, 101,   0,  45, 186, 
-     46, 241,   1,   0,   0,   0, 
-      0,   0,   0,   0,  32,  10, 
-      0,   0,  32,   0,   0,  96, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      2,   0,   2,   0,   7,   0, 
-      0,   0,   0,   0,   1,   0, 
-    255, 255, 255, 255,   0,   0, 
-      0,   0,  32,  10,   0,   0, 
-      8,   2,   0,   0,   0,   0, 
-      0,   0, 255, 255, 255, 255, 
-      0,   0,   0,   0, 255, 255, 
-    255, 255,   1,   0,   1,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,  67,  58,  92,  85, 
-    115, 101, 114, 115,  92, 107, 
-    111, 108, 106,  97,  92,  68, 
-    101, 115, 107, 116, 111, 112, 
-     92,  75, 111, 108, 106,  97, 
-     45,  83, 116, 114, 111, 104, 
-    109,  45,  71,  97, 109, 101, 
-    115,  92,  83, 112, 105, 101, 
-    108, 101,  32,  80, 108,  97, 
-    116, 102, 111, 114, 109,  92, 
-     83, 116,  97, 110, 100,  97, 
-    108, 111, 119, 110,  92,  75, 
-    108, 105, 101, 110, 116,  92, 
-     70,  97,  99, 116, 111, 114, 
-    121,  67, 114,  97, 102, 116, 
-     92,  70,  97,  99, 116, 111, 
-    114, 121,  67, 114,  97, 102, 
-    116,  92,  68,  88,  49,  49, 
-     67, 117, 115, 116, 111, 109, 
-     80, 105, 120, 101, 108,  83, 
-    104,  97, 100, 101, 114,  46, 
-    104, 108, 115, 108,   0,   0, 
-      0,   0, 254, 239, 254, 239, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0,   0,   1,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 255, 255, 255, 
-    255, 255, 255, 255, 255, 255, 
-    255,  12,   0, 255, 255, 255, 
-    255, 255, 255, 255, 255, 255, 
-    255,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4989,9 +4989,9 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,  40,   0,   0,   0, 
     152,   2,   0,   0,  44,   0, 
       0,   0, 148,   1,   0,   0, 
-      3,   0,   0,   0,  45,   0, 
+      3,   0,   0,   0,  46,   0, 
       0,   0,  30,   0,   0,   0, 
-     29,   0,   0,   0,  46,   0, 
+     29,   0,   0,   0,  45,   0, 
       0,   0,  31,   0,   0,   0, 
      18,   0,   0,   0,   6,   0, 
       0,   0,  32,   0,   0,   0, 

+ 122 - 122
FactoryCraft/CustomUIDX11VertexShader.h

@@ -237,10 +237,10 @@ ret
 
 const BYTE CustomUIDX11VertexShader[] =
 {
-     68,  88,  66,  67,  82,  83, 
-    117,  73, 125,  21, 217, 225, 
-     63,  21, 207, 146, 190,  94, 
-    235, 123,   1,   0,   0,   0, 
+     68,  88,  66,  67,  92, 137, 
+     81,  66,  43,  68, 115, 189, 
+     25,  53, 111, 114,  34,  49, 
+     34,  70,   1,   0,   0,   0, 
     216,  93,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      84,   3,   0,   0,  12,   4, 
@@ -1340,11 +1340,11 @@ const BYTE CustomUIDX11VertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1, 183, 167,  15,  99, 
-      1,   0,   0,   0, 103,  80, 
-    122,  39,  98, 228, 138,  75, 
-    175, 159, 160, 135, 184, 174, 
-    180, 147,   0,   0,   0,   0, 
+     49,   1,  99,  87,  18,  99, 
+      1,   0,   0,   0, 102, 225, 
+     45, 108,  95,  87, 214,  75, 
+    171,  78,  55, 217, 174, 146, 
+    233, 109,   0,   0,   0,   0, 
       0,   0,   0,   0,   1,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2109,7 +2109,7 @@ const BYTE CustomUIDX11VertexShader[] =
     105, 111, 110,  59,  13,  10, 
     125,  13,  10,  13,  27, 226, 
      48,   1, 128,   0,   0,   0, 
-     40, 218,  33,  30, 103, 189, 
+    178,  26, 238,   0,   1, 191, 
     216,   1,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2196,8 +2196,8 @@ const BYTE CustomUIDX11VertexShader[] =
       4,   0,   0,   0,  66,   0, 
      60,  17,  16,   1,   0,   0, 
       0,   1,  10,   0,   1,   0, 
-    173,   2,  97,  74,  10,   0, 
-      1,   0, 173,   2,  97,  74, 
+      1,   0,  93,  88,  10,   0, 
+      1,   0,   1,   0,  93,  88, 
      77, 105,  99, 114, 111, 115, 
     111, 102, 116,  32,  40,  82, 
      41,  32,  72,  76,  83,  76, 
@@ -3899,62 +3899,78 @@ const BYTE CustomUIDX11VertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 148,  46, 
-     49,   1, 183, 167,  15,  99, 
-      1,   0,   0,   0, 103,  80, 
-    122,  39,  98, 228, 138,  75, 
-    175, 159, 160, 135, 184, 174, 
-    180, 147, 175,   0,   0,   0, 
-     47,  76, 105, 110, 107,  73, 
-    110, 102, 111,   0,  47, 110, 
-     97, 109, 101, 115,   0,  47, 
-    115, 114,  99,  47, 104, 101, 
-     97, 100, 101, 114,  98, 108, 
-    111,  99, 107,   0,  47, 115, 
-    114,  99,  47, 102, 105, 108, 
-    101, 115,  47,  99,  58,  92, 
-    117, 115, 101, 114, 115,  92, 
-    107, 111, 108, 106,  97,  92, 
-    100, 101, 115, 107, 116, 111, 
-    112,  92, 107, 111, 108, 106, 
-     97,  45, 115, 116, 114, 111, 
-    104, 109,  45, 103,  97, 109, 
-    101, 115,  92, 115, 112, 105, 
-    101, 108, 101,  32, 112, 108, 
-     97, 116, 102, 111, 114, 109, 
-     92, 115, 116,  97, 110, 100, 
-     97, 108, 111, 119, 110,  92, 
-    107, 108, 105, 101, 110, 116, 
-     92, 102,  97,  99, 116, 111, 
-    114, 121,  99, 114,  97, 102, 
-    116,  92, 102,  97,  99, 116, 
-    111, 114, 121,  99, 114,  97, 
-    102, 116,  92, 100, 120,  49, 
-     49,  99, 117, 115, 116, 111, 
-    109, 118, 101, 114, 116, 101, 
-    120, 115, 104,  97, 100, 101, 
-    114,  46, 104, 108, 115, 108, 
-      0,   4,   0,   0,   0,   6, 
-      0,   0,   0,   1,   0,   0, 
-      0,  30,   0,   0,   0,   0, 
-      0,   0,   0,  17,   0,   0, 
-      0,   7,   0,   0,   0,  34, 
-      0,   0,   0,   8,   0,   0, 
-      0,  10,   0,   0,   0,   6, 
-      0,   0,   0,   0,   0,   0, 
-      0,   5,   0,   0,   0,   0, 
-      0,   0,   0, 220,  81,  51, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 255, 255, 
+    255, 255, 119,   9,  49,   1, 
+      1,   0,   0,   0,  13,   0, 
+     20, 142,  14,   0,  20, 107, 
+     15,   0,   1,   0,  92,   0, 
+      0,   0,  32,   0,   0,   0, 
+     44,   0,   0,   0, 144,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  22,   0, 
+      0,   0,  25,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 120,  10,   0,   0, 
+     32,   0,   0,  96,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      9,   0,  64,   6,   0,   0, 
+      0,   0,   0,   0, 236,   8, 
+      0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+     84, 101, 120, 116, 117, 114, 
+    101,  86, 101, 114, 116, 101, 
+    120,  83, 104,  97, 100, 101, 
+    114,   0, 110, 111, 110, 101, 
+      0,   0,   0,   0,  45, 186, 
+     46, 241,   1,   0,   0,   0, 
+      0,   0,   0,   0, 120,  10, 
+      0,   0,  32,   0,   0,  96, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      2,   0,   2,   0,   7,   0, 
+      0,   0,   0,   0,   1,   0, 
+    255, 255, 255, 255,   0,   0, 
+      0,   0, 120,  10,   0,   0, 
+      8,   2,   0,   0,   0,   0, 
+      0,   0, 255, 255, 255, 255, 
+      0,   0,   0,   0, 255, 255, 
+    255, 255,   1,   0,   1,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,  67,  58,  92,  85, 
+    115, 101, 114, 115,  92, 107, 
+    111, 108, 106,  97,  92,  68, 
+    101, 115, 107, 116, 111, 112, 
+     92,  75, 111, 108, 106,  97, 
+     45,  83, 116, 114, 111, 104, 
+    109,  45,  71,  97, 109, 101, 
+    115,  92,  83, 112, 105, 101, 
+    108, 101,  32,  80, 108,  97, 
+    116, 102, 111, 114, 109,  92, 
+     83, 116,  97, 110, 100,  97, 
+    108, 111, 119, 110,  92,  75, 
+    108, 105, 101, 110, 116,  92, 
+     70,  97,  99, 116, 111, 114, 
+    121,  67, 114,  97, 102, 116, 
+     92,  70,  97,  99, 116, 111, 
+    114, 121,  67, 114,  97, 102, 
+    116,  92,  68,  88,  49,  49, 
+     67, 117, 115, 116, 111, 109, 
+     86, 101, 114, 116, 101, 120, 
+     83, 104,  97, 100, 101, 114, 
+     46, 104, 108, 115, 108,   0, 
+      0,   0, 254, 239, 254, 239, 
+      1,   0,   0,   0,   1,   0, 
+      0,   0,   0,   1,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 255, 255, 255, 
+    255, 255, 255, 255, 255, 255, 
+    255,  12,   0, 255, 255, 255, 
+    255, 255, 255, 255, 255, 255, 
+    255,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3969,6 +3985,51 @@ const BYTE CustomUIDX11VertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+    148,  46,  49,   1,  99,  87, 
+     18,  99,   1,   0,   0,   0, 
+    102, 225,  45, 108,  95,  87, 
+    214,  75, 171,  78,  55, 217, 
+    174, 146, 233, 109, 175,   0, 
+      0,   0,  47,  76, 105, 110, 
+    107,  73, 110, 102, 111,   0, 
+     47, 110,  97, 109, 101, 115, 
+      0,  47, 115, 114,  99,  47, 
+    104, 101,  97, 100, 101, 114, 
+     98, 108, 111,  99, 107,   0, 
+     47, 115, 114,  99,  47, 102, 
+    105, 108, 101, 115,  47,  99, 
+     58,  92, 117, 115, 101, 114, 
+    115,  92, 107, 111, 108, 106, 
+     97,  92, 100, 101, 115, 107, 
+    116, 111, 112,  92, 107, 111, 
+    108, 106,  97,  45, 115, 116, 
+    114, 111, 104, 109,  45, 103, 
+     97, 109, 101, 115,  92, 115, 
+    112, 105, 101, 108, 101,  32, 
+    112, 108,  97, 116, 102, 111, 
+    114, 109,  92, 115, 116,  97, 
+    110, 100,  97, 108, 111, 119, 
+    110,  92, 107, 108, 105, 101, 
+    110, 116,  92, 102,  97,  99, 
+    116, 111, 114, 121,  99, 114, 
+     97, 102, 116,  92, 102,  97, 
+     99, 116, 111, 114, 121,  99, 
+    114,  97, 102, 116,  92, 100, 
+    120,  49,  49,  99, 117, 115, 
+    116, 111, 109, 118, 101, 114, 
+    116, 101, 120, 115, 104,  97, 
+    100, 101, 114,  46, 104, 108, 
+    115, 108,   0,   4,   0,   0, 
+      0,   6,   0,   0,   0,   1, 
+      0,   0,   0,  30,   0,   0, 
+      0,   0,   0,   0,   0,  17, 
+      0,   0,   0,   7,   0,   0, 
+      0,  34,   0,   0,   0,   8, 
+      0,   0,   0,  10,   0,   0, 
+      0,   6,   0,   0,   0,   0, 
+      0,   0,   0,   5,   0,   0, 
+      0,   0,   0,   0,   0, 220, 
+     81,  51,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3985,77 +4046,16 @@ const BYTE CustomUIDX11VertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    255, 255, 255, 255, 119,   9, 
-     49,   1,   1,   0,   0,   0, 
-     13,   0,   0, 142,  14,   0, 
-     63,  92,  15,   0,   0,   0, 
-     92,   0,   0,   0,  32,   0, 
-      0,   0,  44,   0,   0,   0, 
-    144,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-     22,   0,   0,   0,  25,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0, 120,  10, 
-      0,   0,  32,   0,   0,  96, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      2,   0,   9,   0,  64,   6, 
       0,   0,   0,   0,   0,   0, 
-    236,   8,   0,   0,   1,   0, 
-     52, 219,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,  84, 101, 120, 116, 
-    117, 114, 101,  86, 101, 114, 
-    116, 101, 120,  83, 104,  97, 
-    100, 101, 114,   0, 110, 111, 
-    110, 101,   0,   0,   0,   0, 
-     45, 186,  46, 241,   1,   0, 
       0,   0,   0,   0,   0,   0, 
-    120,  10,   0,   0,  32,   0, 
-      0,  96,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   2,   0,   2,   0, 
-      7,   0,   0,   0,   0,   0, 
-      1,   0, 255, 255, 255, 255, 
-      0,   0,   0,   0, 120,  10, 
-      0,   0,   8,   2,   0,   0, 
-      0,   0,   0,   0, 255, 255, 
-    255, 255,   0,   0,   0,   0, 
-    255, 255, 255, 255,   1,   0, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,  67,  58, 
-     92,  85, 115, 101, 114, 115, 
-     92, 107, 111, 108, 106,  97, 
-     92,  68, 101, 115, 107, 116, 
-    111, 112,  92,  75, 111, 108, 
-    106,  97,  45,  83, 116, 114, 
-    111, 104, 109,  45,  71,  97, 
-    109, 101, 115,  92,  83, 112, 
-    105, 101, 108, 101,  32,  80, 
-    108,  97, 116, 102, 111, 114, 
-    109,  92,  83, 116,  97, 110, 
-    100,  97, 108, 111, 119, 110, 
-     92,  75, 108, 105, 101, 110, 
-    116,  92,  70,  97,  99, 116, 
-    111, 114, 121,  67, 114,  97, 
-    102, 116,  92,  70,  97,  99, 
-    116, 111, 114, 121,  67, 114, 
-     97, 102, 116,  92,  68,  88, 
-     49,  49,  67, 117, 115, 116, 
-    111, 109,  86, 101, 114, 116, 
-    101, 120,  83, 104,  97, 100, 
-    101, 114,  46, 104, 108, 115, 
-    108,   0,   0,   0, 254, 239, 
-    254, 239,   1,   0,   0,   0, 
-      1,   0,   0,   0,   0,   1, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 255, 
-    255, 255, 255, 255, 255, 255, 
-    255, 255, 255,  12,   0, 255, 
-    255, 255, 255, 255, 255, 255, 
-    255, 255, 255,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4082,9 +4082,9 @@ const BYTE CustomUIDX11VertexShader[] =
      40,   0,   0,   0,  92,   2, 
       0,   0,  44,   0,   0,   0, 
     192,   0,   0,   0,   3,   0, 
-      0,   0,  35,   0,   0,   0, 
-     24,   0,   0,   0,  23,   0, 
       0,   0,  36,   0,   0,   0, 
+     24,   0,   0,   0,  23,   0, 
+      0,   0,  35,   0,   0,   0, 
      25,   0,   0,   0,  13,   0, 
       0,   0,   6,   0,   0,   0, 
      26,   0,   0,   0,  27,   0, 

+ 8 - 0
FactoryCraft/Dimension.cpp

@@ -43,15 +43,19 @@ void Dimension::api(char* message)
         {
             int cX = *(int*)(message + 1);
             int cY = *(int*)(message + 5);
+            cs.lock();
             Chunk* ch = zChunk(Punkt(cX, cY));
             if (ch) ch->api(message + 9);
+            cs.unlock();
             break;
         }
     case 2: // entity
         {
             int eId = *(int*)(message + 1);
+            cs.lock();
             Entity* e = zEntity(eId);
             if (e) e->api(message + 5);
+            cs.unlock();
             break;
         }
     case 3: // block
@@ -59,8 +63,10 @@ void Dimension::api(char* message)
             int px = *(int*)(message + 1);
             int py = *(int*)(message + 5);
             int pz = *(int*)(message + 9);
+            cs.lock();
             Block* b = zBlock(Framework::Vec3<int>(px, py, pz));
             if (b) b->api(message + 13);
+            cs.unlock();
             break;
         }
     case 4: // add new chunck
@@ -73,12 +79,14 @@ void Dimension::api(char* message)
                       << "\n";
             ZeitMesser zm;
             zm.messungStart();
+            cs.lock();
             Chunk* chunk = new Chunk(center);
             chunk->load(&reader);
             zm.messungEnde();
             std::cout << "chunk loading took " << zm.getSekunden()
                       << " seconds\n";
             setChunk(chunk, center);
+            cs.unlock();
             World::INSTANCE->onChunkAdded(center);
             break;
         }

+ 12 - 4
FactoryCraft/FactoryClient.cpp

@@ -74,16 +74,24 @@ void FactoryClient::loadServerInfo()
     kam->setBildschirmPosition(0, 0);
     kam->setBildschirmSize(50, 50);
     kam->setPosition(Vec3<float>(0, 0, 0));
-    kam->setRotation({2.f, 0, -1.f});
+    kam->setRotation({(float)PI / 2.f, 0.f, std::atan2(0.f, -1.f) + (float)PI / 2});
     Bild* b = new Bild();
     b->neuBild(50, 50, 0);
     for (int i = 0; i < itemTypeCount; i++)
     {
         Model3D* mdl = new Model3D();
-        mdl->setModelDaten(itemTypes[i]->getItemModel());
+        Model3DData* data = itemTypes[i]->getItemModel();
+        if (data)
+        {
+            Vec3<float> min = data->getMinPos();
+            Vec3<float> max = data->getMaxPos();
+            float maxX = MAX(MAX(MAX(abs(min.x), abs(max.x)), MAX(abs(min.y), abs(max.y))),  MAX(abs(min.z), abs(max.z)));
+            kam->setPosition(Vec3<float>(maxX * 5, 0.f, 0.f));
+        }
+        mdl->setModelDaten(data);
         mdl->setModelTextur(itemTypes[i]->getItemTextur());
-        mdl->setPosition(Vec3<float>(-0.8f, -0.45f, -0.4f));
-        mdl->setSize(2.f);
+        mdl->setPosition(Vec3<float>(0.f, 0.f, 0.f));
+        mdl->setDrehung(0.25f, 0.25f, 0.55f);
         w->addZeichnung(mdl);
         w->tick(0);
         window->zBildschirm()->lock();