From 2b7d873e5a5b43a339ce9047789807eb74f866e6 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sun, 19 Jan 2014 23:12:40 +0800 Subject: [PATCH] Added new battery model --- .../electrical/battery/RenderBattery.java | 12 +++++++++++- .../resonantinduction/models/battery/battery.obj | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/main/java/resonantinduction/electrical/battery/RenderBattery.java b/src/main/java/resonantinduction/electrical/battery/RenderBattery.java index 10c123f0..cbcc770b 100644 --- a/src/main/java/resonantinduction/electrical/battery/RenderBattery.java +++ b/src/main/java/resonantinduction/electrical/battery/RenderBattery.java @@ -41,8 +41,18 @@ public class RenderBattery extends TileEntitySpecialRenderer glTranslatef((float) x + 0.5F, (float) y, (float) z + 0.5F); glScalef(0.46f, 0.46f, 0.46f); GL11.glRotatef(90 * i, 0, 1, 0); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTURE_LEVELS); + MODEL.renderPart("Battery"); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTURE_CAP); + MODEL.renderPart("CapInterior"); + MODEL.renderPart("CapCorner"); + MODEL.renderPart("CapEdge"); + MODEL.renderPart("BaseEdge"); + MODEL.renderPart("BaseInterior"); + MODEL.renderPart("BaseCorner"); FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTURE_CASE); - MODEL.renderOnly("Default"); + MODEL.renderPart("VertConnector"); + MODEL.renderPart("BatteryCase"); glPopMatrix(); } } diff --git a/src/main/resources/assets/resonantinduction/models/battery/battery.obj b/src/main/resources/assets/resonantinduction/models/battery/battery.obj index 1c7a4500..6d28d56d 100644 --- a/src/main/resources/assets/resonantinduction/models/battery/battery.obj +++ b/src/main/resources/assets/resonantinduction/models/battery/battery.obj @@ -1,6 +1,7 @@ # Blender v2.69 (sub 0) OBJ File: 'battery.blend' # www.blender.org mtllib battery.mtl +g Battery v 0.333532 0.200000 -0.884667 v 0.333532 1.600000 -0.884667 v 0.566469 0.200000 -0.884667 @@ -19,10 +20,10 @@ v 0.000000 0.200000 -0.566468 v 0.000000 1.600000 -0.566468 v 0.131802 0.200000 -0.768198 v 0.131802 1.600000 -0.768198 -vt 0.039062 0.000000 -vt 0.039062 0.781250 +vt 0.062500 0.000000 +vt 0.062500 0.625000 vt 0.000000 -0.000000 -vt 0.000000 0.781250 +vt 0.000000 0.625000 usemtl (null) s off f 1/1 2/2 3/3 @@ -41,6 +42,7 @@ f 10/2 12/4 11/3 f 12/2 14/4 13/3 f 16/2 18/4 17/3 f 18/2 2/4 1/3 +g CapInterior v 0.000000 1.800000 -0.000000 v 0.000000 1.800000 -1.000000 v 1.000000 1.800000 0.000000 @@ -59,6 +61,7 @@ f 19/5 21/6 20/7 f 23/5 25/6 24/7 f 21/6 22/8 20/7 f 25/6 26/8 24/7 +g CapCorner v 0.900000 1.600000 0.000000 v 0.900000 1.600000 -0.900000 v 0.000000 1.600000 -0.900000 @@ -91,6 +94,7 @@ f 32/10 27/12 28/11 f 31/13 33/20 28/14 f 32/16 33/21 31/17 f 27/16 34/22 29/19 +g BaseEdge v 1.000000 0.200000 0.000000 v 1.000000 0.200000 -0.900000 v 0.000000 0.200000 -0.900000 @@ -118,6 +122,7 @@ f 36/29 41/30 37/31 f 36/24 37/32 42/25 f 40/27 38/33 39/28 f 41/30 39/26 37/31 +g BaseInterior v 1.000000 0.200000 -1.000000 v 0.000000 -0.000000 -0.000000 v 0.000000 -0.000000 -1.000000 @@ -136,6 +141,7 @@ f 47/34 46/35 45/36 f 43/34 48/35 49/36 f 46/35 44/37 45/36 f 48/35 50/37 49/36 +g BaseCorner v 0.900000 0.200000 0.000000 v 0.900000 0.200000 -0.900000 v 0.000000 0.200000 -0.900000 @@ -163,6 +169,7 @@ f 52/44 51/38 57/40 f 52/45 57/41 53/38 f 56/43 54/46 55/38 f 53/38 58/42 51/42 +g VertConnector v 0.900000 1.600000 -0.900000 v 0.750000 1.800000 -0.750000 v 0.900000 2.200000 -0.900000 @@ -187,6 +194,7 @@ f 66/53 62/48 64/54 f 62/48 66/53 65/49 f 63/51 64/54 60/52 f 62/48 60/52 64/54 +g CapEdge v 0.000000 1.600000 -0.000000 v 0.000000 1.600000 -0.900000 v 0.000000 1.800000 -0.000000 @@ -215,6 +223,7 @@ f 67/61 68/62 74/63 f 71/56 72/64 70/57 f 68/59 70/65 72/60 f 68/62 73/66 74/63 +g BatteryCase v 0.900000 1.600000 -0.900000 v 0.050000 1.600000 -0.900000 v 0.750000 1.600000 -0.900000