@ -193,9 +193,8 @@ class MaterialConverter:
# being a waveset, doublesided, etc. # being a waveset, doublesided, etc.
single_user = self . _requires_single_user ( bo , bm ) single_user = self . _requires_single_user ( bo , bm )
if single_user : if single_user :
mat_name = " {} _AutoSingle " . format ( bm . name ) if bo . name == bm . name else " {} _ {} " . format ( bo . name , bm . name ) mat_name = f " { bm . name } _AutoSingle " if bo . name == bm . name else f " { bo . name } _ { bm . name } "
self . _report . msg ( " Exporting Material ' {} ' as single user ' {} ' " , bm . name , mat_name , indent = 1 ) self . _report . msg ( f " Exporting Material ' { bm . name } ' as single user ' { mat_name } ' " )
hgmat = None
else : else :
# Ensure that RT-lit objects don't infect the static-lit objects. # Ensure that RT-lit objects don't infect the static-lit objects.
lighting_mod = bo . plasma_modifiers . lighting lighting_mod = bo . plasma_modifiers . lighting
@ -207,7 +206,7 @@ class MaterialConverter:
mat_prefix = " " mat_prefix = " "
mat_prefix2 = " NonVtxP_ " if self . _exporter ( ) . mesh . is_nonpreshaded ( bo , bm ) else " " mat_prefix2 = " NonVtxP_ " if self . _exporter ( ) . mesh . is_nonpreshaded ( bo , bm ) else " "
mat_name = " " . join ( ( mat_prefix , mat_prefix2 , bm . name ) ) mat_name = " " . join ( ( mat_prefix , mat_prefix2 , bm . name ) )
self . _report . msg ( " Exporting Material ' {} ' " , mat_name , indent = 1 ) self . _report . msg ( f " Exporting Material ' { mat_name } ' " )
hsgmat = self . _mgr . find_key ( hsGMaterial , name = mat_name , bl = bo ) hsgmat = self . _mgr . find_key ( hsGMaterial , name = mat_name , bl = bo )
if hsgmat is not None : if hsgmat is not None :
return hsgmat return hsgmat
@ -228,6 +227,7 @@ class MaterialConverter:
restart_pass_next = False restart_pass_next = False
# Loop over layers # Loop over layers
with self . _report . indent ( ) :
for idx , slot in slots : for idx , slot in slots :
# Prepend any BumpMapping magic layers # Prepend any BumpMapping magic layers
if slot . use_map_normal : if slot . use_map_normal :
@ -293,7 +293,7 @@ class MaterialConverter:
layer . preshade = hsColorRGBA ( 0.0 , 0.0 , 0.0 , 1.0 ) layer . preshade = hsColorRGBA ( 0.0 , 0.0 , 0.0 , 1.0 )
layer . runtime = hsColorRGBA ( 1.0 , 1.0 , 1.0 , 1.0 ) layer . runtime = hsColorRGBA ( 1.0 , 1.0 , 1.0 , 1.0 )
self . export_prepared_image ( name = image_name , image = image , alpha_type = image_alpha , self . export_prepared_image ( name = image_name , image = image , alpha_type = image_alpha ,
owner = layer , allowed_formats = { " DDS " } , indent = 4 ) owner = layer , allowed_formats = { " DDS " } )
material = self . _mgr . add_object ( hsGMaterial , bl = bo , name = name ) material = self . _mgr . add_object ( hsGMaterial , bl = bo , name = name )
material . addLayer ( layer . key ) material . addLayer ( layer . key )
return material , layer return material , layer
@ -309,7 +309,7 @@ class MaterialConverter:
# exporting a DXT1 version. As of right now, opaque vs on_off does nothing, so we still # exporting a DXT1 version. As of right now, opaque vs on_off does nothing, so we still
# get some turd-alpha data. # get some turd-alpha data.
if image_alpha == TextureAlpha . full and not want_preshade : if image_alpha == TextureAlpha . full and not want_preshade :
self . _report . warn ( " Using an alpha texture with a non-alpha blend mode -- this may look bad " , indent = 3 ) self . _report . warn ( " Using an alpha texture with a non-alpha blend mode -- this may look bad " )
image_alpha = TextureAlpha . opaque image_alpha = TextureAlpha . opaque
image_name = " DECALPRINT_ {} " . format ( image . name ) image_name = " DECALPRINT_ {} " . format ( image . name )
else : else :
@ -326,14 +326,16 @@ class MaterialConverter:
if rt_key or pre_key : if rt_key or pre_key :
return pre_key , rt_key return pre_key , rt_key
self . _report . msg ( " Exporting Print Material ' {} ' " , rtname , indent = 3 ) self . _report . msg ( f " Exporting Print Material ' { rtname } ' " )
with self . _report . indent ( ) :
rt_material , rt_layer = make_print_material ( rtname ) rt_material , rt_layer = make_print_material ( rtname )
if blend == hsGMatState . kBlendMult : if blend == hsGMatState . kBlendMult :
rt_layer . state . blendFlags | = hsGMatState . kBlendInvertFinalColor rt_layer . state . blendFlags | = hsGMatState . kBlendInvertFinalColor
rt_key = rt_material . key rt_key = rt_material . key
if want_preshade : if want_preshade :
self . _report . msg ( " Exporting Print Material ' {} ' " , prename , indent = 3 ) self . _report . msg ( f " Exporting Print Material ' { prename } ' " )
with self . _report . indent ( ) :
pre_material , pre_layer = make_print_material ( prename ) pre_material , pre_layer = make_print_material ( prename )
pre_material . compFlags | = hsGMaterial . kCompNeedsBlendChannel pre_material . compFlags | = hsGMaterial . kCompNeedsBlendChannel
pre_layer . state . miscFlags | = hsGMatState . kMiscBindNext | hsGMatState . kMiscRestartPassHere pre_layer . state . miscFlags | = hsGMatState . kMiscBindNext | hsGMatState . kMiscRestartPassHere
@ -346,7 +348,8 @@ class MaterialConverter:
blend_layer . state . ZFlags = hsGMatState . kZNoZWrite blend_layer . state . ZFlags = hsGMatState . kZNoZWrite
blend_layer . ambient = hsColorRGBA ( 1.0 , 1.0 , 1.0 , 1.0 ) blend_layer . ambient = hsColorRGBA ( 1.0 , 1.0 , 1.0 , 1.0 )
pre_material . addLayer ( blend_layer . key ) pre_material . addLayer ( blend_layer . key )
self . export_alpha_blend ( " LINEAR " , " HORIZONTAL " , owner = blend_layer , indent = 4 ) with self . _report . indent ( ) :
self . export_alpha_blend ( " LINEAR " , " HORIZONTAL " , owner = blend_layer )
pre_key = pre_material . key pre_key = pre_material . key
else : else :
@ -354,10 +357,10 @@ class MaterialConverter:
return pre_key , rt_key return pre_key , rt_key
def export_waveset_material ( self , bo , bm ) : def export_waveset_material ( self , bo , bm ) :
self . _report . msg ( " Exporting WaveSet Material ' {} ' " , bm . name , indent = 1 ) self . _report . msg ( f " Exporting WaveSet Material ' { bm . name } ' " )
# WaveSets MUST have their own material # WaveSets MUST have their own material
unique_name = " {} _WaveSet7 " . format ( bm . name ) unique_name = f " { bm . name } _WaveSet7 "
hsgmat = self . _mgr . add_object ( hsGMaterial , name = unique_name , bl = bo ) hsgmat = self . _mgr . add_object ( hsGMaterial , name = unique_name , bl = bo )
# Materials MUST have one layer. Wavesets need alpha blending... # Materials MUST have one layer. Wavesets need alpha blending...
@ -370,13 +373,13 @@ class MaterialConverter:
return hsgmat . key return hsgmat . key
def export_bumpmap_slot ( self , bo , bm , hsgmat , slot , idx ) : def export_bumpmap_slot ( self , bo , bm , hsgmat , slot , idx ) :
name = " {} _ {} " . format ( hsgmat . key . name , slot . name ) name = f " { hsgmat . key . name } _ { slot . name } "
self . _report . msg ( " Exporting Plasma Bumpmap Layers for ' {} ' " , name , indent = 2 ) self . _report . msg ( f " Exporting Plasma Bumpmap Layers for ' { name } ' " )
# Okay, now we need to make 3 layers for the Du, Dw, and Dv # Okay, now we need to make 3 layers for the Du, Dw, and Dv
du_layer = self . _mgr . find_create_object ( plLayer , name = " {} _DU_BumpLut " . format ( name ) , bl = bo ) du_layer = self . _mgr . find_create_object ( plLayer , name = f " { name } _DU_BumpLut " , bl = bo )
dw_layer = self . _mgr . find_create_object ( plLayer , name = " {} _DW_BumpLut " . format ( name ) , bl = bo ) dw_layer = self . _mgr . find_create_object ( plLayer , name = f " { name } _DW_BumpLut " , bl = bo )
dv_layer = self . _mgr . find_create_object ( plLayer , name = " {} _DV_BumpLut " . format ( name ) , bl = bo ) dv_layer = self . _mgr . find_create_object ( plLayer , name = f " { name } _DV_BumpLut " , bl = bo )
for layer in ( du_layer , dw_layer , dv_layer ) : for layer in ( du_layer , dw_layer , dv_layer ) :
layer . ambient = hsColorRGBA ( 1.0 , 1.0 , 1.0 , 1.0 ) layer . ambient = hsColorRGBA ( 1.0 , 1.0 , 1.0 , 1.0 )
@ -419,21 +422,22 @@ class MaterialConverter:
def export_texture_slot ( self , bo , bm , hsgmat , slot , idx , name = None , blend_flags = True ) : def export_texture_slot ( self , bo , bm , hsgmat , slot , idx , name = None , blend_flags = True ) :
if name is None : if name is None :
name = " {} _ {} " . format ( bm . name if bm is not None else bo . name , slot . name ) name = f " { bm . name if bm is not None else bo . name } _ { slot . name } "
self . _report . msg ( " Exporting Plasma Layer ' {} ' " , name , indent = 2 ) self . _report . msg ( f " Exporting Plasma Layer ' { name } ' " )
layer = self . _mgr . find_create_object ( plLayer , name = name , bl = bo ) layer = self . _mgr . find_create_object ( plLayer , name = name , bl = bo )
if bm is not None and not slot . use_map_normal : if bm is not None and not slot . use_map_normal :
self . _propagate_material_settings ( bo , bm , slot , layer ) self . _propagate_material_settings ( bo , bm , slot , layer )
with self . _report . indent ( ) :
# UVW Channel # UVW Channel
if slot . texture_coords == " UV " : if slot . texture_coords == " UV " :
for i , uvchan in enumerate ( bo . data . uv_layers ) : for i , uvchan in enumerate ( bo . data . uv_layers ) :
if uvchan . name == slot . uv_layer : if uvchan . name == slot . uv_layer :
layer . UVWSrc = i layer . UVWSrc = i
self . _report . msg ( " Using UV Map # {} ' {} ' " , i , name , indent = 3 ) self . _report . msg ( f " Using UV Map # { i } ' { name } ' " )
break break
else : else :
self . _report . msg ( " No UVMap specified... Blindly using the first one, maybe it exists :| " , indent = 3 ) self . _report . msg ( " No UVMap specified... Blindly using the first one, maybe it exists :| " )
# Transform # Transform
xform = hsMatrix44 ( ) xform = hsMatrix44 ( )
@ -446,7 +450,7 @@ class MaterialConverter:
wantStencil , canStencil = slot . use_stencil , slot . use_stencil and bm is not None and not slot . use_map_normal wantStencil , canStencil = slot . use_stencil , slot . use_stencil and bm is not None and not slot . use_map_normal
if wantStencil and not canStencil : if wantStencil and not canStencil :
self . _exporter ( ) . report . warn ( " {} wants to stencil, but this is not a real Material " . format ( slot . name ) ) self . _exporter ( ) . report . warn ( f " { slot . name } wants to stencil, but this is not a real Material " )
state = layer . state state = layer . state
if canStencil : if canStencil :
@ -492,7 +496,7 @@ class MaterialConverter:
# Lightmapped emissive layers seem to cause cascading render issues. Skip flagging it # Lightmapped emissive layers seem to cause cascading render issues. Skip flagging it
# and just hope that the ambient color bump is good enough. # and just hope that the ambient color bump is good enough.
if bo . plasma_modifiers . lightmap . bake_lightmap : if bo . plasma_modifiers . lightmap . bake_lightmap :
self . _report . warn ( " A lightmapped and emissive material??? You like living dangerously... " , indent = 3 ) self . _report . warn ( " A lightmapped and emissive material??? You like living dangerously... " )
else : else :
state . shadeFlags | = hsGMatState . kShadeEmissive state . shadeFlags | = hsGMatState . kShadeEmissive
@ -715,7 +719,7 @@ class MaterialConverter:
# to a big "finalize" save step to prevent races. The texture cache would # to a big "finalize" save step to prevent races. The texture cache would
# prevent that as well, so we could theoretically slice-and-dice the single # prevent that as well, so we could theoretically slice-and-dice the single
# image here... but... meh. Offloading taim. # image here... but... meh. Offloading taim.
self . export_prepared_image ( texture = texture , owner = layer , indent = 3 , self . export_prepared_image ( texture = texture , owner = layer ,
alpha_type = TextureAlpha . opaque , mipmap = True , alpha_type = TextureAlpha . opaque , mipmap = True ,
allowed_formats = { " DDS " } , is_cube_map = True , tag = " cubemap " ) allowed_formats = { " DDS " } , is_cube_map = True , tag = " cubemap " )
@ -732,7 +736,7 @@ class MaterialConverter:
oRes = bl_env . resolution oRes = bl_env . resolution
eRes = helpers . ensure_power_of_two ( oRes ) eRes = helpers . ensure_power_of_two ( oRes )
if oRes != eRes : if oRes != eRes :
self . _report . msg ( " Overriding EnvMap size to ( {} x {} ) -- POT " , eRes , eRes , indent = 3 ) self . _report . msg ( f " Overriding EnvMap size to ( { eRes } x { eRes } ) -- POT " )
# And now for the general ho'hum-ness # And now for the general ho'hum-ness
pl_env = self . _mgr . find_create_object ( pl_class , bl = bo , name = name ) pl_env = self . _mgr . find_create_object ( pl_class , bl = bo , name = name )
@ -791,7 +795,7 @@ class MaterialConverter:
if viewpt . type == " CAMERA " : if viewpt . type == " CAMERA " :
warn = self . _report . port if bl_env . mapping == " PLANE " else self . _report . warn warn = self . _report . port if bl_env . mapping == " PLANE " else self . _report . warn
warn ( " Environment Map ' {} ' is exporting as a cube map. The viewpoint ' {} ' is a camera, but only its position will be used. " , warn ( " Environment Map ' {} ' is exporting as a cube map. The viewpoint ' {} ' is a camera, but only its position will be used. " ,
bl_env . id_data . name , viewpt . name , indent = 5 ) bl_env . id_data . name , viewpt . name )
# DEMs can do just a position vector. We actually prefer this because the WaveSet exporter # DEMs can do just a position vector. We actually prefer this because the WaveSet exporter
# will probably want to steal it for diabolical purposes... In MOUL, root objects are # will probably want to steal it for diabolical purposes... In MOUL, root objects are
@ -830,8 +834,7 @@ class MaterialConverter:
alpha_type = self . _test_image_alpha ( texture . image ) alpha_type = self . _test_image_alpha ( texture . image )
has_alpha = texture . use_calculate_alpha or slot . use_stencil or alpha_type != TextureAlpha . opaque has_alpha = texture . use_calculate_alpha or slot . use_stencil or alpha_type != TextureAlpha . opaque
if ( texture . image . use_alpha and texture . use_alpha ) and not has_alpha : if ( texture . image . use_alpha and texture . use_alpha ) and not has_alpha :
warning = " ' {} ' wants to use alpha, but ' {} ' is opaque " . format ( texture . name , texture . image . name ) self . _report . warn ( f " ' { texture . name } ' wants to use alpha, but ' { texture . image . name } ' is opaque " )
self . _exporter ( ) . report . warn ( warning , indent = 3 )
else : else :
alpha_type , has_alpha = TextureAlpha . opaque , False alpha_type , has_alpha = TextureAlpha . opaque , False
@ -894,8 +897,7 @@ class MaterialConverter:
detail_fade_stop = layer_props . detail_fade_stop , detail_fade_stop = layer_props . detail_fade_stop ,
detail_opacity_start = layer_props . detail_opacity_start , detail_opacity_start = layer_props . detail_opacity_start ,
detail_opacity_stop = layer_props . detail_opacity_stop , detail_opacity_stop = layer_props . detail_opacity_stop ,
mipmap = mipmap , allowed_formats = allowed_formats , mipmap = mipmap , allowed_formats = allowed_formats )
indent = 3 )
def _export_texture_type_none ( self , bo , layer , slot , idx ) : def _export_texture_type_none ( self , bo , layer , slot , idx ) :
# We'll allow this, just for sanity's sake... # We'll allow this, just for sanity's sake...
@ -911,14 +913,12 @@ class MaterialConverter:
texture = slot . texture texture = slot . texture
self . export_alpha_blend ( texture . progression , texture . use_flip_axis , layer ) self . export_alpha_blend ( texture . progression , texture . use_flip_axis , layer )
def export_alpha_blend ( self , progression , axis , owner , indent = 2 ) : def export_alpha_blend ( self , progression , axis , owner ) :
""" This exports an alpha blend texture as exposed by bpy.types.BlendTexture. """ This exports an alpha blend texture as exposed by bpy.types.BlendTexture.
The following arguments are expected : The following arguments are expected :
- progression : ( required ) - progression : ( required )
- axis : ( required ) - axis : ( required )
- owner : ( required ) the Plasma object using this image - owner : ( required ) the Plasma object using this image
- indent : ( optional ) indentation level for log messages
default : 2
""" """
# Certain blend types don't use an axis... # Certain blend types don't use an axis...
@ -1013,7 +1013,7 @@ class MaterialConverter:
image . pack ( True ) image . pack ( True )
self . export_prepared_image ( image = image , owner = owner , allowed_formats = { " BMP " } , self . export_prepared_image ( image = image , owner = owner , allowed_formats = { " BMP " } ,
alpha_type = TextureAlpha . full , indent = indent , ephemeral = True ) alpha_type = TextureAlpha . full , ephemeral = True )
def export_prepared_image ( self , * * kwargs ) : def export_prepared_image ( self , * * kwargs ) :
""" This exports an externally prepared image and an optional owning layer. """ This exports an externally prepared image and an optional owning layer.
@ -1026,8 +1026,6 @@ class MaterialConverter:
valid options : BMP , DDS , JPG , PNG valid options : BMP , DDS , JPG , PNG
- extension : ( optional ) file extension to use for the image object - extension : ( optional ) file extension to use for the image object
to use the image datablock extension , set this to None to use the image datablock extension , set this to None
- indent : ( optional ) indentation level for log messages
default : 2
- ephemeral : ( optional ) never cache this image - ephemeral : ( optional ) never cache this image
- tag : ( optional ) an optional identifier hint that allows multiple images with the - tag : ( optional ) an optional identifier hint that allows multiple images with the
same name to coexist in the cache same name to coexist in the cache
@ -1035,15 +1033,14 @@ class MaterialConverter:
that must be split into six separate images for Plasma that must be split into six separate images for Plasma
""" """
owner = kwargs . pop ( " owner " , None ) owner = kwargs . pop ( " owner " , None )
indent = kwargs . pop ( " indent " , 2 )
key = _Texture ( * * kwargs ) key = _Texture ( * * kwargs )
image = key . image image = key . image
if key not in self . _pending : if key not in self . _pending :
self . _report . msg ( " Stashing ' {} ' for conversion as ' {} ' " , image . name , key , indent = indent ) self . _report . msg ( " Stashing ' {} ' for conversion as ' {} ' " , image . name , key )
self . _pending [ key ] = [ owner . key , ] self . _pending [ key ] = [ owner . key , ]
else : else :
self . _report . msg ( " Found another user of ' {} ' " , key , indent = indent ) self . _report . msg ( " Found another user of ' {} ' " , key )
self . _pending [ key ] . append ( owner . key ) self . _pending [ key ] . append ( owner . key )
def finalize ( self ) : def finalize ( self ) :
@ -1064,6 +1061,7 @@ class MaterialConverter:
pClassName = " CubicEnvironmap " if key . is_cube_map else " Mipmap " pClassName = " CubicEnvironmap " if key . is_cube_map else " Mipmap "
self . _report . msg ( " \n [ {} ' {} ' ] " , pClassName , name ) self . _report . msg ( " \n [ {} ' {} ' ] " , pClassName , name )
with self . _report . indent ( ) :
image = key . image image = key . image
# Now we try to use the pile of hints we were given to figure out what format to use # Now we try to use the pile of hints we were given to figure out what format to use
@ -1098,7 +1096,7 @@ class MaterialConverter:
try : try :
self . _finalize_bitmap ( key , owners , name , numLevels , width , height , compression , dxt , data ) self . _finalize_bitmap ( key , owners , name , numLevels , width , height , compression , dxt , data )
except RuntimeError : except RuntimeError :
self . _report . warn ( " Cached image is corrupted! Recaching image... " , indent = 1 ) self . _report . warn ( " Cached image is corrupted! Recaching image... " )
numLevels , width , height , data = self . _finalize_cache ( texcache , key , image , name , compression , dxt ) numLevels , width , height , data = self . _finalize_cache ( texcache , key , image , name , compression , dxt )
self . _finalize_bitmap ( key , owners , name , numLevels , width , height , compression , dxt , data ) self . _finalize_bitmap ( key , owners , name , numLevels , width , height , compression , dxt , data )
@ -1111,10 +1109,11 @@ class MaterialConverter:
# business to account for per-page textures # business to account for per-page textures
pages = { } pages = { }
self . _report . msg ( " Adding to... " , indent = 1 ) self . _report . msg ( " Adding to... " )
with self . _report . indent ( ) :
for owner_key in owners : for owner_key in owners :
owner = owner_key . object owner = owner_key . object
self . _report . msg ( " [ {} ' {} ' ] " , owner . ClassName ( ) [ 2 : ] , owner_key . name , indent = 2 ) self . _report . msg ( f " [ { owner . ClassName ( ) [ 2 : ] } ' { owner_key . name } ' ] " )
page = mgr . get_textures_page ( owner_key ) # Layer's page or Textures.prp page = mgr . get_textures_page ( owner_key ) # Layer's page or Textures.prp
# If we haven't created this texture in the page (either layer's page or Textures.prp), # If we haven't created this texture in the page (either layer's page or Textures.prp),
@ -1162,7 +1161,7 @@ class MaterialConverter:
def _finalize_cube_map ( self , key , image , name , compression , dxt ) : def _finalize_cube_map ( self , key , image , name , compression , dxt ) :
oWidth , oHeight = image . size oWidth , oHeight = image . size
if oWidth == 0 and oHeight == 0 : if oWidth == 0 and oHeight == 0 :
raise ExportError ( " Image ' {} ' could not be loaded. " . format ( image . name ) ) raise ExportError ( f " Image ' { image . name } ' could not be loaded. " )
# Non-DXT images are BGRA in Plasma # Non-DXT images are BGRA in Plasma
bgra = compression != plBitmap . kDirectXCompression bgra = compression != plBitmap . kDirectXCompression
@ -1177,7 +1176,7 @@ class MaterialConverter:
# something funky. # something funky.
if oWidth != cWidth or oHeight != cHeight : if oWidth != cWidth or oHeight != cHeight :
self . _report . warn ( " Image was resized by Blender to ( {} x {} )--resizing the resize to ( {} x {} ) " , self . _report . warn ( " Image was resized by Blender to ( {} x {} )--resizing the resize to ( {} x {} ) " ,
cWidth , cHeight , oWidth , oHeight , indent = 1 ) cWidth , cHeight , oWidth , oHeight )
data = scale_image ( data , cWidth , cHeight , oWidth , oHeight ) data = scale_image ( data , cWidth , cHeight , oWidth , oHeight )
# Face dimensions # Face dimensions
@ -1213,14 +1212,14 @@ class MaterialConverter:
name = face_name [ : - 4 ] . upper ( ) name = face_name [ : - 4 ] . upper ( )
if compression == plBitmap . kDirectXCompression : if compression == plBitmap . kDirectXCompression :
numLevels = glimage . num_levels numLevels = glimage . num_levels
self . _report . msg ( " Generating mip levels for cube face ' {} ' " , name , indent = 1 ) self . _report . msg ( " Generating mip levels for cube face ' {} ' " , name )
# If we're compressing this mofo, we'll need a temporary mipmap to do that here... # If we're compressing this mofo, we'll need a temporary mipmap to do that here...
mipmap = plMipmap ( name = name , width = eWidth , height = eHeight , numLevels = numLevels , mipmap = plMipmap ( name = name , width = eWidth , height = eHeight , numLevels = numLevels ,
compType = compression , format = plBitmap . kRGB8888 , dxtLevel = dxt ) compType = compression , format = plBitmap . kRGB8888 , dxtLevel = dxt )
else : else :
numLevels = 1 numLevels = 1
self . _report . msg ( " Compressing single level for cube face ' {} ' " , name , indent = 1 ) self . _report . msg ( " Compressing single level for cube face ' {} ' " , name )
face_images [ i ] = [ None ] * numLevels face_images [ i ] = [ None ] * numLevels
for j in range ( numLevels ) : for j in range ( numLevels ) :
@ -1244,7 +1243,7 @@ class MaterialConverter:
eWidth , eHeight = glimage . size_pot eWidth , eHeight = glimage . size_pot
if compression == plBitmap . kDirectXCompression : if compression == plBitmap . kDirectXCompression :
numLevels = glimage . num_levels numLevels = glimage . num_levels
self . _report . msg ( " Generating mip levels " , indent = 1 ) self . _report . msg ( " Generating mip levels " )
# If this is a DXT-compressed mipmap, we need to use a temporary mipmap # If this is a DXT-compressed mipmap, we need to use a temporary mipmap
# to do the compression. We'll then steal the data from it. # to do the compression. We'll then steal the data from it.
@ -1252,7 +1251,7 @@ class MaterialConverter:
compType = compression , format = plBitmap . kRGB8888 , dxtLevel = dxt ) compType = compression , format = plBitmap . kRGB8888 , dxtLevel = dxt )
else : else :
numLevels = 1 numLevels = 1
self . _report . msg ( " Compressing single level " , indent = 1 ) self . _report . msg ( " Compressing single level " )
# Hold the uncompressed level data for now. We may have to make multiple copies of # Hold the uncompressed level data for now. We may have to make multiple copies of
# this mipmap for per-page textures :( # this mipmap for per-page textures :(
@ -1281,7 +1280,7 @@ class MaterialConverter:
yield from filter ( None , self . _obj2layer [ bo ] [ bm ] [ tex ] ) yield from filter ( None , self . _obj2layer [ bo ] [ bm ] [ tex ] )
return return
if bo is None and bm is None and tex is None : if bo is None and bm is None and tex is None :
self . _exporter ( ) . report . warn ( " Asking for all the layers we ' ve ever exported, eh? You like living dangerously. " , indent = 2 ) self . _exporter ( ) . report . warn ( " Asking for all the layers we ' ve ever exported, eh? You like living dangerously. " )
# What we want to do is filter _obj2layers: # What we want to do is filter _obj2layers:
# bo if set, or all objects # bo if set, or all objects
