Skip to content

Commit 6043160

Browse files
committed
fix blender binary stuff
1 parent 7bcb281 commit 6043160

5 files changed

Lines changed: 30 additions & 15 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,6 @@ docs/*
5454

5555
# Blender extension binary data
5656
BlenderExtension/dist
57+
BlenderExtension/see_blender/wheels
5758
BlenderExtension/seesharp_binaries.egg-info
5859
BlenderExtension/see_sharp_renderer-*.zip

BlenderExtension/see_blender/blender_manifest.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ copyright = [
2323
# # Optional: bundle 3rd party Python modules.
2424
# # https://docs.blender.org/manual/en/dev/advanced/extensions/python_wheels.html
2525
wheels = [
26-
"../dist/seesharp_binaries-1.0.0-py3-none-any.whl",
26+
"./wheels/seesharp_binaries-1.0.0-py3-none-any.whl",
2727
]
2828

2929
[permissions]

BlenderExtension/see_blender/render_engine.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import bpy
22
from bpy.props import EnumProperty, IntProperty, BoolProperty, PointerProperty
33
import os
4-
import subprocess
54
import tempfile
5+
import seesharp_binaries
66

77
from . import exporter
88

@@ -20,21 +20,18 @@ def render(self, depsgraph):
2020

2121
config = scene.seesharp.config
2222

23-
exe = os.path.dirname(__file__) + "/bin/SeeSharp.PreviewRender.dll"
2423
with tempfile.TemporaryDirectory() as tempdir:
2524
exporter.export_scene(tempdir + "/scene.json", scene, depsgraph)
26-
args = ["dotnet", exe]
27-
args.extend([
28-
"--scene", tempdir + "/scene.json",
29-
"--output", tempdir + "/Render.hdr",
30-
"--resx", str(size_x),
31-
"--resy", str(size_y),
32-
"--samples", str(config.samples),
33-
"--algo", str(config.engine),
34-
"--maxdepth", str(config.maxdepth),
35-
"--denoise", str(config.denoise)
36-
])
37-
subprocess.call(args)
25+
26+
seesharp_binaries.preview_render(
27+
tempdir + "/scene.json",
28+
tempdir + "/Render.hdr",
29+
size_x, size_y,
30+
config.samples,
31+
config.engine,
32+
config.maxdepth,
33+
config.denoise
34+
)
3835

3936
result = self.begin_result(0, 0, size_x, size_y)
4037
result.layers[0].load_from_file(tempdir + "/Render.hdr")
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
11
import os
2+
import subprocess
23

34
dllpath = os.path.dirname(__file__) + "/bin/SeeSharp.PreviewRender.dll"
5+
6+
def preview_render(scene, output, size_x, size_y, samples, algorithm, maxdepth, denoise):
7+
exe = os.path.dirname(__file__) + "/bin/SeeSharp.PreviewRender.dll"
8+
args = ["dotnet", exe]
9+
args.extend([
10+
"--scene", scene,
11+
"--output", output,
12+
"--resx", str(size_x),
13+
"--resy", str(size_y),
14+
"--samples", str(samples),
15+
"--algo", str(algorithm),
16+
"--maxdepth", str(maxdepth),
17+
"--denoise", str(denoise)
18+
])
19+
subprocess.call(args)

justfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ _build_dotnet:
99
[working-directory: "./BlenderExtension"]
1010
_blender_binaries:
1111
python -m build --wheel
12+
cp -r ./dist ./see_blender/wheels
1213

1314
# Builds the Blender add-on .zip
1415
[working-directory: "./BlenderExtension/see_blender/"]

0 commit comments

Comments
 (0)