minerender 2.0.0-alpha.14 → 2.0.0-alpha.15

package/src/skin/SkinTextureCoordinates.ts

@@ -4,9 +4,13 @@ import { ModelFaces } from "../model/ModelElement";
 
 export type SkinTextureCoordinates = Record<SkinPart, ModelFaces>;
 
+// up and down UVs are weird
+//  so they're flipped on X - u0 is u1, u1 is u0
+//  up seems to also be flipped on Y - v0 is v1, v1 is v0
+
 const baseSkinCoordinates: SkinTextureCoordinates = {
     head: {
-        west: {
+        east: { // left
             uv: [
                 0,
                 8,
@@ -14,7 +18,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 16
             ]
         },
-        east: {
+        west: { // right
             uv: [
                 16,
                 8,
@@ -22,7 +26,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 16
             ]
         },
-        north: {
+        north: { // front
             uv: [
                 8,
                 8,
@@ -30,7 +34,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 16
             ]
         },
-        south: {
+        south: { // back
             uv: [
                 24,
                 8,
@@ -38,26 +42,25 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 16
             ]
         },
-        up: {
+        up: { // top
             uv: [
-                8,
-                0,
                 16,
-                8
+                8,
+                8,
+                0
             ]
         },
-        down: {
+        down: { // bottom
             uv: [
-                16,
-                0,
                 24,
+                0,
+                16,
                 8
-            ],
-            rotation: 180
+            ]
         }
     },
     body: {
-        west: {
+        east: {
             uv: [
                 16,
                 20,
@@ -65,7 +68,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 32
             ]
         },
-        east: {
+        west: {
             uv: [
                 28,
                 20,
@@ -91,24 +94,23 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
         },
         up: {
             uv: [
-                20,
-                16,
                 28,
-                20
+                20,
+                20,
+                16
             ]
         },
         down: {
             uv: [
-                28,
-                16,
                 36,
+                16,
+                28,
                 20
-            ],
-            rotation: 180
+            ]
         }
     },
-    rightArm: {
-        west: {
+    leftArm: {
+        east: {
             uv: [
                 32,
                 52,
@@ -116,7 +118,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 64
             ]
         },
-        east: {
+        west: {
             uv: [
                 40,
                 52,
@@ -142,38 +144,39 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
         },
         up: {
             uv: [
-                36,
-                48,
                 40,
-                52
+                52,
+                36,
+                48
             ]
         },
         down: {
             uv: [
-                40,
-                48,
                 44,
+                48,
+                40,
                 52
-            ],
-            rotation: 180
+            ]
         }
     },
-    leftArm: {
-        west: {
+    rightArm: {
+        east: {
             uv: [
                 40,
                 20,
                 44,
                 32
-            ]
+            ],
+
         },
-        east: {
+        west: {
             uv: [
                 48,
                 20,
                 52,
                 32
-            ]
+            ],
+
         },
         north: {
             uv: [
@@ -181,7 +184,8 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 20,
                 48,
                 32
-            ]
+            ],
+
         },
         south: {
             uv: [
@@ -189,28 +193,31 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 20,
                 56,
                 32
-            ]
+            ],
+
         },
         up: {
             uv: [
-                44,
-                16,
                 48,
-                20
-            ]
+                20,
+                44,
+                16
+            ],
+
         },
         down: {
             uv: [
-                48,
-                16,
                 52,
+                16,
+                48,
                 20
             ],
-            rotation: 180
+
+
         }
     },
-    rightLeg: {
-        west: {
+    leftLeg: {
+        east: {
             uv: [
                 16,
                 52,
@@ -218,7 +225,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 64
             ]
         },
-        east: {
+        west: {
             uv: [
                 24,
                 52,
@@ -244,32 +251,33 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
         },
         up: {
             uv: [
-                20,
-                48,
                 24,
-                52
+                52,
+                20,
+                48
             ]
         },
         down: {
             uv: [
-                24,
-                48,
                 28,
+                48,
+                24,
                 52
             ],
             rotation: 180
         }
     },
-    leftLeg: {
-        west: {
+    rightLeg: {
+        east: {
             uv: [
                 0,
                 20,
                 4,
                 32
-            ]
+            ],
+
         },
-        east: {
+        west: {
             uv: [
                 8,
                 20,
@@ -283,7 +291,8 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 20,
                 8,
                 32
-            ]
+            ],
+
         },
         south: {
             uv: [
@@ -291,28 +300,31 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 20,
                 16,
                 32
-            ]
+            ],
+
         },
         up: {
             uv: [
-                4,
-                16,
                 8,
-                20
-            ]
+                20,
+                4,
+                16
+            ],
+
         },
         down: {
             uv: [
-                8,
-                16,
                 12,
+                16,
+                8,
                 20
             ],
-            rotation: 180
+
+
         }
     },
     hat: {
-        west: {
+        east: {
             uv: [
                 32,
                 8,
@@ -320,7 +332,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 16
             ]
         },
-        east: {
+        west: {
             uv: [
                 48,
                 8,
@@ -346,24 +358,24 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
         },
         up: {
             uv: [
-                40,
-                0,
                 48,
-                8
+                8,
+                40,
+                0
             ]
         },
         down: {
             uv: [
-                48,
-                0,
                 56,
+                0,
+                48,
                 8
             ],
             rotation: 180
         }
     },
     jacket: {
-        west: {
+        east: {
             uv: [
                 16,
                 36,
@@ -371,7 +383,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 48
             ]
         },
-        east: {
+        west: {
             uv: [
                 28,
                 36,
@@ -397,24 +409,24 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
         },
         up: {
             uv: [
-                20,
-                32,
                 28,
-                36
+                36,
+                20,
+                32
             ]
         },
         down: {
             uv: [
-                28,
-                32,
                 36,
+                32,
+                28,
                 36
             ],
             rotation: 180
         }
     },
-    rightSleeve: {
-        west: {
+    leftSleeve: {
+        east: {
             uv: [
                 48,
                 52,
@@ -422,7 +434,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 64
             ]
         },
-        east: {
+        west: {
             uv: [
                 56,
                 52,
@@ -448,24 +460,24 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
         },
         up: {
             uv: [
-                52,
-                48,
                 56,
-                52
+                52,
+                52,
+                48
             ]
         },
         down: {
             uv: [
-                56,
-                48,
                 60,
+                48,
+                56,
                 52
             ],
             rotation: 180
         }
     },
-    leftSleeve: {
-        west: {
+    rightSleeve: {
+        east: {
             uv: [
                 40,
                 36,
@@ -473,7 +485,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 48
             ]
         },
-        east: {
+        west: {
             uv: [
                 48,
                 36,
@@ -499,24 +511,24 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
         },
         up: {
             uv: [
-                44,
-                32,
                 48,
-                36
+                36,
+                44,
+                32
             ]
         },
         down: {
             uv: [
-                48,
-                32,
                 52,
+                32,
+                48,
                 36
             ],
             rotation: 180
         }
     },
-    rightTrousers: {
-        west: {
+    leftTrousers: {
+        east: {
             uv: [
                 0,
                 52,
@@ -524,7 +536,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 64
             ]
         },
-        east: {
+        west: {
             uv: [
                 8,
                 52,
@@ -550,24 +562,23 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
         },
         up: {
             uv: [
-                4,
-                48,
                 8,
-                52
+                52,
+                4,
+                48
             ]
         },
         down: {
             uv: [
-                8,
-                48,
                 12,
+                48,
+                8,
                 52
-            ],
-            rotation: 180
+            ]
         }
     },
-    leftTrousers: {
-        west: {
+    rightTrousers: {
+        east: {
             uv: [
                 0,
                 36,
@@ -575,7 +586,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 48
             ]
         },
-        east: {
+        west: {
             uv: [
                 8,
                 36,
@@ -602,9 +613,9 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
         up: {
             uv: [
                 4,
-                32,
+                36,
                 8,
-                36
+                32
             ]
         },
         down: {
@@ -618,7 +629,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
         }
     },
     cape: {//TODO
-        west: {
+        east: {
             uv: [
                 0,
                 36,
@@ -626,7 +637,7 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
                 48
             ]
         },
-        east: {
+        west: {
             uv: [
                 8,
                 36,
@@ -671,7 +682,6 @@ const baseSkinCoordinates: SkinTextureCoordinates = {
 }
 
 
-
 export const classicSkinTextureCoordinates: Readonly<SkinTextureCoordinates> = {
     ...baseSkinCoordinates
 };
@@ -679,7 +689,7 @@ export const classicSkinTextureCoordinates: Readonly<SkinTextureCoordinates> = {
 //TODO
 export const slimSkinTextureCoordinates: Readonly<SkinTextureCoordinates> = {...baseSkinCoordinates} /*merge(baseSkinCoordinates, <SkinTextureCoordinates>{
     rightArm: {
-        east: {
+        west: {
             x: 39
         },
         south: {
@@ -698,7 +708,7 @@ export const slimSkinTextureCoordinates: Readonly<SkinTextureCoordinates> = {...
         }
     },
     leftArm: {
-        east: {
+        west: {
             x: 47
         },
         south: {
@@ -718,7 +728,7 @@ export const slimSkinTextureCoordinates: Readonly<SkinTextureCoordinates> = {...
     },
 
     rightSleeve: {
-        east: {
+        west: {
             x: 55
         },
         south: {
@@ -737,7 +747,7 @@ export const slimSkinTextureCoordinates: Readonly<SkinTextureCoordinates> = {...
         }
     },
     leftSleeve: {
-        east: {
+        west: {
             x: 47
         },
         south: {

package/src/world/Chunk.ts

@@ -3,14 +3,12 @@ import { BlockObject, isBlockObject } from "../model/block/scene/BlockObject";
 import { Box3, Object3D, Vector3 } from "three";
 import { Maybe } from "../util/util";
 import { BlockInfo } from "./BlockInfo";
-import { del } from "node-persist";
 import { MineRenderScene } from "../renderer/MineRenderScene";
 import { BlockStates } from "../assets/BlockStates";
 import { AssetKey } from "../assets/AssetKey";
 import { MineRenderWorld } from "./MineRenderWorld";
 import { isTripleArray, TripleArray } from "../model/Model";
 import { addBox3WireframeToObject } from "../util/model";
-import webpack from "webpack";
 import { prefix } from "../util/log";
 
 const p = prefix("Chunk");

package/tsconfig.json

@@ -17,8 +17,8 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "esModuleInterop": true,
-    "module": "ES6",
-    "target": "ES6",
+    "module": "ES2020",
+    "target": "ES2020",
     "lib": [
       "es6",
       "dom"