From 316a039f0603777c8ac2cd653dc5d2052eeb3ce0 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Fri, 3 Jul 2015 00:05:57 -0400 Subject: [PATCH] Work on custom rendering drawer --- .../textures/blocks/overlay/handle_1.png | Bin 0 -> 203 bytes .../textures/blocks/overlay/handle_2.png | Bin 0 -> 205 bytes .../textures/blocks/overlay/handle_4.png | Bin 0 -> 197 bytes .../blocks/overlay/shading_face_1.png | Bin 0 -> 218 bytes .../blocks/overlay/shading_face_2.png | Bin 0 -> 219 bytes .../blocks/overlay/shading_face_4.png | Bin 0 -> 214 bytes .../blocks/overlay/shading_trim_1.png | Bin 0 -> 200 bytes .../blocks/overlay/shading_trim_2.png | Bin 0 -> 206 bytes .../blocks/overlay/shading_trim_4.png | Bin 0 -> 209 bytes .../storagedrawers/block/BlockDrawers.java | 2 +- .../block/BlockDrawersCustom.java | 95 +++++++++++ .../renderer/DrawersCustomRenderer.java | 59 +++++++ .../client/renderer/DrawersRenderer.java | 25 +-- .../client/renderer/ModularBoxRenderer.java | 4 + .../storagedrawers/core/ClientProxy.java | 5 + .../storagedrawers/core/CommonProxy.java | 1 + .../storagedrawers/core/ModBlocks.java | 9 ++ .../storagedrawers/util/RenderHelper.java | 10 +- .../util/RenderHelperState.java | 147 +++++++++++++++--- 19 files changed, 321 insertions(+), 36 deletions(-) create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay/handle_1.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay/handle_2.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay/handle_4.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay/shading_face_1.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay/shading_face_2.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay/shading_face_4.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay/shading_trim_1.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay/shading_trim_2.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay/shading_trim_4.png create mode 100644 src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersCustomRenderer.java diff --git a/resources/assets/storagedrawers/textures/blocks/overlay/handle_1.png b/resources/assets/storagedrawers/textures/blocks/overlay/handle_1.png new file mode 100644 index 0000000000000000000000000000000000000000..16bb2329092db1f56e7de61b67b136c46d02bdb2 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Iwh_VCC){ui6xo&c?uz!xv31n zrFjZQ77AV<%D~W6!N9=E(89{pOhMPc)W9H%m7xfzkG;gx*OmP~n+%JHM8l7NOh6&d z0*}aI1_o{+5N5n|x9$&6kR{#G*O7r?V?XzwL{=bQ$&U>cv7h@-A}f%u;_2cTQgJIeVS#|bqe&B{PW{_| qrvA?lL*>NBZU+Te7r#u1U|_IZ$ibY^_Nfr4p25@A&t;ucLK6T=lsDo4 literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/overlay/handle_4.png b/resources/assets/storagedrawers/textures/blocks/overlay/handle_4.png new file mode 100644 index 0000000000000000000000000000000000000000..db5e700bd8e4c9a67783aacf4c0fd7c44916c495 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Iwh_VCC){ui6xo&c?uz!xv31n zrFjZQ77AV<%D~W6!N9=E$iT|jTtU~s)WD!YLuCt4AA5XsrKlJ2O if73%ox620uSQ#oqxHc|0*Chp1$KdJe=d#Wzp$P!)nl+#R literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/overlay/shading_face_1.png b/resources/assets/storagedrawers/textures/blocks/overlay/shading_face_1.png new file mode 100644 index 0000000000000000000000000000000000000000..74f4ec675a854b900f027467a0c67c0e4be69e2c GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Iwh_VCC){ui6xo&c?uz!xv31n zrFjZQ77AV<%D~W6!N9=E$k58jR6*Ck)WE>xew-~(AA5QK$!8;-MT+OL6&q!Uq=Rpjs4tz5?O(KLr)jSkcwN$2@3=aoH9*yind?) z5pi|HgawSNZMd293c4FP4!C4W^hggTe~DWM4fyFNPh literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/overlay/shading_trim_1.png b/resources/assets/storagedrawers/textures/blocks/overlay/shading_trim_1.png new file mode 100644 index 0000000000000000000000000000000000000000..b59bf9069a420dc0e130eae20338161863908991 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Iwh_VCC){ui6xo&c?uz!xv31n zrFjZQ77AV<%D~W6!N9=E$kfWzR6*Ck)WE>}zT z0*}aI1_o{*n_GzS(%rg0KtYytM_)$E)e-c@Ne0fh7$B>F!$q5n(3y!(0CK) literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/overlay/shading_trim_2.png b/resources/assets/storagedrawers/textures/blocks/overlay/shading_trim_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0a6e8f088f16b2290cac16c2353d5943e41fd18d GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Iwh_VCC){ui6xo&c?uz!xv31n zrFjZQ77AV<%D~W6!N9=E$jr*vQbE_i)WF~_r~W#iKK2q%Usv|~Y%(m;!V@-Gy8?wc z3p^r=85p>QK$!8;-MT+OL6&q!Uq=Rpjs4tz5?O(KRZkbkkcwN$2@(klj=8MlT+C)* rVBnN#>cuN%U@(hsMIyt|mkbPkD;d_;yzgBB)WG2B>gTe~DWM4fW1cmD literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/overlay/shading_trim_4.png b/resources/assets/storagedrawers/textures/blocks/overlay/shading_trim_4.png new file mode 100644 index 0000000000000000000000000000000000000000..ee3ce446f0a5bba2137c8bfbb53097b46903a36c GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Iwh_VCC){ui6xo&c?uz!xv31n zrFjZQ77AV<%D~W6!N9=E$lS`vR6*Ck)WE>gaw8H$|~nwR`M=p uGcefTklD1*ccp7e^TiSeer63nc81bzjK1O1-|+$UFnGH9xvX renderMaxY) { + double temp = renderMinY; + renderMinY = renderMaxY; + renderMaxY = temp; + } + if (renderMinZ > renderMaxZ) { double temp = renderMinZ; renderMinZ = renderMaxZ; @@ -171,27 +230,75 @@ public class RenderHelperState } } - public void transformCoord (double[] coordIn, double[] coordOut, int rotation) { + public void transformCoordY (double[] coordIn, double[] coordOut, int rotation) { coordOut[1] = coordIn[1]; switch (rotation) { - case 1: + case 1: // 90 coordOut[0] = 1 - coordIn[2]; coordOut[2] = coordIn[0]; break; - case 2: + case 2: // 180 coordOut[0] = 1 - coordIn[0]; coordOut[2] = 1 - coordIn[2]; break; - case 3: + case 3: // 270 coordOut[0] = coordIn[2]; coordOut[2] = 1 - coordIn[0]; break; - case 0: + case 0: // 0 default: coordOut[0] = coordIn[0]; coordOut[2] = coordIn[2]; break; } } + + public void transformCoordZ (double[] coordIn, double[] coordOut, int rotation) { + coordOut[2] = coordIn[2]; + + switch (rotation) { + case 1: // 90 + coordOut[0] = coordIn[1]; + coordOut[1] = 1 - coordIn[0]; + break; + case 2: // 180 + coordOut[0] = 1 - coordIn[0]; + coordOut[1] = 1 - coordIn[1]; + break; + case 3: // 270 + coordOut[0] = 1 - coordIn[1]; + coordOut[1] = coordIn[0]; + break; + case 0: // 0 + default: + coordOut[0] = coordIn[0]; + coordOut[1] = coordIn[1]; + break; + } + } + + public void transformCoordX (double[] coordIn, double[] coordOut, int rotation) { + coordOut[0] = coordIn[0]; + + switch (rotation) { + case 1: // 90 + coordOut[2] = coordIn[1]; + coordOut[1] = 1 - coordIn[2]; + break; + case 2: // 180 + coordOut[2] = 1 - coordIn[2]; + coordOut[1] = 1 - coordIn[1]; + break; + case 3: // 270 + coordOut[2] = 1 - coordIn[1]; + coordOut[1] = coordIn[2]; + break; + case 0: // 0 + default: + coordOut[2] = coordIn[2]; + coordOut[1] = coordIn[1]; + break; + } + } }