Skip to content

Commit

Permalink
Support Cycles for certain bake maps that can benefit from it
Browse files Browse the repository at this point in the history
  • Loading branch information
@oRazeD
oRazeD committed Jan 5, 2022
1 parent a257a3f commit 328ef93
Show file tree
Hide file tree
Showing 4 changed files with 183 additions and 139 deletions.
42 changes: 34 additions & 8 deletions baker_setup_cleanup_utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ def export_and_preview_setup(self, context):
self.savedEeveeRenderSampling = eevee.taa_render_samples
self.savedEeveeSampling = eevee.taa_samples

self.savedCyclesSampling = context.scene.cycles.preview_samples
self.savedCyclesRenderSampling = context.scene.cycles.samples

# Save & Set - Bloom
self.savedUseBloom = eevee.use_bloom

Expand Down Expand Up @@ -199,6 +202,9 @@ def export_refresh(self, context) -> None:
scene.display.viewport_aa = self.savedWorkbenchVPSampling
scene.eevee.taa_render_samples = self.savedEeveeRenderSampling
scene.eevee.taa_samples = self.savedEeveeSampling

self.savedCyclesSampling = context.scene.cycles.preview_samples
self.savedCyclesRenderSampling = context.scene.cycles.samples

# Refresh - Bloom
scene.eevee.use_bloom = self.savedUseBloom
Expand Down Expand Up @@ -313,8 +319,13 @@ def normals_setup(self, context) -> None:
scene = context.scene
render = scene.render

render.engine = 'BLENDER_EEVEE'
scene.eevee.taa_render_samples = scene.eevee.taa_samples = scene.grabDoc.samplesNormals
if scene.grabDoc.engineNormals == 'blender_eevee':
scene.eevee.taa_render_samples = scene.eevee.taa_samples = scene.grabDoc.samplesNormals
else: # Cycles
scene.cycles.samples = scene.cycles.preview_samples = scene.grabDoc.samplesCyclesNormals

render.engine = str(scene.grabDoc.engineNormals).upper()

scene.display_settings.display_device = 'None'

ng_normal = bpy.data.node_groups["GD_Normal"]
Expand Down Expand Up @@ -473,8 +484,13 @@ def albedo_setup(self, context) -> None:
scene = context.scene
render = scene.render

render.engine = 'BLENDER_EEVEE'
scene.eevee.taa_render_samples = scene.eevee.taa_samples = scene.grabDoc.samplesAlbedo
if scene.grabDoc.engineAlbedo == 'blender_eevee':
scene.eevee.taa_render_samples = scene.eevee.taa_samples = scene.grabDoc.samplesAlbedo
else: # Cycles
scene.cycles.samples = scene.cycles.preview_samples = scene.grabDoc.samplesCyclesAlbedo

render.engine = str(scene.grabDoc.engineAlbedo).upper()

scene.display_settings.display_device = 'sRGB'

add_ng_to_mat(self, context, setup_type='GD_Albedo')
Expand All @@ -485,8 +501,13 @@ def roughness_setup(self, context) -> None:
scene = context.scene
render = scene.render

render.engine = 'BLENDER_EEVEE'
scene.eevee.taa_render_samples = scene.eevee.taa_samples = scene.grabDoc.samplesRoughness
if scene.grabDoc.engineRoughness == 'blender_eevee':
scene.eevee.taa_render_samples = scene.eevee.taa_samples = scene.grabDoc.samplesRoughness
else: # Cycles
scene.cycles.samples = scene.cycles.preview_samples = scene.grabDoc.samplesCyclesRoughness

render.engine = str(scene.grabDoc.engineRoughness).upper()

scene.display_settings.display_device = 'sRGB'

add_ng_to_mat(self, context, setup_type='GD_Roughness')
Expand All @@ -497,8 +518,13 @@ def metalness_setup(self, context) -> None:
scene = context.scene
render = scene.render

render.engine = 'BLENDER_EEVEE'
scene.eevee.taa_render_samples = scene.eevee.taa_samples = scene.grabDoc.samplesMetalness
if scene.grabDoc.engineMetalness == 'blender_eevee':
scene.eevee.taa_render_samples = scene.eevee.taa_samples = scene.grabDoc.samplesMetalness
else: # Cycles
scene.cycles.samples = scene.cycles.preview_samples = scene.grabDoc.samplesMetalness

render.engine = str(scene.grabDoc.engineMetalness).upper()

scene.display_settings.display_device = 'sRGB'

add_ng_to_mat(self, context, setup_type='GD_Metalness')
Expand Down
136 changes: 55 additions & 81 deletions operators.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,16 +500,15 @@ class GRABDOC_OT_map_preview(OpInfo, Operator):
def modal(self, context, event):
scene = context.scene
grabDoc = scene.grabDoc
view_settings = scene.view_settings
scene_shading = bpy.data.scenes[str(scene.name)].display.shading
eevee = scene.eevee

scene.camera = bpy.data.objects["GD_Trim Camera"]
if scene.camera != bpy.data.objects["GD_Trim Camera"]:
scene.camera = bpy.data.objects["GD_Trim Camera"]

# Set - Exporter settings
image_settings = scene.render.image_settings

if not grabDoc.collRendered: # If background plane not visible in render, create alpha channel

# If background plane not visible in render, enable alpha channel
if not grabDoc.collRendered:
scene.render.film_transparent = True

image_settings.color_mode = 'RGBA'
Expand All @@ -518,112 +517,88 @@ def modal(self, context, event):

image_settings.color_mode = 'RGB'

# Get correct file format and color depth
image_settings.file_format = grabDoc.imageType

if grabDoc.imageType == 'OPEN_EXR':
image_settings.color_depth = grabDoc.colorDepthEXR

elif grabDoc.imageType != 'TARGA':
image_settings.color_depth = grabDoc.colorDepth

if self.preview_type == "normals":
eevee.taa_render_samples = eevee.taa_samples = grabDoc.samplesNormals

elif self.preview_type == "curvature":
scene.display.render_aa = scene.display.viewport_aa = grabDoc.samplesCurvature
# Bake map specific settings that are forcibly kept in check
# TODO update the node group input values for Mixed Normal
view_settings = scene.view_settings

if self.preview_type == "curvature":
view_settings.look = grabDoc.contrastCurvature.replace('_', ' ')

bpy.data.objects["GD_Background Plane"].color[3] = .9999

# Refresh specific settings
if self.done:
curvature_refresh(self, context)

elif self.preview_type == "occlusion":
eevee.taa_render_samples = eevee.taa_samples = grabDoc.samplesOcclusion

view_settings.look = grabDoc.contrastOcclusion.replace('_', ' ')

ao_node = bpy.data.node_groups["GD_Ambient Occlusion"].nodes.get('Ambient Occlusion')
ao_node.inputs[1].default_value = grabDoc.distanceOcclusion

# Refresh specific settings
if self.done:
occlusion_refresh(self, context)
#ao_node = bpy.data.node_groups["GD_Ambient Occlusion"].nodes.get('Ambient Occlusion')
#ao_node.inputs[1].default_value = grabDoc.distanceOcclusion

elif self.preview_type == "height":
eevee.taa_render_samples = eevee.taa_samples = grabDoc.samplesHeight

view_settings.look = grabDoc.contrastHeight.replace('_', ' ')

elif self.preview_type == "ID":
scene.display.render_aa = scene.display.viewport_aa = grabDoc.samplesMatID
scene.display.shading.color_type = grabDoc.methodMatID

# Choose the method of ID creation based on user preference
scene_shading.color_type = grabDoc.methodMatID
# Exit check
if not grabDoc.modalState or event.type in {'ESC'} or not proper_scene_setup():
self.modal_cleanup(context)
return {'CANCELLED'}
return {'PASS_THROUGH'}

elif self.preview_type == "alpha":
eevee.taa_render_samples = eevee.taa_samples = grabDoc.samplesAlpha
def modal_cleanup(self, context) -> None:
grabDoc = context.scene.grabDoc

elif self.preview_type == "albedo":
eevee.taa_render_samples = eevee.taa_samples = grabDoc.samplesAlbedo
grabDoc.modalState = False

elif self.preview_type == "roughness":
eevee.taa_render_samples = eevee.taa_samples = grabDoc.samplesRoughness
bpy.types.SpaceView3D.draw_handler_remove(self._handle, 'WINDOW')

if self.preview_type == "normals":
cleanup_ng_from_mat('GD_Normal')
elif self.preview_type == "curvature":
curvature_refresh(self, context)
elif self.preview_type == "occlusion":
occlusion_refresh(self, context)
cleanup_ng_from_mat('GD_Ambient Occlusion')
elif self.preview_type == "height":
cleanup_ng_from_mat('GD_Height')
elif self.preview_type == "alpha":
cleanup_ng_from_mat('GD_Alpha')
elif self.preview_type == "albedo":
cleanup_ng_from_mat('GD_Albedo')
elif self.preview_type == "roughness":
cleanup_ng_from_mat('GD_Roughness')
elif self.preview_type == "metalness":
eevee.taa_render_samples = eevee.taa_samples = grabDoc.samplesMetalness
cleanup_ng_from_mat('GD_Metalness')

# TODO update the node group input values for Mixed Normal
export_refresh(self, context)

# Exiting
if self.done:
bpy.types.SpaceView3D.draw_handler_remove(self._handle, 'WINDOW')

if self.preview_type == "normals":
cleanup_ng_from_mat('GD_Normal')
elif self.preview_type == "occlusion":
cleanup_ng_from_mat('GD_Ambient Occlusion')
elif self.preview_type == "height":
cleanup_ng_from_mat('GD_Height')
elif self.preview_type == "alpha":
cleanup_ng_from_mat('GD_Alpha')
elif self.preview_type == "albedo":
cleanup_ng_from_mat('GD_Albedo')
elif self.preview_type == "roughness":
cleanup_ng_from_mat('GD_Roughness')
elif self.preview_type == "metalness":
cleanup_ng_from_mat('GD_Metalness')

export_refresh(self, context)

# Refresh - Current workspace shading type
for area in context.screen.areas:
# Refresh - Current workspace shading type
for area in context.screen.areas:
if area.type == 'VIEW_3D':
for space in area.spaces:
space.shading.type = self.saved_render_view
break

# Refresh - Original workspace shading type
for screen in bpy.data.workspaces[self.savedOriginalWorkspace].screens:
for area in screen.areas:
if area.type == 'VIEW_3D':
for space in area.spaces:
space.shading.type = self.saved_render_view
break

# Refresh - Original workspace shading type
for screen in bpy.data.workspaces[self.savedOriginalWorkspace].screens:
for area in screen.areas:
if area.type == 'VIEW_3D':
for space in area.spaces:
space.shading.type = self.saved_render_view
break

grabDoc.bakerType = self.savedBakerType

# Check for auto exit camera option (Keep this at the end of the stack to avoid pop in)
if grabDoc.autoExitCamera or not proper_scene_setup():
bpy.ops.grab_doc.view_cam(from_modal=True)
return {'CANCELLED'}

# Exit checking
if not grabDoc.modalState or event.type in {'ESC'} or not proper_scene_setup():
bpy.ops.grab_doc.leave_modal()
self.done = True
return {'PASS_THROUGH'}
grabDoc.bakerType = self.savedBakerType

# Check for auto exit camera option (Keep this at the end of the stack to avoid pop in)
if grabDoc.autoExitCamera or not proper_scene_setup():
bpy.ops.grab_doc.view_cam(from_modal=True)

def execute(self, context):
grabDoc = context.scene.grabDoc
Expand All @@ -634,7 +609,6 @@ def execute(self, context):
self.report({'ERROR'}, report_string)
return{'CANCELLED'}

self.done = False
grabDoc.modalState = True

if bpy.ops.object.mode_set.poll():
Expand Down
Loading

0 comments on commit 328ef93

Please sign in to comment.