icrdr/Bioxel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #51 from OmooLab/feature/dev

Browse Source 
Feature/dev
This commit is contained in:
Ma Nan
2024-11-01 11:58:31 +08:00
committed by GitHub
parent 66aafb41bd 4e9dc1ce67
commit d4bc355d94
7 changed files with 59 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bioxelnodes/assets/Nodes/BioxelNodes_latest.blend LFS
View File

Binary file not shown.

2
bioxelnodes/blender_manifest.toml
View File

@@ -1,7 +1,7 @@
schema_version = "1.0.0"
id = "bioxelnodes"
version = "1.0.6"
version = "1.0.7"
name = "Bioxel Nodes"
tagline = "For scientific volumetric data visualization in Blender"
maintainer = "Ma Nan <icrdr2010@outlook.com>"

10
bioxelnodes/constants.py
View File

@@ -1,6 +1,6 @@
from pathlib import Path
VERSIONS = [{"label": "Latest", "node_version": (1, 0, 6)},
VERSIONS = [{"label": "Latest", "node_version": (1, 0, 7)},
{"label": "v0.3.x", "node_version": (0, 3, 3)},
{"label": "v0.2.x", "node_version": (0, 2, 9)}]
@@ -8,7 +8,7 @@ NODE_LIB_DIRPATH = Path(Path(__file__).parent,
"assets/Nodes").resolve()
LATEST_NODE_LIB_PATH = lib_path = Path(NODE_LIB_DIRPATH,
"BioxelNodes_latest.blend").resolve()
"BioxelNodes_latest.blend").resolve()
COMPONENT_OUTPUT_NODES = [
"CutoutByThreshold",
@@ -166,6 +166,12 @@ MENU_ITEMS = [
'name': 'ReCenter',
'description': ''
},
{
'label': 'Copy Transform',
'icon': 'EMPTY_AXIS',
'name': 'CopyTransform',
'description': ''
},
{
'label': 'Extract Transform',
'icon': 'EMPTY_AXIS',

1
bioxelnodes/operators/container.py
View File

@@ -541,6 +541,7 @@ class ContainerProps(bpy.types.Operator):
bl_label = "Change Container Properties"
bl_description = "Change current ontainer properties"
bl_icon = "FILE_TICK"
bl_options = {'UNDO'}
scene_scale: bpy.props.FloatProperty(name="Scene Scale",
soft_min=0.0001, soft_max=10.0,

3
bioxelnodes/operators/io.py
View File

@@ -664,6 +664,9 @@ class ImportVolumetricDataDialog(bpy.types.Operator):
else:
data = data.astype(np.float32)
# Gamma Correct
# data = data ** 2.2
name = self.layer_name or "Color"
if data.shape[4] == 1:
data = np.repeat(data, repeats=3, axis=4)

71
bioxelnodes/operators/misc.py
View File

@@ -207,15 +207,24 @@ class SliceViewer(bpy.types.Operator):
bpy.context.scene.eevee.volumetric_shadow_samples = 128
bpy.context.scene.eevee.volumetric_samples = 128
bpy.context.scene.eevee.volumetric_ray_depth = 1
bpy.context.scene.eevee.use_shadows = False
bpy.context.scene.eevee.use_volumetric_shadows = False
for area in bpy.context.screen.areas:
if area.type == 'VIEW_3D':
area.spaces[0].shading.type = 'MATERIAL'
area.spaces[0].shading.studio_light = 'studio.exr'
area.spaces[0].shading.studiolight_intensity = 2.5
area.spaces[0].shading.use_scene_lights = False
area.spaces[0].shading.use_scene_world = False
view_3d = None
if context.area.type == 'VIEW_3D':
view_3d = context.area
else:
for area in context.screen.areas:
if area.type == 'VIEW_3D':
view_3d = area
break
if view_3d:
view_3d.spaces[0].shading.type = 'MATERIAL'
view_3d.spaces[0].shading.studio_light = 'studio.exr'
view_3d.spaces[0].shading.studiolight_intensity = 1.5
view_3d.spaces[0].shading.use_scene_lights = False
view_3d.spaces[0].shading.use_scene_world = False
return {'FINISHED'}
@@ -282,29 +291,35 @@ class AddEeveeEnv(bpy.types.Operator):
bl_description = "To make volume shadow less dark"
def execute(self, context):
bpy.ops.object.light_add(
type='POINT', align='WORLD', location=(0, 0, 0), scale=(1, 1, 1))
light_obj = bpy.context.active_object
light_obj.name = "EeveeEnv"
light_obj.data.shadow_soft_size = 100
light_obj.data.energy = 1e+06
light_obj.data.color = (0.1, 0.1, 0.1)
light_obj.data.use_shadow = False
light_obj.data.diffuse_factor = 0
light_obj.data.specular_factor = 0
light_obj.data.transmission_factor = 0
light_obj.hide_select = True
light_obj.lock_location[0] = True
light_obj.lock_location[1] = True
light_obj.lock_location[2] = True
light_obj.lock_rotation[0] = True
light_obj.lock_rotation[1] = True
light_obj.lock_rotation[2] = True
light_obj.lock_scale[0] = True
light_obj.lock_scale[1] = True
light_obj.lock_scale[2] = True
bpy.ops.wm.append(
directory=f"{str(LATEST_NODE_LIB_PATH)}/Object",
filename="EeveeEnv"
)
# bpy.ops.object.light_add(
# type='POINT', align='WORLD', location=(0, 0, 0), scale=(1, 1, 1))
# light_obj = bpy.context.active_object
# light_obj.name = "EeveeEnv"
# light_obj.data.shadow_soft_size = 100
# light_obj.data.energy = 1e+06
# light_obj.data.color = (0.1, 0.1, 0.1)
# light_obj.data.use_shadow = False
# light_obj.data.diffuse_factor = 0
# light_obj.data.specular_factor = 0
# light_obj.data.transmission_factor = 0
# light_obj.hide_select = True
# light_obj.lock_location[0] = True
# light_obj.lock_location[1] = True
# light_obj.lock_location[2] = True
# light_obj.lock_rotation[0] = True
# light_obj.lock_rotation[1] = True
# light_obj.lock_rotation[2] = True
# light_obj.lock_scale[0] = True
# light_obj.lock_scale[1] = True
# light_obj.lock_scale[2] = True
bpy.context.scene.eevee.use_shadows = True
bpy.context.scene.eevee.use_volumetric_shadows = True
return {'FINISHED'}

2
pyproject.toml
View File

@@ -1,6 +1,6 @@
[tool.poetry]
name = "bioxelnodes"
version = "1.0.6"
version = "1.0.7"
description = ""
authors = ["Ma Nan <icrdr2010@outlook.com>"]
license = "MIT"