Modified item rendering. (#307)

* Reverted design, tape measure, and bit bag rendering back to normal. * Chisels, wrenches, and saws now render the same as item/handheld, except at the scale of normal items and with slight tweaking of position. * Reduced code duplication by extracting matrix creation to a method. * Matched perspective model rendering to block.json (translation values in json files specify pixels, but are scaled to meters in ItemTransformVec3f$Deserializer.deserialize).
ChiselsAndBits · Sep 24, 2017 · 13c96ec · 13c96ec
1 parent 2fcb485
commit 13c96ec
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 72 deletions.
diff --git a/src/main/java/mod/chiselsandbits/render/BaseBakedPerspectiveModel.java b/src/main/java/mod/chiselsandbits/render/BaseBakedPerspectiveModel.java
@@ -24,62 +24,29 @@ public abstract class BaseBakedPerspectiveModel implements IPerspectiveAwareMode
 
 	static
 	{
-		// for some reason these are not identical to vanilla's Block.json, I
-		// don't know why.. but its close.
-
-		{
-			final javax.vecmath.Vector3f translation = new javax.vecmath.Vector3f( 0, 0, 0 );
-			final javax.vecmath.Vector3f scale = new javax.vecmath.Vector3f( 0.625f, 0.625f, 0.625f );
-			final Quat4f rotation = TRSRTransformation.quatFromXYZDegrees( new javax.vecmath.Vector3f( 30, 225, 0 ) );
-
-			final TRSRTransformation transform = new TRSRTransformation( translation, rotation, scale, null );
-			gui = transform.getMatrix();
-		}
-
-		{
-			final javax.vecmath.Vector3f translation = new javax.vecmath.Vector3f( 0, 0, 0 );
-			final javax.vecmath.Vector3f scale = new javax.vecmath.Vector3f( 0.25f, 0.25f, 0.25f );
-			final Quat4f rotation = TRSRTransformation.quatFromXYZDegrees( new javax.vecmath.Vector3f( 0, 0, 0 ) );
-
-			final TRSRTransformation transform = new TRSRTransformation( translation, rotation, scale, null );
-			ground = transform.getMatrix();
-		}
-
-		{
-			final javax.vecmath.Vector3f translation = new javax.vecmath.Vector3f( 0, 0, 0 );
-			final javax.vecmath.Vector3f scale = new javax.vecmath.Vector3f( 0.5f, 0.5f, 0.5f );
-			final Quat4f rotation = TRSRTransformation.quatFromXYZDegrees( new javax.vecmath.Vector3f( 0, 0, 0 ) );
-
-			final TRSRTransformation transform = new TRSRTransformation( translation, rotation, scale, null );
-			fixed = transform.getMatrix();
-		}
-
-		{
-			final javax.vecmath.Vector3f translation = new javax.vecmath.Vector3f( 0, 0, 0 );
-			final javax.vecmath.Vector3f scale = new javax.vecmath.Vector3f( 0.375f, 0.375f, 0.375f );
-			final Quat4f rotation = TRSRTransformation.quatFromXYZDegrees( new javax.vecmath.Vector3f( 75, 45, 0 ) );
-
-			final TRSRTransformation transform = new TRSRTransformation( translation, rotation, scale, null );
-			thirdPerson_lefthand = thirdPerson_righthand = transform.getMatrix();
-		}
-
-		{
-			final javax.vecmath.Vector3f translation = new javax.vecmath.Vector3f( 0, 0, 0 );
-			final javax.vecmath.Vector3f scale = new javax.vecmath.Vector3f( 0.40f, 0.40f, 0.40f );
-			final Quat4f rotation = TRSRTransformation.quatFromXYZDegrees( new javax.vecmath.Vector3f( 0, 45, 0 ) );
-
-			final TRSRTransformation transform = new TRSRTransformation( translation, rotation, scale, null );
-			firstPerson_righthand = transform.getMatrix();
-		}
+		gui = getMatrix( 0, 0, 0, 30, 225, 0, 0.625f );
+		ground = getMatrix( 0, 3 / 16.0f, 0, 0, 0, 0, 0.25f );
+		fixed = getMatrix( 0, 0, 0, 0, 0, 0, 0.5f );
+		thirdPerson_lefthand = thirdPerson_righthand = getMatrix( 0, 2.5f / 16.0f, 0, 75, 45, 0, 0.375f );
+		firstPerson_righthand = getMatrix( 0, 0, 0, 0, 45, 0, 0.40f );
+		firstPerson_lefthand = getMatrix( 0, 0, 0, 0, 0, 225, 0.40f );
+	}
 
-		{
-			final javax.vecmath.Vector3f translation = new javax.vecmath.Vector3f( 0, 0, 0 );
-			final javax.vecmath.Vector3f scale = new javax.vecmath.Vector3f( 0.40f, 0.40f, 0.40f );
-			final Quat4f rotation = TRSRTransformation.quatFromXYZDegrees( new javax.vecmath.Vector3f( 0, 225, 0 ) );
+	private static Matrix4f getMatrix(
+			final float transX,
+			final float transY,
+			final float transZ,
+			final float rotX,
+			final float rotY,
+			final float rotZ,
+			final float scaleXYZ )
+	{
+		final javax.vecmath.Vector3f translation = new javax.vecmath.Vector3f( transX, transY, transZ );
+		final javax.vecmath.Vector3f scale = new javax.vecmath.Vector3f( scaleXYZ, scaleXYZ, scaleXYZ );
+		final Quat4f rotation = TRSRTransformation.quatFromXYZDegrees( new javax.vecmath.Vector3f( rotX, rotY, rotZ ) );
 
-			final TRSRTransformation transform = new TRSRTransformation( translation, rotation, scale, null );
-			firstPerson_lefthand = transform.getMatrix();
-		}
+		final TRSRTransformation transform = new TRSRTransformation( translation, rotation, scale, null );
+		return transform.getMatrix();
 	}
 
 	@Override

diff --git a/src/main/resources/assets/chiselsandbits/models/item/bit_bag.json b/src/main/resources/assets/chiselsandbits/models/item/bit_bag.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"item/generated",
     "textures": {
         "layer0":"chiselsandbits:items/bit_bag"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/bitsaw_diamond.json b/src/main/resources/assets/chiselsandbits/models/item/bitsaw_diamond.json
@@ -1,18 +1,18 @@
 {
-	"parent": "item/generated",
+    "parent":"item/generated",
 	"textures": {
 		"layer0":"chiselsandbits:items/bitsaw_diamond"
 	},
 	"display": {
 		"thirdperson_righthand": {
 			"rotation": [ 0, 90, 55 ],
-			"translation": [ 0, 4.0, 0.5 ],
-			"scale": [ 0.85, 0.85, 0.85 ]
+			"translation": [ 0, 3.5, 0.75 ],
+			"scale": [ 0.55, 0.55, 0.55 ]
 		},
 		"thirdperson_lefthand": {
 			"rotation": [ 0, -90, -55 ],
-			"translation": [ 0, 4.0, 0.5 ],
-			"scale": [ 0.85, 0.85, 0.85 ]
+			"translation": [ 0, 3.5, 0.75 ],
+			"scale": [ 0.55, 0.55, 0.55 ]
 		},
 		"firstperson_righthand": {
 			"rotation": [ 0, 90, 25 ],

diff --git a/src/main/resources/assets/chiselsandbits/models/item/chisel_diamond.json b/src/main/resources/assets/chiselsandbits/models/item/chisel_diamond.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"chiselsandbits:item/tool",
     "textures": {
         "layer0":"chiselsandbits:items/chisel_diamond"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/chisel_gold.json b/src/main/resources/assets/chiselsandbits/models/item/chisel_gold.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"chiselsandbits:item/tool",
     "textures": {
         "layer0":"chiselsandbits:items/chisel_gold"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/chisel_iron.json b/src/main/resources/assets/chiselsandbits/models/item/chisel_iron.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"chiselsandbits:item/tool",
     "textures": {
         "layer0":"chiselsandbits:items/chisel_iron"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/chisel_stone.json b/src/main/resources/assets/chiselsandbits/models/item/chisel_stone.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"chiselsandbits:item/tool",
     "textures": {
         "layer0":"chiselsandbits:items/chisel_stone"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/mirrorprint.json b/src/main/resources/assets/chiselsandbits/models/item/mirrorprint.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"item/generated",
     "textures": {
         "layer0":"chiselsandbits:items/mirrorprint"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/mirrorprint_written.json b/src/main/resources/assets/chiselsandbits/models/item/mirrorprint_written.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"item/generated",
     "textures": {
         "layer0":"chiselsandbits:items/mirrorprint_written"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/negativeprint.json b/src/main/resources/assets/chiselsandbits/models/item/negativeprint.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"item/generated",
     "textures": {
         "layer0":"chiselsandbits:items/negativeprint"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/negativeprint_written.json b/src/main/resources/assets/chiselsandbits/models/item/negativeprint_written.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"item/generated",
     "textures": {
         "layer0":"chiselsandbits:items/negativeprint_written"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/positiveprint.json b/src/main/resources/assets/chiselsandbits/models/item/positiveprint.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"item/generated",
     "textures": {
         "layer0":"chiselsandbits:items/positiveprint"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/positiveprint_written.json b/src/main/resources/assets/chiselsandbits/models/item/positiveprint_written.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"item/generated",
     "textures": {
         "layer0":"chiselsandbits:items/positiveprint_written"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/tape_measure.json b/src/main/resources/assets/chiselsandbits/models/item/tape_measure.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"item/generated",
     "textures": {
         "layer0":"chiselsandbits:items/tape_measure"
     }

diff --git a/src/main/resources/assets/chiselsandbits/models/item/tool.json b/src/main/resources/assets/chiselsandbits/models/item/tool.json
@@ -0,0 +1,15 @@
+{
+    "parent": "item/handheld",
+	"display": {
+        "thirdperson_righthand": {
+            "rotation": [ 0, -90, 55 ],
+            "translation": [ 0, 3.5, 0.75 ],
+            "scale": [ 0.55, 0.55, 0.55 ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [ 0, 90, -55 ],
+            "translation": [ 0, 3.5, 0.75 ],
+            "scale": [ 0.55, 0.55, 0.55 ]
+        }
+    }
+}
diff --git a/src/main/resources/assets/chiselsandbits/models/item/wrench_wood.json b/src/main/resources/assets/chiselsandbits/models/item/wrench_wood.json
@@ -1,5 +1,5 @@
 {
-    "parent":"item/handheld",
+    "parent":"chiselsandbits:item/tool",
     "textures": {
         "layer0":"chiselsandbits:items/wrench_wood"
     }