From 31cfbd46a3fd9b59b2d336bb184015db3323c0d7 Mon Sep 17 00:00:00 2001 From: inyourface34456 <62214409+inyourface34456@users.noreply.github.com> Date: Tue, 28 Sep 2021 15:46:52 -0400 Subject: [PATCH 1/6] now up to 40 bounces --- src/tantalum.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tantalum.js b/src/tantalum.js index 9831f8d..b3605d7 100644 --- a/src/tantalum.js +++ b/src/tantalum.js @@ -177,7 +177,7 @@ Tantalum.prototype.setupUI = function() { spectrumRenderer.setSpectrum(renderer.getEmissionSpectrum()); }); - var bounceSlider = new tui.Slider("path-length", 1, 20, true, function(length) { + var bounceSlider = new tui.Slider("path-length", 1, 40, true, function(length) { this.setLabel((length - 1) + " light bounces"); renderer.setMaxPathLength(length); }); @@ -281,4 +281,4 @@ Tantalum.prototype.renderLoop = function(timestamp) { this.progressBar.setLabel(Math.min(this.renderer.totalRaysTraced(), this.renderer.maxRayCount()) + "/" + this.renderer.maxRayCount() + " rays traced; Progress: " + this.progressBar.getProgressPercentage() + "%"); -} \ No newline at end of file +} From 84222f8912273ab7b717815b0ffa3c69ed3a5825 Mon Sep 17 00:00:00 2001 From: inyourface34456 <62214409+inyourface34456@users.noreply.github.com> Date: Tue, 28 Sep 2021 15:48:47 -0400 Subject: [PATCH 2/6] renamed to index.html --- tantalum.html => index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tantalum.html => index.html (100%) diff --git a/tantalum.html b/index.html similarity index 100% rename from tantalum.html rename to index.html From 320b202ca86d259eb3a439e520b56bc12f543634 Mon Sep 17 00:00:00 2001 From: inyourface34456 <62214409+inyourface34456@users.noreply.github.com> Date: Tue, 28 Sep 2021 15:54:41 -0400 Subject: [PATCH 3/6] now up to 800 sample count units --- src/tantalum.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tantalum.js b/src/tantalum.js index b3605d7..7976bad 100644 --- a/src/tantalum.js +++ b/src/tantalum.js @@ -183,7 +183,7 @@ Tantalum.prototype.setupUI = function() { }); bounceSlider.setValue(12); - var sampleSlider = new tui.Slider("sample-count", 400, 700, true, function(exponent100) { + var sampleSlider = new tui.Slider("sample-count", 400, 800, true, function(exponent100) { var sampleCount = Math.floor(Math.pow(10, exponent100*0.01)); this.setLabel(sampleCount + " light paths"); renderer.setMaxSampleCount(sampleCount); From 2d49386dc497f0dd6cb8a60ef106034799725f51 Mon Sep 17 00:00:00 2001 From: inyourface34456 <62214409+inyourface34456@users.noreply.github.com> Date: Wed, 29 Sep 2021 15:38:09 -0400 Subject: [PATCH 4/6] multiple changes + Added more path length options + Added one more resolution (8K in 8192 by 4320) + Added more sample sizes --- src/tantalum.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tantalum.js b/src/tantalum.js index 7976bad..24b0a1f 100644 --- a/src/tantalum.js +++ b/src/tantalum.js @@ -117,7 +117,7 @@ Tantalum.prototype.setupUI = function() { function map(a, b) { return [a*0.5/1.78 + 0.5, -b*0.5 + 0.5]; } var config = { - "resolutions": [[820, 461], [1024, 576], [1280, 720], [1600, 900], [1920, 1080], [4096, 2160]], + "resolutions": [[820, 461], [1024, 576], [1280, 720], [1600, 900], [1920, 1080], [4096, 2160], [8192, 4320]], "scenes": [ {'shader': 'scene1', 'name': 'Lenses', 'posA': [0.5, 0.5], 'posB': [0.5, 0.5], 'spread': tcore.Renderer.SPREAD_POINT}, {'shader': 'scene6', 'name': 'Spheres', 'posA': map(-1.59, 0.65), 'posB': map(0.65, -0.75), 'spread': tcore.Renderer.SPREAD_BEAM}, @@ -171,19 +171,19 @@ Tantalum.prototype.setupUI = function() { var mouseListener = new tui.MouseListener(canvas, renderer.setEmitterPos.bind(renderer)); - var temperatureSlider = new tui.Slider("emission-temperature", 1000, 10000, true, function(temperature) { + var temperatureSlider = new tui.Slider("emission-temperature", 100, 100000, true, function(temperature) { this.setLabel("Temperature: " + temperature + "K"); renderer.setEmitterTemperature(temperature); spectrumRenderer.setSpectrum(renderer.getEmissionSpectrum()); }); - var bounceSlider = new tui.Slider("path-length", 1, 40, true, function(length) { + var bounceSlider = new tui.Slider("path-length", 1, 41, true, function(length) { this.setLabel((length - 1) + " light bounces"); renderer.setMaxPathLength(length); }); bounceSlider.setValue(12); - var sampleSlider = new tui.Slider("sample-count", 400, 800, true, function(exponent100) { + var sampleSlider = new tui.Slider("sample-count", 1, 800, true, function(exponent100) { var sampleCount = Math.floor(Math.pow(10, exponent100*0.01)); this.setLabel(sampleCount + " light paths"); renderer.setMaxSampleCount(sampleCount); From 3c3c470b33453a7247d650fa100b85172ea3550c Mon Sep 17 00:00:00 2001 From: inyourface34456 <62214409+inyourface34456@users.noreply.github.com> Date: Wed, 29 Sep 2021 15:44:26 -0400 Subject: [PATCH 5/6] removed the 8k option --- src/tantalum.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tantalum.js b/src/tantalum.js index 24b0a1f..6d7160e 100644 --- a/src/tantalum.js +++ b/src/tantalum.js @@ -117,7 +117,7 @@ Tantalum.prototype.setupUI = function() { function map(a, b) { return [a*0.5/1.78 + 0.5, -b*0.5 + 0.5]; } var config = { - "resolutions": [[820, 461], [1024, 576], [1280, 720], [1600, 900], [1920, 1080], [4096, 2160], [8192, 4320]], + "resolutions": [[820, 461], [1024, 576], [1280, 720], [1600, 900], [1920, 1080], [4096, 2160]], "scenes": [ {'shader': 'scene1', 'name': 'Lenses', 'posA': [0.5, 0.5], 'posB': [0.5, 0.5], 'spread': tcore.Renderer.SPREAD_POINT}, {'shader': 'scene6', 'name': 'Spheres', 'posA': map(-1.59, 0.65), 'posB': map(0.65, -0.75), 'spread': tcore.Renderer.SPREAD_BEAM}, From 73b8c45b7f3082ac34f41023a896ea7a949f9ffe Mon Sep 17 00:00:00 2001 From: inyourface34456 <62214409+inyourface34456@users.noreply.github.com> Date: Wed, 18 Jan 2023 17:39:12 -0500 Subject: [PATCH 6/6] Update tantalum.js --- src/tantalum.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tantalum.js b/src/tantalum.js index 6d7160e..814f182 100644 --- a/src/tantalum.js +++ b/src/tantalum.js @@ -183,7 +183,7 @@ Tantalum.prototype.setupUI = function() { }); bounceSlider.setValue(12); - var sampleSlider = new tui.Slider("sample-count", 1, 800, true, function(exponent100) { + var sampleSlider = new tui.Slider("sample-count", 1, 1000, true, function(exponent100) { var sampleCount = Math.floor(Math.pow(10, exponent100*0.01)); this.setLabel(sampleCount + " light paths"); renderer.setMaxSampleCount(sampleCount);