Skip to content

Commit

Permalink
Release 1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@pissang
pissang committed May 2, 2018
1 parent e4497f0 commit b0239d3
Show file tree
Hide file tree
Showing 8 changed files with 1,441 additions and 978 deletions.
905 changes: 712 additions & 193 deletions dist/claygl.es.js
View file

Large diffs are not rendered by default.

905 changes: 712 additions & 193 deletions dist/claygl.js
View file

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions dist/claygl.min.js
View file

Large diffs are not rendered by default.

383 changes: 1 addition & 382 deletions example/assets/fx/composite.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,387 +496,6 @@
}
},


{
"name": "coc",
"shader": "#source(clay.compositor.dof.coc)",
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr)",
"height": "expr(height * dpr)"
}
}
}
},

{
"name": "coc_half",
"shader": "#source(clay.compositor.dof.min_coc)",
"inputs": {
"coc": "coc"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr, height * dpr] )"
}
},

{
"name": "dof_source_half",
"shader": "#source(clay.compositor.dof.downsample)",
"inputs": {
"texture": "source",
"coc": "coc"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr, height * dpr] )"
},
"defines": {
"RGBM": null
}
},

{
"name": "dof_far_blur_hexangonal_1",
"shader": "#source(clay.compositor.dof.hexagonal_blur_1)",
"inputs": {
"texture": "dof_source_half",
"coc": "coc"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"RGBM": null
}
},
{
"name": "dof_far_blur_hexangonal_2",
"shader": "#source(clay.compositor.dof.hexagonal_blur_2)",
"inputs": {
"texture": "dof_source_half",
"coc": "coc"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"RGBM": null
}
},
{
"name": "dof_far_blur_hexangonal_3",
"shader": "#source(clay.compositor.dof.hexagonal_blur_3)",
"inputs": {
"texture1": "dof_far_blur_hexangonal_1",
"texture2": "dof_far_blur_hexangonal_2",
"coc": "coc"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"RGBM": null
}
},

{
"name": "dof_near_blur_hexangonal_1",
"shader": "#source(clay.compositor.dof.hexagonal_blur_1)",
"inputs": {
"texture": "dof_source_half",
"coc": "coc"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"RGBM": null,
"BLUR_NEARFIELD": null
}
},
{
"name": "dof_near_blur_hexangonal_2",
"shader": "#source(clay.compositor.dof.hexagonal_blur_2)",
"inputs": {
"texture": "dof_source_half",
"coc": "coc"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"RGBM": null,
"BLUR_NEARFIELD": null
}
},
{
"name": "dof_near_blur_hexangonal_3",
"shader": "#source(clay.compositor.dof.hexagonal_blur_3)",
"inputs": {
"texture1": "dof_near_blur_hexangonal_1",
"texture2": "dof_near_blur_hexangonal_2",
"coc": "coc"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"RGBM": null,
"BLUR_NEARFIELD": null
}
},


{
"name": "dof_coc_blur_hexangonal_1",
"shader": "#source(clay.compositor.dof.hexagonal_blur_1)",
"inputs": {
"texture": "coc_half"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"BLUR_COC": null
}
},
{
"name": "dof_coc_blur_hexangonal_2",
"shader": "#source(clay.compositor.dof.hexagonal_blur_2)",
"inputs": {
"texture": "coc_half"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"BLUR_COC": null
}
},
{
"name": "dof_coc_blur_hexangonal_3",
"shader": "#source(clay.compositor.dof.hexagonal_blur_3)",
"inputs": {
"texture1": "dof_coc_blur_hexangonal_1",
"texture2": "dof_coc_blur_hexangonal_2"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr / 2)",
"height": "expr(height * dpr / 2)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"BLUR_COC": null
}
},

{
"name": "dof_far_blur_upsample",
"shader": "#source(clay.compositor.dof.upsample)",
"inputs": {
"texture": "dof_far_blur_hexangonal_3",
"coc": "coc"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr)",
"height": "expr(height * dpr)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"RGBM": null
}
},

{
"name": "dof_near_blur_upsample",
"shader": "#source(clay.compositor.dof.upsample)",
"inputs": {
"texture": "dof_near_blur_hexangonal_3",
"coc": "coc"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr)",
"height": "expr(height * dpr)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
},
"defines": {
"RGBM": null
}
},

{
"name": "dof_coc_blur_upsample",
"shader": "#source(clay.compositor.dof.coc_upsample)",
"inputs": {
"coc": "dof_coc_blur_hexangonal_3"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr)",
"height": "expr(height * dpr)"
}
}
},
"parameters": {
"textureSize": "expr( [width * dpr / 2, height * dpr / 2] )"
}
},

{
"name": "dof_composite",
"shader": "#source(clay.compositor.dof.composite)",
"inputs": {
"original": "source",
"blurred": "dof_far_blur_upsample",
"nearfield": "dof_near_blur_upsample",
"coc": "coc",
"nearcoc": "dof_coc_blur_upsample"
},
"outputs": {
"color": {
"parameters": {
"minFilter": "NEAREST",
"magFilter": "NEAREST",
"width": "expr(width * dpr)",
"height": "expr(height * dpr)"
}
}
},
"defines": {
"RGBM": null
}
},

{
"name" : "lensflare",
"shader" : "#source(clay.compositor.lensflare)",
Expand Down Expand Up @@ -949,7 +568,7 @@
"name" : "composite",
"shader" : "#source(clay.compositor.hdr.composite)",
"inputs" : {
"texture" : "dof_composite",
"texture" : "source",
"bloom" : "bloom_composite",
"lensflare" : "lensflare_blur_v"
},
Expand Down
Loading

0 comments on commit b0239d3

Please sign in to comment.