feat: Add config parameter for antialias. Small changes to rendering,.

IMAGINARY · Aug 26, 2024 · 4b8ddd7 · 4b8ddd7
1 parent 47111cc
commit 4b8ddd7
Show file tree

Hide file tree

Showing 31 changed files with 93 additions and 37 deletions.
diff --git a/assets/3b7c50e3e5653e7ee161.svg b/assets/3b7c50e3e5653e7ee161.svg
diff --git a/assets/8b225ba9db54b0b532d6.svg b/assets/8b225ba9db54b0b532d6.svg
diff --git a/assets/default.e1c1c69850fc8e84e075.js.map b/assets/default.e1c1c69850fc8e84e075.js.map
diff --git a/assets/default.e1c1c69850fc8e84e075.js → assets/default.f72e6d27ea27085911be.js b/assets/default.e1c1c69850fc8e84e075.js → assets/default.f72e6d27ea27085911be.js
diff --git a/...fault.e1c1c69850fc8e84e075.js.LICENSE.txt → ...fault.f72e6d27ea27085911be.js.LICENSE.txt b/...fault.e1c1c69850fc8e84e075.js.LICENSE.txt → ...fault.f72e6d27ea27085911be.js.LICENSE.txt
diff --git a/assets/default.f72e6d27ea27085911be.js.map b/assets/default.f72e6d27ea27085911be.js.map
diff --git a/assets/embed.bac3065fea6dce64db5e.css → assets/embed.47b4f3a0acc1bf87924f.css b/assets/embed.bac3065fea6dce64db5e.css → assets/embed.47b4f3a0acc1bf87924f.css
diff --git a/assets/embed.bac3065fea6dce64db5e.css.map → assets/embed.47b4f3a0acc1bf87924f.css.map b/assets/embed.bac3065fea6dce64db5e.css.map → assets/embed.47b4f3a0acc1bf87924f.css.map
diff --git a/assets/embed.c1230227080108ea1dde.js → assets/embed.7efe006f662afc974eeb.js b/assets/embed.c1230227080108ea1dde.js → assets/embed.7efe006f662afc974eeb.js
diff --git a/...embed.c1230227080108ea1dde.js.LICENSE.txt → ...embed.7efe006f662afc974eeb.js.LICENSE.txt b/...embed.c1230227080108ea1dde.js.LICENSE.txt → ...embed.7efe006f662afc974eeb.js.LICENSE.txt
diff --git a/assets/embed.7efe006f662afc974eeb.js.map b/assets/embed.7efe006f662afc974eeb.js.map
diff --git a/assets/embed.c1230227080108ea1dde.js.map b/assets/embed.c1230227080108ea1dde.js.map
diff --git a/assets/exhibit.35df4d11ea5fa11760d8.js b/assets/exhibit.35df4d11ea5fa11760d8.js
diff --git a/...hibit.8c56f1014e504b1584a1.js.LICENSE.txt → ...hibit.35df4d11ea5fa11760d8.js.LICENSE.txt b/...hibit.8c56f1014e504b1584a1.js.LICENSE.txt → ...hibit.35df4d11ea5fa11760d8.js.LICENSE.txt
diff --git a/assets/exhibit.35df4d11ea5fa11760d8.js.map b/assets/exhibit.35df4d11ea5fa11760d8.js.map
diff --git a/assets/exhibit.bb20d4167e91ddf0d89c.css → assets/exhibit.71f899a7400d7e4c1d7f.css b/assets/exhibit.bb20d4167e91ddf0d89c.css → assets/exhibit.71f899a7400d7e4c1d7f.css
diff --git a/assets/exhibit.bb20d4167e91ddf0d89c.css.map → assets/exhibit.71f899a7400d7e4c1d7f.css.map b/assets/exhibit.bb20d4167e91ddf0d89c.css.map → assets/exhibit.71f899a7400d7e4c1d7f.css.map
diff --git a/assets/exhibit.8c56f1014e504b1584a1.js b/assets/exhibit.8c56f1014e504b1584a1.js
diff --git a/assets/exhibit.8c56f1014e504b1584a1.js.map b/assets/exhibit.8c56f1014e504b1584a1.js.map
diff --git a/config/exhibit.yml b/config/exhibit.yml
@@ -1,3 +1,5 @@
+pixiOptions:
+  antialias: false
 panels:
   editor:
     # If true, the policy overlay will be visible all the time. This also hides the "View policy"

diff --git a/config/items.yml b/config/items.yml
@@ -17,6 +17,6 @@ items:
   candy:
     name: Candy
     editorIcon: 'static/icons/candy.svg'
-    texture: 'static/icons/candy.svg'
+    texture: 'static/icons/candy.png'
     reward: 0
     inPalette: false
diff --git a/embed.html b/embed.html
@@ -1 +1 @@
-<!doctype html><meta charset="utf-8"><head><link rel="stylesheet" href="vendor/bootstrap-4.6.0/css/bootstrap.min.css"><link rel="preconnect" href="https://fonts.gstatic.com"><link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;700&display=swap" rel="stylesheet"><script src="vendor/jquery-3.5.1/jquery-3.5.1.slim.min.js"></script><script src="vendor/popper-1.16.1/popper.min.js"></script><script src="vendor/bootstrap-4.6.0/js/bootstrap.min.js"></script><script src="vendor/pixijs-6.0.2/pixi.min.js"></script><script src="vendor/i18n4js-1.3.1/i18n4js-1.3.1.min.js"></script><script defer="defer" src="assets/embed.c1230227080108ea1dde.js"></script><link href="assets/embed.bac3065fea6dce64db5e.css" rel="stylesheet"></head><body class="rl2-embed"></body>
+<!doctype html><meta charset="utf-8"><head><link rel="stylesheet" href="vendor/bootstrap-4.6.0/css/bootstrap.min.css"><link rel="preconnect" href="https://fonts.gstatic.com"><link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;700&display=swap" rel="stylesheet"><script src="vendor/jquery-3.5.1/jquery-3.5.1.slim.min.js"></script><script src="vendor/popper-1.16.1/popper.min.js"></script><script src="vendor/bootstrap-4.6.0/js/bootstrap.min.js"></script><script src="vendor/pixijs-6.0.2/pixi.min.js"></script><script src="vendor/i18n4js-1.3.1/i18n4js-1.3.1.min.js"></script><script defer="defer" src="assets/embed.7efe006f662afc974eeb.js"></script><link href="assets/embed.47b4f3a0acc1bf87924f.css" rel="stylesheet"></head><body class="rl2-embed"></body>
diff --git a/exhibit.html b/exhibit.html
@@ -1 +1 @@
-<!doctype html><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><head><link rel="stylesheet" href="vendor/bootstrap-4.6.0/css/bootstrap.min.css"><link rel="preconnect" href="https://fonts.gstatic.com"><link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;700&display=swap" rel="stylesheet"><script src="vendor/jquery-3.5.1/jquery-3.5.1.slim.min.js"></script><script src="vendor/popper-1.16.1/popper.min.js"></script><script src="vendor/bootstrap-4.6.0/js/bootstrap.min.js"></script><script src="vendor/pixijs-6.0.2/pixi.min.js"></script><script src="vendor/i18n4js-1.3.1/i18n4js-1.3.1.min.js"></script><title>Reinforcement Learning</title><script defer="defer" src="assets/exhibit.8c56f1014e504b1584a1.js"></script><link href="assets/exhibit.bb20d4167e91ddf0d89c.css" rel="stylesheet"></head><body><div class="rl2-exhibit" data-component="rl2-exhibit"><div id="pixi-app-container"></div><div id="panel-1" class="panel panel-title"><div class="panel-text" data-i18n-text="panel-1"></div></div><div id="panel-2" class="panel panel-sm"><div class="panel-text" data-i18n-text="panel-2"></div><div id="rewards-bar"></div><div id="rewards-ui"></div></div><div id="panel-3" class="panel panel-sm"><div class="panel-text" data-i18n-text="panel-3"></div><div id="explore-exploit-ui"></div></div><div id="panel-4" class="panel panel-lg"><div class="panel-text" data-i18n-text="panel-4"></div><div id="training-ui"></div></div><div id="lang-switcher-container"></div></div></body>
+<!doctype html><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><head><link rel="stylesheet" href="vendor/bootstrap-4.6.0/css/bootstrap.min.css"><link rel="preconnect" href="https://fonts.gstatic.com"><link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;700&display=swap" rel="stylesheet"><script src="vendor/jquery-3.5.1/jquery-3.5.1.slim.min.js"></script><script src="vendor/popper-1.16.1/popper.min.js"></script><script src="vendor/bootstrap-4.6.0/js/bootstrap.min.js"></script><script src="vendor/pixijs-6.0.2/pixi.min.js"></script><script src="vendor/i18n4js-1.3.1/i18n4js-1.3.1.min.js"></script><title>Reinforcement Learning</title><script defer="defer" src="assets/exhibit.35df4d11ea5fa11760d8.js"></script><link href="assets/exhibit.71f899a7400d7e4c1d7f.css" rel="stylesheet"></head><body><div class="rl2-exhibit" data-component="rl2-exhibit"><div id="pixi-app-container"></div><div id="panel-1" class="panel panel-title"><div class="panel-text" data-i18n-text="panel-1"></div></div><div id="panel-2" class="panel panel-sm"><div class="panel-text" data-i18n-text="panel-2"></div><div id="rewards-bar"></div><div id="rewards-ui"></div></div><div id="panel-3" class="panel panel-sm"><div class="panel-text" data-i18n-text="panel-3"></div><div id="explore-exploit-ui"></div></div><div id="panel-4" class="panel panel-lg"><div class="panel-text" data-i18n-text="panel-4"></div><div id="training-ui"></div></div><div id="lang-switcher-container"></div></div></body>
diff --git a/index.html b/index.html
@@ -1 +1 @@
-<!doctype html><meta charset="utf-8"><head><link rel="stylesheet" href="vendor/bootstrap-4.6.0/css/bootstrap.min.css"><link rel="preconnect" href="https://fonts.gstatic.com"><link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;700&display=swap" rel="stylesheet"><script src="vendor/jquery-3.5.1/jquery-3.5.1.slim.min.js"></script><script src="vendor/popper-1.16.1/popper.min.js"></script><script src="vendor/bootstrap-4.6.0/js/bootstrap.min.js"></script><script src="vendor/pixijs-6.0.2/pixi.min.js"></script><script src="vendor/i18n4js-1.3.1/i18n4js-1.3.1.min.js"></script><title>Reinforcement Learning</title><script defer="defer" src="assets/default.e1c1c69850fc8e84e075.js"></script><link href="assets/default.701139cc62c5e123ba12.css" rel="stylesheet"></head><body class="rl2-desktop"><div class="container"><div class="row justify-content-center pt-4"><div class="col-md-5"><div data-component="app-container"></div></div><div class="col-md-3"><div class="sidebar"></div></div></div></div></body>
+<!doctype html><meta charset="utf-8"><head><link rel="stylesheet" href="vendor/bootstrap-4.6.0/css/bootstrap.min.css"><link rel="preconnect" href="https://fonts.gstatic.com"><link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;700&display=swap" rel="stylesheet"><script src="vendor/jquery-3.5.1/jquery-3.5.1.slim.min.js"></script><script src="vendor/popper-1.16.1/popper.min.js"></script><script src="vendor/bootstrap-4.6.0/js/bootstrap.min.js"></script><script src="vendor/pixijs-6.0.2/pixi.min.js"></script><script src="vendor/i18n4js-1.3.1/i18n4js-1.3.1.min.js"></script><title>Reinforcement Learning</title><script defer="defer" src="assets/default.f72e6d27ea27085911be.js"></script><link href="assets/default.701139cc62c5e123ba12.css" rel="stylesheet"></head><body class="rl2-desktop"><div class="container"><div class="row justify-content-center pt-4"><div class="col-md-5"><div data-component="app-container"></div></div><div class="col-md-3"><div class="sidebar"></div></div></div></div></body>
diff --git a/src/js/main-exhibit.js b/src/js/main-exhibit.js
@@ -10,7 +10,8 @@ runExhibit((config, textures) => {
   const app = new PixiCompositeApp(
     1920,
     1080,
-    0xffffff
+    0xffffff,
+    config.pixiOptions || {}
   );
   $('#pixi-app-container').append(app.getView());
 

diff --git a/src/js/view-pixi/maze-view.js b/src/js/view-pixi/maze-view.js
@@ -55,7 +55,7 @@ class MazeView {
       floorTexture.y = y * MazeView.TILE_SIZE;
       floorTexture.width = MazeView.TILE_SIZE;
       floorTexture.height = MazeView.TILE_SIZE;
-      floorTexture.roundPixels = true;
+      floorTexture.roundPixels = false;
       this.floorTextures[y][x] = floorTexture;
 
       this.renderCell(x, y);
@@ -158,7 +158,7 @@ class MazeView {
     sprite.y = item.y * MazeView.TILE_SIZE + MazeView.TILE_SIZE * 0.25;
     sprite.width = MazeView.TILE_SIZE * textureScale;
     sprite.height = MazeView.TILE_SIZE * textureScale;
-    sprite.roundPixels = true;
+    sprite.roundPixels = false;
     sprite.texture = this.textures[`item-${item.type}`];
 
     this.itemSprites[item.id] = sprite;

diff --git a/src/js/view-pixi/pixi-composite-app.js b/src/js/view-pixi/pixi-composite-app.js
@@ -1,11 +1,12 @@
 /* globals PIXI */
 
 class PixiCompositeApp {
-  constructor(width, height, backgroundColor = 0xffffff) {
+  constructor(width, height, backgroundColor = 0xffffff, pixiOptions = {}) {
     this.app = new PIXI.Application({
       width,
       height,
       backgroundColor,
+      ...pixiOptions,
     });
   }
 

diff --git a/src/js/view-pixi/robot-view.js b/src/js/view-pixi/robot-view.js
@@ -24,7 +24,7 @@ class RobotView {
     const sprite = new PIXI.Sprite();
     sprite.width = tileSize;
     sprite.height = tileSize;
-    sprite.roundPixels = true;
+    sprite.roundPixels = false;
     sprite.texture = texture;
 
     return sprite;

diff --git a/static/icons/candy.png b/static/icons/candy.png
diff --git a/static/icons/candy.svg b/static/icons/candy.svg
diff --git a/static/icons/exploit-arrow.svg b/static/icons/exploit-arrow.svg