Skip to content

Commit c89d889

Browse files
committed
reworked noise balanced sampling
1 parent 2a261a3 commit c89d889

File tree

88 files changed

+34
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+34
-21
lines changed

CHANGELOG.rst

Lines changed: 10 additions & 0 deletions

examples/1_basics/4_subsurface_scattering.ipynb

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@
8787
"from plotoptix.materials import m_clear_glass, m_matt_glass\n",
8888
"import copy\n",
8989
"\n",
90+
"m_env = copy.deepcopy(m_clear_glass)\n",
91+
"m_env[\"VarFloat3\"][\"refraction_index\"] = [1.0, 1.0, 1.0]\n",
92+
"\n",
9093
"m_clear_glass_2 = copy.deepcopy(m_clear_glass)\n",
9194
"m_clear_glass_3 = copy.deepcopy(m_clear_glass)\n",
9295
"m_clear_glass_4 = copy.deepcopy(m_clear_glass)\n",
@@ -126,24 +129,24 @@
126129
" u=[size_u, 0, 0], v=[0, -1, 0], w=[0, 0, size_w],\n",
127130
" geom=\"Parallelepipeds\")\n",
128131
"\n",
129-
"optix.set_data(\"c_clear\", pos=[-3.5, 0, -5], u=[0.25, 0, 0], v=[0, 4, 0], w=[0, 0, 4], c=10, mat=\"glass\", geom=\"Parallelepipeds\")\n",
130-
"optix.rotate_geometry(\"c_clear\", [0, 0, -np.pi/4])\n",
131-
"optix.set_data(\"c_diffuse\", pos=[-0.5, 0, -5], u=[0.25, 0, 0], v=[0, 4, 0], w=[0, 0, 4], c=10, mat=\"glass_2\", geom=\"Parallelepipeds\")\n",
132-
"optix.rotate_geometry(\"c_diffuse\", [0, 0, -np.pi/4])\n",
133-
"optix.set_data(\"c_light\", pos=[2.5, 0, -5], u=[0.25, 0, 0], v=[0, 4, 0], w=[0, 0, 4], c=10, mat=\"light_1\", geom=\"Parallelepipeds\")\n",
134-
"optix.rotate_geometry(\"c_light\", [0, 0, -np.pi/4])\n",
132+
"optix.set_data(\"c_glass\", pos=[-3.5, 0, -5], u=[0.25, 0, 0], v=[0, 4, 0], w=[0, 0, 4], c=10, mat=\"glass\", geom=\"Parallelepipeds\")\n",
133+
"optix.rotate_geometry(\"c_glass\", [0, 0, -np.pi/4])\n",
134+
"optix.set_data(\"c_glass_2\", pos=[-0.5, 0, -5], u=[0.25, 0, 0], v=[0, 4, 0], w=[0, 0, 4], c=10, mat=\"glass_2\", geom=\"Parallelepipeds\")\n",
135+
"optix.rotate_geometry(\"c_glass_2\", [0, 0, -np.pi/4])\n",
136+
"optix.set_data(\"c_light_1\", pos=[2.5, 0, -5], u=[0.25, 0, 0], v=[0, 4, 0], w=[0, 0, 4], c=10, mat=\"light_1\", geom=\"Parallelepipeds\")\n",
137+
"optix.rotate_geometry(\"c_light_1\", [0, 0, -np.pi/4])\n",
135138
"\n",
136139
"optix.set_data(\"s_light_2\", pos=[-3.1, 1.5, 1], r=1.5, c=10, mat=\"light_2\", geom=\"ParticleSetTextured\")\n",
137-
"optix.set_data(\"s_diffuse\", pos=[0, 1.5, 1], r=1.5, c=10, mat=\"glass_2\")\n",
138-
"optix.set_data(\"s_diffuse_colored\", pos=[3.1, 1.5, 1], r=1.5, c=10, mat=\"glass_3\")\n",
140+
"optix.set_data(\"s_glass_2\", pos=[0, 1.5, 1], r=1.5, c=10, mat=\"glass_2\")\n",
141+
"optix.set_data(\"s_glass_3\", pos=[3.1, 1.5, 1], r=1.5, c=10, mat=\"glass_3\")\n",
139142
"\n",
140-
"optix.set_data(\"s_matt\", pos=[-3.1, 1.5, 4.1], r=1.5, c=10, mat=\"matt_glass\")\n",
141-
"optix.set_data(\"s_diffuse_less\", pos=[0, 1.5, 4.1], r=1.5, c=10, mat=\"glass_4\")\n",
142-
"optix.set_data(\"s_diffuse_tex\", pos=[3.1, 1.5, 4.1], r=1.5, c=10, mat=\"glass_5\", geom=\"ParticleSetTextured\")\n",
143+
"optix.set_data(\"s_matt_glass\", pos=[-3.1, 1.5, 4.1], r=1.5, c=10, mat=\"matt_glass\")\n",
144+
"optix.set_data(\"s_glass_4\", pos=[0, 1.5, 4.1], r=1.5, c=10, mat=\"glass_4\")\n",
145+
"optix.set_data(\"s_glass_5\", pos=[3.1, 1.5, 4.1], r=1.5, c=10, mat=\"glass_5\", geom=\"ParticleSetTextured\")\n",
143146
"\n",
144147
"optix.set_data(\"s_matt_colored\", pos=[-3.1, 1.5, 7.2], r=1.5, c=10, mat=\"matt_glass_2\")\n",
145148
"optix.set_data(\"s_light_1\", pos=[0, 1.5, 7.2], r=1.5, c=10, mat=\"light_1\")\n",
146-
"optix.set_data(\"s_clear\", pos=[3.1, 1.5, 7.2], r=1.5, c=10, mat=\"glass\")"
149+
"optix.set_data(\"s_glass\", pos=[3.1, 1.5, 7.2], r=1.5, c=10, mat=\"glass\")"
147150
]
148151
},
149152
{
@@ -264,7 +267,7 @@
264267
],
265268
"metadata": {
266269
"kernelspec": {
267-
"display_name": "Python 3",
270+
"display_name": "Python 3 (ipykernel)",
268271
"language": "python",
269272
"name": "python3"
270273
},
@@ -278,7 +281,7 @@
278281
"name": "python",
279282
"nbconvert_exporter": "python",
280283
"pygments_lexer": "ipython3",
281-
"version": "3.7.4"
284+
"version": "3.10.6"
282285
}
283286
},
284287
"nbformat": 4,

plotoptix/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
__author__ = "Robert Sulej, R&D Team <[email protected]>"
1414
__status__ = "beta"
15-
__version__ = "0.18.3"
16-
__date__ = "3 Jan 2025"
15+
__version__ = "0.18.4"
16+
__date__ = "30 Jan 2025"
1717

1818
import logging
1919

plotoptix/bin/cuda/ahit7_occlusion.ir

-392 Bytes
Binary file not shown.
12 Bytes
Binary file not shown.
20 Bytes
Binary file not shown.
24 Bytes
Binary file not shown.
24 Bytes
Binary file not shown.

plotoptix/bin/cuda/camera7_fisheye.ir

4 Bytes
Binary file not shown.
72 Bytes
Binary file not shown.
Binary file not shown.
16 Bytes
Binary file not shown.

plotoptix/bin/cuda/camera7_ortho.ir

-8 Bytes
Binary file not shown.
4 Bytes
Binary file not shown.
12 Bytes
Binary file not shown.
28 Bytes
Binary file not shown.

plotoptix/bin/cuda/camera7_pinhole.ir

4 Bytes
Binary file not shown.
20 Bytes
Binary file not shown.
-404 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
72 Bytes
Binary file not shown.
Binary file not shown.
-88 Bytes
Binary file not shown.
16 Bytes
Binary file not shown.
-412 Bytes
Binary file not shown.

plotoptix/bin/cuda/chit7_occlusion.ir

-396 Bytes
Binary file not shown.
-404 Bytes
Binary file not shown.

plotoptix/bin/cuda/dummy7_ahit.ir

-388 Bytes
Binary file not shown.

plotoptix/bin/cuda/dummy7_chit.ir

-388 Bytes
Binary file not shown.

plotoptix/bin/cuda/dummy7_isec.ir

-388 Bytes
Binary file not shown.

plotoptix/bin/cuda/isec7_bezier.ir

-304 Bytes
Binary file not shown.
-308 Bytes
Binary file not shown.
-312 Bytes
Binary file not shown.
-412 Bytes
Binary file not shown.
-408 Bytes
Binary file not shown.
-412 Bytes
Binary file not shown.
-396 Bytes
Binary file not shown.
-440 Bytes
Binary file not shown.
-400 Bytes
Binary file not shown.
-408 Bytes
Binary file not shown.
Binary file not shown.
-324 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-416 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
-420 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-424 Bytes
Binary file not shown.
-452 Bytes
Binary file not shown.
Binary file not shown.
-424 Bytes
Binary file not shown.
-444 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-416 Bytes
Binary file not shown.

plotoptix/bin/cuda/miss7_radiance.ir

-396 Bytes
Binary file not shown.
-400 Bytes
Binary file not shown.
-400 Bytes
Binary file not shown.
-400 Bytes
Binary file not shown.
-404 Bytes
Binary file not shown.

plotoptix/bin/librndSharpOptiX7.so

12.2 KB
Binary file not shown.

plotoptix/bin/rndSharpEncoder.dll

0 Bytes
Binary file not shown.

plotoptix/bin/rndSharpOptiX7.dll

12.5 KB
Binary file not shown.

plotoptix/enums.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,16 +497,16 @@ class WorkDistribution(Enum):
497497
"""Constant numbe of rays per pixel.
498498
"""
499499

500-
NoiseBalanced = 1
501-
"""More rays towards pixels with a higher relative noise, same as.
500+
NoiseBalanced = 2
501+
"""More rays towards pixels with the higher absolute noise, same as ``AbsNoiseBalanced``.
502502
"""
503503

504504
RelNoiseBalanced = 1
505-
"""More rays towards pixels a higher relative noise.
505+
"""More rays towards pixels with the higher relative noise.
506506
"""
507507

508508
AbsNoiseBalanced = 2
509-
"""More rays towards pixels a higher absolute noise.
509+
"""More rays towards pixels with the higher absolute noise.
510510
"""
511511

512512
class Camera(Enum):

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def get_tag(self):
175175

176176

177177
setup(name='plotoptix',
178-
version='0.18.3',
178+
version='0.18.4',
179179
url='https://rnd.team/plotoptix',
180180
project_urls={
181181
'Documentation': 'https://plotoptix.rnd.team',

0 commit comments

Comments
 (0)