AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add adjacent area lightmap cooking

This commit is contained in:
Jack Andersen 2018-04-08 14:08:33 -10:00
parent 396790181a
commit 2c5a662fec
3 changed files with 251 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

360
hecl/blender/hecl/srea/__init__.py
View File

@ -2,7 +2,8 @@ import bpy
from bpy.app.handlers import persistent
from mathutils import Quaternion, Color
import math
from .. import Nodegrid
import os.path
from .. import Nodegrid, swld
# Preview update func (for lighting preview)
def preview_update(self, context):
@ -12,7 +13,7 @@ def preview_update(self, context):
# Original Lightmaps
if area_data.lightmap_mode == 'ORIGINAL':
for material in bpy.data.materials:
if material.hecl_lightmap != '':
if material.hecl_lightmap:
material.use_shadeless = False
# Reference original game lightmaps
@ -26,7 +27,7 @@ def preview_update(self, context):
# Cycles Lightmaps
elif area_data.lightmap_mode == 'CYCLES':
for material in bpy.data.materials:
if material.hecl_lightmap != '':
if material.hecl_lightmap:
material.use_shadeless = False
# Reference newly-generated lightmaps
@ -50,7 +51,7 @@ def preview_update(self, context):
img.file_format = 'PNG'
for material in bpy.data.materials:
if material.hecl_lightmap != '':
if material.hecl_lightmap:
material.use_shadeless = False
# Reference NONE
@ -63,7 +64,7 @@ def set_lightmap_resolution(self, context):
area_data = context.scene.hecl_srea_data
pixel_size = int(area_data.lightmap_resolution)
for mat in bpy.data.materials:
if mat.hecl_lightmap == '':
if not mat.hecl_lightmap:
continue
# Determine proportional aspect
@ -85,6 +86,130 @@ def set_lightmap_resolution(self, context):
if image:
image.scale(width, height)
def make_or_load_cycles_image(mat, area_data):
if not mat.hecl_lightmap:
return
pixel_size = int(area_data.lightmap_resolution)
tex_name = mat.hecl_lightmap + '_CYCLES'
if area_data.adjacent_area < 0:
path_name = '//' + mat.hecl_lightmap + '_CYCLES.png'
else:
path_name = '//' + mat.hecl_lightmap + '_CYCLES_%d.png' % area_data.adjacent_area
# Determine proportional aspect
old_image = bpy.data.images[mat.hecl_lightmap]
width_fac = 1
height_fac = 1
if old_image.size[0] > old_image.size[1]:
height_fac = old_image.size[0] // old_image.size[1]
else:
width_fac = old_image.size[1] // old_image.size[0]
width = pixel_size // width_fac
height = pixel_size // height_fac
# Check for consistency with on-disk image
if tex_name in bpy.data.images:
image = bpy.data.images[tex_name]
image.use_fake_user = True
image.file_format = 'PNG'
image.filepath = path_name
good = True
if image.size[0] != width or image.size[1] != height:
try:
image.scale(width, height)
except:
good = False
if good:
return image
# Remove and recreate if we get here
bpy.data.images.remove(bpy.data.images[tex_name])
# New image (or load from disk if available)
try:
new_image = bpy.data.images.load(path_name)
new_image.name = tex_name
new_image.use_fake_user = True
if new_image.size[0] != width or new_image.size[1] != height:
new_image.scale(width, height)
except:
new_image = bpy.data.images.new(tex_name, width, height)
new_image.use_fake_user = True
new_image.file_format = 'PNG'
new_image.filepath = path_name
return new_image
# Set adjacent area lightmaps
def set_adjacent_area(self, context):
bg_scene = context.scene.background_set
dock_idx = context.scene.hecl_srea_data.adjacent_area
if bg_scene is None:
self.report({'ERROR_INVALID_CONTEXT'}, 'No background world scene is set')
return
if bg_scene.hecl_type != 'WORLD':
self.report({'ERROR_INVALID_CONTEXT'}, 'Scene "%s" is not a hecl WORLD' % bg_scene.name)
return
adjacent = dock_idx >= 0
if len(context.scene.render.layers):
context.scene.render.layers[0].use_sky = not adjacent
# Remove linked lamps and show/hide locals
for obj in bpy.data.objects:
if obj.library is not None and (obj.type == 'LAMP' or obj.type == 'MESH'):
try:
context.scene.objects.unlink(obj)
except:
pass
continue
if obj.type == 'LAMP':
obj.hide_render = adjacent
# Remove linked scenes
to_remove = []
for scene in bpy.data.scenes:
if scene.hecl_type == 'AREA' and scene.library is not None:
to_remove.append(scene)
for scene in to_remove:
bpy.data.scenes.remove(scene)
# Link scene, meshes, and lamps
if dock_idx >= 0:
other_area_name = get_other_area_name(self, bg_scene, dock_idx)
if other_area_name is None:
return
other_area_scene_name = None
this_dir = os.path.split(bpy.data.filepath)[0]
try:
with bpy.data.libraries.load('%s/../%s/!area.blend' % (this_dir, other_area_name),
link=True, relative=True) as (data_from, data_to):
for scene in data_from.scenes:
other_area_scene_name = scene
data_to.scenes = [other_area_scene_name]
break
except Exception as e:
self.report({'ERROR_INVALID_CONTEXT'}, 'Unable to open "%s" blend file: %s' % (other_area_name, str(e)))
return
if other_area_scene_name is None:
self.report({'ERROR_INVALID_CONTEXT'}, '"%s" does not have an area scene' % other_area_name)
return
other_scene = bpy.data.scenes[other_area_scene_name]
if other_scene.hecl_type != 'AREA':
self.report({'ERROR_INVALID_CONTEXT'}, '"%s" does not have an area scene' % other_area_name)
bpy.data.scenes.remove(other_scene)
return
for obj in other_scene.objects:
if (obj.type == 'LAMP' or obj.type == 'MESH') and obj.layers[0]:
context.scene.objects.link(obj)
obj.hide_render = False
# Ensure filepaths target the current dock index
for mat in bpy.data.materials:
if not mat.library and mat.use_nodes and 'CYCLES_OUT' in mat.node_tree.nodes:
texture_node = mat.node_tree.nodes['CYCLES_OUT']
texture_node.image = make_or_load_cycles_image(mat, context.scene.hecl_srea_data)
# Area data class
class SREAData(bpy.types.PropertyGroup):
lightmap_resolution = bpy.props.EnumProperty(name="HECL Area Lightmap Resolution",
@ -107,6 +232,16 @@ class SREAData(bpy.types.PropertyGroup):
update=preview_update,
default='ORIGINAL')
adjacent_area = bpy.props.IntProperty(name="HECL Adjacent Area Lightmap",
description="Dock index of adjacent area to render, or -1 for local lights",
update=set_adjacent_area,
default=-1,
min=-1,
max=8)
def report(self, code, string):
pass
# Trace color output searching for material node and making list from it
def recursive_build_material_chain(node):
if node.type == 'OUTPUT':
@ -179,7 +314,7 @@ def tex_node_from_node(node):
# Delete existing cycles nodes and convert from GLSL nodes
CYCLES_TYPES = {'OUTPUT_MATERIAL', 'ADD_SHADER', 'BSDF_DIFFUSE', 'BSDF_TRANSPARENT',
'EMISSION', 'MIX_SHADER', 'TEX_IMAGE'}
def initialize_nodetree_cycles(mat, pixel_size):
def initialize_nodetree_cycles(mat, area_data):
nt = mat.node_tree
to_remove = set()
for node in nt.nodes:
@ -192,9 +327,7 @@ def initialize_nodetree_cycles(mat, pixel_size):
gridder = Nodegrid.Nodegrid(nt, cycles=True)
image_out_node = None
if mat.hecl_lightmap != '':
if mat.hecl_lightmap and not mat.library:
# Get name of lightmap texture
if mat.hecl_lightmap in bpy.data.textures:
img_name = mat.hecl_lightmap
@ -203,40 +336,14 @@ def initialize_nodetree_cycles(mat, pixel_size):
else:
bpy.data.textures[mat.hecl_lightmap].image = None
# Determine if image already established
new_image = None
tex_name = mat.hecl_lightmap + '_CYCLES'
if tex_name in bpy.data.images:
new_image = bpy.data.images[tex_name]
else:
# New image; determine proportional aspect
old_image = bpy.data.images[mat.hecl_lightmap]
width_fac = 1
height_fac = 1
if old_image.size[0] > old_image.size[1]:
height_fac = old_image.size[0] // old_image.size[1]
else:
width_fac = old_image.size[1] // old_image.size[0]
# Make or load image established in filesystem
new_path = '//' + mat.hecl_lightmap + '_CYCLES.png'
try:
new_image = bpy.data.images.load(new_path)
new_image.name = tex_name
new_image.use_fake_user = True
except:
new_image = bpy.data.images.new(tex_name, pixel_size // width_fac, pixel_size // height_fac)
new_image.use_fake_user = True
new_image.file_format = 'PNG'
new_image.filepath = new_path
# Get image already established or make new one
new_image = make_or_load_cycles_image(mat, area_data)
image_out_node = nt.nodes.new('ShaderNodeTexImage')
image_out_node.name = 'CYCLES_OUT'
gridder.place_node(image_out_node, 3)
image_out_node.image = new_image
if mat.game_settings.alpha_blend == 'ADD':
transp = nt.nodes.new('ShaderNodeBsdfTransparent')
gridder.place_node(transp, 2)
@ -262,25 +369,23 @@ def initialize_nodetree_cycles(mat, pixel_size):
if chain:
diffuse_soc, emissive_soc = get_de_sockets(chain)
tex_node = tex_node_from_node(diffuse_soc.node)
diffuse_image_node = nt.nodes.new('ShaderNodeTexImage')
gridder.place_node(diffuse_image_node, 1)
diffuse_image_node.image = tex_node.texture.image
mixrgb_node = nt.nodes.new('ShaderNodeMixRGB')
gridder.place_node(mixrgb_node, 1)
mixrgb_node.inputs[1].default_value = (1.0,1.0,1.0,1.0)
mapping = nt.nodes.new('ShaderNodeMapping')
gridder.place_node(mapping, 1)
mapping.vector_type = 'TEXTURE'
mapping.translation = (1.0,1.0,0.0)
mapping.scale = (2.0,2.0,1.0)
nt.links.new(diffuse_image_node.outputs[0], diffuse.inputs[0])
nt.links.new(diffuse_image_node.outputs[0], mixrgb_node.inputs[2])
if nt.nodes['Output'].inputs[1].is_linked:
nt.links.new(nt.nodes['Output'].inputs[1].links[0].from_socket, mix_shader.inputs[0])
nt.links.new(nt.nodes['Output'].inputs[1].links[0].from_socket, mixrgb_node.inputs[0])
nt.links.new(mixrgb_node.outputs[0], transp.inputs[0])
nt.links.new(tex_node.inputs[0].links[0].from_socket, mapping.inputs[0])
nt.links.new(mapping.outputs[0], diffuse_image_node.inputs[0])
if tex_node and tex_node.inputs[0].links[0].from_socket.name == 'UV':
diffuse_image_node = nt.nodes.new('ShaderNodeTexImage')
gridder.place_node(diffuse_image_node, 1)
diffuse_image_node.image = tex_node.texture.image
mixrgb_node = nt.nodes.new('ShaderNodeMixRGB')
gridder.place_node(mixrgb_node, 1)
mixrgb_node.inputs[1].default_value = (1.0,1.0,1.0,1.0)
mapping = nt.nodes.new('ShaderNodeUVMap')
gridder.place_node(mapping, 1)
mapping.uv_map = tex_node.inputs[0].links[0].from_node.uv_layer
nt.links.new(diffuse_image_node.outputs[0], diffuse.inputs[0])
nt.links.new(diffuse_image_node.outputs[0], mixrgb_node.inputs[2])
if nt.nodes['Output'].inputs[1].is_linked:
nt.links.new(nt.nodes['Output'].inputs[1].links[0].from_socket, mix_shader.inputs[0])
nt.links.new(nt.nodes['Output'].inputs[1].links[0].from_socket, mixrgb_node.inputs[0])
nt.links.new(mixrgb_node.outputs[0], transp.inputs[0])
nt.links.new(mapping.outputs[0], diffuse_image_node.inputs[0])
else:
# Classify connected opaque textures
@ -290,19 +395,16 @@ def initialize_nodetree_cycles(mat, pixel_size):
emissive_soc = None
if diffuse_soc:
tex_node = tex_node_from_node(diffuse_soc.node)
if tex_node:
if tex_node and tex_node.inputs[0].links[0].from_socket.name == 'UV':
diffuse_image_node = nt.nodes.new('ShaderNodeTexImage')
gridder.place_node(diffuse_image_node, 1)
diffuse_image_node.image = tex_node.texture.image
mapping = nt.nodes.new('ShaderNodeMapping')
mapping = nt.nodes.new('ShaderNodeUVMap')
gridder.place_node(mapping, 1)
mapping.vector_type = 'TEXTURE'
mapping.translation = (1.0,1.0,0.0)
mapping.scale = (2.0,2.0,1.0)
mapping.uv_map = tex_node.inputs[0].links[0].from_node.uv_layer
diffuse = nt.nodes.new('ShaderNodeBsdfDiffuse')
gridder.place_node(diffuse, 2)
nt.links.new(diffuse_image_node.outputs[0], diffuse.inputs[0])
nt.links.new(tex_node.inputs[0].links[0].from_socket, mapping.inputs[0])
nt.links.new(mapping.outputs[0], diffuse_image_node.inputs[0])
else:
diffuse = nt.nodes.new('ShaderNodeBsdfDiffuse')
@ -325,7 +427,7 @@ def initialize_nodetree_cycles(mat, pixel_size):
elif emissive_soc:
nt.links.new(emissive.outputs[0], material_output.inputs[0])
# Lightmap render operator
# Lightmap setup operator
class SREAInitializeCycles(bpy.types.Operator):
bl_idname = "scene.hecl_area_initialize_cycles"
bl_label = "HECL Initialize Cycles"
@ -333,22 +435,83 @@ class SREAInitializeCycles(bpy.types.Operator):
@classmethod
def poll(cls, context):
return (context.scene is not None and context.scene.hecl_type == 'AREA')
return context.scene is not None and context.scene.hecl_type == 'AREA'
def execute(self, context):
area_data = context.scene.hecl_srea_data
# Iterate materials and setup cycles
for mat in bpy.data.materials:
if mat.use_nodes:
initialize_nodetree_cycles(mat, area_data)
return {'FINISHED'}
def invoke(self, context, event):
return context.window_manager.invoke_confirm(self, event)
# Lookup the directory name of other area via dock link
def get_other_area_name(op, bg_scene, dock_idx):
dock_conns = swld.build_dock_connections(bg_scene)
this_dir = os.path.split(bpy.data.filepath)[0]
this_area_name = os.path.basename(this_dir)
wld_area = next((area for area in dock_conns[0] if area[0].name == this_area_name), None)
if wld_area is None:
op.report({'ERROR_INVALID_CONTEXT'}, 'Unable to resolve area in world')
return None
if dock_idx not in range(len(wld_area[1])):
op.report({'ERROR_INVALID_CONTEXT'}, 'Dock %d is out of this area\'s range [0,%d]' %
(dock_idx, len(wld_area[1])))
return None
dock_obj = wld_area[1][dock_idx]
if dock_obj.name not in dock_conns[1]:
op.report({'ERROR_INVALID_CONTEXT'}, 'Unable to find sister dock for %s' % dock_obj.name)
return None
other_wld_area = dock_conns[1][dock_obj.name][2].parent
if other_wld_area is None:
op.report({'ERROR_INVALID_CONTEXT'}, '%s does not have a parent area' % dock_obj.name)
return None
return other_wld_area.name
# Shared lightmap render procedure
def render_lightmaps(context):
if context.scene is not None:
area_data = context.scene.hecl_srea_data
# Resolution
pixel_size = int(area_data.lightmap_resolution)
# Mmm Cycles
context.scene.render.engine = 'CYCLES'
context.scene.render.bake.margin = pixel_size // 256
# Iterate materials and setup cycles
for mat in bpy.data.materials:
if mat.use_nodes:
initialize_nodetree_cycles(mat, pixel_size)
return {'FINISHED'}
# Set bake target node active
if 'CYCLES_OUT' in mat.node_tree.nodes:
mat.node_tree.nodes.active = mat.node_tree.nodes['CYCLES_OUT']
else:
image_out_node = mat.node_tree.nodes.new('ShaderNodeTexImage')
mat.node_tree.nodes.active = image_out_node
image_out_node.name = 'CYCLES_OUT'
if 'FAKE' in bpy.data.images:
image_out_node.image = bpy.data.images['FAKE']
else:
fake_img = bpy.data.images.new('FAKE', 1, 1)
image_out_node.image = fake_img
def invoke(self, context, event):
return context.window_manager.invoke_confirm(self, event)
# Iterate mesh objects and set UV 0 as the active UV layer
for obj in context.scene.objects:
if obj.type == 'MESH':
if not len(obj.data.uv_textures):
continue
# Make correct UV layer active
obj.data.uv_textures.active_index = 0
# Make lightmaps
bpy.ops.object.bake('INVOKE_DEFAULT', type='DIFFUSE', pass_filter={'DIRECT', 'INDIRECT'})
# Lightmap render operator
class SREARenderLightmaps(bpy.types.Operator):
@ -361,48 +524,13 @@ class SREARenderLightmaps(bpy.types.Operator):
return context.scene is not None
def execute(self, context):
if not bpy.ops.object.bake.poll():
self.report({'ERROR_INVALID_CONTEXT'}, 'One or more mesh objects must be selected; nothing else')
return {'CANCELLED'}
if context.scene is not None:
area_data = context.scene.hecl_srea_data
# Resolution
pixel_size = int(area_data.lightmap_resolution)
# Mmm Cycles
context.scene.render.engine = 'CYCLES'
context.scene.render.bake.margin = pixel_size // 256
# Iterate materials and setup cycles
for mat in bpy.data.materials:
if mat.use_nodes:
# Set bake target node active
if 'CYCLES_OUT' in mat.node_tree.nodes:
mat.node_tree.nodes.active = mat.node_tree.nodes['CYCLES_OUT']
else:
image_out_node = mat.node_tree.nodes.new('ShaderNodeTexImage')
mat.node_tree.nodes.active = image_out_node
image_out_node.name = 'CYCLES_OUT'
if 'FAKE' in bpy.data.images:
image_out_node.image = bpy.data.images['FAKE']
else:
fake_img = bpy.data.images.new('FAKE', 1, 1)
image_out_node.image = fake_img
# Iterate mesh objects and set UV 0 as the active UV layer
if not context.selected_objects:
for obj in context.scene.objects:
if obj.type == 'MESH':
if obj.type == 'MESH' and not obj.library:
obj.select = True
context.scene.objects.active = obj
if not len(obj.data.uv_textures):
continue
# Make correct UV layer active
obj.data.uv_textures.active_index = 0
# Make lightmaps
bpy.ops.object.bake('INVOKE_DEFAULT', type='DIFFUSE', pass_filter={'DIRECT'})
render_lightmaps(context)
return {'FINISHED'}
@ -451,7 +579,7 @@ def render_pvs(pathOut, location):
cam.angle = math.radians(90.0)
mat_idx = 0
for obj in bpy.data.objects:
for obj in bpy.context.scene.objects:
if obj.type == 'MESH':
if obj.name == 'CMESH':
continue
@ -475,9 +603,9 @@ def render_pvs(pathOut, location):
# Render PVS for light
def render_pvs_light(pathOut, lightName):
if lightName not in bpy.data.objects:
if lightName not in bpy.context.scene.objects:
raise RuntimeError('Unable to find light %s' % lightName)
render_pvs(pathOut, bpy.data.objects[lightName].location)
render_pvs(pathOut, bpy.context.scene.objects[lightName].location)
# Cook
def cook(writebuffunc, platform, endianchar):
@ -486,15 +614,15 @@ def cook(writebuffunc, platform, endianchar):
# Panel draw
def draw(layout, context):
area_data = context.scene.hecl_srea_data
layout.label("Lighting:", icon='LAMP_SPOT')
light_row = layout.row(align=True)
light_row.prop_enum(context.scene.hecl_srea_data, 'lightmap_mode', 'NONE')
light_row.prop_enum(context.scene.hecl_srea_data, 'lightmap_mode', 'ORIGINAL')
light_row.prop_enum(context.scene.hecl_srea_data, 'lightmap_mode', 'CYCLES')
layout.prop(context.scene.hecl_srea_data, 'lightmap_resolution', text="Resolution")
light_row.prop_enum(area_data, 'lightmap_mode', 'NONE')
light_row.prop_enum(area_data, 'lightmap_mode', 'ORIGINAL')
light_row.prop_enum(area_data, 'lightmap_mode', 'CYCLES')
layout.prop(area_data, 'lightmap_resolution', text="Resolution")
layout.menu("CYCLES_MT_sampling_presets", text=bpy.types.CYCLES_MT_sampling_presets.bl_label)
layout.prop(context.scene.render.bake, "use_clear", text="Clear Before Baking")
layout.prop(area_data, 'adjacent_area', text='Adjacent Dock Index', icon='OOPS')
layout.operator("scene.hecl_area_initialize_cycles", text="Initialize Cycles Nodes", icon='NODETREE')
layout.operator("scene.hecl_area_render_lightmaps", text="Bake Cycles Lightmaps", icon='RENDER_STILL')
layout.operator("image.save_dirty", text="Save Lightmaps", icon='FILE_TICK')

6
hecl/blender/hecl/swld/__init__.py
View File

@ -1,11 +1,11 @@
import bpy, struct
from mathutils import Vector
def build_dock_connections():
def build_dock_connections(scene):
areas = []
docks = []
for obj in sorted(bpy.context.scene.objects, key=lambda x: x.name):
for obj in sorted(scene.objects, key=lambda x: x.name):
if obj.type == 'MESH' and obj.parent is None:
dock_list = []
for ch in obj.children:
@ -36,7 +36,7 @@ def build_dock_connections():
# Cook
def cook(writebuf):
areas, dock_conns = build_dock_connections()
areas, dock_conns = build_dock_connections(bpy.context.scene)
writebuf(struct.pack('I', len(areas)))
for area in areas:
obj = area[0]

6
hecl/lib/Blender/Connection.cpp
View File

@ -265,7 +265,8 @@ static bool RegFileExists(const hecl::SystemChar* path)
Connection::Connection(int verbosityLevel)
{
#if !WINDOWS_STORE
BlenderLog.report(logvisor::Info, "Establishing BlenderConnection...");
if (hecl::VerbosityLevel >= 1)
BlenderLog.report(logvisor::Info, "Establishing BlenderConnection...");
/* Put hecl_blendershell.py in temp dir */
const SystemChar* TMPDIR = GetTmpDir();
@ -2401,7 +2402,8 @@ void Token::shutdown()
{
m_conn->quitBlender();
m_conn.reset();
BlenderLog.report(logvisor::Info, "Blender Shutdown Successful");
if (hecl::VerbosityLevel >= 1)
BlenderLog.report(logvisor::Info, "Blender Shutdown Successful");
}
}