add: shader-study-201909.frag

update: add image output directory setting processing

close #1

Author: DBC-Works

FrameRecorder.pde

@@ -9,8 +9,8 @@ interface FrameRecorder {
 
 final class SyncFrameRecorder implements FrameRecorder {
   private final String frameFormat;
-  SyncFrameRecorder(String ext) {
-    frameFormat = "img/########." + ext;
+  SyncFrameRecorder(String path, String ext) {
+    frameFormat = path + "/########." + ext;
   }
 
   void recordFrame() {
@@ -24,8 +24,10 @@ final class SyncFrameRecorder implements FrameRecorder {
 final class AsyncFrameRecorder implements FrameRecorder {
   private final ExecutorService executor = Executors.newCachedThreadPool();
   private final List<Future> futures = new ArrayList<Future>();
+  private final String recordPath;
 
-  AsyncFrameRecorder() {
+  AsyncFrameRecorder(String path) {
+    recordPath = path;
   }
 
   void recordFrame() {
@@ -41,7 +43,7 @@ final class AsyncFrameRecorder implements FrameRecorder {
       public void run() {
         final PImage frameImage = createImage(width, height, HSB);
         frameImage.pixels = savePixels;
-        frameImage.save(String.format("img/%08d.jpg", saveFrameCount));
+        frameImage.save(String.format("%s/%08d.jpg", recordPath, saveFrameCount));
       }
     };
 
@@ -114,18 +116,18 @@ enum FrameRecorderType {
   AsyncRecorder
 }
 
-FrameRecorder createFrameRecorderInstanceOf(FrameRecorderType type) {
+FrameRecorder createFrameRecorderInstanceOf(FrameRecorderType type, String path) {
   switch (type) {
     /*
     case VideoExportRecorder:
       return new VideoExportRecorder(this);
      */
     case SyncTgaRecorder:
-      return new SyncFrameRecorder("tga");
+      return new SyncFrameRecorder(path, "tga");
     case SyncPngRecorder:
-      return new SyncFrameRecorder("png");
+      return new SyncFrameRecorder(path, "png");
     case AsyncRecorder:
-      return new AsyncFrameRecorder();
+      return new AsyncFrameRecorder(path);
     default:
       throw new RuntimeException();
   }

Implementation.pde

@@ -58,22 +58,36 @@ final class ShaderInfo {
 }
 
 FrameRecorder createFrameRecorder(JSONObject setting) {
+  final JSONObject record = setting.getJSONObject("record");
+  if (record == null) {
+    return null;
+  }
+
   FrameRecorderType recorderType = null;
-  String recordImageType = setting.getString("recordImageType");
-  if (recordImageType != null) {
-    recordImageType = recordImageType.toLowerCase();
-    if (recordImageType.equals("jpeg") || recordImageType.equals("jpg")) {
+
+  String imageType = record.getString("imageType");
+  if (imageType != null) {
+    imageType = imageType.toLowerCase();
+    if (imageType.equals("jpeg") || imageType.equals("jpg")) {
       recorderType = FrameRecorderType.AsyncRecorder;
     }
-    else if (recordImageType.equals("tga")) {
+    else if (imageType.equals("tga")) {
       recorderType = FrameRecorderType.SyncTgaRecorder;
     }
-    else if (recordImageType.equals("png")) {
+    else if (imageType.equals("png")) {
       recorderType = FrameRecorderType.SyncPngRecorder;
     }
   }
+  if (recorderType == null) {
+    return null;
+  }
+
+  String recordPath = record.getString("path");
+  if (recordPath == null || recordPath.length() == 0) {
+    recordPath = "img";
+  }
 
-  return recorderType != null ? createFrameRecorderInstanceOf(recorderType) : null;
+  return createFrameRecorderInstanceOf(recorderType, recordPath);
 }
 
 List<SoundInfo> loadSounds(JSONArray soundDefinitions) {

data/setting-schema.json

@@ -35,19 +35,29 @@
       "description": "Output definition.",
       "type": "object",
       "properties": {
-        "recordImageType": {
-          "description": "Image type of recording frame.",
-          "type": [
-            "string",
-            "null"
-          ],
-          "enum": [
-            "jpeg",
-            "jpg",
-            "png",
-            "tga",
-            ""
-          ]
+        "record": {
+          "description": "Record information.",
+          "type": "object",
+          "properties": {
+            "imageType": {
+              "description": "Image type of recording frame.",
+              "type": [
+                "string",
+                "null"
+              ],
+              "enum": [
+                "jpeg",
+                "jpg",
+                "png",
+                "tga",
+                ""
+              ]
+            },
+            "path": {
+              "description": "Path to save recording images.",
+              "type": "string"
+            }
+          }
         },
         "connection": {
           "description": "External connection name(for spout).",

data/setting.json

@@ -1,7 +1,10 @@
 {
   "framePerSecond": 18,
   "out": {
-    "recordImageType": "",
+    "record": {
+      "imageType": "",
+      "path": "img"
+    },
     "connection": {
       "name": ""
     }

data/shader-study-201909.frag

@@ -0,0 +1,45 @@
+/*
+ * shader: cellular noise study
+ * based on: [Cellular Noise](https://thebookofshaders.com/12/?lan=jp) by @patriciogv
+ */
+
+uniform vec2 resolution;
+uniform float time;
+uniform float progress;
+
+uint xorshift(uint seed) {
+  uint y = seed;
+  y = y ^ (y << 13);
+  y = y ^ (y >> 17);
+  return y ^ (y << 15);
+}
+
+vec2 focusPoint(vec2 p) {
+  return vec2(sin(xorshift(uint(dot(p, resolution)))));
+}
+
+void main() {
+  vec2 st = gl_FragCoord.xy / resolution.xy;
+  st.x *= resolution.x / resolution.y;
+
+  st *= 3.0 * progress;
+  vec2 intSt = floor(st);
+  vec2 fractSt = fract(st);
+
+  float dist = 1.0;
+  for (int y = -1; y <= 1; ++y) {
+    for (int x = -1; x <= 1; ++x) {
+      vec2 neighbor = vec2(float(x), float(y));
+      /*
+      vec2 fp = focusPoint(intSt + neighbor);
+      vec2 point = vec2(0.5);
+      point.x += 0.5 * cos(time + acos(-1) * fp.x);
+      point.y += 0.5 * sin(time + acos(-1) * fp.y);
+       */
+      vec2 point = 0.5 + 0.5 * cos(time + acos(-1) * focusPoint(intSt + neighbor));
+      vec2 diff = neighbor + point - fractSt;
+      dist = min(dist, length(diff));
+    }
+  }
+  gl_FragColor = vec4(vec3(dist * dist), 1.0);
+}

doc/Examples.md

@@ -1,12 +1,19 @@
 Examples
 ======
 
+[shader-study-201909.frag](../data/shader-study-201909.frag)
+------
+
+[![星屑降る地より(feat. GUMI, VOCALOID Megpoid V4) by Sad Juno](https://i.ytimg.com/vi/JOH3b3gxxdA/sddefault.jpg "星屑降る地より(feat. GUMI, VOCALOID Megpoid V4) by Sad Juno")](https://www.youtube.com/JOH3b3gxxdA)
+
+(with other source)
+
 [shader-study-20190804.frag](../data/shader-study-20190804.frag)
 ------
 
-<iframe width="560" height="315" src="https://www.youtube.com/qMwQ23na1Ek" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+[![Small bird in the rain(Processing + GLSL sound visualization study)](https://i.ytimg.com/vi/qMwQ23na1Ek/sddefault.jpg "Small bird in the rain(Processing + GLSL sound visualization study)")](https://www.youtube.com/qMwQ23na1Ek)
 
 [shader-ray-marching-study-01.frag](../data/shader-ray-marching-study-01.frag)
 ------
 
-<iframe width="560" height="315" src="https://www.youtube.com/8bA4d6-tRKE" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+[![Running on the fence(Processing + GLSL sound visualization study)](https://i.ytimg.com/vi/8bA4d6-tRKE/sddefault.jpg "Running on the fence(Processing + GLSL sound visualization study)")](https://www.youtube.com/8bA4d6-tRKE)