From 43285eec8f7a12dc4f3b41c036baf658a30a2bcc Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Wed, 1 Jun 2022 01:01:17 +0200 Subject: [PATCH] Ports: Restore the former `c-ray` HDR patch This was accidentally corrupted during the Git conversion, as `input/hdr.json` is listed in the `.gitignore` and was therefore missing from the repository. --- ...0006-Reduce-HDR-scene-settings-a-bit.patch | 421 +----------------- 1 file changed, 22 insertions(+), 399 deletions(-) diff --git a/Ports/c-ray/patches/0006-Reduce-HDR-scene-settings-a-bit.patch b/Ports/c-ray/patches/0006-Reduce-HDR-scene-settings-a-bit.patch index 841dd0ac2b..0d0b8f1c67 100644 --- a/Ports/c-ray/patches/0006-Reduce-HDR-scene-settings-a-bit.patch +++ b/Ports/c-ray/patches/0006-Reduce-HDR-scene-settings-a-bit.patch @@ -1,413 +1,36 @@ -From 81f73eaff2d269158ee4cef7bd576af5bedb835e Mon Sep 17 00:00:00 2001 +From 252852219ee147c38a885ea3f1e6118244f7f57d Mon Sep 17 00:00:00 2001 From: Valtteri Koskivuori Date: Sat, 13 Mar 2021 22:11:07 +0100 Subject: [PATCH 6/8] Reduce HDR scene settings a bit --- - input/hdr.json | 394 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 394 insertions(+) - create mode 100644 input/hdr.json + input/hdr.json | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/input/hdr.json b/input/hdr.json -new file mode 100644 -index 0000000..b7b5b63 ---- /dev/null +index f2f45b1..b7b5b63 100644 +--- a/input/hdr.json +++ b/input/hdr.json -@@ -0,0 +1,394 @@ -+{ -+ "version": 1.0, -+ "renderer": { -+ "threads": 0, +@@ -2,7 +2,7 @@ + "version": 1.0, + "renderer": { + "threads": 0, +- "samples": 250, + "samples": 25, -+ "bounces": 30, -+ "tileWidth": 64, -+ "tileHeight": 64, -+ "tileOrder": "fromMiddle", -+ "outputFilePath": "output/", -+ "outputFileName": "rendered", -+ "fileType": "png", -+ "count": 0, + "bounces": 30, + "tileWidth": 64, + "tileHeight": 64, +@@ -11,8 +11,8 @@ + "outputFileName": "rendered", + "fileType": "png", + "count": 0, +- "width": 1280, +- "height": 800 + "width": 320, + "height": 200 -+ }, -+ "display": { -+ "isFullscreen": false, -+ "isBorderless": false, -+ "windowScale": 1.0 -+ }, -+ "camera": [ -+ { -+ "FOV": 30.0, -+ "focalDistance": 0.7, -+ "fstops": 6.5, -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": 0, -+ "y": 0.1, -+ "z": -0.7 -+ }, -+ { -+ "type": "rotateX", -+ "degrees": 5 -+ }, -+ { -+ "type": "rotateZ", -+ "degrees": 0 -+ } -+ ] -+ }, -+ { -+ "FOV": 90.0, -+ "focalDistance": 0.2, -+ "fstops": 6.5, -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": 0, -+ "y": 0.1, -+ "z": -0.2 -+ }, -+ { -+ "type": "rotateX", -+ "degrees": 5 -+ }, -+ { -+ "type": "rotateY", -+ "degrees": 5 -+ } -+ ] -+ } -+ ], -+ "scene": { -+ "ambientColor": { -+ "hdr": "HDRs/roof_garden_1k.hdr", -+ "offset": 0, -+ "down": { -+ "r": 1.0, -+ "g": 1.0, -+ "b": 1.0 -+ }, -+ "up": { -+ "r": 0.5, -+ "g": 0.7, -+ "b": 1.0 -+ } -+ }, -+ "primitives": [ -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": -0.25, -+ "y": 0.1001, -+ "z": 0.3 -+ } -+ ] -+ } -+ ], -+ "color": { -+ "r": 1.0, -+ "g": 0.0, -+ "b": 1.0 -+ }, -+ "bsdf": "metal", -+ "roughness": 0.05, -+ "radius": 0.1 -+ }, -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": 0, -+ "y": 0.05, -+ "z": 0 -+ } -+ ] -+ } -+ ], -+ "color": { -+ "r": 0.8, -+ "g": 0.8, -+ "b": 0.8 -+ }, -+ "bsdf": "metal", -+ "roughness": 0.00, -+ "radius": 0.05 -+ }, -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": 0.05, -+ "y": 0.05, -+ "z": 0.1 -+ } -+ ] -+ } -+ ], -+ "color": { -+ "r": 0.0, -+ "g": 0.8, -+ "b": 0.0 -+ }, -+ "bsdf": "metal", -+ "roughness": 0.00, -+ "radius": 0.05 -+ }, -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": 0.15, -+ "y": 0.05, -+ "z": 0 -+ } -+ ] -+ } -+ ], -+ "color": { -+ "r": 1.0, -+ "g": 1.0, -+ "b": 1.0 -+ }, -+ "bsdf": "glass", -+ "IOR": 1.9, -+ "roughness": 0, -+ "radius": 0.05 -+ }, -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": -0.15, -+ "y": 0.025, -+ "z": 0.05 -+ } -+ ] -+ } -+ ], -+ "color": { -+ "r": 1.0, -+ "g": 0.1, -+ "b": 0.1 -+ }, -+ "bsdf": "glass", -+ "IOR": 1.9, -+ "roughness": 0, -+ "radius": 0.025 -+ }, -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": -0.120, -+ "y": 0.025, -+ "z": 0.1 -+ } -+ ] -+ } -+ ], -+ "color": { -+ "r": 0.1, -+ "g": 1.0, -+ "b": 0.1 -+ }, -+ "bsdf": "glass", -+ "IOR": 1.9, -+ "roughness": 0, -+ "radius": 0.025 -+ }, -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": -0.090, -+ "y": 0.025, -+ "z": 0.15 -+ } -+ ] -+ } -+ ], -+ "color": { -+ "r": 0.1, -+ "g": 0.1, -+ "b": 1.0 -+ }, -+ "bsdf": "glass", -+ "IOR": 1.9, -+ "roughness": 0, -+ "radius": 0.025 -+ }, -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": -0.03, -+ "y": 0.01, -+ "z": -0.25 -+ } -+ ] -+ } -+ ], -+ "radius": 0.01, -+ "color": { -+ "r": 1.0, -+ "g": 0.0, -+ "b": 0.0 -+ }, -+ "bsdf": "metal", -+ "roughness": 1.0 -+ }, -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": 1070, -+ "y": 310, -+ "z": 820 -+ } -+ ] -+ } -+ ], -+ "radius": 2.5, -+ "color": { -+ "r": 0.0, -+ "g": 1.0, -+ "b": 0.0 -+ }, -+ "bsdf": "emissive", -+ "intensity": 10.0 -+ }, -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": 1090, -+ "y": 310, -+ "z": 820 -+ } -+ ] -+ } -+ ], -+ "radius": 2.5, -+ "color": { -+ "r": 0.0, -+ "g": 0.0, -+ "b": 1.0 -+ }, -+ "bsdf": "emissive", -+ "intensity": 10.0 -+ }, -+ { -+ "type": "sphere", -+ "instances": [ -+ { -+ "transforms": [ -+ { -+ "type": "translate", -+ "x": 950, -+ "y": 420, -+ "z": 1500 -+ } -+ ] -+ } -+ ], -+ "color": { -+ "r": 1.0, -+ "g": 1.0, -+ "b": 1.0 -+ }, -+ "bsdf": "emissive", -+ "intensity": 10.0, -+ "radius": 10 -+ } -+ ], -+ "meshes": [ -+ { -+ "fileName": "shapes/gridplane.obj", -+ "instances": [ -+ { -+ "for": "Plane", -+ "material": [ -+ { -+ "type": "diffuse", -+ "color": "shapes/grid.png" -+ } -+ ], -+ "transforms": [ -+ { -+ "type": "scaleUniform", -+ "scale": 0.25 -+ }, -+ { -+ "type": "rotateX", -+ "degrees": 0 -+ } -+ ] -+ } -+ ] -+ }, -+ { -+ "fileName": "venusscaled.obj", -+ "instances": [ -+ { -+ "materials": { -+ "type": "plastic", -+ "roughness": 0, -+ "IOR": 1.45, -+ "color": [1.0, 0.2705, 0.0] -+ }, -+ "transforms": [ -+ { -+ "type": "scaleUniform", -+ "scale": 0.05 -+ }, -+ { -+ "type": "translate", -+ "X": 0.08 -+ }, -+ { -+ "type": "rotateY", -+ "degrees": 0 -+ } -+ ] -+ } -+ ] -+ } -+ ] -+ } -+} + }, + "display": { + "isFullscreen": false, -- 2.36.1