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 0000000..bad3a91 Binary files /dev/null and b/src/main/resources/assets/webdisplays/html/front.png differ diff --git a/src/main/resources/assets/webdisplays/html/main.html b/src/main/resources/assets/webdisplays/html/main.html new file mode 100644 index 0000000..4a3edb9 --- /dev/null +++ b/src/main/resources/assets/webdisplays/html/main.html @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + 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 0000000..3935b6f Binary files /dev/null and b/src/main/resources/assets/webdisplays/html/side.png differ diff --git a/src/main/resources/assets/webdisplays/html/webdisplays.png b/src/main/resources/assets/webdisplays/html/webdisplays.png new file mode 100644 index 0000000..117afb2 Binary files /dev/null and b/src/main/resources/assets/webdisplays/html/webdisplays.png differ
+
+
+
+
+ +
+
+ 		+ +