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

Add "None" as a lightmap option 

Add Target testing for LogVisor
This commit is contained in:
Phillip Stephens 2015-10-30 13:03:20 -07:00
parent 7ccec951e3
commit dcd0515f04
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,26 @@ def preview_update(self, context):
bpy.data.textures[material.hecl_lightmap].image = bpy.data.images[img_name] bpy.data.textures[material.hecl_lightmap].image = bpy.data.images[img_name]
else: else:
bpy.data.textures[material.hecl_lightmap].image = None bpy.data.textures[material.hecl_lightmap].image = None
# White Lightmaps
elif area_data.lightmap_mode == 'NONE':
img_name = 'NONE'
img = None
if img_name in bpy.data.images:
img = bpy.data.images[img_name]
else:
img = bpy.data.images.new(img_name, width=1, height=1)
pixels = [1.0] * (4 * 1 * 1)
img.pixels = pixels
img.use_fake_user = True
img.file_format = 'PNG'
for material in bpy.data.materials:
if material.hecl_lightmap != '':
material.use_shadeless = False
# Reference NONE
if material.hecl_lightmap in bpy.data.textures:
bpy.data.textures[material.hecl_lightmap].image = img
# Update lightmap output-resolution # Update lightmap output-resolution
@ -79,6 +99,7 @@ class SREAData(bpy.types.PropertyGroup):
lightmap_mode = bpy.props.EnumProperty(name="HECL Area Lightmap Mode", lightmap_mode = bpy.props.EnumProperty(name="HECL Area Lightmap Mode",
description="Simple way to manipulate all lightmap-using materials", description="Simple way to manipulate all lightmap-using materials",
items=[ items=[
('NONE', "None", "Pure white lightmaps"),
('ORIGINAL', "Original", "Original extracted lightmaps"), ('ORIGINAL', "Original", "Original extracted lightmaps"),
('CYCLES', "Cycles", "Blender-rendered lightmaps")], ('CYCLES', "Cycles", "Blender-rendered lightmaps")],
update=preview_update, update=preview_update,
@ -393,6 +414,7 @@ def draw(layout, context):
layout.label("Lighting:", icon='LAMP_SPOT') layout.label("Lighting:", icon='LAMP_SPOT')
light_row = layout.row(align=True) 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', 'ORIGINAL')
light_row.prop_enum(context.scene.hecl_srea_data, 'lightmap_mode', 'CYCLES') light_row.prop_enum(context.scene.hecl_srea_data, 'lightmap_mode', 'CYCLES')
layout.prop(context.scene.hecl_srea_data, 'lightmap_resolution', text="Resolution") layout.prop(context.scene.hecl_srea_data, 'lightmap_resolution', text="Resolution")

2
hecl/extern/CMakeLists.txt vendored
View File

@ -1,5 +1,7 @@
add_subdirectory(libSquish) add_subdirectory(libSquish)
add_subdirectory(xxhash) add_subdirectory(xxhash)
if (NOT TARGET LogVisor)
add_subdirectory(LogVisor) add_subdirectory(LogVisor)
endif()
add_subdirectory(Athena) add_subdirectory(Athena)
add_subdirectory(libpng) add_subdirectory(libpng)