From 938b21c246cdb2ebd25e062b3965a51b93d31e01 Mon Sep 17 00:00:00 2001 From: Renaud Pawlak Date: Mon, 23 May 2016 14:50:37 +0200 Subject: [PATCH] removed strict mode --- pom.xml | 6 +++--- .../examples/threejs/WebglMaterialsNormalMap.java | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 3a8e51f..acb09c5 100644 --- a/pom.xml +++ b/pom.xml @@ -118,8 +118,8 @@ - org.jsweet - jsweet-core-strict + org.jsweet.candies + jsweet-core 1.0.0-SNAPSHOT @@ -155,7 +155,7 @@ org.jsweet jsweet-transpiler - 1.0.0-RC1 + 1.0.0 \ No newline at end of file diff --git a/src/main/java/org/jsweet/examples/threejs/WebglMaterialsNormalMap.java b/src/main/java/org/jsweet/examples/threejs/WebglMaterialsNormalMap.java index 5745ec8..fa4d7c1 100644 --- a/src/main/java/org/jsweet/examples/threejs/WebglMaterialsNormalMap.java +++ b/src/main/java/org/jsweet/examples/threejs/WebglMaterialsNormalMap.java @@ -7,6 +7,8 @@ import static jsweet.dom.Globals.document; import static jsweet.dom.Globals.requestAnimationFrame; import static jsweet.dom.Globals.window; +import static jsweet.util.Globals.$get; +import static jsweet.util.Globals.$set; import static jsweet.util.Globals.union; import def.stats.Stats; @@ -154,13 +156,13 @@ public static void init() { ShaderPass effectColor = new ShaderPass(ColorCorrectionShader); effectFXAA = new ShaderPass(FXAAShader); - ((Euler) effectFXAA.$get("uniforms").$get("resolution").$get("value")).set(1 / window.innerWidth, + ((Euler) $get($get(effectFXAA.$get("uniforms"), "resolution"), "value")).set(1 / window.innerWidth, 1 / window.innerHeight, 0); - effectBleach.$get("uniforms").$get("opacity").$set("value", 0.4); + $set($get(effectBleach.$get("uniforms"), "opacity"), "value", 0.4); - ((Euler) effectColor.$get("uniforms").$get("powRGB").$get("value")).set(1.4, 1.45, 1.45); - ((Euler) effectColor.$get("uniforms").$get("mulRGB").$get("value")).set(1.1, 1.1, 1.1); + ((Euler) $get($get(effectColor.$get("uniforms"), "powRGB"), "value")).set(1.4, 1.45, 1.45); + ((Euler) $get($get(effectColor.$get("uniforms"), "mulRGB"), "value")).set(1.1, 1.1, 1.1); effectFXAA.renderToScreen = true; @@ -205,8 +207,8 @@ public static void onWindowResize(Event event) { composer.reset(); - ((Euler) effectFXAA.$get("uniforms").$get("resolution").$get("value")).set(1 / SCREEN_WIDTH, 1 / SCREEN_HEIGHT, - 0); + ((Euler) $get($get(effectFXAA.$get("uniforms"), "resolution"), "value")).set(1 / SCREEN_WIDTH, + 1 / SCREEN_HEIGHT, 0); }