"IndustrialPanel" and "FlatScreenMonitor" reflection plane added. "Fl…

…atScreenMonitor" decimated LED polygon count.

src/main/java/mods/eln/sixnode/electricaldatalogger/ElectricalDataLoggerDescriptor.java

@@ -27,6 +27,8 @@ public class ElectricalDataLoggerDescriptor extends SixNodeDescriptor {
 
     float cr, cg, cb;
 
+	float reflc;
+
     public boolean onFloor;
     private String textColor;
 
@@ -54,7 +56,7 @@ public ElectricalDataLoggerDescriptor(String name, boolean onFloor, String objNa
 				ra = main.getFloat("ra");
 				mx = main.getFloat("mx");
 				my = main.getFloat("my");
-
+				reflc = main.getFloat("reflc");
 				led = obj.getPart("led");
 			}
 		}
@@ -82,7 +84,7 @@ void draw(DataLogs log, LRDU front, int objPosMX, int objPosMZ) {
 		float rotYaw = Minecraft.getMinecraft().thePlayer.rotationYaw / 360.f;
 		float rotPitch = Minecraft.getMinecraft().thePlayer.rotationPitch / 180.f;
 		float pos = (((float)Minecraft.getMinecraft().thePlayer.posX)-((float)(objPosMX*2)) + ((float)Minecraft.getMinecraft().thePlayer.posZ)-((float)(objPosMZ*2))) / 24.f;
-		GL11.glColor4f(1, 1, 1, 0.8f);
+		GL11.glColor4f(1, 1, 1, reflc);
 		reflection.draw(rotYaw+pos, rotPitch*0.857f);
 		UtilsClient.disableBlend();
 

src/main/resources/assets/eln/model/DataloggerCRTFloor/DataloggerCRTFloor.txt

@@ -15,5 +15,4 @@ f ra 90
 f mx 1.15
 f my 1.2
 
-
-
+f reflc 0.8

src/main/resources/assets/eln/model/FlatScreenMonitor/FlatScreenMonitor.mtl

@@ -1,16 +1,16 @@
 # Blender MTL File: 'FlatScreenMonitor.blend'
 # Material Count: 2
 
-newmtl Material
-Ns 96.078431
+newmtl None
+Ns 0
 Ka 0.000000 0.000000 0.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ni 1.000000
-d 1.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
 illum 2
+map_Kd Reflection.png
 
-newmtl None
+newmtl None_FlatScreenMonitor
 Ns 0
 Ka 0.000000 0.000000 0.000000
 Kd 0.8 0.8 0.8

src/main/resources/assets/eln/model/FlatScreenMonitor/FlatScreenMonitor.obj

@@ -1,79 +1,41 @@
 # Blender v2.72 (sub 0) OBJ File: 'FlatScreenMonitor.blend'
 # www.blender.org
 mtllib FlatScreenMonitor.mtl
+o reflection
+v 0.311959 -0.350000 -0.125456
+v 0.858941 -0.350000 -0.067916
+v 0.311959 0.350000 -0.125456
+v 0.858941 0.350000 -0.067916
+vt 0.429688 0.578125
+vt 0.429688 0.421875
+vt 0.570312 0.421875
+vt 0.570312 0.578125
+usemtl None
+s off
+f 2/1 1/2 3/3
+f 4/4 2/1 3/3
 o led
-v 0.260684 0.335181 -0.139258
-v 0.260778 0.336157 -0.139242
-v 0.261059 0.337095 -0.139194
-v 0.261514 0.337959 -0.139116
-v 0.262127 0.338717 -0.139011
-v 0.262874 0.339338 -0.138883
-v 0.263726 0.339801 -0.138737
-v 0.264650 0.340085 -0.138578
-v 0.265612 0.340181 -0.138413
-v 0.266573 0.340085 -0.138248
-v 0.267498 0.339801 -0.138090
-v 0.268350 0.339338 -0.137944
-v 0.269096 0.338717 -0.137816
-v 0.269709 0.337959 -0.137711
-v 0.270165 0.337095 -0.137633
-v 0.270445 0.336157 -0.137584
-v 0.270540 0.335181 -0.137568
-v 0.270445 0.334206 -0.137584
-v 0.270165 0.333268 -0.137633
-v 0.269709 0.332403 -0.137711
-v 0.269096 0.331646 -0.137816
-v 0.268350 0.331024 -0.137944
-v 0.267498 0.330562 -0.138090
-v 0.266573 0.330277 -0.138248
-v 0.265612 0.330181 -0.138413
-v 0.264650 0.330277 -0.138578
-v 0.263726 0.330562 -0.138737
-v 0.262874 0.331024 -0.138883
-v 0.262127 0.331646 -0.139011
-v 0.261514 0.332403 -0.139116
-v 0.261059 0.333268 -0.139194
-v 0.260778 0.334206 -0.139242
-vt 0.625000 0.250000
-vt 0.625000 0.375000
-vt 0.500000 0.375000
+v 0.255681 0.335181 -0.139585
+v 0.258589 0.342252 -0.139242
+v 0.265612 0.345181 -0.138413
+v 0.272634 0.342252 -0.137585
+v 0.275543 0.335181 -0.137241
+v 0.272634 0.328110 -0.137585
+v 0.265612 0.325181 -0.138413
+v 0.258589 0.328110 -0.139242
+vt 0.500000 0.312500
+vt 0.562500 0.312500
+vt 0.562500 0.250000
 vt 0.562500 0.375000
 vt 0.625000 0.312500
-vt 0.562500 0.250000
-vt 0.500000 0.250000
-vt 0.500000 0.312500
-usemtl None
+usemtl None_FlatScreenMonitor
 s off
-f 20/1 30/2 4/3
-f 2/4 30/2 1/4
-f 30/2 31/2 32/4
-f 28/2 29/2 30/2
-f 26/5 27/5 28/2
-f 24/5 25/5 26/5
-f 24/5 26/5 23/1
-f 20/1 21/1 22/1
-f 18/6 19/1 20/1
-f 16/6 17/6 18/6
-f 14/7 15/6 16/6
-f 12/7 13/7 14/7
-f 10/8 11/7 12/7
-f 8/8 9/8 10/8
-f 6/3 7/8 8/8
-f 4/3 5/3 6/3
-f 2/4 3/4 4/3
-f 20/1 14/7 16/6
-f 26/5 28/2 30/2
-f 22/1 23/1 20/1
-f 18/6 20/1 16/6
-f 10/8 12/7 14/7
-f 4/3 6/3 8/8
-f 10/8 20/1 4/3
-f 30/2 32/4 1/4
-f 23/1 26/5 30/2
-f 20/1 23/1 30/2
-f 30/2 2/4 4/3
-f 10/8 4/3 8/8
-f 20/1 10/8 14/7
+f 11/5 12/6 5/7
+f 8/6 9/8 10/6
+f 8/6 11/5 7/9
+f 6/6 11/5 5/7
+f 11/5 6/6 7/9
+f 8/6 10/6 11/5
 o main
 v 0.000000 -0.250000 -0.250000
 v 0.000000 -0.250000 0.250000
@@ -167,121 +129,67 @@ vt 1.000000 0.437500
 vt 0.312500 0.500000
 vt 0.437500 0.062500
 vt 0.812500 0.562500
-usemtl None
-s off
-f 38/9 34/10 33/11
-f 39/9 35/10 34/11
-f 39/9 40/12 36/11
-f 37/13 33/11 36/10
-f 40/14 44/15 41/15
-f 41/9 44/9 48/16
-f 39/17 43/18 44/18
-f 38/19 42/15 43/15
-f 38/20 37/12 41/21
-f 47/16 46/22 45/22
-f 43/9 47/23 48/23
-f 43/9 42/9 46/22
-f 41/9 45/23 46/23
-f 59/24 54/24 50/25
-f 55/26 51/27 50/28
-f 58/29 56/30 52/31
-f 56/32 53/33 49/34
-f 50/35 51/36 52/31
-f 64/37 60/37 55/27
-f 56/32 58/37 63/37
-f 62/38 59/39 57/40
-f 60/41 64/42 63/39
-f 64/43 68/44 67/45
-f 68/46 66/47 65/48
-f 61/49 65/50 66/45
-f 62/51 66/52 68/53
-f 63/51 67/52 65/49
-f 37/12 38/9 33/11
-f 38/13 39/9 34/11
-f 35/10 39/9 36/11
-f 40/9 37/13 36/10
-f 37/54 40/14 41/15
-f 45/22 41/9 48/16
-f 40/55 39/17 44/18
-f 39/22 38/19 43/15
-f 42/21 38/20 41/21
-f 48/16 47/16 45/22
-f 44/9 43/9 48/23
-f 47/16 43/9 46/22
-f 42/9 41/9 46/23
-f 53/34 57/56 49/30
-f 54/36 55/26 50/28
-f 55/25 60/57 51/58
-f 57/56 59/24 50/25
-f 57/56 50/25 49/30
-f 52/24 56/32 49/34
-f 51/58 60/57 58/29
-f 52/31 51/58 58/29
-f 49/59 50/35 52/31
-f 57/60 53/33 61/60
-f 63/37 61/60 56/32
-f 62/60 64/37 55/27
-f 54/28 59/60 62/60
-f 54/28 62/60 55/27
-f 61/61 62/38 57/40
-f 58/38 60/41 63/39
-f 61/60 53/33 56/32
-f 63/62 64/43 67/45
-f 67/63 68/46 65/48
-f 62/62 61/49 66/45
-f 64/64 62/51 68/53
-f 61/59 63/51 65/49
-o Minecraft_2_Edge_Connectivity_Cube.002
-v 0.000000 0.500000 -0.500000
-v 0.000000 -0.500000 -0.500000
-v 0.000000 -0.500000 0.500000
-v 0.000000 0.500000 0.500000
-v 0.500000 -0.000000 -0.500000
-v 0.500000 0.000000 0.500000
-usemtl Material
-s off
-f 70 71 72
-f 70 73 74
-f 69 73 70
-f 71 74 72
-f 73 69 72
-f 69 70 72
-f 71 70 74
-f 74 73 72
-o Minecraft_4_Edge_Connectivity_Cube.001
-v 0.000000 0.500000 -0.500000
-v 0.000000 -0.500000 -0.500000
-v 0.000000 -0.500000 0.500000
-v 0.000000 0.500000 0.500000
-v 0.500000 -0.000000 0.000000
-usemtl Material
-s off
-f 76 77 78
-f 75 79 76
-f 76 79 77
-f 77 79 78
-f 79 75 78
-f 75 76 78
-o Minecraft_Block_Cube
-v 0.000000 0.500000 -0.500000
-v 0.000000 -0.500000 -0.500000
-v 0.000000 -0.500000 0.500000
-v 0.000000 0.500000 0.500000
-v 1.000000 0.500000 -0.500000
-v 1.000000 -0.500000 -0.500000
-v 1.000000 -0.500000 0.500000
-v 1.000000 0.500000 0.500000
-usemtl Material
+usemtl None_FlatScreenMonitor
 s off
-f 81 82 83
-f 87 86 85
-f 84 85 81
-f 81 85 86
-f 86 87 83
-f 80 83 87
-f 80 81 83
-f 84 87 85
-f 80 84 81
-f 82 81 86
-f 82 86 83
-f 84 80 87
+f 18/10 14/11 13/12
+f 19/10 15/11 14/12
+f 19/10 20/13 16/12
+f 17/14 13/12 16/11
+f 20/15 24/16 21/16
+f 21/10 24/10 28/17
+f 19/18 23/19 24/19
+f 18/20 22/16 23/16
+f 18/21 17/13 21/22
+f 27/17 26/23 25/23
+f 23/10 27/24 28/24
+f 23/10 22/10 26/23
+f 21/10 25/24 26/24
+f 39/25 34/25 30/26
+f 35/27 31/28 30/29
+f 38/30 36/31 32/32
+f 36/33 33/34 29/35
+f 30/36 31/37 32/32
+f 44/38 40/38 35/28
+f 36/33 38/38 43/38
+f 42/39 39/40 37/41
+f 40/42 44/43 43/40
+f 44/44 48/45 47/46
+f 48/47 46/48 45/49
+f 41/50 45/51 46/46
+f 42/52 46/53 48/54
+f 43/52 47/53 45/50
+f 17/13 18/10 13/12
+f 18/14 19/10 14/12
+f 15/11 19/10 16/12
+f 20/10 17/14 16/11
+f 17/55 20/15 21/16
+f 25/23 21/10 28/17
+f 20/56 19/18 24/19
+f 19/23 18/20 23/16
+f 22/22 18/21 21/22
+f 28/17 27/17 25/23
+f 24/10 23/10 28/24
+f 27/17 23/10 26/23
+f 22/10 21/10 26/24
+f 33/35 37/57 29/31
+f 34/37 35/27 30/29
+f 35/26 40/58 31/59
+f 37/57 39/25 30/26
+f 37/57 30/26 29/31
+f 32/25 36/33 29/35
+f 31/59 40/58 38/30
+f 32/32 31/59 38/30
+f 29/60 30/36 32/32
+f 37/61 33/34 41/61
+f 43/38 41/61 36/33
+f 42/61 44/38 35/28
+f 34/29 39/61 42/61
+f 34/29 42/61 35/28
+f 41/62 42/39 37/41
+f 38/39 40/42 43/40
+f 41/61 33/34 36/33
+f 43/63 44/44 47/46
+f 47/64 48/47 45/49
+f 42/63 41/50 46/46
+f 44/65 42/52 48/54
+f 41/60 43/52 45/50

src/main/resources/assets/eln/model/FlatScreenMonitor/FlatScreenMonitor.txt

@@ -13,3 +13,5 @@ f rz 0.997
 f ra 90.157
 f mx 1.15
 f my 1.2
+
+f reflc 0.4

src/main/resources/assets/eln/model/IndustrialPanel/IndustrialPanel.mtl

@@ -1,16 +1,16 @@
 # Blender MTL File: 'IndustrialPanel.blend'
 # Material Count: 2
 
-newmtl Material
-Ns 96.078431
+newmtl None
+Ns 0
 Ka 0.000000 0.000000 0.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ni 1.000000
-d 1.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
 illum 2
+map_Kd Reflection.png
 
-newmtl None
+newmtl None_IndustrialPanel
 Ns 0
 Ka 0.000000 0.000000 0.000000
 Kd 0.8 0.8 0.8