🔀 Merge branch 'release/1.1.0'

CosmoMyzrailGorynych · Apr 14, 2019 · ed88ba4 · ed88ba4
2 parents f79d6e0 + 04138d9
commit ed88ba4
Show file tree

Hide file tree

Showing 27 changed files with 2,215 additions and 56 deletions.
diff --git a/app/js/fragmentShader.glsl b/app/js/fragmentShader.glsl
@@ -9,6 +9,8 @@ varying vec2 v_texCoord;
 
 ${uniforms}
 
+${functions}
+
 void main() {
    vec2 pixel = vec2(1.0, 1.0) / u_textureSize;
    // Look up a color from the texture.

diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FilterJS",
   "description": "Generate textures with JS power!",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "main": "index.html",
   "dependencies": {
     "fs-extra": "^6.0.0",

diff --git a/app/sampleFilters/BilateralFilter.fjs b/app/sampleFilters/BilateralFilter.fjs
@@ -0,0 +1,77 @@
+{
+  "name": "New filter",
+  "graph": [
+    {
+      "id": 0,
+      "inputLinks": [
+        {
+          "inputKey": "image",
+          "outBlock": 2,
+          "outKey": "output"
+        }
+      ],
+      "x": 200,
+      "y": -40,
+      "template": "outputImage",
+      "tagValues": {}
+    },
+    {
+      "id": 1,
+      "inputLinks": [],
+      "x": -540,
+      "y": -40,
+      "template": "inputImage",
+      "tagValues": {}
+    },
+    {
+      "id": 2,
+      "inputLinks": [
+        {
+          "inputKey": "input",
+          "outBlock": 1,
+          "outKey": "image"
+        },
+        {
+          "inputKey": "threshold",
+          "outBlock": 4,
+          "outKey": "number"
+        },
+        {
+          "inputKey": "size",
+          "outBlock": 3,
+          "outKey": "number"
+        }
+      ],
+      "x": -240,
+      "y": -40,
+      "template": "bilateralFilter",
+      "tagValues": {}
+    },
+    {
+      "id": 3,
+      "inputLinks": [],
+      "x": -540,
+      "y": 100,
+      "template": "numberInput",
+      "tagValues": {
+        "number": 0.01
+      }
+    },
+    {
+      "id": 4,
+      "inputLinks": [],
+      "x": -540,
+      "y": 260,
+      "template": "numberInput",
+      "tagValues": {
+        "number": 0.1
+      }
+    }
+  ],
+  "view": {
+    "x": -23,
+    "y": -60
+  },
+  "lastId": 5,
+  "seed": 0
+}
diff --git a/app/sampleFilters/Median.fjs b/app/sampleFilters/Median.fjs
@@ -0,0 +1,108 @@
+{
+  "name": "New filter",
+  "graph": [
+    {
+      "id": 0,
+      "inputLinks": [
+        {
+          "inputKey": "image",
+          "outBlock": 4,
+          "outKey": "canvas"
+        }
+      ],
+      "x": 340,
+      "y": -40,
+      "template": "outputImage",
+      "tagValues": {}
+    },
+    {
+      "id": 1,
+      "inputLinks": [],
+      "x": -600,
+      "y": -40,
+      "template": "inputImage",
+      "tagValues": {}
+    },
+    {
+      "id": 2,
+      "inputLinks": [
+        {
+          "inputKey": "input",
+          "outBlock": 3,
+          "outKey": "pixels"
+        },
+        {
+          "inputKey": "size",
+          "outBlock": 5,
+          "outKey": "number"
+        },
+        {
+          "inputKey": "percentile",
+          "outBlock": 6,
+          "outKey": "number"
+        }
+      ],
+      "x": -180,
+      "y": -40,
+      "template": "median",
+      "tagValues": {
+        "mode": "circular",
+        "quality": true
+      }
+    },
+    {
+      "id": 3,
+      "inputLinks": [
+        {
+          "inputKey": "canvas",
+          "outBlock": 1,
+          "outKey": "image"
+        }
+      ],
+      "x": -380,
+      "y": -40,
+      "template": "canvasToPixels",
+      "tagValues": {}
+    },
+    {
+      "id": 4,
+      "inputLinks": [
+        {
+          "inputKey": "pixels",
+          "outBlock": 2,
+          "outKey": "output"
+        }
+      ],
+      "x": 120,
+      "y": -40,
+      "template": "pixelsToCanvas",
+      "tagValues": {}
+    },
+    {
+      "id": 5,
+      "inputLinks": [],
+      "x": -540,
+      "y": 100,
+      "template": "numberInput",
+      "tagValues": {
+        "number": 0.01
+      }
+    },
+    {
+      "id": 6,
+      "inputLinks": [],
+      "x": -540,
+      "y": 280,
+      "template": "numberInput",
+      "tagValues": {
+        "number": 0.5
+      }
+    }
+  ],
+  "view": {
+    "x": -41,
+    "y": -109
+  },
+  "lastId": 7,
+  "seed": 0
+}