From 14ae65668497c6a66e0df5b62aec41aaac04c9bc Mon Sep 17 00:00:00 2001 From: Nicolas BARBOTIN Date: Tue, 30 Jan 2018 16:23:06 +0100 Subject: [PATCH] + It's sexy and I know it --- src/main/java/net/montoyo/wd/WebDisplays.java | 2 +- .../wd/client/renderers/ScreenRenderer.java | 15 ++++ .../montoyo/wd/entity/TileEntityScreen.java | 2 + .../assets/webdisplays/html/front.png | Bin 0 -> 1797 bytes .../assets/webdisplays/html/main.html | 82 ++++++++++++++++++ .../assets/webdisplays/html/side.png | Bin 0 -> 479 bytes .../assets/webdisplays/html/webdisplays.png | Bin 0 -> 7072 bytes 7 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/webdisplays/html/front.png create mode 100644 src/main/resources/assets/webdisplays/html/main.html create mode 100644 src/main/resources/assets/webdisplays/html/side.png create mode 100644 src/main/resources/assets/webdisplays/html/webdisplays.png diff --git a/src/main/java/net/montoyo/wd/WebDisplays.java b/src/main/java/net/montoyo/wd/WebDisplays.java index 0d2a244..466f563 100644 --- a/src/main/java/net/montoyo/wd/WebDisplays.java +++ b/src/main/java/net/montoyo/wd/WebDisplays.java @@ -69,7 +69,7 @@ public class WebDisplays { //Config public static final double PAD_RATIO = 59.0 / 30.0; - public String homePage = "https://google.com"; //TODO: Read from config + public String homePage = "mod://webdisplays/main.html"; //TODO: Read from config public double padResX; public double padResY; private int lastPadId = 0; diff --git a/src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java b/src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java index c6abc6b..c8e781a 100644 --- a/src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java +++ b/src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java @@ -42,6 +42,8 @@ public class ScreenRenderer extends TileEntitySpecialRenderer if(scr.browser == null) { scr.browser = ((ClientProxy) WebDisplays.PROXY).getMCEF().createBrowser(scr.url); scr.browser.resize(scr.resolution.x, scr.resolution.y); + scr.doTurnOnAnim = true; + scr.turnOnTime = System.currentTimeMillis(); } tmpi.set(scr.side.right); @@ -84,9 +86,22 @@ public class ScreenRenderer extends TileEntitySpecialRenderer break; } + if(scr.doTurnOnAnim) { + long lt = System.currentTimeMillis() - scr.turnOnTime; + float ft = ((float) lt) / 100.0f; + + if(ft >= 1.0f) { + ft = 1.0f; + scr.doTurnOnAnim = false; + } + + glScalef(ft, ft, 1.0f); + } + float sw = ((float) scr.size.x) * 0.5f - 2.f / 16.f; float sh = ((float) scr.size.y) * 0.5f - 2.f / 16.f; + //TODO: Use tesselator glBindTexture(GL_TEXTURE_2D, scr.browser.getTextureID()); glBegin(GL_QUADS); glColor4f(1.f, 1.f, 1.f, 1.f); glTexCoord2f(0.f, 1.f); glVertex3f(-sw, -sh, 0.505f); diff --git a/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java b/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java index dcb7e70..4aca777 100644 --- a/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java +++ b/src/main/java/net/montoyo/wd/entity/TileEntityScreen.java @@ -50,6 +50,8 @@ public class TileEntityScreen extends TileEntity { public int otherRights; public IBrowser browser; public ArrayList upgrades; + public boolean doTurnOnAnim; + public long turnOnTime; public static boolean isYouTubeURL(String url) { return url.matches(YT_REGEX1) || url.matches(YT_REGEX2); diff --git a/src/main/resources/assets/webdisplays/html/front.png b/src/main/resources/assets/webdisplays/html/front.png new file mode 100644 index 0000000000000000000000000000000000000000..bad3a91f20181c7f11b8bb31e2c24f6965b0113d GIT binary patch literal 1797 zcmV+g2m1JlP)R!+;AgT^WYN2rzV;PPziYGdb|=W%DY%^mrEVd#G6MbGm&zqe=S?9@4( z&MX94w{9Ium8NMzyP_ztlNJ{jh4wXT)|9k908CF$3++y)Q)sUTRZ}7m0-*?mK&a)a z&hPgNt1O?-$I+>v5{U#ogdvL}5WCA#3*Fb(2fyF1vt77w0TUAwOYdA!@bcwLT~|6Y zGlOHtjurizJ9qBHqeqW)wyCKpbai#*--p9tO9z=wr?I%Wh-5N}pFe*h9*^Vg+qZc7 z^eN`&=k4bqq66QxYgf_j_U+qenj-LcJZNicvjoJbk&%&Q9b`j80~`(qyk0MY!63T2 zx^Uyh4fOT(;mVaOsIRZLKM>J?8FlE;A))=?!Gl!=B9qJILT_&`?%%(U=H}+w0J5;K z0MV-)Kx6}N1xR~)d&Pm|)Y;jIJ9qBbCx=9%QK+h_JBtE=0GgVbkV>VbXWxz;JEWmZ zQ55Oya8pwgwr}6Avn?zv;PdCtMgP~md-t01SYu-&+-^7gem@Q$K8%wmPn!CyP$-0J z*RJ8gg9o)AvND+rK7IORI?!M+DBUI$3ZbE)LAb2Bxfy%*?2&F83g>2$i} z1JpDPs;XjYY6{_S829eo!?|TNoyzcbr(<_?bEdv=H z9YrRSu~ho{d_J_awB+AUOiW;Wd>qkeR5$3d0~Z0Y+H;hm@87?pzrWuUPG!|$Re(4g z4v1bx&Ckyx7K`a@EiEl@xm-oV)xf}j?q@DM95`^mw5`+W)WHOR$;nB~&dye30A9R! zVY2PtzrW%GuW6d_RZ>S}HEbDyyn6M@1Vk3L+S}VrjasG3-CPA}RBLOiJ?65k0ttme z`QMYtWPZC3A3i`;)uKSE)qmusV?-g>wm^(|q_wpbUavR*erRYY-*0G|rmMCBfdDpc z+*tL5UZ_8R{+MhYkH;QBCMPFNm$euN(0JD8!j&uu?9GF5wa7(3%7y zI$M1{pUxv>3Ec`1m&=8%Tes?#kByBXo6S~i0F0I6iqB=0y20@9ur!Y-ilVDfzJC3R zA3uKR*8TSFo6c4UM3g@&QSKJ1v9Zx)o12@f{G64d2w(s0App?P(E$M1y?eK=w=jBx z$nNv`ux;BmY5pi@hc1%n3e9Q&DVv8xA`#PsVs0Rdg{xv=tJ(=205)yfWU|f7%-9Er zrfG;oBEm#m7=BWz6o!U|g!>pA9MmP#+;+y06_3Y-RZuw<2n0+v<3wsr0}-9I>({SG zTU(p%3?CjIHhr#ASUDAjqR!4vcsw3#-n_Z0-jVy;R`O&`0}=hhmoHz|O_|HWm1w!! z?Z)}@=c^vB91aJL9zCkFrBW%=%(U%11OSd7KfYxDQ7n&icXwAE$fZk{;C8!pwr9_t z*(<37z^`Aw5Rb=AWn4~)L;_#Fd|7fI$`*gpP8r%s(hPfw4|mQJVf z@ZrN1?L(G*C(X#nNWNS(>hJIK1aIyjw9c)eb9badeC z*|WO&wwxY6er%f2whfSQIE*uA&Ip$k3s;32;^+5mr{foJ|IV2JZM59sk z_xI!Z^XJk_kyc8)KV*f(`$KFZ0wEBJKnR3dcG)YdzgcC`Lns0v5Q;zug!-QJ zYtcg(vM2%}5Q;!nOO+-1-d(Ell0C+i9>S1C5eR`$1hQJHEZGCtdDCZQ#knkoEQ&w~ zgdz|Ep{iQ;7C!rfs-9%+20er!iy{yLp$KG^Ncz3Kq6aSKB&*D1A4|$6(q!w`s$^ff nY<$!>J%k~PA`k+h2!z5vD + + + + + + + + + + + + + + diff --git a/src/main/resources/assets/webdisplays/html/side.png b/src/main/resources/assets/webdisplays/html/side.png new file mode 100644 index 0000000000000000000000000000000000000000..3935b6f83c41bb13494043e18c29df91f754d14b GIT binary patch literal 479 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 Gi}@dDiNg>8 literal 0 HcmV?d00001
+
+
+
+
+ +
+
+ 		+ +